mirror of https://github.com/davatorium/rofi.git
[Cleanup] clang-tidy rofi-icon-fetcher.c
This commit is contained in:
Dave Davenport
Dave Davenport
parent
c95ce86553
commit
9a62c5bc1a
|
|
@ -28,28 +28,28 @@
|
|||
/** The log domain of this Helper. */
|
||||
#define G_LOG_DOMAIN "Helpers.IconFetcher"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <config.h>
|
||||
#include <stdlib.h>
|
||||
#include <xcb/xproto.h>
|
||||
|
||||
#include "helper.h"
|
||||
#include "rofi-icon-fetcher.h"
|
||||
#include "rofi-types.h"
|
||||
#include "helper.h"
|
||||
#include "settings.h"
|
||||
|
||||
#include "xcb.h"
|
||||
#include "keyb.h"
|
||||
#include "view.h"
|
||||
#include "xcb.h"
|
||||
|
||||
#include "nkutils-xdg-theme.h"
|
||||
#include "nkutils-enum.h"
|
||||
#include "nkutils-xdg-theme.h"
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||
#include "helper.h"
|
||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||
|
||||
typedef struct
|
||||
{
|
||||
typedef struct {
|
||||
// Context for icon-themes.
|
||||
NkXdgThemeContext *xdg_context;
|
||||
|
||||
|
|
@ -63,14 +63,12 @@ typedef struct
|
|||
uint32_t last_uid;
|
||||
} IconFetcher;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
typedef struct {
|
||||
char *name;
|
||||
GList *sizes;
|
||||
} IconFetcherNameEntry;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
typedef struct {
|
||||
thread_state state;
|
||||
|
||||
GCond *cond;
|
||||
|
|
@ -90,14 +88,14 @@ typedef struct
|
|||
*/
|
||||
IconFetcher *rofi_icon_fetcher_data = NULL;
|
||||
|
||||
static void rofi_icon_fetch_entry_free ( gpointer data )
|
||||
{
|
||||
static void rofi_icon_fetch_entry_free(gpointer data) {
|
||||
IconFetcherNameEntry *entry = (IconFetcherNameEntry *)data;
|
||||
|
||||
// Free name/key.
|
||||
g_free(entry->name);
|
||||
|
||||
for ( GList *iter = g_list_first ( entry->sizes ); iter; iter = g_list_next ( iter ) ) {
|
||||
for (GList *iter = g_list_first(entry->sizes); iter;
|
||||
iter = g_list_next(iter)) {
|
||||
IconFetcherEntry *sentry = (IconFetcherEntry *)(iter->data);
|
||||
|
||||
cairo_surface_destroy(sentry->surface);
|
||||
|
|
@ -108,31 +106,31 @@ static void rofi_icon_fetch_entry_free ( gpointer data )
|
|||
g_free(entry);
|
||||
}
|
||||
|
||||
void rofi_icon_fetcher_init ( void )
|
||||
{
|
||||
void rofi_icon_fetcher_init(void) {
|
||||
g_assert(rofi_icon_fetcher_data == NULL);
|
||||
|
||||
static const gchar * const icon_fallback_themes[] = {
|
||||
"Adwaita",
|
||||
"gnome",
|
||||
NULL
|
||||
};
|
||||
static const gchar *const icon_fallback_themes[] = {"Adwaita", "gnome", NULL};
|
||||
const char *themes[2] = {config.icon_theme, NULL};
|
||||
|
||||
rofi_icon_fetcher_data = g_malloc0(sizeof(IconFetcher));
|
||||
|
||||
rofi_icon_fetcher_data->xdg_context = nk_xdg_theme_context_new ( icon_fallback_themes, NULL );
|
||||
rofi_icon_fetcher_data->xdg_context =
|
||||
nk_xdg_theme_context_new(icon_fallback_themes, NULL);
|
||||
nk_xdg_theme_preload_themes_icon(rofi_icon_fetcher_data->xdg_context, themes);
|
||||
|
||||
rofi_icon_fetcher_data->icon_cache_uid = g_hash_table_new ( g_direct_hash, g_direct_equal );
|
||||
rofi_icon_fetcher_data->icon_cache = g_hash_table_new_full ( g_str_hash, g_str_equal, NULL, rofi_icon_fetch_entry_free );
|
||||
rofi_icon_fetcher_data->icon_cache_uid =
|
||||
g_hash_table_new(g_direct_hash, g_direct_equal);
|
||||
rofi_icon_fetcher_data->icon_cache = g_hash_table_new_full(
|
||||
g_str_hash, g_str_equal, NULL, rofi_icon_fetch_entry_free);
|
||||
|
||||
GSList *l = gdk_pixbuf_get_formats();
|
||||
for (GSList *li = l; li != NULL; li = g_slist_next(li)) {
|
||||
gchar **exts = gdk_pixbuf_format_get_extensions ( (GdkPixbufFormat *) li->data );
|
||||
gchar **exts =
|
||||
gdk_pixbuf_format_get_extensions((GdkPixbufFormat *)li->data);
|
||||
|
||||
for (unsigned int i = 0; exts && exts[i]; i++) {
|
||||
rofi_icon_fetcher_data->supported_extensions = g_list_append ( rofi_icon_fetcher_data->supported_extensions, exts[i] );
|
||||
rofi_icon_fetcher_data->supported_extensions =
|
||||
g_list_append(rofi_icon_fetcher_data->supported_extensions, exts[i]);
|
||||
g_info("Add image extension: %s", exts[i]);
|
||||
exts[i] = NULL;
|
||||
}
|
||||
|
|
@ -142,13 +140,11 @@ void rofi_icon_fetcher_init ( void )
|
|||
g_slist_free(l);
|
||||
}
|
||||
|
||||
static void free_wrapper ( gpointer data, G_GNUC_UNUSED gpointer user_data )
|
||||
{
|
||||
static void free_wrapper(gpointer data, G_GNUC_UNUSED gpointer user_data) {
|
||||
g_free(data);
|
||||
}
|
||||
|
||||
void rofi_icon_fetcher_destroy ( void )
|
||||
{
|
||||
void rofi_icon_fetcher_destroy(void) {
|
||||
if (rofi_icon_fetcher_data == NULL) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -158,7 +154,8 @@ void rofi_icon_fetcher_destroy ( void )
|
|||
g_hash_table_unref(rofi_icon_fetcher_data->icon_cache_uid);
|
||||
g_hash_table_unref(rofi_icon_fetcher_data->icon_cache);
|
||||
|
||||
g_list_foreach ( rofi_icon_fetcher_data->supported_extensions, free_wrapper, NULL );
|
||||
g_list_foreach(rofi_icon_fetcher_data->supported_extensions, free_wrapper,
|
||||
NULL);
|
||||
g_list_free(rofi_icon_fetcher_data->supported_extensions);
|
||||
g_free(rofi_icon_fetcher_data);
|
||||
}
|
||||
|
|
@ -189,11 +186,9 @@ void rofi_icon_fetcher_destroy ( void )
|
|||
#define ALPHA_BYTE 0
|
||||
#endif
|
||||
|
||||
static inline guchar alpha_mult ( guchar c, guchar a )
|
||||
{
|
||||
static inline guchar alpha_mult(guchar c, guchar a) {
|
||||
guint16 t;
|
||||
switch ( a )
|
||||
{
|
||||
switch (a) {
|
||||
case 0xff:
|
||||
return c;
|
||||
case 0x00:
|
||||
|
|
@ -204,9 +199,8 @@ static inline guchar alpha_mult ( guchar c, guchar a )
|
|||
}
|
||||
}
|
||||
|
||||
static cairo_surface_t * rofi_icon_fetcher_get_surface_from_pixbuf ( GdkPixbuf
|
||||
*pixbuf )
|
||||
{
|
||||
static cairo_surface_t *
|
||||
rofi_icon_fetcher_get_surface_from_pixbuf(GdkPixbuf *pixbuf) {
|
||||
gint width, height;
|
||||
const guchar *pixels;
|
||||
gint stride;
|
||||
|
|
@ -266,8 +260,7 @@ static cairo_surface_t * rofi_icon_fetcher_get_surface_from_pixbuf ( GdkPixbuf
|
|||
return surface;
|
||||
}
|
||||
|
||||
gboolean rofi_icon_fetcher_file_is_image ( const char * const path )
|
||||
{
|
||||
gboolean rofi_icon_fetcher_file_is_image(const char *const path) {
|
||||
if (path == NULL) {
|
||||
return FALSE;
|
||||
}
|
||||
|
|
@ -277,7 +270,8 @@ gboolean rofi_icon_fetcher_file_is_image ( const char * const path )
|
|||
}
|
||||
suf++;
|
||||
|
||||
for ( GList *iter = rofi_icon_fetcher_data->supported_extensions; iter != NULL; iter = g_list_next ( iter ) ) {
|
||||
for (GList *iter = rofi_icon_fetcher_data->supported_extensions; iter != NULL;
|
||||
iter = g_list_next(iter)) {
|
||||
if (g_ascii_strcasecmp(iter->data, suf) == 0) {
|
||||
return TRUE;
|
||||
}
|
||||
|
|
@ -285,27 +279,26 @@ gboolean rofi_icon_fetcher_file_is_image ( const char * const path )
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
static void rofi_icon_fetcher_worker ( thread_state *sdata, G_GNUC_UNUSED gpointer user_data )
|
||||
{
|
||||
static void rofi_icon_fetcher_worker(thread_state *sdata,
|
||||
G_GNUC_UNUSED gpointer user_data) {
|
||||
g_debug("starting up icon fetching thread.");
|
||||
// as long as dr->icon is updated atomicly.. (is a pointer write atomic?)
|
||||
// this should be fine running in another thread.
|
||||
IconFetcherEntry *sentry = (IconFetcherEntry *)sdata;
|
||||
const gchar *themes[] = {
|
||||
config.icon_theme,
|
||||
NULL
|
||||
};
|
||||
const gchar *themes[] = {config.icon_theme, NULL};
|
||||
|
||||
const gchar *icon_path;
|
||||
gchar *icon_path_ = NULL;
|
||||
|
||||
if (g_path_is_absolute(sentry->entry->name)) {
|
||||
icon_path = sentry->entry->name;
|
||||
}
|
||||
else {
|
||||
icon_path = icon_path_ = nk_xdg_theme_get_icon ( rofi_icon_fetcher_data->xdg_context, themes, NULL, sentry->entry->name, MIN(sentry->wsize,sentry->hsize), 1, TRUE );
|
||||
} else {
|
||||
icon_path = icon_path_ = nk_xdg_theme_get_icon(
|
||||
rofi_icon_fetcher_data->xdg_context, themes, NULL, sentry->entry->name,
|
||||
MIN(sentry->wsize, sentry->hsize), 1, TRUE);
|
||||
if (icon_path_ == NULL) {
|
||||
g_debug ( "failed to get icon %s(%dx%d): n/a", sentry->entry->name, sentry->wsize, sentry->hsize );
|
||||
g_debug("failed to get icon %s(%dx%d): n/a", sentry->entry->name,
|
||||
sentry->wsize, sentry->hsize);
|
||||
|
||||
const char *ext = g_strrstr(sentry->entry->name, ".");
|
||||
if (ext) {
|
||||
|
|
@ -315,9 +308,9 @@ printf("%s %s\r\n", sentry->entry->name, ext);
|
|||
if (icon_path == NULL) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
else{
|
||||
g_debug ( "found icon %s(%dx%d): %s", sentry->entry->name, sentry->wsize, sentry->hsize, icon_path );
|
||||
} else {
|
||||
g_debug("found icon %s(%dx%d): %s", sentry->entry->name, sentry->wsize,
|
||||
sentry->hsize, icon_path);
|
||||
}
|
||||
}
|
||||
cairo_surface_t *icon_surf = NULL;
|
||||
|
|
@ -328,15 +321,15 @@ printf("%s %s\r\n", sentry->entry->name, ext);
|
|||
}
|
||||
|
||||
GError *error = NULL;
|
||||
GdkPixbuf *pb = gdk_pixbuf_new_from_file_at_scale ( icon_path, sentry->wsize, sentry->hsize, TRUE, &error );
|
||||
GdkPixbuf *pb = gdk_pixbuf_new_from_file_at_scale(
|
||||
icon_path, sentry->wsize, sentry->hsize, TRUE, &error);
|
||||
if (error != NULL) {
|
||||
g_warning("Failed to load image: %s", error->message);
|
||||
g_error_free(error);
|
||||
if (pb) {
|
||||
g_object_unref(pb);
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
icon_surf = rofi_icon_fetcher_get_surface_from_pixbuf(pb);
|
||||
g_object_unref(pb);
|
||||
}
|
||||
|
|
@ -346,17 +339,19 @@ printf("%s %s\r\n", sentry->entry->name, ext);
|
|||
rofi_view_reload();
|
||||
}
|
||||
|
||||
uint32_t rofi_icon_fetcher_query_advanced ( const char *name, const int wsize, const int hsize )
|
||||
{
|
||||
uint32_t rofi_icon_fetcher_query_advanced(const char *name, const int wsize,
|
||||
const int hsize) {
|
||||
g_debug("Query: %s(%dx%d)", name, wsize, hsize);
|
||||
IconFetcherNameEntry *entry = g_hash_table_lookup ( rofi_icon_fetcher_data->icon_cache, name );
|
||||
IconFetcherNameEntry *entry =
|
||||
g_hash_table_lookup(rofi_icon_fetcher_data->icon_cache, name);
|
||||
if (entry == NULL) {
|
||||
entry = g_new0(IconFetcherNameEntry, 1);
|
||||
entry->name = g_strdup(name);
|
||||
g_hash_table_insert(rofi_icon_fetcher_data->icon_cache, entry->name, entry);
|
||||
}
|
||||
IconFetcherEntry *sentry;
|
||||
for ( GList *iter = g_list_first ( entry->sizes ); iter; iter = g_list_next ( iter ) ) {
|
||||
for (GList *iter = g_list_first(entry->sizes); iter;
|
||||
iter = g_list_next(iter)) {
|
||||
sentry = iter->data;
|
||||
if (sentry->wsize == wsize && sentry->hsize == hsize) {
|
||||
return sentry->uid;
|
||||
|
|
@ -372,7 +367,8 @@ uint32_t rofi_icon_fetcher_query_advanced ( const char *name, const int wsize, c
|
|||
sentry->surface = NULL;
|
||||
|
||||
entry->sizes = g_list_prepend(entry->sizes, sentry);
|
||||
g_hash_table_insert ( rofi_icon_fetcher_data->icon_cache_uid, GINT_TO_POINTER ( sentry->uid ), sentry );
|
||||
g_hash_table_insert(rofi_icon_fetcher_data->icon_cache_uid,
|
||||
GINT_TO_POINTER(sentry->uid), sentry);
|
||||
|
||||
// Push into fetching queue.
|
||||
sentry->state.callback = rofi_icon_fetcher_worker;
|
||||
|
|
@ -380,17 +376,18 @@ uint32_t rofi_icon_fetcher_query_advanced ( const char *name, const int wsize, c
|
|||
|
||||
return sentry->uid;
|
||||
}
|
||||
uint32_t rofi_icon_fetcher_query ( const char *name, const int size )
|
||||
{
|
||||
uint32_t rofi_icon_fetcher_query(const char *name, const int size) {
|
||||
g_debug("Query: %s(%d)", name, size);
|
||||
IconFetcherNameEntry *entry = g_hash_table_lookup ( rofi_icon_fetcher_data->icon_cache, name );
|
||||
IconFetcherNameEntry *entry =
|
||||
g_hash_table_lookup(rofi_icon_fetcher_data->icon_cache, name);
|
||||
if (entry == NULL) {
|
||||
entry = g_new0(IconFetcherNameEntry, 1);
|
||||
entry->name = g_strdup(name);
|
||||
g_hash_table_insert(rofi_icon_fetcher_data->icon_cache, entry->name, entry);
|
||||
}
|
||||
IconFetcherEntry *sentry;
|
||||
for ( GList *iter = g_list_first ( entry->sizes ); iter; iter = g_list_next ( iter ) ) {
|
||||
for (GList *iter = g_list_first(entry->sizes); iter;
|
||||
iter = g_list_next(iter)) {
|
||||
sentry = iter->data;
|
||||
if (sentry->wsize == size && sentry->hsize == size) {
|
||||
return sentry->uid;
|
||||
|
|
@ -406,7 +403,8 @@ uint32_t rofi_icon_fetcher_query ( const char *name, const int size )
|
|||
sentry->surface = NULL;
|
||||
|
||||
entry->sizes = g_list_prepend(entry->sizes, sentry);
|
||||
g_hash_table_insert ( rofi_icon_fetcher_data->icon_cache_uid, GINT_TO_POINTER ( sentry->uid ), sentry );
|
||||
g_hash_table_insert(rofi_icon_fetcher_data->icon_cache_uid,
|
||||
GINT_TO_POINTER(sentry->uid), sentry);
|
||||
|
||||
// Push into fetching queue.
|
||||
sentry->state.callback = rofi_icon_fetcher_worker;
|
||||
|
|
@ -415,9 +413,9 @@ uint32_t rofi_icon_fetcher_query ( const char *name, const int size )
|
|||
return sentry->uid;
|
||||
}
|
||||
|
||||
cairo_surface_t * rofi_icon_fetcher_get ( const uint32_t uid )
|
||||
{
|
||||
IconFetcherEntry *sentry = g_hash_table_lookup ( rofi_icon_fetcher_data->icon_cache_uid, GINT_TO_POINTER ( uid ) );
|
||||
cairo_surface_t *rofi_icon_fetcher_get(const uint32_t uid) {
|
||||
IconFetcherEntry *sentry = g_hash_table_lookup(
|
||||
rofi_icon_fetcher_data->icon_cache_uid, GINT_TO_POINTER(uid));
|
||||
if (sentry) {
|
||||
return sentry->surface;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue