void setup_action_directional_focus_north(Action *a)
{
- a->data.diraction.direction = Direction_North;
+ a->data.diraction.direction = OB_DIRECTION_NORTH;
}
void setup_action_directional_focus_east(Action *a)
{
- a->data.diraction.direction = Direction_East;
+ a->data.diraction.direction = OB_DIRECTION_EAST;
}
void setup_action_directional_focus_south(Action *a)
{
- a->data.diraction.direction = Direction_South;
+ a->data.diraction.direction = OB_DIRECTION_SOUTH;
}
void setup_action_directional_focus_west(Action *a)
{
- a->data.diraction.direction = Direction_West;
+ a->data.diraction.direction = OB_DIRECTION_WEST;
}
void setup_action_directional_focus_northeast(Action *a)
{
- a->data.diraction.direction = Direction_NorthEast;
+ a->data.diraction.direction = OB_DIRECTION_NORTHEAST;
}
void setup_action_directional_focus_southeast(Action *a)
{
- a->data.diraction.direction = Direction_SouthEast;
+ a->data.diraction.direction = OB_DIRECTION_SOUTHEAST;
}
void setup_action_directional_focus_southwest(Action *a)
{
- a->data.diraction.direction = Direction_SouthWest;
+ a->data.diraction.direction = OB_DIRECTION_SOUTHWEST;
}
void setup_action_directional_focus_northwest(Action *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_movetoedge_north(Action *a)
{
- a->data.diraction.direction = Direction_North;
+ a->data.diraction.direction = OB_DIRECTION_NORTH;
}
void setup_action_movetoedge_south(Action *a)
{
- a->data.diraction.direction = Direction_South;
+ a->data.diraction.direction = OB_DIRECTION_SOUTH;
}
void setup_action_movetoedge_east(Action *a)
{
- a->data.diraction.direction = Direction_East;
+ a->data.diraction.direction = OB_DIRECTION_EAST;
}
void setup_action_movetoedge_west(Action *a)
{
- a->data.diraction.direction = Direction_West;
+ a->data.diraction.direction = OB_DIRECTION_WEST;
}
void setup_action_top_layer(Action *a)
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, data->sendto.follow);
+ if (data->sendto.follow) screen_set_desktop(data->sendto.desk);
}
}
static void cur_row_col(guint *r, guint *c)
{
switch (screen_desktop_layout.orientation) {
- case Orientation_Horz:
+ case OB_ORIENTATION_HORZ:
switch (screen_desktop_layout.start_corner) {
- case Corner_TopLeft:
+ case OB_CORNER_TOPLEFT:
*r = screen_desktop / screen_desktop_layout.columns;
*c = screen_desktop % screen_desktop_layout.columns;
break;
- case Corner_BottomLeft:
+ case OB_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:
+ case OB_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:
+ case OB_CORNER_BOTTOMRIGHT:
*r = screen_desktop_layout.rows - 1 -
screen_desktop / screen_desktop_layout.columns;
*c = screen_desktop_layout.columns - 1 -
break;
}
break;
- case Orientation_Vert:
+ case OB_ORIENTATION_VERT:
switch (screen_desktop_layout.start_corner) {
- case Corner_TopLeft:
+ case OB_CORNER_TOPLEFT:
*r = screen_desktop % screen_desktop_layout.rows;
*c = screen_desktop / screen_desktop_layout.rows;
break;
- case Corner_BottomLeft:
+ case OB_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:
+ case OB_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:
+ case OB_CORNER_BOTTOMRIGHT:
*r = screen_desktop_layout.rows - 1 -
screen_desktop % screen_desktop_layout.rows;
*c = screen_desktop_layout.columns - 1 -
static guint translate_row_col(guint r, guint c)
{
switch (screen_desktop_layout.orientation) {
- case Orientation_Horz:
+ case OB_ORIENTATION_HORZ:
switch (screen_desktop_layout.start_corner) {
- case Corner_TopLeft:
+ case OB_CORNER_TOPLEFT:
return r % screen_desktop_layout.rows *
screen_desktop_layout.columns +
c % screen_desktop_layout.columns;
- case Corner_BottomLeft:
+ case OB_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:
+ case OB_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:
+ case OB_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:
+ case OB_ORIENTATION_VERT:
switch (screen_desktop_layout.start_corner) {
- case Corner_TopLeft:
+ case OB_CORNER_TOPLEFT:
return c % screen_desktop_layout.columns *
screen_desktop_layout.rows +
r % screen_desktop_layout.rows;
- case Corner_BottomLeft:
+ case OB_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:
+ case OB_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:
+ case OB_CORNER_BOTTOMRIGHT:
return (screen_desktop_layout.columns - 1 -
c % screen_desktop_layout.columns) *
screen_desktop_layout.rows +
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_set_desktop(d);
}
}
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_set_desktop(d);
}
}
void action_toggle_decorations(union ActionData *data)
{
- Client *c = data->client.c;;
+ ObClient *c = data->client.c;;
if (!c) return;
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)