X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=bcdce5535bc96125133cb4b9e7fbe78b20b4bc87;hb=e4a75256e901a89729c48fcc2f9229cd0cfe9124;hp=9ebde933fe10e9e21d47e3a0d0225aab508cecdb;hpb=9d047029eec65619c096da63056ed71721f027eb;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/window.c b/libchimara/window.c
index 9ebde93..bcdce55 100644
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -691,10 +691,10 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 	}
 
 	/* Set the window as a child of the Glk widget, don't trigger an arrange event */
-	g_mutex_lock(glk_data->arrange_lock);
+	g_mutex_lock(&glk_data->arrange_lock);
 	glk_data->needs_rearrange = TRUE;
 	glk_data->ignore_next_arrange_event = TRUE;
-	g_mutex_unlock(glk_data->arrange_lock);
+	g_mutex_unlock(&glk_data->arrange_lock);
 	gtk_widget_set_parent(win->frame, GTK_WIDGET(glk_data->self));
 	gtk_widget_queue_resize(GTK_WIDGET(glk_data->self));
 	
@@ -888,10 +888,10 @@ glk_window_close(winid_t win, stream_result_t *result)
 	window_close_common(win, FALSE);
 
 	/* Schedule a redraw */
-	g_mutex_lock(glk_data->arrange_lock);
+	g_mutex_lock(&glk_data->arrange_lock);
 	glk_data->needs_rearrange = TRUE;
 	glk_data->ignore_next_arrange_event = TRUE;
-	g_mutex_unlock(glk_data->arrange_lock);
+	g_mutex_unlock(&glk_data->arrange_lock);
 	gtk_widget_queue_resize( GTK_WIDGET(glk_data->self) );
 	gdk_threads_leave();
 }
@@ -954,11 +954,11 @@ glk_window_clear(winid_t win)
 		    /* fill the buffer with blanks */
 		{
 			/* Wait for the window's size to be updated */
-			g_mutex_lock(glk_data->arrange_lock);
+			g_mutex_lock(&glk_data->arrange_lock);
 			if(glk_data->needs_rearrange)
-				g_cond_wait(glk_data->rearranged, glk_data->arrange_lock);
-			g_mutex_unlock(glk_data->arrange_lock);
-			
+				g_cond_wait(&glk_data->rearranged, &glk_data->arrange_lock);
+			g_mutex_unlock(&glk_data->arrange_lock);
+
 		    gdk_threads_enter();
 		    
             /* Manually put newlines at the end of each row of characters in the buffer; manual newlines make resizing the window's grid easier. */
@@ -979,24 +979,7 @@ glk_window_clear(winid_t win)
             GtkTextIter start, end;
             gtk_text_buffer_get_start_iter(textbuffer, &start);
             gtk_text_buffer_get_end_iter(textbuffer, &end);
-
-			/* Determine default style */
-			GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(textbuffer);
-			GtkTextTag *default_tag = gtk_text_tag_table_lookup(tags, "default");
-			GtkTextTag *style_tag = gtk_text_tag_table_lookup(tags, "normal");
-			GtkTextTag *glk_style_tag = gtk_text_tag_table_lookup(tags, "normal");
-
-			// Default style
-			gtk_text_buffer_apply_tag(textbuffer, default_tag, &start, &end);
-
-			// Player's style overrides
-			gtk_text_buffer_apply_tag(textbuffer, style_tag, &start, &end);
-
-			// GLK Program's style overrides
-			gtk_text_buffer_apply_tag(textbuffer, glk_style_tag, &start, &end);
-
-			if(win->zcolor != NULL)
-				gtk_text_buffer_apply_tag(textbuffer, win->zcolor, &start, &end);
+			style_apply(win, &start, &end);
 
             gtk_text_buffer_move_mark_by_name(textbuffer, "cursor_position", &start);
 		    
@@ -1023,10 +1006,10 @@ glk_window_clear(winid_t win)
 			GtkAllocation allocation;
 
 			/* Wait for the window's size to be updated */
-			g_mutex_lock(glk_data->arrange_lock);
+			g_mutex_lock(&glk_data->arrange_lock);
 			if(glk_data->needs_rearrange)
-				g_cond_wait(glk_data->rearranged, glk_data->arrange_lock);
-			g_mutex_unlock(glk_data->arrange_lock);
+				g_cond_wait(&glk_data->rearranged, &glk_data->arrange_lock);
+			g_mutex_unlock(&glk_data->arrange_lock);
 
 			gdk_threads_enter();
 			gtk_widget_get_allocation(win->widget, &allocation);
@@ -1167,11 +1150,11 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr)
             
         case wintype_TextGrid:
 			/* Wait until the window's size is current */
