summaryrefslogtreecommitdiffstats
path: root/libvo/x11_common.c
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-08-27 23:56:44 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-08-27 23:56:44 +0000
commit855050e68a778e200aa1a1a6310d5d346e64ec71 (patch)
tree39a12d7afc05e3a01cf7c6ceb19700b4d9caeca9 /libvo/x11_common.c
parentf777d845b308144a828e334648ff1f5b2bfb21d5 (diff)
downloadmpv-855050e68a778e200aa1a1a6310d5d346e64ec71.tar.bz2
mpv-855050e68a778e200aa1a1a6310d5d346e64ec71.tar.xz
GUI stuff. now seeking works, and xmga renders to video window
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1724 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/x11_common.c')
-rw-r--r--libvo/x11_common.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 2f0b6ab52a..c2a16037fe 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -227,15 +227,17 @@ void vo_x11_classhint( Display * display,Window window,char *name ){
XSetClassHint(display,window,&wmClass);
}
-#ifdef HAVE_GUI
+#ifdef HAVE_NEW_GUI
Window vo_window = None;
GC vo_gc;
int vo_xeventhandling = 1;
int vo_resize = 0;
int vo_expose = 0;
- void vo_setwindow( Window w,GC g )
- { vo_window=w; vo_gc=g; }
+ void vo_setwindow( Window w,GC g ) {
+ vo_window=w; vo_gc=g;
+ vo_xeventhandling=0;
+ }
#endif
int vo_x11_check_events(Display *mydisplay){
@@ -246,7 +248,7 @@ int vo_x11_check_events(Display *mydisplay){
static XComposeStatus stat;
// unsigned long vo_KeyTable[512];
-#ifdef HAVE_GUI
+#ifdef HAVE_NEW_GUI
if ( vo_xeventhandling )
{
#endif
@@ -270,7 +272,7 @@ int vo_x11_check_events(Display *mydisplay){
break;
}
}
-#ifdef HAVE_GUI
+#ifdef HAVE_NEW_GUI
}
else
{