comparison src/console-x-impl.h @ 5239:f19e6bc25969

Backed out changeset 6466bc9ebf15 This would leave all but the first frame blank.
author Mike Sperber <sperber@deinprogramm.de>
date Tue, 13 Jul 2010 10:19:33 +0200
parents 6466bc9ebf15
children 308d34e9f07d
comparison
equal deleted inserted replaced
5237:6466bc9ebf15 5239:f19e6bc25969
65 int depth; 65 int depth;
66 Colormap device_cmap; 66 Colormap device_cmap;
67 67
68 /* Used by x_bevel_modeline in redisplay-x.c */ 68 /* Used by x_bevel_modeline in redisplay-x.c */
69 Pixmap gray_pixmap; 69 Pixmap gray_pixmap;
70
71 #ifdef HAVE_XFT
72 /* The Xft Drawable wrapper for this device. */
73 /* This is persistent to take advantage of the ability of Xft's glyph
74 cache in the server, and avoid rendering the font again and again...
75
76 This is created the first time through redisplay, and destroyed when our
77 connection to the X display is destroyed. */
78 XftDraw *xftDraw;
79 #endif
80
81 70
82 /* Atoms associated with this device. */ 71 /* Atoms associated with this device. */
83 /* allocated in Xatoms_of_device_x */ 72 /* allocated in Xatoms_of_device_x */
84 Atom Xatom_WM_PROTOCOLS; 73 Atom Xatom_WM_PROTOCOLS;
85 Atom Xatom_WM_DELETE_WINDOW; 74 Atom Xatom_WM_DELETE_WINDOW;
196 #define DEVICE_X_DEPTH(d) (DEVICE_X_DATA (d)->depth) 185 #define DEVICE_X_DEPTH(d) (DEVICE_X_DATA (d)->depth)
197 #define DEVICE_X_COLORMAP(d) (DEVICE_X_DATA (d)->device_cmap) 186 #define DEVICE_X_COLORMAP(d) (DEVICE_X_DATA (d)->device_cmap)
198 #define DEVICE_XT_APP_SHELL(d) (DEVICE_X_DATA (d)->Xt_app_shell) 187 #define DEVICE_XT_APP_SHELL(d) (DEVICE_X_DATA (d)->Xt_app_shell)
199 #define DEVICE_X_GC_CACHE(d) (DEVICE_X_DATA (d)->gc_cache) 188 #define DEVICE_X_GC_CACHE(d) (DEVICE_X_DATA (d)->gc_cache)
200 #define DEVICE_X_GRAY_PIXMAP(d) (DEVICE_X_DATA (d)->gray_pixmap) 189 #define DEVICE_X_GRAY_PIXMAP(d) (DEVICE_X_DATA (d)->gray_pixmap)
201 #define DEVICE_X_XFTDRAW(d) (DEVICE_X_DATA (d)->xftDraw)
202 #define DEVICE_X_WM_COMMAND_FRAME(d) (DEVICE_X_DATA (d)->WM_COMMAND_frame) 190 #define DEVICE_X_WM_COMMAND_FRAME(d) (DEVICE_X_DATA (d)->WM_COMMAND_frame)
203 #define DEVICE_X_MOUSE_TIMESTAMP(d) (DEVICE_X_DATA (d)->mouse_timestamp) 191 #define DEVICE_X_MOUSE_TIMESTAMP(d) (DEVICE_X_DATA (d)->mouse_timestamp)
204 #define DEVICE_X_GLOBAL_MOUSE_TIMESTAMP(d) (DEVICE_X_DATA (d)->global_mouse_timestamp) 192 #define DEVICE_X_GLOBAL_MOUSE_TIMESTAMP(d) (DEVICE_X_DATA (d)->global_mouse_timestamp)
205 #define DEVICE_X_LAST_SERVER_TIMESTAMP(d) (DEVICE_X_DATA (d)->last_server_timestamp) 193 #define DEVICE_X_LAST_SERVER_TIMESTAMP(d) (DEVICE_X_DATA (d)->last_server_timestamp)
206 #define DEVICE_X_KEYSYM_MAP_HASH_TABLE(d) (DEVICE_X_DATA (d)->x_keysym_map_hash_table) 194 #define DEVICE_X_KEYSYM_MAP_HASH_TABLE(d) (DEVICE_X_DATA (d)->x_keysym_map_hash_table)
329 /* Could get these at any time by asking xic, but... */ 317 /* Could get these at any time by asking xic, but... */
330 XIMStyle xic_style; /* XIM Style cache */ 318 XIMStyle xic_style; /* XIM Style cache */
331 #endif /* XIM_XLIB */ 319 #endif /* XIM_XLIB */
332 #endif /* HAVE_XIM */ 320 #endif /* HAVE_XIM */
333 321
322 #ifdef HAVE_XFT
323 /* The Xft Drawable wrapper for this device.
324 #### Should this be per-device, or per-frame? */
325 /* This is persistent to take advantage of the ability of Xft's glyph
326 cache in the server, and avoid rendering the font again and again...
327
328 This is created the first time through redisplay, and destroyed when our
329 connection to the X display is destroyed. */
330 XftDraw *xftDraw;
331 #endif
332
334 /* 1 if the frame is completely visible on the display, 0 otherwise. 333 /* 1 if the frame is completely visible on the display, 0 otherwise.
335 if 0 the frame may have been iconified or may be totally 334 if 0 the frame may have been iconified or may be totally
336 or partially hidden by another X window */ 335 or partially hidden by another X window */
337 unsigned int totally_visible_p :1; 336 unsigned int totally_visible_p :1;
338 337
390 #define FRAME_X_TOOLBAR_PIXMAP_BACKGROUND_GC(f) (FRAME_X_DATA (f)->toolbar_pixmap_background_gc) 389 #define FRAME_X_TOOLBAR_PIXMAP_BACKGROUND_GC(f) (FRAME_X_DATA (f)->toolbar_pixmap_background_gc)
391 #endif /* HAVE_TOOLBARS */ 390 #endif /* HAVE_TOOLBARS */
392 391
393 #define FRAME_X_GEOM_FREE_ME_PLEASE(f) (FRAME_X_DATA (f)->geom_free_me_please) 392 #define FRAME_X_GEOM_FREE_ME_PLEASE(f) (FRAME_X_DATA (f)->geom_free_me_please)
394 393
394 #ifdef HAVE_XFT
395 #define FRAME_X_XFTDRAW(f) (FRAME_X_DATA (f)->xftDraw)
396 #endif
397
395 #define FRAME_X_TOTALLY_VISIBLE_P(f) (FRAME_X_DATA (f)->totally_visible_p) 398 #define FRAME_X_TOTALLY_VISIBLE_P(f) (FRAME_X_DATA (f)->totally_visible_p)
396 #define FRAME_X_TOP_LEVEL_FRAME_P(f) (FRAME_X_DATA (f)->top_level_frame_p) 399 #define FRAME_X_TOP_LEVEL_FRAME_P(f) (FRAME_X_DATA (f)->top_level_frame_p)
397 400
398 #ifdef EXTERNAL_WIDGET 401 #ifdef EXTERNAL_WIDGET
399 #define FRAME_X_EXTERNAL_WINDOW_P(f) (FRAME_X_DATA (f)->external_window_p) 402 #define FRAME_X_EXTERNAL_WINDOW_P(f) (FRAME_X_DATA (f)->external_window_p)