From: Daniel Caujolle-B. <f1...@us...> - 2004-07-26 00:48:34
|
Update of /cvsroot/xine/xine-ui/src/xitk/xine-toolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29929/xine-toolkit Modified Files: cursors.c Log Message: fix transparent cursor with X only. revert logic. Index: cursors.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/xine-toolkit/cursors.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cursors.c 26 Jul 2004 00:43:47 -0000 1.1 +++ cursors.c 26 Jul 2004 00:48:25 -0000 1.2 @@ -869,16 +869,14 @@ void xitk_cursors_init(Display *display) { int i; - int x_only = xitk_get_cursors_feature(); + int xitk_cursors = xitk_get_cursors_feature(); + + /* Transparent cursor isn't a valid X cursor */ + _cursors_create_cursor(display, &cursors[0]); - for(i = 0; i < MAX_CURSORS; i++) { + for(i = 1; i < MAX_CURSORS; i++) { - if(!x_only) { - XLOCK(display); - cursors[i].cursor = XCreateFontCursor(display, cursors[i].x_shape); - XUNLOCK(display); - } - else { + if(xitk_cursors) { if(cursors[i].embedded == X_CURSOR) { XLOCK(display); cursors[i].cursor = XCreateFontCursor(display, cursors[i].x_shape); @@ -886,7 +884,11 @@ } else _cursors_create_cursor(display, &cursors[i]); - + } + else { + XLOCK(display); + cursors[i].cursor = XCreateFontCursor(display, cursors[i].x_shape); + XUNLOCK(display); } } } |