X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstyle.c;h=034dfd52f22c49a004da09758e54f26da2b5b89f;hb=bcff6a22baa9e87b406416e83d7775720d38ca99;hp=0734fd37847ce1244b7ed209acb846072a46c34e;hpb=ed25f6521c1715c564d945cf5edc236eca65b27f;p=rodin%2Fchimara.git
diff --git a/libchimara/style.c b/libchimara/style.c
index 0734fd3..034dfd5 100644
--- a/libchimara/style.c
+++ b/libchimara/style.c
@@ -67,6 +67,10 @@ get_tag_name(glui32 style)
*/
void
glk_set_style_stream(strid_t str, glui32 styl) {
+ if(str->window == NULL)
+ return;
+
+ flush_window_buffer(str->window);
str->style = get_tag_name(styl);
}
@@ -80,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));
}
@@ -93,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));
}
@@ -149,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()
@@ -176,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);
@@ -188,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");
@@ -204,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;
@@ -470,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];
@@ -565,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;
@@ -644,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:
@@ -691,6 +738,20 @@ glk_stylehint_set(glui32 wintype, glui32 styl, glui32 hint, glsi32 val)
}
}
+/**
+ * glk_stylehint_clear:
+ * @wintype: The window type to set a style hint on, or %wintype_AllTypes.
+ * @styl: The style to set a hint for.
+ * @hint: The type of style hint, one of the stylehint_ constants.
+ *
+ * Resets a hint about the appearance of one style for a particular type of
+ * window to it's default value. You can also set wintype to %wintype_AllTypes, which resets a hint for
+ * all types of window.
+ *
+ * There is no equivalent constant to reset a hint for all styles of a single
+ * window type.
+ *
+ */
void
glk_stylehint_clear(glui32 wintype, glui32 styl, glui32 hint)
{
@@ -710,12 +771,31 @@ glk_stylehint_clear(glui32 wintype, glui32 styl, glui32 hint)
}
}
+/**
+ * glk_style_distinguish:
+ * @win: The window in which the styles are to be distinguished.
+ * @styl1: The first style to be distinguished from the second style.
+ * @styl2: The second styel to be distinguished from the first style.
+ *
+ * Returns: TRUE if the two styles are visually distinguishable in the given window.
+ * If they are not, it returns FALSE.
+ */
glui32
glk_style_distinguish(winid_t win, glui32 styl1, glui32 styl2)
{
return styl1 != styl2;
}
+/**
+ * glk_style_measure:
+ * @win: The window from which to take the style.
+ * @styl: The style to perform the measurement on.
+ * @hint: The stylehint to measure.
+ * @result: Address to write the result to.
+ *
+ * This function can be used to query the current value of a particular style hint.
+ * Returns: TRUE upon successul retrievel, otherwise FALSE.
+ */
glui32
glk_style_measure(winid_t win, glui32 styl, glui32 hint, glui32 *result)
{
@@ -736,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;
+}