X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Femugtk.c;h=656a07e249763b4e7ba6c3880aa68f39bbb54255;hb=7b400e8dd6a3f1a50247b74283c76e34f9e20ba1;hp=1a380f849076e04a0e6d810c77d9b6ed03856591;hpb=c9f73afe56fd33fd606be7ff5898d8588b2be0a4;p=emu8051.git diff --git a/src/emugtk.c b/src/emugtk.c index 1a380f8..656a07e 100644 --- a/src/emugtk.c +++ b/src/emugtk.c @@ -49,9 +49,11 @@ static int running; static int running_function_tag; -static GtkWidget *mainwin; + +GtkWidget *mainwin; extern struct app_config_t *cfg; +extern struct options_t options; /* Step out of running state */ static void @@ -240,8 +242,6 @@ AddMenu(void) 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; @@ -431,10 +431,7 @@ emugtk_new_file(char *file) int main(int argc, char **argv) { - char *hex_file; - - ParseCommandLineOptions(argc, argv); - + parse_command_line_options(argc, argv); app_config_load(); cpu8051_init(); @@ -445,10 +442,10 @@ main(int argc, char **argv) emugtk_window_init(); - hex_file = get_hex_filename(); - - if (hex_file != NULL) - emugtk_new_file(hex_file); + if (options.filename != NULL) + emugtk_new_file(options.filename); + else + emugtk_Reset(); gtk_main();