X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=6e06d374360764e5afb7a197c5e61bae137d45fc;hb=eea43e64883fc0c988b916db99bc5b45ccffc432;hp=9015939e854d5ef1e6fc0f5cc5b204f471cc6772;hpb=3753a0ed3eb1f10d8579dc20098504484003e8bf;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index 9015939e..6e06d374 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -41,42 +41,42 @@ void action_free(Action *a) 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) @@ -141,22 +141,22 @@ void setup_action_cycle_windows_previous(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) @@ -246,11 +246,6 @@ ActionString actionstrings[] = action_lower, NULL }, - { - "focusraise", - action_focusraise, - NULL - }, { "close", action_close, @@ -548,6 +543,56 @@ Action *action_from_string(char *name) return a; } +Action *action_parse(xmlDocPtr doc, xmlNodePtr node) +{ + char *actname; + Action *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_right || + act->func == action_desktop_left || + act->func == action_desktop_up || + act->func == action_desktop_down) { + if ((n = parse_find_node("wrap", node->xmlChildrenNode))) { + g_message("WRAP %d", parse_bool(doc, n)); + act->data.desktopdir.wrap = parse_bool(doc, n); + } + } else if (act->func == action_send_to_desktop_right || + act->func == action_send_to_desktop_left || + act->func == action_send_to_desktop_up || + act->func == action_send_to_desktop_down) { + 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); + } + } + } + return act; +} + void action_execute(union ActionData *data) { GError *e = NULL; @@ -583,14 +628,6 @@ void action_iconify(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) @@ -663,27 +700,27 @@ void action_toggle_omnipresent(union ActionData *data) 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); @@ -691,9 +728,9 @@ void action_resize_relative_horz(union ActionData *data) 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); @@ -758,13 +795,14 @@ void action_toggle_maximize_vert(union ActionData *data) 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); } } @@ -778,23 +816,23 @@ void action_desktop(union ActionData *data) 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 - @@ -802,23 +840,23 @@ static void cur_row_col(guint *r, guint *c) 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 - @@ -832,46 +870,46 @@ static void cur_row_col(guint *r, guint *c) 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 + @@ -905,25 +943,26 @@ void action_desktop_right(union ActionData *data) 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); } } @@ -949,25 +988,26 @@ void action_desktop_left(union ActionData *data) 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); } } @@ -1061,7 +1101,7 @@ void action_send_to_desktop_up(union ActionData *data) void action_toggle_decorations(union ActionData *data) { - Client *c = data->client.c;; + ObClient *c = data->client.c;; if (!c) return; @@ -1071,7 +1111,7 @@ void action_toggle_decorations(union ActionData *data) void action_moveresize(union ActionData *data) { - Client *c = data->moveresize.c; + ObClient *c = data->moveresize.c; if (!c || !client_normal(c)) return; @@ -1081,13 +1121,12 @@ void action_moveresize(union ActionData *data) 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) @@ -1100,7 +1139,7 @@ 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); @@ -1108,7 +1147,7 @@ void action_cycle_windows(union ActionData *data) void action_directional_focus(union ActionData *data) { - Client *nf; + ObClient *nf; if (!data->diraction.c) return; @@ -1120,7 +1159,7 @@ void action_directional_focus(union ActionData *data) void action_movetoedge(union ActionData *data) { int x, y, h, w; - Client *c = data->diraction.c; + ObClient *c = data->diraction.c; if (!c) return; @@ -1130,21 +1169,23 @@ void action_movetoedge(union ActionData *data) 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); } @@ -1157,7 +1198,7 @@ void action_send_to_layer(union ActionData *data) void action_toggle_layer(union ActionData *data) { - Client *c = data->layer.c; + ObClient *c = data->layer.c; if (c) { if (data->layer.layer < 0)