X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.h;h=aa3250274a5e5e3609e12252457b587f7a61a0cf;hb=fd95bbfc8f01fe812d9f24d1d377079df5f968d5;hp=1a0b2e987297ef6893bc5f0d1f71162eaa38650e;hpb=78652af29a2f39e626febd5f4213da57d3a13901;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/window.h b/libchimara/window.h
index 1a0b2e9..aa32502 100644
--- a/libchimara/window.h
+++ b/libchimara/window.h
@@ -2,12 +2,15 @@
 #define WINDOW_H
 
 #include <gtk/gtk.h>
+#include "chimara-glk-private.h"
 #include "glk.h"
-
+#include "gi_dispa.h"
 #include "stream.h"
-#include "error.h"
 #include "input.h"
 #include "style.h"
+#include "hyperlink.h"
+#include "mouse.h"
+#include "graphics.h"
 
 
 enum InputRequestType
@@ -29,6 +32,7 @@ struct glk_window_struct
 {
 	/*< private >*/
 	glui32 magic, rock;
+	gidispatch_rock_t disprock;
 	/* Pointer to the node in the global tree that contains this window */
 	GNode *window_node;
 	/* Window parameters */
@@ -38,6 +42,10 @@ struct glk_window_struct
 	/* "frame" is the widget that is the child of the ChimaraGlk container, such 
 	as a scroll window. It may be the same as "widget". */
 	GtkWidget *frame;
+	/* In text buffer windows, the scrolled window and the pager are extra
+	widgets that are neither "widget" nor "frame" */
+	GtkWidget *scrolledwindow;
+	GtkWidget *pager;
 	/* Width and height of the window's size units, in pixels */
 	int unit_width;
 	int unit_height;
@@ -56,14 +64,43 @@ struct glk_window_struct
 	gchar *line_input_buffer;
 	glui32 *line_input_buffer_unicode;
 	glui32 line_input_buffer_max_len;
+	gidispatch_rock_t buffer_rock;
 	gboolean mouse_input_requested;
+	GList *history;
+	GList *history_pos;
+	GSList *extra_line_terminators;
+	GSList *current_extra_line_terminators;
+	/* Line input echoing (text buffers only) */
+	gboolean echo_line_input;
+	gboolean echo_current_line_input;
 	/* Line input field (text grids only) */
 	glui32 input_length;
 	GtkTextChildAnchor *input_anchor;
 	GtkWidget *input_entry;
+	gulong line_input_entry_changed;
 	/* Signal handlers */
-	gulong keypress_handler;
+	gulong char_input_keypress_handler;
+	gulong line_input_keypress_handler;
 	gulong insert_text_handler;
+	gulong tag_event_handler;
+	gulong shutdown_keypress_handler;
+	gulong button_press_event_handler;
+	gulong size_allocate_handler;
+	gulong pager_keypress_handler;
+	gulong pager_adjustment_handler;
+	/* Window buffer */
+	GString *buffer;
+	GtkTextTag *zcolor;
+	GtkTextTag *zcolor_reversed;
+	/* Hyperlinks */
+	GHashTable *hyperlinks;
+	struct hyperlink *current_hyperlink;
+	gboolean hyperlink_event_requested;
+	/* Graphics */
+	glui32 background_color;
+	cairo_surface_t *backing_store;
+	/* Pager (textbuffer only) */
+	gboolean currently_paging;
 };
 
 #endif