nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

grab the mouse before any move/resizes in actions, preventing focus from moving when followMouse is on and the window moves/resizes out from under the pointer

Browse source
This commit is contained in:
Dana Jansens 2003-09-02 17:54:11 +00:00
parent 67f9061a7a
commit 0223fed117
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
openbox/action.c
View file

@ -9,6 +9,7 @@
#include "screen.h" #include "screen.h"
#include "action.h" #include "action.h"
#include "openbox.h" #include "openbox.h"
#include "grab.h"
#include <glib.h> #include <glib.h>
@ -718,6 +719,9 @@ ObAction *action_from_string(char *name)
actionstrings[i].setup(a); actionstrings[i].setup(a);
break; break;
} }
if (!a)
g_warning("Invalid action '%s' requested. No such action exists.",
name);
return a; return a;
} }
@ -916,32 +920,44 @@ void action_toggle_omnipresent(union ActionData *data)
void action_move_relative_horz(union ActionData *data) void action_move_relative_horz(union ActionData *data)
{ {
ObClient *c = data->relative.any.c; ObClient *c = data->relative.any.c;
if (c) if (c) {
grab_pointer(TRUE, None);
client_move(c, c->area.x + data->relative.delta, c->area.y); client_move(c, c->area.x + data->relative.delta, c->area.y);
grab_pointer(FALSE, None);
}
} }
void action_move_relative_vert(union ActionData *data) void action_move_relative_vert(union ActionData *data)
{ {
ObClient *c = data->relative.any.c; ObClient *c = data->relative.any.c;
if (c) if (c) {
grab_pointer(TRUE, None);
client_move(c, c->area.x, c->area.y + data->relative.delta); client_move(c, c->area.x, c->area.y + data->relative.delta);
grab_pointer(FALSE, None);
}
} }
void action_resize_relative_horz(union ActionData *data) void action_resize_relative_horz(union ActionData *data)
{ {
ObClient *c = data->relative.any.c; ObClient *c = data->relative.any.c;
if (c) if (c) {
grab_pointer(TRUE, None);
client_resize(c, client_resize(c,
c->area.width + data->relative.delta * c->size_inc.width, c->area.width + data->relative.delta * c->size_inc.width,
c->area.height); c->area.height);
grab_pointer(FALSE, None);
}
} }
void action_resize_relative_vert(union ActionData *data) void action_resize_relative_vert(union ActionData *data)
{ {
ObClient *c = data->relative.any.c; ObClient *c = data->relative.any.c;
if (c && !c->shaded) if (c && !c->shaded) {
grab_pointer(TRUE, None);
client_resize(c, c->area.width, c->area.height + client_resize(c, c->area.width, c->area.height +
data->relative.delta * c->size_inc.height); data->relative.delta * c->size_inc.height);
grab_pointer(FALSE, None);
}
} }
void action_maximize_full(union ActionData *data) void action_maximize_full(union ActionData *data)
@ -1140,7 +1156,9 @@ void action_movetoedge(union ActionData *data)
g_assert_not_reached(); g_assert_not_reached();
} }
frame_frame_gravity(c->frame, &x, &y); frame_frame_gravity(c->frame, &x, &y);
grab_pointer(TRUE, None);
client_move(c, x, y); client_move(c, x, y);
grab_pointer(FALSE, None);
} }
@ -1203,7 +1221,9 @@ void action_growtoedge(union ActionData *data)
frame_frame_gravity(c->frame, &x, &y); frame_frame_gravity(c->frame, &x, &y);
width -= c->frame->size.left + c->frame->size.right; width -= c->frame->size.left + c->frame->size.right;
height -= c->frame->size.top + c->frame->size.bottom; height -= c->frame->size.top + c->frame->size.bottom;
grab_pointer(TRUE, None);
client_move_resize(c, x, y, width, height); client_move_resize(c, x, y, width, height);
grab_pointer(FALSE, None);
} }
void action_send_to_layer(union ActionData *data) void action_send_to_layer(union ActionData *data)