Eliminated warnings about static functions declared with G_GNUC_INTERNAL

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

diff --git a/src/window.h b/src/window.h
index 3395bb482296225c9d663da43a6f6ac228c826d4..b3b824a7a09a5782be52199ebdbad13d7c485e71 100644 (file)
--- a/src/window.h
+++ b/src/window.h
@@ -8,6 +8,8 @@
 #include "error.h"
 #include "callbacks.h"
 #include "input.h"
+#include "style.h"
+
 
 enum InputRequestType
 {
@@ -18,9 +20,16 @@ enum InputRequestType
        INPUT_REQUEST_LINE_UNICODE
 };
 
+/**
+ * glk_window_struct:
+ *
+ * This is an opaque structure (see <link linkend="chimara-Opaque-Structures">
+ * Opaque Structures</link> and should not be accessed directly.
+ */
 struct glk_window_struct
 {
-       glui32 rock;
+       /*< private >*/
+       glui32 magic, rock;
        /* Pointer to the node in the global tree that contains this window */
        GNode *window_node;
        /* Window parameters */
@@ -36,12 +45,23 @@ struct glk_window_struct
        /* 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;
+       /* Window split data (pair windows only) */
+       winid_t key_window;
+       glui32 split_method;
+       glui32 constraint_size;
        /* 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;