X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmoveresize.c;h=39fdd45daefaba48a5f67692be79c3bb5764305c;hb=ad852b6b56e43bdd7dda1389f54051cf92c0fad9;hp=b9a3309ef828edc88d7700a1f3d71d95bf33af2c;hpb=8420e47848ba2c521929d2d7be5d58d59d0b209c;p=chaz%2Fopenbox diff --git a/openbox/moveresize.c b/openbox/moveresize.c index b9a3309e..39fdd45d 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -1,3 +1,22 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + moveresize.c for the Openbox window manager + Copyright (c) 2006 Mikael Magnusson + Copyright (c) 2003-2007 Dana Jansens + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + #include "grab.h" #include "framerender.h" #include "screen.h" @@ -9,6 +28,9 @@ #include "popup.h" #include "moveresize.h" #include "config.h" +#include "event.h" +#include "debug.h" +#include "extensions.h" #include "render/render.h" #include "render/theme.h" @@ -17,64 +39,81 @@ gboolean moveresize_in_progress = FALSE; ObClient *moveresize_client = NULL; +#ifdef SYNC +XSyncAlarm moveresize_alarm = None; +#endif static gboolean moving = FALSE; /* TRUE - moving, FALSE - resizing */ -static int start_x, start_y, start_cx, start_cy, start_cw, start_ch; -static int cur_x, cur_y; +static gint start_x, start_y, start_cx, start_cy, start_cw, start_ch; +static gint cur_x, cur_y; static guint button; static guint32 corner; static ObCorner lockcorner; +#ifdef SYNC +static gboolean waiting_for_sync; +#endif -static Popup *popup = NULL; +static ObPopup *popup = NULL; -#define POPUP_X (10) -#define POPUP_Y (10) - -static void client_dest(ObClient *c) +static void client_dest(ObClient *client, gpointer data) { - if (moveresize_client == c) + if (moveresize_client == client) moveresize_end(TRUE); } -void moveresize_startup() +void moveresize_startup(gboolean reconfig) { - XSetWindowAttributes attrib; - popup = popup_new(FALSE); - popup_size_to_string(popup, "W: 0000 W: 0000"); - - attrib.save_under = True; - client_add_destructor(client_dest); + if (!reconfig) + client_add_destructor(client_dest, NULL); } -void moveresize_shutdown() +void moveresize_shutdown(gboolean reconfig) { - client_remove_destructor(client_dest); + if (!reconfig) { + if (moveresize_in_progress) + moveresize_end(FALSE); + client_remove_destructor(client_dest); + } popup_free(popup); popup = NULL; } -static void popup_coords(char *format, int a, int b) +static void popup_coords(ObClient *c, const gchar *format, gint a, gint b) { - char *text; - Rect *area; + gchar *text; text = g_strdup_printf(format, a, b); - area = screen_physical_area_monitor(0); - popup_position(popup, NorthWestGravity, - POPUP_X + area->x, POPUP_Y + area->y); - popup_show(popup, text, NULL); + if (config_resize_popup_pos == 1) /* == "Top" */ + popup_position(popup, SouthGravity, + c->frame->area.x + + c->frame->area.width/2, + c->frame->area.y - ob_rr_theme->fbwidth); + else /* == "Center" */ + popup_position(popup, CenterGravity, + c->frame->area.x + c->frame->size.left + + c->area.width / 2, + c->frame->area.y + c->frame->size.top + + c->area.height / 2); + popup_show(popup, text); g_free(text); } -void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr) +void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr) { ObCursor cur; - g_assert(!moveresize_in_progress); + moving = (cnr == prop_atoms.net_wm_moveresize_move || + cnr == prop_atoms.net_wm_moveresize_move_keyboard); + + if (moveresize_in_progress || !c->frame->visible || + !(moving ? + (c->functions & OB_CLIENT_FUNC_MOVE) : + (c->functions & OB_CLIENT_FUNC_RESIZE))) + return; moveresize_client = c; start_cx = c->frame->area.x; @@ -84,8 +123,8 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr) increment instead of at 0, so you have to move half an increment either way instead of a full increment one and 1 px the other. and this is one large mother fucking comment. */ - start_cw = c->area.width + (c->size_inc.width + 1) / 2; - start_ch = c->area.height + (c->size_inc.height + 1) / 2; + start_cw = c->area.width + c->size_inc.width / 2; + start_ch = c->area.height + c->size_inc.height / 2; start_x = x; start_y = y; corner = cnr; @@ -99,15 +138,12 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr) c->area.width / 2, c->area.height / 2); */ - if (corner == prop_atoms.net_wm_moveresize_move || - corner == prop_atoms.net_wm_moveresize_move_keyboard) { + if (moving) { cur_x = start_cx; cur_y = start_cy; - moving = TRUE; } else { cur_x = start_cw; cur_y = start_ch; - moving = FALSE; } moveresize_in_progress = TRUE; @@ -137,14 +173,55 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr) else g_assert_not_reached(); - grab_pointer(TRUE, cur); +#ifdef SYNC + if (!moving && extensions_shape && moveresize_client->sync_request && + moveresize_client->sync_counter) + { + /* Initialize values for the resize syncing, and create an alarm for + the client's xsync counter */ + + XSyncValue val; + XSyncAlarmAttributes aa; + + /* set the counter to an initial value */ + XSyncIntToValue(&val, 0); + XSyncSetCounter(ob_display, moveresize_client->sync_counter, val); + + /* this will be incremented when we tell the client what we're + looking for */ + moveresize_client->sync_counter_value = 0; + + /* the next sequence we're waiting for with the alarm */ + XSyncIntToValue(&val, 1); + + /* set an alarm on the counter */ + aa.trigger.counter = moveresize_client->sync_counter; + aa.trigger.wait_value = val; + aa.trigger.value_type = XSyncAbsolute; + aa.trigger.test_type = XSyncPositiveTransition; + aa.events = True; + XSyncIntToValue(&aa.delta, 1); + moveresize_alarm = XSyncCreateAlarm(ob_display, + XSyncCACounter | + XSyncCAValue | + XSyncCAValueType | + XSyncCATestType | + XSyncCADelta | + XSyncCAEvents, + &aa); + + waiting_for_sync = FALSE; + } +#endif + + grab_pointer(TRUE, FALSE, cur); grab_keyboard(TRUE); } void moveresize_end(gboolean cancel) { grab_keyboard(FALSE); - grab_pointer(FALSE, None); + grab_pointer(FALSE, FALSE, OB_CURSOR_NONE); popup_hide(popup); @@ -153,6 +230,14 @@ void moveresize_end(gboolean cancel) (cancel ? start_cx : cur_x), (cancel ? start_cy : cur_y)); } else { +#ifdef SYNC + /* turn off the alarm */ + if (moveresize_alarm != None) { + XSyncDestroyAlarm(ob_display, moveresize_alarm); + moveresize_alarm = None; + } +#endif + client_configure(moveresize_client, lockcorner, moveresize_client->area.x, moveresize_client->area.y, @@ -166,26 +251,89 @@ void moveresize_end(gboolean cancel) static void do_move(gboolean resist) { - Rect *a; - - if (resist) + if (resist) { resist_move_windows(moveresize_client, &cur_x, &cur_y); - resist_move_monitors(moveresize_client, &cur_x, &cur_y); + resist_move_monitors(moveresize_client, &cur_x, &cur_y); + } /* get where the client should be */ frame_frame_gravity(moveresize_client->frame, &cur_x, &cur_y); client_configure(moveresize_client, OB_CORNER_TOPLEFT, cur_x, cur_y, - start_cw, start_ch, TRUE, FALSE); + moveresize_client->area.width, + moveresize_client->area.height, TRUE, FALSE); + if (config_resize_popup_show == 2) /* == "Always" */ + popup_coords(moveresize_client, "%d x %d", + moveresize_client->frame->area.x, + moveresize_client->frame->area.y); +} + +static void do_resize() +{ +#ifdef SYNC + gint x, y, w, h, lw, lh; + + /* see if it is actually going to resize */ + x = moveresize_client->area.x; + y = moveresize_client->area.y; + w = cur_x; + h = cur_y; + client_try_configure(moveresize_client, lockcorner, &x, &y, &w, &h, + &lw, &lh, TRUE); + if (w == moveresize_client->area.width && + h == moveresize_client->area.height) + { + return; + } + + if (extensions_sync && moveresize_client->sync_request && + moveresize_client->sync_counter) + { + XEvent ce; + XSyncValue val; + + /* are we already waiting for the sync counter to catch up? */ + if (waiting_for_sync) + return; + + /* increment the value we're waiting for */ + ++moveresize_client->sync_counter_value; + XSyncIntToValue(&val, moveresize_client->sync_counter_value); + + /* tell the client what we're waiting for */ + ce.xclient.type = ClientMessage; + ce.xclient.message_type = prop_atoms.wm_protocols; + ce.xclient.display = ob_display; + ce.xclient.window = moveresize_client->window; + ce.xclient.format = 32; + ce.xclient.data.l[0] = prop_atoms.net_wm_sync_request; + ce.xclient.data.l[1] = event_curtime; + ce.xclient.data.l[2] = XSyncValueLow32(val); + ce.xclient.data.l[3] = XSyncValueHigh32(val); + ce.xclient.data.l[4] = 0l; + XSendEvent(ob_display, moveresize_client->window, FALSE, + NoEventMask, &ce); + + waiting_for_sync = TRUE; + } +#endif + + client_configure(moveresize_client, lockcorner, + moveresize_client->area.x, moveresize_client->area.y, + cur_x, cur_y, TRUE, FALSE); /* this would be better with a fixed width font ... XXX can do it better if there are 2 text boxes */ - a = screen_area(screen_desktop); - popup_coords("X: %4d Y: %4d", - moveresize_client->frame->area.x - a->x, - moveresize_client->frame->area.y - a->y); + if (config_resize_popup_show == 2 || /* == "Always" */ + (config_resize_popup_show == 1 && /* == "Nonpixel" */ + (moveresize_client->size_inc.width > 1 || + moveresize_client->size_inc.height > 1)) + ) + popup_coords(moveresize_client, "%d x %d", + moveresize_client->logical_size.width, + moveresize_client->logical_size.height); } -static void do_resize(gboolean resist) +static void calc_resize(gboolean resist) { /* resist_size_* needs the frame size */ cur_x += moveresize_client->frame->size.left + @@ -193,23 +341,15 @@ static void do_resize(gboolean resist) cur_y += moveresize_client->frame->size.top + moveresize_client->frame->size.bottom; - if (resist) + if (resist) { resist_size_windows(moveresize_client, &cur_x, &cur_y, lockcorner); - resist_size_monitors(moveresize_client, &cur_x, &cur_y, lockcorner); + resist_size_monitors(moveresize_client, &cur_x, &cur_y, lockcorner); + } cur_x -= moveresize_client->frame->size.left + moveresize_client->frame->size.right; cur_y -= moveresize_client->frame->size.top + moveresize_client->frame->size.bottom; - - client_configure(moveresize_client, lockcorner, - moveresize_client->area.x, moveresize_client->area.y, - cur_x, cur_y, TRUE, FALSE); - - /* this would be better with a fixed width font ... XXX can do it better - if there are 2 text boxes */ - popup_coords("W: %4d H: %4d", moveresize_client->logical_size.width, - moveresize_client->logical_size.height); } void moveresize_event(XEvent *e) @@ -273,7 +413,8 @@ void moveresize_event(XEvent *e) } else g_assert_not_reached(); - do_resize(TRUE); + calc_resize(TRUE); + do_resize(); } } else if (e->type == KeyPress) { if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) @@ -282,7 +423,7 @@ void moveresize_event(XEvent *e) moveresize_end(FALSE); else { if (corner == prop_atoms.net_wm_moveresize_size_keyboard) { - int dx = 0, dy = 0; + gint dx = 0, dy = 0, ox = cur_x, oy = cur_y; if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT)) dx = MAX(4, moveresize_client->size_inc.width); @@ -298,10 +439,24 @@ void moveresize_event(XEvent *e) cur_x += dx; cur_y += dy; XWarpPointer(ob_display, None, None, 0, 0, 0, 0, dx, dy); + /* steal the motion events this causes */ + XSync(ob_display, FALSE); + { + XEvent ce; + while (XCheckTypedEvent(ob_display, MotionNotify, &ce)); + } do_resize(FALSE); + + /* because the cursor moves even though the window does + not nessesarily (resistance), this adjusts where the curor + thinks it started so that it keeps up with where the window + actually is */ + start_x += dx - (cur_x - ox); + start_y += dy - (cur_y - oy); } else if (corner == prop_atoms.net_wm_moveresize_move_keyboard) { - int dx = 0, dy = 0; + gint dx = 0, dy = 0, ox = cur_x, oy = cur_y; + gint opx, px, opy, py; if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT)) dx = 4; @@ -316,10 +471,32 @@ void moveresize_event(XEvent *e) cur_x += dx; cur_y += dy; + screen_pointer_pos(&opx, &opy); XWarpPointer(ob_display, None, None, 0, 0, 0, 0, dx, dy); + /* steal the motion events this causes */ + XSync(ob_display, FALSE); + { + XEvent ce; + while (XCheckTypedEvent(ob_display, MotionNotify, &ce)); + } + screen_pointer_pos(&px, &py); do_move(FALSE); + + /* because the cursor moves even though the window does + not nessesarily (resistance), this adjusts where the curor + thinks it started so that it keeps up with where the window + actually is */ + start_x += (px - opx) - (cur_x - ox); + start_y += (py - opy) - (cur_y - oy); } } } +#ifdef SYNC + else if (e->type == extensions_sync_event_basep + XSyncAlarmNotify) + { + waiting_for_sync = FALSE; /* we got our sync... */ + do_resize(); /* ...so try resize if there is more change pending */ + } +#endif }