X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstyle.c;h=48883a94a0ba4d3e6d55c707a897f5181b308b19;hb=b4edce061b3ad51cd2c2be1ae996c724481ef4e0;hp=9fc6b1e499fe38a907b182f9988c08fce0515221;hpb=c758728fc30c616c15f7413d805768f9a6672fe1;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/style.c b/libchimara/style.c
index 9fc6b1e..48883a9 100644
--- a/libchimara/style.c
+++ b/libchimara/style.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include <math.h>
 #include "chimara-glk-private.h"
 #include "glk.h"
 #include "style.h"
@@ -137,7 +138,7 @@ style_init_textbuffer(GtkTextBuffer *buffer)
 	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
 
 	/* Place the default text tags in the textbuffer's tag table */
-	g_hash_table_foreach(glk_data->styles->text_buffer, style_add_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
+	g_hash_table_foreach(glk_data->styles->text_buffer, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
 
 	/* Copy the override text tags to the textbuffers's tag table */
 	g_hash_table_foreach(glk_data->glk_styles->text_buffer, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
@@ -153,7 +154,7 @@ style_init_textgrid(GtkTextBuffer *buffer)
 	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
 
 	/* Place the default text tags in the textbuffer's tag table */
-	g_hash_table_foreach(glk_data->styles->text_grid, style_add_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
+	g_hash_table_foreach(glk_data->styles->text_grid, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
 
 	/* Copy the current text tags to the textbuffers's tag table */
 	g_hash_table_foreach(glk_data->glk_styles->text_grid, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
@@ -214,6 +215,7 @@ gtk_text_tag_copy(GtkTextTag *tag)
 		_COPY_FLAG (invisible_set);
 		_COPY_FLAG (editable_set);
 		_COPY_FLAG (language_set);
+		_COPY_FLAG (scale_set);
 	#undef _COPY_FLAG
 
 	/* Copy the data that was added manually */
@@ -319,12 +321,12 @@ style_init(ChimaraGlk *glk)
 
 	tag = gtk_text_tag_new("header");
 	//g_object_set(tag, "font-desc", default_font_desc, "size-points", 18.0, "weight", PANGO_WEIGHT_BOLD, NULL);
-	g_object_set(tag, "size-points", 18.0, "weight", PANGO_WEIGHT_BOLD, NULL);
+	g_object_set(tag, "weight", PANGO_WEIGHT_BOLD, NULL);
 	g_hash_table_insert(default_text_buffer_styles, "header", tag);
 
 	tag = gtk_text_tag_new("subheader");
 	//g_object_set(tag, "font-desc", default_font_desc, "size-points", 14.0, "weight", PANGO_WEIGHT_BOLD, NULL);
-	g_object_set(tag, "size-points", 14.0, "weight", PANGO_WEIGHT_BOLD, NULL);
+	g_object_set(tag, "weight", PANGO_WEIGHT_BOLD, NULL);
 	g_hash_table_insert(default_text_buffer_styles, "subheader", tag);
 
 	tag = gtk_text_tag_new("alert");
@@ -376,6 +378,7 @@ style_init(ChimaraGlk *glk)
 	for(i=0; i<style_NUMSTYLES; i++) {
 		tag = gtk_text_tag_new(GLK_TAG_NAMES[i]);
 		g_hash_table_insert(glk_text_grid_styles, (gchar*) GLK_TAG_NAMES[i], tag);
+		tag = gtk_text_tag_new(GLK_TAG_NAMES[i]);
 		g_hash_table_insert(glk_text_buffer_styles, (gchar*) GLK_TAG_NAMES[i], tag);
 	}
 
@@ -731,7 +734,23 @@ apply_stylehint_to_tag(GtkTextTag *tag, GtkTextTag *default_tag, glui32 wintype,
 		break;
 
 	case stylehint_Size:
-		g_object_set(tag_object, "size", 14+(2*val), "size-set", TRUE, NULL);
+		{
+			gdouble scale = PANGO_SCALE_MEDIUM;
+			switch(val) {
+				case -3: scale = PANGO_SCALE_XX_SMALL; break;
+				case -2: scale = PANGO_SCALE_X_SMALL; break;
+				case -1: scale = PANGO_SCALE_SMALL; break;
+				case  0: scale = PANGO_SCALE_MEDIUM; break;
+				case  1: scale = PANGO_SCALE_LARGE; break;
+				case  2: scale = PANGO_SCALE_X_LARGE; break;
+				case  3: scale = PANGO_SCALE_XX_LARGE; break;
+				default:
+					/* We follow Pango's convention of having each magnification
+					step be a scaling of 1.2 */
+					scale = pow(1.2, (double)val);
+			}
+			g_object_set(tag_object, "scale", scale, "scale-set", TRUE, NULL);
+		}
 		break;
 
 	case stylehint_Oblique:
@@ -743,7 +762,7 @@ apply_stylehint_to_tag(GtkTextTag *tag, GtkTextTag *default_tag, glui32 wintype,
 		gchar *font_family;
 		GtkTextTag *font_tag = g_hash_table_lookup(
 		    wintype == wintype_TextBuffer? glk_data->styles->text_buffer : glk_data->styles->text_grid,
-		    val? "normal" : "preformatted");
+		    val? "default" : "preformatted");
 		g_object_get(font_tag, "family", &font_family, NULL);
 		g_object_set(tag_object, "family", font_family, "family-set", TRUE, NULL);
 		g_free(font_family);
@@ -812,6 +831,7 @@ static gint
 query_tag(GtkTextTag *tag, glui32 wintype, glui32 hint)
 {
 	gint intval;
+	gdouble doubleval;
 	GdkColor *colval;
 
 	g_return_val_if_fail(tag != NULL, 0);
@@ -849,8 +869,8 @@ query_tag(GtkTextTag *tag, glui32 wintype, glui32 hint)
 		}
 
 	case stylehint_Size:
-		g_object_get(tag, "size", &intval, NULL);
-		return (intval/2)-14;
+		g_object_get(tag, "scale", &doubleval, NULL);
+		return (gint)round(log(doubleval) / log(1.2));
 
 	case stylehint_Oblique:
 		g_object_get(tag, "style", &intval , NULL);
@@ -1082,21 +1102,21 @@ PangoFontDescription *
 get_current_font(guint32 wintype)
 {
 	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-	GtkTextTag *normal;
+	GtkTextTag *tag;
 
 	switch(wintype) {
 	case wintype_TextGrid:
-		normal = g_hash_table_lookup(glk_data->styles->text_grid, "normal");
+		tag = g_hash_table_lookup(glk_data->styles->text_grid, "default");
 		break;
 	case wintype_TextBuffer:
-		normal = g_hash_table_lookup(glk_data->styles->text_buffer, "normal");
+		tag = g_hash_table_lookup(glk_data->styles->text_buffer, "default");
 		break;
 	default:
 		return NULL;
 	}
 
 	PangoFontDescription *font;
-	g_object_get( G_OBJECT(normal), "font-desc", &font, NULL );
+	g_object_get( G_OBJECT(tag), "font-desc", &font, NULL );
 
 	return font;
 }