use the <wmclass> for startup notfication in the execute action. when present don't use the check against the binary.
This commit is contained in:
parent
beb2895f5a
commit
1b33ab6c0d
3 changed files with 23 additions and 22 deletions
|
@ -104,6 +104,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
|
||||||
program = g_path_get_basename(argv[0]);
|
program = g_path_get_basename(argv[0]);
|
||||||
/* sets up the environment */
|
/* sets up the environment */
|
||||||
sn_setup_spawn_environment(program, o->sn_name, o->sn_icon,
|
sn_setup_spawn_environment(program, o->sn_name, o->sn_icon,
|
||||||
|
o->sn_wmclass,
|
||||||
/* launch it on the current desktop */
|
/* launch it on the current desktop */
|
||||||
screen_desktop);
|
screen_desktop);
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,8 +33,9 @@ Time sn_app_started(const gchar *id, const gchar *wmclass, const gchar *name)
|
||||||
return CurrentTime;
|
return CurrentTime;
|
||||||
}
|
}
|
||||||
gboolean sn_get_desktop(gchar *id, guint *desktop) { return FALSE; }
|
gboolean sn_get_desktop(gchar *id, guint *desktop) { return FALSE; }
|
||||||
void sn_setup_spawn_environment(gchar *program, gchar *name,
|
void sn_setup_spawn_environment(const gchar *program, const gchar *name,
|
||||||
gchar *icon_name, gint desktop) {}
|
const gchar *icon_name, const gchar *wmclass,
|
||||||
|
gint desktop) {}
|
||||||
void sn_spawn_cancel() {}
|
void sn_spawn_cancel() {}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
@ -173,10 +174,9 @@ Time sn_app_started(const gchar *id, const gchar *wmclass, const gchar *name)
|
||||||
for (it = sn_waits; it; it = g_slist_next(it)) {
|
for (it = sn_waits; it; it = g_slist_next(it)) {
|
||||||
SnStartupSequence *seq = it->data;
|
SnStartupSequence *seq = it->data;
|
||||||
gboolean found = FALSE;
|
gboolean found = FALSE;
|
||||||
const gchar *seqid, *seqclass, *seqname, *seqbin;
|
const gchar *seqid, *seqclass, *seqbin;
|
||||||
seqid = sn_startup_sequence_get_id(seq);
|
seqid = sn_startup_sequence_get_id(seq);
|
||||||
seqclass = sn_startup_sequence_get_wmclass(seq);
|
seqclass = sn_startup_sequence_get_wmclass(seq);
|
||||||
seqname = sn_startup_sequence_get_name(seq);
|
|
||||||
seqbin = sn_startup_sequence_get_binary_name(seq);
|
seqbin = sn_startup_sequence_get_binary_name(seq);
|
||||||
|
|
||||||
if (id && seqid) {
|
if (id && seqid) {
|
||||||
|
@ -184,24 +184,21 @@ Time sn_app_started(const gchar *id, const gchar *wmclass, const gchar *name)
|
||||||
accuracy */
|
accuracy */
|
||||||
if (!strcmp(seqid, id))
|
if (!strcmp(seqid, id))
|
||||||
found = TRUE;
|
found = TRUE;
|
||||||
} else {
|
}
|
||||||
seqclass = sn_startup_sequence_get_wmclass(seq);
|
else if (seqclass) {
|
||||||
seqbin = sn_startup_sequence_get_binary_name(seq);
|
|
||||||
|
|
||||||
/* seqclass = "a string to match against the "resource name" or
|
/* seqclass = "a string to match against the "resource name" or
|
||||||
"resource class" hints. These are WM_CLASS[0] and WM_CLASS[1]"
|
"resource class" hints. These are WM_CLASS[0] and WM_CLASS[1]"
|
||||||
- from the startup-notification spec
|
- from the startup-notification spec
|
||||||
*/
|
*/
|
||||||
if ((seqclass && !strcmp(seqclass, wmclass)) ||
|
found = (seqclass && !strcmp(seqclass, wmclass)) ||
|
||||||
(seqclass && !strcmp(seqclass, name)) ||
|
(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
|
else if (seqbin) {
|
||||||
correctly */
|
/* Check the binary name against the class and name hints
|
||||||
(seqbin && !g_ascii_strcasecmp(seqbin, wmclass)) ||
|
as well, to help apps that don't have the class set
|
||||||
(seqbin && !g_ascii_strcasecmp(seqbin, name)))
|
correctly */
|
||||||
{
|
found = (seqbin && !g_ascii_strcasecmp(seqbin, wmclass)) ||
|
||||||
found = TRUE;
|
(seqbin && !g_ascii_strcasecmp(seqbin, name));
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (found) {
|
if (found) {
|
||||||
|
@ -234,8 +231,9 @@ static gboolean sn_launch_wait_timeout(gpointer data)
|
||||||
return FALSE; /* don't repeat */
|
return FALSE; /* don't repeat */
|
||||||
}
|
}
|
||||||
|
|
||||||
void sn_setup_spawn_environment(gchar *program, gchar *name,
|
void sn_setup_spawn_environment(const gchar *program, const gchar *name,
|
||||||
gchar *icon_name, gint desktop)
|
const gchar *icon_name, const gchar *wmclass,
|
||||||
|
gint desktop)
|
||||||
{
|
{
|
||||||
gchar *desc;
|
gchar *desc;
|
||||||
const char *id;
|
const char *id;
|
||||||
|
@ -252,6 +250,7 @@ void sn_setup_spawn_environment(gchar *program, gchar *name,
|
||||||
sn_launcher_context_set_icon_name(sn_launcher, icon_name ?
|
sn_launcher_context_set_icon_name(sn_launcher, icon_name ?
|
||||||
icon_name : program);
|
icon_name : program);
|
||||||
sn_launcher_context_set_binary_name(sn_launcher, program);
|
sn_launcher_context_set_binary_name(sn_launcher, program);
|
||||||
|
if (wmclass) sn_launcher_context_set_wmclass(sn_launcher, wmclass);
|
||||||
if (desktop >= 0 && (unsigned) desktop < screen_num_desktops)
|
if (desktop >= 0 && (unsigned) desktop < screen_num_desktops)
|
||||||
sn_launcher_context_set_workspace(sn_launcher, (signed) desktop);
|
sn_launcher_context_set_workspace(sn_launcher, (signed) desktop);
|
||||||
sn_launcher_context_initiate(sn_launcher, "openbox", program,
|
sn_launcher_context_initiate(sn_launcher, "openbox", program,
|
||||||
|
|
|
@ -38,8 +38,9 @@ Time sn_app_started(const gchar *id, const gchar *wmclass, const gchar *name);
|
||||||
gboolean sn_get_desktop(gchar *id, guint *desktop);
|
gboolean sn_get_desktop(gchar *id, guint *desktop);
|
||||||
|
|
||||||
/* Get the environment to run the program in, with startup notification */
|
/* Get the environment to run the program in, with startup notification */
|
||||||
void sn_setup_spawn_environment(gchar *program, gchar *name,
|
void sn_setup_spawn_environment(const gchar *program, const gchar *name,
|
||||||
gchar *icon_name, gint desktop);
|
const gchar *icon_name, const gchar *wmclass,
|
||||||
|
gint desktop);
|
||||||
|
|
||||||
/* Tell startup notification we're not actually running the program we
|
/* Tell startup notification we're not actually running the program we
|
||||||
told it we were
|
told it we were
|
||||||
|
|
Loading…
Reference in a new issue