summaryrefslogtreecommitdiff
path: root/src/window.h
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2001-08-20 01:42:44 +0000
committerHavoc Pennington <hp@src.gnome.org>2001-08-20 01:42:44 +0000
commit04e09d4c564dc5efea47b60c24309617c9d961c8 (patch)
treeca8d99de667c01c7b1413dd102df2b7b8fbe12ad /src/window.h
parent78a68f3e10233bb9c7d699456cf7d8ed6445769d (diff)
downloadmetacity-04e09d4c564dc5efea47b60c24309617c9d961c8.tar.gz
metacity-04e09d4c564dc5efea47b60c24309617c9d961c8.tar.bz2
we support _NET_WM_ICON
2001-08-19 Havoc Pennington <hp@pobox.com> * src/screen.c (set_supported_hint): we support _NET_WM_ICON * src/wm-tester/main.c: add stuff to test _NET_WM_ICON (but it doesn't work, so it isn't tested yet) * src/window.c (update_icon): read _NET_WM_ICON * src/screen.c (meta_screen_new): set the WM_ICON_SIZE hint * src/tabpopup.c (meta_ui_tab_popup_select): remove assertion * src/window.c (meta_window_get_icon_geometry): fix obscure memleak
Diffstat (limited to 'src/window.h')
-rw-r--r--src/window.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/window.h b/src/window.h
index 3757d8d..a70649d 100644
--- a/src/window.h
+++ b/src/window.h
@@ -70,11 +70,14 @@ struct _MetaWindow
Window xgroup_leader;
Window xclient_leader;
- Pixmap icon_pixmap;
- Pixmap icon_mask;
-
/* Initial workspace property */
- int initial_workspace;
+ int initial_workspace;
+
+ Pixmap icon_pixmap;
+ Pixmap icon_mask;
+
+ /* Whether ->icon is from NET_WM_ICON instead of pixmap */
+ guint using_rgb_icon : 1;
/* Whether we're maximized */
guint maximized : 1;