make the activate action have a 'here' parameter
This commit is contained in:
parent
99d0b71677
commit
60bf9dcdb7
2 changed files with 10 additions and 4 deletions
|
@ -742,8 +742,8 @@ void action_execute(union ActionData *data)
|
|||
|
||||
void action_activate(union ActionData *data)
|
||||
{
|
||||
if (data->client.c)
|
||||
client_activate(data->client.c);
|
||||
if (data->activate.c)
|
||||
client_activate(data->activate.c, data->activate.here);
|
||||
}
|
||||
|
||||
void action_focus(union ActionData *data)
|
||||
|
@ -1219,7 +1219,7 @@ void action_directional_focus(union ActionData *data)
|
|||
return;
|
||||
if ((nf = client_find_directional(data->diraction.c,
|
||||
data->diraction.direction)))
|
||||
client_activate(nf);
|
||||
client_activate(nf, FALSE);
|
||||
}
|
||||
|
||||
void action_movetoedge(union ActionData *data)
|
||||
|
|
|
@ -29,6 +29,11 @@ struct ClientAction {
|
|||
struct _ObClient *c;
|
||||
};
|
||||
|
||||
struct Activate {
|
||||
struct _ObClient *c;
|
||||
gboolean here; /* bring it to the current desktop */
|
||||
};
|
||||
|
||||
struct MoveResizeRelative {
|
||||
struct _ObClient *c;
|
||||
int delta;
|
||||
|
@ -96,6 +101,7 @@ union ActionData {
|
|||
struct DirectionalAction diraction;
|
||||
struct Execute execute;
|
||||
struct ClientAction client;
|
||||
struct Activate activate;
|
||||
struct MoveResizeRelative relative;
|
||||
struct SendToDesktop sendto;
|
||||
struct SendToDesktopDirection sendtodir;
|
||||
|
@ -135,7 +141,7 @@ void action_free(ObAction *a);
|
|||
|
||||
/* Execute */
|
||||
void action_execute(union ActionData *data);
|
||||
/* ClientAction */
|
||||
/* ActivateAction */
|
||||
void action_activate(union ActionData *data);
|
||||
/* ClientAction */
|
||||
void action_focus(union ActionData *data);
|
||||
|
|
Loading…
Reference in a new issue