Make TildaWindow properly generate terminal numbers

[tilda-gobject.git] / tilda-terminal.h

diff --git a/tilda-terminal.h b/tilda-terminal.h
index bf19ba2..d451ada 100644 (file)
--- a/tilda-terminal.h
+++ b/tilda-terminal.h
@@ -1,10 +1,15 @@
 #ifndef TILDA_TERMINAL_H
 #define TILDA_TERMINAL_H
 
-#include <glib-object.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <vte/vte.h>
+
+#include "tilda-window.h"
+
 
 #define TILDA_TYPE_TERMINAL                            (tilda_terminal_get_type())
-#define TILDA_TERMINAL(obj)                            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TILDA_TYPE_TERMINAL))
+#define TILDA_TERMINAL(obj)                            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TILDA_TYPE_TERMINAL, TildaTerminal))
 #define TILDA_TERMINAL_CLASS(klass)            (G_TYPE_CHECK_CLASS_CAST ((klass), TILDA_TYPE_TERMINAL, TildaTerminalClass))
 #define TILDA_IS_TERMINAL(obj)                 (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TILDA_TYPE_TERMINAL))
 #define TILDA_IS_TERMINAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TILDA_TYPE_TERMINAL))
@@ -18,9 +23,11 @@ struct _TildaTerminal {
        gboolean dispose_has_run;
 
        /* Instance Members */
-       // FIXME: ADD THESE BACK
-       // TildaWindow *tw;
-       // VteTerminal *vte_term;
+       gint window_number;
+       GObject *parent_window;
+       GtkWidget *vte_term;
+       GtkWidget *scrollbar;
+       GtkWidget *hbox;
        gint number;
 
        gchar *background_image;
@@ -39,14 +46,15 @@ struct _TildaTerminal {
        // TODO:
        // TODO: or, maybe ints would just be better
        // TODO: REMEMBER THOUGH: make the computer do what it's good at ;)
-       gint backspace_key;
-       gint delete_key;
+       gint backspace_binding;
+       gint delete_binding;
        gint dynamic_title;
        gint exit_action;
-       gint colorscheme;
-       // FIXME: ADD THESE BACK
-       //GdkColor background_color;
-       //GdkColor foreground_color;
+       // TODO: gint colorscheme; the code can work around the need for
+       // TODO: this value. Just check if the back and fore colors match
+       // TODO: any pre-defined colorschemes exactly in the GUI.
+       GdkColor background_color;
+       GdkColor foreground_color;
        // TODO: all other colors supported by VTE
 
        gboolean scroll_background;