+#include "debug.h"
#include "client.h"
#include "focus.h"
#include "moveresize.h"
typedef struct ActionString {
char *name;
void (*func)(union ActionData *);
- void (*setup)(Action *);
+ void (*setup)(ObAction *);
} ActionString;
-Action *action_new(void (*func)(union ActionData *data))
+ObAction *action_new(void (*func)(union ActionData *data))
{
- Action *a = g_new0(Action, 1);
+ ObAction *a = g_new0(ObAction, 1);
a->func = func;
return a;
}
-void action_free(Action *a)
+void action_free(ObAction *a)
{
if (a == NULL) return;
g_free(a);
}
-void setup_action_directional_focus_north(Action *a)
+void setup_action_directional_focus_north(ObAction *a)
{
- a->data.diraction.direction = Direction_North;
+ a->data.diraction.direction = OB_DIRECTION_NORTH;
}
-void setup_action_directional_focus_east(Action *a)
+void setup_action_directional_focus_east(ObAction *a)
{
- a->data.diraction.direction = Direction_East;
+ a->data.diraction.direction = OB_DIRECTION_EAST;
}
-void setup_action_directional_focus_south(Action *a)
+void setup_action_directional_focus_south(ObAction *a)
{
- a->data.diraction.direction = Direction_South;
+ a->data.diraction.direction = OB_DIRECTION_SOUTH;
}
-void setup_action_directional_focus_west(Action *a)
+void setup_action_directional_focus_west(ObAction *a)
{
- a->data.diraction.direction = Direction_West;
+ a->data.diraction.direction = OB_DIRECTION_WEST;
}
-void setup_action_directional_focus_northeast(Action *a)
+void setup_action_directional_focus_northeast(ObAction *a)
{
- a->data.diraction.direction = Direction_NorthEast;
+ a->data.diraction.direction = OB_DIRECTION_NORTHEAST;
}
-void setup_action_directional_focus_southeast(Action *a)
+void setup_action_directional_focus_southeast(ObAction *a)
{
- a->data.diraction.direction = Direction_SouthEast;
+ a->data.diraction.direction = OB_DIRECTION_SOUTHEAST;
}
-void setup_action_directional_focus_southwest(Action *a)
+void setup_action_directional_focus_southwest(ObAction *a)
{
- a->data.diraction.direction = Direction_SouthWest;
+ a->data.diraction.direction = OB_DIRECTION_SOUTHWEST;
}
-void setup_action_directional_focus_northwest(Action *a)
+void setup_action_directional_focus_northwest(ObAction *a)
{
- a->data.diraction.direction = Direction_NorthWest;
+ a->data.diraction.direction = OB_DIRECTION_NORTHWEST;
}
-void setup_action_send_to_desktop(Action *a)
+void setup_action_send_to_desktop(ObAction *a)
{
- a->data.sendto.follow = TRUE;
}
-void setup_action_send_to_desktop_direction(Action *a)
+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_desktop_direction(Action *a)
+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;
+}
+
+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;
+}
+
+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;
+}
+
+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;
+}
+
+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;
+}
+
+void setup_action_desktop_prev(ObAction *a)
+{
+ a->data.desktopdir.dir = OB_DIRECTION_WEST;
+ a->data.desktopdir.linear = TRUE;
+ a->data.desktopdir.wrap = TRUE;
+}
+
+void setup_action_desktop_next(ObAction *a)
+{
+ a->data.desktopdir.dir = OB_DIRECTION_EAST;
+ a->data.desktopdir.linear = TRUE;
+ a->data.desktopdir.wrap = TRUE;
+}
+
+void setup_action_desktop_left(ObAction *a)
+{
+ a->data.desktopdir.dir = OB_DIRECTION_WEST;
+ a->data.desktopdir.linear = FALSE;
+ a->data.desktopdir.wrap = TRUE;
+}
+
+void setup_action_desktop_right(ObAction *a)
+{
+ a->data.desktopdir.dir = OB_DIRECTION_EAST;
+ a->data.desktopdir.linear = FALSE;
+ a->data.desktopdir.wrap = TRUE;
+}
+
+void setup_action_desktop_up(ObAction *a)
+{
+ a->data.desktopdir.dir = OB_DIRECTION_NORTH;
+ a->data.desktopdir.linear = FALSE;
+ a->data.desktopdir.wrap = TRUE;
+}
+
+void setup_action_desktop_down(ObAction *a)
+{
+ a->data.desktopdir.dir = OB_DIRECTION_SOUTH;
+ a->data.desktopdir.linear = FALSE;
a->data.desktopdir.wrap = TRUE;
}
-void setup_action_move_keyboard(Action *a)
+void setup_action_move_keyboard(ObAction *a)
{
a->data.moveresize.corner = prop_atoms.net_wm_moveresize_move_keyboard;
}
-void setup_action_move(Action *a)
+void setup_action_move(ObAction *a)
{
a->data.moveresize.corner = prop_atoms.net_wm_moveresize_move;
}
-void setup_action_resize(Action *a)
+void setup_action_resize(ObAction *a)
{
a->data.moveresize.corner = prop_atoms.net_wm_moveresize_size_topleft;
}
-void setup_action_resize_keyboard(Action *a)
+void setup_action_resize_keyboard(ObAction *a)
{
a->data.moveresize.corner = prop_atoms.net_wm_moveresize_size_keyboard;
}
-void setup_action_cycle_windows_linear_next(Action *a)
+void setup_action_cycle_windows_linear_next(ObAction *a)
{
a->data.cycle.linear = TRUE;
a->data.cycle.forward = TRUE;
}
-void setup_action_cycle_windows_linear_previous(Action *a)
+void setup_action_cycle_windows_linear_previous(ObAction *a)
{
a->data.cycle.linear = TRUE;
a->data.cycle.forward = FALSE;
}
-void setup_action_cycle_windows_next(Action *a)
+void setup_action_cycle_windows_next(ObAction *a)
{
a->data.cycle.linear = FALSE;
a->data.cycle.forward = TRUE;
}
-void setup_action_cycle_windows_previous(Action *a)
+void setup_action_cycle_windows_previous(ObAction *a)
{
a->data.cycle.linear = FALSE;
a->data.cycle.forward = FALSE;
}
-void setup_action_movetoedge_north(Action *a)
+void setup_action_movetoedge_north(ObAction *a)
{
- a->data.diraction.direction = Direction_North;
+ a->data.diraction.direction = OB_DIRECTION_NORTH;
}
-void setup_action_movetoedge_south(Action *a)
+void setup_action_movetoedge_south(ObAction *a)
{
- a->data.diraction.direction = Direction_South;
+ a->data.diraction.direction = OB_DIRECTION_SOUTH;
}
-void setup_action_movetoedge_east(Action *a)
+void setup_action_movetoedge_east(ObAction *a)
{
- a->data.diraction.direction = Direction_East;
+ a->data.diraction.direction = OB_DIRECTION_EAST;
}
-void setup_action_movetoedge_west(Action *a)
+void setup_action_movetoedge_west(ObAction *a)
{
- a->data.diraction.direction = Direction_West;
+ a->data.diraction.direction = OB_DIRECTION_WEST;
}
-void setup_action_top_layer(Action *a)
+void setup_action_top_layer(ObAction *a)
{
a->data.layer.layer = 1;
}
-void setup_action_normal_layer(Action *a)
+void setup_action_normal_layer(ObAction *a)
{
a->data.layer.layer = 0;
}
-void setup_action_bottom_layer(Action *a)
+void setup_action_bottom_layer(ObAction *a)
{
a->data.layer.layer = -1;
}
action_lower,
NULL
},
- {
- "focusraise",
- action_focusraise,
- NULL
- },
{
"close",
action_close,
action_send_to_desktop,
setup_action_send_to_desktop
},
+ {
+ "sendtodesktopnext",
+ action_send_to_desktop_dir,
+ setup_action_send_to_desktop_next
+ },
+ {
+ "sendtodesktopprevious",
+ action_send_to_desktop_dir,
+ setup_action_send_to_desktop_prev
+ },
{
"sendtodesktopright",
- action_send_to_desktop_right,
- setup_action_send_to_desktop_direction
+ action_send_to_desktop_dir,
+ setup_action_send_to_desktop_right
},
{
"sendtodesktopleft",
- action_send_to_desktop_left,
- setup_action_send_to_desktop_direction
+ action_send_to_desktop_dir,
+ setup_action_send_to_desktop_left
},
{
"sendtodesktopup",
- action_send_to_desktop_up,
- setup_action_send_to_desktop_direction
+ action_send_to_desktop_dir,
+ setup_action_send_to_desktop_up
},
{
"sendtodesktopdown",
- action_send_to_desktop_down,
- setup_action_send_to_desktop_direction
+ action_send_to_desktop_dir,
+ setup_action_send_to_desktop_down
},
{
"desktop",
action_desktop,
NULL
},
+ {
+ "desktopnext",
+ action_desktop_dir,
+ setup_action_desktop_next
+ },
+ {
+ "desktopprevious",
+ action_desktop_dir,
+ setup_action_desktop_prev
+ },
{
"desktopright",
- action_desktop_right,
- setup_action_desktop_direction
+ action_desktop_dir,
+ setup_action_desktop_right
},
{
"desktopleft",
- action_desktop_left,
- setup_action_desktop_direction
+ action_desktop_dir,
+ setup_action_desktop_left
},
{
"desktopup",
- action_desktop_up,
- setup_action_desktop_direction
+ action_desktop_dir,
+ setup_action_desktop_up
},
{
"desktopdown",
- action_desktop_down,
- setup_action_desktop_direction
+ action_desktop_dir,
+ setup_action_desktop_down
},
{
"toggledecorations",
action_moveresize,
setup_action_resize_keyboard
},
+ {
+ "toggleshowdesktop",
+ action_toggle_show_desktop,
+ NULL
+ },
+ {
+ "showdesktop",
+ action_show_desktop,
+ NULL
+ },
+ {
+ "unshowdesktop",
+ action_unshow_desktop,
+ NULL
+ },
{
"restart",
action_restart,
}
};
-Action *action_from_string(char *name)
+ObAction *action_from_string(char *name)
{
- Action *a = NULL;
+ ObAction *a = NULL;
int i;
for (i = 0; actionstrings[i].name; i++)
return a;
}
+ObAction *action_parse(xmlDocPtr doc, xmlNodePtr node)
+{
+ char *actname;
+ ObAction *act = NULL;
+ xmlNodePtr n;
+
+ if (parse_attr_string("name", node, &actname)) {
+ if ((act = action_from_string(actname))) {
+ if (act->func == action_execute || act->func == action_restart) {
+ if ((n = parse_find_node("execute", node->xmlChildrenNode)))
+ act->data.execute.path = parse_string(doc, n);
+ } else if (act->func == action_showmenu) {
+ if ((n = parse_find_node("menu", node->xmlChildrenNode)))
+ act->data.showmenu.name = parse_string(doc, n);
+ } else if (act->func == action_desktop) {
+ if ((n = parse_find_node("desktop", node->xmlChildrenNode)))
+ act->data.desktop.desk = parse_int(doc, n);
+ if (act->data.desktop.desk > 0) act->data.desktop.desk--;
+ } else if (act->func == action_send_to_desktop) {
+ if ((n = parse_find_node("desktop", node->xmlChildrenNode)))
+ act->data.sendto.desk = parse_int(doc, n);
+ if (act->data.sendto.desk > 0) act->data.sendto.desk--;
+ } else if (act->func == action_move_relative_horz ||
+ act->func == action_move_relative_vert ||
+ act->func == action_resize_relative_horz ||
+ act->func == action_resize_relative_vert) {
+ if ((n = parse_find_node("delta", node->xmlChildrenNode)))
+ act->data.relative.delta = parse_int(doc, n);
+ } else if (act->func == action_desktop_dir) {
+ if ((n = parse_find_node("wrap", node->xmlChildrenNode))) {
+ act->data.desktopdir.wrap = 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);
+ }
+ }
+ g_free(actname);
+ }
+ return act;
+}
+
void action_execute(union ActionData *data)
{
GError *e = NULL;
- if (data->execute.path)
- if (!g_spawn_command_line_async(data->execute.path, &e)) {
- g_warning("failed to execute '%s': %s",
- data->execute.path, e->message);
+ char *cmd;
+ if (data->execute.path) {
+ cmd = g_filename_from_utf8(data->execute.path, -1, NULL, NULL, NULL);
+ if (cmd) {
+ if (!g_spawn_command_line_async(cmd, &e)) {
+ g_warning("failed to execute '%s': %s",
+ cmd, e->message);
+ }
+ } else {
+ g_warning("failed to convert '%s' from utf8", data->execute.path);
}
+ }
}
void action_focus(union ActionData *data)
client_iconify(data->client.c, TRUE, TRUE);
}
-void action_focusraise(union ActionData *data)
-{
- if (data->client.c) {
- client_focus(data->client.c);
- stacking_raise(CLIENT_AS_WINDOW(data->client.c));
- }
-}
-
void action_raise(union ActionData *data)
{
if (data->client.c)
void action_move_relative_horz(union ActionData *data)
{
- Client *c = data->relative.c;
+ ObClient *c = data->relative.c;
if (c)
- client_configure(c, Corner_TopLeft,
+ client_configure(c, OB_CORNER_TOPLEFT,
c->area.x + data->relative.delta, c->area.y,
c->area.width, c->area.height, TRUE, TRUE);
}
void action_move_relative_vert(union ActionData *data)
{
- Client *c = data->relative.c;
+ ObClient *c = data->relative.c;
if (c)
- client_configure(c, Corner_TopLeft,
+ client_configure(c, OB_CORNER_TOPLEFT,
c->area.x, c->area.y + data->relative.delta,
c->area.width, c->area.height, TRUE, TRUE);
}
void action_resize_relative_horz(union ActionData *data)
{
- Client *c = data->relative.c;
+ ObClient *c = data->relative.c;
if (c)
- client_configure(c, Corner_TopLeft, c->area.x, c->area.y,
+ client_configure(c, OB_CORNER_TOPLEFT, c->area.x, c->area.y,
c->area.width +
data->relative.delta * c->size_inc.width,
c->area.height, TRUE, TRUE);
void action_resize_relative_vert(union ActionData *data)
{
- Client *c = data->relative.c;
+ ObClient *c = data->relative.c;
if (c && !c->shaded)
- client_configure(c, Corner_TopLeft, c->area.x, c->area.y,
+ client_configure(c, OB_CORNER_TOPLEFT, c->area.x, c->area.y,
c->area.width, c->area.height +
data->relative.delta * c->size_inc.height,
TRUE, TRUE);
void action_send_to_desktop(union ActionData *data)
{
- if (data->sendto.c) {
- if (data->sendto.desk < screen_num_desktops ||
- data->sendto.desk == DESKTOP_ALL) {
- client_set_desktop(data->desktop.c,
- data->sendto.desk, data->sendto.follow);
- if (data->sendto.follow) screen_set_desktop(data->sendto.desk);
- }
+ ObClient *c = data->sendto.c;
+
+ if (!c || !client_normal(c)) return;
+
+ 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);
}
}
screen_set_desktop(data->desktop.desk);
}
-static void cur_row_col(guint *r, guint *c)
+void action_desktop_dir(union ActionData *data)
{
- switch (screen_desktop_layout.orientation) {
- case Orientation_Horz:
- switch (screen_desktop_layout.start_corner) {
- case Corner_TopLeft:
- *r = screen_desktop / screen_desktop_layout.columns;
- *c = screen_desktop % screen_desktop_layout.columns;
- break;
- case Corner_BottomLeft:
- *r = screen_desktop_layout.rows - 1 -
- screen_desktop / screen_desktop_layout.columns;
- *c = screen_desktop % screen_desktop_layout.columns;
- break;
- case Corner_TopRight:
- *r = screen_desktop / screen_desktop_layout.columns;
- *c = screen_desktop_layout.columns - 1 -
- screen_desktop % screen_desktop_layout.columns;
- break;
- case Corner_BottomRight:
- *r = screen_desktop_layout.rows - 1 -
- screen_desktop / screen_desktop_layout.columns;
- *c = screen_desktop_layout.columns - 1 -
- screen_desktop % screen_desktop_layout.columns;
- break;
- }
- break;
- case Orientation_Vert:
- switch (screen_desktop_layout.start_corner) {
- case Corner_TopLeft:
- *r = screen_desktop % screen_desktop_layout.rows;
- *c = screen_desktop / screen_desktop_layout.rows;
- break;
- case Corner_BottomLeft:
- *r = screen_desktop_layout.rows - 1 -
- screen_desktop % screen_desktop_layout.rows;
- *c = screen_desktop / screen_desktop_layout.rows;
- break;
- case Corner_TopRight:
- *r = screen_desktop % screen_desktop_layout.rows;
- *c = screen_desktop_layout.columns - 1 -
- screen_desktop / screen_desktop_layout.rows;
- break;
- case Corner_BottomRight:
- *r = screen_desktop_layout.rows - 1 -
- screen_desktop % screen_desktop_layout.rows;
- *c = screen_desktop_layout.columns - 1 -
- screen_desktop / screen_desktop_layout.rows;
- break;
- }
- break;
- }
+ guint d;
+
+ d = screen_cycle_desktop(data->desktopdir.dir, data->desktopdir.wrap,
+ data->sendtodir.linear,
+ data->desktopdir.final, data->desktopdir.cancel);
+ screen_set_desktop(d);
}
-static guint translate_row_col(guint r, guint c)
-{
- switch (screen_desktop_layout.orientation) {
- case Orientation_Horz:
- switch (screen_desktop_layout.start_corner) {
- case Corner_TopLeft:
- return r % screen_desktop_layout.rows *
- screen_desktop_layout.columns +
- c % screen_desktop_layout.columns;
- case Corner_BottomLeft:
- return (screen_desktop_layout.rows - 1 -
- r % screen_desktop_layout.rows) *
- screen_desktop_layout.columns +
- c % screen_desktop_layout.columns;
- case Corner_TopRight:
- return r % screen_desktop_layout.rows *
- screen_desktop_layout.columns +
- (screen_desktop_layout.columns - 1 -
- c % screen_desktop_layout.columns);
- case Corner_BottomRight:
- return (screen_desktop_layout.rows - 1 -
- r % screen_desktop_layout.rows) *
- screen_desktop_layout.columns +
- (screen_desktop_layout.columns - 1 -
- c % screen_desktop_layout.columns);
- }
- case Orientation_Vert:
- switch (screen_desktop_layout.start_corner) {
- case Corner_TopLeft:
- return c % screen_desktop_layout.columns *
- screen_desktop_layout.rows +
- r % screen_desktop_layout.rows;
- case Corner_BottomLeft:
- return c % screen_desktop_layout.columns *
- screen_desktop_layout.rows +
- (screen_desktop_layout.rows - 1 -
- r % screen_desktop_layout.rows);
- case Corner_TopRight:
- return (screen_desktop_layout.columns - 1 -
- c % screen_desktop_layout.columns) *
- screen_desktop_layout.rows +
- r % screen_desktop_layout.rows;
- case Corner_BottomRight:
- return (screen_desktop_layout.columns - 1 -
- c % screen_desktop_layout.columns) *
- screen_desktop_layout.rows +
- (screen_desktop_layout.rows - 1 -
- r % screen_desktop_layout.rows);
- }
- }
- g_assert_not_reached();
- return 0;
+void action_send_to_desktop_dir(union ActionData *data)
+{
+ ObClient *c = data->sendtodir.c;
+ guint d;
+
+ if (!c || !client_normal(c)) return;
+
+ d = screen_cycle_desktop(data->sendtodir.dir, data->sendtodir.wrap,
+ data->sendtodir.linear,
+ data->sendtodir.final, data->sendtodir.cancel);
+
+ g_message("sendto %d", d);
+
+ client_set_desktop(c, d, TRUE);
+ screen_set_desktop(d);
}
+#if 0
void action_desktop_right(union ActionData *data)
{
guint r, c, d;
}
d = translate_row_col(r, c);
if (d < screen_num_desktops)
- screen_set_desktop(d);
+ screen_cycle_desktop(d, data->desktopdir.final,
+ data->desktopdir.cancel);
}
void action_send_to_desktop_right(union ActionData *data)
{
+ ObClient *cl = data->sendto.c;
guint r, c, d;
- if (data->sendtodir.c) {
- cur_row_col(&r, &c);
+ if (!cl || !client_normal(cl)) return;
+
+ cur_row_col(&r, &c);
+ ++c;
+ if (c >= screen_desktop_layout.columns) {
+ if (!data->sendtodir.wrap) return;
+ c = 0;
+ }
+ d = translate_row_col(r, c);
+ if (d >= screen_num_desktops) {
+ if (!data->sendtodir.wrap) return;
++c;
- if (c >= screen_desktop_layout.columns) {
- if (!data->sendtodir.wrap) return;
- c = 0;
- }
- d = translate_row_col(r, c);
- if (d >= screen_num_desktops) {
- if (!data->sendtodir.wrap) return;
- ++c;
- }
- d = translate_row_col(r, c);
- if (d < screen_num_desktops) {
- client_set_desktop(data->sendtodir.c, d, data->sendtodir.follow);
- if (data->sendtodir.follow) screen_set_desktop(d);
- }
+ }
+ d = translate_row_col(r, c);
+ if (d < screen_num_desktops) {
+ client_set_desktop(cl, d, data->sendtodir.follow);
+ if (data->sendtodir.follow)
+ screen_cycle_desktop(d, data->desktopdir.final,
+ data->desktopdir.cancel);
}
}
}
d = translate_row_col(r, c);
if (d < screen_num_desktops)
- screen_set_desktop(d);
+ screen_cycle_desktop(d, data->desktopdir.final,
+ data->desktopdir.cancel);
}
void action_send_to_desktop_left(union ActionData *data)
{
+ ObClient *cl = data->sendto.c;
guint r, c, d;
- if (data->sendtodir.c) {
- cur_row_col(&r, &c);
+ if (!cl || !client_normal(cl)) return;
+
+ cur_row_col(&r, &c);
+ --c;
+ if (c >= screen_desktop_layout.columns) {
+ if (!data->sendtodir.wrap) return;
+ c = screen_desktop_layout.columns - 1;
+ }
+ d = translate_row_col(r, c);
+ if (d >= screen_num_desktops) {
+ if (!data->sendtodir.wrap) return;
--c;
- if (c >= screen_desktop_layout.columns) {
- if (!data->sendtodir.wrap) return;
- c = screen_desktop_layout.columns - 1;
- }
- d = translate_row_col(r, c);
- if (d >= screen_num_desktops) {
- if (!data->sendtodir.wrap) return;
- --c;
- }
- d = translate_row_col(r, c);
- if (d < screen_num_desktops) {
- client_set_desktop(data->sendtodir.c, d, data->sendtodir.follow);
- if (data->sendtodir.follow) screen_set_desktop(d);
- }
+ }
+ d = translate_row_col(r, c);
+ if (d < screen_num_desktops) {
+ client_set_desktop(cl, d, data->sendtodir.follow);
+ if (data->sendtodir.follow)
+ screen_cycle_desktop(d, data->desktopdir.final,
+ data->desktopdir.cancel);
}
}
}
d = translate_row_col(r, c);
if (d < screen_num_desktops)
- screen_set_desktop(d);
+ screen_cycle_desktop(d, data->desktopdir.final,
+ data->desktopdir.cancel);
}
void action_send_to_desktop_down(union ActionData *data)
d = translate_row_col(r, c);
if (d < screen_num_desktops) {
client_set_desktop(data->sendtodir.c, d, data->sendtodir.follow);
- if (data->sendtodir.follow) screen_set_desktop(d);
+ if (data->sendtodir.follow)
+ screen_cycle_desktop(d, data->desktopdir.final,
+ data->desktopdir.cancel);
}
}
}
}
d = translate_row_col(r, c);
if (d < screen_num_desktops)
- screen_set_desktop(d);
+ screen_cycle_desktop(d, data->desktopdir.final,
+ data->desktopdir.cancel);
}
void action_send_to_desktop_up(union ActionData *data)
d = translate_row_col(r, c);
if (d < screen_num_desktops) {
client_set_desktop(data->sendtodir.c, d, data->sendtodir.follow);
- if (data->sendtodir.follow) screen_set_desktop(d);
+ if (data->sendtodir.follow)
+ screen_cycle_desktop(d, data->desktopdir.final,
+ data->desktopdir.cancel);
}
}
}
+#endif
void action_toggle_decorations(union ActionData *data)
{
- Client *c = data->client.c;;
+ ObClient *c = data->client.c;;
if (!c) return;
- c->disabled_decorations = c->disabled_decorations ? 0 : ~0;
+ c->decorate = !c->decorate;
client_setup_decor_and_functions(c);
}
void action_moveresize(union ActionData *data)
{
- Client *c = data->moveresize.c;
+ ObClient *c = data->moveresize.c;
if (!c || !client_normal(c)) return;
void action_restart(union ActionData *data)
{
- ob_restart_path = data->execute.path;
- ob_shutdown = ob_restart = TRUE;
+ ob_restart_other(data->execute.path);
}
void action_exit(union ActionData *data)
{
- ob_shutdown = TRUE;
+ ob_exit();
}
void action_showmenu(union ActionData *data)
void action_cycle_windows(union ActionData *data)
{
- Client *c;
+ ObClient *c;
c = focus_cycle(data->cycle.forward, data->cycle.linear, data->cycle.final,
data->cycle.cancel);
void action_directional_focus(union ActionData *data)
{
- Client *nf;
+ ObClient *nf;
if (!data->diraction.c)
return;
void action_movetoedge(union ActionData *data)
{
int x, y, h, w;
- Client *c = data->diraction.c;
+ ObClient *c = data->diraction.c;
if (!c)
return;
h = screen_area(c->desktop)->height;
w = screen_area(c->desktop)->width;
switch(data->diraction.direction) {
- case Direction_North:
+ case OB_DIRECTION_NORTH:
y = 0;
break;
- case Direction_West:
+ case OB_DIRECTION_WEST:
x = 0;
break;
- case Direction_South:
+ case OB_DIRECTION_SOUTH:
y = h - c->frame->area.height;
break;
- case Direction_East:
+ case OB_DIRECTION_EAST:
x = w - c->frame->area.width;
break;
+ default:
+ g_assert_not_reached();
}
frame_frame_gravity(c->frame, &x, &y);
- client_configure(c, Corner_TopLeft,
+ client_configure(c, OB_CORNER_TOPLEFT,
x, y, c->area.width, c->area.height, TRUE, TRUE);
}
void action_toggle_layer(union ActionData *data)
{
- Client *c = data->layer.c;
+ ObClient *c = data->layer.c;
if (c) {
if (data->layer.layer < 0)
client_set_layer(c, c->above ? 0 : 1);
}
}
+
+void action_toggle_show_desktop(union ActionData *data)
+{
+ screen_show_desktop(!screen_showing_desktop);
+}
+
+void action_show_desktop(union ActionData *data)
+{
+ screen_show_desktop(TRUE);
+}
+
+void action_unshow_desktop(union ActionData *data)
+{
+ screen_show_desktop(FALSE);
+}
projects / chaz / openbox / blobdiff