import gtk settings for colors and fonts

dk · Nov 10, 2015 · 40a0b20 · 40a0b20
1 parent 5a09990
commit 40a0b20
Show file tree

Hide file tree

Showing 4 changed files with 102 additions and 3 deletions.
diff --git a/include/unix/guts.h b/include/unix/guts.h
@@ -1147,6 +1147,9 @@ prima_char2wchar( XChar2b * dest, char * src, int lim);
 extern XCharStruct * 
 prima_char_struct( XFontStruct * xs, void * c, Bool wide);
 
+extern Color**
+prima_standard_colors(void);
+
 struct MsgDlg {
    struct MsgDlg * next;
    Font  * font;

diff --git a/unix/apc_app.c b/unix/apc_app.c
@@ -376,6 +376,9 @@ init_x11( char * error_buf )
    if ( !prima_init_clipboard_subsystem( error_buf)) return false;
    if ( !prima_init_color_subsystem( error_buf)) return false;
    if ( !prima_init_font_subsystem( error_buf)) return false;
+#ifdef WITH_GTK2
+   if (!prima_gtk_init()) return false;
+#endif
    bzero( &guts. cursor_gcv, sizeof( guts. cursor_gcv));
    guts. cursor_gcv. cap_style = CapButt;
    guts. cursor_gcv. function = GXcopy;
@@ -544,7 +547,7 @@ window_subsystem_cleanup( void)
    if ( !DISP) return;
    /*XXX*/
    prima_end_menu();
-#ifdef WITH_GTK
+#ifdef WITH_GTK2
    prima_gtk_done();
 #endif
 }

diff --git a/unix/color.c b/unix/color.c
@@ -115,6 +115,12 @@ static Color* standard_colors[] = {
 
 static const int MAX_COLOR_CLASS = sizeof( standard_colors) / sizeof( standard_colors[ 0]) - 1;
 
+Color **
+prima_standard_colors(void)
+{
+   return standard_colors;
+}
+
 /* maps RGB or cl-constant value to RGB value.  */
 Color 
 prima_map_color( Color clr, int * hint)

diff --git a/unix/gtk.c b/unix/gtk.c
@@ -58,10 +58,52 @@ static int	gtk_filter_index       = 0;
 
 static GdkDisplay * display = NULL;
 
+static Color 
+gdk_color(GdkColor * c)
+{
+	return ((c->red >> 8) << 16) | ((c->green >> 8) << 8) | (c->blue >> 8);
+}
+
+typedef struct {
+	GType (*func)(void);
+	char * name;
+	int    prima_class;
+	Font * prima_font;
+} GTFStruct;
+
+#define GT(x) gtk_##x##_get_type, #x
+
+static GType gtf_type_null(void) { return G_TYPE_NONE; }
+
+static GTFStruct widget_types[] = {
+	{ GT(button),       wcButton       >> 16, NULL },  
+	{ GT(check_button), wcCheckBox     >> 16, NULL },  
+	{ GT(combo_box),    wcCombo        >> 16, NULL },  
+	{ GT(dialog),       wcDialog       >> 16, NULL },  
+	{ GT(entry),        wcEdit         >> 16, NULL },  
+	{ GT(entry),        wcInputLine    >> 16, NULL },  
+	{ GT(label),        wcLabel        >> 16, &guts. default_msg_font },  
+	{ GT(list),         wcListBox      >> 16, NULL },  
+	{ GT(menu),         wcMenu         >> 16, &guts. default_menu_font },  
+	{ GT(menu_item),    wcPopup        >> 16, NULL },  
+	{ GT(check_button), wcRadio        >> 16, NULL },  
+	{ GT(scrollbar),    wcScrollBar    >> 16, NULL },  
+	{ GT(ruler),        wcSlider       >> 16, NULL },  
+	{ GT(widget),       wcWidget       >> 16, &guts. default_widget_font },
+	{ GT(window),       wcWindow       >> 16, &guts. default_caption_font },  
+	{ GT(widget),       wcApplication  >> 16, &guts. default_font },  
+};
+#undef GT
+
 Display*
 prima_gtk_init(void)
 {
-	int argc = 0;
+	int i, argc = 0;
+	Display *ret;
+	GtkSettings * settings;
+	Color ** stdcolors;
+	PangoWeight weight;
+	PangoStyle style;
 
 	switch ( gtk_initialized) {
 	case -1:
@@ -75,8 +117,53 @@ prima_gtk_init(void)
 		return false;
 	} else {
 		gtk_initialized = 1;
-		return gdk_x11_display_get_xdisplay(display);
+		ret = gdk_x11_display_get_xdisplay(display);
+	}
+
+	settings  = gtk_settings_get_default();
+	stdcolors = prima_standard_colors();
+	for ( i = 0; i < sizeof(widget_types)/sizeof(GTFStruct); i++) {
+		GTFStruct * s = widget_types + i;
+		Color     * c = stdcolors[ s-> prima_class ]; 
+		Font      * f = s->prima_font;
+		GtkStyle  * t = gtk_rc_get_style_by_paths(settings, NULL, NULL, s->func());
+		if ( t == NULL ) {
+			warn("cannot query gtk style for %s\n", s->name);
+			t = gtk_rc_get_style_by_paths(settings, NULL, NULL, GTK_TYPE_WIDGET);
+			if ( !t ) continue;
+		}
+		c[ciFore]         = gdk_color( t-> fg + GTK_STATE_NORMAL );
+		c[ciBack]         = gdk_color( t-> bg + GTK_STATE_NORMAL );
+		c[ciHiliteText]   = gdk_color( t-> fg + GTK_STATE_SELECTED );
+		c[ciHilite]       = gdk_color( t-> bg + GTK_STATE_SELECTED );
+		c[ciDisabledText] = gdk_color( t-> fg + GTK_STATE_INSENSITIVE );
+		c[ciDisabled]     = gdk_color( t-> bg + GTK_STATE_INSENSITIVE );
+		/*
+		c[ciLight3DColor] = gdk_color( t-> light + GTK_STATE_NORMAL );
+		c[ciDark3DColor]  = gdk_color( t-> dark  + GTK_STATE_NORMAL );
+		*/
+   		Pdebug("gtk-color: %s %06x %06x %06x %06x %06x\n", s->name, c[0], c[1], c[2], c[3], c[4], c[5]);
+
+		if ( !f) continue;
+		bzero(f, sizeof(Font));
+		strncpy( f->name, pango_font_description_get_family(t->font_desc), 256);
+		/* does gnome ignore X resolution? */
+		f-> size = pango_font_description_get_size(t->font_desc) / PANGO_SCALE * (96.0 / guts. resolution. y);
+		weight = pango_font_description_get_weight(t->font_desc);
+		if ( weight <= PANGO_WEIGHT_LIGHT ) f-> style |= fsThin;
+		if ( weight >= PANGO_WEIGHT_BOLD  ) f-> style |= fsBold;
+		if ( pango_font_description_get_style(t->font_desc) == PANGO_STYLE_ITALIC)
+			f-> style |= fsItalic;
+   		strcpy( f->encoding, "Default" );
+   		f-> width = f-> height = f->pitch = C_NUMERIC_UNDEF;
+   		apc_font_pick( application, f, f);
+#define DEBUG_FONT(font) f->height,f->width,f->size,f->name,f->encoding
+   		Fdebug("gtk-font (%s): %d.[w=%d,s=%d].%s.%s\n", s->name, DEBUG_FONT(f));
+
 	}
+
+	return ret;
+
 }
 
 Bool