X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=bbfe49db68658f134ee667503044a19b5117ceb3;hb=3f33a29456e1aba473c03b58d320d5f56620cb2b;hp=4db770659a952fff583c673cb74f7770588c3090;hpb=004b7d56c3e44f2dfbd943b8843e1015a3e77230;p=projects%2Fchimara%2Fchimara.git diff --git a/libchimara/window.c b/libchimara/window.c index 4db7706..bbfe49d 100644 --- a/libchimara/window.c +++ b/libchimara/window.c @@ -1,8 +1,9 @@ +#include #include "window.h" #include "magic.h" #include "chimara-glk-private.h" -extern ChimaraGlkPrivate *glk_data; +extern GPrivate *glk_data_key; /** * glk_window_iterate: @@ -25,6 +26,7 @@ glk_window_iterate(winid_t win, glui32 *rockptr) { VALID_WINDOW_OR_NULL(win, return NULL); + ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); GNode *retnode; if(win == NULL) @@ -73,8 +75,8 @@ glk_window_get_rock(winid_t win) * glk_window_get_type: * @win: A window. * - * Returns @win's type, one of #wintype_Blank, #wintype_Pair, - * #wintype_TextBuffer, #wintype_TextGrid, or #wintype_Graphics. + * Returns @win's type, one of %wintype_Blank, %wintype_Pair, + * %wintype_TextBuffer, %wintype_TextGrid, or %wintype_Graphics. * * Returns: The window's type. */ @@ -135,6 +137,7 @@ glk_window_get_sibling(winid_t win) 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; @@ -145,15 +148,15 @@ glk_window_get_root() * @split: The window to split to create the new window. Must be 0 if there * are no windows yet. * @method: Position of the new window and method of size computation. One of - * #winmethod_Above, #winmethod_Below, #winmethod_Left, or #winmethod_Right - * OR'ed with #winmethod_Fixed or #winmethod_Proportional. If @wintype is - * #wintype_Blank, then #winmethod_Fixed is not allowed. + * %winmethod_Above, %winmethod_Below, %winmethod_Left, or %winmethod_Right + * OR'ed with %winmethod_Fixed or %winmethod_Proportional. If @wintype is + * %wintype_Blank, then %winmethod_Fixed is not allowed. * @size: Size of the new window, in percentage points if @method is - * #winmethod_Proportional, otherwise in characters if @wintype is - * #wintype_TextBuffer or #wintype_TextGrid, or pixels if @wintype is - * #wintype_Graphics. - * @wintype: Type of the new window. One of #wintype_Blank, #wintype_TextGrid, - * #wintype_TextBuffer, or #wintype_Graphics. + * %winmethod_Proportional, otherwise in characters if @wintype is + * %wintype_TextBuffer or %wintype_TextGrid, or pixels if @wintype is + * %wintype_Graphics. + * @wintype: Type of the new window. One of %wintype_Blank, %wintype_TextGrid, + * %wintype_TextBuffer, or %wintype_Graphics. * @rock: The new window's rock value. * * Creates a new window. If there are no windows, the first three arguments are @@ -218,12 +221,12 @@ glk_window_get_root() * |[ newwin = #glk_window_open(win, #winmethod_Below | #winmethod_Fixed, 5, #wintype_TextGrid, 0); ]| * * Note that the meaning of the @size argument depends on the @method argument. - * If the method is #winmethod_Fixed, it also depends on the @wintype argument. + * If the method is %winmethod_Fixed, it also depends on the @wintype argument. * The new window is then called the key window of this split, * because its window type determines how the split size is computed. * * - * For #winmethod_Proportional splits, you can still call the new window the + * For %winmethod_Proportional splits, you can still call the new window the * key window. But the key window is not important for * proportional splits, because the size will always be computed as a simple * ratio of the available space, not a fixed size of one child window. @@ -377,6 +380,8 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, 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"); @@ -454,6 +459,9 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype, 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); @@ -698,6 +706,8 @@ void 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 */ @@ -807,6 +817,8 @@ glk_window_clear(winid_t win) { 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) { @@ -973,6 +985,8 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr) { VALID_WINDOW(win, return); + ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + switch(win->type) { case wintype_Blank: @@ -1026,13 +1040,13 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr) /** * glk_window_set_arrangement: * @win: a pair window to rearrange. - * @method: new method of size computation. One of #winmethod_Above, - * #winmethod_Below, #winmethod_Left, or #winmethod_Right OR'ed with - * #winmethod_Fixed or #winmethod_Proportional. + * @method: new method of size computation. One of %winmethod_Above, + * %winmethod_Below, %winmethod_Left, or %winmethod_Right OR'ed with + * %winmethod_Fixed or %winmethod_Proportional. * @size: new size constraint, in percentage points if @method is - * #winmethod_Proportional, otherwise in characters if @win's type is - * #wintype_TextBuffer or #wintype_TextGrid, or pixels if @win's type is - * #wintype_Graphics. + * %winmethod_Proportional, otherwise in characters if @win's type is + * %wintype_TextBuffer or %wintype_TextGrid, or pixels if @win's type is + * %wintype_Graphics. * @keywin: new key window, or %NULL to leave the key window unchanged. * * Changes the size of an existing split — that is, it changes the @@ -1100,6 +1114,8 @@ glk_window_set_arrangement(winid_t win, glui32 method, glui32 size, winid_t keyw } 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; @@ -1174,6 +1190,8 @@ glk_window_move_cursor(winid_t win, glui32 xpos, glui32 ypos) { 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);