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

add horiz/vertical options to the maximize action

Browse source
This commit is contained in:
Dana Jansens 2007-06-22 14:47:10 +00:00
parent ee6671c3fa
commit 06ed8ab6c0
2 changed files with 44 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
openbox/action.c
View file

@ -1127,42 +1127,6 @@ void action_resize_relative(union ActionData *data)
client_action_end(data, FALSE); client_action_end(data, FALSE);
} }
void action_maximize_horz(union ActionData *data)
{
client_action_start(data);
client_maximize(data->client.any.c, TRUE, 1);
client_action_end(data, config_focus_under_mouse);
}
void action_unmaximize_horz(union ActionData *data)
{
client_action_start(data);
client_maximize(data->client.any.c, FALSE, 1);
client_action_end(data, config_focus_under_mouse);
}
void action_toggle_maximize_horz(union ActionData *data)
{
client_action_start(data);
client_maximize(data->client.any.c,
!data->client.any.c->max_horz, 1);
client_action_end(data, config_focus_under_mouse);
}
void action_maximize_vert(union ActionData *data)
{
client_action_start(data);
client_maximize(data->client.any.c, TRUE, 2);
client_action_end(data, config_focus_under_mouse);
}
void action_unmaximize_vert(union ActionData *data)
{
client_action_start(data);
client_maximize(data->client.any.c, FALSE, 2);
client_action_end(data, config_focus_under_mouse);
}
void action_toggle_maximize_vert(union ActionData *data) void action_toggle_maximize_vert(union ActionData *data)
{ {
client_action_start(data); client_action_start(data);

48
openbox/actions/maximize.c
View file

@ -1,24 +1,64 @@
#include "openbox/actions.h" #include "openbox/actions.h"
#include "openbox/client.h" #include "openbox/client.h"
typedef struct {
gboolean vertical;
gboolean horizontal;
} 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); static gboolean run_func(ObActionsData *data, gpointer options);
void action_maximize_startup() void action_maximize_startup()
{ {
actions_register("Maximize", actions_register("Maximize",
NULL, NULL, setup_func,
free_func,
run_func, run_func,
NULL, NULL); NULL, NULL);
} }
static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
{
xmlNodePtr n;
Options *o;
o = g_new0(Options, 1);
o->vertical = TRUE;
o->horizontal = TRUE;
if ((n = parse_find_node("vertical", node)))
o->vertical = parse_bool(doc, n);
if ((n = parse_find_node("horizontal", node)))
o->horizontal = parse_bool(doc, n);
return o;
}
static void free_func(gpointer options)
{
Options *o = options;
g_free(o);
}
/* Always return FALSE because its not interactive */ /* Always return FALSE because its not interactive */
static gboolean run_func(ObActionsData *data, gpointer options) static gboolean run_func(ObActionsData *data, gpointer options)
{ {
Options *o = options;
if (data->client) { if (data->client) {
actions_client_move(data, TRUE); actions_client_move(data, TRUE);
client_maximize(data->client,
!(data->client->max_horz || data->client->max_vert), if (o->horizontal && !o->vertical)
0); client_maximize(data->client, !data->client->max_horz, 1);
else if (!o->horizontal && o->vertical)
client_maximize(data->client, !data->client->max_vert, 2);
else if (o->horizontal && o->vertical)
client_maximize(data->client,
!data->client->max_horz || !data->client->max_vert,
0);
actions_client_move(data, FALSE); actions_client_move(data, FALSE);
} }