From c1460f7920ff0a41b31e2adfc843df4f3c245141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= Date: Fri, 7 May 2021 22:43:48 +0300 Subject: xutils: replace width and height with size in read_icons _wnck_read_icons is used in WnckApplication and WnckWindow. In both cases ideal_width and ideal_height have same value - default icon size. Same with ideal_mini_width and ideal_mini_height. Simplify function by replacing width and height parameters with size parameter. --- libwnck/application.c | 6 ++++-- libwnck/window.c | 6 ++++-- libwnck/xutils.c | 56 ++++++++++++++++++++++----------------------------- libwnck/xutils.h | 6 ++---- 4 files changed, 34 insertions(+), 40 deletions(-) diff --git a/libwnck/application.c b/libwnck/application.c index 26c880c..9a03342 100644 --- a/libwnck/application.c +++ b/libwnck/application.c @@ -340,8 +340,10 @@ get_icons (WnckApplication *app) if (_wnck_read_icons (app->priv->screen, app->priv->xwindow, app->priv->icon_cache, - &icon, normal_size, normal_size, - &mini_icon, mini_size, mini_size)) + &icon, + normal_size, + &mini_icon, + mini_size)) { app->priv->need_emit_icon_changed = TRUE; app->priv->icon_from_leader = TRUE; diff --git a/libwnck/window.c b/libwnck/window.c index fadda82..66a4386 100644 --- a/libwnck/window.c +++ b/libwnck/window.c @@ -2128,8 +2128,10 @@ get_icons (WnckWindow *window) if (_wnck_read_icons (window->priv->screen, window->priv->xwindow, window->priv->icon_cache, - &icon, normal_size, normal_size, - &mini_icon, mini_size, mini_size)) + &icon, + normal_size, + &mini_icon, + mini_size)) { window->priv->need_emit_icon_changed = TRUE; diff --git a/libwnck/xutils.c b/libwnck/xutils.c index 74e455d..d53f190 100644 --- a/libwnck/xutils.c +++ b/libwnck/xutils.c @@ -1968,10 +1968,8 @@ struct _WnckIconCache Pixmap prev_mask; GdkPixbuf *icon; GdkPixbuf *mini_icon; - int ideal_width; - int ideal_height; - int ideal_mini_width; - int ideal_mini_height; + int ideal_size; + int ideal_mini_size; guint want_fallback : 1; /* TRUE if these props have changed */ guint wm_hints_dirty : 1; @@ -1990,10 +1988,8 @@ _wnck_icon_cache_new (void) icon_cache->prev_pixmap = None; icon_cache->icon = NULL; icon_cache->mini_icon = NULL; - icon_cache->ideal_width = -1; /* won't be a legit width */ - icon_cache->ideal_height = -1; - icon_cache->ideal_mini_width = -1; - icon_cache->ideal_mini_height = -1; + icon_cache->ideal_size = -1; /* won't be a legit size */ + icon_cache->ideal_mini_size = -1; icon_cache->want_fallback = TRUE; icon_cache->wm_hints_dirty = TRUE; icon_cache->kwm_win_icon_dirty = TRUE; @@ -2163,11 +2159,9 @@ _wnck_read_icons (WnckScreen *screen, Window xwindow, WnckIconCache *icon_cache, GdkPixbuf **iconp, - int ideal_width, - int ideal_height, + int ideal_size, GdkPixbuf **mini_iconp, - int ideal_mini_width, - int ideal_mini_height) + int ideal_mini_size) { Screen *xscreen; Display *display; @@ -2189,16 +2183,12 @@ _wnck_read_icons (WnckScreen *screen, *iconp = NULL; *mini_iconp = NULL; - if (ideal_width != icon_cache->ideal_width || - ideal_height != icon_cache->ideal_height || - ideal_mini_width != icon_cache->ideal_mini_width || - ideal_mini_height != icon_cache->ideal_mini_height) + if (ideal_size != icon_cache->ideal_size || + ideal_mini_size != icon_cache->ideal_mini_size) clear_icon_cache (icon_cache, TRUE); - icon_cache->ideal_width = ideal_width; - icon_cache->ideal_height = ideal_height; - icon_cache->ideal_mini_width = ideal_mini_width; - icon_cache->ideal_mini_height = ideal_mini_height; + icon_cache->ideal_size = ideal_size; + icon_cache->ideal_mini_size = ideal_mini_size; if (!_wnck_icon_cache_get_icon_invalidated (icon_cache)) return FALSE; /* we have no new info to use */ @@ -2221,15 +2211,17 @@ _wnck_read_icons (WnckScreen *screen, icon_cache->net_wm_icon_dirty = FALSE; if (read_rgb_icon (xscreen, xwindow, - ideal_width, ideal_height, - ideal_mini_width, ideal_mini_height, + ideal_size, + ideal_size, + ideal_mini_size, + ideal_mini_size, &w, &h, &pixdata, &mini_w, &mini_h, &mini_pixdata)) { - *iconp = scaled_from_pixdata (pixdata, w, h, ideal_width, ideal_height); + *iconp = scaled_from_pixdata (pixdata, w, h, ideal_size, ideal_size); *mini_iconp = scaled_from_pixdata (mini_pixdata, mini_w, mini_h, - ideal_mini_width, ideal_mini_height); + ideal_mini_size, ideal_mini_size); replace_cache (icon_cache, USING_NET_WM_ICON, *iconp, *mini_iconp); @@ -2268,8 +2260,8 @@ _wnck_read_icons (WnckScreen *screen, pixmap != None) { if (try_pixmap_and_mask (xscreen, pixmap, mask, - iconp, ideal_width, ideal_height, - mini_iconp, ideal_mini_width, ideal_mini_height)) + iconp, ideal_size, ideal_size, + mini_iconp, ideal_mini_size, ideal_mini_size)) { icon_cache->prev_pixmap = pixmap; icon_cache->prev_mask = mask; @@ -2294,8 +2286,8 @@ _wnck_read_icons (WnckScreen *screen, pixmap != None) { if (try_pixmap_and_mask (xscreen, pixmap, mask, - iconp, ideal_width, ideal_height, - mini_iconp, ideal_mini_width, ideal_mini_height)) + iconp, ideal_size, ideal_size, + mini_iconp, ideal_mini_size, ideal_mini_size)) { icon_cache->prev_pixmap = pixmap; icon_cache->prev_mask = mask; @@ -2312,11 +2304,11 @@ _wnck_read_icons (WnckScreen *screen, icon_cache->origin < USING_FALLBACK_ICON) { _wnck_get_fallback_icons (iconp, - ideal_width, - ideal_height, + ideal_size, + ideal_size, mini_iconp, - ideal_mini_width, - ideal_mini_height); + ideal_mini_size, + ideal_mini_size); replace_cache (icon_cache, USING_FALLBACK_ICON, *iconp, *mini_iconp); diff --git a/libwnck/xutils.h b/libwnck/xutils.h index e09666f..b460bcf 100644 --- a/libwnck/xutils.h +++ b/libwnck/xutils.h @@ -174,11 +174,9 @@ gboolean _wnck_read_icons (WnckScreen *screen, Window xwindow, WnckIconCache *icon_cache, GdkPixbuf **iconp, - int ideal_width, - int ideal_height, + int ideal_size, GdkPixbuf **mini_iconp, - int ideal_mini_width, - int ideal_mini_height); + int ideal_mini_size); void _wnck_get_fallback_icons (GdkPixbuf **iconp, int ideal_width, -- cgit v1.2.1