/* Initialise the buffer */
win->buffer = g_string_sized_new(1024);
+ /* 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: do all the stuff necessary to close a window. Call only
+ from Glk thread. */
static void
window_close_common(winid_t win, gboolean destroy_node)
{
ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-
+
if(glk_data->unregister_obj)
{
(*glk_data->unregister_obj)(win, gidisp_Class_Window, win->disprock);
win->disprock.ptr = NULL;
}
-
+
if(destroy_node)
g_node_destroy(win->window_node);
+
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);
}
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);
-
- gtk_widget_add_events( textview, GDK_BUTTON_RELEASE_MASK );
- win->mouse_click_handler = g_signal_connect_after( G_OBJECT(textview), "button-release-event", G_CALLBACK(on_window_button_release_event), win );
- g_signal_handler_block( textview, win->mouse_click_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;
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);
-
- gtk_widget_add_events( GTK_WIDGET(textview), GDK_BUTTON_RELEASE_MASK );
- win->mouse_click_handler = g_signal_connect_after( textview, "button-release-event", G_CALLBACK(on_window_button_release_event), win );
- g_signal_handler_block( textview, win->mouse_click_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 );
+ 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_mark(textbuffer, "input_position", &end, TRUE);
}
break;
+
+ case wintype_Graphics:
+ {
+ GtkWidget *image = gtk_image_new_from_pixmap(NULL, NULL);
+ gtk_widget_show(image);
+
+ win->unit_width = 1;
+ win->unit_height = 1;
+ 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();
case wintype_Blank:
case wintype_TextGrid:
case wintype_TextBuffer:
+ case wintype_Graphics:
gtk_widget_unparent(win->frame);
break;
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);
*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: