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)
NULL
},
{
- "focusraise",
- action_focusraise,
- NULL
- },
- {
"close",
action_close,
NULL
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;
- 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)
{
Client *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);
}
{
Client *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);
}
{
Client *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);
{
Client *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);
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_restart(union ActionData *data)
{
- ob_restart_path = data->execute.path;
+ ob_restart_path = g_strdup(data->execute.path);
ob_shutdown = ob_restart = TRUE;
}
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);
}
projects / mikachu / openbox.git / blobdiff