Fixed reversevideo

[rodin/chimara.git] / libchimara / style.c

diff --git a/libchimara/style.c b/libchimara/style.c
index 0734fd37847ce1244b7ed209acb846072a46c34e..5b388f1032e78fb66796627e9b780f502966696b 100644 (file)
--- 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);
 }
 
@@ -149,9 +153,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()
@@ -470,11 +477,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 +569,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 +650,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 +696,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 <code>stylehint_</code> 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.
+ * <note><para>
+ *  There is no equivalent constant to reset a hint for all styles of a single 
+ *  window type.
+ * </para></note>
+ */
 void
 glk_stylehint_clear(glui32 wintype, glui32 styl, glui32 hint)
 {
@@ -710,12 +729,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)
 {