X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=209cda689a57e9cb5bd6515ecf723c11f798078d;hb=65f88142d8843d16c203efad8830fbebba888f0f;hp=31b157f17077278a3b01bb357f4308acb882eade;hpb=cbd4cb7f8c62b2ba51329a4cb082a96115a7529d;p=rodin%2Fchimara.git

diff --git a/libchimara/window.c b/libchimara/window.c
index 31b157f..209cda6 100644
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -37,24 +37,8 @@ window_new_common(glui32 rock)
 
 	/* Initialise hyperlink table */
 	win->hyperlinks = g_hash_table_new_full(g_int_hash, g_direct_equal, g_free, g_object_unref);
-
-	return win;
-}
-
-/* Internal function: window closing stuff that is safe to call from either the
- main thread or the Glk thread. */
-void
-trash_window_thread_independent(ChimaraGlkPrivate *glk_data, winid_t win)
-{
-	win->magic = MAGIC_FREE;
 	
-	g_list_foreach(win->history, (GFunc)g_free, NULL);
-	g_list_free(win->history);
-
-	g_string_free(win->buffer, TRUE);
-	g_hash_table_destroy(win->hyperlinks);
-	g_free(win->current_hyperlink);
-	g_free(win);
+	return win;
 }
 
 /* Internal function: do all the stuff necessary to close a window. Call only
@@ -73,7 +57,15 @@ window_close_common(winid_t win, gboolean destroy_node)
 	if(destroy_node)
 		g_node_destroy(win->window_node);
 	
-	trash_window_thread_independent(glk_data, win);
+	win->magic = MAGIC_FREE;
+	
+	g_list_foreach(win->history, (GFunc)g_free, NULL);
+	g_list_free(win->history);
+	
+	g_string_free(win->buffer, TRUE);
+	g_hash_table_destroy(win->hyperlinks);
+	g_free(win->current_hyperlink);
+	g_free(win);
 }
 
 /**
@@ -509,6 +501,10 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			g_signal_handler_block(textview, win->char_input_keypress_handler);
 			win->line_input_keypress_handler = g_signal_connect(textview, "key-press-event", G_CALLBACK(on_line_input_key_press_event), win);
 			g_signal_handler_block(textview, win->line_input_keypress_handler);
+			win->shutdown_keypress_handler = g_signal_connect(textview, "key-press-event", G_CALLBACK(on_shutdown_key_press_event), win);
+			g_signal_handler_block(textview, win->shutdown_keypress_handler);
+			win->button_press_event_handler = g_signal_connect( textview, "button-press-event", G_CALLBACK(on_window_button_press), win );
+			g_signal_handler_block(textview, win->button_press_event_handler);
 		}
 		    break;
 		
@@ -547,11 +543,11 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			g_signal_handler_block(textview, win->char_input_keypress_handler);
 			win->line_input_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(on_line_input_key_press_event), win );
 			g_signal_handler_block(textview, win->line_input_keypress_handler);
-			
+			win->shutdown_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(on_shutdown_key_press_event), win );
+			g_signal_handler_block(textview, win->shutdown_keypress_handler);			
 			win->insert_text_handler = g_signal_connect_after( textbuffer, "insert-text", G_CALLBACK(after_window_insert_text), win );
 			g_signal_handler_block(textbuffer, win->insert_text_handler);
 
-
 			/* Create an editable tag to indicate uneditable parts of the window
 			(for line input) */
 			gtk_text_buffer_create_tag(textbuffer, "uneditable", "editable", FALSE, "editable-set", TRUE, NULL);
@@ -562,6 +558,28 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			gtk_text_buffer_create_mark(textbuffer, "input_position", &end, TRUE);
 		}
 			break;
+
+		case wintype_Graphics:
+		{
+			// TODO: Find real size
+			GdkPixmap *newmap = gdk_pixmap_new(NULL, 800, 600, 24);
+		    GtkWidget *image = gtk_image_new_from_pixmap(newmap, NULL);
+			g_object_unref(newmap);
+
+			gtk_widget_show(image);
+
+		    win->widget = image;
+		    win->frame = image;
+
+		    		
+			/* Connect signal handlers */
+			win->button_press_event_handler = g_signal_connect(image, "button-press-event", G_CALLBACK(on_window_button_press), win);
+			g_signal_handler_block(image, win->button_press_event_handler);
+			win->shutdown_keypress_handler = g_signal_connect(image, "key-press-event", G_CALLBACK(on_shutdown_key_press_event), win);
+			g_signal_handler_block(image, win->shutdown_keypress_handler);			
+			win->size_allocate_handler = g_signal_connect(image, "size-allocate", G_CALLBACK(on_graphics_size_allocate), win);
+		}
+		    break;
 			
 		default:
 			gdk_threads_leave();
@@ -664,6 +682,7 @@ destroy_windows_below(winid_t win, stream_result_t *result)
 		case wintype_Blank:
 	    case wintype_TextGrid:
 		case wintype_TextBuffer:
+		case wintype_Graphics:
 			gtk_widget_unparent(win->frame);
 			break;
 
@@ -918,6 +937,18 @@ glk_window_clear(winid_t win)
 			gdk_threads_leave();
 		}
 			break;
+
+		case wintype_Graphics:
+		{
+			/* Wait for the window's size to be updated */
+			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);
+
+			glk_window_erase_rect(win, 0, 0, win->widget->allocation.width, win->widget->allocation.height);
+		}
+			break;
 		
 		default:
 			ILLEGAL_PARAM("Unknown window type: %d", win->type);
@@ -1083,6 +1114,21 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr)
                 *heightptr = (glui32)(win->widget->allocation.height / win->unit_height);
             gdk_threads_leave();
             
+            break;
+
+		case wintype_Graphics:
+			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);
+			
+            gdk_threads_enter();
+            if(widthptr != NULL)
+                *widthptr = (glui32)(win->widget->allocation.width);
+            if(heightptr != NULL)
+                *heightptr = (glui32)(win->widget->allocation.height);
+            gdk_threads_leave();
+            
             break;
             
         default: