diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-06-18 23:23:30 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-06-18 23:23:30 +0000 |
| commit | 1abf7df6be75d0f9a1c7277f46248eb87d46bf69 (patch) | |
| tree | aa5703e4cbcfa0a2e464d45853df7f090b425d8e /gdk/win32/gdkinput.c | |
| parent | c597a7be39c3fb1f4d3caa6d1d21fedf413d6f51 (diff) | |
| download | gtk+-1abf7df6be75d0f9a1c7277f46248eb87d46bf69.tar.gz | |
Make the core pointer object per-display. (#85698)
Tue Jun 18 19:11:51 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdisplay.[ch] gdk/gdkevents.c gdk/gdkinput.h
gdk/gdkinternals.h gdk/win32/gdkevents-win32.c
gdk/win32/gdkinput-win32.[ch] gdk/x11/gdkevents-x11.c
gdk/x11/gdkinput{,-none,-x11}.c gdk/x11/gdkinputprivate.h:
Make the core pointer object per-display. (#85698)
Diffstat (limited to 'gdk/win32/gdkinput.c')
| -rw-r--r-- | gdk/win32/gdkinput.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/gdk/win32/gdkinput.c b/gdk/win32/gdkinput.c index 110ef5c5f2..767ed2b9f5 100644 --- a/gdk/win32/gdkinput.c +++ b/gdk/win32/gdkinput.c @@ -54,8 +54,6 @@ static GdkDeviceAxis gdk_input_core_axes[] = { /* Global variables */ -GDKVAR GdkDevice *_gdk_core_pointer = NULL; - gint _gdk_input_ignore_core; GList *_gdk_input_devices; @@ -64,16 +62,16 @@ GList *_gdk_input_windows; void _gdk_init_input_core (void) { - _gdk_core_pointer = g_object_new (GDK_TYPE_DEVICE, NULL); + display->core_pointer = g_object_new (GDK_TYPE_DEVICE, NULL); - _gdk_core_pointer->name = "Core Pointer"; - _gdk_core_pointer->source = GDK_SOURCE_MOUSE; - _gdk_core_pointer->mode = GDK_MODE_SCREEN; - _gdk_core_pointer->has_cursor = TRUE; - _gdk_core_pointer->num_axes = 2; - _gdk_core_pointer->axes = gdk_input_core_axes; - _gdk_core_pointer->num_keys = 0; - _gdk_core_pointer->keys = NULL; + display->core_pointer->name = "Core Pointer"; + display->core_pointer->source = GDK_SOURCE_MOUSE; + display->core_pointer->mode = GDK_MODE_SCREEN; + display->core_pointer->has_cursor = TRUE; + display->core_pointer->num_axes = 2; + display->core_pointer->axes = gdk_input_core_axes; + display->core_pointer->num_keys = 0; + display->core_pointer->keys = NULL; } static void |