mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-11 08:21:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

icon-loader: also match desktop entries by executable path

Browse source 
It's relatively common for X11 applications to set WM_CLASS to the name
of the executable, which may not be the same as the name of the .desktop
file (for example, "gimp-2.10" vs. gimp.desktop). We can still match
these applications by looking at the Exec key.

This currently makes use of an internal libsfdo header since the needed
API doesn't exist yet. I have submitted a merge request upstream:
https://gitlab.freedesktop.org/vyivel/libsfdo/-/merge_requests/5
This commit is contained in:
John Lindgren 2024-10-04 13:42:23 -04:00
parent fb0c7a29c6
commit 199e1ef041
1 changed files with 32 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/icon-loader.c
View file

@ -5,6 +5,12 @@
#include <string.h> #include <string.h>
#include <strings.h> #include <strings.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
/*
* FIXME: remove when this is merged:
* https://gitlab.freedesktop.org/vyivel/libsfdo/-/merge_requests/5
*/
#include <sfdo-desktop/internal.h>
#include "common/mem.h" #include "common/mem.h"
#include "common/string-helpers.h" #include "common/string-helpers.h"
#include "config.h" #include "config.h"
@ -25,6 +31,20 @@ struct icon_loader {
struct sfdo_icon_theme *icon_theme; struct sfdo_icon_theme *icon_theme;
}; };
/*
* FIXME: remove when this is merged:
* https://gitlab.freedesktop.org/vyivel/libsfdo/-/merge_requests/5
*/
static const char *
desktop_entry_get_exec_name(struct sfdo_desktop_entry *entry)
{
struct sfdo_desktop_exec *exec = sfdo_desktop_entry_get_exec(entry);
if (!exec || exec->n_literals < 1) {
return NULL;
}
return exec->literals[0];
}
void void
icon_loader_init(struct server *server) icon_loader_init(struct server *server)
{ {
@ -152,14 +172,24 @@ get_db_entry_by_id_fuzzy(struct sfdo_desktop_db *db, const char *app_id)
for (size_t i = 0; i < n_entries; i++) { for (size_t i = 0; i < n_entries; i++) {
struct sfdo_desktop_entry *entry = entries[i]; struct sfdo_desktop_entry *entry = entries[i];
/* Try portion of desktop ID after last '.' */
const char *desktop_id = sfdo_desktop_entry_get_id(entry, NULL); const char *desktop_id = sfdo_desktop_entry_get_id(entry, NULL);
/* Get portion of desktop ID after last '.' */
const char *dot = strrchr(desktop_id, '.'); const char *dot = strrchr(desktop_id, '.');
const char *desktop_id_base = dot ? (dot + 1) : desktop_id; const char *desktop_id_base = dot ? (dot + 1) : desktop_id;
if (!strcasecmp(app_id, desktop_id_base)) { if (!strcasecmp(app_id, desktop_id_base)) {
return entry; return entry;
} }
/* Try basename of executable (e.g. "gimp-2.10") */
const char *exec_name = desktop_entry_get_exec_name(entry);
if (exec_name) {
const char *slash = strrchr(exec_name, '/');
const char *exec_base = slash ? (slash + 1) : exec_name;
if (!strcasecmp(app_id, exec_base)) {
return entry;
}
}
} }
return NULL; return NULL;