+/* -*- 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 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"
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;
-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);
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 popup_coords(ObClient *c, gchar *format, gint a, gint b)
{
- char *text;
+ 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);
+ 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;
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;
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;
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);
+ 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)
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;
/* 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)
+ 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);
moveresize_end(FALSE);
else {
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);
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, 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;