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

add moverelative action

Browse source
This commit is contained in:
Dana Jansens 2007-06-22 15:26:12 +00:00
parent 1e6c375fdd
commit 597c9c9321
6 changed files with 71 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.am
View file

@ -168,6 +168,7 @@ openbox_openbox_SOURCES = \
openbox/actions/lower.c \
openbox/actions/maximize.c \
openbox/actions/move.c \
openbox/actions/moverelative.c \
openbox/actions/moveto.c \
openbox/actions/raise.c \
openbox/actions/raiselower.c \

42
openbox/action.c
View file

@ -494,26 +494,11 @@ ActionString actionstrings[] =
action_move_relative_horz,
setup_client_action
},
{
"moverelativevert",
action_move_relative_vert,
setup_client_action
},
{
"resizerelativehorz",
action_resize_relative_horz,
setup_client_action
},
{
"resizerelativevert",
action_resize_relative_vert,
setup_client_action
},
{
"moverelative",
action_move_relative,
setup_client_action
},
{
"resizerelative",
action_resize_relative,
@ -762,17 +747,6 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
if (parse_attr_string("name", node, &actname)) {
if ((act = action_from_string(actname, uact))) {
} else if (act->func == action_move_relative_horz ||
act->func == action_move_relative_vert ||
act->func == action_resize_relative_horz ||
act->func == action_resize_relative_vert) {
if ((n = parse_find_node("delta", node->xmlChildrenNode)))
act->data.relative.deltax = parse_int(doc, n);
} else if (act->func == action_move_relative) {
if ((n = parse_find_node("x", node->xmlChildrenNode)))
act->data.relative.deltax = parse_int(doc, n);
if ((n = parse_find_node("y", node->xmlChildrenNode)))
act->data.relative.deltay = parse_int(doc, n);
} else if (act->func == action_resize_relative) {
if ((n = parse_find_node("left", node->xmlChildrenNode)))
act->data.relative.deltaxl = parse_int(doc, n);
@ -1004,22 +978,6 @@ void action_toggle_omnipresent(union ActionData *data)
screen_desktop : DESKTOP_ALL, FALSE, TRUE);
}
void action_move_relative_horz(union ActionData *data)
{
ObClient *c = data->relative.any.c;
client_action_start(data);
client_move(c, c->area.x + data->relative.deltax, c->area.y);
client_action_end(data, FALSE);
}
void action_move_relative_vert(union ActionData *data)
{
ObClient *c = data->relative.any.c;
client_action_start(data);
client_move(c, c->area.x, c->area.y + data->relative.deltax);
client_action_end(data, FALSE);
}
void action_resize_relative_horz(union ActionData *data)
{
ObClient *c = data->relative.any.c;

1
openbox/actions/all.c
View file

@ -22,4 +22,5 @@ void action_all_startup()
action_fullscreen_startup();
action_maximize_startup();
action_moveto_startup();
action_moverelative_startup();
}

1
openbox/actions/all.h
View file

@ -23,5 +23,6 @@ void action_iconify_startup();
void action_fullscreen_startup();
void action_maximize_startup();
void action_moveto_startup();
void action_moverelative_startup();
#endif

68
openbox/actions/moverelative.c Normal file
View file

@ -0,0 +1,68 @@
#include "openbox/actions.h"
#include "openbox/client.h"
#include "openbox/screen.h"
#include "openbox/frame.h"
#include <stdlib.h> /* for atoi */
typedef struct {
gint x;
gint y;
} Options;
static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
static void free_func(gpointer options);
static gboolean run_func(ObActionsData *data, gpointer options);
void action_moverelative_startup()
{
actions_register("MoveRelative",
setup_func,
free_func,
run_func,
NULL, NULL);
}
static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
{
xmlNodePtr n;
Options *o;
o = g_new0(Options, 1);
if ((n = parse_find_node("x", node)))
o->x = parse_int(doc, n);
if ((n = parse_find_node("y", node)))
o->y = parse_int(doc, n);
return o;
}
static void free_func(gpointer options)
{
Options *o = options;
g_free(o);
}
/* Always return FALSE because its not interactive */
static gboolean run_func(ObActionsData *data, gpointer options)
{
Options *o = options;
if (data->client) {
ObClient *c;
gint x, y, lw, lh, w, h;
c = data->client;
x = data->client->area.x + o->x;
y = data->client->area.y + o->y;
w = data->client->area.width;
h = data->client->area.height;
client_try_configure(data->client, &x, &y, &w, &h, &lw, &lh, TRUE);
client_find_onscreen(data->client, &x, &y, w, h, FALSE);
client_configure(data->client, x, y, w, h, TRUE, TRUE, FALSE);
}
return FALSE;
}

2
openbox/actions/moveto.c
View file

@ -99,9 +99,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
/* force it on screen if its moving to another monitor */
client_find_onscreen(c, &x, &y, w, h, mon != cmon);
actions_client_move(data, TRUE);
client_configure(c, x, y, w, h, TRUE, TRUE, FALSE);
actions_client_move(data, FALSE);
g_free(area);
g_free(carea);