action_directional_focus,
setup_action_directional_focus_northwest
},
+ {
+ "activate",
+ action_activate,
+ NULL,
+ },
{
"focus",
action_focus,
action_iconify,
NULL
},
+ {
+ "raiselower",
+ action_raiselower,
+ NULL
+ },
{
"raise",
action_raise,
} 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);
+ } else if (act->func == action_activate) {
+ if ((n = parse_find_node("here", node->xmlChildrenNode)))
+ act->data.activate.here = parse_bool(doc, n);
}
}
g_free(actname);
}
}
+void action_activate(union ActionData *data)
+{
+ if (data->activate.c)
+ client_activate(data->activate.c, data->activate.here);
+}
+
void action_focus(union ActionData *data)
{
if (data->client.c)
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)
return;
if ((nf = client_find_directional(data->diraction.c,
data->diraction.direction)))
- client_activate(nf);
+ client_activate(nf, FALSE);
}
void action_movetoedge(union ActionData *data)
switch(data->diraction.direction) {
case OB_DIRECTION_NORTH:
dest = client_directional_edge_search(c, OB_DIRECTION_NORTH);
- if(a->y > (y - c->size_inc.height))
+ if (a->y == y)
height = c->frame->area.height / 2;
else {
height = c->frame->area.y + c->frame->area.height - dest;
break;
case OB_DIRECTION_WEST:
dest = client_directional_edge_search(c, OB_DIRECTION_WEST);
- if(a->x > (x - c->size_inc.width))
+ if (a->x == x)
width = c->frame->area.width / 2;
else {
width = c->frame->area.x + c->frame->area.width - dest;
break;
case OB_DIRECTION_SOUTH:
dest = client_directional_edge_search(c, OB_DIRECTION_SOUTH);
- if(a->y + a->height <
- (y + c->frame->area.height + c->size_inc.height)) {
+ if (a->y + a->height == y + c->frame->area.height) {
height = c->frame->area.height / 2;
y = a->y + a->height - height;
} else
height = dest - c->frame->area.y;
+ y += (height - c->frame->area.height) % c->size_inc.height;
+ height -= (height - c->frame->area.height) % c->size_inc.height;
break;
case OB_DIRECTION_EAST:
dest = client_directional_edge_search(c, OB_DIRECTION_EAST);
- if(a->x + a->width <
- (x + c->frame->area.width + c->size_inc.width)) {
+ if (a->x + a->width == x + c->frame->area.width) {
width = c->frame->area.width / 2;
x = a->x + a->width - width;
} else
width = dest - c->frame->area.x;
+ x += (width - c->frame->area.width) % c->size_inc.width;
+ width -= (width - c->frame->area.width) % c->size_inc.width;
break;
default:
g_assert_not_reached();