X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=src%2Fwindow.h;h=3395bb482296225c9d663da43a6f6ac228c826d4;hb=47d20aad0aecf8161a3ec94bdc7da9cd42f4ae62;hp=02afe78e377ac505e8c20fb6a390614427dfc6dd;hpb=0b8b3b9c20937f7b522274ad83739816d8ef21e3;p=rodin%2Fchimara.git

diff --git a/src/window.h b/src/window.h
index 02afe78..3395bb4 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
 {
@@ -22,8 +24,16 @@ struct glk_window_struct
 	/* Pointer to the node in the global tree that contains this window */
 	GNode *window_node;
 	/* Window parameters */
-	glui32 window_type;
+	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;
 	/* Input request stuff */
@@ -31,6 +41,10 @@ struct glk_window_struct
 	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