X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmoveresize.c;h=b0b1f2a106daabeda8afb1a38aa3947084a8cc42;hb=378adaa94f0fac07dc65f0531e950c7ec8944cdf;hp=722146aa9883420b8fbad0fab88baa465e6e59f2;hpb=806a8c411f10c7a2292bfac15d77c8609f56ee71;p=chaz%2Fopenbox

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 722146aa..b0b1f2a1 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,18 +39,24 @@
 
 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;
 
-static void client_dest(gpointer client)
+static void client_dest(ObClient *client, gpointer data)
 {
     if (moveresize_client == client)
         moveresize_end(TRUE);    
@@ -39,48 +67,110 @@ void moveresize_startup(gboolean reconfig)
     popup = popup_new(FALSE);
 
     if (!reconfig)
-        client_add_destructor(client_dest);
+        client_add_destructor(client_dest, NULL);
 }
 
 void moveresize_shutdown(gboolean reconfig)
 {
-    if (!reconfig)
+    if (!reconfig) {
+        if (moveresize_in_progress)
+            moveresize_end(FALSE);
         client_remove_destructor(client_dest);
+    }
 
     popup_free(popup);
     popup = NULL;
 }
 
-static void popup_coords(ObClient *c, char *format, int a, int b)
+static void get_resize_position(gint *x, gint *y, gboolean cancel)
 {
-    char *text;
+    gint dw, dh;
+    gint w, h, lw, lh;
+
+    *x = moveresize_client->frame->area.x;
+    *y = moveresize_client->frame->area.y;
+
+    if (cancel) {
+        w = start_cw;
+        h = start_ch;
+    } else {
+        w = cur_x;
+        h = cur_y;
+    }
+
+    /* see how much it is actually going to resize */
+    {
+        gint cx = *x, cy = *y;
+        frame_frame_gravity(moveresize_client->frame, &cx, &cy, w, h);
+        client_try_configure(moveresize_client, &cx, &cy, &w, &h,
+                             &lw, &lh, TRUE);
+    }
+    dw = w - moveresize_client->area.width;
+    dh = h - moveresize_client->area.height;
+
+    switch (lockcorner) {
+    case OB_CORNER_TOPLEFT:
+        break;
+    case OB_CORNER_TOPRIGHT:
+        *x -= dw;
+        break;
+    case OB_CORNER_BOTTOMLEFT:
+        *y -= dh;
+        break;
+    case OB_CORNER_BOTTOMRIGHT:
+        *x -= dw;
+        *y -= dh;
+        break;
+    }
+
+    frame_frame_gravity(moveresize_client->frame, x, y, w, h);
+}
+
+static void popup_coords(ObClient *c, const gchar *format, gint a, gint b)
+{
+    gchar *text;
 
     text = g_strdup_printf(format, a, b);
-    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, 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;
+
+    frame_end_iconify_animation(c->frame);
 
     moveresize_client = c;
-    start_cx = c->frame->area.x;
-    start_cy = c->frame->area.y;
+    start_cx = c->area.x;
+    start_cy = c->area.y;
     /* these adjustments for the size_inc make resizing a terminal more
        friendly. you essentially start the resize in the middle of the
        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;
@@ -94,15 +184,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;
@@ -132,14 +219,57 @@ 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 (config_resize_redraw && !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)
 {
+    gint x, y;
+
     grab_keyboard(FALSE);
-    grab_pointer(FALSE, None);
+    grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
 
     popup_hide(popup);
 
@@ -148,9 +278,16 @@ void moveresize_end(gboolean cancel)
                     (cancel ? start_cx : cur_x),
                     (cancel ? start_cy : cur_y));
     } else {
-        client_configure(moveresize_client, lockcorner,
-                         moveresize_client->area.x,
-                         moveresize_client->area.y,
+#ifdef SYNC
+        /* turn off the alarm */
+        if (moveresize_alarm != None) {
+            XSyncDestroyAlarm(ob_display, moveresize_alarm);
+            moveresize_alarm = None;
+        }
+#endif
+
+        get_resize_position(&x, &y, cancel);
+        client_configure(moveresize_client, x, y,
                          (cancel ? start_cw : cur_x),
                          (cancel ? start_ch : cur_y), TRUE, TRUE);
     }
