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

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

diff --git a/src/window.h b/src/window.h
index 954415e494ecd14fb1f2c7b22ef446ae3b0e352e..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
 {
@@ -22,8 +24,9 @@ struct glk_window_struct
        /* Pointer to the node in the global tree that contains this window */
        GNode *window_node;
        /* Window parameters */
-       glui32 window_type;
-       GtkWidget *widget;
+       glui32 type;
+       GtkWidget *widget; /* actual widget that does stuff */
+       GtkWidget *frame; /* container child */
        strid_t window_stream;
        strid_t echo_stream;
        /* Input request stuff */
@@ -32,6 +35,8 @@ struct glk_window_struct
        glui32 *line_input_buffer_unicode;
        glui32 line_input_buffer_max_len;
        gboolean mouse_input_requested;
+       gulong keypress_handler;
+       gulong insert_text_handler;
 };
 
 #endif