From 185cdddb0d725891cd016acb1f5b847b2a9294df Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 15 Dec 2010 17:55:04 -0500 Subject: Rename _gdk_moveresize functions to _gdk_x11_moveresize --- gdk/x11/gdkdevicemanager-core.c | 4 +-- gdk/x11/gdkdevicemanager-xi2.c | 2 +- gdk/x11/gdkdisplay-x11.c | 14 +++++----- gdk/x11/gdkprivate-x11.h | 6 ++--- gdk/x11/gdkwindow-x11.c | 60 ++++++++++++++++++++--------------------- 5 files changed, 43 insertions(+), 43 deletions(-) (limited to 'gdk') diff --git a/gdk/x11/gdkdevicemanager-core.c b/gdk/x11/gdkdevicemanager-core.c index b368614f26..32d58426f2 100644 --- a/gdk/x11/gdkdevicemanager-core.c +++ b/gdk/x11/gdkdevicemanager-core.c @@ -452,8 +452,8 @@ gdk_device_manager_core_translate_event (GdkEventTranslator *translator, (xevent->type == MotionNotify || xevent->type == ButtonRelease)) { - if (_gdk_moveresize_handle_event (xevent)) - { + if (_gdk_x11_moveresize_handle_event (xevent)) + { return_val = FALSE; goto done; } diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c index 177926a7a5..07f1245527 100644 --- a/gdk/x11/gdkdevicemanager-xi2.c +++ b/gdk/x11/gdkdevicemanager-xi2.c @@ -974,7 +974,7 @@ gdk_device_manager_xi2_translate_event (GdkEventTranslator *translator, if (ev->evtype == XI_Motion || ev->evtype == XI_ButtonRelease) { - if (_gdk_moveresize_handle_event (xevent)) + if (_gdk_x11_moveresize_handle_event (xevent)) { XFreeEventData (dpy, cookie); return FALSE; diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 21cbb32316..d5cb0b6eda 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -735,14 +735,14 @@ gdk_display_x11_translate_event (GdkEventTranslator *translator, _gdk_window_update_size (window); _gdk_x11_window_update_size (GDK_WINDOW_IMPL_X11 (window->impl)); - if (window->resize_count >= 1) - { - window->resize_count -= 1; + if (window->resize_count >= 1) + { + window->resize_count -= 1; - if (window->resize_count == 0) - _gdk_moveresize_configure_done (display, window); - } - } + if (window->resize_count == 0) + _gdk_x11_moveresize_configure_done (display, window); + } + } break; case PropertyNotify: diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h index d481f58cbc..70c91a1024 100644 --- a/gdk/x11/gdkprivate-x11.h +++ b/gdk/x11/gdkprivate-x11.h @@ -119,9 +119,9 @@ void _gdk_x11_region_get_xrectangles (const cairo_region_t *region, XRectangle **rects, gint *n_rects); -gboolean _gdk_moveresize_handle_event (XEvent *event); -gboolean _gdk_moveresize_configure_done (GdkDisplay *display, - GdkWindow *window); +gboolean _gdk_x11_moveresize_handle_event (XEvent *event); +gboolean _gdk_x11_moveresize_configure_done (GdkDisplay *display, + GdkWindow *window); void _gdk_keymap_state_changed (GdkDisplay *display, XEvent *event); diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 6f7ef13532..3a3c34e0e1 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -4150,22 +4150,22 @@ moveresize_lookahead (MoveResizeData *mv_resize, if (mv_resize->moveresize_process_time) { if (event->xmotion.time == mv_resize->moveresize_process_time) - { - mv_resize->moveresize_process_time = 0; - return TRUE; - } + { + mv_resize->moveresize_process_time = 0; + return TRUE; + } else - return FALSE; + return FALSE; } XCheckIfEvent (event->xany.display, &tmp_event, - lookahead_motion_predicate, (XPointer) & seen_release); + lookahead_motion_predicate, (XPointer) & seen_release); return mv_resize->moveresize_process_time == 0; } - + gboolean -_gdk_moveresize_handle_event (XEvent *event) +_gdk_x11_moveresize_handle_event (XEvent *event) { guint button_mask = 0; GdkDisplay *display = gdk_x11_lookup_xdisplay (event->xany.display); @@ -4180,21 +4180,21 @@ _gdk_moveresize_handle_event (XEvent *event) { case MotionNotify: if (mv_resize->moveresize_window->resize_count > 0) - { - if (mv_resize->moveresize_pending_event) - *mv_resize->moveresize_pending_event = *event; - else - mv_resize->moveresize_pending_event = - g_memdup (event, sizeof (XEvent)); + { + if (mv_resize->moveresize_pending_event) + *mv_resize->moveresize_pending_event = *event; + else + mv_resize->moveresize_pending_event = + g_memdup (event, sizeof (XEvent)); - break; - } + break; + } if (!moveresize_lookahead (mv_resize, event)) - break; + break; update_pos (mv_resize, - event->xmotion.x_root, - event->xmotion.y_root); + event->xmotion.x_root, + event->xmotion.y_root); /* This should never be triggered in normal cases, but in the * case where the drag started without an implicit grab being @@ -4203,28 +4203,28 @@ _gdk_moveresize_handle_event (XEvent *event) * get a permanently stuck grab. */ if ((event->xmotion.state & button_mask) == 0) - finish_drag (mv_resize); + finish_drag (mv_resize); break; case ButtonRelease: update_pos (mv_resize, - event->xbutton.x_root, - event->xbutton.y_root); + event->xbutton.x_root, + event->xbutton.y_root); if (event->xbutton.button == mv_resize->moveresize_button) - finish_drag (mv_resize); + finish_drag (mv_resize); break; } return TRUE; } -gboolean -_gdk_moveresize_configure_done (GdkDisplay *display, - GdkWindow *window) +gboolean +_gdk_x11_moveresize_configure_done (GdkDisplay *display, + GdkWindow *window) { XEvent *tmp_event; MoveResizeData *mv_resize = get_move_resize_data (display, FALSE); - + if (!mv_resize || window != mv_resize->moveresize_window) return FALSE; @@ -4232,16 +4232,16 @@ _gdk_moveresize_configure_done (GdkDisplay *display, { tmp_event = mv_resize->moveresize_pending_event; mv_resize->moveresize_pending_event = NULL; - _gdk_moveresize_handle_event (tmp_event); + _gdk_x11_moveresize_handle_event (tmp_event); g_free (tmp_event); } - + return TRUE; } static void create_moveresize_window (MoveResizeData *mv_resize, - guint32 timestamp) + guint32 timestamp) { GdkWindowAttr attributes; gint attributes_mask; -- cgit v1.2.1