diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-11-27 12:02:09 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-11-27 12:02:09 +0000 |
| commit | 555d07b089f1893a3ae9534dcad7397f1fd6eedf (patch) | |
| tree | dbfa59af072cb607cf373d38c2b148507fdd074b /plugins | |
| parent | 9490d3a6dce545d19cadcebf3e33a55b8b27e13e (diff) | |
| download | pcsxr-555d07b089f1893a3ae9534dcad7397f1fd6eedf.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@38321 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/dfcdrom/cdrcfg-0.1df/main.c | 1 | ||||
| -rw-r--r-- | plugins/dfxvideo/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/dfxvideo/Makefile.in | 2 | ||||
| -rw-r--r-- | plugins/dfxvideo/draw.c | 18 |
4 files changed, 5 insertions, 18 deletions
diff --git a/plugins/dfcdrom/cdrcfg-0.1df/main.c b/plugins/dfcdrom/cdrcfg-0.1df/main.c index acc5de25..9eac7ef4 100644 --- a/plugins/dfcdrom/cdrcfg-0.1df/main.c +++ b/plugins/dfcdrom/cdrcfg-0.1df/main.c @@ -17,6 +17,7 @@ #ifdef __linux__ #include "../cfg.c" +#include <sys/ioctl.h> GtkWidget *MainWindow; diff --git a/plugins/dfxvideo/Makefile.am b/plugins/dfxvideo/Makefile.am index 49ab9a7b..89ba770e 100644 --- a/plugins/dfxvideo/Makefile.am +++ b/plugins/dfxvideo/Makefile.am @@ -25,7 +25,7 @@ INCLUDES += -DUSE_NASM=1 endif libDFXVideo_la_LDFLAGS = -module -avoid-version libDFXVideo_la_LDFLAGS += -L/usr/X11R6/lib64 -L/usr/X11R6/lib \ - -lX11 -lXv -lXext -lXtst -lm + -lX11 -lXv -lXext -lm bin_PROGRAMS = cfgDFXVideo cfgDFXVideo_SOURCES = gpucfg-0.1df/main.c diff --git a/plugins/dfxvideo/Makefile.in b/plugins/dfxvideo/Makefile.in index 3353a2a5..b5491783 100644 --- a/plugins/dfxvideo/Makefile.in +++ b/plugins/dfxvideo/Makefile.in @@ -253,7 +253,7 @@ lib_LTLIBRARIES = libDFXVideo.la libDFXVideo_la_SOURCES = gpu.c cfg.c draw.c fps.c key.c menu.c prim.c \ soft.c zn.c $(am__append_1) libDFXVideo_la_LDFLAGS = -module -avoid-version -L/usr/X11R6/lib64 \ - -L/usr/X11R6/lib -lX11 -lXv -lXext -lXtst -lm + -L/usr/X11R6/lib -lX11 -lXv -lXext -lm cfgDFXVideo_SOURCES = gpucfg-0.1df/main.c cfgDFXVideo_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) -L/usr/X11R6/lib -lXext glade_DATA = gpucfg-0.1df/dfxvideo.glade2 diff --git a/plugins/dfxvideo/draw.c b/plugins/dfxvideo/draw.c index ef1613ce..d89d75c2 100644 --- a/plugins/dfxvideo/draw.c +++ b/plugins/dfxvideo/draw.c @@ -54,7 +54,6 @@ float pixelaspect; #include <X11/extensions/Xv.h> #include <X11/extensions/Xvlib.h> #include <X11/extensions/XShm.h> -#include <X11/extensions/XTest.h> int xv_port = -1; int xv_id = -1; int xv_depth = 0; @@ -62,20 +61,18 @@ int yuv_port = -1; int yuv_id = -1; int use_yuv = 0; int xv_vsync = 0; -int has_test_ext = 0; -int fake_key_timer = 0; XShmSegmentInfo shminfo; int finalw,finalh; extern XvImage *XvShmCreateImage(Display*, XvPortID, int, char*, int, int, XShmSegmentInfo*); +#include <time.h> + // prototypes void hq2x_32( unsigned char * srcPtr, DWORD srcPitch, unsigned char * dstPtr, int width, int height); void hq3x_32( unsigned char * srcPtr, DWORD srcPitch, unsigned char * dstPtr, int width, int height); -#include <time.h> - //////////////////////////////////////////////////////////////////////// // generic 2xSaI helpers //////////////////////////////////////////////////////////////////////// @@ -1325,11 +1322,6 @@ shminfo.readOnly = 0; printf("XShmAttach failed !\n"); exit (-1); } - - { - int a,b,c,d; - has_test_ext = XTestQueryExtension(display, &a, &b, &c, &d); - } } void (*p2XSaIFunc) (unsigned char *, DWORD, unsigned char *, int, int); @@ -1576,12 +1568,6 @@ void DoBufferSwap(void) if (finalw == 0 || finalh == 0) return; - // disable screensaver - if (has_test_ext && fake_key_timer < time(NULL)) { - XTestFakeRelativeMotionEvent(display, 1, 0, 0); - fake_key_timer = time(NULL) + 55; - } - XSync(display,False); if(use_yuv) { |