summaryrefslogtreecommitdiff
path: root/src/window.h
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2002-02-09 23:03:52 +0000
committerHavoc Pennington <hp@src.gnome.org>2002-02-09 23:03:52 +0000
commit245c9c2d7e27445744eee764ecae6e3914fabd1e (patch)
treea20a282963f71f7d064de2276619afa138eeb6af /src/window.h
parent29a86695d1eabfaab0675511dc2c3f80e548258d (diff)
downloadmetacity-245c9c2d7e27445744eee764ecae6e3914fabd1e.tar.gz
metacity-245c9c2d7e27445744eee764ecae6e3914fabd1e.tar.bz2
port to icon cache
2002-02-09 Havoc Pennington <hp@pobox.com> * src/window.c (update_icon): port to icon cache * src/iconcache.c, src/iconcache.c: begin process of cleaning up window.c by moving the icon-reading code in here, based on the code in libwnck, which was in turn based on the earlier metacity code
Diffstat (limited to 'src/window.h')
-rw-r--r--src/window.h16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/window.h b/src/window.h
index 21f8c84..2cbf25c 100644
--- a/src/window.h
+++ b/src/window.h
@@ -25,6 +25,7 @@
#include "screen.h"
#include "util.h"
#include "stack.h"
+#include "iconcache.h"
#include <X11/Xutil.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
@@ -58,6 +59,9 @@ struct _MetaWindow
char *icon_name;
GdkPixbuf *icon;
GdkPixbuf *mini_icon;
+ MetaIconCache icon_cache;
+ Pixmap wm_hints_pixmap;
+ Pixmap wm_hints_mask;
MetaWindowType type;
Atom type_atom;
@@ -77,18 +81,6 @@ struct _MetaWindow
/* Initial workspace property */
int initial_workspace;
- Pixmap icon_pixmap;
- Pixmap icon_mask;
-
- /* these are legacy and should die once we have _NET_WM_ICON in
- * most apps
- */
- Pixmap kwm_pixmap;
- Pixmap kwm_mask;
-
- /* Whether ->icon is from NET_WM_ICON instead of pixmap */
- guint using_rgb_icon : 1;
-
/* Whether we're maximized */
guint maximized : 1;