AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Rename _gdk_xgrab_ apis to _gdk_x11_window_

Browse Source
This commit is contained in:
Matthias Clasen 2010-12-15 17:45:05 -05:00
parent 566abbad25
commit e11bbbf194
4 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -619,7 +619,7 @@ gdk_display_x11_translate_event (GdkEventTranslator *translator,
0, 0,
GDK_WINDOW_STATE_ICONIFIED); GDK_WINDOW_STATE_ICONIFIED);
_gdk_xgrab_check_unmap (window, xevent->xany.serial); _gdk_x11_window_grab_check_unmap (window, xevent->xany.serial);
} }
break; break;

12
gdk/x11/gdkmain-x11.c
View File

@ -128,8 +128,8 @@ _gdk_x11_convert_grab_status (gint status)
return 0; return 0;
} }
/** /*
* _gdk_xgrab_check_unmap: * _gdk_x11_window_grab_check_unmap:
* @window: a #GdkWindow * @window: a #GdkWindow
* @serial: serial from Unmap event (or from NextRequest(display) * @serial: serial from Unmap event (or from NextRequest(display)
* if the unmap is being done by this client.) * if the unmap is being done by this client.)
@ -139,7 +139,7 @@ _gdk_x11_convert_grab_status (gint status)
* the pointer we keep to it. * the pointer we keep to it.
**/ **/
void void
_gdk_xgrab_check_unmap (GdkWindow *window, _gdk_x11_window_grab_check_unmap (GdkWindow *window,
gulong serial) gulong serial)
{ {
GdkDisplay *display = gdk_window_get_display (window); GdkDisplay *display = gdk_window_get_display (window);
@ -160,15 +160,15 @@ _gdk_xgrab_check_unmap (GdkWindow *window,
g_list_free (devices); g_list_free (devices);
} }
/** /*
* _gdk_xgrab_check_destroy: * _gdk_x11_window_grab_check_destroy:
* @window: a #GdkWindow * @window: a #GdkWindow
* *
* Checks to see if window is the current grab window, and if * Checks to see if window is the current grab window, and if
* so, clear the current grab window. * so, clear the current grab window.
**/ **/
void void
_gdk_xgrab_check_destroy (GdkWindow *window) _gdk_x11_window_grab_check_destroy (GdkWindow *window)
{ {
GdkDisplay *display = gdk_window_get_display (window); GdkDisplay *display = gdk_window_get_display (window);
GdkDeviceManager *device_manager; GdkDeviceManager *device_manager;

4
gdk/x11/gdkprivate-x11.h
View File

@ -136,9 +136,9 @@ gboolean _gdk_keymap_key_is_modifier (GdkKeymap *keymap,
void _gdk_x11_initialize_locale (void); void _gdk_x11_initialize_locale (void);
void _gdk_x11_windowing_init (void); void _gdk_x11_windowing_init (void);
void _gdk_xgrab_check_unmap (GdkWindow *window, void _gdk_x11_window_grab_check_unmap (GdkWindow *window,
gulong serial); gulong serial);
void _gdk_xgrab_check_destroy (GdkWindow *window); void _gdk_x11_window_grab_check_destroy (GdkWindow *window);
gboolean _gdk_x11_display_is_root_window (GdkDisplay *display, gboolean _gdk_x11_display_is_root_window (GdkDisplay *display,
Window xroot_window); Window xroot_window);

6
gdk/x11/gdkwindow-x11.c
View File

@ -239,7 +239,7 @@ gdk_window_impl_x11_finalize (GObject *object)
wrapper = impl->wrapper; wrapper = impl->wrapper;
_gdk_xgrab_check_destroy (wrapper); _gdk_x11_window_grab_check_destroy (wrapper);
if (!GDK_WINDOW_DESTROYED (wrapper)) if (!GDK_WINDOW_DESTROYED (wrapper))
{ {
@ -1097,7 +1097,7 @@ gdk_x11_window_destroy_notify (GdkWindow *window)
if (window_impl->toplevel && window_impl->toplevel->focus_window) if (window_impl->toplevel && window_impl->toplevel->focus_window)
_gdk_xid_table_remove (GDK_WINDOW_DISPLAY (window), window_impl->toplevel->focus_window); _gdk_xid_table_remove (GDK_WINDOW_DISPLAY (window), window_impl->toplevel->focus_window);
_gdk_xgrab_check_destroy (window); _gdk_x11_window_grab_check_destroy (window);
g_object_unref (window); g_object_unref (window);
} }
@ -1369,7 +1369,7 @@ gdk_window_x11_hide (GdkWindow *window)
* but checking here makes things more consistent if we are * but checking here makes things more consistent if we are
* just doing stuff ourself. * just doing stuff ourself.
*/ */
_gdk_xgrab_check_unmap (window, _gdk_x11_window_grab_check_unmap (window,
NextRequest (GDK_WINDOW_XDISPLAY (window))); NextRequest (GDK_WINDOW_XDISPLAY (window)));
/* You can't simply unmap toplevel windows. */ /* You can't simply unmap toplevel windows. */