Index: Makefile
===================================================================
--- Makefile (nonexistent)
+++ Makefile (revision 351)
@@ -0,0 +1,56 @@
+
+COMPONENT_TARGETS = $(HARDWARE_NOARCH)
+
+
+include ../../../../build-system/constants.mk
+
+
+url = $(DOWNLOAD_SERVER)/sources/packages/m/mplayer
+
+versions = 38448
+pkgname = mplayer
+suffix = tar.xz
+
+tarballs = $(addsuffix .$(suffix), $(addprefix $(pkgname)-, $(versions)))
+sha1s = $(addsuffix .sha1sum, $(tarballs))
+
+patches = $(CURDIR)/patches/mplayer-38448-not-hide-x11-cursor.patch
+
+.NOTPARALLEL: $(patches)
+
+
+BUILD_TARGETS = $(tarballs) $(sha1s) $(patches)
+
+
+include ../../../../build-system/core.mk
+
+
+.PHONY: download_clean
+
+
+$(tarballs):
+ @echo -e "\n======= Downloading source tarballs =======" ; \
+ for tarball in $(tarballs) ; do \
+ echo "$(url)/$$tarball" | xargs -n 1 -P 100 wget $(WGET_OPTIONS) - & \
+ done ; wait
+
+$(sha1s): $(tarballs)
+ @for sha in $@ ; do \
+ echo -e "\n======= Downloading '$$sha' signature =======\n" ; \
+ echo "$(url)/$$sha" | xargs -n 1 -P 100 wget $(WGET_OPTIONS) - & wait %1 ; \
+ touch $$sha ; \
+ echo -e "\n======= Check the '$$sha' sha1sum =======\n" ; \
+ sha1sum --check $$sha ; ret="$$?" ; \
+ if [ "$$ret" == "1" ]; then \
+ echo -e "\n======= ERROR: Bad '$$sha' sha1sum =======\n" ; \
+ exit 1 ; \
+ fi ; \
+ done
+
+$(patches): $(sha1s)
+ @echo -e "\n======= Create Patches =======\n" ; \
+ ( cd create-38448-not-hide-x11-cursor-patch ; ./create.patch.sh ) ; \
+ echo -e "\n"
+
+download_clean:
+ @rm -f $(tarballs) $(sha1s) $(patches)
Index: create-38448-not-hide-x11-cursor-patch/create.patch.sh
===================================================================
--- create-38448-not-hide-x11-cursor-patch/create.patch.sh (nonexistent)
+++ create-38448-not-hide-x11-cursor-patch/create.patch.sh (revision 351)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+VERSION=38448
+
+tar --files-from=file.list -xJvf ../mplayer-$VERSION.tar.xz
+mv mplayer-$VERSION mplayer-$VERSION-orig
+
+cp -rf ./mplayer-$VERSION-new ./mplayer-$VERSION
+
+diff -b --unified -Nr mplayer-$VERSION-orig mplayer-$VERSION > mplayer-$VERSION-not-hide-x11-cursor.patch
+
+mv mplayer-$VERSION-not-hide-x11-cursor.patch ../patches
+
+rm -rf ./mplayer-$VERSION
+rm -rf ./mplayer-$VERSION-orig
Property changes on: create-38448-not-hide-x11-cursor-patch/create.patch.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: create-38448-not-hide-x11-cursor-patch/file.list
===================================================================
--- create-38448-not-hide-x11-cursor-patch/file.list (nonexistent)
+++ create-38448-not-hide-x11-cursor-patch/file.list (revision 351)
@@ -0,0 +1 @@
+mplayer-38448/libvo/x11_common.c
Index: create-38448-not-hide-x11-cursor-patch/mplayer-38448-new/libvo/x11_common.c
===================================================================
--- create-38448-not-hide-x11-cursor-patch/mplayer-38448-new/libvo/x11_common.c (nonexistent)
+++ create-38448-not-hide-x11-cursor-patch/mplayer-38448-new/libvo/x11_common.c (revision 351)
@@ -0,0 +1,2439 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <locale.h>
+
+#include "config.h"
+#include "mp_msg.h"
+#include "mp_fifo.h"
+#include "libavutil/common.h"
+#include "libavutil/avstring.h"
+#include "x11_common.h"
+
+#include <string.h>
+#include <unistd.h>
+#include <assert.h>
+
+#include "video_out.h"
+#include "aspect.h"
+#include "geometry.h"
+#include "help_mp.h"
+#include "osdep/timer.h"
+
+#include <X11/Xmd.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
+
+#ifdef CONFIG_XSS
+#include <X11/extensions/scrnsaver.h>
+#endif
+
+#ifdef CONFIG_XDPMS
+#include <X11/extensions/dpms.h>
+#endif
+
+#ifdef CONFIG_XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
+
+#ifdef CONFIG_XF86VM
+#include <X11/extensions/xf86vmode.h>
+#endif
+
+#ifdef CONFIG_XF86XK
+#include <X11/XF86keysym.h>
+#endif
+
+#ifdef CONFIG_XV
+#include <X11/extensions/Xv.h>
+#include <X11/extensions/Xvlib.h>
+
+#include "subopt-helper.h"
+#endif
+
+#include "input/input.h"
+#include "input/mouse.h"
+
+#ifdef CONFIG_GUI
+#include "gui/interface.h"
+#include "mplayer.h"
+#endif
+
+#define WIN_LAYER_ONBOTTOM 2
+#define WIN_LAYER_NORMAL 4
+#define WIN_LAYER_ONTOP 6
+#define WIN_LAYER_ABOVE_DOCK 10
+
+static int fs_layer = WIN_LAYER_ABOVE_DOCK;
+static int orig_layer = 0;
+static int old_gravity = NorthWestGravity;
+
+int stop_xscreensaver = 1;
+
+static int dpms_disabled = 0;
+
+char *mDisplayName;
+Display *mDisplay;
+Window mRootWin;
+int mScreen;
+int mLocalDisplay;
+
+/* output window id */
+int vo_mouse_autohide = 0;
+int vo_wm_type = 0;
+int vo_fs_type = 0; // needs to be accessible for GUI X11 code
+static int window_state;
+static int vo_fs_flip = 0;
+char **vo_fstype_list;
+
+/* 1 means that the WM is metacity (broken as hell) */
+int metacity_hack = 0;
+
+static Atom XA_NET_SUPPORTED;
+static Atom XA_NET_WM_STATE;
+static Atom XA_NET_WM_STATE_FULLSCREEN;
+static Atom XA_NET_WM_STATE_ABOVE;
+static Atom XA_NET_WM_STATE_STAYS_ON_TOP;
+static Atom XA_NET_WM_STATE_BELOW;
+static Atom XA_NET_WM_PID;
+static Atom XA_NET_WM_NAME;
+static Atom XA_WIN_PROTOCOLS;
+static Atom XA_WIN_LAYER;
+static Atom XA_WIN_HINTS;
+static Atom XAWM_PROTOCOLS;
+static Atom XAWM_DELETE_WINDOW;
+static Atom XAUTF8_STRING;
+
+#define XA_INIT(x) XA##x = XInternAtom(mDisplay, #x, False)
+
+static int vo_old_x = 0;
+static int vo_old_y = 0;
+static int vo_old_width = 0;
+static int vo_old_height = 0;
+
+#ifdef CONFIG_XF86VM
+static int modecount;
+static XF86VidModeModeInfo **vidmodes;
+static XF86VidModeModeLine modeline;
+#endif
+
+static int vo_x11_get_fs_type(int supported);
+
+
+/*
+ * Sends the EWMH fullscreen state event.
+ *
+ * win: id of the window to which the event shall be sent
+ * action: could be one of _NET_WM_STATE_REMOVE -- remove state
+ * _NET_WM_STATE_ADD -- add state
+ * _NET_WM_STATE_TOGGLE -- toggle
+ */
+void vo_x11_ewmh_fullscreen(Window win, int action)
+{
+ assert(action == _NET_WM_STATE_REMOVE ||
+ action == _NET_WM_STATE_ADD || action == _NET_WM_STATE_TOGGLE);
+
+ if (vo_fs_type & vo_wm_FULLSCREEN)
+ {
+ XEvent xev;
+
+ /* init X event structure for _NET_WM_FULLSCREEN client message */
+ xev.xclient.type = ClientMessage;
+ xev.xclient.serial = 0;
+ xev.xclient.send_event = True;
+ xev.xclient.message_type = XA_NET_WM_STATE;
+ xev.xclient.window = win;
+ xev.xclient.format = 32;
+ xev.xclient.data.l[0] = action;
+ xev.xclient.data.l[1] = XA_NET_WM_STATE_FULLSCREEN;
+ xev.xclient.data.l[2] = 0;
+ xev.xclient.data.l[3] = 0;
+ xev.xclient.data.l[4] = 0;
+
+ /* finally send that damn thing */
+ if (!XSendEvent(mDisplay, DefaultRootWindow(mDisplay), False,
+ SubstructureRedirectMask | SubstructureNotifyMask,
+ &xev))
+ {
+ mp_msg(MSGT_VO, MSGL_ERR, MSGTR_EwmhFullscreenStateFailed);
+ }
+ }
+}
+
+static void vo_hidecursor(Display * disp, Window win)
+{
+ return;
+}
+
+static void vo_showcursor(Display * disp, Window win)
+{
+ return;
+}
+
+static int x11_errorhandler(Display * display, XErrorEvent * event)
+{
+#define MSGLEN 60
+ char msg[MSGLEN];
+
+ XGetErrorText(display, event->error_code, (char *) &msg, MSGLEN);
+
+ mp_msg(MSGT_VO, MSGL_ERR, MSGTR_X11Error, msg);
+
+ mp_msg(MSGT_VO, MSGL_V,
+ "Type: %x, display: %p, resourceid: %lx, serial: %lx\n",
+ event->type, event->display, event->resourceid, event->serial);
+ mp_msg(MSGT_VO, MSGL_V,
+ "Error code: %x, request code: %x, minor code: %x\n",
+ event->error_code, event->request_code, event->minor_code);
+
+// abort();
+ return 0;
+#undef MSGLEN
+}
+
+void fstype_help(void)
+{
+ mp_msg(MSGT_VO, MSGL_INFO, MSGTR_AvailableFsType);
+ mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_FULL_SCREEN_TYPES\n");
+
+ mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "none",
+ "don't set fullscreen window layer");
+ mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "layer",
+ "use _WIN_LAYER hint with default layer");
+ mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "layer=<0..15>",
+ "use _WIN_LAYER hint with a given layer number");
+ mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "netwm",
+ "force NETWM style");
+ mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "above",
+ "use _NETWM_STATE_ABOVE hint if available");
+ mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "below",
+ "use _NETWM_STATE_BELOW hint if available");
+ mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "fullscreen",
+ "use _NETWM_STATE_FULLSCREEN hint if available");
+ mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "stays_on_top",
+ "use _NETWM_STATE_STAYS_ON_TOP hint if available");
+ mp_msg(MSGT_VO, MSGL_INFO,
+ "You can also negate individual flags by preceding them with a '-' character");
+ mp_msg(MSGT_VO, MSGL_INFO, "\n");
+}
+
+static void fstype_dump(int fstype)
+{
+ if (fstype)
+ {
+ mp_msg(MSGT_VO, MSGL_V, "[x11] Current fstype setting honours");
+ if (fstype & vo_wm_LAYER)
+ mp_msg(MSGT_VO, MSGL_V, " LAYER");
+ if (fstype & vo_wm_FULLSCREEN)
+ mp_msg(MSGT_VO, MSGL_V, " FULLSCREEN");
+ if (fstype & vo_wm_STAYS_ON_TOP)
+ mp_msg(MSGT_VO, MSGL_V, " STAYS_ON_TOP");
+ if (fstype & vo_wm_ABOVE)
+ mp_msg(MSGT_VO, MSGL_V, " ABOVE");
+ if (fstype & vo_wm_BELOW)
+ mp_msg(MSGT_VO, MSGL_V, " BELOW");
+ mp_msg(MSGT_VO, MSGL_V, " X atoms\n");
+ } else
+ mp_msg(MSGT_VO, MSGL_V,
+ "[x11] Current fstype setting doesn't honour any X atoms\n");
+}
+
+static int net_wm_support_state_test(Atom atom)
+{
+#define NET_WM_STATE_TEST(x) { if (atom == XA_NET_WM_STATE_##x) { mp_msg( MSGT_VO,MSGL_V, "[x11] Detected wm supports " #x " state.\n" ); return vo_wm_##x; } }
+
+ NET_WM_STATE_TEST(FULLSCREEN);
+ NET_WM_STATE_TEST(ABOVE);
+ NET_WM_STATE_TEST(STAYS_ON_TOP);
+ NET_WM_STATE_TEST(BELOW);
+ return 0;
+}
+
+static int x11_get_property(Atom type, Atom ** args, unsigned long *nitems)
+{
+ int format;
+ unsigned long bytesafter;
+
+ return Success ==
+ XGetWindowProperty(mDisplay, mRootWin, type, 0, 16384, False,
+ AnyPropertyType, &type, &format, nitems,
+ &bytesafter, (unsigned char **) args)
+ && *nitems > 0;
+}
+
+static int vo_wm_detect(void)
+{
+ int i;
+ int wm = 0;
+ unsigned long nitems;
+ Atom *args = NULL;
+
+ if (WinID >= 0)
+ return 0;
+
+// -- supports layers
+ if (x11_get_property(XA_WIN_PROTOCOLS, &args, &nitems))
+ {
+ mp_msg(MSGT_VO, MSGL_V, "[x11] Detected wm supports layers.\n");
+ for (i = 0; i < nitems; i++)
+ {
+ if (args[i] == XA_WIN_LAYER)
+ {
+ wm |= vo_wm_LAYER;
+ metacity_hack |= 1;
+ } else
+ /* metacity is the only window manager I know which reports
+ * supporting only the _WIN_LAYER hint in _WIN_PROTOCOLS.
+ * (what's more support for it is broken) */
+ metacity_hack |= 2;
+ }
+ XFree(args);
+ if (wm && (metacity_hack == 1))
+ {
+ // metacity claims to support layers, but it is not the truth :-)
+ wm ^= vo_wm_LAYER;
+ mp_msg(MSGT_VO, MSGL_V,
+ "[x11] Using workaround for Metacity bugs.\n");
+ }
+ }
+// --- netwm
+ if (x11_get_property(XA_NET_SUPPORTED, &args, &nitems))
+ {
+ mp_msg(MSGT_VO, MSGL_V, "[x11] Detected wm supports NetWM.\n");
+ for (i = 0; i < nitems; i++)
+ wm |= net_wm_support_state_test(args[i]);
+ XFree(args);
+ }
+
+ if (wm == 0)
+ mp_msg(MSGT_VO, MSGL_V, "[x11] Unknown wm type...\n");
+ return wm;
+}
+
+static void init_atoms(void)
+{
+ XA_INIT(_NET_SUPPORTED);
+ XA_INIT(_NET_WM_STATE);
+ XA_INIT(_NET_WM_STATE_FULLSCREEN);
+ XA_INIT(_NET_WM_STATE_ABOVE);
+ XA_INIT(_NET_WM_STATE_STAYS_ON_TOP);
+ XA_INIT(_NET_WM_STATE_BELOW);
+ XA_INIT(_NET_WM_PID);
+ XA_INIT(_NET_WM_NAME);
+ XA_INIT(_WIN_PROTOCOLS);
+ XA_INIT(_WIN_LAYER);
+ XA_INIT(_WIN_HINTS);
+ XA_INIT(WM_PROTOCOLS);
+ XA_INIT(WM_DELETE_WINDOW);
+ XA_INIT(UTF8_STRING);
+}
+
+void update_xinerama_info(void) {
+ xinerama_x = xinerama_y = 0;
+#ifdef CONFIG_XINERAMA
+ if (xinerama_screen >= -1 && XineramaIsActive(mDisplay))
+ {
+ int screen = xinerama_screen;
+ XineramaScreenInfo *screens;
+ int num_screens;
+
+ screens = XineramaQueryScreens(mDisplay, &num_screens);
+ if (screen >= num_screens)
+ screen = num_screens - 1;
+ if (screen == -1) {
+ int x = vo_dx + vo_dwidth / 2;
+ int y = vo_dy + vo_dheight / 2;
+ for (screen = num_screens - 1; screen > 0; screen--) {
+ int left = screens[screen].x_org;
+ int right = left + screens[screen].width;
+ int top = screens[screen].y_org;
+ int bottom = top + screens[screen].height;
+ if (left <= x && x <= right && top <= y && y <= bottom)
+ break;
+ }
+ }
+ if (screen < 0)
+ screen = 0;
+ vo_screenwidth = screens[screen].width;
+ vo_screenheight = screens[screen].height;
+ xinerama_x = screens[screen].x_org;
+ xinerama_y = screens[screen].y_org;
+
+ XFree(screens);
+ }
+#endif
+ aspect_save_screenres(vo_screenwidth, vo_screenheight);
+}
+
+int vo_init(void)
+{
+// int mScreen;
+ int depth, bpp;
+ unsigned int mask;
+
+ XImage *mXImage = NULL;
+
+// Window mRootWin;
+ XWindowAttributes attribs;
+ char *dispName;
+
+ if (vo_rootwin)
+ WinID = 0; // use root window
+
+ if (vo_depthonscreen)
+ {
+ saver_off(mDisplay);
+ return 1; // already called
+ }
+
+ // Required so that XLookupString returns UTF-8
+ if (!setlocale(LC_CTYPE, "C.UTF-8") && !setlocale(LC_CTYPE, "en_US.utf8"))
+ mp_msg(MSGT_VO, MSGL_WARN, MSGTR_CouldntFindUTF8Locale);
+ XSetErrorHandler(x11_errorhandler);
+
+ dispName = XDisplayName(mDisplayName);
+
+ mp_msg(MSGT_VO, MSGL_V, "X11 opening display: %s\n", dispName);
+
+ mDisplay = XOpenDisplay(dispName);
+ if (!mDisplay)
+ {
+ mp_msg(MSGT_VO, MSGL_ERR,
+ MSGTR_CouldntOpenDisplay, dispName);
+ return 0;
+ }
+ mScreen = DefaultScreen(mDisplay); // screen ID
+ mRootWin = RootWindow(mDisplay, mScreen); // root window ID
+
+ init_atoms();
+
+#ifdef CONFIG_XF86VM
+ {
+ int clock;
+
+ XF86VidModeGetModeLine(mDisplay, mScreen, &clock, &modeline);
+ if (!vo_screenwidth)
+ vo_screenwidth = modeline.hdisplay;
+ if (!vo_screenheight)
+ vo_screenheight = modeline.vdisplay;
+ }
+#endif
+ {
+ if (!vo_screenwidth)
+ vo_screenwidth = DisplayWidth(mDisplay, mScreen);
+ if (!vo_screenheight)
+ vo_screenheight = DisplayHeight(mDisplay, mScreen);
+ }
+ // get color depth (from root window, or the best visual):
+ XGetWindowAttributes(mDisplay, mRootWin, &attribs);
+ depth = attribs.depth;
+
+ if (depth != 15 && depth != 16 && depth != 24 && depth != 32)
+ {
+ Visual *visual;
+
+ depth = vo_find_depth_from_visuals(mDisplay, mScreen, &visual);
+ if (depth != -1)
+ mXImage = XCreateImage(mDisplay, visual, depth, ZPixmap,
+ 0, NULL, 1, 1, 8, 1);
+ } else
+ mXImage =
+ XGetImage(mDisplay, mRootWin, 0, 0, 1, 1, AllPlanes, ZPixmap);
+
+ vo_depthonscreen = depth; // display depth on screen
+
+ // get bits/pixel from XImage structure:
+ if (mXImage == NULL)
+ {
+ mask = 0;
+ } else
+ {
+ /*
+ * for the depth==24 case, the XImage structures might use
+ * 24 or 32 bits of data per pixel. The global variable
+ * vo_depthonscreen stores the amount of data per pixel in the
+ * XImage structure!
+ *
+ * Maybe we should rename vo_depthonscreen to (or add) vo_bpp?
+ */
+ bpp = mXImage->bits_per_pixel;
+ if ((vo_depthonscreen + 7) / 8 != (bpp + 7) / 8)
+ vo_depthonscreen = bpp; // by A'rpi
+ mask =
+ mXImage->red_mask | mXImage->green_mask | mXImage->blue_mask;
+ mp_msg(MSGT_VO, MSGL_V,
+ "vo: X11 color mask: %X (R:%lX G:%lX B:%lX)\n", mask,
+ mXImage->red_mask, mXImage->green_mask, mXImage->blue_mask);
+ XDestroyImage(mXImage);
+ }
+ if (((vo_depthonscreen + 7) / 8) == 2)
+ {
+ if (mask == 0x7FFF)
+ vo_depthonscreen = 15;
+ else if (mask == 0xFFFF)
+ vo_depthonscreen = 16;
+ }
+// XCloseDisplay( mDisplay );
+/* slightly improved local display detection AST */
+ if (strncmp(dispName, "unix:", 5) == 0)
+ dispName += 4;
+ else if (strncmp(dispName, "localhost:", 10) == 0)
+ dispName += 9;
+ if (*dispName == ':' && atoi(dispName + 1) < 10)
+ mLocalDisplay = 1;
+ else
+ mLocalDisplay = 0;
+ mp_msg(MSGT_VO, MSGL_V,
+ "vo: X11 running at %dx%d with depth %d and %d bpp (\"%s\" => %s display)\n",
+ vo_screenwidth, vo_screenheight, depth, vo_depthonscreen,
+ dispName, mLocalDisplay ? "local" : "remote");
+
+ vo_wm_type = vo_wm_detect();
+
+ vo_fs_type = vo_x11_get_fs_type(vo_wm_type);
+
+ fstype_dump(vo_fs_type);
+
+ saver_off(mDisplay);
+ return 1;
+}
+
+void vo_uninit(void)
+{
+ if (!mDisplay)
+ {
+ mp_msg(MSGT_VO, MSGL_V,
+ "vo: x11 uninit called but X11 not initialized..\n");
+ return;
+ }
+// if( !vo_depthonscreen ) return;
+ mp_msg(MSGT_VO, MSGL_V, "vo: uninit ...\n");
+ XSetErrorHandler(NULL);
+ XCloseDisplay(mDisplay);
+ vo_depthonscreen = 0;
+ mDisplay = NULL;
+}
+
+#include "osdep/keycodes.h"
+#include "wskeys.h"
+
+static const struct mp_keymap keysym_map[] = {
+#ifdef XF86XK_AudioPause
+ {XF86XK_MenuKB, KEY_MENU},
+ {XF86XK_AudioPlay, KEY_PLAY}, {XF86XK_AudioPause, KEY_PAUSE}, {XF86XK_AudioStop, KEY_STOP},
+ {XF86XK_AudioPrev, KEY_PREV}, {XF86XK_AudioNext, KEY_NEXT},
+ {XF86XK_AudioMute, KEY_MUTE}, {XF86XK_AudioLowerVolume, KEY_VOLUME_DOWN}, {XF86XK_AudioRaiseVolume, KEY_VOLUME_UP},
+#endif
+ {0, 0}
+};
+
+static int vo_x11_putkey_ext(int keysym)
+{
+ int mpkey = lookup_keymap_table(keysym_map, keysym);
+ if (mpkey)
+ mplayer_put_key(mpkey);
+ return mpkey != 0;
+}
+
+static const struct mp_keymap keymap[] = {
+ // special keys
+ {wsPause, KEY_PAUSE}, {wsEscape, KEY_ESC}, {wsBackSpace, KEY_BS},
+ {wsTab, KEY_TAB}, {wsEnter, KEY_ENTER},
+
+ // cursor keys
+ {wsLeft, KEY_LEFT}, {wsRight, KEY_RIGHT}, {wsUp, KEY_UP}, {wsDown, KEY_DOWN},
+
+ // navigation block
+ {wsInsert, KEY_INSERT}, {wsDelete, KEY_DELETE}, {wsHome, KEY_HOME}, {wsEnd, KEY_END},
+ {wsPageUp, KEY_PAGE_UP}, {wsPageDown, KEY_PAGE_DOWN},
+
+ // F-keys
+ {wsF1, KEY_F+1}, {wsF2, KEY_F+2}, {wsF3, KEY_F+3}, {wsF4, KEY_F+4},
+ {wsF5, KEY_F+5}, {wsF6, KEY_F+6}, {wsF7, KEY_F+7}, {wsF8, KEY_F+8},
+ {wsF9, KEY_F+9}, {wsF10, KEY_F+10}, {wsF11, KEY_F+11}, {wsF12, KEY_F+12},
+
+ // numpad independent of numlock
+ {wsGrayMinus, '-'}, {wsGrayPlus, '+'}, {wsGrayMul, '*'}, {wsGrayDiv, '/'},
+ {wsGrayEnter, KEY_KPENTER},
+
+ // numpad with numlock
+ {wsGray0, KEY_KP0}, {wsGray1, KEY_KP1}, {wsGray2, KEY_KP2},
+ {wsGray3, KEY_KP3}, {wsGray4, KEY_KP4}, {wsGray5, KEY_KP5},
+ {wsGray6, KEY_KP6}, {wsGray7, KEY_KP7}, {wsGray8, KEY_KP8},
+ {wsGray9, KEY_KP9}, {wsGrayDecimal, KEY_KPDEC},
+
+ // numpad without numlock
+ {wsGrayInsert, KEY_KPINS}, {wsGrayEnd, KEY_KP1}, {wsGrayDown, KEY_KP2},
+ {wsGrayPgDn, KEY_KP3}, {wsGrayLeft, KEY_KP4}, {wsGray5Dup, KEY_KP5},
+ {wsGrayRight, KEY_KP6}, {wsGrayHome, KEY_KP7}, {wsGrayUp, KEY_KP8},
+ {wsGrayPgUp, KEY_KP9}, {wsGrayDelete, KEY_KPDEL},
+
+ {0, 0}
+};
+
+void vo_x11_putkey(int key)
+{
+ static const char *passthrough_keys = " -+*/<>`~!@#$%^&()_{}:;\"\',.?\\|=[]";
+ int mpkey = 0;
+ if ((key >= 'a' && key <= 'z') ||
+ (key >= 'A' && key <= 'Z') ||
+ (key >= '0' && key <= '9') ||
+ (key > 0 && key < 256 && strchr(passthrough_keys, key)))
+ mpkey = key;
+
+ if (!mpkey)
+ mpkey = lookup_keymap_table(keymap, key);
+
+ if (mpkey)
+ mplayer_put_key(mpkey);
+}
+
+
+// ----- Motif header: -------
+
+#define MWM_HINTS_FUNCTIONS (1L << 0)
+#define MWM_HINTS_DECORATIONS (1L << 1)
+#define MWM_HINTS_INPUT_MODE (1L << 2)
+#define MWM_HINTS_STATUS (1L << 3)
+
+#define MWM_FUNC_ALL (1L << 0)
+#define MWM_FUNC_RESIZE (1L << 1)
+#define MWM_FUNC_MOVE (1L << 2)
+#define MWM_FUNC_MINIMIZE (1L << 3)
+#define MWM_FUNC_MAXIMIZE (1L << 4)
+#define MWM_FUNC_CLOSE (1L << 5)
+
+#define MWM_DECOR_ALL (1L << 0)
+#define MWM_DECOR_BORDER (1L << 1)
+#define MWM_DECOR_RESIZEH (1L << 2)
+#define MWM_DECOR_TITLE (1L << 3)
+#define MWM_DECOR_MENU (1L << 4)
+#define MWM_DECOR_MINIMIZE (1L << 5)
+#define MWM_DECOR_MAXIMIZE (1L << 6)
+
+#define MWM_INPUT_MODELESS 0
+#define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1
+#define MWM_INPUT_SYSTEM_MODAL 2
+#define MWM_INPUT_FULL_APPLICATION_MODAL 3
+#define MWM_INPUT_APPLICATION_MODAL MWM_INPUT_PRIMARY_APPLICATION_MODAL
+
+#define MWM_TEAROFF_WINDOW (1L<<0)
+
+typedef struct
+{
+ long flags;
+ long functions;
+ long decorations;
+ long input_mode;
+ long state;
+} MotifWmHints;
+
+static MotifWmHints vo_MotifWmHints;
+static Atom vo_MotifHints = None;
+
+void vo_x11_decoration(Display * vo_Display, Window w, int d)
+{
+ static unsigned int olddecor = MWM_DECOR_ALL;
+ static unsigned int oldfuncs =
+ MWM_FUNC_MOVE | MWM_FUNC_CLOSE | MWM_FUNC_MINIMIZE |
+ MWM_FUNC_MAXIMIZE | MWM_FUNC_RESIZE;
+ Atom mtype;
+ int mformat;
+ unsigned long mn, mb;
+
+ if (WinID >= 0)
+ return;
+
+ if (vo_fsmode & 8)
+ {
+ XSetTransientForHint(vo_Display, w,
+ RootWindow(vo_Display, mScreen));
+ }
+
+ vo_MotifHints = XInternAtom(vo_Display, "_MOTIF_WM_HINTS", 0);
+ if (vo_MotifHints != None)
+ {
+ if (!d)
+ {
+ MotifWmHints *mhints = NULL;
+
+ XGetWindowProperty(vo_Display, w, vo_MotifHints, 0, 20, False,
+ vo_MotifHints, &mtype, &mformat, &mn,
+ &mb, (unsigned char **) &mhints);
+ if (mhints)
+ {
+ if (mhints->flags & MWM_HINTS_DECORATIONS)
+ olddecor = mhints->decorations;
+ if (mhints->flags & MWM_HINTS_FUNCTIONS)
+ oldfuncs = mhints->functions;
+ XFree(mhints);
+ }
+ }
+
+ memset(&vo_MotifWmHints, 0, sizeof(MotifWmHints));
+ vo_MotifWmHints.flags =
+ MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS;
+ if (d)
+ {
+ vo_MotifWmHints.functions = oldfuncs;
+ d = olddecor;
+ }
+#if 0
+ vo_MotifWmHints.decorations =
+ d | ((vo_fsmode & 2) ? 0 : MWM_DECOR_MENU);
+#else
+ vo_MotifWmHints.decorations =
+ d | ((vo_fsmode & 2) ? MWM_DECOR_MENU : 0);
+#endif
+ XChangeProperty(vo_Display, w, vo_MotifHints, vo_MotifHints, 32,
+ PropModeReplace,
+ (unsigned char *) &vo_MotifWmHints,
+ (vo_fsmode & 4) ? 4 : 5);
+ }
+}
+
+void vo_x11_classhint(Display * display, Window window, const char *name)
+{
+ XClassHint wmClass;
+ pid_t pid = getpid();
+ long prop = pid & 0x7FFFFFFF;
+
+ wmClass.res_name = vo_winname ? vo_winname : name;
+ wmClass.res_class = "MPlayer";
+ XSetClassHint(display, window, &wmClass);
+
+ /* PID sizes other than 32-bit are not handled by the EWMH spec */
+ if ((pid_t)prop != pid)
+ return;
+
+ XChangeProperty(display, window, XA_NET_WM_PID, XA_CARDINAL, 32,
+ PropModeReplace, (unsigned char *)&prop, 1);
+}
+
+Window vo_window = None;
+GC vo_gc = None;
+GC f_gc = None;
+XSizeHints vo_hint;
+
+void vo_x11_uninit(void)
+{
+ saver_on(mDisplay);
+ if (vo_window != None)
+ vo_showcursor(mDisplay, vo_window);
+
+ if (f_gc != None)
+ {
+ XFreeGC(mDisplay, f_gc);
+ f_gc = None;
+ }
+ {
+ if (vo_gc != None)
+ {
+ XFreeGC(mDisplay, vo_gc);
+ vo_gc = None;
+ }
+ if (vo_window != None)
+ {
+ XClearWindow(mDisplay, vo_window);
+ if (WinID < 0 && vo_window != mRootWin)
+ {
+ XEvent xev;
+
+ XUnmapWindow(mDisplay, vo_window);
+ XSelectInput(mDisplay, vo_window, StructureNotifyMask);
+ XDestroyWindow(mDisplay, vo_window);
+ do
+ {
+ XNextEvent(mDisplay, &xev);
+ }
+ while (xev.type != DestroyNotify
+ || xev.xdestroywindow.event != vo_window);
+ }
+ vo_window = None;
+ }
+ vo_fs = 0;
+ vo_old_width = vo_old_height = 0;
+ }
+}
+
+static unsigned int mouse_timer;
+static int mouse_waiting_hide;
+
+static int check_resize(void)
+{
+ int old_w = vo_dwidth, old_h = vo_dheight;
+ int old_x = vo_dx, old_y = vo_dy;
+ int rc = 0;
+ vo_x11_update_geometry();
+ if (vo_dwidth != old_w || vo_dheight != old_h)
+ rc |= VO_EVENT_RESIZE;
+ if (vo_dx != old_x || vo_dy != old_y)
+ rc |= VO_EVENT_MOVE;
+ return rc;
+}
+
+static int to_utf8(const uint8_t *in)
+{
+ uint32_t v = 0;
+ GET_UTF8(v, *in++, goto err;)
+ if (*in || v >= KEY_BASE)
+ goto err;
+ return v;
+err:
+ return 0;
+}
+
+static void fixup_ctrl_state(int *ctrl_state, int state)
+{
+ // Attempt to fix if somehow our state got out of
+ // sync with reality.
+ // This usually happens when a shortcut involving CTRL
+ // was used to switch to a different window/workspace.
+ if (*ctrl_state != !!(state & 4)) {
+ *ctrl_state = !!(state & 4);
+ mplayer_put_key(KEY_CTRL |
+ (*ctrl_state ? MP_KEY_DOWN : 0));
+ }
+}
+
+static int handle_x11_event(Display *mydisplay, XEvent *event)
+{
+ int key = 0;
+ uint8_t buf[16] = {0};
+ KeySym keySym;
+ static XComposeStatus stat;
+ static int ctrl_state;
+#ifdef CONFIG_GUI
+ if (use_gui)
+ {
+ gui(GUI_HANDLE_X_EVENT, event);
+ if (vo_window != event->xany.window)
+ return 0;
+ }
+#endif
+ switch (event->type)
+ {
+ case Expose:
+ return VO_EVENT_EXPOSE;
+ case ConfigureNotify:
+ if (vo_window == None)
+ break;
+ return check_resize();
+ case KeyPress:
+ case KeyRelease:
+ {
+ int key, utf8;
+
+#ifdef CONFIG_GUI
+ if ( use_gui ) { break; }
+#endif
+
+ XLookupString(&event->xkey, buf, sizeof(buf), &keySym,
+ &stat);
+ key =
+ ((keySym & 0xff00) !=
+ 0 ? ((keySym & 0x00ff) + 256) : (keySym));
+ utf8 = buf[0] > 0xc0 ? to_utf8(buf) : 0;
+ if (utf8) key = 0;
+ if (key == wsLeftCtrl || key == wsRightCtrl) {
+ ctrl_state = event->type == KeyPress;
+ mplayer_put_key(KEY_CTRL |
+ (ctrl_state ? MP_KEY_DOWN : 0));
+ } else if (event->type == KeyRelease) {
+ break;
+ }
+ fixup_ctrl_state(&ctrl_state, event->xkey.state);
+ if (!vo_x11_putkey_ext(keySym)) {
+ if (utf8) mplayer_put_key(utf8);
+ else vo_x11_putkey(key);
+ }
+ return VO_EVENT_KEYPRESS;
+ }
+ break;
+ case MotionNotify:
+ vo_mouse_movement(event->xmotion.x, event->xmotion.y);
+
+ return VO_EVENT_MOUSE;
+ case ButtonPress:
+ key = MP_KEY_DOWN;
+ /* Fallthrough, treat like release otherwise */
+ case ButtonRelease:
+ fixup_ctrl_state(&ctrl_state, event->xbutton.state);
+#ifdef CONFIG_GUI
+ // Ignore mouse button 1-3 under GUI.
+ if (use_gui && (event->xbutton.button >= 1)
+ && (event->xbutton.button <= 3))
+ return VO_EVENT_MOUSE;
+#endif
+ key |= MOUSE_BTN0 + event->xbutton.button - 1;
+ mplayer_put_key(key);
+ return VO_EVENT_MOUSE;
+ case PropertyNotify:
+ {
+ char *name =
+ XGetAtomName(mydisplay, event->xproperty.atom);
+
+ if (!name)
+ break;
+
+ XFree(name);
+ }
+ break;
+ case MapNotify:
+ if (WinID < 0) {
+ vo_hint.win_gravity = old_gravity;
+ XSetWMNormalHints(mDisplay, vo_window, &vo_hint);
+ vo_fs_flip = 0;
+ }
+ break;
+ case DestroyNotify:
+ mp_msg(MSGT_VO, MSGL_WARN, MSGTR_WindowDestroyed);
+ mplayer_put_key(KEY_CLOSE_WIN);
+ break;
+ case ClientMessage:
+ if (event->xclient.message_type == XAWM_PROTOCOLS &&
+ event->xclient.data.l[0] == XAWM_DELETE_WINDOW)
+ mplayer_put_key(KEY_CLOSE_WIN);
+ break;
+ }
+ return 0;
+}
+
+int vo_x11_check_events(Display * mydisplay)
+{
+ int ret = 0;
+ XEvent Event;
+
+ if (vo_mouse_autohide && mouse_waiting_hide &&
+ (GetTimerMS() - mouse_timer >= 1000)) {
+ vo_hidecursor(mydisplay, vo_window);
+ mouse_waiting_hide = 0;
+ }
+
+ if (WinID > 0)
+ ret |= check_resize();
+ while (XPending(mydisplay))
+ {
+ XNextEvent(mydisplay, &Event);
+ ret |= handle_x11_event(mydisplay, &Event);
+ }
+ if (vo_mouse_autohide && (ret & VO_EVENT_MOUSE))
+ {
+ vo_showcursor(mydisplay, vo_window);
+ mouse_waiting_hide = 1;
+ mouse_timer = GetTimerMS();
+ }
+ return ret;
+}
+
+static void vo_x11_update_fs_borders(void)
+{
+ if (!vo_fs)
+ return;
+ if (vo_dwidth <= vo_fs_border_l + vo_fs_border_r ||
+ vo_dheight <= vo_fs_border_t + vo_fs_border_b) {
+ mp_msg(MSGT_VO, MSGL_ERR, "[x11] borders too wide, ignored.\n");
+ return;
+ }
+ vo_dwidth -= vo_fs_border_l + vo_fs_border_r;
+ vo_dheight -= vo_fs_border_t + vo_fs_border_b;
+}
+
+/**
+ * \brief sets the size and position of the non-fullscreen window.
+ */
+void vo_x11_nofs_sizepos(int x, int y, int width, int height)
+{
+ vo_x11_sizehint(x, y, width, height, 0);
+ if (vo_fs) {
+ vo_old_x = x;
+ vo_old_y = y;
+ vo_old_width = width;
+ vo_old_height = height;
+ }
+ else
+ {
+ vo_dwidth = width;
+ vo_dheight = height;
+ XMoveResizeWindow(mDisplay, vo_window, x, y, width, height);
+ }
+}
+
+void vo_x11_sizehint(int x, int y, int width, int height, int max)
+{
+ vo_hint.flags = 0;
+ if (vo_keepaspect)
+ {
+ vo_hint.flags |= PAspect;
+ vo_hint.min_aspect.x = width;
+ vo_hint.min_aspect.y = height;
+ vo_hint.max_aspect.x = width;
+ vo_hint.max_aspect.y = height;
+ }
+
+ vo_hint.flags |= PPosition | PSize;
+ vo_hint.x = x;
+ vo_hint.y = y;
+ vo_hint.width = width;
+ vo_hint.height = height;
+ if (max)
+ {
+ vo_hint.flags |= PMaxSize;
+ vo_hint.max_width = width;
+ vo_hint.max_height = height;
+ } else
+ {
+ vo_hint.max_width = 0;
+ vo_hint.max_height = 0;
+ }
+
+ // Set minimum height/width to 4 to avoid off-by-one errors
+ // and because mga_vid requires a minimal size of 4 pixels.
+ vo_hint.flags |= PMinSize;
+ vo_hint.min_width = vo_hint.min_height = 4;
+
+ // Set the base size. A window manager might display the window
+ // size to the user relative to this.
+ // Setting these to width/height might be nice, but e.g. fluxbox can't handle it.
+ vo_hint.flags |= PBaseSize;
+ vo_hint.base_width = 0 /*width*/;
+ vo_hint.base_height = 0 /*height*/;
+
+ vo_hint.flags |= PWinGravity;
+ vo_hint.win_gravity = StaticGravity;
+ XSetWMNormalHints(mDisplay, vo_window, &vo_hint);
+}
+
+static int vo_x11_get_gnome_layer(Display * mDisplay, Window win)
+{
+ Atom type;
+ int format;
+ unsigned long nitems;
+ unsigned long bytesafter;
+ unsigned short *args = NULL;
+
+ if (XGetWindowProperty(mDisplay, win, XA_WIN_LAYER, 0, 16384,
+ False, AnyPropertyType, &type, &format, &nitems,
+ &bytesafter,
+ (unsigned char **) &args) == Success
+ && nitems > 0 && args)
+ {
+ mp_msg(MSGT_VO, MSGL_V, "[x11] original window layer is %d.\n",
+ *args);
+ return *args;
+ }
+ return WIN_LAYER_NORMAL;
+}
+
+//
+Window vo_x11_create_smooth_window(Display * mDisplay, Window mRoot,
+ Visual * vis, int x, int y,
+ unsigned int width, unsigned int height,
+ int depth, Colormap col_map)
+{
+ unsigned long xswamask = CWBorderPixel;
+ XSetWindowAttributes xswa;
+ Window ret_win;
+
+ if (col_map != CopyFromParent)
+ {
+ xswa.colormap = col_map;
+ xswamask |= CWColormap;
+ }
+ xswa.background_pixel = 0;
+ xswa.border_pixel = 0;
+ xswa.backing_store = NotUseful;
+ xswa.bit_gravity = StaticGravity;
+
+ ret_win =
+ XCreateWindow(mDisplay, mRoot, x, y, width, height, 0, depth,
+ CopyFromParent, vis, xswamask, &xswa);
+ XSetWMProtocols(mDisplay, ret_win, &XAWM_DELETE_WINDOW, 1);
+ if (f_gc == None)
+ f_gc = XCreateGC(mDisplay, ret_win, 0, 0);
+ XSetForeground(mDisplay, f_gc, 0);
+
+ return ret_win;
+}
+
+/**
+ * \brief create and setup a window suitable for display
+ * \param vis Visual to use for creating the window
+ * \param x x position of window
+ * \param y y position of window
+ * \param width width of window
+ * \param height height of window
+ * \param flags flags for window creation.
+ * Only VOFLAG_FULLSCREEN is supported so far.
+ * \param col_map Colourmap for window or CopyFromParent if a specific colormap isn't needed
+ * \param classname name to use for the classhint
+ * \param title title for the window
+ *
+ * This also does the grunt-work like setting Window Manager hints etc.
+ * If vo_window is already set it just moves and resizes it.
+ */
+void vo_x11_create_vo_window(XVisualInfo *vis, int x, int y,
+ unsigned int width, unsigned int height, int flags,
+ Colormap col_map,
+ const char *classname, const char *title)
+{
+ if (flags & VOFLAG_HIDDEN) {
+ // unmapped windows cause lots of issues, in particular
+ // -geometry might be ignore when finally mapping them etc.
+ if (vo_window == None)
+ vo_window = mRootWin;
+ window_state = VOFLAG_HIDDEN;
+ goto final;
+ } else if (vo_window == mRootWin && (window_state & VOFLAG_HIDDEN)) {
+ vo_window = None;
+ }
+ if (vo_wintitle)
+ title = vo_wintitle;
+ if (WinID >= 0) {
+ vo_fs = flags & VOFLAG_FULLSCREEN;
+ vo_window = WinID ? (Window)WinID : mRootWin;
+ if (col_map != CopyFromParent) {
+ unsigned long xswamask = CWColormap;
+ XSetWindowAttributes xswa;
+ xswa.colormap = col_map;
+ XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa);
+ XInstallColormap(mDisplay, col_map);
+ }
+ if (WinID) {
+ // Expose events can only really be handled by us, so request them.
+ // Do not remove existing masks so GUI keeps working.
+ XWindowAttributes attribs;
+ XGetWindowAttributes(mDisplay, vo_window, &attribs);
+ vo_x11_selectinput_witherr(mDisplay, vo_window,
+ attribs.your_event_mask | ExposureMask);
+ } else
+ // Do not capture events since it might break the parent application
+ // if it relies on events being forwarded to the parent of WinID.
+ // It also is consistent with the w32_common.c code.
+ vo_x11_selectinput_witherr(mDisplay, vo_window,
+ StructureNotifyMask | KeyPressMask | KeyReleaseMask | PointerMotionMask |
+ ButtonPressMask | ButtonReleaseMask | ExposureMask);
+
+ vo_x11_update_geometry();
+ goto final;
+ }
+ if (vo_window == None) {
+ vo_fs = 0;
+ vo_dwidth = width;
+ vo_dheight = height;
+ vo_x11_update_fs_borders();
+ vo_window = vo_x11_create_smooth_window(mDisplay, mRootWin, vis->visual,
+ x, y, width, height, vis->depth, col_map);
+ window_state = VOFLAG_HIDDEN;
+ }
+ XStoreName(mDisplay, vo_window, title);
+ XChangeProperty(mDisplay, vo_window, XA_NET_WM_NAME, XAUTF8_STRING,
+ 8, PropModeReplace, title, strlen(title));
+ if (window_state & VOFLAG_HIDDEN) {
+ XSizeHints hint;
+ XEvent xev;
+ window_state &= ~VOFLAG_HIDDEN;
+ vo_x11_classhint(mDisplay, vo_window, classname);
+ vo_hidecursor(mDisplay, vo_window);
+ XSelectInput(mDisplay, vo_window, StructureNotifyMask);
+ hint.x = x; hint.y = y;
+ hint.width = width; hint.height = height;
+ hint.flags = PSize;
+ if (geometry_xy_changed)
+ hint.flags |= PPosition;
+ XSetStandardProperties(mDisplay, vo_window, title, title, None, NULL, 0, &hint);
+ if (!vo_border) vo_x11_decoration(mDisplay, vo_window, 0);
+ // map window
+ XMapWindow(mDisplay, vo_window);
+ // wait for map
+ do {
+ XNextEvent(mDisplay, &xev);
+ handle_x11_event(mDisplay, &xev);
+ } while (xev.type != MapNotify || xev.xmap.event != vo_window);
+ vo_x11_clearwindow(mDisplay, vo_window);
+ vo_x11_selectinput_witherr(mDisplay, vo_window,
+ StructureNotifyMask | KeyPressMask | KeyReleaseMask | PointerMotionMask |
+ ButtonPressMask | ButtonReleaseMask | ExposureMask);
+ }
+ if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
+ if (!geometry_xy_changed)
+ vo_x11_update_geometry();
+ vo_x11_nofs_sizepos(vo_dx, vo_dy, width, height);
+ if (!!vo_fs != !!(flags & VOFLAG_FULLSCREEN))
+ vo_x11_fullscreen();
+ else if (vo_fs) {
+ // if we are already in fullscreen do not switch back and forth, just
+ // set the size values right.
+ vo_dwidth = vo_screenwidth;
+ vo_dheight = vo_screenheight;
+ vo_x11_update_fs_borders();
+ }
+final:
+ if (vo_gc != None)
+ XFreeGC(mDisplay, vo_gc);
+ vo_gc = XCreateGC(mDisplay, vo_window, 0, NULL);
+
+ XSync(mDisplay, False);
+ vo_mouse_autohide = 1;
+}
+
+void vo_x11_clearwindow_part(Display * mDisplay, Window vo_window,
+ int img_width, int img_height, int use_fs)
+{
+ int u_dheight, u_dwidth, left_ov, left_ov2;
+
+ if (f_gc == None)
+ return;
+
+ u_dheight = use_fs ? vo_screenheight : vo_dheight;
+ u_dwidth = use_fs ? vo_screenwidth : vo_dwidth;
+ if ((u_dheight <= img_height) && (u_dwidth <= img_width))
+ return;
+
+ left_ov = (u_dheight - img_height) / 2;
+ left_ov2 = (u_dwidth - img_width) / 2;
+
+ XFillRectangle(mDisplay, vo_window, f_gc, 0, 0, u_dwidth, left_ov);
+ XFillRectangle(mDisplay, vo_window, f_gc, 0, u_dheight - left_ov - 1,
+ u_dwidth, left_ov + 1);
+
+ if (u_dwidth > img_width)
+ {
+ XFillRectangle(mDisplay, vo_window, f_gc, 0, left_ov, left_ov2,
+ img_height);
+ XFillRectangle(mDisplay, vo_window, f_gc, u_dwidth - left_ov2 - 1,
+ left_ov, left_ov2 + 1, img_height);
+ }
+
+ XFlush(mDisplay);
+}
+
+void vo_x11_clearwindow(Display * mDisplay, Window vo_window)
+{
+ if (f_gc == None)
+ return;
+ XFillRectangle(mDisplay, vo_window, f_gc, 0, 0, vo_screenwidth,
+ vo_screenheight);
+ //
+ XFlush(mDisplay);
+}
+
+
+void vo_x11_setlayer(Display * mDisplay, Window vo_window, int layer)
+{
+ if (WinID >= 0)
+ return;
+
+ if (vo_fs_type & vo_wm_LAYER)
+ {
+ XClientMessageEvent xev;
+
+ if (!orig_layer)
+ orig_layer = vo_x11_get_gnome_layer(mDisplay, vo_window);
+
+ memset(&xev, 0, sizeof(xev));
+ xev.type = ClientMessage;
+ xev.display = mDisplay;
+ xev.window = vo_window;
+ xev.message_type = XA_WIN_LAYER;
+ xev.format = 32;
+ xev.data.l[0] = layer ? fs_layer : orig_layer; // if not fullscreen, stay on default layer
+ xev.data.l[1] = CurrentTime;
+ mp_msg(MSGT_VO, MSGL_V,
+ "[x11] Layered style stay on top (layer %ld).\n",
+ xev.data.l[0]);
+ XSendEvent(mDisplay, mRootWin, False, SubstructureNotifyMask,
+ (XEvent *) & xev);
+ } else if (vo_fs_type & vo_wm_NETWM)
+ {
+ XClientMessageEvent xev;
+ char *state;
+
+ memset(&xev, 0, sizeof(xev));
+ xev.type = ClientMessage;
+ xev.message_type = XA_NET_WM_STATE;
+ xev.display = mDisplay;
+ xev.window = vo_window;
+ xev.format = 32;
+ xev.data.l[0] = layer;
+
+ if (vo_fs_type & vo_wm_STAYS_ON_TOP)
+ xev.data.l[1] = XA_NET_WM_STATE_STAYS_ON_TOP;
+ else if (vo_fs_type & vo_wm_ABOVE)
+ xev.data.l[1] = XA_NET_WM_STATE_ABOVE;
+ else if (vo_fs_type & vo_wm_FULLSCREEN)
+ xev.data.l[1] = XA_NET_WM_STATE_FULLSCREEN;
+ else if (vo_fs_type & vo_wm_BELOW)
+ // This is not fallback. We can safely assume that the situation
+ // where only NETWM_STATE_BELOW is supported doesn't exist.
+ xev.data.l[1] = XA_NET_WM_STATE_BELOW;
+
+ XSendEvent(mDisplay, mRootWin, False, SubstructureRedirectMask,
+ (XEvent *) & xev);
+ state = XGetAtomName(mDisplay, xev.data.l[1]);
+ mp_msg(MSGT_VO, MSGL_V,
+ "[x11] NET style stay on top (layer %d). Using state %s.\n",
+ layer, state);
+ XFree(state);
+ }
+}
+
+static int vo_x11_get_fs_type(int supported)
+{
+ int i;
+ int type = supported;
+
+ if (vo_fstype_list)
+ {
+ for (i = 0; vo_fstype_list[i]; i++)
+ {
+ int neg = 0;
+ char *arg = vo_fstype_list[i];
+
+ if (vo_fstype_list[i][0] == '-')
+ {
+ neg = 1;
+ arg = vo_fstype_list[i] + 1;
+ }
+
+ if (!strncmp(arg, "layer", 5))
+ {
+ if (!neg && (arg[5] == '='))
+ {
+ char *endptr = NULL;
+ int layer = strtol(vo_fstype_list[i] + 6, &endptr, 10);
+
+ if (endptr && *endptr == '\0' && layer >= 0
+ && layer <= 15)
+ fs_layer = layer;
+ }
+ if (neg)
+ type &= ~vo_wm_LAYER;
+ else
+ type |= vo_wm_LAYER;
+ } else if (!strcmp(arg, "above"))
+ {
+ if (neg)
+ type &= ~vo_wm_ABOVE;
+ else
+ type |= vo_wm_ABOVE;
+ } else if (!strcmp(arg, "fullscreen"))
+ {
+ if (neg)
+ type &= ~vo_wm_FULLSCREEN;
+ else
+ type |= vo_wm_FULLSCREEN;
+ } else if (!strcmp(arg, "stays_on_top"))
+ {
+ if (neg)
+ type &= ~vo_wm_STAYS_ON_TOP;
+ else
+ type |= vo_wm_STAYS_ON_TOP;
+ } else if (!strcmp(arg, "below"))
+ {
+ if (neg)
+ type &= ~vo_wm_BELOW;
+ else
+ type |= vo_wm_BELOW;
+ } else if (!strcmp(arg, "netwm"))
+ {
+ if (neg)
+ type &= ~vo_wm_NETWM;
+ else
+ type |= vo_wm_NETWM;
+ } else if (!strcmp(arg, "none"))
+ type = 0; // clear; keep parsing
+ }
+ }
+
+ return type;
+}
+
+/**
+ * \brief update vo_dx, vo_dy, vo_dwidth and vo_dheight with current values of vo_window
+ * \return returns current color depth of vo_window
+ */
+int vo_x11_update_geometry(void) {
+ unsigned depth, w = 0, h = 0;
+ int dummy_int;
+ Window dummy_win;
+ XGetGeometry(mDisplay, vo_window, &dummy_win, &dummy_int, &dummy_int,
+ &w, &h, &dummy_int, &depth);
+ if (w > 0 && h > 0 && w <= INT_MAX && h <= INT_MAX) {
+ vo_dwidth = w;
+ vo_dheight = h;
+ vo_x11_update_fs_borders();
+ }
+ // ensure minimum value of 1, to avoid e.g. division by 0.
+ if (vo_dwidth <= 0) vo_dwidth = 1;
+ if (vo_dheight <= 0) vo_dheight = 1;
+ XTranslateCoordinates(mDisplay, vo_window, mRootWin, 0, 0, &vo_dx, &vo_dy,
+ &dummy_win);
+
+ return depth <= INT_MAX ? depth : 0;
+}
+
+void vo_x11_fullscreen(void)
+{
+ int x, y, w, h;
+ x = vo_old_x;
+ y = vo_old_y;
+ w = vo_old_width;
+ h = vo_old_height;
+
+ if (WinID >= 0) {
+ vo_fs = !vo_fs;
+ return;
+ }
+ if (vo_fs_flip)
+ return;
+
+ if (vo_fs)
+ {
+ vo_x11_ewmh_fullscreen(vo_window, _NET_WM_STATE_REMOVE); // removes fullscreen state if wm supports EWMH
+ vo_fs = VO_FALSE;
+ } else
+ {
+ // win->fs
+ vo_x11_ewmh_fullscreen(vo_window, _NET_WM_STATE_ADD); // sends fullscreen state to be added if wm supports EWMH
+
+ vo_fs = VO_TRUE;
+ if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs
+ {
+ vo_old_x = vo_dx;
+ vo_old_y = vo_dy;
+ vo_old_width = vo_dwidth;
+ vo_old_height = vo_dheight;
+ }
+ update_xinerama_info();
+ x = xinerama_x;
+ y = xinerama_y;
+ w = vo_screenwidth;
+ h = vo_screenheight;
+ }
+ {
+ long dummy;
+
+ XGetWMNormalHints(mDisplay, vo_window, &vo_hint, &dummy);
+ if (!(vo_hint.flags & PWinGravity))
+ old_gravity = NorthWestGravity;
+ else
+ old_gravity = vo_hint.win_gravity;
+ }
+ if (vo_wm_type == 0 && !(vo_fsmode & 16))
+ {
+ XUnmapWindow(mDisplay, vo_window); // required for MWM
+ XWithdrawWindow(mDisplay, vo_window, mScreen);
+ vo_fs_flip = 1;
+ }
+
+ if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs
+ {
+ vo_x11_decoration(mDisplay, vo_window, vo_border && !vo_fs);
+ vo_x11_sizehint(x, y, w, h, 0);
+ vo_x11_setlayer(mDisplay, vo_window, vo_fs);
+
+
+ XMoveResizeWindow(mDisplay, vo_window, x, y, w, h);
+ }
+ /* some WMs lose ontop after fullscreen */
+ if ((!(vo_fs)) & vo_ontop)
+ vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
+
+ XMapRaised(mDisplay, vo_window);
+ if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // some WMs change window pos on map
+ XMoveResizeWindow(mDisplay, vo_window, x, y, w, h);
+ XRaiseWindow(mDisplay, vo_window);
+ XFlush(mDisplay);
+}
+
+void vo_x11_ontop(void)
+{
+ vo_ontop = (!(vo_ontop));
+
+ vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
+}
+
+void vo_x11_border(void)
+{
+ vo_border = !vo_border;
+ vo_x11_decoration(mDisplay, vo_window, vo_border && !vo_fs);
+}
+
+/*
+ * XScreensaver stuff
+ */
+
+static int screensaver_off;
+static unsigned int time_last;
+
+void xscreensaver_heartbeat(void)
+{
+ unsigned int time = GetTimerMS();
+
+ if (mDisplay && screensaver_off && (time - time_last) > 30000)
+ {
+ time_last = time;
+
+ XResetScreenSaver(mDisplay);
+ }
+}
+
+static int xss_suspend(Bool suspend)
+{
+#ifndef CONFIG_XSS
+ return 0;
+#else
+ int event, error, major, minor;
+ if (XScreenSaverQueryExtension(mDisplay, &event, &error) != True ||
+ XScreenSaverQueryVersion(mDisplay, &major, &minor) != True)
+ return 0;
+ if (major < 1 || (major == 1 && minor < 1))
+ return 0;
+ XScreenSaverSuspend(mDisplay, suspend);
+ return 1;
+#endif
+}
+
+/*
+ * End of XScreensaver stuff
+ */
+
+void saver_on(Display * mDisplay)
+{
+
+ if (!screensaver_off)
+ return;
+ screensaver_off = 0;
+ if (xss_suspend(False))
+ return;
+#ifdef CONFIG_XDPMS
+ if (dpms_disabled)
+ {
+ int nothing;
+ if (DPMSQueryExtension(mDisplay, ¬hing, ¬hing))
+ {
+ if (!DPMSEnable(mDisplay))
+ { // restoring power saving settings
+ mp_msg(MSGT_VO, MSGL_WARN, MSGTR_DPMSnotAvailable);
+ } else
+ {
+ // DPMS does not seem to be enabled unless we call DPMSInfo
+ BOOL onoff;
+ CARD16 state;
+
+ DPMSForceLevel(mDisplay, DPMSModeOn);
+ DPMSInfo(mDisplay, &state, &onoff);
+ if (onoff)
+ {
+ mp_msg(MSGT_VO, MSGL_V,
+ "Successfully enabled DPMS\n");
+ } else
+ {
+ mp_msg(MSGT_VO, MSGL_WARN, MSGTR_DPMSnotEnabled);
+ }
+ }
+ }
+ dpms_disabled = 0;
+ }
+#endif
+}
+
+void saver_off(Display * mDisplay)
+{
+ int nothing;
+
+ if (!stop_xscreensaver || screensaver_off)
+ return;
+ screensaver_off = 1;
+ if (xss_suspend(True))
+ return;
+#ifdef CONFIG_XDPMS
+ if (DPMSQueryExtension(mDisplay, ¬hing, ¬hing))
+ {
+ BOOL onoff;
+ CARD16 state;
+
+ DPMSInfo(mDisplay, &state, &onoff);
+ if (onoff)
+ {
+ Status stat;
+
+ mp_msg(MSGT_VO, MSGL_V, "Disabling DPMS\n");
+ dpms_disabled = 1;
+ stat = DPMSDisable(mDisplay); // monitor powersave off
+ mp_msg(MSGT_VO, MSGL_V, "DPMSDisable stat: %d\n", stat);
+ }
+ }
+#endif
+}
+
+static XErrorHandler old_handler = NULL;
+static int selectinput_err = 0;
+static int x11_selectinput_errorhandler(Display * display,
+ XErrorEvent * event)
+{
+ if (event->error_code == BadAccess)
+ {
+ selectinput_err = 1;
+ mp_msg(MSGT_VO, MSGL_ERR,
+ MSGTR_BadAccessXSelectInput);
+ mp_msg(MSGT_VO, MSGL_ERR,
+ MSGTR_ButtonPressMaskInUse);
+ /* If you think MPlayer should shutdown with this error,
+ * comment out the following line */
+ return 0;
+ }
+ if (old_handler != NULL)
+ old_handler(display, event);
+ else
+ x11_errorhandler(display, event);
+ return 0;
+}
+
+void vo_x11_selectinput_witherr(Display * display, Window w,
+ long event_mask)
+{
+ XSync(display, False);
+ old_handler = XSetErrorHandler(x11_selectinput_errorhandler);
+ selectinput_err = 0;
+ if (vo_nomouse_input)
+ {
+ XSelectInput(display, w,
+ event_mask &
+ (~(ButtonPressMask | ButtonReleaseMask)));
+ } else
+ {
+ XSelectInput(display, w, event_mask);
+ }
+ XSync(display, False);
+ XSetErrorHandler(old_handler);
+ if (selectinput_err)
+ {
+ mp_msg(MSGT_VO, MSGL_ERR,
+ MSGTR_DiscardMouseControl);
+ XSelectInput(display, w,
+ event_mask &
+ (~
+ (ButtonPressMask | ButtonReleaseMask |
+ PointerMotionMask)));
+ }
+}
+
+#ifdef CONFIG_XF86VM
+void vo_vm_switch(void)
+{
+ int vm_event, vm_error;
+ int vm_ver, vm_rev;
+ int i, j, have_vm = 0;
+ int X = vo_dwidth, Y = vo_dheight;
+ int modeline_width, modeline_height;
+
+ if (XF86VidModeQueryExtension(mDisplay, &vm_event, &vm_error))
+ {
+ XF86VidModeQueryVersion(mDisplay, &vm_ver, &vm_rev);
+ mp_msg(MSGT_VO, MSGL_V, "XF86VidMode extension v%i.%i\n", vm_ver,
+ vm_rev);
+ have_vm = 1;
+ } else {
+ mp_msg(MSGT_VO, MSGL_WARN,
+ MSGTR_NoXF86VidModeExtension);
+ }
+
+ if (have_vm)
+ {
+ if (vidmodes == NULL)
+ XF86VidModeGetAllModeLines(mDisplay, mScreen, &modecount,
+ &vidmodes);
+ j = 0;
+ modeline_width = vidmodes[0]->hdisplay;
+ modeline_height = vidmodes[0]->vdisplay;
+
+ for (i = 1; i < modecount; i++)
+ if ((vidmodes[i]->hdisplay >= X)
+ && (vidmodes[i]->vdisplay >= Y))
+ if ((vidmodes[i]->hdisplay <= modeline_width)
+ && (vidmodes[i]->vdisplay <= modeline_height))
+ {
+ modeline_width = vidmodes[i]->hdisplay;
+ modeline_height = vidmodes[i]->vdisplay;
+ j = i;
+ }
+
+ mp_msg(MSGT_VO, MSGL_INFO, MSGTR_SelectedVideoMode,
+ modeline_width, modeline_height, X, Y);
+ XF86VidModeLockModeSwitch(mDisplay, mScreen, 0);
+ XF86VidModeSwitchToMode(mDisplay, mScreen, vidmodes[j]);
+ XF86VidModeSwitchToMode(mDisplay, mScreen, vidmodes[j]);
+
+ // FIXME: all this is more of a hack than proper solution
+ X = (vo_screenwidth - modeline_width) / 2;
+ Y = (vo_screenheight - modeline_height) / 2;
+ XF86VidModeSetViewPort(mDisplay, mScreen, X, Y);
+ vo_dx = X;
+ vo_dy = Y;
+ vo_dwidth = modeline_width;
+ vo_dheight = modeline_height;
+ aspect_save_screenres(modeline_width, modeline_height);
+ }
+}
+
+void vo_vm_close(void)
+{
+ if (vidmodes != NULL)
+ {
+ int i;
+
+ free(vidmodes);
+ vidmodes = NULL;
+ XF86VidModeGetAllModeLines(mDisplay, mScreen, &modecount,
+ &vidmodes);
+ for (i = 0; i < modecount; i++)
+ if ((vidmodes[i]->hdisplay == vo_screenwidth)
+ && (vidmodes[i]->vdisplay == vo_screenheight))
+ {
+ mp_msg(MSGT_VO, MSGL_INFO,
+ MSGTR_ReturningOriginalMode,
+ vo_screenwidth, vo_screenheight);
+ break;
+ }
+
+ XF86VidModeSwitchToMode(mDisplay, mScreen, vidmodes[i]);
+ XF86VidModeSwitchToMode(mDisplay, mScreen, vidmodes[i]);
+ free(vidmodes);
+ vidmodes = NULL;
+ modecount = 0;
+ }
+}
+#endif
+
+
+/*
+ * Scan the available visuals on this Display/Screen. Try to find
+ * the 'best' available TrueColor visual that has a decent color
+ * depth (at least 15bit). If there are multiple visuals with depth
+ * >= 15bit, we prefer visuals with a smaller color depth.
+ */
+int vo_find_depth_from_visuals(Display * dpy, int screen,
+ Visual ** visual_return)
+{
+ XVisualInfo visual_tmpl;
+ XVisualInfo *visuals;
+ int nvisuals, i;
+ int bestvisual = -1;
+ int bestvisual_depth = -1;
+
+ visual_tmpl.screen = screen;
+ visual_tmpl.class = TrueColor;
+ visuals = XGetVisualInfo(dpy,
+ VisualScreenMask | VisualClassMask,
+ &visual_tmpl, &nvisuals);
+ if (visuals != NULL)
+ {
+ for (i = 0; i < nvisuals; i++)
+ {
+ mp_msg(MSGT_VO, MSGL_V,
+ "vo: X11 truecolor visual %#lx, depth %d, R:%lX G:%lX B:%lX\n",
+ visuals[i].visualid, visuals[i].depth,
+ visuals[i].red_mask, visuals[i].green_mask,
+ visuals[i].blue_mask);
+ /*
+ * Save the visual index and its depth, if this is the first
+ * truecolor visual, or a visual that is 'preferred' over the
+ * previous 'best' visual.
+ */
+ if (bestvisual_depth == -1
+ || (visuals[i].depth >= 15
+ && (visuals[i].depth < bestvisual_depth
+ || bestvisual_depth < 15)))
+ {
+ bestvisual = i;
+ bestvisual_depth = visuals[i].depth;
+ }
+ }
+
+ if (bestvisual != -1 && visual_return != NULL)
+ *visual_return = visuals[bestvisual].visual;
+
+ XFree(visuals);
+ }
+ return bestvisual_depth;
+}
+
+
+static Colormap cmap = None;
+static XColor cols[256];
+static int cm_size, red_mask, green_mask, blue_mask;
+
+
+Colormap vo_x11_create_colormap(XVisualInfo * vinfo)
+{
+ unsigned k, r, g, b, ru, gu, bu, m, rv, gv, bv, rvu, gvu, bvu;
+
+ if (vinfo->class != DirectColor)
+ return XCreateColormap(mDisplay, mRootWin, vinfo->visual,
+ AllocNone);
+
+ /* can this function get called twice or more? */
+ if (cmap)
+ return cmap;
+ cm_size = vinfo->colormap_size;
+ red_mask = vinfo->red_mask;
+ green_mask = vinfo->green_mask;
+ blue_mask = vinfo->blue_mask;
+ ru = (red_mask & (red_mask - 1)) ^ red_mask;
+ gu = (green_mask & (green_mask - 1)) ^ green_mask;
+ bu = (blue_mask & (blue_mask - 1)) ^ blue_mask;
+ rvu = 65536ull * ru / (red_mask + ru);
+ gvu = 65536ull * gu / (green_mask + gu);
+ bvu = 65536ull * bu / (blue_mask + bu);
+ r = g = b = 0;
+ rv = gv = bv = 0;
+ m = DoRed | DoGreen | DoBlue;
+ for (k = 0; k < cm_size; k++)
+ {
+ int t;
+
+ cols[k].pixel = r | g | b;
+ cols[k].red = rv;
+ cols[k].green = gv;
+ cols[k].blue = bv;
+ cols[k].flags = m;
+ t = (r + ru) & red_mask;
+ if (t < r)
+ m &= ~DoRed;
+ r = t;
+ t = (g + gu) & green_mask;
+ if (t < g)
+ m &= ~DoGreen;
+ g = t;
+ t = (b + bu) & blue_mask;
+ if (t < b)
+ m &= ~DoBlue;
+ b = t;
+ rv += rvu;
+ gv += gvu;
+ bv += bvu;
+ }
+ cmap = XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocAll);
+ XStoreColors(mDisplay, cmap, cols, cm_size);
+ return cmap;
+}
+
+/*
+ * Via colormaps/gamma ramps we can do gamma, brightness, contrast,
+ * hue and red/green/blue intensity, but we cannot do saturation.
+ * Currently only gamma, brightness and contrast are implemented.
+ * Is there sufficient interest for hue and/or red/green/blue intensity?
+ */
+/* these values have range [-100,100] and are initially 0 */
+static int vo_gamma = 0;
+static int vo_brightness = 0;
+static int vo_contrast = 0;
+
+static int transform_color(float val,
+ float brightness, float contrast, float gamma) {
+ float s = pow(val, gamma);
+ s = (s - 0.5) * contrast + 0.5;
+ s += brightness;
+ if (s < 0)
+ s = 0;
+ if (s > 1)
+ s = 1;
+ return (unsigned short) (s * 65535);
+}
+
+uint32_t vo_x11_set_equalizer(const char *name, int value)
+{
+ float gamma, brightness, contrast;
+ float rf, gf, bf;
+ int k;
+
+ /*
+ * IMPLEMENTME: consider using XF86VidModeSetGammaRamp in the case
+ * of TrueColor-ed window but be careful:
+ * Unlike the colormaps, which are private for the X client
+ * who created them and thus automatically destroyed on client
+ * disconnect, this gamma ramp is a system-wide (X-server-wide)
+ * setting and _must_ be restored before the process exits.
+ * Unforunately when the process crashes (or gets killed
+ * for some reason) it is impossible to restore the setting,
+ * and such behaviour could be rather annoying for the users.
+ */
+ if (cmap == None)
+ return VO_NOTAVAIL;
+
+ if (!av_strcasecmp(name, "brightness"))
+ vo_brightness = value;
+ else if (!av_strcasecmp(name, "contrast"))
+ vo_contrast = value;
+ else if (!av_strcasecmp(name, "gamma"))
+ vo_gamma = value;
+ else
+ return VO_NOTIMPL;
+
+ brightness = 0.01 * vo_brightness;
+ contrast = tan(0.0095 * (vo_contrast + 100) * M_PI / 4);
+ gamma = pow(2, -0.02 * vo_gamma);
+
+ rf = (float) ((red_mask & (red_mask - 1)) ^ red_mask) / red_mask;
+ gf = (float) ((green_mask & (green_mask - 1)) ^ green_mask) /
+ green_mask;
+ bf = (float) ((blue_mask & (blue_mask - 1)) ^ blue_mask) / blue_mask;
+
+ /* now recalculate the colormap using the newly set value */
+ for (k = 0; k < cm_size; k++)
+ {
+ cols[k].red = transform_color(rf * k, brightness, contrast, gamma);
+ cols[k].green = transform_color(gf * k, brightness, contrast, gamma);
+ cols[k].blue = transform_color(bf * k, brightness, contrast, gamma);
+ }
+
+ XStoreColors(mDisplay, cmap, cols, cm_size);
+ XFlush(mDisplay);
+ return VO_TRUE;
+}
+
+uint32_t vo_x11_get_equalizer(const char *name, int *value)
+{
+ if (cmap == None)
+ return VO_NOTAVAIL;
+ if (!av_strcasecmp(name, "brightness"))
+ *value = vo_brightness;
+ else if (!av_strcasecmp(name, "contrast"))
+ *value = vo_contrast;
+ else if (!av_strcasecmp(name, "gamma"))
+ *value = vo_gamma;
+ else
+ return VO_NOTIMPL;
+ return VO_TRUE;
+}
+
+#ifdef CONFIG_XV
+int vo_xv_set_eq(uint32_t xv_port, const char *name, int value)
+{
+ XvAttribute *attributes;
+ int i, howmany, xv_atom;
+
+ mp_dbg(MSGT_VO, MSGL_V, "xv_set_eq called! (%s, %d)\n", name, value);
+
+ /* get available attributes */
+ attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany);
+ for (i = 0; i < howmany && attributes; i++)
+ if (attributes[i].flags & XvSettable)
+ {
+ xv_atom = XInternAtom(mDisplay, attributes[i].name, True);
+/* since we have SET_DEFAULTS first in our list, we can check if it's available
+ then trigger it if it's ok so that the other values are at default upon query */
+ if (xv_atom != None)
+ {
+ int hue = 0, port_value, port_min, port_max;
+
+ if (!strcmp(attributes[i].name, "XV_BRIGHTNESS") &&
+ (!av_strcasecmp(name, "brightness")))
+ port_value = value;
+ else if (!strcmp(attributes[i].name, "XV_CONTRAST") &&
+ (!av_strcasecmp(name, "contrast")))
+ port_value = value;
+ else if (!strcmp(attributes[i].name, "XV_SATURATION") &&
+ (!av_strcasecmp(name, "saturation")))
+ port_value = value;
+ else if (!strcmp(attributes[i].name, "XV_HUE") &&
+ (!av_strcasecmp(name, "hue")))
+ {
+ port_value = value;
+ hue = 1;
+ } else
+ /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */
+ if (!strcmp(attributes[i].name, "XV_RED_INTENSITY") &&
+ (!av_strcasecmp(name, "red_intensity")))
+ port_value = value;
+ else if (!strcmp(attributes[i].name, "XV_GREEN_INTENSITY")
+ && (!av_strcasecmp(name, "green_intensity")))
+ port_value = value;
+ else if (!strcmp(attributes[i].name, "XV_BLUE_INTENSITY")
+ && (!av_strcasecmp(name, "blue_intensity")))
+ port_value = value;
+ else
+ continue;
+
+ port_min = attributes[i].min_value;
+ port_max = attributes[i].max_value;
+
+ /* nvidia hue workaround */
+ if (hue && port_min == 0 && port_max == 360)
+ {
+ port_value =
+ (port_value >=
+ 0) ? (port_value - 100) : (port_value + 100);
+ }
+ // -100 -> min
+ // 0 -> (max+min)/2
+ // +100 -> max
+ port_value =
+ (port_value + 100) * (port_max - port_min) / 200 +
+ port_min;
+ XvSetPortAttribute(mDisplay, xv_port, xv_atom, port_value);
+ return VO_TRUE;
+ }
+ }
+ return VO_FALSE;
+}
+
+int vo_xv_get_eq(uint32_t xv_port, const char *name, int *value)
+{
+
+ XvAttribute *attributes;
+ int i, howmany, xv_atom;
+
+ /* get available attributes */
+ attributes = XvQueryPortAttributes(mDisplay, xv_port, &howmany);
+ for (i = 0; i < howmany && attributes; i++)
+ if (attributes[i].flags & XvGettable)
+ {
+ xv_atom = XInternAtom(mDisplay, attributes[i].name, True);
+/* since we have SET_DEFAULTS first in our list, we can check if it's available
+ then trigger it if it's ok so that the other values are at default upon query */
+ if (xv_atom != None)
+ {
+ int val, port_value = 0, port_min, port_max;
+
+ XvGetPortAttribute(mDisplay, xv_port, xv_atom,
+ &port_value);
+
+ port_min = attributes[i].min_value;
+ port_max = attributes[i].max_value;
+ val =
+ (port_value - port_min) * 200 / (port_max - port_min) -
+ 100;
+
+ if (!strcmp(attributes[i].name, "XV_BRIGHTNESS") &&
+ (!av_strcasecmp(name, "brightness")))
+ *value = val;
+ else if (!strcmp(attributes[i].name, "XV_CONTRAST") &&
+ (!av_strcasecmp(name, "contrast")))
+ *value = val;
+ else if (!strcmp(attributes[i].name, "XV_SATURATION") &&
+ (!av_strcasecmp(name, "saturation")))
+ *value = val;
+ else if (!strcmp(attributes[i].name, "XV_HUE") &&
+ (!av_strcasecmp(name, "hue")))
+ {
+ /* nasty nvidia detect */
+ if (port_min == 0 && port_max == 360)
+ *value = (val >= 0) ? (val - 100) : (val + 100);
+ else
+ *value = val;
+ } else
+ /* Note: since 22.01.2002 GATOS supports these attrs for radeons (NK) */
+ if (!strcmp(attributes[i].name, "XV_RED_INTENSITY") &&
+ (!av_strcasecmp(name, "red_intensity")))
+ *value = val;
+ else if (!strcmp(attributes[i].name, "XV_GREEN_INTENSITY")
+ && (!av_strcasecmp(name, "green_intensity")))
+ *value = val;
+ else if (!strcmp(attributes[i].name, "XV_BLUE_INTENSITY")
+ && (!av_strcasecmp(name, "blue_intensity")))
+ *value = val;
+ else
+ continue;
+
+ mp_dbg(MSGT_VO, MSGL_V, "xv_get_eq called! (%s, %d)\n",
+ name, *value);
+ return VO_TRUE;
+ }
+ }
+ return VO_FALSE;
+}
+
+/** \brief contains flags changing the execution of the colorkeying code */
+xv_ck_info_t xv_ck_info = { CK_METHOD_MANUALFILL, CK_SRC_CUR };
+unsigned long xv_colorkey; ///< The color used for manual colorkeying.
+unsigned int xv_port; ///< The selected Xv port.
+
+/**
+ * \brief Interns the requested atom if it is available.
+ *
+ * \param atom_name String containing the name of the requested atom.
+ *
+ * \return Returns the atom if available, else None is returned.
+ *
+ */
+static Atom xv_intern_atom_if_exists( char const * atom_name )
+{
+ XvAttribute * attributes;
+ int attrib_count,i;
+ Atom xv_atom = None;
+
+ attributes = XvQueryPortAttributes( mDisplay, xv_port, &attrib_count );
+ if( attributes!=NULL )
+ {
+ for ( i = 0; i < attrib_count; ++i )
+ {
+ if ( strcmp(attributes[i].name, atom_name ) == 0 )
+ {
+ xv_atom = XInternAtom( mDisplay, atom_name, False );
+ break; // found what we want, break out
+ }
+ }
+ XFree( attributes );
+ }
+
+ return xv_atom;
+}
+
+/**
+ * \brief Try to enable vsync for xv.
+ * \return Returns -1 if not available, 0 on failure and 1 on success.
+ */
+int vo_xv_enable_vsync(void)
+{
+ Atom xv_atom = xv_intern_atom_if_exists("XV_SYNC_TO_VBLANK");
+ if (xv_atom == None)
+ return -1;
+ return XvSetPortAttribute(mDisplay, xv_port, xv_atom, 1) == Success;
+}
+
+/**
+ * \brief Get maximum supported source image dimensions.
+ *
+ * This function does not set the variables pointed to by
+ * width and height if the information could not be retrieved,
+ * so the caller is reponsible for properly initializing them.
+ *
+ * \param width [out] The maximum width gets stored here.
+ * \param height [out] The maximum height gets stored here.
+ *
+ */
+void vo_xv_get_max_img_dim( uint32_t * width, uint32_t * height )
+{
+ XvEncodingInfo * encodings;
+ //unsigned long num_encodings, idx; to int or too long?!
+ unsigned int num_encodings, idx;
+
+ XvQueryEncodings( mDisplay, xv_port, &num_encodings, &encodings);
+
+ if ( encodings )
+ {
+ for ( idx = 0; idx < num_encodings; ++idx )
+ {
+ if ( strcmp( encodings[idx].name, "XV_IMAGE" ) == 0 )
+ {
+ *width = encodings[idx].width;
+ *height = encodings[idx].height;
+ break;
+ }
+ }
+ }
+
+ mp_msg( MSGT_VO, MSGL_V,
+ "[xv common] Maximum source image dimensions: %ux%u\n",
+ *width, *height );
+
+ XvFreeEncodingInfo( encodings );
+}
+
+/**
+ * \brief Print information about the colorkey method and source.
+ *
+ * \param ck_handling Integer value containing the information about
+ * colorkey handling (see x11_common.h).
+ *
+ * Outputs the content of |ck_handling| as a readable message.
+ *
+ */
+static void vo_xv_print_ck_info(void)
+{
+ mp_msg( MSGT_VO, MSGL_V, "[xv common] " );
+
+ switch ( xv_ck_info.method )
+ {
+ case CK_METHOD_NONE:
+ mp_msg( MSGT_VO, MSGL_V, "Drawing no colorkey.\n" ); return;
+ case CK_METHOD_AUTOPAINT:
+ mp_msg( MSGT_VO, MSGL_V, "Colorkey is drawn by Xv." ); break;
+ case CK_METHOD_MANUALFILL:
+ mp_msg( MSGT_VO, MSGL_V, "Drawing colorkey manually." ); break;
+ case CK_METHOD_BACKGROUND:
+ mp_msg( MSGT_VO, MSGL_V, "Colorkey is drawn as window background." ); break;
+ }
+
+ mp_msg( MSGT_VO, MSGL_V, "\n[xv common] " );
+
+ switch ( xv_ck_info.source )
+ {
+ case CK_SRC_CUR:
+ mp_msg( MSGT_VO, MSGL_V, "Using colorkey from Xv (0x%06lx).\n",
+ xv_colorkey );
+ break;
+ case CK_SRC_USE:
+ if ( xv_ck_info.method == CK_METHOD_AUTOPAINT )
+ {
+ mp_msg( MSGT_VO, MSGL_V,
+ "Ignoring colorkey from MPlayer (0x%06lx).\n",
+ xv_colorkey );
+ }
+ else
+ {
+ mp_msg( MSGT_VO, MSGL_V,
+ "Using colorkey from MPlayer (0x%06lx)."
+ " Use -colorkey to change.\n",
+ xv_colorkey );
+ }
+ break;
+ case CK_SRC_SET:
+ mp_msg( MSGT_VO, MSGL_V,
+ "Setting and using colorkey from MPlayer (0x%06lx)."
+ " Use -colorkey to change.\n",
+ xv_colorkey );
+ break;
+ }
+}
+/**
+ * \brief Init colorkey depending on the settings in xv_ck_info.
+ *
+ * \return Returns 0 on failure and 1 on success.
+ *
+ * Sets the colorkey variable according to the CK_SRC_* and CK_METHOD_*
+ * flags in xv_ck_info.
+ *
+ * Possiblilities:
+ * * Methods
+ * - manual colorkey drawing ( CK_METHOD_MANUALFILL )
+ * - set colorkey as window background ( CK_METHOD_BACKGROUND )
+ * - let Xv paint the colorkey ( CK_METHOD_AUTOPAINT )
+ * * Sources
+ * - use currently set colorkey ( CK_SRC_CUR )
+ * - use colorkey in vo_colorkey ( CK_SRC_USE )
+ * - use and set colorkey in vo_colorkey ( CK_SRC_SET )
+ *
+ * NOTE: If vo_colorkey has bits set after the first 3 low order bytes
+ * we don't draw anything as this means it was forced to off.
+ */
+int vo_xv_init_colorkey(void)
+{
+ Atom xv_atom;
+ int rez;
+
+ /* check if colorkeying is needed */
+ xv_atom = xv_intern_atom_if_exists( "XV_COLORKEY" );
+
+ /* if we have to deal with colorkeying ... */
+ if( xv_atom != None && !(vo_colorkey & 0xFF000000) )
+ {
+ /* check if we should use the colorkey specified in vo_colorkey */
+ if ( xv_ck_info.source != CK_SRC_CUR )
+ {
+ xv_colorkey = vo_colorkey;
+
+ /* check if we have to set the colorkey too */
+ if ( xv_ck_info.source == CK_SRC_SET )
+ {
+ xv_atom = XInternAtom(mDisplay, "XV_COLORKEY",False);
+
+ rez = XvSetPortAttribute( mDisplay, xv_port, xv_atom, vo_colorkey );
+ if ( rez != Success )
+ {
+ mp_msg( MSGT_VO, MSGL_FATAL,
+ MSGTR_CouldntSetColorkey );
+ return 0; // error setting colorkey
+ }
+ }
+ }
+ else
+ {
+ int colorkey_ret;
+
+ rez=XvGetPortAttribute(mDisplay,xv_port, xv_atom, &colorkey_ret);
+ if ( rez == Success )
+ {
+ xv_colorkey = colorkey_ret;
+ }
+ else
+ {
+ mp_msg( MSGT_VO, MSGL_FATAL,
+ MSGTR_CouldntGetColorkey );
+ return 0; // error getting colorkey
+ }
+ }
+
+ xv_atom = xv_intern_atom_if_exists( "XV_AUTOPAINT_COLORKEY" );
+
+ /* should we draw the colorkey ourselves or activate autopainting? */
+ if ( xv_ck_info.method == CK_METHOD_AUTOPAINT )
+ {
+ rez = !Success; // reset rez to something different than Success
+
+ if ( xv_atom != None ) // autopaint is supported
+ {
+ rez = XvSetPortAttribute( mDisplay, xv_port, xv_atom, 1 );
+ }
+
+ if ( rez != Success )
+ {
+ // fallback to manual colorkey drawing
+ xv_ck_info.method = CK_METHOD_MANUALFILL;
+ }
+ }
+ else // disable colorkey autopainting if supported
+ {
+ if ( xv_atom != None ) // we have autopaint attribute
+ {
+ XvSetPortAttribute( mDisplay, xv_port, xv_atom, 0 );
+ }
+ }
+ }
+ else // do no colorkey drawing at all
+ {
+ xv_ck_info.method = CK_METHOD_NONE;
+ } /* end: should we draw colorkey */
+
+ /* output information about the current colorkey settings */
+ vo_xv_print_ck_info();
+
+ return 1; // success
+}
+
+/**
+ * \brief Draw the colorkey on the video window.
+ *
+ * Draws the colorkey depending on the set method ( colorkey_handling ).
+ *
+ * Also draws the black bars ( when the video doesn't fit the display in
+ * fullscreen ) separately, so they don't overlap with the video area.
+ * It doesn't call XFlush.
+ *
+ */
+void vo_xv_draw_colorkey( int32_t x, int32_t y,
+ int32_t w, int32_t h )
+{
+ if( xv_ck_info.method == CK_METHOD_MANUALFILL ||
+ xv_ck_info.method == CK_METHOD_BACKGROUND )//less tearing than XClearWindow()
+ {
+ XSetForeground( mDisplay, vo_gc, xv_colorkey );
+ XFillRectangle( mDisplay, vo_window, vo_gc,
+ x, y,
+ w, h );
+ }
+
+ /* TODO! move this to vo_x11_clearwindow_part() */
+ /* draw left/right black bars if needed */
+ if (w < vo_dwidth)
+ {
+ XSetForeground( mDisplay, vo_gc, 0 );
+ XFillRectangle( mDisplay, vo_window, vo_gc,
+ 0, 0,
+ x, vo_dheight);
+ XFillRectangle( mDisplay, vo_window, vo_gc,
+ x + w, 0,
+ vo_dwidth, vo_dheight);
+ }
+ /* draw top/bottom black bars if needed */
+ if (h < vo_dheight)
+ {
+ XSetForeground( mDisplay, vo_gc, 0 );
+ XFillRectangle( mDisplay, vo_window, vo_gc,
+ 0, 0,
+ vo_dwidth, y);
+ XFillRectangle( mDisplay, vo_window, vo_gc,
+ 0, y + h,
+ vo_dwidth, vo_dheight);
+ }
+}
+
+/** \brief Tests if a valid argument for the ck suboption was given. */
+int xv_test_ck( void * arg )
+{
+ strarg_t * strarg = (strarg_t *)arg;
+
+ if ( strargcmp( strarg, "use" ) == 0 ||
+ strargcmp( strarg, "set" ) == 0 ||
+ strargcmp( strarg, "cur" ) == 0 )
+ {
+ return 1;
+ }
+
+ return 0;
+}
+/** \brief Tests if a valid arguments for the ck-method suboption was given. */
+int xv_test_ckm( void * arg )
+{
+ strarg_t * strarg = (strarg_t *)arg;
+
+ if ( strargcmp( strarg, "bg" ) == 0 ||
+ strargcmp( strarg, "man" ) == 0 ||
+ strargcmp( strarg, "auto" ) == 0 )
+ {
+ return 1;
+ }
+
+ return 0;
+}
+
+/**
+ * \brief Modify the colorkey_handling var according to str
+ *
+ * Checks if a valid pointer ( not NULL ) to the string
+ * was given. And in that case modifies the colorkey_handling
+ * var to reflect the requested behaviour.
+ * If nothing happens the content of colorkey_handling stays
+ * the same.
+ *
+ * \param str Pointer to the string or NULL
+ *
+ */
+void xv_setup_colorkeyhandling( char const * ck_method_str,
+ char const * ck_str )
+{
+ /* check if a valid pointer to the string was passed */
+ if ( ck_str )
+ {
+ if ( strncmp( ck_str, "use", 3 ) == 0 )
+ {
+ xv_ck_info.source = CK_SRC_USE;
+ }
+ else if ( strncmp( ck_str, "set", 3 ) == 0 )
+ {
+ xv_ck_info.source = CK_SRC_SET;
+ }
+ }
+ /* check if a valid pointer to the string was passed */
+ if ( ck_method_str )
+ {
+ if ( strncmp( ck_method_str, "bg", 2 ) == 0 )
+ {
+ xv_ck_info.method = CK_METHOD_BACKGROUND;
+ }
+ else if ( strncmp( ck_method_str, "man", 3 ) == 0 )
+ {
+ xv_ck_info.method = CK_METHOD_MANUALFILL;
+ }
+ else if ( strncmp( ck_method_str, "auto", 4 ) == 0 )
+ {
+ xv_ck_info.method = CK_METHOD_AUTOPAINT;
+ }
+ }
+}
+
+#endif
Index: patches/README
===================================================================
--- patches/README (nonexistent)
+++ patches/README (revision 351)
@@ -0,0 +1,6 @@
+
+/* begin *
+
+ TODO: Leave some comment here.
+
+ * end */
Index: patches
===================================================================
--- patches (nonexistent)
+++ patches (revision 351)
Property changes on: patches
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,74 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.rk358x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: .
===================================================================
--- . (nonexistent)
+++ . (revision 351)
Property changes on: .
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,74 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.rk358x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Radix cross Linux
The main Radix cross Linux repository contains the build scripts of packages, which have the most complete and common functionality for desktop machines
452 Commits
2 Branches
1 Tag