X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstyle.c;h=034dfd52f22c49a004da09758e54f26da2b5b89f;hb=bcff6a22baa9e87b406416e83d7775720d38ca99;hp=cf20f0ca1ccbe58f77805b96db02016e55a61207;hpb=f5361c37bf7265628802787ea90164bab8108d3a;p=rodin%2Fchimara.git diff --git a/libchimara/style.c b/libchimara/style.c index cf20f0c..034dfd5 100644 --- a/libchimara/style.c +++ b/libchimara/style.c @@ -84,6 +84,8 @@ style_init_textbuffer(GtkTextBuffer *buffer) if( G_UNLIKELY(!glk_data->style_initialized) ) { style_init(); } + + /* Copy the current text tags to the textbuffer's tag table */ g_hash_table_foreach(glk_data->current_styles->text_buffer, style_add_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer)); } @@ -97,6 +99,8 @@ style_init_textgrid(GtkTextBuffer *buffer) if( G_UNLIKELY(!glk_data->style_initialized) ) { style_init(); } + + /* Copy the current text tags to the textgrid's tag table */ g_hash_table_foreach(glk_data->current_styles->text_grid, style_add_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer)); } @@ -153,9 +157,12 @@ gtk_text_tag_copy(GtkTextTag *tag) _COPY_FLAG (language_set); #undef _COPY_FLAG + /* Copy the reverse_color attribute, that was added manually */ + g_object_set_data( G_OBJECT(copy), "reverse_color", g_object_get_data(G_OBJECT(tag), "reverse_color") ); + return copy; } - + /* Internal function that reads the default styles from a CSS file */ void style_init() @@ -180,8 +187,10 @@ style_init() scanner->config->cpair_comment_single = NULL; scanner->config->scan_float = FALSE; - /* Initialise the default styles */ - g_hash_table_insert(default_text_grid_styles, "normal", gtk_text_tag_new("normal")); + /* Initialise the default styles for a text grid */ + tag = gtk_text_tag_new("normal"); + g_object_set(tag, "font-desc", glk_data->monospace_font_desc, NULL); + g_hash_table_insert(default_text_grid_styles, "normal", tag); tag = gtk_text_tag_new("emphasized"); g_object_set(tag, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL); @@ -192,11 +201,11 @@ style_init() g_hash_table_insert(default_text_grid_styles, "preformatted", tag); tag = gtk_text_tag_new("header"); - 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_grid_styles, "header", tag); tag = gtk_text_tag_new("subheader"); - 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_grid_styles, "subheader", tag); tag = gtk_text_tag_new("alert"); @@ -208,14 +217,50 @@ style_init() g_hash_table_insert(default_text_grid_styles, "note", tag); tag = gtk_text_tag_new("block-quote"); - g_object_set(tag, "justification", GTK_JUSTIFY_CENTER, "style", PANGO_STYLE_ITALIC, NULL); + g_object_set(tag, "style", PANGO_STYLE_ITALIC, NULL); g_hash_table_insert(default_text_grid_styles, "block-quote", tag); g_hash_table_insert(default_text_grid_styles, "input", gtk_text_tag_new("input")); g_hash_table_insert(default_text_grid_styles, "user1", gtk_text_tag_new("user1")); g_hash_table_insert(default_text_grid_styles, "user2", gtk_text_tag_new("user2")); - g_hash_table_foreach(default_text_grid_styles, style_table_copy, default_text_buffer_styles); + /* Tags for the textbuffer */ + tag = gtk_text_tag_new("normal"); + g_object_set(tag, "font-desc", glk_data->default_font_desc, NULL); + g_hash_table_insert(default_text_buffer_styles, "normal", tag); + + tag = gtk_text_tag_new("emphasized"); + g_object_set(tag, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL); + g_hash_table_insert(default_text_buffer_styles, "emphasized", tag); + + tag = gtk_text_tag_new("preformatted"); + g_object_set(tag, "font-desc", glk_data->monospace_font_desc, NULL); + g_hash_table_insert(default_text_buffer_styles, "preformatted", tag); + + tag = gtk_text_tag_new("header"); + g_object_set(tag, "size-points", 18.0, "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, "size-points", 14.0, "weight", PANGO_WEIGHT_BOLD, NULL); + g_hash_table_insert(default_text_buffer_styles, "subheader", tag); + + tag = gtk_text_tag_new("alert"); + g_object_set(tag, "foreground", "#aa0000", "weight", PANGO_WEIGHT_BOLD, NULL); + g_hash_table_insert(default_text_buffer_styles, "alert", tag); + + tag = gtk_text_tag_new("note"); + g_object_set(tag, "foreground", "#aaaa00", "weight", PANGO_WEIGHT_BOLD, NULL); + g_hash_table_insert(default_text_buffer_styles, "note", tag); + + tag = gtk_text_tag_new("block-quote"); + g_object_set(tag, "justification", GTK_JUSTIFY_CENTER, "style", PANGO_STYLE_ITALIC, NULL); + g_hash_table_insert(default_text_buffer_styles, "block-quote", tag); + + g_hash_table_insert(default_text_buffer_styles, "input", gtk_text_tag_new("input")); + g_hash_table_insert(default_text_buffer_styles, "user1", gtk_text_tag_new("user1")); + g_hash_table_insert(default_text_buffer_styles, "user2", gtk_text_tag_new("user2")); + glk_data->default_styles->text_grid = default_text_grid_styles; glk_data->default_styles->text_buffer = default_text_buffer_styles; @@ -474,11 +519,8 @@ apply_stylehint_to_tag(GtkTextTag *tag, glui32 hint, glsi32 val) ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); GObject *tag_object = G_OBJECT(tag); - gint reverse_color = 0; - /* FIXME where should we keep track of this? - g_object_get(tag, "reverse_color", &reverse_color, NULL); - */ + gint reverse_color = GPOINTER_TO_INT( g_object_get_data(tag_object, "reverse-color") ); int i = 0; gchar color[20]; @@ -569,6 +611,8 @@ apply_stylehint_to_tag(GtkTextTag *tag, glui32 hint, glsi32 val) g_object_set(tag_object, "background-gdk", foreground_color, NULL); else g_object_set(tag_object, "background", "#000000", NULL); + + g_object_set_data( tag_object, "reverse-color", GINT_TO_POINTER(val != 0) ); } break; @@ -648,8 +692,7 @@ query_tag(GtkTextTag *tag, glui32 hint) break; case stylehint_ReverseColor: - /* FIXME: implement this */ - return 0; + return GPOINTER_TO_INT( g_object_get_data(G_OBJECT(tag), "reverse_color") ); break; default: @@ -773,3 +816,29 @@ glk_style_measure(winid_t win, glui32 styl, glui32 hint, glui32 *result) return TRUE; } + +/* Internal function returning the current default font for a window type + * This can be used later for size calculations. Only wintype_TextGrid and wintype_TextBuffer are + * supported for now */ +PangoFontDescription* +get_current_font(guint32 wintype) +{ + ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + GtkTextTag *normal; + + switch(wintype) { + case wintype_TextGrid: + normal = g_hash_table_lookup(glk_data->default_styles->text_grid, "normal"); + break; + case wintype_TextBuffer: + normal = g_hash_table_lookup(glk_data->default_styles->text_buffer, "normal"); + break; + default: + return NULL; + } + + PangoFontDescription *font; + g_object_get( G_OBJECT(normal), "font-desc", &font, NULL ); + + return font; +}