CVS: main/libvo x11_common.c,1.4,1.5 x11_common.h,1.2,1.3 vo_x11.c,1.13,1.14 vo_xv.c,1.10,1.11 vo_xmga.c,1.11,1.12 vo_gl.c,1.2,1.3
Update of /cvsroot/mplayer/main/libvo In directory usw-pr-cvs1:/tmp/cvs-serv26936/main/libvo Modified Files: x11_common.c x11_common.h vo_x11.c vo_xv.c vo_xmga.c vo_gl.c Log Message: Autohide X11 cursor Index: x11_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** x11_common.c 2001/04/12 00:05:41 1.4 --- x11_common.c 2001/04/13 00:54:05 1.5 *************** *** 25,28 **** --- 25,45 ---- static int timeout_save=0; + + void vo_hidecursor ( Display *disp , Window win ) + { + Cursor no_ptr; + Pixmap bm_no; + XColor black,dummy; + Colormap colormap; + static unsigned char bm_no_data[] = { 0,0,0,0, 0,0,0,0 }; + + colormap = DefaultColormap(disp,DefaultScreen(disp)); + XAllocNamedColor(disp,colormap,"black",&black,&dummy); + bm_no = XCreateBitmapFromData(disp, win, bm_no_data, 8,8); + no_ptr=XCreatePixmapCursor(disp, bm_no, bm_no,&black, &black,0, 0); + XDefineCursor(disp,win,no_ptr); + } + + int vo_init( void ) { Index: x11_common.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/x11_common.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** x11_common.h 2001/04/10 00:00:04 1.2 --- x11_common.h 2001/04/13 00:54:05 1.3 *************** *** 10,13 **** --- 10,14 ---- int vo_init( void ); + int vo_hidecursor ( Display* , Window ); void vo_x11_decoration( Display * vo_Display,Window w,int d ); int vo_x11_check_events(Display *mydisplay); Index: vo_x11.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** vo_x11.c 2001/04/11 19:41:38 1.13 --- vo_x11.c 2001/04/13 00:54:05 1.14 *************** *** 226,229 **** --- 226,230 ---- hint.width,hint.height, xswa.border_pixel,depth,CopyFromParent,vinfo.visual,xswamask,&xswa ); + vo_hidecursor(mDisplay,mywindow); if ( fullscreen ) vo_x11_decoration( mDisplay,mywindow,0 ); Index: vo_xv.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** vo_xv.c 2001/04/11 19:41:38 1.10 --- vo_xv.c 2001/04/13 00:54:05 1.11 *************** *** 139,142 **** --- 139,143 ---- hint.x, hint.y, hint.width, hint.height, 0, depth,CopyFromParent,vinfo.visual,xswamask,&xswa); + vo_hidecursor(mydisplay,mywindow); XSelectInput(mydisplay, mywindow, StructureNotifyMask | KeyPressMask ); Index: vo_xmga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** vo_xmga.c 2001/04/11 01:38:56 1.11 --- vo_xmga.c 2001/04/13 00:54:05 1.12 *************** *** 245,248 **** --- 245,249 ---- InputOutput, vinfo.visual,xswamask,&xWAttribs ); + vo_hidecursor(mDisplay,mWindow); if ( fullscreen ) vo_x11_decoration( mDisplay,mWindow,0 ); Index: vo_gl.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** vo_gl.c 2001/03/03 21:46:39 1.2 --- vo_gl.c 2001/04/13 00:54:05 1.3 *************** *** 184,187 **** --- 184,188 ---- mywindow = XCreateWindow(mydisplay, RootWindow(mydisplay,screen), hint.x, hint.y, hint.width, hint.height, 4, vinfo->depth,CopyFromParent,vinfo->visual,xswamask,&xswa); + vo_hidecursor(mydisplay,mywindow); wsGLXContext=glXCreateContext( mydisplay,vinfo,NULL,True ); _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog@lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog
participants (1)
-
Gabor Lenart