-			g_mutex_lock(glk_data->arrange_lock);
+			g_mutex_lock(&glk_data->arrange_lock);
 			if(glk_data->needs_rearrange)
-				g_cond_wait(glk_data->rearranged, glk_data->arrange_lock);
-			g_mutex_unlock(glk_data->arrange_lock);
-			
+				g_cond_wait(&glk_data->rearranged, &glk_data->arrange_lock);
+			g_mutex_unlock(&glk_data->arrange_lock);
+
 			gdk_threads_enter();
 			gtk_widget_get_allocation(win->widget, &allocation);
 			/* Cache the width and height */
@@ -1186,12 +1169,12 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr)
             break;
             
         case wintype_TextBuffer:
-            /* Wait until the window's size is current */
-			g_mutex_lock(glk_data->arrange_lock);
+			/* Wait until the window's size is current */
+			g_mutex_lock(&glk_data->arrange_lock);
 			if(glk_data->needs_rearrange)
-				g_cond_wait(glk_data->rearranged, glk_data->arrange_lock);
-			g_mutex_unlock(glk_data->arrange_lock);
-			
+				g_cond_wait(&glk_data->rearranged, &glk_data->arrange_lock);
+			g_mutex_unlock(&glk_data->arrange_lock);
+
             gdk_threads_enter();
             gtk_widget_get_allocation(win->widget, &allocation);
             if(widthptr != NULL)
@@ -1203,11 +1186,11 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr)
             break;
 
 		case wintype_Graphics:
-			g_mutex_lock(glk_data->arrange_lock);
+			g_mutex_lock(&glk_data->arrange_lock);
 			if(glk_data->needs_rearrange)
-				g_cond_wait(glk_data->rearranged, glk_data->arrange_lock);
-			g_mutex_unlock(glk_data->arrange_lock);
-			
+				g_cond_wait(&glk_data->rearranged, &glk_data->arrange_lock);
+			g_mutex_unlock(&glk_data->arrange_lock);
+
             gdk_threads_enter();
             gtk_widget_get_allocation(win->widget, &allocation);
             if(widthptr != NULL)
@@ -1310,10 +1293,10 @@ glk_window_set_arrangement(winid_t win, glui32 method, glui32 size, winid_t keyw
 
 	/* Tell GTK to rearrange the windows */
 	gdk_threads_enter();
-	g_mutex_lock(glk_data->arrange_lock);
+	g_mutex_lock(&glk_data->arrange_lock);
 	glk_data->needs_rearrange = TRUE;
 	glk_data->ignore_next_arrange_event = TRUE;
-	g_mutex_unlock(glk_data->arrange_lock);
+	g_mutex_unlock(&glk_data->arrange_lock);
 	gtk_widget_queue_resize(GTK_WIDGET(glk_data->self));
 	gdk_threads_leave();
 }
@@ -1382,10 +1365,10 @@ glk_window_move_cursor(winid_t win, glui32 xpos, glui32 ypos)
 	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
 	
 	/* Wait until the window's size is current */
-	g_mutex_lock(glk_data->arrange_lock);
+	g_mutex_lock(&glk_data->arrange_lock);
 	if(glk_data->needs_rearrange)
-		g_cond_wait(glk_data->rearranged, glk_data->arrange_lock);
-	g_mutex_unlock(glk_data->arrange_lock);
+		g_cond_wait(&glk_data->rearranged, &glk_data->arrange_lock);
+	g_mutex_unlock(&glk_data->arrange_lock);
 
 	/* Don't do anything if the window is shrunk down to nothing */
 	if(win->width == 0 || win->height == 0)