#include "dock.h"
#include "config.h"
#include "mainloop.h"
+#include "startupnotify.h"
#include <glib.h>
act->data.execute.path = parse_expand_tilde(s);
g_free(s);
}
+ if ((n = parse_find_node("startupnotify", node->xmlChildrenNode))) {
+ xmlNodePtr m;
+ if ((m = parse_find_node("enabled", n->xmlChildrenNode)))
+ act->data.execute.startupnotify = parse_bool(doc, m);
+ if ((m = parse_find_node("name", n->xmlChildrenNode)))
+ act->data.execute.name = parse_string(doc, m);
+ if ((m = parse_find_node("icon", n->xmlChildrenNode)))
+ act->data.execute.icon_name = parse_string(doc, m);
+ }
} else if (act->func == action_showmenu) {
if ((n = parse_find_node("menu", node->xmlChildrenNode)))
act->data.showmenu.name = parse_string(doc, n);
act->func == action_raiselower ||
act->func == action_shadelower ||
act->func == action_unshaderaise) {
- if ((n = parse_find_node("group", node->xmlChildrenNode)))
- act->data.stacking.group = parse_bool(doc, n);
}
INTERACTIVE_LIMIT(act, uact);
}
}
void action_run_list(GSList *acts, ObClient *c, ObFrameContext context,
- guint state, guint button, gint x, gint y,
+ guint state, guint button, gint x, gint y, Time time,
gboolean cancel, gboolean done)
{
GSList *it;
it won't work right unless we XUngrabKeyboard first,
even though we grabbed the key/button Asychronously.
e.g. "gnome-panel-control --main-menu" */
- XUngrabKeyboard(ob_display, event_lasttime);
+ XUngrabKeyboard(ob_display, event_curtime);
}
for (it = acts; it; it = g_slist_next(it)) {
a->data.any.button = button;
+ a->data.any.time = time;
+
if (a->data.any.interactive) {
a->data.inter.cancel = cancel;
a->data.inter.final = done;
}
}
-void action_run_string(const gchar *name, struct _ObClient *c)
+void action_run_string(const gchar *name, struct _ObClient *c, Time time)
{
ObAction *a;
GSList *l;
l = g_slist_append(NULL, a);
- action_run(l, c, 0);
+ action_run(l, c, 0, time);
}
void action_execute(union ActionData *data)
g_warning("failed to execute '%s': %s",
cmd, e->message);
g_error_free(e);
+ } else if (data->execute.startupnotify) {
+ gchar **env, *program;
+
+ program = g_path_get_basename(argv[0]);
+ env = sn_get_spawn_environment(program,
+ data->execute.name,
+ data->execute.icon_name,
+ data->execute.any.time);
+ if (!g_spawn_async(NULL, argv, env, G_SPAWN_SEARCH_PATH |
+ G_SPAWN_DO_NOT_REAP_CHILD,
+ NULL, NULL, NULL, &e)) {
+ g_warning("failed to execute '%s': %s",
+ cmd, e->message);
+ g_error_free(e);
+ sn_spawn_cancel();
+ }
+ g_strfreev(env);
+ g_free(program);
+ g_strfreev(argv);
} else {
if (!g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH |
G_SPAWN_DO_NOT_REAP_CHILD,
- NULL, NULL, NULL, &e)) {
+ NULL, NULL, NULL, &e))
+ {
g_warning("failed to execute '%s': %s",
cmd, e->message);
g_error_free(e);
void action_activate(union ActionData *data)
{
- client_activate(data->activate.any.c, data->activate.here);
+ /* similar to the openbox dock for dockapps, don't let user actions give
+ focus to 3rd-party docks (panels) either (unless they ask for it
+ themselves). */
+ if (data->client.any.c->type != OB_CLIENT_TYPE_DOCK) {
+ /* if using focus_delay, stop the timer now so that focus doesn't go
+ moving on us */
+ event_halt_focus_delay();
+
+ client_activate(data->activate.any.c, data->activate.here, TRUE,
+ data->activate.any.time);
+ }
}
void action_focus(union ActionData *data)
{
- /* if using focus_delay, stop the timer now so that focus doesn't go moving
- on us */
- event_halt_focus_delay();
+ /* similar to the openbox dock for dockapps, don't let user actions give
+ focus to 3rd-party docks (panels) either (unless they ask for it
+ themselves). */
+ if (data->client.any.c->type != OB_CLIENT_TYPE_DOCK) {
+ /* if using focus_delay, stop the timer now so that focus doesn't go
+ moving on us */
+ event_halt_focus_delay();
- client_focus(data->client.any.c);
+ if (client_validate(data->client.any.c))
+ client_focus(data->client.any.c);
+ }
}
void action_unfocus (union ActionData *data)
{
if (data->client.any.c == focus_client)
- focus_fallback(OB_FOCUS_FALLBACK_UNFOCUSING);
+ focus_fallback(FALSE);
}
void action_iconify(union ActionData *data)
void action_raise(union ActionData *data)
{
client_action_start(data);
- stacking_raise(CLIENT_AS_WINDOW(data->client.any.c), data->stacking.group);
+ stacking_raise(CLIENT_AS_WINDOW(data->client.any.c));
client_action_end(data);
}
void action_lower(union ActionData *data)
{
client_action_start(data);
- stacking_lower(CLIENT_AS_WINDOW(data->client.any.c), data->stacking.group);
+ stacking_lower(CLIENT_AS_WINDOW(data->client.any.c));
client_action_end(data);
}
void action_resize_relative(union ActionData *data)
{
ObClient *c = data->relative.any.c;
+ gint x, y, ow, w, oh, h, lw, lh;
+
client_action_start(data);
- client_move_resize(c,
- c->area.x - data->relative.deltaxl * c->size_inc.width,
- c->area.y - data->relative.deltayu * c->size_inc.height,
- c->area.width + data->relative.deltax * c->size_inc.width
- + data->relative.deltaxl * c->size_inc.width,
- c->area.height + data->relative.deltay * c->size_inc.height
- + data->relative.deltayu * c->size_inc.height);
+
+ x = c->area.x;
+ y = c->area.y;
+ ow = c->area.width;
+ w = ow + data->relative.deltax * c->size_inc.width
+ + data->relative.deltaxl * c->size_inc.width;
+ oh = c->area.height;
+ h = oh + data->relative.deltay * c->size_inc.height
+ + data->relative.deltayu * c->size_inc.height;
+
+ client_try_configure(c, OB_CORNER_TOPLEFT, &x, &y, &w, &h, &lw, &lh, TRUE);
+ client_move_resize(c, x + (ow - w), y + (oh - h), w, h);
client_action_end(data);
}
void action_maximize_full(union ActionData *data)
{
client_action_start(data);
- client_maximize(data->client.any.c, TRUE, 0, TRUE);
+ client_maximize(data->client.any.c, TRUE, 0);
client_action_end(data);
}
void action_unmaximize_full(union ActionData *data)
{
client_action_start(data);
- client_maximize(data->client.any.c, FALSE, 0, TRUE);
+ client_maximize(data->client.any.c, FALSE, 0);
client_action_end(data);
}
client_maximize(data->client.any.c,
!(data->client.any.c->max_horz ||
data->client.any.c->max_vert),
- 0, TRUE);
+ 0);
client_action_end(data);
}
void action_maximize_horz(union ActionData *data)
{
client_action_start(data);
- client_maximize(data->client.any.c, TRUE, 1, TRUE);
+ client_maximize(data->client.any.c, TRUE, 1);
client_action_end(data);
}
void action_unmaximize_horz(union ActionData *data)
{
client_action_start(data);
- client_maximize(data->client.any.c, FALSE, 1, TRUE);
+ client_maximize(data->client.any.c, FALSE, 1);
client_action_end(data);
}
{
client_action_start(data);
client_maximize(data->client.any.c,
- !data->client.any.c->max_horz, 1, TRUE);
+ !data->client.any.c->max_horz, 1);
client_action_end(data);
}
void action_maximize_vert(union ActionData *data)
{
client_action_start(data);
- client_maximize(data->client.any.c, TRUE, 2, TRUE);
+ client_maximize(data->client.any.c, TRUE, 2);
client_action_end(data);
}
void action_unmaximize_vert(union ActionData *data)
{
client_action_start(data);
- client_maximize(data->client.any.c, FALSE, 2, TRUE);
+ client_maximize(data->client.any.c, FALSE, 2);
client_action_end(data);
}
{
client_action_start(data);
client_maximize(data->client.any.c,
- !data->client.any.c->max_vert, 2, TRUE);
+ !data->client.any.c->max_vert, 2);
client_action_end(data);
}
void action_toggle_fullscreen(union ActionData *data)
{
client_action_start(data);
- client_fullscreen(data->client.any.c,
- !(data->client.any.c->fullscreen), TRUE);
+ client_fullscreen(data->client.any.c, !(data->client.any.c->fullscreen));
client_action_end(data);
}
focus_cycle(data->cycle.forward, data->cycle.linear, data->any.interactive,
data->cycle.dialog,
- data->cycle.inter.final, data->cycle.inter.cancel);
+ data->cycle.inter.final, data->cycle.inter.cancel,
+ data->cycle.inter.any.time);
}
void action_directional_focus(union ActionData *data)
data->any.interactive,
data->interdiraction.dialog,
data->interdiraction.inter.final,
- data->interdiraction.inter.cancel);
+ data->interdiraction.inter.cancel,
+ data->interdiraction.inter.any.time);
}
void action_movetoedge(union ActionData *data)
switch(data->diraction.direction) {
case OB_DIRECTION_NORTH:
- y = client_directional_edge_search(c, OB_DIRECTION_NORTH, data->diraction.hang)
+ y = client_directional_edge_search(c, OB_DIRECTION_NORTH,
+ data->diraction.hang)
- (data->diraction.hang ? c->frame->area.height : 0);
break;
case OB_DIRECTION_WEST:
- x = client_directional_edge_search(c, OB_DIRECTION_WEST, data->diraction.hang)
+ x = client_directional_edge_search(c, OB_DIRECTION_WEST,
+ data->diraction.hang)
- (data->diraction.hang ? c->frame->area.width : 0);
break;
case OB_DIRECTION_SOUTH:
- y = client_directional_edge_search(c, OB_DIRECTION_SOUTH, data->diraction.hang)
+ y = client_directional_edge_search(c, OB_DIRECTION_SOUTH,
+ data->diraction.hang)
- (data->diraction.hang ? 0 : c->frame->area.height);
break;
case OB_DIRECTION_EAST:
- x = client_directional_edge_search(c, OB_DIRECTION_EAST, data->diraction.hang)
+ x = client_directional_edge_search(c, OB_DIRECTION_EAST,
+ data->diraction.hang)
- (data->diraction.hang ? 0 : c->frame->area.width);
break;
default: