#include "frame.h"
#include "screen.h"
#include "action.h"
-#include "dispatch.h"
#include "openbox.h"
#include <glib.h>
void setup_action_send_to_desktop(ObAction *a)
{
+ a->data.sendto.follow = TRUE;
}
void setup_action_send_to_desktop_prev(ObAction *a)
a->data.sendtodir.dir = OB_DIRECTION_WEST;
a->data.sendtodir.linear = TRUE;
a->data.sendtodir.wrap = TRUE;
+ a->data.sendtodir.follow = TRUE;
}
void setup_action_send_to_desktop_next(ObAction *a)
a->data.sendtodir.dir = OB_DIRECTION_EAST;
a->data.sendtodir.linear = TRUE;
a->data.sendtodir.wrap = TRUE;
+ a->data.sendtodir.follow = TRUE;
}
void setup_action_send_to_desktop_left(ObAction *a)
a->data.sendtodir.dir = OB_DIRECTION_WEST;
a->data.sendtodir.linear = FALSE;
a->data.sendtodir.wrap = TRUE;
+ a->data.sendtodir.follow = TRUE;
}
void setup_action_send_to_desktop_right(ObAction *a)
a->data.sendtodir.dir = OB_DIRECTION_EAST;
a->data.sendtodir.linear = FALSE;
a->data.sendtodir.wrap = TRUE;
+ a->data.sendtodir.follow = TRUE;
}
void setup_action_send_to_desktop_up(ObAction *a)
a->data.sendtodir.dir = OB_DIRECTION_NORTH;
a->data.sendtodir.linear = FALSE;
a->data.sendtodir.wrap = TRUE;
+ a->data.sendtodir.follow = TRUE;
}
void setup_action_send_to_desktop_down(ObAction *a)
a->data.sendtodir.dir = OB_DIRECTION_SOUTH;
a->data.sendtodir.linear = FALSE;
a->data.sendtodir.wrap = TRUE;
+ a->data.sendtodir.follow = TRUE;
}
void setup_action_desktop_prev(ObAction *a)
action_iconify,
NULL
},
+ {
+ "raiselower",
+ action_raiselower,
+ NULL
+ },
{
"raise",
action_raise,
return a;
}
-ObAction *action_parse(xmlDocPtr doc, xmlNodePtr node)
+ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
{
char *actname;
ObAction *act = NULL;
if ((n = parse_find_node("wrap", node->xmlChildrenNode))) {
act->data.desktopdir.wrap = parse_bool(doc, n);
}
+ } else if (act->func == action_send_to_desktop) {
+ if ((n = parse_find_node("follow", node->xmlChildrenNode)))
+ act->data.sendto.follow = parse_bool(doc, n);
} else if (act->func == action_send_to_desktop_dir) {
if ((n = parse_find_node("wrap", node->xmlChildrenNode)))
act->data.sendtodir.wrap = parse_bool(doc, n);
+ if ((n = parse_find_node("follow", node->xmlChildrenNode)))
+ act->data.sendtodir.follow = parse_bool(doc, n);
} else if (act->func == action_activate) {
if ((n = parse_find_node("here", node->xmlChildrenNode)))
act->data.activate.here = parse_bool(doc, n);
client_iconify(data->client.c, TRUE, TRUE);
}
+void action_raiselower(union ActionData *data)
+{
+ ObClient *c = data->client.c;
+ GList *it;
+ gboolean raise = FALSE;
+
+ if (!c) return;
+
+ for (it = stacking_list; it; it = g_list_next(it)) {
+ ObClient *cit = it->data;
+
+ if (cit == c) break;
+ if (client_normal(cit) == client_normal(c) &&
+ cit->layer == c->layer &&
+ cit->frame->visible)
+ {
+ if (RECT_INTERSECTS_RECT(cit->frame->area, c->frame->area)) {
+ raise = TRUE;
+ break;
+ }
+ }
+ }
+
+ if (raise)
+ stacking_raise(CLIENT_AS_WINDOW(c));
+ else
+ stacking_lower(CLIENT_AS_WINDOW(c));
+}
+
void action_raise(union ActionData *data)
{
if (data->client.c)
if (data->sendto.desk < screen_num_desktops ||
data->sendto.desk == DESKTOP_ALL) {
- client_set_desktop(c, data->sendto.desk, TRUE);
- screen_set_desktop(data->sendto.desk);
+ client_set_desktop(c, data->sendto.desk, data->sendto.follow);
+ if (data->sendto.follow)
+ screen_set_desktop(data->sendto.desk);
}
}
d = screen_cycle_desktop(data->sendtodir.dir, data->sendtodir.wrap,
data->sendtodir.linear,
data->sendtodir.final, data->sendtodir.cancel);
- client_set_desktop(c, d, TRUE);
- screen_set_desktop(d);
+ client_set_desktop(c, d, data->sendtodir.follow);
+ if (data->sendtodir.follow)
+ screen_set_desktop(d);
}
#if 0
void action_toggle_decorations(union ActionData *data)
{
- ObClient *c = data->client.c;;
+ ObClient *c = data->client.c;
if (!c) return;