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

Revert "rewrite focus() a bit" 

This reverts commit 652c1459ba.
This commit is contained in:
Julien Danjou 2008-01-25 00:51:11 +01:00
parent dcde59df02
commit 367b4d48fb
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
client.c
View File

@ -163,19 +163,6 @@ focus(Client *c, int screen)
{ {
int phys_screen = get_phys_screen(screen); int phys_screen = get_phys_screen(screen);
/* if c is NULL or invisible, take next client in the focus history */
if(!c || (c && !client_isvisible(c, screen)))
{
c = focus_get_current_client(screen);
/* if c is still NULL take next client in the stack */
if(!c)
for(c = globalconf.clients; c && (c->skip || !client_isvisible(c, screen)); c = c->next);
}
if(c == globalconf.focus->client)
return;
/* unfocus current selected client */ /* unfocus current selected client */
if(globalconf.focus->client) if(globalconf.focus->client)
{ {
@ -186,16 +173,30 @@ focus(Client *c, int screen)
globalconf.screens[screen].colors_normal[ColBorder].pixel); globalconf.screens[screen].colors_normal[ColBorder].pixel);
} }
/* if c is NULL or invisible, take next client in the focus history */
if(!c || (c && !client_isvisible(c, screen)))
{
c = focus_get_current_client(screen);
/* if c is still NULL take next client in the stack */
if(!c)
for(c = globalconf.clients; c && (c->skip || !client_isvisible(c, screen)); c = c->next);
}
if(c)
{
XSetWindowBorder(globalconf.display, c->win, globalconf.screens[screen].colors_selected[ColBorder].pixel);
window_grabbuttons(phys_screen, c->win, True, True);
}
/* save sel in focus history */ /* save sel in focus history */
focus_add_client(c); focus_add_client(c);
if(globalconf.focus->client) if(globalconf.focus->client)
{ {
XSetWindowBorder(globalconf.display, c->win, widget_invalidate_cache(screen, WIDGET_CACHE_CLIENTS);
globalconf.screens[screen].colors_selected[ColBorder].pixel);
XSetInputFocus(globalconf.display, XSetInputFocus(globalconf.display,
globalconf.focus->client->win, RevertToPointerRoot, CurrentTime); globalconf.focus->client->win, RevertToPointerRoot, CurrentTime);
window_grabbuttons(phys_screen, c->win, True, True);
restack(screen); restack(screen);
} }
else else
@ -203,7 +204,6 @@ focus(Client *c, int screen)
RootWindow(globalconf.display, phys_screen), RootWindow(globalconf.display, phys_screen),
RevertToPointerRoot, CurrentTime); RevertToPointerRoot, CurrentTime);
widget_invalidate_cache(screen, WIDGET_CACHE_CLIENTS);
ewmh_update_net_active_window(phys_screen); ewmh_update_net_active_window(phys_screen);
} }