awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[focus] Backport `Rewrite focus handling on arrange' from awesome-3 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-05-25 11:26:51 +02:00
parent 24d2e200af
commit 1b495c698c
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
layout.c
View File

@ -46,7 +46,7 @@ arrange(int screen)
Client *c; Client *c;
Layout *curlay = layout_get_current(screen); Layout *curlay = layout_get_current(screen);
unsigned int dui; unsigned int dui;
int di, x, y, phys_screen = screen_virttophys(screen); int di, x, y, fscreen, phys_screen = screen_virttophys(screen);
Window rootwin, childwin; Window rootwin, childwin;
for(c = globalconf.clients; c; c = c->next) for(c = globalconf.clients; c; c = c->next)
@ -73,11 +73,6 @@ arrange(int screen)
client_stack(globalconf.focus->client); client_stack(globalconf.focus->client);
} }
/* if we have a valid client that could be focused but currently no window
* are focused, then set the focus on this window */
if((c = focus_get_current_client(screen)) && globalconf.focus->client != c)
client_focus(c, screen, True);
/* check that the mouse is on a window or not */ /* check that the mouse is on a window or not */
if(XQueryPointer(globalconf.display, if(XQueryPointer(globalconf.display,
RootWindow(globalconf.display, phys_screen), RootWindow(globalconf.display, phys_screen),
@ -86,8 +81,21 @@ arrange(int screen)
if(rootwin == None || childwin == None || childwin == rootwin) if(rootwin == None || childwin == None || childwin == rootwin)
window_root_grabbuttons(phys_screen); window_root_grabbuttons(phys_screen);
globalconf.pointer_x = x; globalconf.pointer_x = x;
globalconf.pointer_y = y; globalconf.pointer_y = y;
/* no window have focus, let's try to see if mouse is on
* the screen we just rearranged */
if(!globalconf.focus->client)
{
fscreen = screen_get_bycoord(globalconf.screens_info,
screen, x, y);
/* if the mouse in on the same screen we just rearranged, and no
* client are currently focused, pick the first one in history */
if(fscreen == screen
&& (c = focus_get_current_client(screen)))
client_focus(c, screen, True);
}
} }
/* reset status */ /* reset status */