changed: no need to send a fake key event to unblank the screen from …

…dpms (this also removes the related build dependency libxtst-dev)
fss · Mar 12, 2011 · a3a7f74 · a3a7f74
1 parent b145011
commit a3a7f74
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 11 deletions.
diff --git a/README.linux b/README.linux
@@ -44,7 +44,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
  libfreetype6-dev, libfontconfig-dev, libbz2-dev, libfribidi-dev,
  libsqlite3-dev, libmysqlclient-dev, libasound-dev, libpng12-dev | libpng-dev,
  libpcre3-dev, liblzo2-dev, libcdio-dev, libsdl-dev, libsdl-image1.2-dev,
- libsdl-mixer1.2-dev, libenca-dev, libjasper-dev, libxt-dev, libxtst-dev,
+ libsdl-mixer1.2-dev, libenca-dev, libjasper-dev, libxt-dev,
  libxmu-dev, libxinerama-dev, libcurl4-gnutls-dev | libcurl-dev,
  libdbus-1-dev, libhal-storage-dev, libhal-dev, libpulse-dev,
  libavahi-common-dev, libavahi-client-dev, libxrandr-dev, libavcodec-dev,

diff --git a/README.ubuntu b/README.ubuntu
@@ -44,7 +44,7 @@ Two methods exist to install the required Ubuntu packages:
 
 For Ubuntu (all versions >= 7.04):
 
-   # sudo apt-get install subversion make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxtst-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libwavpack-dev libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs
+   # sudo apt-get install subversion make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libwavpack-dev libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs
 
 For Ubuntu Maverick (10.10):
    # sudo apt-get install autopoint

diff --git a/configure.in b/configure.in
@@ -637,9 +637,6 @@ else
   PKG_CHECK_MODULES([XT],    [xt],
     [INCLUDES="$INCLUDES $XT_CFLAGS"; LIBS="$LIBS $XT_LIBS"],
     AC_MSG_ERROR($missing_library))
-  PKG_CHECK_MODULES([XTST],  [xtst],
-    [INCLUDES="$INCLUDES $XTST_CFLAGS"; LIBS="$LIBS $XTST_LIBS"],
-    AC_MSG_ERROR($missing_library))
   PKG_CHECK_MODULES([XEXT],  [xext],
     [INCLUDES="$INCLUDES $XEXT_CFLAGS"; LIBS="$LIBS $XEXT_LIBS"],
     AC_MSG_ERROR($missing_library))

diff --git a/xbmc/powermanagement/DPMSSupport.cpp b/xbmc/powermanagement/DPMSSupport.cpp
@@ -122,7 +122,6 @@ bool DPMSSupport::DisablePowerSaving()
 #define INT64 __X11_SPECIFIC_INT64
 #include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
-#include <X11/extensions/XTest.h>
 #undef INT64
 #undef BOOL
 
@@ -184,11 +183,6 @@ bool DPMSSupport::PlatformSpecificDisablePowerSaving()
   XFlush(dpy);
   XMapWindow(dpy, g_Windowing.GetWindow());
   XFlush(dpy);
-  // Send fake key event (shift) to make sure the screen
-  // unblanks on keypresses other than keyboard.
-  XTestFakeKeyEvent(dpy, 62, 1, 0);
-  XTestFakeKeyEvent(dpy, 62, 0, 0);
-  XFlush(dpy);
 
   return true;
 }