Fix bug with children not resizing with main window
[emu8051.git] / src / emugtk.c
index 3a111cb..7742788 100644 (file)
@@ -43,6 +43,7 @@
 #include "regwin.h"
 #include "pgmwin.h"
 #include "memwin.h"
+#include "app-config.h"
 
 #define BUTTONS_BORDER 2
 
@@ -50,6 +51,8 @@ static int running;
 static int running_function_tag;
 static GtkWidget *mainwin;
 
+extern struct app_config_t *cfg;
+
 /* Signal DestroyEvent */
 static void
 WindowDestroyEvent(GtkWidget *widget, gpointer data)
@@ -247,69 +250,161 @@ AddMenu(void)
        return menu_bar;
 }
 
+static int
+mainwin_configure_event(GtkWindow *window, GdkEvent *event, gpointer data)
+{
+       //event->configure.x;
+       //event->configure.y;
+       cfg->win_width = event->configure.width;
+       cfg->win_height = event->configure.height;
+
+       /*
+        * Important:
+        * Returning false allows event to propagate to children. If not, they
+        * will not be resized when we resize the main window.
+        */
+       return FALSE;
+}
+
+static void
+hpaned_notify_event(GtkWindow *window, GdkEvent *event, gpointer data)
+{
+       GtkWidget *hpaned = data;
+
+       cfg->hpane_pos = gtk_paned_get_position(GTK_PANED(hpaned));
+}
+
+static void
+vpaned_notify_event(GtkWindow *window, GdkEvent *event, gpointer data)
+{
+       GtkWidget *vpaned = data;
+
+       cfg->vpane_pos = gtk_paned_get_position(GTK_PANED(vpaned));
+}
+
+/*
+ *  mainwin
+ * +---------------------------------------------------------------------+
+ * |                                                                     |
+ * |  vbox                                                               |
+ * |  +---------------------------------------------------------------+  |
+ * |  |                                                               |  |
+ * |  |  menu_bar                                                     |  |
+ * |  |  +----------------------+                                     |  |
+ * |  |  | File  View  Help     |                                     |  |
+ * |  |  +----------------------+                                     |  |
+ * |  |                                                               |  |
+ * |  |---------------------------------------------------------------|  |
+ * |  |                                                               |  |
+ * |  |  buttons_bar                                                  |  |
+ * |  |  +-----------------------+                                    |  |
+ * |  |  | RST  RUN  STOP  STEP  |                                    |  |
+ * |  |  +-----------------------+                                    |  |
+ * |  |                                                               |  |
+ * |  |---------------------------------------------------------------|  |
+ * |  |                                                               |  |
+ * |  |  vpaned                                                       |  |
+ * |  |  +---------------------------------------------------------+  |  |
+ * |  |  |                                                         |  |  |
+ * |  |  |  hpaned                                                 |  |  |
+ * |  |  |  +---------------------------------------------------+  |  |  |
+ * |  |  |  |                        |                          |  |  |  |
+ * |  |  |  |  scrollwin             |  scrollwin               |  |  |  |
+ * |  |  |  |  +------------------+  *  +--------------------+  |  |  |  |
+ * |  |  |  |  | REGISTERS window |  *  | Disassembly window |  |  |  |  |
+ * |  |  |  |  +------------------+  |  +--------------------+  |  |  |  |
+ * |  |  |  |                        |                          |  |  |  |
+ * |  |  |  +---------------------------------------------------+  |  |  |
+ * |  |  |                                                         |  |  |
+ * |  |  |--------------------------***-----------------------------  |  |
+ * |  |  |                                                         |  |  |
+ * |  |  |  scrollwin                                              |  |  |
+ * |  |  |  +---------------------------------------------------+  |  |  |
+ * |  |  |  | Memory window                                     |  |  |  |
+ * |  |  |  +---------------------------------------------------+  |  |  |
+ * |  |  |                                                         |  |  |
+ * |  |  +---------------------------------------------------------+  |  |
+ * |  |                                                               |  |
+ * |  |                                                               |  |
+ * |  +---------------------------------------------------------------+  |
+ * |                                                                     |
+ * |                                                                     |
+ * +---------------------------------------------------------------------+
+ */
 static void
 emugtk_window_init(void)
 {
-       GtkWidget *main_vbox;
+       GtkWidget *vbox;
        GtkWidget *menu_bar;
        GtkWidget *buttons_bar;
-       GtkWidget *emufixed;
-       GtkWidget *fixed_frame;
+       GtkWidget *scrollwin;
+       GtkWidget *hpaned;
+       GtkWidget *vpaned;
 
        mainwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title(GTK_WINDOW(mainwin), PACKAGE);
-       gtk_widget_set_usize(GTK_WIDGET(mainwin),
-                            MAIN_WIN_WIDTH, MAIN_WIN_HEIGHT);
+       gtk_window_set_default_size(GTK_WINDOW(mainwin),
+                                   cfg->win_width, cfg->win_height);
        gtk_container_set_border_width(GTK_CONTAINER(mainwin), 0);
 
        /* Window DESTROY event. */
        g_signal_connect(mainwin, "destroy",
                         G_CALLBACK(WindowDestroyEvent), NULL);
 
-       /*
-        * Setting main window geometry based on command line options
-        * (if specified).
-       */
-       /*MainWindowSetGeometry();*/
+       g_signal_connect(G_OBJECT(mainwin), "configure-event",
+                        G_CALLBACK(mainwin_configure_event), NULL);
 
        /*
-        * main_vbox contains the menu bar and body_vbox (for all remaining
+        * vbox contains the menu bar and body_vbox (for all remaining
         * items).
         */
-       main_vbox = gtk_vbox_new(FALSE, 1);
+       vbox = gtk_vbox_new(FALSE, 1);
 
        /* Creating the menu bar. */
        menu_bar = AddMenu();
-       /* Adding menu bar to main_vbox */
-       gtk_box_pack_start(GTK_BOX(main_vbox), menu_bar, FALSE, FALSE, 1);
+       /* Adding menu bar to vbox */
+       gtk_box_pack_start(GTK_BOX(vbox), menu_bar, FALSE, FALSE, 1);
 
        /* Creating the buttons bar. */
        buttons_bar = AddButtons();
-       /* Adding buttons bar to main_vbox */
-       gtk_box_pack_start(GTK_BOX(main_vbox), buttons_bar, FALSE, FALSE, 1);
+       /* Adding buttons bar to vbox */
+       gtk_box_pack_start(GTK_BOX(vbox), buttons_bar, FALSE, FALSE, 1);
 
-       /* Emulator fixed window. */
-       emufixed = gtk_fixed_new();
-       gtk_widget_set_usize(GTK_WIDGET(emufixed), MAIN_WIN_WIDTH,
-                            REG_WIN_HEIGHT + MEM_WIN_HEIGHT + 10);
+       /*
+        * vpaned will contain:
+        *   Top:    registers and disassembly windows.
+        *   Bottom: memory window
+        */
+       vpaned = gtk_vpaned_new();
+       gtk_paned_set_position(GTK_PANED(vpaned), cfg->vpane_pos);
+       g_signal_connect(G_OBJECT(vpaned), "notify::position",
+                        G_CALLBACK(vpaned_notify_event), vpaned);
+
+       /* hpaned will contain registers and disassembly windows. */
+       hpaned = gtk_hpaned_new();
+       gtk_paned_set_position(GTK_PANED(hpaned), cfg->hpane_pos);
+       g_signal_connect(G_OBJECT(hpaned), "notify::position",
+                        G_CALLBACK(hpaned_notify_event), hpaned);
 
        /* 8051 registers frame. */
-       fixed_frame = regwin_init(REG_WIN_WIDTH, REG_WIN_HEIGHT);
-       gtk_fixed_put(GTK_FIXED(emufixed), fixed_frame, 0, 0);
+       scrollwin = regwin_init();
+       gtk_paned_pack1(GTK_PANED(hpaned), scrollwin, FALSE, FALSE);
 
        /* Program disassembly frame. */
-       fixed_frame = pgmwin_init(PGM_WIN_WIDTH, PGM_WIN_HEIGHT);
-       gtk_fixed_put(GTK_FIXED(emufixed), fixed_frame, REG_WIN_WIDTH + 10, 0);
+       scrollwin = pgmwin_init();
+       gtk_paned_pack2(GTK_PANED(hpaned), scrollwin, TRUE, FALSE);
+
+       gtk_paned_pack1(GTK_PANED(vpaned), hpaned, FALSE, FALSE);
 
        /* Memory dump frame. */
-       fixed_frame = memwin_init(MEM_WIN_WIDTH, MEM_WIN_HEIGHT);
-       gtk_fixed_put(GTK_FIXED(emufixed), fixed_frame, 0, REG_WIN_HEIGHT);
+       scrollwin = memwin_init();
+       gtk_paned_pack2(GTK_PANED(vpaned), scrollwin, TRUE, FALSE);
 
-       /* Adding fixed window to main_vbox */
-       gtk_box_pack_start(GTK_BOX(main_vbox), emufixed, FALSE, FALSE, 1);
+       /* Adding vpaned window to vbox */
+       gtk_box_pack_start(GTK_BOX(vbox), vpaned, true, true, 1);
 
-       /* Adding the main_vbox to the main window. */
-       gtk_container_add(GTK_CONTAINER(mainwin), main_vbox);
+       /* Adding the vbox to the main window. */
+       gtk_container_add(GTK_CONTAINER(mainwin), vbox);
 
        gtk_widget_show_all(mainwin);
 }
@@ -353,6 +448,8 @@ main(int argc, char **argv)
 
        ParseCommandLineOptions(argc, argv);
 
+       app_config_load();
+
        cpu8051_init();
 
        running = 0;
@@ -372,5 +469,7 @@ main(int argc, char **argv)
        printf("End of program.\n");
 #endif
 
+       app_config_save();
+
        return EXIT_SUCCESS;
 }