X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Femugtk.c;h=d0a4582d50409ae146e7ac044b47a4c5c74f3901;hb=c361bcde92ff71208eded7e706f25f567c1de793;hp=3b5677f60c2003ea25043502a681af98667bde7a;hpb=31155ac8672e72db0d3cab3e4167a3c00f73a2bc;p=emu8051.git diff --git a/src/emugtk.c b/src/emugtk.c index 3b5677f..d0a4582 100644 --- a/src/emugtk.c +++ b/src/emugtk.c @@ -22,6 +22,9 @@ #include #include "config.h" +#include +#include + #include #include "common.h" @@ -41,6 +44,8 @@ #include "pgmwin.h" #include "memwin.h" +#define BUTTONS_BORDER 2 + static int running; static int running_function_tag; static GtkWidget *mainwin; @@ -64,7 +69,7 @@ emugtk_stop_running() #ifdef EMU8051_DEBUG printf("emugtk_StopRunning()\n"); #endif - gtk_idle_remove(running_function_tag); + g_source_remove(running_function_tag); running = 0; regwin_Show(); pgmwin_Disasm(); @@ -95,28 +100,25 @@ emugtk_start_running(void) #ifdef EMU8051_DEBUG printf("emugtk_StartRunning()\n"); #endif - running_function_tag = gtk_idle_add(emugtk_running, 0); + running_function_tag = g_idle_add(emugtk_running, 0); running = 1; } } /* Taken from the Gxine source code. */ static GtkWidget * -AddPixButton(GtkWidget *box, gchar **pixmap_array) +button_add_pix(GtkWidget *box, char **xpm) { GtkWidget *button, *icon; - GdkPixmap *image; - GdkBitmap *transparent; button = gtk_button_new(); gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NORMAL); - image = gdk_pixmap_colormap_create_from_xpm_d( - NULL, gdk_colormap_get_system(), - &transparent, NULL, pixmap_array); - icon = gtk_pixmap_new(image, transparent); + + icon = gtk_image_new_from_pixbuf( + gdk_pixbuf_new_from_xpm_data((const char **) xpm)); gtk_container_add(GTK_CONTAINER(button), icon); - gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, BUTTONS_BORDER); return button; } @@ -197,28 +199,28 @@ AddButtons(void) button_hbox = gtk_hbox_new(FALSE, 0); /* Creating the RESET button. */ - button = AddPixButton(button_hbox, reset_xpm); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(emugtk_ResetEvent), - NULL); + button = button_add_pix(button_hbox, reset_xpm); + g_signal_connect(button, "clicked", + G_CALLBACK(emugtk_ResetEvent), + NULL); /* Creating the RUN button. */ - button = AddPixButton(button_hbox, run_xpm); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(emugtk_RunEvent), - NULL); + button = button_add_pix(button_hbox, run_xpm); + g_signal_connect(button, "clicked", + G_CALLBACK(emugtk_RunEvent), + NULL); /* Creating STOP button. */ - button = AddPixButton(button_hbox, stop_xpm); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(emugtk_StopEvent), - NULL); + button = button_add_pix(button_hbox, stop_xpm); + g_signal_connect(GTK_OBJECT(button), "clicked", + G_CALLBACK(emugtk_StopEvent), + NULL); /* Creating STEP button. */ - button = AddPixButton(button_hbox, step_xpm); - gtk_signal_connect(GTK_OBJECT(button), "clicked", - GTK_SIGNAL_FUNC(emugtk_StepEvent), - NULL); + button = button_add_pix(button_hbox, step_xpm); + g_signal_connect(GTK_OBJECT(button), "clicked", + G_CALLBACK(emugtk_StepEvent), + NULL); return button_hbox; } @@ -251,18 +253,18 @@ emugtk_window_init(void) GtkWidget *main_vbox; GtkWidget *menu_bar; GtkWidget *buttons_bar; - GtkWidget *emufixed; GtkWidget *fixed_frame; + GtkWidget *hbox; 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), + MAIN_WIN_WIDTH, MAIN_WIN_HEIGHT); gtk_container_set_border_width(GTK_CONTAINER(mainwin), 0); /* Window DESTROY event. */ - gtk_signal_connect(GTK_OBJECT(mainwin), "destroy", - GTK_SIGNAL_FUNC(WindowDestroyEvent), NULL); + g_signal_connect(mainwin, "destroy", + G_CALLBACK(WindowDestroyEvent), NULL); /* * Setting main window geometry based on command line options @@ -286,25 +288,24 @@ emugtk_window_init(void) /* Adding buttons bar to main_vbox */ gtk_box_pack_start(GTK_BOX(main_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); + /* hbox will contain registers and disassembly windows. */ + hbox = gtk_hbox_new(FALSE, 1); /* 8051 registers frame. */ fixed_frame = regwin_init(REG_WIN_WIDTH, REG_WIN_HEIGHT); - gtk_fixed_put(GTK_FIXED(emufixed), fixed_frame, 0, 0); + gtk_box_pack_start(GTK_BOX(hbox), fixed_frame, true, true, 1); /* 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); + gtk_box_pack_start(GTK_BOX(hbox), fixed_frame, true, true, 1); + + /* Adding hbox window to main_vbox */ + gtk_box_pack_start(GTK_BOX(main_vbox), hbox, true, true, 1); /* 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); - - /* Adding fixed window to main_vbox */ - gtk_box_pack_start(GTK_BOX(main_vbox), emufixed, FALSE, FALSE, 1); + /* Adding memory dump window to main_vbox */ + gtk_box_pack_start(GTK_BOX(main_vbox), fixed_frame, true, true, 1); /* Adding the main_vbox to the main window. */ gtk_container_add(GTK_CONTAINER(mainwin), main_vbox); @@ -324,6 +325,15 @@ emugtk_UpdateDisplay(void) memwin_DumpD("00"); } +void +AddMenuSeparator(GtkWidget *menu) +{ + GtkWidget *item; + + item = gtk_menu_item_new(); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); +} + void emugtk_new_file(char *file) { @@ -357,16 +367,9 @@ main(int argc, char **argv) gtk_main(); +#ifdef EMU8051_DEBUG printf("End of program.\n"); +#endif return EXIT_SUCCESS; } - -void -AddMenuSeparator(GtkWidget *menu) -{ - GtkWidget *item; - - item = gtk_menu_item_new(); - gtk_menu_append(GTK_MENU(menu), item); -}