Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

focus scratch window when it appears, and don't select it for focusing in history

This commit is contained in:
Julien Danjou 2008-02-08 15:08:42 +01:00
parent 1d57d7b327
commit 85e5baa4b1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client.c
View File

@ -191,6 +191,8 @@ client_focus(Client *c, int screen, Bool from_mouse)
if(c) if(c)
{ {
/* unban the client before focusing or it will fail */
client_unban(c);
/* save sel in focus history */ /* save sel in focus history */
focus_add_client(c); focus_add_client(c);
if(globalconf.screens[c->screen].opacity_unfocused != -1) if(globalconf.screens[c->screen].opacity_unfocused != -1)
@ -1108,12 +1110,14 @@ uicb_client_setscratch(int screen,
* \ingroup ui_callback * \ingroup ui_callback
*/ */
void void
uicb_client_togglescratch(int screen __attribute__ ((unused)), uicb_client_togglescratch(int screen,
char *arg __attribute__ ((unused))) char *arg __attribute__ ((unused)))
{ {
if(globalconf.scratch.client) if(globalconf.scratch.client)
{ {
globalconf.scratch.isvisible = !globalconf.scratch.isvisible; globalconf.scratch.isvisible = !globalconf.scratch.isvisible;
if(globalconf.scratch.isvisible)
client_focus(globalconf.scratch.client, screen, False);
globalconf.screens[globalconf.scratch.client->screen].need_arrange = True; globalconf.screens[globalconf.scratch.client->screen].need_arrange = True;
widget_invalidate_cache(globalconf.scratch.client->screen, WIDGET_CACHE_CLIENTS); widget_invalidate_cache(globalconf.scratch.client->screen, WIDGET_CACHE_CLIENTS);
} }

2
focus.c
View File

@ -74,7 +74,7 @@ focus_get_latest_client_for_tags(Tag **t, int nindex)
int i = 0; int i = 0;
for(node = globalconf.focus; node; node = node->next) for(node = globalconf.focus; node; node = node->next)
if(node->client && !node->client->skip) if(node->client && !node->client->skip && node->client != globalconf.scratch.client)
for(tags = t; *tags; tags++) for(tags = t; *tags; tags++)
if(is_client_tagged(node->client, *tags)) if(is_client_tagged(node->client, *tags))
{ {