README.win32 Add HAVE_WINTAB. Undefine it if bulding without the Wintab
* README.win32 * config.h.win32: Add HAVE_WINTAB. Undefine it if bulding without the Wintab SDK. * gdk/win32/gdkinput.c: Hack some more. Still doesn't quite work OK, but getting closer. Guard against bogus tilt data from Wacom ArtPad II with the 3.40 driver. Add ifdefs for HAVE_WINTAB to enable easier building without Wintab. * gdk/win32/gdkinput.h * gdk/win32/gdkevents.c * gdk/win32/gdkwindow.c: Minor changes related related to above. * gdk/win32/gdkvisual.c: Simplify a lot, remove leftovers from X11 code. As we have just one visual on Win32, no sense to have it in a table, and no need for the hash table.
This commit is contained in:
@ -28,9 +28,13 @@
|
||||
#include "config.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include <gdk/gdk.h>
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
#include "gdkx.h"
|
||||
#ifdef HAVE_WINTAB
|
||||
#include <wintab.h>
|
||||
#endif
|
||||
#include "gdkinput.h"
|
||||
|
||||
#define PING() printf("%s: %d\n",__FILE__,__LINE__),fflush(stdout)
|
||||
@ -2782,6 +2786,7 @@ gdk_event_translate (GdkEvent *event,
|
||||
return_val = window_private && !window_private->destroyed;
|
||||
break;
|
||||
|
||||
#ifdef HAVE_WINTAB
|
||||
/* Handle WINTAB events here, as we know that gdkinput.c will
|
||||
* use the fixed WT_DEFBASE as lcMsgBase, and we thus can use the
|
||||
* constants as case labels.
|
||||
@ -2801,9 +2806,11 @@ gdk_event_translate (GdkEvent *event,
|
||||
g_print ("WT_PROXIMITY: %#x %d %d\n",
|
||||
xevent->wParam,
|
||||
LOWORD (xevent->lParam), HIWORD (xevent->lParam)));
|
||||
/* Fall through */
|
||||
wintab:
|
||||
return_val = gdk_input_vtable.other_event(event, xevent);
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
|
||||
bypass_switch:
|
||||
|
||||
Reference in New Issue
Block a user