Changed build system to Automake. Split Glk code off into a GTK widget.

[rodin/chimara.git] / src / window.h

diff --git a/src/window.h b/src/window.h
index 4e705f2d69822bbf14a510b6691974d7e237a151..728a381079c6f0f8cd302d048abcaad19b958b15 100644 (file)
--- 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,23 @@ enum InputRequestType
 
 struct glk_window_struct
 {
-       GNode *window_node;
-
        glui32 rock;
-       glui32 window_type;
-       GtkWidget *widget;
+       /* Pointer to the node in the global tree that contains this window */
+       GNode *window_node;
+       /* Window parameters */
+       glui32 type;
+       GtkWidget *widget; /* actual widget that does stuff */
+       GtkWidget *frame; /* container child */
        strid_t window_stream;
        strid_t echo_stream;
+       /* 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;
+       gulong keypress_handler;
+       gulong insert_text_handler;
 };
 
 #endif