[gtk+] Rename _gdk_window_move_resize_child
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Rename _gdk_window_move_resize_child
- Date: Tue, 21 Dec 2010 17:13:52 +0000 (UTC)
commit 021f595a3809a7331b82af05c21a6fb7e43df200
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Dec 15 22:21:39 2010 -0500
Rename _gdk_window_move_resize_child
Rename _gdk_window_move_resize_child and _gdk_window_process_expose
to _gdk_x11.
gdk/x11/gdkdisplay-x11.c | 10 ++--
gdk/x11/gdkgeometry-x11.c | 106 ++++++++++++++++++++++----------------------
gdk/x11/gdkprivate-x11.h | 16 +++---
gdk/x11/gdkwindow-x11.c | 14 +++---
4 files changed, 73 insertions(+), 73 deletions(-)
---
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 551c754..88f8c98 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -488,7 +488,7 @@ gdk_display_x11_translate_event (GdkEventTranslator *translator,
expose_rect.width = xevent->xexpose.width;
expose_rect.height = xevent->xexpose.height;
- _gdk_window_process_expose (window, xevent->xexpose.serial, &expose_rect);
+ _gdk_x11_window_process_expose (window, xevent->xexpose.serial, &expose_rect);
return_val = FALSE;
}
@@ -513,7 +513,7 @@ gdk_display_x11_translate_event (GdkEventTranslator *translator,
expose_rect.width = xevent->xgraphicsexpose.width;
expose_rect.height = xevent->xgraphicsexpose.height;
- _gdk_window_process_expose (window, xevent->xgraphicsexpose.serial, &expose_rect);
+ _gdk_x11_window_process_expose (window, xevent->xgraphicsexpose.serial, &expose_rect);
return_val = FALSE;
}
break;
@@ -960,9 +960,9 @@ gdk_display_x11_translate_event (GdkEventTranslator *translator,
repair, None);
XFixesDestroyRegion (display_x11->xdisplay, repair);
- if (window->parent != NULL)
- _gdk_window_process_expose (window->parent,
- damage_event->serial, &rect);
+ if (window->parent != NULL)
+ _gdk_x11_window_process_expose (window->parent,
+ damage_event->serial, &rect);
return_val = TRUE;
}
diff --git a/gdk/x11/gdkgeometry-x11.c b/gdk/x11/gdkgeometry-x11.c
index 29b3e58..7e3cf16 100644
--- a/gdk/x11/gdkgeometry-x11.c
+++ b/gdk/x11/gdkgeometry-x11.c
@@ -53,11 +53,11 @@ struct _GdkWindowQueueItem
};
void
-_gdk_window_move_resize_child (GdkWindow *window,
- gint x,
- gint y,
- gint width,
- gint height)
+_gdk_x11_window_move_resize_child (GdkWindow *window,
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
g_return_if_fail (window != NULL);
g_return_if_fail (GDK_IS_WINDOW (window));
@@ -68,9 +68,9 @@ _gdk_window_move_resize_child (GdkWindow *window,
g_warning ("Native children wider or taller than 65535 pixels are not supported");
if (width > 65535)
- width = 65535;
+ width = 65535;
if (height > 65535)
- height = 65535;
+ height = 65535;
}
window->x = x;
@@ -79,16 +79,16 @@ _gdk_window_move_resize_child (GdkWindow *window,
window->height = height;
/* We don't really care about origin overflow, because on overflow
- the window won't be visible anyway and thus it will be shaped
- to nothing */
-
+ * the window won't be visible anyway and thus it will be shaped
+ * to nothing
+ */
_gdk_x11_window_tmp_unset_parent_bg (window);
_gdk_x11_window_tmp_unset_bg (window, TRUE);
XMoveResizeWindow (GDK_WINDOW_XDISPLAY (window),
- GDK_WINDOW_XID (window),
- window->x + window->parent->abs_x,
- window->y + window->parent->abs_y,
- width, height);
+ GDK_WINDOW_XID (window),
+ window->x + window->parent->abs_x,
+ window->y + window->parent->abs_y,
+ width, height);
_gdk_x11_window_tmp_reset_parent_bg (window);
_gdk_x11_window_tmp_reset_bg (window, TRUE);
}
@@ -326,9 +326,9 @@ _gdk_x11_window_queue_antiexpose (GdkWindow *window,
}
void
-_gdk_window_process_expose (GdkWindow *window,
- gulong serial,
- GdkRectangle *area)
+_gdk_x11_window_process_expose (GdkWindow *window,
+ gulong serial,
+ GdkRectangle *area)
{
cairo_region_t *invalidate_region = cairo_region_create_rectangle (area);
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (window));
@@ -338,44 +338,44 @@ _gdk_window_process_expose (GdkWindow *window,
GList *tmp_list = display_x11->translate_queue->head;
while (tmp_list)
- {
- GdkWindowQueueItem *item = tmp_list->data;
+ {
+ GdkWindowQueueItem *item = tmp_list->data;
GList *next = tmp_list->next;
- /* an overflow-safe (serial < item->serial) */
- if (serial - item->serial > (gulong) G_MAXLONG)
- {
- if (item->window == window)
- {
- if (item->type == GDK_WINDOW_QUEUE_TRANSLATE)
- {
- if (item->u.translate.area)
- {
- cairo_region_t *intersection;
-
- intersection = cairo_region_copy (invalidate_region);
- cairo_region_intersect (intersection, item->u.translate.area);
- cairo_region_subtract (invalidate_region, intersection);
- cairo_region_translate (intersection, item->u.translate.dx, item->u.translate.dy);
- cairo_region_union (invalidate_region, intersection);
- cairo_region_destroy (intersection);
- }
- else
- cairo_region_translate (invalidate_region, item->u.translate.dx, item->u.translate.dy);
- }
- else /* anti-expose */
- {
- cairo_region_subtract (invalidate_region, item->u.antiexpose.area);
- }
- }
- }
- else
- {
- queue_delete_link (display_x11->translate_queue, tmp_list);
- queue_item_free (item);
- }
- tmp_list = next;
- }
+ /* an overflow-safe (serial < item->serial) */
+ if (serial - item->serial > (gulong) G_MAXLONG)
+ {
+ if (item->window == window)
+ {
+ if (item->type == GDK_WINDOW_QUEUE_TRANSLATE)
+ {
+ if (item->u.translate.area)
+ {
+ cairo_region_t *intersection;
+
+ intersection = cairo_region_copy (invalidate_region);
+ cairo_region_intersect (intersection, item->u.translate.area);
+ cairo_region_subtract (invalidate_region, intersection);
+ cairo_region_translate (intersection, item->u.translate.dx, item->u.translate.dy);
+ cairo_region_union (invalidate_region, intersection);
+ cairo_region_destroy (intersection);
+ }
+ else
+ cairo_region_translate (invalidate_region, item->u.translate.dx, item->u.translate.dy);
+ }
+ else /* anti-expose */
+ {
+ cairo_region_subtract (invalidate_region, item->u.antiexpose.area);
+ }
+ }
+ }
+ else
+ {
+ queue_delete_link (display_x11->translate_queue, tmp_list);
+ queue_item_free (item);
+ }
+ tmp_list = next;
+ }
}
if (!cairo_region_is_empty (invalidate_region))
diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index b573b27..ccb2a56 100644
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -92,14 +92,14 @@ gint _gdk_x11_display_send_xevent (GdkDisplay *display,
XEvent *event_send);
/* Routines from gdkgeometry-x11.c */
-void _gdk_window_move_resize_child (GdkWindow *window,
- gint x,
- gint y,
- gint width,
- gint height);
-void _gdk_window_process_expose (GdkWindow *window,
- gulong serial,
- GdkRectangle *area);
+void _gdk_x11_window_move_resize_child (GdkWindow *window,
+ gint x,
+ gint y,
+ gint width,
+ gint height);
+void _gdk_x11_window_process_expose (GdkWindow *window,
+ gulong serial,
+ GdkRectangle *area);
gboolean _gdk_x11_window_queue_antiexpose (GdkWindow *window,
cairo_region_t *area);
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index c532bb1..d7857a0 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -1424,9 +1424,9 @@ window_x11_move (GdkWindow *window,
if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_CHILD)
{
- _gdk_window_move_resize_child (window,
- x, y,
- window->width, window->height);
+ _gdk_x11_window_move_resize_child (window,
+ x, y,
+ window->width, window->height);
}
else
{
@@ -1455,9 +1455,9 @@ window_x11_resize (GdkWindow *window,
if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_CHILD)
{
- _gdk_window_move_resize_child (window,
- window->x, window->y,
- width, height);
+ _gdk_x11_window_move_resize_child (window,
+ window->x, window->y,
+ width, height);
}
else
{
@@ -1498,7 +1498,7 @@ window_x11_move_resize (GdkWindow *window,
if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_CHILD)
{
- _gdk_window_move_resize_child (window, x, y, width, height);
+ _gdk_x11_window_move_resize_child (window, x, y, width, height);
_gdk_x11_window_update_size (GDK_WINDOW_IMPL_X11 (window->impl));
}
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]