nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make directional focusing an interactive action

Browse source
This commit is contained in:
Dana Jansens 2003-08-31 18:54:26 +00:00
parent ba64eb20db
commit 4ab212d0cd
2 changed files with 31 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
openbox/action.c
View file

@ -41,42 +41,50 @@ void action_free(ObAction *a)
void setup_action_directional_focus_north(ObAction *a) void setup_action_directional_focus_north(ObAction *a)
{ {
a->data.diraction.direction = OB_DIRECTION_NORTH; a->data.interdiraction.inter.any.interactive = TRUE;
a->data.interdiraction.direction = OB_DIRECTION_NORTH;
} }
void setup_action_directional_focus_east(ObAction *a) void setup_action_directional_focus_east(ObAction *a)
{ {
a->data.diraction.direction = OB_DIRECTION_EAST; a->data.interdiraction.inter.any.interactive = TRUE;
a->data.interdiraction.direction = OB_DIRECTION_EAST;
} }
void setup_action_directional_focus_south(ObAction *a) void setup_action_directional_focus_south(ObAction *a)
{ {
a->data.diraction.direction = OB_DIRECTION_SOUTH; a->data.interdiraction.inter.any.interactive = TRUE;
a->data.interdiraction.direction = OB_DIRECTION_SOUTH;
} }
void setup_action_directional_focus_west(ObAction *a) void setup_action_directional_focus_west(ObAction *a)
{ {
a->data.diraction.direction = OB_DIRECTION_WEST; a->data.interdiraction.inter.any.interactive = TRUE;
a->data.interdiraction.direction = OB_DIRECTION_WEST;
} }
void setup_action_directional_focus_northeast(ObAction *a) void setup_action_directional_focus_northeast(ObAction *a)
{ {
a->data.diraction.direction = OB_DIRECTION_NORTHEAST; a->data.interdiraction.inter.any.interactive = TRUE;
a->data.interdiraction.direction = OB_DIRECTION_NORTHEAST;
} }
void setup_action_directional_focus_southeast(ObAction *a) void setup_action_directional_focus_southeast(ObAction *a)
{ {
a->data.diraction.direction = OB_DIRECTION_SOUTHEAST; a->data.interdiraction.inter.any.interactive = TRUE;
a->data.interdiraction.direction = OB_DIRECTION_SOUTHEAST;
} }
void setup_action_directional_focus_southwest(ObAction *a) void setup_action_directional_focus_southwest(ObAction *a)
{ {
a->data.diraction.direction = OB_DIRECTION_SOUTHWEST; a->data.interdiraction.inter.any.interactive = TRUE;
a->data.interdiraction.direction = OB_DIRECTION_SOUTHWEST;
} }
void setup_action_directional_focus_northwest(ObAction *a) void setup_action_directional_focus_northwest(ObAction *a)
{ {
a->data.diraction.direction = OB_DIRECTION_NORTHWEST; a->data.interdiraction.inter.any.interactive = TRUE;
a->data.interdiraction.direction = OB_DIRECTION_NORTHWEST;
} }
void setup_action_send_to_desktop(ObAction *a) void setup_action_send_to_desktop(ObAction *a)
@ -751,11 +759,6 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
if ((n = parse_find_node("here", node->xmlChildrenNode))) if ((n = parse_find_node("here", node->xmlChildrenNode)))
act->data.activate.here = parse_bool(doc, n); act->data.activate.here = parse_bool(doc, n);
} }
if (act->data.any.interactive) {
if ((n = parse_find_node("interactive",node->xmlChildrenNode)))
act->data.any.interactive = parse_bool(doc, n);
}
} }
g_free(actname); g_free(actname);
} }
@ -1089,22 +1092,17 @@ void action_showmenu(union ActionData *data)
void action_cycle_windows(union ActionData *data) void action_cycle_windows(union ActionData *data)
{ {
ObClient *c; focus_cycle(data->cycle.forward, data->cycle.linear,
c = focus_cycle(data->cycle.forward, data->cycle.linear,
data->cycle.inter.any.interactive, data->cycle.inter.any.interactive,
data->cycle.inter.final, data->cycle.inter.cancel); data->cycle.inter.final, data->cycle.inter.cancel);
} }
void action_directional_focus(union ActionData *data) void action_directional_focus(union ActionData *data)
{ {
ObClient *nf; focus_directional_cycle(data->interdiraction.direction,
data->interdiraction.inter.any.interactive,
if (!data->diraction.any.c) data->interdiraction.inter.final,
return; data->interdiraction.inter.cancel);
if ((nf = client_find_directional(data->diraction.any.c,
data->diraction.direction)))
client_activate(nf, FALSE);
} }
void action_movetoedge(union ActionData *data) void action_movetoedge(union ActionData *data)

8
openbox/action.h
View file

@ -22,6 +22,11 @@ struct InteractiveAction {
gboolean cancel; gboolean cancel;
}; };
struct InterDirectionalAction{
struct InteractiveAction inter;
ObDirection direction;
};
struct DirectionalAction{ struct DirectionalAction{
struct AnyAction any; struct AnyAction any;
ObDirection direction; ObDirection direction;
@ -101,6 +106,7 @@ struct CycleWindows {
union ActionData { union ActionData {
struct AnyAction any; struct AnyAction any;
struct InteractiveAction inter; struct InteractiveAction inter;
struct InterDirectionalAction interdiraction;
struct DirectionalAction diraction; struct DirectionalAction diraction;
struct Execute execute; struct Execute execute;
struct ClientAction client; struct ClientAction client;
@ -220,7 +226,7 @@ void action_exit(union ActionData *data);
void action_showmenu(union ActionData *data); void action_showmenu(union ActionData *data);
/* CycleWindows */ /* CycleWindows */
void action_cycle_windows(union ActionData *data); void action_cycle_windows(union ActionData *data);
/* DirectionalAction */ /* InterDirectionalAction */
void action_directional_focus(union ActionData *data); void action_directional_focus(union ActionData *data);
/* DirectionalAction */ /* DirectionalAction */
void action_movetoedge(union ActionData *data); void action_movetoedge(union ActionData *data);