brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix strict focus mode by picking up on res_class. Fixes #361054, strict

Browse Source 
2006-10-30  Dan Mick  <dan.mick@sun.com>

	* src/window.c: (__window_is_terminal): Fix strict focus
        mode by picking up on res_class. Fixes #361054, strict focus
        mode still not working; should look for res_class, not res_name
This commit is contained in:
Dan Mick 2006-10-29 20:30:18 +00:00 committed by Glynn Foster
parent c8c666f855
commit 191baa3c76
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-10-30 Dan Mick <dan.mick@sun.com>
* src/window.c: (__window_is_terminal): Fix strict focus
mode by picking up on res_class. Fixes #361054, strict focus
mode still not working; should look for res_class, not res_name
2006-10-16 Elijah Newren <newren gmail com> 2006-10-16 Elijah Newren <newren gmail com>
* NEWS: 2.17.1 release. * NEWS: 2.17.1 release.

23
src/window.c
View File

@ -1750,32 +1750,37 @@ intervening_user_event_occurred (MetaWindow *window)
gboolean gboolean
__window_is_terminal (MetaWindow *window) __window_is_terminal (MetaWindow *window)
{ {
if (window == NULL || window->res_name == NULL) if (window == NULL || window->res_class == NULL)
return FALSE; return FALSE;
/*
* Compare res_class, which is not user-settable, and thus theoretically
* a more-reliable indication of term-ness.
*/
/* gnome-terminal -- if you couldn't guess */ /* gnome-terminal -- if you couldn't guess */
if (strcmp (window->res_name, "gnome-terminal") == 0) if (strcmp (window->res_class, "Gnome-terminal") == 0)
return TRUE; return TRUE;
/* xterm, rxvt, aterm */ /* xterm, rxvt, aterm */
else if (strcmp (window->res_name, "XTerm") == 0) else if (strcmp (window->res_class, "XTerm") == 0)
return TRUE; return TRUE;
/* konsole, KDE's terminal program */ /* konsole, KDE's terminal program */
else if (strcmp (window->res_name, "Konsole") == 0) else if (strcmp (window->res_class, "Konsole") == 0)
return TRUE; return TRUE;
/* rxvt-unicode */ /* rxvt-unicode */
else if (strcmp (window->res_name, "URxvt") == 0) else if (strcmp (window->res_class, "URxvt") == 0)
return TRUE; return TRUE;
/* eterm */ /* eterm */
else if (strcmp (window->res_name, "Eterm") == 0) else if (strcmp (window->res_class, "Eterm") == 0)
return TRUE; return TRUE;
/* KTerm -- some terminal not KDE based; so not like Konsole */ /* KTerm -- some terminal not KDE based; so not like Konsole */
else if (strcmp (window->res_name, "KTerm") == 0) else if (strcmp (window->res_class, "KTerm") == 0)
return TRUE; return TRUE;
/* Multi-gnome-terminal */ /* Multi-gnome-terminal */
else if (strcmp (window->res_name, "Multi-gnome-terminal") == 0) else if (strcmp (window->res_class, "Multi-gnome-terminal") == 0)
return TRUE; return TRUE;
/* mlterm ("multi lingual terminal emulator on X") */ /* mlterm ("multi lingual terminal emulator on X") */
else if (strcmp (window->res_name, "mlterm") == 0) else if (strcmp (window->res_class, "mlterm") == 0)
return TRUE; return TRUE;
return FALSE; return FALSE;