[gtk+] GdkX11Screen: Struct packing improvements
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GdkX11Screen: Struct packing improvements
- Date: Tue, 12 Apr 2011 16:51:18 +0000 (UTC)
commit 1c4cb29475dc8796f3172c4e39f147831f22bcfe
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Apr 12 10:38:38 2011 -0400
GdkX11Screen: Struct packing improvements
gdk/x11/gdkscreen-x11.h | 55 ++++++++++++++++++++++-----------------------
gdk/x11/gdkxftdefaults.c | 11 ++++++---
2 files changed, 34 insertions(+), 32 deletions(-)
---
diff --git a/gdk/x11/gdkscreen-x11.h b/gdk/x11/gdkscreen-x11.h
index e7aeca9..be0c669 100644
--- a/gdk/x11/gdkscreen-x11.h
+++ b/gdk/x11/gdkscreen-x11.h
@@ -38,18 +38,31 @@ typedef struct _GdkX11Monitor GdkX11Monitor;
struct _GdkX11Screen
{
GdkScreen parent_instance;
-
+
GdkDisplay *display;
Display *xdisplay;
Screen *xscreen;
- gint screen_num;
Window xroot_window;
GdkWindow *root_window;
+ gint screen_num;
+ /* Xinerama/RandR 1.2 */
+ gint n_monitors;
+ GdkX11Monitor *monitors;
+ gint primary_monitor;
+
+ /* Xft resources for the display, used for default values for
+ * the Xft/ XSETTINGS
+ */
+ gint xft_hintstyle;
+ gint xft_rgba;
+ gint xft_dpi;
/* Window manager */
+ GdkAtom cm_selection_atom;
long last_wmspec_check_time;
Window wmspec_check_window;
char *window_manager_name;
+
/* TRUE if wmspec_check_window has changed since last
* fetch of _NET_SUPPORTED
*/
@@ -58,44 +71,30 @@ struct _GdkX11Screen
* fetch of window manager name
*/
guint need_refetch_wm_name : 1;
-
+ guint xsettings_in_init : 1;
+ guint is_composited : 1;
+ guint xft_init : 1; /* Whether we've intialized these values yet */
+ guint xft_antialias : 1;
+ guint xft_hinting : 1;
+
/* Visual Part */
- GdkVisual *system_visual;
- GdkVisual **visuals;
gint nvisuals;
+ GdkVisual **visuals;
+ GdkVisual *system_visual;
gint available_depths[7];
- gint navailable_depths;
GdkVisualType available_types[6];
- gint navailable_types;
+ gint16 navailable_depths;
+ gint16 navailable_types;
GHashTable *visual_hash;
GdkVisual *rgba_visual;
-
+
/* X settings */
XSettingsClient *xsettings_client;
- guint xsettings_in_init : 1;
-
- /* Xinerama/RandR 1.2 */
- gint n_monitors;
- GdkX11Monitor *monitors;
- gint primary_monitor;
/* cache for window->translate vfunc */
GC subwindow_gcs[32];
-
- /* Xft resources for the display, used for default values for
- * the Xft/ XSETTINGS
- */
- gboolean xft_init; /* Whether we've intialized these values yet */
- gboolean xft_antialias;
- gboolean xft_hinting;
- gint xft_hintstyle;
- gint xft_rgba;
- gint xft_dpi;
-
- GdkAtom cm_selection_atom;
- gboolean is_composited;
};
-
+
struct _GdkX11ScreenClass
{
GdkScreenClass parent_class;
diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c
index ca598e6..c2437e3 100644
--- a/gdk/x11/gdkxftdefaults.c
+++ b/gdk/x11/gdkxftdefaults.c
@@ -154,17 +154,20 @@ init_xft_settings (GdkScreen *screen)
GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
Display *xdisplay = GDK_SCREEN_XDISPLAY (screen);
double dpi_double;
+ gboolean b;
if (x11_screen->xft_init)
return;
x11_screen->xft_init = TRUE;
- if (!get_boolean_default (xdisplay, "antialias", &x11_screen->xft_antialias))
- x11_screen->xft_antialias = TRUE;
+ if (!get_boolean_default (xdisplay, "antialias", &b))
+ b = TRUE;
+ x11_screen->xft_antialias = b;
- if (!get_boolean_default (xdisplay, "hinting", &x11_screen->xft_hinting))
- x11_screen->xft_hinting = TRUE;
+ if (!get_boolean_default (xdisplay, "hinting", &b))
+ b = TRUE;
+ x11_screen->xft_hinting = b;
if (!get_integer_default (xdisplay, "hintstyle", &x11_screen->xft_hintstyle))
x11_screen->xft_hintstyle = FC_HINT_FULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]