marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

XQueryKeymap -> TSXQueryKeymap (fixes the XIO errors reported).

oldstable
Marcus Meissner 1998-10-22 07:55:33 +00:00 committed by Alexandre Julliard
parent 8163465a49
commit 96dad15fd8
5 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/ts_xlib.h
View File

@ -93,6 +93,7 @@ extern int TSXPending(Display*);
extern int TSXPutBackEvent(Display*, XEvent*); extern int TSXPutBackEvent(Display*, XEvent*);
extern int TSXPutImage(Display*, Drawable, GC, XImage*, int, int, int, int, unsigned int, unsigned int); extern int TSXPutImage(Display*, Drawable, GC, XImage*, int, int, int, int, unsigned int, unsigned int);
extern int TSXQueryColor(Display*, Colormap, XColor*); extern int TSXQueryColor(Display*, Colormap, XColor*);
extern int TSXQueryKeymap(Display*, char*);
extern int TSXQueryPointer(Display*, Window, Window*, Window*, int*, int*, int*, int*, unsigned int*); extern int TSXQueryPointer(Display*, Window, Window*, Window*, int*, int*, int*, int*, unsigned int*);
extern int TSXQueryTree(Display*, Window, Window*, Window*, Window**, unsigned int*); extern int TSXQueryTree(Display*, Window, Window*, Window*, Window**, unsigned int*);
extern int TSXResetScreenSaver(Display*); extern int TSXResetScreenSaver(Display*);

3
tools/make_X11wrappers
View File

@ -173,6 +173,9 @@ END
} }
if(m'\s*([^,]*[^, \t])\s*(,?\n)') { if(m'\s*([^,]*[^, \t])\s*(,?\n)') {
$args[$#args+1] = $1; $args[$#args+1] = $1;
if ($1 =~ /char\s*\[/) { # small hack for XQueryKeymap
$args[$#args] = "char*";
}
} }
} }
# Skip if vararg, function pointer arg, or not needed. # Skip if vararg, function pointer arg, or not needed.

1
tsx11/X11_calls
View File

@ -101,6 +101,7 @@ XPolygonRegion
XPutBackEvent XPutBackEvent
XPutImage XPutImage
XQueryColor XQueryColor
XQueryKeymap
XQueryPointer XQueryPointer
XQueryTree XQueryTree
XReconfigureWMWindow XReconfigureWMWindow

11
tsx11/ts_xlib.c
View File

@ -908,6 +908,17 @@ int TSXQueryColor(Display* a0, Colormap a1, XColor* a2)
return r; return r;
} }
int TSXQueryKeymap(Display* a0, char* a1)
{
int r;
TRACE(x11, "Call XQueryKeymap\n");
EnterCriticalSection( &X11DRV_CritSection );
r = XQueryKeymap(a0, a1);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE(x11, "Ret XQueryKeymap\n");
return r;
}
int TSXQueryPointer(Display* a0, Window a1, Window* a2, Window* a3, int* a4, int* a5, int* a6, int* a7, unsigned int* a8) int TSXQueryPointer(Display* a0, Window a1, Window* a2, Window* a3, int* a4, int* a5, int* a6, int* a7, unsigned int* a8)
{ {
int r; int r;

2
windows/keyboard.c
View File

@ -449,7 +449,7 @@ void KEYBOARD_UpdateState ( void )
KEYLP keylp; KEYLP keylp;
TRACE(keyboard,"called\n"); TRACE(keyboard,"called\n");
if (!XQueryKeymap(display, keys_return)) { if (!TSXQueryKeymap(display, keys_return)) {
ERR(keyboard,"Error getting keymap !"); ERR(keyboard,"Error getting keymap !");
return; return;
} }