callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a vfunc for _gdk_windowing_window_get_next_serial

Browse Source
This commit is contained in:
Matthias Clasen
2010-12-13 14:05:59 -05:00
parent 9635f09623
commit 9adb974155
7 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gdk/x11/gdkdevicemanager-core.c
View File

@ -23,6 +23,7 @@
#include "gdktypes.h"
#include "gdkdevicemanagerprivate.h"
#include "gdkdisplayprivate.h"
#include "gdkeventtranslator.h"
#include "gdkdevice-core.h"
#include "gdkkeysyms.h"
@ -391,7 +392,7 @@ get_event_window (GdkEventTranslator *translator,
GdkDeviceGrabInfo *info;
gulong serial;
serial = _gdk_windowing_window_get_next_serial (display);
serial = _gdk_display_get_next_serial (display);
info = _gdk_display_has_device_grab (display,
GDK_DEVICE_MANAGER_CORE (device_manager)->core_keyboard,
serial);

5
gdk/x11/gdkdevicemanager-xi2.c
View File

@ -21,7 +21,8 @@
#include "gdkdevicemanager-xi2.h"
#include <gdk/gdkdeviceprivate.h>
#include "gdkdeviceprivate.h"
#include "gdkdisplayprivate.h"
#include "gdkeventtranslator.h"
#include "gdkdevice-xi2.h"
#include "gdkkeysyms.h"
@ -905,7 +906,7 @@ get_event_window (GdkEventTranslator *translator,
device = g_hash_table_lookup (GDK_DEVICE_MANAGER_XI2 (translator)->id_table,
GUINT_TO_POINTER (((XIDeviceEvent *) ev)->deviceid));
serial = _gdk_windowing_window_get_next_serial (display);
serial = _gdk_display_get_next_serial (display);
info = _gdk_display_has_device_grab (display, device, serial);
if (info &&

5
gdk/x11/gdkdisplay-x11.c
View File

@ -1486,8 +1486,8 @@ process_internal_connection (GIOChannel *gioc,
return TRUE;
}
gulong
_gdk_windowing_window_get_next_serial (GdkDisplay *display)
static gulong
gdk_x11_display_get_next_serial (GdkDisplay *display)
{
return NextRequest (GDK_DISPLAY_XDISPLAY (display));
}
@ -2753,5 +2753,6 @@ _gdk_display_x11_class_init (GdkDisplayX11Class * class)
display_class->before_process_all_updates = _gdk_x11_display_before_process_all_updates;
display_class->after_process_all_updates = _gdk_x11_display_after_process_all_updates;
display_class->get_next_serial = gdk_x11_display_get_next_serial;
}