X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fwindow.h;h=93e946ab03caea3b11456b2d0de1bc7bd187f729;hb=c8c67078daea54fdf03b46726a77ecf26cf65be4;hp=4e705f2d69822bbf14a510b6691974d7e237a151;hpb=199d247c0c2155c1c8fca97fcc6087efdd29e482;p=rodin%2Fchimara.git

diff --git a/src/window.h b/src/window.h
index 4e705f2..93e946a 100644
--- a/src/window.h
+++ b/src/window.h
@@ -6,6 +6,8 @@
 
 #include "stream.h"
 #include "error.h"
+#include "callbacks.h"
+#include "input.h"
 
 enum InputRequestType
 {
@@ -18,17 +20,34 @@ enum InputRequestType
 
 struct glk_window_struct
 {
-	GNode *window_node;
-
 	glui32 rock;
-	glui32 window_type;
+	/* Pointer to the node in the global tree that contains this window */
+	GNode *window_node;
+	/* Window parameters */
+	glui32 type;
+	/* "widget" is the actual widget with the window's functionality */
 	GtkWidget *widget;
+	/* "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;
+	/* Width and height of the window's size units, in pixels */
+	int unit_width;
+	int unit_height;
+	/* Streams associated with the window */
 	strid_t window_stream;
 	strid_t echo_stream;
+	/* Width and height of the window, in characters (text grids only) */
+	glui32 width;
+	glui32 height;
+	/* Input request stuff */
 	enum InputRequestType input_request_type;
 	gchar *line_input_buffer;
 	glui32 *line_input_buffer_unicode;
 	glui32 line_input_buffer_max_len;
+	gboolean mouse_input_requested;
+	/* Signal handlers */
+	gulong keypress_handler;
+	gulong insert_text_handler;
 };
 
 #endif