]> Dogcows Code - chaz/openbox/blobdiff - openbox/moveresize.c
add copyright headers, adjust --version output to include copyright, and --help outpu...
[chaz/openbox] / openbox / moveresize.c
index 424b8a14b8b7ed01bdf55cfe227eeb14c067402e..ba10af4b3adb4cd2faa8a088d0b5fb9546a90c6f 100644 (file)
@@ -1,3 +1,21 @@
+/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*-
+
+   moveresize.c for the Openbox window manager
+   Copyright (c) 2003        Ben 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"
@@ -26,47 +44,45 @@ static guint button;
 static guint32 corner;
 static ObCorner lockcorner;
 
-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(gpointer client)
 {
-    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);
 }
 
-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, char *format, int a, int b)
 {
     char *text;
-    Rect *area;
 
     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);
+    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);
 }
 
@@ -74,13 +90,19 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr)
 {
     ObCursor cur;
 
-    g_assert(!moveresize_in_progress);
+    if (moveresize_in_progress || !c->frame->visible)
+        return;
 
     moveresize_client = c;
     start_cx = c->frame->area.x;
     start_cy = c->frame->area.y;
-    start_cw = c->area.width;
-    start_ch = c->area.height;
+    /* 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 / 2;
+    start_ch = c->area.height + c->size_inc.height / 2;
     start_x = x;
     start_y = y;
     corner = cnr;
@@ -139,7 +161,7 @@ void moveresize_start(ObClient *c, int x, int y, guint b, guint32 cnr)
 void moveresize_end(gboolean cancel)
 {
     grab_keyboard(FALSE);
-    grab_pointer(FALSE, None);
+    grab_pointer(FALSE, OB_CURSOR_NONE);
 
     popup_hide(popup);
 
@@ -161,48 +183,45 @@ void moveresize_end(gboolean cancel)
 
 static void do_move(gboolean resist)
 {
-    Rect *a;
-
     if (resist)
-        resist_move(moveresize_client, &cur_x, &cur_y);
+        resist_move_windows(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_move(moveresize_client, cur_x, cur_y);
-
-    /* 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);
+    client_configure(moveresize_client, OB_CORNER_TOPLEFT, cur_x, cur_y,
+                     moveresize_client->area.width,
+                     moveresize_client->area.height, TRUE, FALSE);
 }
 
 static void do_resize(gboolean resist)
 {
-    if (resist) {
-        /* resist_size needs the frame size */
-        cur_x += moveresize_client->frame->size.left +
-            moveresize_client->frame->size.right;
-        cur_y += moveresize_client->frame->size.top +
-            moveresize_client->frame->size.bottom;
-
-        resist_size(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;
-    }
-    
+    /* resist_size_* needs the frame size */
+    cur_x += moveresize_client->frame->size.left +
+        moveresize_client->frame->size.right;
+    cur_y += moveresize_client->frame->size.top +
+        moveresize_client->frame->size.bottom;
+
+    if (resist)
+        resist_size_windows(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);
+    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)
@@ -275,7 +294,7 @@ void moveresize_event(XEvent *e)
             moveresize_end(FALSE);
         else {
             if (corner == prop_atoms.net_wm_moveresize_size_keyboard) {
-                int dx = 0, dy = 0;
+                int 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);
@@ -291,10 +310,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;
+                int dx = 0, dy = 0, ox = cur_x, oy = cur_y;
+                int opx, px, opy, py;
 
                 if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT))
                     dx = 4;
@@ -309,9 +342,24 @@ 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);
             }
         }
     }
This page took 0.029252 seconds and 4 git commands to generate.