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

split layer action back into togglealwaysontop, togglealwaysonbottom, and sendtolayer (which takes <layer> as an argument)

Browse source
This commit is contained in:
Dana Jansens 2007-07-13 12:19:17 -04:00
parent 3e94f9e642
commit 23c8f0bc5b
1 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
openbox/actions/layer.c
View file

@ -4,23 +4,42 @@
typedef struct { typedef struct {
gint layer; /*!< -1 for below, 0 for normal, and 1 for above */ gint layer; /*!< -1 for below, 0 for normal, and 1 for above */
gboolean toggle; gboolean toggle;
gboolean on;
} Options; } Options;
static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node); static gpointer setup_func_top(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
static void free_func(gpointer options); static gpointer setup_func_bottom(ObParseInst *i, xmlDocPtr doc,
xmlNodePtr node);
static gpointer setup_func_send(ObParseInst *i, xmlDocPtr doc,
xmlNodePtr node);
static gboolean run_func(ObActionsData *data, gpointer options); static gboolean run_func(ObActionsData *data, gpointer options);
void action_layer_startup() void action_layer_startup()
{ {
actions_register("Layer", actions_register("ToggleAlwaysOnTop", setup_func_top, g_free,
setup_func, run_func_toggle, NULL, NULL);
free_func, actions_register("ToggleAlwaysOnBottom", setup_func_bottom, g_free,
run_func, run_func_toggle, NULL, NULL);
NULL, NULL); actions_register("SendToLayer", setup_func_send, g_free,
run_func_send, NULL, NULL);
} }
static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node) static gpointer setup_func_top(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
{
Options *o = g_new0(Options, 1);
o->layer = 1;
return o;
}
static gpointer setup_func_bottom(ObParseInst *i, xmlDocPtr doc,
xmlNodePtr node)
{
Options *o = g_new0(Options, 1);
o->layer = -1;
return o;
}
static gpointer setup_func_send(ObParseInst *i, xmlDocPtr doc,
xmlNodePtr node)
{ {
xmlNodePtr n; xmlNodePtr n;
Options *o; Options *o;
@ -41,25 +60,10 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
o->layer = 0; o->layer = 0;
g_free(s); g_free(s);
} }
if ((n = parse_find_node("state", node))) {
gchar *s = parse_string(doc, n);
if (g_ascii_strcasecmp(s, "toggle")) {
o->toggle = FALSE;
o->on = parse_bool(doc, n);
}
g_free(s);
}
return o; 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)
{ {
@ -71,17 +75,15 @@ static gboolean run_func(ObActionsData *data, gpointer options)
actions_client_move(data, TRUE); actions_client_move(data, TRUE);
if (o->layer < 0) { if (o->layer < 0) {
if (o->toggle || c->below != o->on) if (o->toggle || !c->below)
client_set_layer(c, c->below ? 0 : -1); client_set_layer(c, c->below ? 0 : -1);
} }
else if (o->layer > 0) { else if (o->layer > 0) {
if (o->toggle || c->above != o->on) if (o->toggle || !c->above)
client_set_layer(c, c->above ? 0 : 1); client_set_layer(c, c->above ? 0 : 1);
} }
else { else if (c->above || c->below)
if ((o->toggle || o->on) && (c->above || c->below))
client_set_layer(c, 0); client_set_layer(c, 0);
}
actions_client_move(data, FALSE); actions_client_move(data, FALSE);
} }