mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-05 13:29:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

icon-loader: match more application icons via fuzzy match

Browse source 
Add fallback logic to match reverse-URL .desktop file names when
the app_id is just the base name (e.g. "thunderbird" ->
org.mozilla.Thunderbird.desktop).
This commit is contained in:
John Lindgren 2024-09-30 00:24:13 -04:00 • committed by Johan Malm
parent 2f3cd205f3
commit 887ec70ba4
1 changed files with 32 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/icon-loader.c
View file

@ -2,6 +2,8 @@
#include <sfdo-desktop.h> #include <sfdo-desktop.h>
#include <sfdo-icon.h> #include <sfdo-icon.h>
#include <sfdo-basedir.h> #include <sfdo-basedir.h>
#include <string.h>
#include <strings.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "common/mem.h" #include "common/mem.h"
#include "common/string-helpers.h" #include "common/string-helpers.h"
@ -135,6 +137,33 @@ err:
return -1; return -1;
} }
/*
* Looks up an application desktop entry using fuzzy matching
* (e.g. "thunderbird" matches "org.mozilla.Thunderbird.desktop"
* and "XTerm" matches "xterm.desktop"). This is not per any spec
* but is needed to find icons for existing applications.
*/
static struct sfdo_desktop_entry *
get_db_entry_by_id_fuzzy(struct sfdo_desktop_db *db, const char *app_id)
{
size_t n_entries;
struct sfdo_desktop_entry **entries = sfdo_desktop_db_get_entries(db, &n_entries);
for (size_t i = 0; i < n_entries; i++) {
struct sfdo_desktop_entry *entry = entries[i];
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 *desktop_id_base = dot ? (dot + 1) : desktop_id;
if (!strcasecmp(app_id, desktop_id_base)) {
return entry;
}
}
return NULL;
}
struct lab_data_buffer * struct lab_data_buffer *
icon_loader_lookup(struct server *server, const char *app_id, int size, int scale) icon_loader_lookup(struct server *server, const char *app_id, int size, int scale)
{ {
@ -146,6 +175,9 @@ icon_loader_lookup(struct server *server, const char *app_id, int size, int scal
const char *icon_name = NULL; const char *icon_name = NULL;
struct sfdo_desktop_entry *entry = sfdo_desktop_db_get_entry_by_id( struct sfdo_desktop_entry *entry = sfdo_desktop_db_get_entry_by_id(
loader->desktop_db, app_id, SFDO_NT); loader->desktop_db, app_id, SFDO_NT);
if (!entry) {
entry = get_db_entry_by_id_fuzzy(loader->desktop_db, app_id);
}
if (entry) { if (entry) {
icon_name = sfdo_desktop_entry_get_icon(entry, NULL); icon_name = sfdo_desktop_entry_get_icon(entry, NULL);
} }