X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=fb7311e7280a09f0c1300fa026630a2221fcb1c3;hb=a990c9f6e84e43b37e9f1e6b89ea6a1e8646354b;hp=826eacd288a146ddeb06a51a2957331af9802d60;hpb=07c4e25bfcbc35efcdd99139cff3ba61e03a507e;p=projects%2Fchimara%2Fchimara.git
diff --git a/libchimara/window.c b/libchimara/window.c
index 826eacd..fb7311e 100644
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -33,6 +33,10 @@ window_new_common(glui32 rock)
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);
@@ -63,6 +67,8 @@ 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);
@@ -196,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;
}
/**
@@ -223,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
@@ -239,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.
@@ -405,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
@@ -451,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);
@@ -553,7 +565,6 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
/* Connect signal handlers */
/* Pager */
- //g_signal_connect_after( textview, "expose-event", G_CALLBACK(pager_after_expose_event), win );
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);
@@ -586,8 +597,7 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
/* Create the pager position mark; it stands for the last character in the buffer
that has been on-screen */
- GtkTextMark *pager_position = gtk_text_buffer_create_mark(textbuffer, "pager_position", &end, TRUE);
- gtk_text_mark_set_visible(pager_position, TRUE);
+ gtk_text_buffer_create_mark(textbuffer, "pager_position", &end, TRUE);
}
break;
@@ -892,8 +902,9 @@ 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).
*
*
*
@@ -953,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();
}
@@ -977,13 +1008,19 @@ glk_window_clear(winid_t win)
case wintype_Graphics:
{
+ GtkAllocation allocation;
+
/* 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);
+ gdk_threads_enter();
+ gtk_widget_get_allocation(win->widget, &allocation);
+ gdk_threads_leave();
+
+ glk_window_erase_rect(win, 0, 0, allocation.width, allocation.height);
}
break;
@@ -996,15 +1033,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)
@@ -1106,6 +1140,7 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr)
{
VALID_WINDOW(win, return);
+ GtkAllocation allocation;
ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
switch(win->type)
@@ -1126,9 +1161,10 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr)
g_mutex_unlock(glk_data->arrange_lock);
gdk_threads_enter();
+ gtk_widget_get_allocation(win->widget, &allocation);
/* Cache the width and height */
- win->width = (glui32)(win->widget->allocation.width / win->unit_width);
- win->height = (glui32)(win->widget->allocation.height / win->unit_height);
+ win->width = (glui32)(allocation.width / win->unit_width);
+ win->height = (glui32)(allocation.height / win->unit_height);
gdk_threads_leave();
if(widthptr != NULL)
@@ -1145,10 +1181,11 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr)
g_mutex_unlock(glk_data->arrange_lock);
gdk_threads_enter();
+ gtk_widget_get_allocation(win->widget, &allocation);
if(widthptr != NULL)
- *widthptr = (glui32)(win->widget->allocation.width / win->unit_width);
+ *widthptr = (glui32)(allocation.width / win->unit_width);
if(heightptr != NULL)
- *heightptr = (glui32)(win->widget->allocation.height / win->unit_height);
+ *heightptr = (glui32)(allocation.height / win->unit_height);
gdk_threads_leave();
break;
@@ -1160,10 +1197,11 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr)
g_mutex_unlock(glk_data->arrange_lock);
gdk_threads_enter();
+ gtk_widget_get_allocation(win->widget, &allocation);
if(widthptr != NULL)
- *widthptr = (glui32)(win->widget->allocation.width);
+ *widthptr = (glui32)(allocation.width);
if(heightptr != NULL)
- *heightptr = (glui32)(win->widget->allocation.height);
+ *heightptr = (glui32)(allocation.height);
gdk_threads_leave();
break;
@@ -1229,9 +1267,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().