diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-01-20 09:52:10 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-01-20 09:52:10 -0500 |
| commit | 6a8a8531bad25c148b4c62263d16c0996a21ca6e (patch) | |
| tree | 4fdd8c2ffdc9ce3522e143638a359442284f151c /openbox/startupnotify.c | |
| parent | 2c6240fd2f3e50fca76bb3f4df172eb745982b79 (diff) | |
check them startupnotify-provided wmclass against both parts of a window's wm_class hint, as the spec doth say so.
Diffstat (limited to 'openbox/startupnotify.c')
| -rw-r--r-- | openbox/startupnotify.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c index 66bce264..8bc38da2 100644 --- a/openbox/startupnotify.c +++ b/openbox/startupnotify.c @@ -28,7 +28,7 @@ void sn_startup(gboolean reconfig) {} void sn_shutdown(gboolean reconfig) {} gboolean sn_app_starting() { return FALSE; } -Time sn_app_started(const gchar *id, const gchar *wmclass) +Time sn_app_started(const gchar *id, const gchar *wmclass, const gchar *name) { return CurrentTime; } @@ -169,7 +169,7 @@ static void sn_event_func(SnMonitorEvent *ev, gpointer data) screen_set_root_cursor(); } -Time sn_app_started(const gchar *id, const gchar *wmclass) +Time sn_app_started(const gchar *id, const gchar *wmclass, const gchar *name) { GSList *it; Time t = CurrentTime; @@ -193,13 +193,22 @@ Time sn_app_started(const gchar *id, const gchar *wmclass) found = TRUE; } else { seqclass = sn_startup_sequence_get_wmclass(seq); - seqname = sn_startup_sequence_get_name(seq); seqbin = sn_startup_sequence_get_binary_name(seq); - if ((seqname && !g_ascii_strcasecmp(seqname, wmclass)) || + /* seqclass = "a string to match against the "resource name" or + "resource class" hints. These are WM_CLASS[0] and WM_CLASS[1]" + - from the startup-notification spec + */ + if ((seqclass && !strcmp(seqclass, wmclass)) || + (seqclass && !strcmp(seqclass, name)) || + /* Check the binary name against the class and name hints + as well, to help apps that don't have the class set + correctly */ (seqbin && !g_ascii_strcasecmp(seqbin, wmclass)) || - (seqclass && !strcmp(seqclass, wmclass))) + (seqbin && !g_ascii_strcasecmp(seqbin, name))) + { found = TRUE; + } } if (found) { |