X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=ef85e3f2651f4de44bd99798c490b40d36f2926c;hb=c4bbce6db0f0661105d88c1ccc046a755f6b8d80;hp=af470566ccd734bf72eaba9b0b45983039287bc0;hpb=dfc0e872bf76faa4944a11d0905eca43143182e2;p=projects%2Fchimara%2Fchimara.git
diff --git a/libchimara/window.c b/libchimara/window.c
index af47056..ef85e3f 100644
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -3,6 +3,7 @@
#include "magic.h"
#include "chimara-glk-private.h"
#include "gi_dispa.h"
+#include "pager.h"
extern GPrivate *glk_data_key;
@@ -25,18 +26,23 @@ window_new_common(glui32 rock)
win->window_stream->type = STREAM_TYPE_WINDOW;
win->window_stream->window = win;
win->window_stream->style = "normal";
-
+ win->window_stream->glk_style = "normal";
+
win->echo_stream = NULL;
win->input_request_type = INPUT_REQUEST_NONE;
win->line_input_buffer = NULL;
win->line_input_buffer_unicode = NULL;
win->history = NULL;
+ win->echo_line_input = TRUE;
+ win->echo_current_line_input = TRUE;
+ win->extra_line_terminators = NULL;
+ win->current_extra_line_terminators = NULL;
/* 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);
+ win->hyperlinks = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free);
return win;
}
@@ -61,10 +67,16 @@ window_close_common(winid_t win, gboolean destroy_node)
g_list_foreach(win->history, (GFunc)g_free, NULL);
g_list_free(win->history);
+ g_slist_free(win->extra_line_terminators);
+ g_slist_free(win->current_extra_line_terminators);
g_string_free(win->buffer, TRUE);
g_hash_table_destroy(win->hyperlinks);
g_free(win->current_hyperlink);
+
+ if(win->pager_layout)
+ g_object_unref(win->pager_layout);
+
g_free(win);
}
@@ -165,7 +177,11 @@ winid_t
glk_window_get_parent(winid_t win)
{
VALID_WINDOW(win, return NULL);
+
/* Value will also be NULL if win is the root window */
+ if(win->window_node->parent == NULL)
+ return NULL;
+
return (winid_t)win->window_node->parent->data;
}
@@ -186,8 +202,8 @@ glk_window_get_sibling(winid_t win)
if(G_NODE_IS_ROOT(win->window_node))
return NULL;
if(win->window_node->next)
- return (winid_t)win->window_node->next;
- return (winid_t)win->window_node->prev;
+ return (winid_t)win->window_node->next->data;
+ return (winid_t)win->window_node->prev->data;
}
/**
@@ -213,7 +229,8 @@ glk_window_get_root()
* @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.
+ * %wintype_Blank, then %winmethod_Fixed is not allowed. May also be OR'ed with
+ * %winmethod_Border or %winmethod_NoBorder.
* @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
@@ -229,9 +246,13 @@ glk_window_get_root()
*
* If any windows exist, new windows must be created by splitting existing
* ones. @split is the window you want to split; this must
- * not be zero. @method is a mask of constants to specify the
- * direction and the split method (see below). @size is the size of the split.
- * @wintype is the type of window you're creating, and @rock is the rock.
+ * not be zero. @method specifies the direction and the split method
+ * (see below). @size is the size of the split. @wintype is the type of window
+ * you're creating, and @rock is the rock.
+ *
+ * The method argument must be the logical-or of a direction constant
+ * (%winmethod_Above, %winmethod_Below, %winmethod_Left, %winmethod_Right) and a
+ * split-method constant (%winmethod_Fixed, %winmethod_Proportional).
*
* Remember that it is possible that the library will be unable to create a new
* window, in which case glk_window_open() will return %NULL.
@@ -277,11 +298,11 @@ glk_window_get_root()
*
* So to create a text buffer window which takes the top 40% of the original
* window's space, you would execute
- * |[ newwin = #glk_window_open(win, #winmethod_Above | #winmethod_Proportional, 40, #wintype_TextBuffer, 0); ]|
+ * |[ newwin = glk_window_open(win, winmethod_Above | winmethod_Proportional, 40, wintype_TextBuffer, 0); ]|
*
* To create a text grid which is always five lines high, at the bottom of the
* original window, you would do
- * |[ newwin = #glk_window_open(win, #winmethod_Below | #winmethod_Fixed, 5, #wintype_TextGrid, 0); ]|
+ * |[ 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.
@@ -326,7 +347,8 @@ glk_window_get_root()
* O. C gets two rows; A gets the rest. All done.
*
* Then the user maliciously starts squeezing the window down, in stages:
- *
+ *
+ *
*
*
*
@@ -394,16 +416,16 @@ glk_window_get_root()
* A C
*
*
- * After the first split, the new pair window (O1, which covers the whole
- * screen) knows that its first child (A) is above the second, and gets 50% of
- * its own area. (A is the key window for this split, but a proportional split
- * doesn't care about key windows.)
+ * The initial window is A. After the first split, the new pair window (O1,
+ * which covers the whole screen) knows that its new child (B) is below A, and
+ * gets 50% of its own area. (B is the key window for this split, but a
+ * proportional split doesn't care about key windows.)
*
- * After the second split, all this remains true; O1 knows that its first child
- * gets 50% of its space, and A is O1's key window. But now O1's first child is
- * O2 instead of A. The newer pair window (O2) knows that its first child (C)
- * is above the second, and gets a fixed size of two rows. (As measured in C's
- * font, because C is O2's key window.)
+ * After the second split, all this remains true; O1 knows
+ * that its first child gets 50% of its space, and B is O1's key window. But
+ * now O1's first child is O2 instead of A. The newer pair window (O2) knows
+ * that its first child (C) is above the second, and gets a fixed size of two
+ * rows. (As measured in C's font, because C is O2's key window.)
*
* If we split C, now, the resulting pair will still be two C-font rows high
* — that is, tall enough for two lines of whatever font C displays. For
@@ -440,8 +462,9 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
glui32 rock)
{
VALID_WINDOW_OR_NULL(split, return NULL);
- 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);
+ g_return_val_if_fail(!(((method & winmethod_DivisionMask) == winmethod_Proportional) && size > 100), NULL);
+ if(method != (method & (winmethod_DirMask | winmethod_DivisionMask | winmethod_BorderMask)))
+ WARNING("Unrecognized bits in method constant");
ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
@@ -525,13 +548,14 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
gtk_container_add( GTK_CONTAINER(scrolledwindow), textview );
gtk_widget_show_all(scrolledwindow);
+ win->widget = textview;
+ win->frame = scrolledwindow;
+
/* Create the styles available to the window stream */
style_init_textbuffer(textbuffer);
+ style_init_more_prompt(win);
gtk_widget_modify_font( textview, get_current_font(wintype) );
- win->widget = textview;
- win->frame = scrolledwindow;
-
/* Determine the size of a "0" character in pixels */
PangoLayout *zero = gtk_widget_create_pango_layout(textview, "0");
pango_layout_set_font_description( zero, get_current_font(wintype) );
@@ -539,23 +563,41 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
g_object_unref(zero);
/* Connect signal handlers */
+
+ /* Pager */
+ g_signal_connect_after( textview, "size-request", G_CALLBACK(pager_after_size_request), win );
+ win->pager_expose_handler = g_signal_connect_after( textview, "expose-event", G_CALLBACK(pager_on_expose), win );
+ g_signal_handler_block(textview, win->pager_expose_handler);
+ win->pager_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(pager_on_key_press_event), win );
+ g_signal_handler_block(textview, win->pager_keypress_handler);
+ GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(scrolledwindow));
+ win->pager_adjustment_handler = g_signal_connect_after(adj, "value-changed", G_CALLBACK(pager_after_adjustment_changed), win);
+
+ /* Char and line input */
win->char_input_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(on_char_input_key_press_event), 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);
- 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);
+ /* Shutdown key press */
+ 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);
+
/* 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);
- /* Mark the position where the user will input text */
+ /* Mark the position where the user will input text and the end mark */
GtkTextIter end;
gtk_text_buffer_get_end_iter(textbuffer, &end);
gtk_text_buffer_create_mark(textbuffer, "input_position", &end, TRUE);
+ gtk_text_buffer_create_mark(textbuffer, "end_position", &end, FALSE);
+
+ /* Create the pager position mark; it stands for the last character in the buffer
+ that has been on-screen */
+ gtk_text_buffer_create_mark(textbuffer, "pager_position", &end, TRUE);
}
break;
@@ -800,7 +842,12 @@ glk_window_close(winid_t win, stream_result_t *result)
if(pair_node != NULL)
{
gboolean new_child_on_left = ( pair_node == g_node_first_sibling(pair_node) );
- GNode *sibling_node = pair_node->children; /* only one child left */
+
+ /* Lookup our sibling */
+ GNode *sibling_node = pair_node->children;
+ if(sibling_node == win->window_node)
+ sibling_node = sibling_node->next;
+
GNode *new_parent_node = pair_node->parent;
g_node_unlink(pair_node);
g_node_unlink(sibling_node);
@@ -818,6 +865,7 @@ glk_window_close(winid_t win, stream_result_t *result)
g_node_append(new_parent_node, sibling_node);
}
+ stream_close_common( ((winid_t) pair_node->data)->window_stream, NULL );
window_close_common( (winid_t) pair_node->data, TRUE);
}
else /* it was the root window */
@@ -854,15 +902,17 @@ glk_window_close(winid_t win, stream_result_t *result)
*
* Text grid
*
- * This will clear the window, filling all positions with blanks. The window
- * cursor is moved to the top left corner (position 0,0).
+ * This will clear the window, filling all positions with blanks (in the
+ * normal style). The window cursor is moved to the top left corner (position
+ * 0,0).
*
*
*
* Graphics
*
* Clears the entire window to its current background color. See Graphics Windows.
+ * linkend="chimara-The-Types-of-Windows#wintype-Graphics">Graphics
+ * Windows.
*
*
*
@@ -914,9 +964,29 @@ glk_window_clear(winid_t win)
gtk_text_buffer_set_text(textbuffer, text, -1);
g_free(text);
- GtkTextIter begin;
- gtk_text_buffer_get_start_iter(textbuffer, &begin);
- gtk_text_buffer_move_mark_by_name(textbuffer, "cursor_position", &begin);
+ 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);
+
+ gtk_text_buffer_move_mark_by_name(textbuffer, "cursor_position", &start);
gdk_threads_leave();
}
@@ -957,15 +1027,12 @@ glk_window_clear(winid_t win)
* glk_set_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)) ]|
+ * Sets the current stream to @win's window stream. If @win is %NULL, it is
+ * equivalent to
+ * |[ glk_stream_set_current(NULL); ]|
+ * If @win is not %NULL, it is equivalent to
+ * |[ glk_stream_set_current(glk_window_get_stream(win)); ]|
* See Streams.
- *
- * Chimara
- *
- * Although this is not mentioned in the specification, @win may also be
- * %NULL, in which case the current stream is also set to %NULL.
- *
*/
void
glk_set_window(winid_t win)
@@ -1152,15 +1219,15 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr)
* Consider the example above, where D has collapsed to zero height. Say D was a
* text buffer window. You could make a more useful layout by doing
* |[
- * #winid_t o2;
- * o2 = #glk_window_get_parent(d);
- * glk_window_set_arrangement(o2, #winmethod_Above | #winmethod_Fixed, 3, d);
+ * winid_t o2;
+ * o2 = glk_window_get_parent(d);
+ * glk_window_set_arrangement(o2, winmethod_Above | winmethod_Fixed, 3, d);
* ]|
* That would set D (the upper child of O2) to be O2's key window, and give it a
* fixed size of 3 rows.
*
* If you later wanted to expand D, you could do
- * |[ glk_window_set_arrangement(o2, #winmethod_Above | #winmethod_Fixed, 5, NULL); ]|
+ * |[ glk_window_set_arrangement(o2, winmethod_Above | winmethod_Fixed, 5, NULL); ]|
* That expands D to five rows. Note that, since O2's key window is already set
* to D, it is not necessary to provide the @keywin argument; you can pass %NULL
* to mean leave the key window unchanged.
@@ -1170,18 +1237,18 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr)
* example, you could change O2's key window to be A, but not B. The key window
* also cannot be a pair window itself.
*
- * |[ glk_window_set_arrangement(o2, #winmethod_Below | #winmethod_Fixed, 3, NULL); ]|
+ * |[ glk_window_set_arrangement(o2, winmethod_Below | winmethod_Fixed, 3, NULL); ]|
* This changes the constraint to be on the lower child of
* O2, which is A. The key window is still D; so A would then be three rows high
* as measured in D's font, and D would get the rest of O2's space. That may not
* be what you want. To set A to be three rows high as measured in A's font, you
* would do
- * |[ glk_window_set_arrangement(o2, #winmethod_Below | #winmethod_Fixed, 3, a); ]|
+ * |[ glk_window_set_arrangement(o2, winmethod_Below | winmethod_Fixed, 3, a); ]|
*
* Or you could change O2 to a proportional split:
- * |[ glk_window_set_arrangement(o2, #winmethod_Below | #winmethod_Proportional, 30, NULL); ]|
+ * |[ glk_window_set_arrangement(o2, winmethod_Below | winmethod_Proportional, 30, NULL); ]|
* or
- * |[ glk_window_set_arrangement(o2, #winmethod_Above | #winmethod_Proportional, 70, NULL); ]|
+ * |[ glk_window_set_arrangement(o2, winmethod_Above | winmethod_Proportional, 70, NULL); ]|
* These do exactly the same thing, since 30% above is the same as
* 70% below. You don't need to specify a key window with a proportional
* split, so the @keywin argument is %NULL. (You could actually specify either A
@@ -1190,9 +1257,9 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr)
* Whatever constraint you set, glk_window_get_size() will tell you the actual
* window size you got.
*
- * Note that you can resize windows, but you can't flip or rotate them. You
- * can't move A above D, or change O2 to a vertical split where A is left or
- * right of D.
+ * Note that you can resize windows, and alter the Border/NoBorder flag. But you
+ * can't flip or rotate them. You can't move A above D, or change O2 to a
+ * vertical split where A is left or right of D.
*
* To get this effect you could close one of the windows, and re-split the
* other one with glk_window_open().