[gtk+/gdk-backend: 61/91] Rename _gdk_xgrab_ apis to _gdk_x11_window_
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gdk-backend: 61/91] Rename _gdk_xgrab_ apis to _gdk_x11_window_
- Date: Sat, 18 Dec 2010 01:10:56 +0000 (UTC)
commit a6991db29a01f76c7c58c4645c40c8ce7ca74920
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Dec 15 17:45:05 2010 -0500
Rename _gdk_xgrab_ apis to _gdk_x11_window_
gdk/x11/gdkdisplay-x11.c | 14 +++++++-------
gdk/x11/gdkmain-x11.c | 16 ++++++++--------
gdk/x11/gdkprivate-x11.h | 8 ++++----
gdk/x11/gdkwindow-x11.c | 20 ++++++++++----------
4 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 40bf45a..21cbb32 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -613,14 +613,14 @@ gdk_display_x11_translate_event (GdkEventTranslator *translator,
* will have already flipped the iconified bit off.
*/
if (window)
- {
- if (GDK_WINDOW_IS_MAPPED (window))
- gdk_synthesize_window_state (window,
- 0,
- GDK_WINDOW_STATE_ICONIFIED);
+ {
+ if (GDK_WINDOW_IS_MAPPED (window))
+ gdk_synthesize_window_state (window,
+ 0,
+ GDK_WINDOW_STATE_ICONIFIED);
- _gdk_xgrab_check_unmap (window, xevent->xany.serial);
- }
+ _gdk_x11_window_grab_check_unmap (window, xevent->xany.serial);
+ }
break;
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 9fe8700..42be400 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -128,19 +128,19 @@ _gdk_x11_convert_grab_status (gint status)
return 0;
}
-/**
- * _gdk_xgrab_check_unmap:
+/*
+ * _gdk_x11_window_grab_check_unmap:
* @window: a #GdkWindow
* @serial: serial from Unmap event (or from NextRequest(display)
* if the unmap is being done by this client.)
- *
+ *
* Checks to see if an unmap request or event causes the current
* grab window to become not viewable, and if so, clear the
* the pointer we keep to it.
**/
void
-_gdk_xgrab_check_unmap (GdkWindow *window,
- gulong serial)
+_gdk_x11_window_grab_check_unmap (GdkWindow *window,
+ gulong serial)
{
GdkDisplay *display = gdk_window_get_display (window);
GdkDeviceManager *device_manager;
@@ -160,15 +160,15 @@ _gdk_xgrab_check_unmap (GdkWindow *window,
g_list_free (devices);
}
-/**
- * _gdk_xgrab_check_destroy:
+/*
+ * _gdk_x11_window_grab_check_destroy:
* @window: a #GdkWindow
*
* Checks to see if window is the current grab window, and if
* so, clear the current grab window.
**/
void
-_gdk_xgrab_check_destroy (GdkWindow *window)
+_gdk_x11_window_grab_check_destroy (GdkWindow *window)
{
GdkDisplay *display = gdk_window_get_display (window);
GdkDeviceManager *device_manager;
diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index 859420a..d481f58 100644
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -136,12 +136,12 @@ gboolean _gdk_keymap_key_is_modifier (GdkKeymap *keymap,
void _gdk_x11_initialize_locale (void);
void _gdk_x11_windowing_init (void);
-void _gdk_xgrab_check_unmap (GdkWindow *window,
- gulong serial);
-void _gdk_xgrab_check_destroy (GdkWindow *window);
+void _gdk_x11_window_grab_check_unmap (GdkWindow *window,
+ gulong serial);
+void _gdk_x11_window_grab_check_destroy (GdkWindow *window);
gboolean _gdk_x11_display_is_root_window (GdkDisplay *display,
- Window xroot_window);
+ Window xroot_window);
GdkDisplay * _gdk_x11_display_open (const gchar *display_name);
void _gdk_x11_display_make_default (GdkDisplay *display);
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 3250cbc..6f7ef13 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -232,22 +232,22 @@ gdk_window_impl_x11_finalize (GObject *object)
{
GdkWindow *wrapper;
GdkWindowImplX11 *impl;
-
+
g_return_if_fail (GDK_IS_WINDOW_IMPL_X11 (object));
impl = GDK_WINDOW_IMPL_X11 (object);
-
+
wrapper = impl->wrapper;
- _gdk_xgrab_check_destroy (wrapper);
+ _gdk_x11_window_grab_check_destroy (wrapper);
if (!GDK_WINDOW_DESTROYED (wrapper))
{
GdkDisplay *display = GDK_WINDOW_DISPLAY (wrapper);
-
+
_gdk_xid_table_remove (display, impl->xid);
if (impl->toplevel && impl->toplevel->focus_window)
- _gdk_xid_table_remove (display, impl->toplevel->focus_window);
+ _gdk_xid_table_remove (display, impl->toplevel->focus_window);
}
g_free (impl->toplevel);
@@ -1092,13 +1092,13 @@ gdk_x11_window_destroy_notify (GdkWindow *window)
_gdk_window_destroy (window, TRUE);
}
-
+
_gdk_xid_table_remove (GDK_WINDOW_DISPLAY (window), GDK_WINDOW_XID (window));
if (window_impl->toplevel && 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);
}
@@ -1369,8 +1369,8 @@ gdk_window_x11_hide (GdkWindow *window)
* but checking here makes things more consistent if we are
* just doing stuff ourself.
*/
- _gdk_xgrab_check_unmap (window,
- NextRequest (GDK_WINDOW_XDISPLAY (window)));
+ _gdk_x11_window_grab_check_unmap (window,
+ NextRequest (GDK_WINDOW_XDISPLAY (window)));
/* You can't simply unmap toplevel windows. */
switch (window->window_type)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]