Implemented line input in text grid windows using a GtkEntry.

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

diff --git a/src/window.h b/src/window.h
index 728a381079c6f0f8cd302d048abcaad19b958b15..7a140991e171bbf0be467b2441e151091dc14e36 100644 (file)
--- a/src/window.h
+++ b/src/window.h
@@ -25,16 +25,31 @@ struct glk_window_struct
        GNode *window_node;
        /* Window parameters */
        glui32 type;
-       GtkWidget *widget; /* actual widget that does stuff */
-       GtkWidget *frame; /* container child */
+       /* "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;
+       /* Line input field (text grids only) */
+       glui32 input_length;
+       GtkTextChildAnchor *input_anchor;
+       GtkWidget *input_entry;
+       /* Signal handlers */
        gulong keypress_handler;
        gulong insert_text_handler;
 };