@@ -161,17 +298,87 @@ void moveresize_end(gboolean cancel)
 
 static void do_move(gboolean resist)
 {
-    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);
+    client_configure(moveresize_client, cur_x, cur_y,
+                     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(gboolean resist)
+static void do_resize()
+{
+#ifdef SYNC
+    if (config_resize_redraw && extensions_sync &&
+        moveresize_client->sync_request && moveresize_client->sync_counter)
+    {
+        XEvent ce;
+        XSyncValue val;
+        gint x, y, w, h, lw, lh;
+
+        /* are we already waiting for the sync counter to catch up? */
+        if (waiting_for_sync)
+            return;
+
+        /* see if it is actually going to resize */
+        x = 0;
+        y = 0;
+        w = cur_x;
+        h = cur_y;
+        client_try_configure(moveresize_client, &x, &y, &w, &h,
+                             &lw, &lh, TRUE);
+        if (w == moveresize_client->area.width &&
+            h == moveresize_client->area.height)
+        {
+            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
+
+    {
+        gint x, y;
+        get_resize_position(&x, &y, FALSE);
+        client_configure(moveresize_client, x, 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 */
+    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 calc_resize(gboolean resist)
 {
     /* resist_size_* needs the frame size */
     cur_x += moveresize_client->frame->size.left +
@@ -179,30 +386,21 @@ 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 */
-    if (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);
 }
 
-void moveresize_event(XEvent *e)
+gboolean moveresize_event(XEvent *e)
 {
+    gboolean used = FALSE;
+
     g_assert(moveresize_in_progress);
 
     if (e->type == ButtonPress) {
@@ -211,9 +409,11 @@ void moveresize_event(XEvent *e)
             start_y = e->xbutton.y_root;
             button = e->xbutton.button; /* this will end it now */
         }
+        used = e->xbutton.button == button;
     } else if (e->type == ButtonRelease) {
         if (!button || e->xbutton.button == button) {
             moveresize_end(FALSE);
+            used = TRUE;
         }
     } else if (e->type == MotionNotify) {
         if (moving) {
@@ -262,16 +462,24 @@ void moveresize_event(XEvent *e)
             } else
                 g_assert_not_reached();
 
-            do_resize(TRUE);
+            calc_resize(TRUE);
+            do_resize();
         }
+        used = TRUE;
     } else if (e->type == KeyPress) {
-        if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
+        if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) {
             moveresize_end(TRUE);
-        else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN))
+            used = TRUE;
+        } else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN)) {
             moveresize_end(FALSE);
-        else {
+            used = TRUE;
+        } else if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT) ||
+                   e->xkey.keycode == ob_keycode(OB_KEY_LEFT) ||
+                   e->xkey.keycode == ob_keycode(OB_KEY_DOWN) ||
+                   e->xkey.keycode == ob_keycode(OB_KEY_UP))
+        {
             if (corner == prop_atoms.net_wm_moveresize_size_keyboard) {
-                int dx = 0, dy = 0, ox = cur_x, oy = cur_y;
+                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);
@@ -279,10 +487,8 @@ void moveresize_event(XEvent *e)
                     dx = -MAX(4, moveresize_client->size_inc.width);
                 else if (e->xkey.keycode == ob_keycode(OB_KEY_DOWN))
                     dy = MAX(4, moveresize_client->size_inc.height);
-                else if (e->xkey.keycode == ob_keycode(OB_KEY_UP))
+                else /* if (e->xkey.keycode == ob_keycode(OB_KEY_UP)) */
                     dy = -MAX(4, moveresize_client->size_inc.height);
-                else
-                    return;
 
                 cur_x += dx;
                 cur_y += dy;
@@ -302,9 +508,11 @@ void moveresize_event(XEvent *e)
                    actually is */
                 start_x += dx - (cur_x - ox);
                 start_y += dy - (cur_y - oy);
+
+                used = TRUE;
             } else if (corner == prop_atoms.net_wm_moveresize_move_keyboard) {
-                int dx = 0, dy = 0, ox = cur_x, oy = cur_y;
-                int opx, px, opy, py;
+                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;
@@ -312,10 +520,8 @@ void moveresize_event(XEvent *e)
                     dx = -4;
                 else if (e->xkey.keycode == ob_keycode(OB_KEY_DOWN))
                     dy = 4;
-                else if (e->xkey.keycode == ob_keycode(OB_KEY_UP))
+                else /* if (e->xkey.keycode == ob_keycode(OB_KEY_UP)) */
                     dy = -4;
-                else
-                    return;
 
                 cur_x += dx;
                 cur_y += dy;
@@ -337,7 +543,18 @@ void moveresize_event(XEvent *e)
                    actually is */
                 start_x += (px - opx) - (cur_x - ox);
                 start_y += (py - opy) - (cur_y - oy);
+
+                used = TRUE;
             }
         }
     }
+#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 */
+        used = TRUE;
+    }
+#endif
+    return used;
 }