Ticket #251: mplayer-20050304-noidle.diff

MPlayer-20050304

@@ -69 +69 @@
 #endif
 extern int WinID;
 
+#ifdef HAVE_XTEST
+extern int xtest_noidle;
+#endif
+
 #ifdef HAVE_MENU
 extern int menu_startup;
 #endif
@@ -183 +187 @@
         {"display", &mDisplayName, CONF_TYPE_STRING, 0, 0, 0, NULL},
 #endif
 
+#ifdef HAVE_XTEST
+        {"xtest-noidle", &xtest_noidle, CONF_TYPE_INT, 0, 0, 0, NULL},
+#endif
+
         // -vo png only:
 #ifdef HAVE_PNG
         {"z", "-z is replaced by -vo png:z=<0-9>\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},

MPlayer-20050304

@@ -371 +371 @@
 static void
 flip_page(void)
 {
+#ifdef HAVE_XTEST
+  vo_x11_noidle();
+#endif
 
 //  glEnable(GL_TEXTURE_2D);
 //  glBindTexture(GL_TEXTURE_2D, texture_id);

MPlayer-20050304

@@ -568 +568 @@
 
 static void flip_page(void)
 {
+#ifdef HAVE_XTEST
+    vo_x11_noidle();
+#endif
     Display_Image(myximage, ImageData);
     XSync(mDisplay, False);
 }

MPlayer-20050304

@@ -602 +602 @@
 
 static void flip_page(void)
 {
+#ifdef HAVE_XTEST
+    vo_x11_noidle();
+#endif
+
     put_xvimage( xvimage[current_buf] );
 
     /* remember the currently visible buffer */

libvo/x11_common.c

@@ -536 +536 @@
     mDisplay = NULL;
 }
 
+#ifdef HAVE_XTEST
+#include <X11/extensions/XTest.h>
+
+int xtest_noidle = -1;
+static int xtest_noidle_step = 30, xtest_noidle_cpt;
+
+void vo_x11_noidle(void)
+{
+    if(--xtest_noidle_cpt > 0)
+        return;
+    xtest_noidle_cpt = xtest_noidle_step;
+    if(!XTestFakeKeyEvent(mDisplay, xtest_noidle, True, 0L) ||
+        !XTestFakeKeyEvent(mDisplay, xtest_noidle, False, 0L)) {
+        mp_msg(MSGT_VO, MSGL_WARN, "Fake key press failed.\n");
+    }
+}
+#endif
+
 #include "osdep/keycodes.h"
 #include "wskeys.h"
 
@@ -1700 +1718 @@
 
     int interval, prefer_blank, allow_exp;
 
+#ifdef HAVE_XTEST
+    if(xtest_noidle > 0) {
+        int nothing;
+
+        if(XTestQueryExtension(mDisplay, &nothing, &nothing,
+            &nothing, &nothing)) {
+            mp_msg(MSGT_VO, MSGL_V, "Using XTest noidle.\n");
+            xtest_noidle_cpt = xtest_noidle_step;
+            return;
+        } else {
+            mp_msg(MSGT_VO, MSGL_WARN, "XTest not available.\n");
+            xtest_noidle = -1;
+        }
+    }
+#endif
+
 #ifdef HAVE_XDPMS
     int nothing;
 

libvo/x11_common.h

@@ -59 +59 @@
 extern void vo_x11_fullscreen( void );
 extern void vo_x11_setlayer( Display * mDisplay,Window vo_window,int layer );
 extern void vo_x11_uninit();
+extern void vo_x11_noidle( void );
 extern Colormap vo_x11_create_colormap(XVisualInfo *vinfo);
 extern uint32_t vo_x11_set_equalizer(char *name, int value);
 extern uint32_t vo_x11_get_equalizer(char *name, int *value);