jazzman/xoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

warp pointer on relevant keyboard actions

Browse Source
This commit is contained in:
Sean Pringle
2014-12-30 13:11:59 +10:00
parent 2cd7d8eaea
commit 46c101dfaa
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
action.c
View File

@@ -29,6 +29,7 @@ void action_move(void *data, int num, Client *cli)
if (!cli) return; if (!cli) return;
client_raise_family(cli); client_raise_family(cli);
client_place_spot(cli, num, cli->monitor, 1); client_place_spot(cli, num, cli->monitor, 1);
spot_warp_pointer(cli->spot, cli->monitor);
} }
void action_move_direction(void *data, int num, Client *cli) void action_move_direction(void *data, int num, Client *cli)
@@ -36,16 +37,19 @@ void action_move_direction(void *data, int num, Client *cli)
if (!cli) return; if (!cli) return;
client_raise_family(cli); client_raise_family(cli);
client_place_spot(cli, spot_choose_by_direction(cli->spot, cli->monitor, num), cli->monitor, 1); client_place_spot(cli, spot_choose_by_direction(cli->spot, cli->monitor, num), cli->monitor, 1);
spot_warp_pointer(cli->spot, cli->monitor);
} }
void action_focus(void *data, int num, Client *cli) void action_focus(void *data, int num, Client *cli)
{ {
spot_try_focus_top_window(num, current_mon, None); spot_try_focus_top_window(num, current_mon, None);
spot_warp_pointer(current_spot, current_mon);
} }
void action_focus_direction(void *data, int num, Client *cli) void action_focus_direction(void *data, int num, Client *cli)
{ {
spot_try_focus_top_window(spot_choose_by_direction(current_spot, current_mon, num), current_mon, None); spot_try_focus_top_window(spot_choose_by_direction(current_spot, current_mon, num), current_mon, None);
spot_warp_pointer(current_spot, current_mon);
} }
void action_close(void *data, int num, Client *cli) void action_close(void *data, int num, Client *cli)
@@ -87,7 +91,7 @@ void action_find_or_start(void *data, int num, Client *cli)
int i; Client *c; char *class = data; int i; Client *c; char *class = data;
for_windows(i, c) for_windows(i, c)
if (c->visible && c->manage && c->class && !strcasecmp(c->class, class)) if (c->visible && c->manage && c->class && !strcasecmp(c->class, class))
{ client_activate(c); return; } { client_activate(c); spot_warp_pointer(cli->spot, cli->monitor); return; }
exec_cmd(class); exec_cmd(class);
} }
@@ -98,13 +102,15 @@ void action_move_monitor(void *data, int num, Client *cli)
cli->monitor = MAX(0, MIN(current_mon+num, nmonitors-1)); cli->monitor = MAX(0, MIN(current_mon+num, nmonitors-1));
client_place_spot(cli, cli->spot, cli->monitor, 1); client_place_spot(cli, cli->spot, cli->monitor, 1);
current_mon = cli->monitor; current_mon = cli->monitor;
spot_warp_pointer(cli->spot, cli->monitor);
} }
void action_focus_monitor(void *data, int num, Client *cli) void action_focus_monitor(void *data, int num, Client *cli)
{ {
int i, mon = MAX(0, MIN(current_mon+num, nmonitors-1)); int i, mon = MAX(0, MIN(current_mon+num, nmonitors-1));
if (spot_focus_top_window(current_spot, mon, None)) return; if (!spot_focus_top_window(current_spot, mon, None))
for_spots(i) if (spot_focus_top_window(i, mon, None)) break; for_spots(i) if (spot_focus_top_window(i, mon, None)) break;
spot_warp_pointer(current_spot, current_mon);
} }
void action_fullscreen(void *data, int num, Client *cli) void action_fullscreen(void *data, int num, Client *cli)

15
spot.c
View File

@@ -85,6 +85,21 @@ void update_bars()
spot_update_bar(j, i); spot_update_bar(j, i);
} }
void spot_warp_pointer(int spot, int mon)
{
Window wroot, child;
int root_x, root_y, win_x, win_y;
unsigned int mask;
if (XQueryPointer(display, root, &wroot, &child, &root_x, &root_y, &win_x, &win_y, &mask)
&& !INTERSECT(monitors[mon].spots[spot].x, monitors[mon].spots[spot].y, monitors[mon].spots[spot].w, monitors[mon].spots[spot].h, root_x, root_y, 1, 1))
{
XWarpPointer(display, None, root, 0, 0, 0, 0,
monitors[mon].spots[spot].x + monitors[mon].spots[spot].w - 10,
monitors[mon].spots[spot].y + 10);
}
}
Window spot_focus_top_window(int spot, int mon, Window except) Window spot_focus_top_window(int spot, int mon, Window except)
{ {
int i; Client *c; int i; Client *c;