+#include <glib.h>
#include "window.h"
#include "magic.h"
#include "chimara-glk-private.h"
+#include "gi_dispa.h"
-extern ChimaraGlkPrivate *glk_data;
+extern GPrivate *glk_data_key;
+
+static winid_t
+window_new_common(glui32 rock)
+{
+ ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+ winid_t win = g_new0(struct glk_window_struct, 1);
+
+ win->magic = MAGIC_WINDOW;
+ win->rock = rock;
+ if(glk_data->register_obj)
+ win->disprock = (*glk_data->register_obj)(win, gidisp_Class_Window);
+
+ win->window_node = g_node_new(win);
+
+ /* Every window has a window stream, but printing to it might have no effect */
+ win->window_stream = stream_new_common(0);
+ win->window_stream->file_mode = filemode_Write;
+ win->window_stream->type = STREAM_TYPE_WINDOW;
+ win->window_stream->window = win;
+ win->window_stream->style = "normal";
+
+ win->echo_stream = NULL;
+ win->input_request_type = INPUT_REQUEST_NONE;
+ win->line_input_buffer = NULL;
+ win->line_input_buffer_unicode = NULL;
+
+ return win;
+}
+
+static void
+window_close_common(winid_t win)
+{
+ 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;
+ }
+
+ g_node_destroy(win->window_node);
+ win->magic = MAGIC_FREE;
+ g_free(win);
+}
/**
* glk_window_iterate:
{
VALID_WINDOW_OR_NULL(win, return NULL);
+ ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
GNode *retnode;
if(win == NULL)
winid_t
glk_window_get_root()
{
+ ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
if(glk_data->root_window == NULL)
return NULL;
return (winid_t)glk_data->root_window->data;
g_return_val_if_fail(method == (method & (winmethod_DirMask | winmethod_DivisionMask)), NULL);
g_return_val_if_fail(!(((method & winmethod_DivisionMask) == winmethod_Proportional) && size > 100), NULL);
+ ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+
if(split == NULL && glk_data->root_window != NULL)
{
ILLEGAL("Tried to open a new root window, but there is already a root window");
gdk_threads_enter();
/* Create the new window */
- winid_t win = g_new0(struct glk_window_struct, 1);
- win->magic = MAGIC_WINDOW;
- win->rock = rock;
+ winid_t win = window_new_common(rock);
win->type = wintype;
- win->window_node = g_node_new(win);
switch(wintype)
{
/* A blank window has no size */
win->unit_width = 0;
win->unit_height = 0;
- /* You can print to a blank window's stream, but it does nothing */
- win->window_stream = window_stream_new(win);
- win->echo_stream = NULL;
}
break;
pango_layout_set_font_description(zero, glk_data->monospace_font_desc);
pango_layout_get_pixel_size(zero, &(win->unit_width), &(win->unit_height));
g_object_unref(zero);
-
- /* Set the other parameters (width and height are set later) */
- win->window_stream = window_stream_new(win);
- win->echo_stream = NULL;
- win->input_request_type = INPUT_REQUEST_NONE;
- win->line_input_buffer = NULL;
- win->line_input_buffer_unicode = NULL;
+ /* width and height are set later */
/* Connect signal handlers */
win->keypress_handler = g_signal_connect( G_OBJECT(textview), "key-press-event", G_CALLBACK(on_window_key_press_event), win );
gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW(textview), GTK_WRAP_WORD_CHAR );
gtk_text_view_set_editable( GTK_TEXT_VIEW(textview), FALSE );
+ gtk_text_view_set_pixels_inside_wrap( GTK_TEXT_VIEW(textview), 3 );
+ gtk_text_view_set_left_margin( GTK_TEXT_VIEW(textview), 20 );
+ gtk_text_view_set_right_margin( GTK_TEXT_VIEW(textview), 20 );
gtk_container_add( GTK_CONTAINER(scrolledwindow), textview );
gtk_widget_show_all(scrolledwindow);
pango_layout_set_font_description(zero, glk_data->default_font_desc);
pango_layout_get_pixel_size(zero, &(win->unit_width), &(win->unit_height));
g_object_unref(zero);
-
- /* Set the other parameters */
- win->window_stream = window_stream_new(win);
- win->echo_stream = NULL;
- win->input_request_type = INPUT_REQUEST_NONE;
- win->line_input_buffer = NULL;
- win->line_input_buffer_unicode = NULL;
/* Connect signal handlers */
win->keypress_handler = g_signal_connect( G_OBJECT(textview), "key-press-event", G_CALLBACK(on_window_key_press_event), win );
{
/* When splitting, construct a new parent window
* copying most characteristics from the window that is being split */
- winid_t pair = g_new0(struct glk_window_struct, 1);
- pair->magic = MAGIC_WINDOW;
- pair->rock = 0;
+ winid_t pair = window_new_common(0);
pair->type = wintype_Pair;
- pair->window_node = g_node_new(pair);
- /* You can print to a pair window's window stream, but it has no effect */
- pair->window_stream = window_stream_new(pair);
- pair->echo_stream = NULL;
/* The pair window must know about its children's split method */
pair->key_window = win;
free_winids_below(win->window_node->children->data);
free_winids_below(win->window_node->children->next->data);
}
- win->magic = MAGIC_FREE;
- g_free(win);
+ window_close_common(win);
}
/**
glk_window_close(winid_t win, stream_result_t *result)
{
VALID_WINDOW(win, return);
+
+ ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
gdk_threads_enter(); /* Prevent redraw while we're trashing the window */
/* Parent window changes from a split window into the sibling window */
/* The parent of any window is either a pair window or NULL */
GNode *pair_node = win->window_node->parent;
- g_node_destroy(win->window_node);
/* If win was not the root window: */
if(pair_node != NULL)
{
g_node_append(new_parent_node, sibling_node);
}
- winid_t pair = (winid_t) pair_node->data;
- g_node_destroy(pair_node);
-
- pair->magic = MAGIC_FREE;
- g_free(pair);
+ window_close_common( (winid_t) pair_node->data );
}
else /* it was the root window */
{
glk_data->root_window = NULL;
}
- win->magic = MAGIC_FREE;
- g_free(win);
+ window_close_common(win);
/* Schedule a redraw */
g_mutex_lock(glk_data->arrange_lock);
{
VALID_WINDOW(win, return);
g_return_if_fail(win->input_request_type != INPUT_REQUEST_LINE && win->input_request_type != INPUT_REQUEST_LINE_UNICODE);
+
+ ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
switch(win->type)
{
/**
* glk_set_window:
- * @win: A window.
+ * @win: A window, or %NULL.
*
* Sets the current stream to @win's window stream. It is exactly equivalent to
* |[ #glk_stream_set_current(#glk_window_get_stream(@win)) ]|
* See <link linkend="chimara-Streams">Streams</link>.
+ *
+ * <note><title>Chimara</title>
+ * <para>
+ * Although this is not mentioned in the specification, @win may also be
+ * %NULL, in which case the current stream is also set to %NULL.
+ * </para></note>
*/
void
glk_set_window(winid_t win)
{
- VALID_WINDOW(win, return);
- glk_stream_set_current( glk_window_get_stream(win) );
+ VALID_WINDOW_OR_NULL(win, return);
+ if(win)
+ glk_stream_set_current( glk_window_get_stream(win) );
+ else
+ glk_stream_set_current(NULL);
}
/**
{
VALID_WINDOW(win, return);
+ ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+
switch(win->type)
{
case wintype_Blank:
}
g_return_if_fail(method == (method & (winmethod_DirMask | winmethod_DivisionMask)));
g_return_if_fail(!(((method & winmethod_DivisionMask) == winmethod_Proportional) && size > 100));
+
+ ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
win->split_method = method;
win->constraint_size = size;
{
VALID_WINDOW(win, return);
g_return_if_fail(win->type == wintype_TextGrid);
+
+ ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
/* Wait until the window's size is current */
g_mutex_lock(glk_data->arrange_lock);
gdk_threads_leave();
}
-
projects / rodin / chimara.git / blobdiff