X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.h;h=4c753c39b587117c598812128bf5513a17e22bb0;hb=0cc686dee7c3d71457b409a097fbc7435709429a;hp=845550ea6e32a740febc526ee449d2ec723a568b;hpb=1f983431c87bfc86307c790f519409672f2d0e5a;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/window.h b/libchimara/window.h
index 845550e..4c753c3 100644
--- a/libchimara/window.h
+++ b/libchimara/window.h
@@ -9,6 +9,8 @@
 #include "input.h"
 #include "style.h"
 #include "hyperlink.h"
+#include "mouse.h"
+#include "graphics.h"
 
 
 enum InputRequestType
@@ -40,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;
@@ -62,6 +68,11 @@ struct glk_window_struct
 	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;
@@ -72,13 +83,25 @@ struct glk_window_struct
 	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;
+	PangoLayout *pager_layout;
 };
 
-G_GNUC_INTERNAL void trash_window_thread_independent(ChimaraGlkPrivate *glk_data, winid_t win);
-
 #endif