85fcabbd8f
--- /home/volker/bochs/bochs/bochs.h 2016-08-12 19:06:18.803209189 +0200 +++ ./bochs.h 2016-12-28 00:41:20.000627252 +0100 @@ -2,7 +2,7 @@ // $Id: bochs.h 12935 2016-08-12 17:06:14Z vruppert $ ///////////////////////////////////////////////////////////////////////// // -// Copyright (C) 2001-2015 The Bochs Project +// Copyright (C) 2001-2016 The Bochs Project // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -276,8 +276,9 @@ void error(const char *fmt, ...) BX_CPP_AttrPrintf(2, 3); void panic(const char *fmt, ...) BX_CPP_AttrPrintf(2, 3); void ldebug(const char *fmt, ...) BX_CPP_AttrPrintf(2, 3); - void fatal (const char *prefix, const char *fmt, va_list ap, int exit_status); - void ask (int level, const char *prefix, const char *fmt, va_list ap); + void fatal(const char *prefix, const char *fmt, va_list ap, int exit_status); + void warn(int level, const char *prefix, const char *fmt, va_list ap); + void ask(int level, const char *prefix, const char *fmt, va_list ap); void put(const char *p); void put(const char *n, const char *p); void setio(class iofunctions *); @@ -334,7 +335,8 @@ void set_log_action(int loglevel, int action); const char *getlevel(int i) const; const char *getaction(int i) const; - + int isaction(const char *val) const; + protected: int n_logfn; #define MAX_LOGFNS 512 diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/CHANGES ./CHANGES --- /home/volker/bochs/bochs/CHANGES 2016-12-26 10:45:44.000000000 +0100 +++ ./CHANGES 2016-12-28 15:54:25.127088081 +0100 @@ -1,5 +1,8 @@ Changes after 2.6.8 release: +- General + - Added new log action "warn", designed to show a message box on error events. + - Configure and compile - Added Android host platform support. diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/config.cc ./config.cc --- /home/volker/bochs/bochs/config.cc 2016-05-03 21:15:09.158016000 +0200 +++ ./config.cc 2016-12-27 19:53:10.461420368 +0100 @@ -2062,15 +2062,8 @@ actstr = strtok(NULL, ""); if (actstr != NULL) { def_action = !strcmp(module, "action"); - if (!strcmp(actstr, "fatal")) - action = ACT_FATAL; - else if (!strcmp (actstr, "report")) - action = ACT_REPORT; - else if (!strcmp (actstr, "ignore")) - action = ACT_IGNORE; - else if (!strcmp (actstr, "ask")) - action = ACT_ASK; - else { + action = SIM->is_action_name(actstr); + if (action < ACT_IGNORE) { PARSE_ERR(("%s: %s directive malformed.", context, params[0])); free(param); return -1; diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/gui/sdl2.cc ./gui/sdl2.cc --- /home/volker/bochs/bochs/gui/sdl2.cc 2016-08-12 19:06:18.811209142 +0200 +++ ./gui/sdl2.cc 2016-12-28 12:33:39.534288819 +0100 @@ -2,7 +2,7 @@ // $Id: sdl2.cc 12935 2016-08-12 17:06:14Z vruppert $ ///////////////////////////////////////////////////////////////////////// // -// Copyright (C) 2014-2015 The Bochs Project +// Copyright (C) 2014-2016 The Bochs Project // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -1478,20 +1478,16 @@ SDL_MessageBoxData msgboxdata; SDL_MessageBoxButtonData buttondata[4]; int level, retcode; -#if BX_DEBUGGER || BX_GDBSTUB - int defbtn = 3; -#else - int defbtn = 2; -#endif char message[512]; level = event->u.logmsg.level; - sprintf(message, "%s %s", event->u.logmsg.prefix, event->u.logmsg.msg); + sprintf(message, "Device: %s\nMessage: %s", event->u.logmsg.prefix, + event->u.logmsg.msg); msgboxdata.flags = SDL_MESSAGEBOX_ERROR; msgboxdata.window = window; msgboxdata.title = SIM->get_log_level_name(level); msgboxdata.message = message; - msgboxdata.numbuttons = defbtn + 1; + msgboxdata.numbuttons = 2; msgboxdata.buttons = buttondata; msgboxdata.colorScheme = NULL; buttondata[0].flags = 0; @@ -1500,14 +1496,18 @@ buttondata[1].flags = 0; buttondata[1].buttonid = BX_LOG_ASK_CHOICE_CONTINUE_ALWAYS; buttondata[1].text = "Alwayscont"; + if (event->u.logmsg.flag == BX_LOG_ASK_ASKDLG) { + msgboxdata.numbuttons = 3; + buttondata[2].flags = SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT; + buttondata[2].buttonid = BX_LOG_ASK_CHOICE_DIE; + buttondata[2].text = "Quit"; #if BX_DEBUGGER || BX_GDBSTUB - buttondata[2].flags = 0; - buttondata[2].buttonid = BX_LOG_ASK_CHOICE_ENTER_DEBUG; - buttondata[2].text = "Debugger"; -#endif - buttondata[defbtn].flags = SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT; - buttondata[defbtn].buttonid = BX_LOG_ASK_CHOICE_DIE; - buttondata[defbtn].text = "Quit"; + msgboxdata.numbuttons = 4; + buttondata[3].flags = 0; + buttondata[3].buttonid = BX_LOG_ASK_CHOICE_ENTER_DEBUG; + buttondata[3].text = "Debugger"; +#endif + } if (SDL_ShowMessageBox(&msgboxdata, &retcode) < 0) { return -1; } else { diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/gui/siminterface.cc ./gui/siminterface.cc --- /home/volker/bochs/bochs/gui/siminterface.cc 2016-12-05 19:56:56.729685000 +0100 +++ ./gui/siminterface.cc 2016-12-28 11:14:02.004075717 +0100 @@ -2,7 +2,7 @@ // $Id: siminterface.cc 12981 2016-12-05 18:56:56Z sshwarts $ ///////////////////////////////////////////////////////////////////////// // -// Copyright (C) 2002-2015 The Bochs Project +// Copyright (C) 2002-2016 The Bochs Project // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -100,6 +100,7 @@ virtual int get_log_action(int mod, int level); virtual void set_log_action(int mod, int level, int action); virtual const char *get_action_name(int action); + virtual int is_action_name(const char *val); virtual int get_default_log_action(int level) { return logfunctions::get_default_action(level); } @@ -123,6 +124,7 @@ virtual void set_notify_callback(bxevent_handler func, void *arg); virtual void get_notify_callback(bxevent_handler *func, void **arg); virtual BxEvent* sim_to_ci_event(BxEvent *event); + virtual int log_warn(const char *prefix, int level, const char *msg); virtual int log_ask(const char *prefix, int level, const char *msg); virtual void log_msg(const char *prefix, int level, const char *msg); virtual void set_log_viewer(bx_bool val) { bx_log_viewer = val; } @@ -420,6 +422,11 @@ return io->getaction(action); } +int bx_real_sim_c::is_action_name(const char *val) +{ + return io->isaction(val); +} + const char *bx_real_sim_c::get_log_level_name(int level) { return io->getlevel(level); @@ -575,6 +582,21 @@ } } +int bx_real_sim_c::log_warn(const char *prefix, int level, const char *msg) +{ + BxEvent be; + be.type = BX_SYNC_EVT_LOG_ASK; + be.u.logmsg.prefix = prefix; + be.u.logmsg.level = level; + be.u.logmsg.msg = msg; + be.u.logmsg.flag = BX_LOG_ASK_MSGBOX_WARN; + // default return value in case something goes wrong. + be.retcode = BX_LOG_NOTIFY_FAILED; + // calling notify + sim_to_ci_event(&be); + return be.retcode; +} + // returns 0 for continue, 1 for alwayscontinue, 2 for die. int bx_real_sim_c::log_ask(const char *prefix, int level, const char *msg) { @@ -583,6 +605,7 @@ be.u.logmsg.prefix = prefix; be.u.logmsg.level = level; be.u.logmsg.msg = msg; + be.u.logmsg.flag = BX_LOG_ASK_ASKDLG; // default return value in case something goes wrong. be.retcode = BX_LOG_NOTIFY_FAILED; // calling notify @@ -1157,16 +1180,10 @@ } else if (!strncmp(string, "PANIC=", 6)) { type = LOGLEV_PANIC; } - if (!strcmp(string+j, "ignore")) { - action = ACT_IGNORE; - } else if (!strcmp(string+j, "report")) { - action = ACT_REPORT; - } else if (!strcmp(string+j, "ask")) { - action = ACT_ASK; - } else if (!strcmp(string+j, "fatal")) { - action = ACT_FATAL; + action = is_action_name(string+j); + if (action >= ACT_IGNORE) { + set_log_action(dev, type, action); } - set_log_action(dev, type, action); } else { if (i == 1) { BX_ERROR(("restore_logopts(): log module '%s' not found", devname)); diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/gui/siminterface.h ./gui/siminterface.h --- /home/volker/bochs/bochs/gui/siminterface.h 2016-03-31 19:24:37.451025427 +0200 +++ ./gui/siminterface.h 2016-12-28 11:11:21.036683362 +0100 @@ -168,6 +168,7 @@ typedef enum { ACT_IGNORE = 0, ACT_REPORT, + ACT_WARN, ACT_ASK, ACT_FATAL, N_ACT @@ -178,11 +179,11 @@ // normally all action choices are available for all event types. The exclude // expression allows some choices to be eliminated if they don't make any // sense. For example, it would be stupid to ignore a panic. -#define BX_LOG_OPTS_EXCLUDE(type, choice) ( \ - /* can't die or ask, on debug or info events */ \ - (type <= LOGLEV_INFO && (choice == ACT_ASK || choice == ACT_FATAL)) \ - /* can't ignore panics */ \ - || (type == LOGLEV_PANIC && choice == ACT_IGNORE) \ +#define BX_LOG_OPTS_EXCLUDE(type, choice) ( \ + /* can't die, ask or warn, on debug or info events */ \ + (type <= LOGLEV_INFO && (choice >= ACT_WARN)) \ + /* can't ignore panics */ \ + || (type == LOGLEV_PANIC && choice == ACT_IGNORE) \ ) // floppy / cdrom media status @@ -392,6 +393,7 @@ // synchronizing threads, etc. for each. typedef struct { Bit8u level; + Bit8u flag; const char *prefix; const char *msg; } BxLogMsgEvent; @@ -419,6 +421,12 @@ BX_LOG_NOTIFY_FAILED }; +enum { + BX_LOG_ASK_ASKDLG, + BX_LOG_ASK_MSGBOX_WARN, + BX_LOG_ASK_MSGBOX_QUIT +}; + // Event type: BX_SYNC_EVT_GET_DBG_COMMAND // // This is a synchronous event sent from the simulator to the debugger @@ -675,6 +683,7 @@ virtual int get_default_log_action(int level) {return -1;} virtual void set_default_log_action(int level, int action) {} virtual const char *get_action_name(int action) {return NULL;} + virtual int is_action_name(const char *val) {return -1;} virtual const char *get_log_level_name(int level) {return NULL;} virtual int get_max_log_level() {return -1;} @@ -715,6 +724,9 @@ // send an event from the simulator to the CI. virtual BxEvent* sim_to_ci_event(BxEvent *event) {return NULL;} + // called from simulator when it hits errors, to warn the user + // before continuing simulation + virtual int log_warn(const char *prefix, int level, const char *msg) {return -1;} // called from simulator when it hits serious errors, to ask if the user // wants to continue or not virtual int log_ask(const char *prefix, int level, const char *msg) {return -1;} diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/gui/textconfig.cc ./gui/textconfig.cc --- /home/volker/bochs/bochs/gui/textconfig.cc 2016-12-05 20:15:59.112637000 +0100 +++ ./gui/textconfig.cc 2016-12-28 12:44:43.079411258 +0100 @@ -2,7 +2,7 @@ // $Id: textconfig.cc 12983 2016-12-05 19:15:59Z sshwarts $ ///////////////////////////////////////////////////////////////////////// // -// Copyright (C) 2002-2013 The Bochs Project +// Copyright (C) 2002-2016 The Bochs Project // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -552,8 +552,8 @@ } static const char *log_options_prompt1 = "Enter the ID of the device to edit, or -1 to return: [-1] "; -static const char *log_level_choices[] = { "ignore", "report", "ask", "fatal", "no change" }; -static int log_level_n_choices_normal = 4; +static const char *log_level_choices[N_ACT+1] = { "ignore", "report", "warn", "ask", "fatal", "no change" }; +static int log_level_n_choices_normal = N_ACT; void bx_log_options(int individual) { @@ -589,7 +589,7 @@ bx_print_log_action_table(); for (int level=0; level<SIM->get_max_log_level(); level++) { char prompt[1024]; - int action, default_action = 4; // default to no change + int action, default_action = N_ACT; // default to no change sprintf(prompt, "Enter action for %s event on all devices: [no change] ", SIM->get_log_level_name(level)); // do show the no change choice (choices=4) if (ask_menu(prompt, "", log_level_n_choices_normal+1, log_level_choices, default_action, &action)<0) @@ -718,47 +718,50 @@ event->retcode = event->u.param.param->text_ask(stdin, stderr); return event; case BX_SYNC_EVT_LOG_ASK: - { - int level = event->u.logmsg.level; - fprintf(stderr, "========================================================================\n"); - fprintf(stderr, "Event type: %s\n", SIM->get_log_level_name (level)); - fprintf(stderr, "Device: %s\n", event->u.logmsg.prefix); - fprintf(stderr, "Message: %s\n\n", event->u.logmsg.msg); - fprintf(stderr, "A %s has occurred. Do you want to:\n", SIM->get_log_level_name (level)); - fprintf(stderr, " cont - continue execution\n"); - fprintf(stderr, " alwayscont - continue execution, and don't ask again.\n"); - fprintf(stderr, " This affects only %s events from device %s\n", SIM->get_log_level_name (level), event->u.logmsg.prefix); - fprintf(stderr, " die - stop execution now\n"); - fprintf(stderr, " abort - dump core %s\n", - BX_HAVE_ABORT ? "" : "(Disabled)"); + if (event->u.logmsg.flag == BX_LOG_ASK_ASKDLG) { + int level = event->u.logmsg.level; + fprintf(stderr, "========================================================================\n"); + fprintf(stderr, "Event type: %s\n", SIM->get_log_level_name (level)); + fprintf(stderr, "Device: %s\n", event->u.logmsg.prefix); + fprintf(stderr, "Message: %s\n\n", event->u.logmsg.msg); + fprintf(stderr, "A %s has occurred. Do you want to:\n", SIM->get_log_level_name (level)); + fprintf(stderr, " cont - continue execution\n"); + fprintf(stderr, " alwayscont - continue execution, and don't ask again.\n"); + fprintf(stderr, " This affects only %s events from device %s\n", SIM->get_log_level_name (level), event->u.logmsg.prefix); + fprintf(stderr, " die - stop execution now\n"); + fprintf(stderr, " abort - dump core %s\n", + BX_HAVE_ABORT ? "" : "(Disabled)"); #if BX_DEBUGGER - fprintf(stderr, " debug - continue and return to bochs debugger\n"); + fprintf(stderr, " debug - continue and return to bochs debugger\n"); #endif #if BX_GDBSTUB - fprintf(stderr, " debug - hand control to gdb\n"); + fprintf(stderr, " debug - hand control to gdb\n"); #endif - int choice; + int choice; ask: - if (ask_menu("Choose one of the actions above: [%s] ", "", - log_action_n_choices, log_action_ask_choices, 2, &choice) < 0) - event->retcode = -1; - // return 0 for continue, 1 for alwayscontinue, 2 for die, 3 for debug. - if (!BX_HAVE_ABORT && choice==BX_LOG_ASK_CHOICE_DUMP_CORE) goto ask; - fflush(stdout); - fflush(stderr); - event->retcode = choice; - } - return event; - case BX_ASYNC_EVT_REFRESH: - case BX_ASYNC_EVT_DBG_MSG: - case BX_ASYNC_EVT_LOG_MSG: - // The text mode interface does not use these events, so just ignore - // them. - return event; - default: - fprintf(stderr, "textconfig: notify callback called with event type %04x\n", event->type); - return event; + if (ask_menu("Choose one of the actions above: [%s] ", "", + log_action_n_choices, log_action_ask_choices, 2, &choice) < 0) + event->retcode = -1; + // return 0 for continue, 1 for alwayscontinue, 2 for die, 3 for debug. + if (!BX_HAVE_ABORT && choice==BX_LOG_ASK_CHOICE_DUMP_CORE) goto ask; + fflush(stdout); + fflush(stderr); + event->retcode = choice; + } else { + // warning prompt not implemented + event->retcode = 0; + } + return event; + case BX_ASYNC_EVT_REFRESH: + case BX_ASYNC_EVT_DBG_MSG: + case BX_ASYNC_EVT_LOG_MSG: + // The text mode interface does not use these events, so just ignore + // them. + return event; + default: + fprintf(stderr, "textconfig: notify callback called with event type %04x\n", event->type); + return event; } assert(0); // switch statement should return } diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/gui/win32dialog.cc ./gui/win32dialog.cc --- /home/volker/bochs/bochs/gui/win32dialog.cc 2014-06-20 11:32:02.034026376 +0200 +++ ./gui/win32dialog.cc 2016-12-28 12:50:14.148888740 +0100 @@ -2,7 +2,7 @@ // $Id: win32dialog.cc 12381 2014-06-20 09:31:56Z vruppert $ ///////////////////////////////////////////////////////////////////////// // -// Copyright (C) 2003-2014 The Bochs Project +// Copyright (C) 2003-2016 The Bochs Project // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -27,7 +27,7 @@ #include "win32res.h" #include "win32paramdlg.h" -const char log_choices[5][16] = {"ignore", "log", "ask user", "end simulation", "no change"}; +const char log_choices[N_ACT+1][16] = {"ignore", "log", "warn user", "ask user", "end simulation", "no change"}; HWND GetBochsWindow() { @@ -97,12 +97,16 @@ SetWindowText(GetDlgItem(hDlg, IDASKMSG), event->u.logmsg.msg); SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_ADDSTRING, 0, (LPARAM)"Continue"); SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_ADDSTRING, 0, (LPARAM)"Continue and don't ask again"); - SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_ADDSTRING, 0, (LPARAM)"Kill simulation"); - SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_ADDSTRING, 0, (LPARAM)"Abort (dump core)"); + if (event->u.logmsg.flag == BX_LOG_ASK_ASKDLG) { + SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_ADDSTRING, 0, (LPARAM)"Kill simulation"); + SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_ADDSTRING, 0, (LPARAM)"Abort (dump core)"); #if BX_DEBUGGER - SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_ADDSTRING, 0, (LPARAM)"Continue and return to debugger"); + SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_ADDSTRING, 0, (LPARAM)"Continue and return to debugger"); #endif - SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_SETCURSEL, 2, 0); + SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_SETCURSEL, 2, 0); + } else { + SendMessage(GetDlgItem(hDlg, IDASKLIST), LB_SETCURSEL, 0, 0); + } SetFocus(GetDlgItem(hDlg, IDASKLIST)); return FALSE; case WM_CLOSE: diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/gui/wxdialog.cc ./gui/wxdialog.cc --- /home/volker/bochs/bochs/gui/wxdialog.cc 2015-01-07 17:17:40.447882000 +0100 +++ ./gui/wxdialog.cc 2016-12-27 20:30:44.997609007 +0100 @@ -2,7 +2,7 @@ // $Id: wxdialog.cc 12594 2015-01-07 16:17:40Z sshwarts $ ///////////////////////////////////////////////////////////////// // -// Copyright (C) 2002-2014 The Bochs Project +// Copyright (C) 2002-2016 The Bochs Project // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -208,7 +208,6 @@ : wxDialog(parent, id, wxT(""), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { - //static int integers[LOG_OPTS_N_CHOICES_NORMAL] = {0, 1, 2, 3}; static wxString names[] = ADVLOG_OPTS_TYPE_NAMES; SetTitle(ADVLOG_OPTS_TITLE); vertSizer = new wxBoxSizer(wxVERTICAL); @@ -1563,7 +1562,7 @@ bool includeNoChange) { static wxString choices[] = LOG_OPTS_CHOICES; - static int integers[LOG_OPTS_N_CHOICES] = {0, 1, 2, 3, 4}; + static int integers[LOG_OPTS_N_CHOICES] = {0, 1, 2, 3, 4, 5}; wxChoice *control = new wxChoice(parent, id, wxDefaultPosition, wxDefaultSize); int lastChoice = 0; // remember index of last choice int nchoice = includeNoChange? LOG_OPTS_N_CHOICES : LOG_OPTS_N_CHOICES_NORMAL; diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/gui/wxdialog.h ./gui/wxdialog.h --- /home/volker/bochs/bochs/gui/wxdialog.h 2014-12-23 20:30:12.896090221 +0100 +++ ./gui/wxdialog.h 2016-12-27 20:34:28.518389938 +0100 @@ -2,7 +2,7 @@ // $Id: wxdialog.h 12576 2014-12-23 19:30:03Z vruppert $ //////////////////////////////////////////////////////////////////// // -// Copyright (C) 2002-2014 The Bochs Project +// Copyright (C) 2002-2016 The Bochs Project // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -354,10 +354,10 @@ #define LOG_OPTS_PROMPT wxT("How should Bochs respond to each type of event?") #define LOG_OPTS_TYPE_NAMES { wxT("Debug events"), wxT("Info events"), wxT("Error events"), wxT("Panic events") } #define LOG_OPTS_N_TYPES 4 -#define LOG_OPTS_CHOICES { wxT("ignore"), wxT("log"), wxT("ask user"), wxT("end simulation"), wxT("no change") } -#define LOG_OPTS_N_CHOICES_NORMAL 4 -#define LOG_OPTS_N_CHOICES 5 // number of choices, including "no change" -#define LOG_OPTS_NO_CHANGE 4 // index of "no change" +#define LOG_OPTS_CHOICES { wxT("ignore"), wxT("log"), wxT("warn user"), wxT("ask user"), wxT("end simulation"), wxT("no change") } +#define LOG_OPTS_N_CHOICES_NORMAL 5 +#define LOG_OPTS_N_CHOICES 6 // number of choices, including "no change" +#define LOG_OPTS_NO_CHANGE 5 // index of "no change" #define LOG_OPTS_ADV wxT("For additional control over how each device responds to events, use the menu option \"Log ... By Device\".") wxFlexGridSizer *gridSizer; wxChoice *action[LOG_OPTS_N_TYPES]; diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/gui/wxmain.cc ./gui/wxmain.cc --- /home/volker/bochs/bochs/gui/wxmain.cc 2016-12-26 17:12:57.470174541 +0100 +++ ./gui/wxmain.cc 2016-12-28 12:15:26.035961463 +0100 @@ -2,7 +2,7 @@ // $Id: wxmain.cc 13006 2016-12-26 16:12:54Z vruppert $ ///////////////////////////////////////////////////////////////// // -// Copyright (C) 2002-2014 The Bochs Project +// Copyright (C) 2002-2016 The Bochs Project // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -1158,6 +1158,10 @@ #if !BX_DEBUGGER && !BX_GDBSTUB dlg.EnableButton(dlg.DEBUG, FALSE); #endif + if (be->u.logmsg.flag != BX_LOG_ASK_ASKDLG) { + dlg.EnableButton(dlg.DIE, FALSE); + dlg.EnableButton(dlg.DUMP, FALSE); + } dlg.SetContext(wxString(be->u.logmsg.prefix, wxConvUTF8)); dlg.SetMessage(wxString(be->u.logmsg.msg, wxConvUTF8)); int n = dlg.ShowModal(); diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/gui/x.cc ./gui/x.cc --- /home/volker/bochs/bochs/gui/x.cc 2016-12-27 17:26:59.622665119 +0100 +++ ./gui/x.cc 2016-12-28 12:03:10.963351647 +0100 @@ -2687,11 +2687,7 @@ } else { size_x = 30 + maxlen * 6; } - if (lines < 3) { - size_y = 90; - } else { - size_y = 60 + lines * 15; - } + size_y = 70 + lines * 15; x11_dialog_c *xdlg = new x11_dialog_c(name, size_x, size_y, (mode == XDLG_SIMPLE) ? 1 : 2); ypos = 34; @@ -2729,11 +2725,21 @@ bx_param_string_c *sparam; bx_param_enum_c *eparam; bx_list_c *list; + char message[256]; switch (event->type) { case BX_SYNC_EVT_LOG_ASK: - event->retcode = x11_ask_dialog(event); + if (event->u.logmsg.flag == BX_LOG_ASK_ASKDLG) { + event->retcode = x11_ask_dialog(event); + } else if (event->u.logmsg.flag == BX_LOG_ASK_MSGBOX_WARN) { + const char *title = SIM->get_log_level_name(event->u.logmsg.level); + sprintf(message, "Device: %s\n\nMessage: %s", event->u.logmsg.prefix, + event->u.logmsg.msg); + bx_param_bool_c bparam(NULL, "warn", title, message, 1); + x11_message_box(&bparam, XDLG_SIMPLE); + event->retcode = 0; + } return event; case BX_SYNC_EVT_ASK_PARAM: param = event->u.param.param; diff -urNX /home/volker/exclude-bochs /home/volker/bochs/bochs/logio.cc ./logio.cc --- /home/volker/bochs/bochs/logio.cc 2015-05-10 08:55:18.678940963 +0200 +++ ./logio.cc 2016-12-28 00:40:40.395736643 +0100 @@ -2,7 +2,7 @@ // $Id: logio.cc 12759 2015-05-10 06:55:16Z vruppert $ ///////////////////////////////////////////////////////////////////////// // -// Copyright (C) 2001-2014 The Bochs Project +// Copyright (C) 2001-2016 The Bochs Project // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -50,11 +50,25 @@ else return "?"; } +static const char *act_name[N_ACT] = { "ignore", "report", "warn", "ask", "fatal" }; + const char* iofunctions::getaction(int i) const { - static const char *name[] = { "ignore", "report", "ask", "fatal" }; assert (i>=ACT_IGNORE && i<N_ACT); - return name[i]; + return act_name[i]; +} + +int iofunctions::isaction(const char *val) const +{ + int action = -1; + + for (int i = 0; i < N_ACT; i++) { + if (!strcmp(val, act_name[i])) { + action = ACT_IGNORE + i; + break; + } + } + return action; } void iofunctions::flush(void) @@ -414,6 +428,11 @@ logio->out(LOGLEV_ERROR, prefix, fmt, ap); va_end(ap); + if (onoff[LOGLEV_ERROR] == ACT_WARN) { + va_start(ap, fmt); + warn(LOGLEV_ERROR, prefix, fmt, ap); + va_end(ap); + } if (onoff[LOGLEV_ERROR] == ACT_ASK) { va_start(ap, fmt); ask(LOGLEV_ERROR, prefix, fmt, ap); @@ -438,6 +457,11 @@ logio->out(LOGLEV_PANIC, prefix, fmt, ap); va_end(ap); + if (onoff[LOGLEV_PANIC] == ACT_WARN) { + va_start(ap, fmt); + warn(LOGLEV_PANIC, prefix, fmt, ap); + va_end(ap); + } if (onoff[LOGLEV_PANIC] == ACT_ASK) { va_start(ap, fmt); ask(LOGLEV_PANIC, prefix, fmt, ap); @@ -465,6 +489,36 @@ // the actions ask() and fatal() are not supported here } +void logfunctions::warn(int level, const char *prefix, const char *fmt, va_list ap) +{ + // Guard against reentry on warn() function. The danger is that some + // function that's called within warn() could trigger another + // BX_ERROR that could call warn() again, leading to infinite + // recursion and infinite asks. + static char in_warn_already = 0; + char buf1[1024]; + if (in_warn_already) { + fprintf(stderr, "logfunctions::warn() should not reenter!!\n"); + return; + } + in_warn_already = 1; + vsnprintf(buf1, sizeof(buf1), fmt, ap); + // FIXME: facility set to 0 because it's unknown. + + // update vga screen. This is useful because sometimes useful messages + // are printed on the screen just before a panic. It's also potentially + // dangerous if this function calls ask again... That's why I added + // the reentry check above. + SIM->refresh_vga(); + + // ensure the text screen is showing + SIM->set_display_mode(DISP_MODE_CONFIG); + SIM->log_warn(prefix, level, buf1); + // return to simulation mode + SIM->set_display_mode(DISP_MODE_SIM); + in_warn_already = 0; +} + void logfunctions::ask(int level, const char *prefix, const char *fmt, va_list ap) { // Guard against reentry on ask() function. The danger is that some
1584 lines
53 KiB
C++
1584 lines
53 KiB
C++
/////////////////////////////////////////////////////////////////
|
|
// $Id$
|
|
/////////////////////////////////////////////////////////////////
|
|
//
|
|
// Copyright (C) 2002-2016 The Bochs Project
|
|
//
|
|
// This library is free software; you can redistribute it and/or
|
|
// modify it under the terms of the GNU Lesser General Public
|
|
// License as published by the Free Software Foundation; either
|
|
// version 2 of the License, or (at your option) any later version.
|
|
//
|
|
// This library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
// Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public
|
|
// License along with this library; if not, write to the Free Software
|
|
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
//
|
|
/////////////////////////////////////////////////////////////////
|
|
|
|
// Define BX_PLUGGABLE in files that can be compiled into plugins. For
|
|
// platforms that require a special tag on exported symbols, BX_PLUGGABLE
|
|
// is used to know when we are exporting symbols and when we are importing.
|
|
#define BX_PLUGGABLE
|
|
|
|
#include "config.h" // definitions based on configure script
|
|
#include "param_names.h"
|
|
|
|
#if BX_WITH_WX
|
|
|
|
// For compilers that support precompilation, includes <wx/wx.h>.
|
|
#include <wx/wxprec.h>
|
|
#ifdef __BORLANDC__
|
|
#pragma hdrstop
|
|
#endif
|
|
#ifndef WX_PRECOMP
|
|
#include <wx/wx.h>
|
|
#endif
|
|
#include <wx/spinctrl.h>
|
|
#include <wx/config.h>
|
|
#include <wx/confbase.h>
|
|
#include <wx/notebook.h>
|
|
|
|
#include "osdep.h" // workarounds for missing stuff
|
|
#include "gui/siminterface.h" // interface to the simulator
|
|
#include "bxversion.h" // get version string
|
|
#include "wxdialog.h" // custom dialog boxes
|
|
#include "wxmain.h" // wxwidgets shared stuff
|
|
|
|
//////////////////////////////////////////////////////////////////////
|
|
// constants, prototypes
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
enum {
|
|
ID_ShowDialog_1 = 1,
|
|
ID_ShowDialog_2,
|
|
ID_ShowDialog_3,
|
|
ID_Button1,
|
|
ID_Button2,
|
|
ID_MY_LAST_ID
|
|
};
|
|
|
|
wxSize longTextSize (300, -1); // width=300, height=default
|
|
wxSize normalTextSize (180, -1); // width=200, height=default
|
|
|
|
//////////////////////////////////////////////////////////////////////
|
|
// LogMsgAskDialog implementation
|
|
//////////////////////////////////////////////////////////////////////
|
|
// Structure:
|
|
// vertSizer:
|
|
// context text field,
|
|
// message text field
|
|
// don't-ask checkbox
|
|
// buttonSizer:
|
|
// continue button
|
|
// die button
|
|
// dumpcore button
|
|
// debugger button
|
|
// help button
|
|
//
|
|
|
|
// all events go to OnEvent method
|
|
BEGIN_EVENT_TABLE(LogMsgAskDialog, wxDialog)
|
|
EVT_BUTTON(ID_Continue, LogMsgAskDialog::OnEvent)
|
|
EVT_BUTTON(ID_Die, LogMsgAskDialog::OnEvent)
|
|
EVT_BUTTON(ID_DumpCore, LogMsgAskDialog::OnEvent)
|
|
EVT_BUTTON(ID_Debugger, LogMsgAskDialog::OnEvent)
|
|
EVT_BUTTON(wxID_HELP, LogMsgAskDialog::OnEvent)
|
|
END_EVENT_TABLE()
|
|
|
|
|
|
LogMsgAskDialog::LogMsgAskDialog(
|
|
wxWindow* parent,
|
|
wxWindowID id,
|
|
const wxString& title)
|
|
: wxDialog (parent, id, title, wxDefaultPosition, wxDefaultSize,
|
|
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
|
|
{
|
|
for (int i=0; i<N_BUTTONS; i++) enabled[i] = TRUE;
|
|
vertSizer = new wxBoxSizer(wxVERTICAL);
|
|
context = new wxStaticText (this, -1, wxT(""));
|
|
wxFont font = context->GetFont ();
|
|
font.SetWeight (wxBOLD);
|
|
font.SetPointSize (2 + font.GetPointSize ());
|
|
context->SetFont (font);
|
|
message = new wxStaticText (this, -1, wxT(""));
|
|
message->SetFont (font);
|
|
dontAsk = new wxCheckBox (this, -1, LOG_MSG_DONT_ASK_STRING);
|
|
btnSizer = new wxBoxSizer(wxHORIZONTAL);
|
|
// fill vertical sizer
|
|
vertSizer->Add (context, 0, wxGROW|wxALIGN_LEFT|wxLEFT|wxTOP, 30);
|
|
vertSizer->Add (message, 0, wxGROW|wxALIGN_LEFT|wxLEFT, 30);
|
|
vertSizer->Add (dontAsk, 0, wxALIGN_CENTER|wxTOP, 30);
|
|
vertSizer->Add (btnSizer, 0, wxALIGN_CENTER|wxTOP, 30);
|
|
// Some object creation and layout is postponed until Init()
|
|
// so that caller has time to configure the dialog.
|
|
}
|
|
|
|
void LogMsgAskDialog::SetContext(wxString s)
|
|
{
|
|
ChangeStaticText(vertSizer, context, wxString(LOG_MSG_CONTEXT) + s);
|
|
}
|
|
|
|
void LogMsgAskDialog::SetMessage(wxString s)
|
|
{
|
|
ChangeStaticText(vertSizer, message, wxString(LOG_MSG_MSG) + s);
|
|
}
|
|
|
|
void LogMsgAskDialog::Init()
|
|
{
|
|
static const int ids[N_BUTTONS] = LOG_MSG_ASK_IDS;
|
|
static const wxString names[N_BUTTONS] = LOG_MSG_ASK_NAMES;
|
|
for (int i=0; i<N_BUTTONS; i++) {
|
|
if (!enabled[i]) continue;
|
|
wxButton *btn = new wxButton(this, ids[i], names[i]);
|
|
btnSizer->Add(btn, 1, wxALL, 5);
|
|
}
|
|
SetAutoLayout(TRUE);
|
|
SetSizer(vertSizer);
|
|
vertSizer->Fit(this);
|
|
wxSize size = vertSizer->GetMinSize();
|
|
int margin = 10;
|
|
SetSizeHints (size.GetWidth () + margin, size.GetHeight () + margin);
|
|
Center ();
|
|
}
|
|
|
|
// Event handler for dialog buttons. Just translate the wx ids into
|
|
// enum values and return them with EndModal() to make the dialog
|
|
// go away.
|
|
void LogMsgAskDialog::OnEvent(wxCommandEvent& event)
|
|
{
|
|
int id = event.GetId();
|
|
int ret = -1;
|
|
switch (id) {
|
|
case ID_Continue: ret = BX_LOG_ASK_CHOICE_CONTINUE; break;
|
|
case ID_Die: ret = BX_LOG_ASK_CHOICE_DIE; break;
|
|
case ID_DumpCore: ret = BX_LOG_ASK_CHOICE_DUMP_CORE; break;
|
|
case ID_Debugger: ret = BX_LOG_ASK_CHOICE_ENTER_DEBUG; break;
|
|
case wxID_HELP: ShowHelp(); return;
|
|
default:
|
|
return; // without EndModal
|
|
}
|
|
EndModal(ret);
|
|
}
|
|
|
|
void LogMsgAskDialog::ShowHelp()
|
|
{
|
|
wxMessageBox(MSG_NO_HELP, MSG_NO_HELP_CAPTION, wxOK | wxICON_ERROR, this);
|
|
}
|
|
|
|
//////////////////////////////////////////////////////////////////////
|
|
// AdvancedLogOptionsDialog implementation
|
|
//////////////////////////////////////////////////////////////////////
|
|
// Structure:
|
|
// vertSizer:
|
|
// logfileSizer
|
|
// prompt
|
|
// logfile
|
|
// browse button
|
|
// prompt (multiline)
|
|
// applyDefault button
|
|
// scrollWin
|
|
// scrollpanel
|
|
// gridSizer 5 columns
|
|
// device
|
|
// debug
|
|
// info
|
|
// error
|
|
// panic
|
|
// etc.
|
|
// buttonSizer:
|
|
// help
|
|
// cancel
|
|
// ok
|
|
|
|
// all events go to OnEvent method
|
|
BEGIN_EVENT_TABLE(AdvancedLogOptionsDialog, wxDialog)
|
|
EVT_BUTTON(-1, AdvancedLogOptionsDialog::OnEvent)
|
|
EVT_CHECKBOX(-1, AdvancedLogOptionsDialog::OnEvent)
|
|
EVT_TEXT(-1, AdvancedLogOptionsDialog::OnEvent)
|
|
END_EVENT_TABLE()
|
|
|
|
AdvancedLogOptionsDialog::AdvancedLogOptionsDialog(
|
|
wxWindow* parent,
|
|
wxWindowID id)
|
|
: wxDialog(parent, id, wxT(""), wxDefaultPosition, wxDefaultSize,
|
|
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
|
|
{
|
|
static wxString names[] = ADVLOG_OPTS_TYPE_NAMES;
|
|
SetTitle(ADVLOG_OPTS_TITLE);
|
|
vertSizer = new wxBoxSizer(wxVERTICAL);
|
|
// top level objects
|
|
logfileSizer = new wxBoxSizer(wxHORIZONTAL);
|
|
vertSizer->Add(logfileSizer, 0, wxTOP|wxLEFT, 20);
|
|
wxStaticText *text = new wxStaticText(this, -1, ADVLOG_OPTS_PROMPT);
|
|
vertSizer->Add(text, 0, wxALL, 10);
|
|
applyDefault = new wxButton(this, ID_ApplyDefault, ADVLOG_DEFAULTS);
|
|
vertSizer->Add(applyDefault, 0, wxALL|wxALIGN_RIGHT, 10);
|
|
headerSizer = new wxGridSizer(ADVLOG_OPTS_N_TYPES + 1);
|
|
vertSizer->Add(headerSizer, 0, wxALL|wxGROW, 10);
|
|
scrollWin = new wxScrolledWindow(this, -1);
|
|
vertSizer->Add(scrollWin, 1, wxALL|wxGROW, 10);
|
|
buttonSizer = new wxBoxSizer(wxHORIZONTAL);
|
|
vertSizer->Add(buttonSizer, 0, wxALIGN_RIGHT);
|
|
|
|
// logfileSizer contents
|
|
text = new wxStaticText(this, -1, ADVLOG_OPTS_LOGFILE);
|
|
logfileSizer->Add(text, 0, wxALL | wxALIGN_CENTER_VERTICAL, 5);
|
|
logfile = new wxTextCtrl(this, -1, wxT(""), wxDefaultPosition, longTextSize);
|
|
logfileSizer->Add(logfile, 0, wxALL | wxALIGN_CENTER_VERTICAL);
|
|
wxButton *btn = new wxButton(this, ID_Browse, BTNLABEL_BROWSE);
|
|
logfileSizer->Add(btn, 0, wxALL, 5);
|
|
if (runtime) {
|
|
text->Enable(false);
|
|
logfile->Enable(false);
|
|
btn->Enable(false);
|
|
}
|
|
|
|
// to get the scrollWin geometry right, first build everything on a wxPanel,
|
|
// with gridSizer as the main sizer.
|
|
scrollPanel = new wxPanel(scrollWin, -1);
|
|
gridSizer = new wxGridSizer(ADVLOG_OPTS_N_TYPES + 1);
|
|
// add title row
|
|
int typemax = ADVLOG_OPTS_N_TYPES;
|
|
text = new wxStaticText(this, -1, wxT("Device"));
|
|
headerSizer->Add(text, 0, wxALIGN_LEFT);
|
|
int type;
|
|
for (type=0; type < typemax; type++) {
|
|
text = new wxStaticText(this, -1, names[type]);
|
|
headerSizer->Add(text, 0, wxALIGN_LEFT);
|
|
}
|
|
// add rows of choice boxes, one for each device
|
|
int devmax = SIM->get_n_log_modules();
|
|
action = new wxChoice** [devmax]; // array of pointers
|
|
for (int dev=0; dev<devmax; dev++) {
|
|
if (strcmp(SIM->get_logfn_name(dev), "?")) {
|
|
action[dev] = new wxChoice* [ADVLOG_OPTS_N_TYPES];
|
|
// name of device in first column
|
|
gridSizer->Add(new wxStaticText(scrollPanel, -1, wxString(SIM->get_logfn_name(dev), wxConvUTF8)),
|
|
0, wxALL | wxALIGN_CENTER_VERTICAL);
|
|
// wxChoice in every other column
|
|
for (type=0; type < typemax; type++) {
|
|
action[dev][type] = makeLogOptionChoiceBox(scrollPanel, -1, type);
|
|
gridSizer->Add(action[dev][type], 1, wxALL|wxGROW|wxADJUST_MINSIZE, 2);
|
|
}
|
|
} else {
|
|
action[dev] = NULL;
|
|
}
|
|
}
|
|
headerSizer->Fit(this);
|
|
headerSizer->SetSizeHints(this);
|
|
scrollPanel->SetAutoLayout(TRUE);
|
|
scrollPanel->SetSizer(gridSizer);
|
|
gridSizer->Fit(scrollPanel);
|
|
gridSizer->SetSizeHints(scrollPanel);
|
|
wxSize size = scrollPanel->GetBestSize();
|
|
// now we know how big the panel wants to be, and we can set the scrollbar
|
|
// and scrollWin size accordingly
|
|
|
|
// finally set up the scroll window outside
|
|
scrollWin->SetScrollbars(1, 1, size.GetWidth(), size.GetHeight());
|
|
|
|
// now that we know the desired width of the panel, use it to set the
|
|
// width of the scrollWin. I tried several things before arriving at
|
|
// a solution, and I'll list them for educational purposes.
|
|
//
|
|
// failure #1: this had no effect at all. sizer took precedence.
|
|
// scrollWin->SetSize(500, 500);
|
|
// failure #2: this changed scrollWin size but sizer was not notified so
|
|
// the overall window didn't expand to make space for it.
|
|
// scrollWin->SetSizeHints(500, 500);
|
|
// success: tell the sizer to change the scrollWin's size, and it works
|
|
vertSizer->SetItemMinSize(scrollWin, size.GetWidth()+30, 400);
|
|
|
|
// buttonSizer contents
|
|
btn = new wxButton(this, wxID_HELP, BTNLABEL_HELP);
|
|
buttonSizer->Add(btn, 0, wxALL, 5);
|
|
// use wxID_CANCEL because pressing ESC produces this same code
|
|
btn = new wxButton(this, wxID_CANCEL, BTNLABEL_CANCEL);
|
|
buttonSizer->Add(btn, 0, wxALL, 5);
|
|
btn = new wxButton(this, wxID_OK, BTNLABEL_OK);
|
|
buttonSizer->Add(btn, 0, wxALL, 5);
|
|
|
|
runtime = 0;
|
|
}
|
|
|
|
AdvancedLogOptionsDialog::~AdvancedLogOptionsDialog()
|
|
{
|
|
int dev, ndev = SIM->get_n_log_modules();
|
|
for (dev=0; dev<ndev; dev++) {
|
|
delete [] action[dev];
|
|
}
|
|
delete [] action;
|
|
}
|
|
|
|
void AdvancedLogOptionsDialog::Init()
|
|
{
|
|
CopyParamToGui();
|
|
// lay it out!
|
|
SetAutoLayout(TRUE);
|
|
SetSizer(vertSizer);
|
|
vertSizer->Fit(this);
|
|
wxSize size = vertSizer->GetMinSize();
|
|
int margin = 5;
|
|
SetSizeHints(size.GetWidth() + margin, size.GetHeight() + margin);
|
|
Center();
|
|
}
|
|
|
|
void AdvancedLogOptionsDialog::CopyParamToGui()
|
|
{
|
|
bx_param_string_c *logfile = SIM->get_param_string(BXPN_LOG_FILENAME);
|
|
SetLogfile(wxString(logfile->getptr(), wxConvUTF8));
|
|
// copy log action settings from siminterface to gui
|
|
int dev, ndev = SIM->get_n_log_modules();
|
|
int type, ntype = SIM->get_max_log_level();
|
|
for (dev=0; dev<ndev; dev++) {
|
|
for (type=0; type<ntype; type++) {
|
|
SetAction(dev, type, SIM->get_log_action(dev, type));
|
|
}
|
|
}
|
|
}
|
|
|
|
void AdvancedLogOptionsDialog::CopyGuiToParam()
|
|
{
|
|
char buf[1024];
|
|
safeWxStrcpy(buf, GetLogfile(), sizeof(buf));
|
|
bx_param_string_c *logfile = SIM->get_param_string(BXPN_LOG_FILENAME);
|
|
logfile->set(buf);
|
|
// copy log action settings from gui to siminterface
|
|
int dev, ndev = SIM->get_n_log_modules();
|
|
int type, ntype = SIM->get_max_log_level();
|
|
for (dev=0; dev<ndev; dev++) {
|
|
for (type=0; type<ntype; type++) {
|
|
SIM->set_log_action(dev, type, GetAction(dev, type));
|
|
}
|
|
}
|
|
}
|
|
|
|
void AdvancedLogOptionsDialog::SetAction(int dev, int evtype, int act)
|
|
{
|
|
if (action[dev] == NULL) return;
|
|
// find the choice whose client data matches "act".
|
|
int *ptr;
|
|
// wxLogDebug(wxT("SetAction dev=%d type=%d act=%d"), dev, evtype, act);
|
|
wxChoice *control = action[dev][evtype];
|
|
for (int i=0; i < (int)control->GetCount(); i++) {
|
|
// wxLogDebug(wxT("reading action[%d][%d]->GetClientData(%d)"), dev, evtype, i);
|
|
ptr = (int*) control->GetClientData(i);
|
|
if (ptr == NULL) continue;
|
|
if (act == *ptr) { // found it!
|
|
control->SetSelection(i);
|
|
return;
|
|
}
|
|
}
|
|
// this can happen if one of the choices that is excluded by
|
|
// BX_LOG_OPTS_EXCLUDE() is used, for example.
|
|
wxLogDebug(wxT("warning: SetAction type=%d act=%d not found"), evtype, act);
|
|
}
|
|
|
|
int AdvancedLogOptionsDialog::GetAction(int dev, int evtype)
|
|
{
|
|
if (action[dev] == NULL) return LOG_OPTS_NO_CHANGE;
|
|
int sel = action[dev][evtype]->GetSelection();
|
|
int *ptrToChoice = (int*)action[dev][evtype]->GetClientData(sel);
|
|
wxASSERT(ptrToChoice != NULL);
|
|
return *ptrToChoice;
|
|
}
|
|
|
|
void AdvancedLogOptionsDialog::OnEvent(wxCommandEvent& event)
|
|
{
|
|
int id = event.GetId();
|
|
switch (id) {
|
|
case ID_Browse:
|
|
BrowseTextCtrl(logfile);
|
|
break;
|
|
case ID_ApplyDefault: {
|
|
int lev, nlev = SIM->get_max_log_level();
|
|
// copy default settings to every device
|
|
for (lev=0; lev<nlev; lev++) {
|
|
int action = SIM->get_default_log_action(lev);
|
|
int dev, ndev = SIM->get_n_log_modules();
|
|
for (dev=0; dev<ndev; dev++)
|
|
SetAction(dev, lev, action);
|
|
}
|
|
break;
|
|
}
|
|
case wxID_OK:
|
|
CopyGuiToParam();
|
|
EndModal(wxID_OK);
|
|
break;
|
|
case wxID_CANCEL:
|
|
EndModal(wxID_CANCEL);
|
|
break;
|
|
case wxID_HELP:
|
|
ShowHelp();
|
|
break;
|
|
default:
|
|
event.Skip();
|
|
}
|
|
}
|
|
|
|
void AdvancedLogOptionsDialog::ShowHelp()
|
|
{
|
|
wxMessageBox(MSG_NO_HELP, MSG_NO_HELP_CAPTION, wxOK | wxICON_ERROR, this);
|
|
}
|
|
|
|
//////////////////////////////////////////////////////////////////////
|
|
// PluginControlDialog implementation
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
// all events go to OnEvent method
|
|
BEGIN_EVENT_TABLE(PluginControlDialog, wxDialog)
|
|
EVT_BUTTON(-1, PluginControlDialog::OnEvent)
|
|
EVT_CHECKBOX(-1, PluginControlDialog::OnEvent)
|
|
EVT_TEXT(-1, PluginControlDialog::OnEvent)
|
|
EVT_LISTBOX(-1, PluginControlDialog::OnEvent)
|
|
END_EVENT_TABLE()
|
|
|
|
PluginControlDialog::PluginControlDialog(
|
|
wxWindow* parent,
|
|
wxWindowID id)
|
|
: wxDialog(parent, id, wxT(""), wxDefaultPosition, wxDefaultSize,
|
|
wxDEFAULT_DIALOG_STYLE)
|
|
{
|
|
SetTitle(wxT("Optional Plugin Control"));
|
|
vertSizer = new wxBoxSizer(wxVERTICAL);
|
|
horzSizer = new wxBoxSizer(wxHORIZONTAL);
|
|
listSizer = new wxBoxSizer(wxVERTICAL);
|
|
editSizer = new wxBoxSizer(wxVERTICAL);
|
|
buttonSizer = new wxBoxSizer(wxHORIZONTAL);
|
|
horzSizer->Add(listSizer, 0, wxALIGN_LEFT);
|
|
horzSizer->Add(editSizer, 0, wxALIGN_RIGHT);
|
|
vertSizer->Add(horzSizer, 0, wxALIGN_LEFT);
|
|
vertSizer->Add(buttonSizer, 0, wxALIGN_CENTER);
|
|
// listSizer contents
|
|
pluglist = new wxListBox(this, ID_PluginList);
|
|
listSizer->Add(pluglist, 0, wxALL, 10);
|
|
// editSizer contents
|
|
plugname = new wxTextCtrl(this, ID_PluginName, wxT(""), wxDefaultPosition, wxSize(120, -1));
|
|
editSizer->Add(plugname, 0, wxALL, 10);
|
|
btn_load = new wxButton(this, ID_Load, wxT("Load"));
|
|
editSizer->Add(btn_load, 0, wxALL | wxALIGN_RIGHT, 5);
|
|
btn_unload = new wxButton(this, ID_Unload, wxT("Unload"));
|
|
editSizer->Add(btn_unload, 0, wxALL | wxALIGN_RIGHT, 5);
|
|
// buttonSizer contents
|
|
wxButton *btn = new wxButton(this, wxID_HELP, BTNLABEL_HELP);
|
|
buttonSizer->Add(btn, 0, wxALL, 5);
|
|
btn = new wxButton(this, wxID_OK, BTNLABEL_OK);
|
|
buttonSizer->Add(btn, 0, wxALL, 5);
|
|
// make sure all plugins are loaded and add them to the listbox
|
|
SIM->opt_plugin_ctrl("*", 1);
|
|
bx_list_c *plugin_ctrl = (bx_list_c*) SIM->get_param(BXPN_PLUGIN_CTRL);
|
|
for (int i = 0; i < plugin_ctrl->get_size(); i++) {
|
|
bx_param_bool_c *plugin = (bx_param_bool_c*)plugin_ctrl->get(i);
|
|
pluglist->Insert(wxString(plugin->get_name(), wxConvUTF8), i);
|
|
}
|
|
btn_load->Enable(0);
|
|
btn_unload->Enable(0);
|
|
}
|
|
|
|
void PluginControlDialog::Init()
|
|
{
|
|
SetSizer(vertSizer);
|
|
vertSizer->Fit(this);
|
|
wxSize size = vertSizer->GetMinSize();
|
|
int margin = 5;
|
|
SetSizeHints(size.GetWidth() + margin, size.GetHeight() + margin);
|
|
Center();
|
|
}
|
|
|
|
void PluginControlDialog::OnEvent(wxCommandEvent& event)
|
|
{
|
|
char buf[1024];
|
|
|
|
int id = event.GetId();
|
|
switch (id) {
|
|
case ID_PluginList:
|
|
if (event.GetEventType() == wxEVT_COMMAND_LISTBOX_SELECTED) {
|
|
btn_unload->Enable(1);
|
|
}
|
|
break;
|
|
case ID_PluginName:
|
|
if (event.GetEventType() == wxEVT_COMMAND_TEXT_UPDATED) {
|
|
btn_load->Enable(!plugname->IsEmpty());
|
|
}
|
|
break;
|
|
case ID_Load:
|
|
{
|
|
wxString tmpname(plugname->GetValue());
|
|
strncpy(buf, tmpname.mb_str(wxConvUTF8), sizeof(buf));
|
|
buf[sizeof(buf) - 1] = '\0';
|
|
if (SIM->opt_plugin_ctrl(buf, 1)) {
|
|
tmpname.Printf(wxT("Plugin '%s' loaded"), buf);
|
|
wxMessageBox(tmpname, wxT("Plugin Control"), wxOK | wxICON_INFORMATION, this);
|
|
pluglist->Insert(wxString(buf, wxConvUTF8), pluglist->GetCount());
|
|
}
|
|
}
|
|
break;
|
|
case ID_Unload:
|
|
{
|
|
int i = pluglist->GetSelection();
|
|
wxString tmpname = pluglist->GetString(i);
|
|
strncpy(buf, tmpname.mb_str(wxConvUTF8), sizeof(buf));
|
|
buf[sizeof(buf) - 1] = '\0';
|
|
if (SIM->opt_plugin_ctrl(buf, 0)) {
|
|
tmpname.Printf(wxT("Plugin '%s' unloaded"), buf);
|
|
wxMessageBox(tmpname, wxT("Plugin Control"), wxOK | wxICON_INFORMATION, this);
|
|
pluglist->Delete(i);
|
|
btn_unload->Enable(0);
|
|
}
|
|
}
|
|
break;
|
|
case wxID_OK:
|
|
EndModal(wxID_OK);
|
|
break;
|
|
case wxID_HELP:
|
|
ShowHelp();
|
|
break;
|
|
default:
|
|
event.Skip();
|
|
}
|
|
}
|
|
|
|
void PluginControlDialog::ShowHelp()
|
|
{
|
|
wxMessageBox(MSG_NO_HELP, MSG_NO_HELP_CAPTION, wxOK | wxICON_ERROR, this);
|
|
}
|
|
|
|
//////////////////////////////////////////////////////////////////////
|
|
// LogViewDialog implementation
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
// all events go to OnEvent method
|
|
BEGIN_EVENT_TABLE(LogViewDialog, wxDialog)
|
|
EVT_BUTTON(-1, LogViewDialog::OnEvent)
|
|
END_EVENT_TABLE()
|
|
|
|
LogViewDialog::LogViewDialog(
|
|
wxWindow* parent,
|
|
wxWindowID id)
|
|
: wxDialog(parent, id, wxT(""), wxDefaultPosition, wxDefaultSize,
|
|
wxDEFAULT_DIALOG_STYLE)
|
|
{
|
|
lengthMax = LOG_VIEW_DEFAULT_LENGTH_MAX;
|
|
lengthTolerance = LOG_VIEW_DEFAULT_TOLERANCE;
|
|
SetTitle(wxT("Bochs Log Viewer"));
|
|
mainSizer = new wxBoxSizer(wxVERTICAL);
|
|
logSizer = new wxBoxSizer(wxHORIZONTAL);
|
|
buttonSizer = new wxBoxSizer(wxHORIZONTAL);
|
|
mainSizer->Add(logSizer, 0, wxALIGN_CENTER);
|
|
mainSizer->Add(buttonSizer, 0, wxALIGN_CENTER);
|
|
log = new wxTextCtrl(this, -1, wxT(""),
|
|
wxDefaultPosition, wxSize(575, 300),
|
|
wxTE_MULTILINE | wxTE_RICH | wxTE_READONLY);
|
|
wxFont font(8, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
|
|
wxTextAttr attr;
|
|
attr.SetFont(font);
|
|
log->SetDefaultStyle(attr);
|
|
logSizer->Add(log, 1, wxALL|wxGROW, 10);
|
|
// buttonSizer contents
|
|
wxButton *btn = new wxButton(this, wxID_OK, BTNLABEL_CLOSE);
|
|
buttonSizer->Add(btn, 0, wxALL, 5);
|
|
}
|
|
|
|
void LogViewDialog::Init()
|
|
{
|
|
SetSizer(mainSizer);
|
|
mainSizer->Fit(this);
|
|
wxSize size = mainSizer->GetMinSize();
|
|
int margin = 5;
|
|
SetSizeHints(size.GetWidth() + margin, size.GetHeight() + margin);
|
|
Center();
|
|
}
|
|
|
|
bool LogViewDialog::Show(bool val)
|
|
{
|
|
SIM->set_log_viewer(val);
|
|
if (val) wxDialog::Raise();
|
|
return wxDialog::Show(val);
|
|
}
|
|
|
|
void LogViewDialog::CheckLogLength()
|
|
{
|
|
// truncate the text control periodically to avoid a
|
|
// serious memory leak.
|
|
wxString str = log->GetValue();
|
|
Bit32u len = str.Length();
|
|
if (len > lengthMax + lengthTolerance) {
|
|
// Truncate the string. Start from length - lengthMax, search
|
|
// forward until we find the first \n.
|
|
for (Bit32u i = len - lengthMax; i<len-1; i++) {
|
|
if (str.GetChar(i) == '\n') {
|
|
// remove the \n and everything before it.
|
|
log->Remove(0, i+1);
|
|
return;
|
|
}
|
|
}
|
|
// no newline found?!
|
|
log->Remove(0, len - lengthMax);
|
|
}
|
|
}
|
|
|
|
void LogViewDialog::AppendText(int level, wxString msg)
|
|
{
|
|
if ((level == LOGLEV_ERROR) || (level == LOGLEV_PANIC)) {
|
|
log->SetDefaultStyle(wxTextAttr(*wxRED));
|
|
} else {
|
|
log->SetDefaultStyle(wxTextAttr(*wxBLACK));
|
|
}
|
|
log->AppendText(msg);
|
|
int n = log->GetLastPosition();
|
|
if (n>0) n--;
|
|
log->ShowPosition(n);
|
|
CheckLogLength();
|
|
}
|
|
|
|
void LogViewDialog::OnEvent(wxCommandEvent& event)
|
|
{
|
|
int id = event.GetId();
|
|
switch (id) {
|
|
case wxID_OK:
|
|
Show(false);
|
|
break;
|
|
default:
|
|
event.Skip();
|
|
}
|
|
}
|
|
|
|
/////////////////////////////////////////////////////////////////
|
|
// ParamDialog
|
|
/////////////////////////////////////////////////////////////////
|
|
|
|
// all events go to OnEvent method
|
|
BEGIN_EVENT_TABLE(ParamDialog, wxDialog)
|
|
EVT_BUTTON(-1, ParamDialog::OnEvent)
|
|
EVT_CHECKBOX(-1, ParamDialog::OnEvent)
|
|
EVT_CHOICE(-1, ParamDialog::OnEvent)
|
|
EVT_TEXT(-1, ParamDialog::OnEvent)
|
|
END_EVENT_TABLE()
|
|
|
|
ParamDialog::ParamDialog(
|
|
wxWindow* parent,
|
|
wxWindowID id)
|
|
: wxDialog(parent, id, wxT(""), wxDefaultPosition, wxDefaultSize,
|
|
wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
|
|
{
|
|
idHash = new wxHashTable(wxKEY_INTEGER);
|
|
paramHash = new wxHashTable(wxKEY_INTEGER);
|
|
nbuttons = 0;
|
|
runtime = 0;
|
|
|
|
// top level objects
|
|
mainSizer = new wxBoxSizer(wxVERTICAL);
|
|
|
|
// info sizer only used in floppy and log options dialog
|
|
infoSizer = NULL;
|
|
|
|
// create buttonSizer, which will hold all the buttons.
|
|
buttonSizer = new wxBoxSizer(wxHORIZONTAL);
|
|
}
|
|
|
|
ParamDialog::~ParamDialog()
|
|
{
|
|
paramHash->BeginFind();
|
|
wxNode *node;
|
|
while ((node = (wxNode*)paramHash->Next()) != NULL) {
|
|
// assume that no ParamStruct appears in the hash table under multiple
|
|
// keys. If so, we will delete it twice and corrupt memory.
|
|
ParamStruct *pstr = (ParamStruct*) node->GetData();
|
|
// wxLogDebug(wxT("deleting ParamStruct id=%d for param %s"), pstr->id, pstr->param->get_name());
|
|
delete pstr;
|
|
}
|
|
delete idHash;
|
|
delete paramHash;
|
|
}
|
|
|
|
wxButton* ParamDialog::AddButton(int id, wxString label)
|
|
{
|
|
wxButton *btn = new wxButton(this, id, label);
|
|
buttonSizer->Add(btn, 0, wxALL, 5);
|
|
nbuttons++;
|
|
return btn;
|
|
}
|
|
|
|
// add the standard HELP, CANCEL, OK buttons.
|
|
void ParamDialog::AddDefaultButtons()
|
|
{
|
|
AddButton(wxID_HELP, BTNLABEL_HELP);
|
|
AddButton(wxID_CANCEL, BTNLABEL_CANCEL);
|
|
AddButton(wxID_OK, BTNLABEL_OK);
|
|
}
|
|
|
|
void ParamDialog::Init()
|
|
{
|
|
// add info sizer if present
|
|
if (infoSizer != NULL) {
|
|
mainSizer->Add(infoSizer, 0, wxALIGN_CENTER);
|
|
}
|
|
// if nobody has made any buttons, then create some now
|
|
if (nbuttons==0) AddDefaultButtons();
|
|
mainSizer->Add(buttonSizer, 0, wxALIGN_RIGHT);
|
|
EnableChanged();
|
|
// lay it out!
|
|
SetAutoLayout(TRUE);
|
|
SetSizer(mainSizer);
|
|
mainSizer->Fit(this);
|
|
wxSize size = mainSizer->GetMinSize();
|
|
int margin = 5;
|
|
SetSizeHints(size.GetWidth() + margin, size.GetHeight() + margin);
|
|
Center();
|
|
}
|
|
|
|
static int _next_id = ID_LAST_USER_DEFINED;
|
|
|
|
int ParamDialog::genId()
|
|
{
|
|
return ++_next_id;
|
|
}
|
|
|
|
bool ParamDialog::isGeneratedId(int id)
|
|
{
|
|
return (id >= ID_LAST_USER_DEFINED && id <= _next_id);
|
|
}
|
|
|
|
void ParamDialog::AddParamList(const char *nameList[], bx_param_c *base, wxFlexGridSizer *sizer, bool plain)
|
|
{
|
|
int i = 0;
|
|
while (nameList[i] != NULL) {
|
|
bx_param_c *param = SIM->get_param(nameList[i], base);
|
|
if (param != NULL) {
|
|
AddParam(param, sizer, plain);
|
|
}
|
|
i++;
|
|
}
|
|
}
|
|
|
|
// support "legacy" addparam functions. Easier than changing them.
|
|
void ParamDialog::AddParam(bx_param_c *param, wxFlexGridSizer *sizer, bool plain)
|
|
{
|
|
AddParamContext context;
|
|
context.depth = 0;
|
|
context.parent = this;
|
|
context.vertSizer = mainSizer;
|
|
context.gridSizer = sizer;
|
|
AddParam(param, plain, &context);
|
|
}
|
|
|
|
void ParamDialog::AddParam(
|
|
bx_param_c *param_generic,
|
|
bool plain,
|
|
AddParamContext *context)
|
|
{
|
|
AddParamContext defaultContext;
|
|
if (context == NULL) {
|
|
context = &defaultContext;
|
|
context->depth = 0;
|
|
context->parent = this;
|
|
context->vertSizer = mainSizer;
|
|
context->gridSizer = NULL;
|
|
}
|
|
wxASSERT(context->parent != NULL);
|
|
wxASSERT(context->vertSizer != NULL);
|
|
if (param_generic == NULL)
|
|
return; // param not registered, probably this option was not compiled in
|
|
wxLogDebug(wxT("AddParam for param '%s'"), param_generic->get_name());
|
|
if (context->gridSizer == NULL) {
|
|
// create a gridSizer if none exists yet. add it to default vertSizer.
|
|
context->gridSizer = new wxFlexGridSizer(3);
|
|
context->vertSizer->Add(context->gridSizer);
|
|
}
|
|
wxFlexGridSizer *sizer = context->gridSizer;
|
|
|
|
ParamStruct *pstr = new ParamStruct();
|
|
pstr->param = param_generic;
|
|
pstr->id = genId();
|
|
pstr->label = NULL;
|
|
pstr->u.window = NULL;
|
|
pstr->browseButton = NULL;
|
|
int type = param_generic->get_type();
|
|
const char *prompt;
|
|
if (type == BXT_LIST) {
|
|
bx_list_c *list = (bx_list_c*)pstr->param;
|
|
prompt = list->get_title();
|
|
} else {
|
|
prompt = pstr->param->get_label();
|
|
}
|
|
if (!prompt) prompt = pstr->param->get_name();
|
|
const char *description = pstr->param->get_description();
|
|
wxASSERT(prompt != NULL);
|
|
#define ADD_LABEL(x) sizer->Add(pstr->label = new wxStaticText(context->parent, -1, wxString(x, wxConvUTF8)), 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 3)
|
|
switch (type) {
|
|
case BXT_PARAM_BOOL:
|
|
{
|
|
bx_param_bool_c *param = (bx_param_bool_c*) param_generic;
|
|
if (!plain) ADD_LABEL(prompt);
|
|
wxCheckBox *ckbx = new wxCheckBox(context->parent, pstr->id, wxT(""));
|
|
ckbx->SetValue(param->get());
|
|
if (description) ckbx->SetToolTip(wxString(description, wxConvUTF8));
|
|
sizer->Add(ckbx, 0, wxALL, 2);
|
|
if (!plain) sizer->Add(1, 1); // spacer
|
|
pstr->u.checkbox = ckbx;
|
|
idHash->Put(pstr->id, pstr);
|
|
paramHash->Put(pstr->param->get_id(), pstr);
|
|
break;
|
|
}
|
|
case BXT_PARAM_NUM:
|
|
{
|
|
bx_param_num_c *param = (bx_param_num_c*) param_generic;
|
|
if (!plain) ADD_LABEL(prompt);
|
|
if (param->get_options() & param->USE_SPIN_CONTROL) {
|
|
wxSpinCtrl *spinctrl = new wxSpinCtrl(context->parent, pstr->id);
|
|
spinctrl->SetValue(param->get());
|
|
int max = (param->get_max() < (1<<24))?param->get_max():(1<<24)-1;
|
|
spinctrl->SetRange(param->get_min(), SPINCTRL_FIX_MAX(max));
|
|
if (description) spinctrl->SetToolTip(wxString(description, wxConvUTF8));
|
|
sizer->Add(spinctrl, 0, wxALL, 2);
|
|
if (!plain) sizer->Add(1, 1); // spacer
|
|
pstr->u.spin = spinctrl;
|
|
} else {
|
|
wxTextCtrl *textctrl = new wxTextCtrl(context->parent, pstr->id, wxT(""), wxDefaultPosition, normalTextSize);
|
|
const char *format = param->get_format();
|
|
if (!format)
|
|
format = strdup(param->get_base() == 16 ? "0x%X" : "%d");
|
|
SetTextCtrl(textctrl, format, param->get());
|
|
if (description) textctrl->SetToolTip(wxString(description, wxConvUTF8));
|
|
sizer->Add(textctrl, 0, wxALL, 2);
|
|
if (!plain) sizer->Add(1, 1); // spacer
|
|
pstr->u.text = textctrl;
|
|
}
|
|
idHash->Put(pstr->id, pstr);
|
|
paramHash->Put(pstr->param->get_id(), pstr);
|
|
break;
|
|
}
|
|
case BXT_PARAM_ENUM:
|
|
{
|
|
bx_param_enum_c *param = (bx_param_enum_c*) param_generic;
|
|
if (!plain) ADD_LABEL(prompt);
|
|
wxChoice *choice = new wxChoice(context->parent, pstr->id);
|
|
if (description) choice->SetToolTip(wxString(description, wxConvUTF8));
|
|
sizer->Add(choice, 0, wxADJUST_MINSIZE, 2);
|
|
if (!plain) sizer->Add(1, 1); // spacer
|
|
// fill in the choices
|
|
int i=0;
|
|
const char *ptr;
|
|
while (NULL != (ptr = param->get_choice(i++)))
|
|
choice->Append(wxString(ptr, wxConvUTF8));
|
|
choice->SetSelection(param->get() - param->get_min());
|
|
pstr->u.choice = choice;
|
|
idHash->Put(pstr->id, pstr);
|
|
paramHash->Put(pstr->param->get_id(), pstr);
|
|
break;
|
|
}
|
|
case BXT_PARAM_STRING:
|
|
{
|
|
bx_param_string_c *param = (bx_param_string_c*) param_generic;
|
|
char value[1024];
|
|
if (!plain) ADD_LABEL(prompt);
|
|
bool isFilename = param->get_options() & param->IS_FILENAME;
|
|
wxTextCtrl *txtctrl = new wxTextCtrl(context->parent, pstr->id, wxT(""), wxDefaultPosition, isFilename? longTextSize : normalTextSize);
|
|
if (description) txtctrl->SetToolTip(wxString(description, wxConvUTF8));
|
|
param->sprint(value, 1024, 0);
|
|
txtctrl->SetValue(wxString(value, wxConvUTF8));
|
|
if ((param->get_options() & param->RAW_BYTES) == 0) {
|
|
txtctrl->SetMaxLength(param->get_maxsize());
|
|
}
|
|
sizer->Add(txtctrl, 0, wxALL, 2);
|
|
if (!plain) {
|
|
if (isFilename) {
|
|
// create Browse button
|
|
pstr->browseButtonId = genId();
|
|
pstr->browseButton = new wxButton(context->parent,
|
|
pstr->browseButtonId, BTNLABEL_BROWSE);
|
|
sizer->Add(pstr->browseButton, 0, wxALL, 2);
|
|
idHash->Put(pstr->browseButtonId, pstr); // register under button id
|
|
} else {
|
|
sizer->Add(1, 1); // spacer
|
|
}
|
|
}
|
|
pstr->u.text = txtctrl;
|
|
idHash->Put(pstr->id, pstr);
|
|
paramHash->Put(pstr->param->get_id(), pstr);
|
|
break;
|
|
}
|
|
case BXT_LIST:
|
|
{
|
|
bx_list_c *list = (bx_list_c*) param_generic;
|
|
if (list->get_options() & bx_list_c::USE_TAB_WINDOW) {
|
|
// put each item in a separate tab of a tabbed window
|
|
wxNotebook *notebook = new wxNotebook(context->parent, -1);
|
|
#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION < 6
|
|
wxNotebookSizer *nbsizer = new wxNotebookSizer(notebook);
|
|
#endif
|
|
// put all items in the list into a separate page of the notebook.
|
|
for (int i=0; i<list->get_size(); i++) {
|
|
bx_list_c *child = (bx_list_c*)list->get(i);
|
|
wxASSERT(child->get_type() == BXT_LIST);
|
|
// the child must be a list! I could support other things but
|
|
// I don't see any reason to. It wouldn't make sense to devote
|
|
// a whole tab to a single parameter.
|
|
wxPanel *panel = new wxPanel(notebook);
|
|
wxBoxSizer *boxsz = new wxBoxSizer(wxVERTICAL);
|
|
AddParamContext newcontext;
|
|
newcontext.depth = 1 + context->depth;
|
|
newcontext.parent = panel;
|
|
newcontext.vertSizer = boxsz;
|
|
newcontext.gridSizer = NULL; // will be created if needed
|
|
// the child itself is a list. Add the child's children in
|
|
// this new context.
|
|
bx_list_c *childl = (bx_list_c *)child;
|
|
for (int j=0; j<childl->get_size(); j++)
|
|
AddParam(childl->get(j), plain, &newcontext);
|
|
const char *pagename = child->get_title();
|
|
if (!pagename) pagename = child->get_name();
|
|
panel->SetAutoLayout(TRUE);
|
|
panel->SetSizer(boxsz);
|
|
notebook->AddPage(panel, wxString(pagename, wxConvUTF8));
|
|
}
|
|
#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION < 6
|
|
context->vertSizer->Add(nbsizer, 0, wxALL|wxGROW, 10);
|
|
#else
|
|
context->vertSizer->Add(notebook, 0, wxALL|wxGROW, 10);
|
|
#endif
|
|
// clear gridSizer variable so that any future parameters force
|
|
// creation of a new one.
|
|
context->gridSizer = NULL;
|
|
// add to hashes
|
|
pstr->u.notebook = notebook;
|
|
idHash->Put(pstr->id, pstr);
|
|
paramHash->Put(pstr->param->get_id(), pstr);
|
|
} else {
|
|
wxString boxTitle;
|
|
wxScrolledWindow *scrollWin = NULL;
|
|
wxPanel *scrollPanel = NULL;
|
|
wxBoxSizer *scrollsz = NULL;
|
|
wxStaticBox *box = NULL;
|
|
wxStaticBoxSizer *boxsz = NULL;
|
|
if (list->get_options() & bx_list_c::USE_BOX_TITLE) {
|
|
boxTitle = wxString(prompt, wxConvUTF8);
|
|
} else {
|
|
boxTitle = wxT("");
|
|
}
|
|
AddParamContext newcontext;
|
|
newcontext.depth = 1 + context->depth;
|
|
newcontext.gridSizer = NULL; // it will be created if necessary
|
|
if (list->get_options() & bx_list_c::USE_SCROLL_WINDOW) {
|
|
scrollWin = new wxScrolledWindow(context->parent, -1);
|
|
scrollPanel = new wxPanel(scrollWin, -1);
|
|
scrollsz = new wxBoxSizer(wxVERTICAL);
|
|
newcontext.parent = scrollPanel;
|
|
newcontext.vertSizer = scrollsz;
|
|
} else {
|
|
box = new wxStaticBox(context->parent, -1, boxTitle);
|
|
boxsz = new wxStaticBoxSizer(box, wxVERTICAL);
|
|
newcontext.parent = context->parent;
|
|
newcontext.vertSizer = boxsz;
|
|
}
|
|
// put all items in the list inside the boxsz sizer.
|
|
for (int i=0; i<list->get_size(); i++) {
|
|
bx_param_c *child = list->get(i);
|
|
AddParam(child, plain, &newcontext);
|
|
}
|
|
if (list->get_options() & bx_list_c::USE_SCROLL_WINDOW) {
|
|
scrollPanel->SetAutoLayout(TRUE);
|
|
scrollPanel->SetSizer(scrollsz);
|
|
scrollsz->Fit(scrollPanel);
|
|
scrollsz->SetSizeHints(scrollPanel);
|
|
wxSize size = scrollPanel->GetBestSize();
|
|
scrollWin->SetScrollbars(1, 1, size.GetWidth(), size.GetHeight());
|
|
context->vertSizer->Add(scrollWin, 0, wxALL|wxGROW, 10);
|
|
context->vertSizer->SetItemMinSize(scrollWin, size.GetWidth() + 30, 400);
|
|
} else {
|
|
// add the boxsz to vertSizer
|
|
context->vertSizer->Add(boxsz, 0, wxALL|wxGROW, 10);
|
|
}
|
|
// clear gridSizer variable so that any future parameters force
|
|
// creation of a new one.
|
|
context->gridSizer = NULL;
|
|
// add to hashes
|
|
pstr->u.staticbox = box;
|
|
idHash->Put(pstr->id, pstr);
|
|
paramHash->Put(pstr->param->get_id(), pstr);
|
|
}
|
|
break;
|
|
}
|
|
default:
|
|
wxLogError(wxT("ParamDialog::AddParam called with unsupported param type id=%d"), (int)type);
|
|
}
|
|
if (pstr->label) pstr->label->Enable(pstr->param->get_enabled());
|
|
if (pstr->u.window) pstr->u.window->Enable(pstr->param->get_enabled());
|
|
if (pstr->browseButton) pstr->browseButton->Enable(pstr->param->get_enabled());
|
|
}
|
|
|
|
bool ParamDialog::CopyGuiToParam()
|
|
{
|
|
bx_bool sim_running = 0;
|
|
|
|
if (runtime) {
|
|
sim_running = theFrame->SimThreadControl(0);
|
|
}
|
|
// loop through all the parameters
|
|
idHash->BeginFind();
|
|
wxNode *node;
|
|
while ((node = (wxNode*)idHash->Next()) != NULL) {
|
|
ParamStruct *pstr = (ParamStruct*) node->GetData();
|
|
wxLogDebug(wxT("commit changes for param %s"), pstr->param->get_name());
|
|
CopyGuiToParam(pstr->param);
|
|
if (pstr->param->get_type() == BXT_LIST) break;
|
|
}
|
|
if (runtime && sim_running) {
|
|
SIM->update_runtime_options();
|
|
theFrame->SimThreadControl(1);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool ParamDialog::CopyGuiToParam(bx_param_c *param)
|
|
{
|
|
int i;
|
|
|
|
if (param == NULL) return false;
|
|
ParamStruct *pstr = (ParamStruct*) paramHash->Get(param->get_id());
|
|
wxLogDebug(wxT("commit changes for param %s"), param->get_name());
|
|
int type = param->get_type();
|
|
switch (type) {
|
|
case BXT_PARAM_BOOL: {
|
|
bx_param_bool_c *boolp = (bx_param_bool_c*) pstr->param;
|
|
bool val = pstr->u.checkbox->GetValue();
|
|
if (val != boolp->get()) boolp->set(val);
|
|
break;
|
|
}
|
|
case BXT_PARAM_NUM: {
|
|
bx_param_num_c *nump = (bx_param_num_c*) pstr->param;
|
|
bool valid;
|
|
int n;
|
|
wxString complaint(wxT("Invalid integer for '"));
|
|
complaint += wxString(pstr->param->get_name(), wxConvUTF8);
|
|
complaint += wxT("'.");
|
|
if (nump->get_options() & nump->USE_SPIN_CONTROL) {
|
|
n = pstr->u.spin->GetValue();
|
|
} else {
|
|
n = GetTextCtrlInt(pstr->u.text, &valid, true, complaint);
|
|
}
|
|
if ((n < nump->get_min()) || (n > nump->get_max())) {
|
|
wxMessageBox(wxT("Numerical parameter out of range"), wxT("Error"), wxOK | wxICON_ERROR, this);
|
|
return false;
|
|
}
|
|
if (n != nump->get()) nump->set(n);
|
|
break;
|
|
}
|
|
case BXT_PARAM_ENUM: {
|
|
bx_param_enum_c *enump = (bx_param_enum_c*) pstr->param;
|
|
int value = pstr->u.choice->GetSelection() + enump->get_min();
|
|
if (value != enump->get()) enump->set(value);
|
|
break;
|
|
}
|
|
case BXT_PARAM_STRING: {
|
|
bx_param_string_c *stringp = (bx_param_string_c*) pstr->param;
|
|
char buf[1024];
|
|
wxString tmp(pstr->u.text->GetValue());
|
|
if (stringp->get_options() & stringp->RAW_BYTES) {
|
|
char src[1024];
|
|
int p = 0;
|
|
unsigned int n;
|
|
strcpy(src, tmp.mb_str(wxConvUTF8));
|
|
for (i=0; i<stringp->get_maxsize(); i++)
|
|
buf[i] = 0;
|
|
for (i=0; i<stringp->get_maxsize(); i++) {
|
|
while (src[p] == stringp->get_separator())
|
|
p++;
|
|
if (src[p] == 0) break;
|
|
// try to read a byte of hex
|
|
if (sscanf(src+p, "%02x", &n) == 1) {
|
|
buf[i] = n;
|
|
p+=2;
|
|
} else {
|
|
wxMessageBox(wxT("Illegal raw byte format"), wxT("Error"), wxOK | wxICON_ERROR, this);
|
|
return false;
|
|
}
|
|
}
|
|
} else {
|
|
strncpy(buf, tmp.mb_str(wxConvUTF8), sizeof(buf));
|
|
}
|
|
buf[sizeof(buf)-1] = 0;
|
|
if (!stringp->equals(buf)) stringp->set(buf);
|
|
break;
|
|
}
|
|
case BXT_LIST: {
|
|
bx_list_c *list = (bx_list_c*) param;
|
|
for (i = 0; i < list->get_size(); i++) {
|
|
bx_param_c *item = list->get(i);
|
|
if (!CopyGuiToParam(item)) break;
|
|
}
|
|
break;
|
|
}
|
|
default:
|
|
wxLogError(wxT("ParamDialog::CopyGuiToParam: unsupported param type id=%d"), (int)type);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
void ParamDialog::EnableChanged()
|
|
{
|
|
idHash->BeginFind();
|
|
wxNode *node;
|
|
while ((node = (wxNode*)idHash->Next()) != NULL) {
|
|
ParamStruct *pstr = (ParamStruct*) node->GetData();
|
|
if (runtime) {
|
|
if ((pstr->param->get_type() != BXT_LIST) && !pstr->param->get_runtime_param())
|
|
EnableParam(pstr->param->get_id(), false);
|
|
}
|
|
// special cases that can't be handled in the usual way
|
|
}
|
|
}
|
|
|
|
void ParamDialog::EnableChanged(ParamStruct *pstr)
|
|
{
|
|
wxLogDebug(wxT("EnableChanged on param %s"), pstr->param->get_name());
|
|
ProcessDependentList(pstr, true);
|
|
}
|
|
|
|
void ParamDialog::EnableParam(int param_id, bool enabled)
|
|
{
|
|
ParamStruct *pstr = (ParamStruct*) paramHash->Get(param_id);
|
|
if (!pstr) return;
|
|
if (pstr->label) pstr->label->Enable(enabled);
|
|
if (pstr->browseButton) pstr->browseButton->Enable(enabled);
|
|
if (pstr->u.window) pstr->u.window->Enable(enabled);
|
|
}
|
|
|
|
void ParamDialog::ProcessDependentList(ParamStruct *pstrChanged, bool enabled)
|
|
{
|
|
bx_param_c *dparam;
|
|
ParamStruct *pstr;
|
|
Bit64s value;
|
|
bool en;
|
|
int i;
|
|
|
|
bx_list_c *list = pstrChanged->param->get_dependent_list();
|
|
if (list) {
|
|
if (pstrChanged->param->get_type() == BXT_PARAM_ENUM) {
|
|
bx_param_enum_c *enump = (bx_param_enum_c*)pstrChanged->param;
|
|
value = pstrChanged->u.choice->GetSelection() + enump->get_min();
|
|
Bit64u enable_bitmap = enump->get_dependent_bitmap(value);
|
|
Bit64u mask = 0x1;
|
|
for (i = 0; i < list->get_size(); i++) {
|
|
dparam = list->get(i);
|
|
if (dparam != enump) {
|
|
en = (enable_bitmap & mask) && enabled;
|
|
pstr = (ParamStruct*) paramHash->Get(dparam->get_id());
|
|
if (pstr) {
|
|
if (en != pstr->u.window->IsEnabled()) {
|
|
EnableParam(dparam->get_id(), en);
|
|
ProcessDependentList(pstr, en);
|
|
}
|
|
}
|
|
}
|
|
mask <<= 1;
|
|
}
|
|
} else if ((pstrChanged->param->get_type() == BXT_PARAM_BOOL) ||
|
|
(pstrChanged->param->get_type() == BXT_PARAM_NUM) ||
|
|
(pstrChanged->param->get_type() == BXT_PARAM_STRING)) {
|
|
bx_param_c *param = pstrChanged->param;
|
|
if (param->get_type() == BXT_PARAM_BOOL) {
|
|
value = pstrChanged->u.checkbox->GetValue();
|
|
} else if (param->get_type() == BXT_PARAM_NUM) {
|
|
bx_param_num_c *nump = (bx_param_num_c*)param;
|
|
if (nump->get_options() & nump->USE_SPIN_CONTROL) {
|
|
value = (pstrChanged->u.spin->GetValue() > 0);
|
|
} else {
|
|
bool valid;
|
|
value = (GetTextCtrlInt(pstrChanged->u.text, &valid, true, wxT("")) > 0);
|
|
}
|
|
} else {
|
|
wxString tmp(pstrChanged->u.text->GetValue());
|
|
value = !tmp.IsEmpty() && tmp.compare(wxT("none"));
|
|
}
|
|
for (i = 0; i < list->get_size(); i++) {
|
|
dparam = list->get(i);
|
|
if (dparam != param) {
|
|
en = (value && enabled);
|
|
pstr = (ParamStruct*) paramHash->Get(dparam->get_id());
|
|
if (pstr) {
|
|
if (en != pstr->u.window->IsEnabled()) {
|
|
EnableParam(dparam->get_id(), en);
|
|
ProcessDependentList(pstr, en);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// if any parameters changed, update the associated control
|
|
void ParamDialog::CopyParamToGui()
|
|
{
|
|
// loop through all the parameters
|
|
idHash->BeginFind();
|
|
wxNode *node;
|
|
while ((node = (wxNode*)idHash->Next()) != NULL) {
|
|
ParamStruct *pstr = (ParamStruct*) node->GetData();
|
|
IFDBG_DLG(wxLogDebug(wxT("refresh param %s"), pstr->param->get_name()));
|
|
int type = pstr->param->get_type();
|
|
switch (type) {
|
|
case BXT_PARAM_BOOL: {
|
|
bx_param_bool_c *boolp = (bx_param_bool_c*) pstr->param;
|
|
pstr->u.checkbox->SetValue(boolp->get());
|
|
break;
|
|
}
|
|
case BXT_PARAM_NUM: {
|
|
bx_param_num_c *nump = (bx_param_num_c*) pstr->param;
|
|
const char *format = nump->get_format();
|
|
if (!format)
|
|
format = strdup(nump->get_base() == 16 ? "0x%X" : "%d");
|
|
SetTextCtrl(pstr->u.text, format, nump->get());
|
|
break;
|
|
}
|
|
case BXT_PARAM_ENUM: {
|
|
bx_param_enum_c *enump = (bx_param_enum_c*) pstr->param;
|
|
pstr->u.choice->SetSelection(enump->get() - enump->get_min());
|
|
break;
|
|
}
|
|
case BXT_PARAM_STRING: {
|
|
bx_param_string_c *stringp = (bx_param_string_c*) pstr->param;
|
|
pstr->u.text->SetValue(wxString(stringp->getptr(), wxConvUTF8));
|
|
break;
|
|
}
|
|
case BXT_LIST:
|
|
break;
|
|
default:
|
|
wxLogError(wxT("ParamDialog::CopyParamToGui(): unsupported param type id=%d"), (int)type);
|
|
}
|
|
}
|
|
}
|
|
|
|
void ParamDialog::OnEvent(wxCommandEvent& event)
|
|
{
|
|
int id = event.GetId();
|
|
if (isGeneratedId(id)) {
|
|
ParamStruct *pstr = (ParamStruct*) idHash->Get(id);
|
|
if (pstr == NULL) {
|
|
wxLogDebug(wxT("ParamStruct not found for id=%d"), id);
|
|
return;
|
|
}
|
|
if (id == pstr->id) {
|
|
IFDBG_DLG(wxLogDebug(wxT("event came from window %p (id=%d) controlled by parameter '%s'"), pstr->u.window, id, pstr->param->get_name()));
|
|
switch (pstr->param->get_type()) {
|
|
case BXT_PARAM_BOOL:
|
|
case BXT_PARAM_NUM:
|
|
case BXT_PARAM_ENUM:
|
|
case BXT_PARAM_STRING:
|
|
EnableChanged(pstr);
|
|
break;
|
|
}
|
|
return;
|
|
}
|
|
if (id == pstr->browseButtonId) {
|
|
wxLogDebug(wxT("browse button id=%d attached to wxTextCtrl %p"), id, pstr->u.text);
|
|
BrowseTextCtrl(pstr->u.text);
|
|
return;
|
|
}
|
|
wxLogDebug(wxT("id was key to ParamStruct but doesn't match either id inside"));
|
|
}
|
|
switch (id) {
|
|
case wxID_OK:
|
|
if (IsModal()) {
|
|
if (CopyGuiToParam())
|
|
EndModal(wxID_OK);
|
|
} else {
|
|
CopyParamToGui();
|
|
}
|
|
break;
|
|
case wxID_CANCEL:
|
|
if (IsModal())
|
|
EndModal(wxID_CANCEL);
|
|
else
|
|
Show(FALSE);
|
|
break;
|
|
case wxID_HELP:
|
|
ShowHelp();
|
|
break;
|
|
default:
|
|
event.Skip();
|
|
}
|
|
}
|
|
|
|
void ParamDialog::ShowHelp()
|
|
{
|
|
wxMessageBox(MSG_NO_HELP, MSG_NO_HELP_CAPTION, wxOK | wxICON_ERROR, this);
|
|
}
|
|
|
|
//////////////////////////////////////////////////////////////////////
|
|
// FloppyConfigDialog implementation
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
// all events go to OnEvent method
|
|
BEGIN_EVENT_TABLE(FloppyConfigDialog, wxDialog)
|
|
EVT_BUTTON(-1, FloppyConfigDialog::OnEvent)
|
|
EVT_CHECKBOX(-1, FloppyConfigDialog::OnEvent)
|
|
EVT_CHOICE(-1, FloppyConfigDialog::OnEvent)
|
|
EVT_TEXT(-1, FloppyConfigDialog::OnEvent)
|
|
END_EVENT_TABLE()
|
|
|
|
FloppyConfigDialog::FloppyConfigDialog(
|
|
wxWindow* parent,
|
|
wxWindowID id)
|
|
: ParamDialog(parent, id)
|
|
{
|
|
infoSizer = new wxBoxSizer(wxHORIZONTAL);
|
|
infoSizer->Add(new wxStaticText(this, -1, wxString("Clicking OK signals a media change for this drive.", wxConvUTF8)), 0, wxALIGN_CENTER|wxALL, 3);
|
|
createButton = AddButton(ID_Create, BTNLABEL_CREATE_IMG);
|
|
AddDefaultButtons();
|
|
}
|
|
|
|
void FloppyConfigDialog::Setup(bx_list_c *list)
|
|
{
|
|
int devtype_id, path_id, media_id, status_id, readonly_id;
|
|
|
|
devtype_id = list->get_by_name("devtype")->get_id();
|
|
path_id = list->get_by_name("path")->get_id();
|
|
media_id = list->get_by_name("type")->get_id();
|
|
status_id = list->get_by_name("status")->get_id();
|
|
readonly_id = list->get_by_name("readonly")->get_id();
|
|
AddParam(list);
|
|
pstrDevice = (ParamStruct*) paramHash->Get(devtype_id);
|
|
pstrPath = (ParamStruct*) paramHash->Get(path_id);
|
|
pstrMedia = (ParamStruct*) paramHash->Get(media_id);
|
|
pstrStatus = (ParamStruct*) paramHash->Get(status_id);
|
|
pstrReadonly = (ParamStruct*) paramHash->Get(readonly_id);
|
|
}
|
|
|
|
void FloppyConfigDialog::OnEvent(wxCommandEvent& event)
|
|
{
|
|
int id = event.GetId();
|
|
if (isGeneratedId(id)) {
|
|
ParamStruct *pstr = (ParamStruct*) idHash->Get(id);
|
|
if (pstr == NULL) {
|
|
wxLogDebug(wxT("ParamStruct not found for id=%d"), id);
|
|
return;
|
|
}
|
|
if (id == pstr->id) {
|
|
if ((pstr == pstrDevice) || (pstr == pstrMedia)) {
|
|
int val1 = pstrDevice->u.choice->GetSelection() + ((bx_param_num_c*)pstrDevice->param)->get_min();
|
|
int val2 = pstrMedia->u.choice->GetSelection() + ((bx_param_num_c*)pstrMedia->param)->get_min();
|
|
createButton->Enable((val1 != BX_FDD_NONE) && (val2 != BX_FLOPPY_NONE));
|
|
} else if ((pstr == pstrPath) && (!pstrPath->u.text->IsModified())) {
|
|
pstrMedia->u.choice->SetSelection(pstrMedia->u.choice->FindString(wxT("auto")));
|
|
pstrStatus->u.choice->SetSelection(BX_INSERTED);
|
|
}
|
|
}
|
|
ParamDialog::OnEvent(event);
|
|
} else {
|
|
switch (id) {
|
|
case ID_Create:
|
|
{
|
|
int cap = pstrMedia->u.choice->GetSelection();
|
|
char name[1024];
|
|
strncpy(name, pstrPath->u.text->GetValue().mb_str(wxConvUTF8), sizeof(name));
|
|
name[sizeof(name) - 1] = '\0';
|
|
if ((floppy_type_n_sectors[cap] > 0) && (strlen(name) > 0) && (strcmp(name, "none"))) {
|
|
if (CreateImage(0, floppy_type_n_sectors[cap], name)) {
|
|
wxString msg(wxT("Created a "));
|
|
msg += pstrMedia->u.choice->GetString(cap);
|
|
msg += wxT(" disk image called '");
|
|
msg += pstrPath->u.text->GetValue();
|
|
msg += wxT("'.");
|
|
wxMessageBox(msg, wxT("Image Created"), wxOK | wxICON_INFORMATION, this);
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
case wxID_OK:
|
|
// force a media change
|
|
((bx_param_enum_c*)pstrStatus->param)->set(BX_EJECTED);
|
|
default:
|
|
ParamDialog::OnEvent(event);
|
|
}
|
|
}
|
|
}
|
|
|
|
//////////////////////////////////////////////////////////////////////
|
|
// LogOptionsDialog implementation
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
// all events go to OnEvent method
|
|
BEGIN_EVENT_TABLE(LogOptionsDialog, wxDialog)
|
|
EVT_BUTTON(-1, LogOptionsDialog::OnEvent)
|
|
EVT_CHECKBOX(-1, LogOptionsDialog::OnEvent)
|
|
EVT_TEXT(-1, LogOptionsDialog::OnEvent)
|
|
END_EVENT_TABLE()
|
|
|
|
LogOptionsDialog::LogOptionsDialog(
|
|
wxWindow* parent,
|
|
wxWindowID id)
|
|
: ParamDialog(parent, id)
|
|
{
|
|
static wxString names[] = LOG_OPTS_TYPE_NAMES;
|
|
SetTitle(LOG_OPTS_TITLE);
|
|
AddParam(SIM->get_param("log"));
|
|
wxStaticText *text = new wxStaticText(this, -1, LOG_OPTS_PROMPT);
|
|
mainSizer->Add(text, 0, wxALL, 10);
|
|
gridSizer = new wxFlexGridSizer(2);
|
|
mainSizer->Add(gridSizer, 1, wxLEFT, 40);
|
|
infoSizer = new wxBoxSizer(wxHORIZONTAL);
|
|
text = new wxStaticText(this, -1, LOG_OPTS_ADV);
|
|
infoSizer->Add(text, 0, wxALIGN_CENTER|wxALL, 3);
|
|
|
|
// gridSizer contents
|
|
gridSizer->AddGrowableCol(1);
|
|
for (int evtype=0; evtype<LOG_OPTS_N_TYPES; evtype++) {
|
|
gridSizer->Add(new wxStaticText(this, -1, names[evtype]), 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);
|
|
action[evtype] = makeLogOptionChoiceBox(this, -1, evtype, true);
|
|
gridSizer->Add(action[evtype], 1, wxALL|wxGROW|wxADJUST_MINSIZE, 5);
|
|
}
|
|
}
|
|
|
|
void LogOptionsDialog::SetAction(int evtype, int a)
|
|
{
|
|
// find the choice whose client data matches "a".
|
|
int *ptr;
|
|
//wxLogDebug ("SetAction type=%d a=%d", evtype, a);
|
|
for (int i=0; i < (int)action[evtype]->GetCount(); i++) {
|
|
//wxLogDebug ("reading action[%d]->GetClientData(%d)", evtype, i);
|
|
ptr = (int*) action[evtype]->GetClientData(i);
|
|
if (ptr == NULL) continue;
|
|
if (a == *ptr) { // found it!
|
|
action[evtype]->SetSelection(i);
|
|
return;
|
|
}
|
|
}
|
|
// this can happen if one of the choices that is excluded by
|
|
// BX_LOG_OPTS_EXCLUDE() is used, for example.
|
|
wxLogDebug(wxT("SetAction type=%d a=%d not found"), evtype, a);
|
|
}
|
|
|
|
int LogOptionsDialog::GetAction(int evtype)
|
|
{
|
|
int sel = action[evtype]->GetSelection();
|
|
int *ptrToChoice = (int*)action[evtype]->GetClientData(sel);
|
|
wxASSERT(ptrToChoice != NULL);
|
|
return *ptrToChoice;
|
|
}
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////
|
|
// utility
|
|
/////////////////////////////////////////////////////////////////
|
|
|
|
// Unfortunately this step is necessary if you change the text of
|
|
// a wxStaticText. Otherwise the sizer that contains the text never realizes
|
|
// that the size has changed, and the layout is never updated. The
|
|
// SetItemMinSize trick was reported on comp.soft-sys.wxwindows by
|
|
// Dirk Birnhardt.
|
|
void ChangeStaticText(wxSizer *sizer, wxStaticText *win, wxString newtext)
|
|
{
|
|
win->SetLabel(newtext);
|
|
wxSize sz = win->GetSize();
|
|
sizer->SetItemMinSize(win, sz.GetWidth(), sz.GetHeight());
|
|
}
|
|
|
|
// CreateImage produces a disk image. It's in the utility function
|
|
// area because it's used by both floppy and hard disk image creation.
|
|
bool CreateImage(int harddisk, int sectors, const char *filename)
|
|
{
|
|
if (sectors<1) {
|
|
wxMessageBox(wxT("The disk size is invalid."), wxT("Invalid Size"), wxOK | wxICON_ERROR);
|
|
return false;
|
|
}
|
|
wxLogDebug(wxT("filename = '%s'\n"), filename);
|
|
if (strlen(filename) < 1) {
|
|
wxMessageBox(wxT("You must type a file name for the new disk image."), wxT("Bad Filename"), wxOK | wxICON_ERROR);
|
|
return false;
|
|
}
|
|
// create disk image with name and capacity determined by the filename
|
|
// and sector args. Call SIM->create_image(filename, sectors, overwrite=0)
|
|
// first which will create the file if it doesn't already exist. If it
|
|
// exists, it will instead return -1, and we can ask the user "are you sure
|
|
// you want to overwrite?". If yes, call again with overwrite=1.
|
|
int ret = SIM->create_disk_image(filename, sectors, 0);
|
|
if (ret == -1) { // already exists
|
|
int answer = wxMessageBox(wxT("File exists. Do you want to overwrite it?"),
|
|
wxT("File exists"), wxYES_NO | wxCENTER);
|
|
if (answer == wxYES)
|
|
ret = SIM->create_disk_image(filename, sectors, 1);
|
|
else
|
|
return false; // wxNO
|
|
}
|
|
if (ret == -2) {
|
|
wxMessageBox(wxT("I could not create the disk image. Check for permission problems or available disk space."), wxT("Failed"), wxOK | wxICON_ERROR);
|
|
return false;
|
|
}
|
|
wxASSERT(ret==0);
|
|
return true;
|
|
}
|
|
|
|
void SetTextCtrl(wxTextCtrl *ctrl, const char *format, int val)
|
|
{
|
|
wxString tmp;
|
|
tmp.Printf(wxString(format, wxConvUTF8), val);
|
|
ctrl->SetValue(tmp);
|
|
}
|
|
|
|
int GetTextCtrlInt(wxTextCtrl *ctrl,
|
|
bool *valid,
|
|
bool complain,
|
|
wxString complaint)
|
|
{
|
|
wxString tmp(ctrl->GetValue());
|
|
char buf[1024];
|
|
strncpy(buf, tmp.mb_str(wxConvUTF8), sizeof(buf));
|
|
buf[sizeof(buf)-1] = '\0';
|
|
int n = strtol(buf, NULL, 0);
|
|
if (n != LONG_MIN && n != LONG_MAX) {
|
|
if (valid) *valid = true;
|
|
return n;
|
|
}
|
|
if (valid) *valid = false;
|
|
if (complain) {
|
|
wxMessageBox(complaint, wxT("Invalid"), wxOK | wxICON_ERROR);
|
|
ctrl->SetFocus();
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
bool BrowseTextCtrl(wxTextCtrl *text, wxString prompt, long style)
|
|
{
|
|
// try to configure the dialog to show hidden files
|
|
wxConfigBase::Get() ->Write(wxT("/wxWidgets/wxFileDialog/ShowHidden"), true);
|
|
wxFileDialog *fdialog = new wxFileDialog(text->GetParent(), prompt, wxT(""), text->GetValue(), wxT("*.*"), style);
|
|
int result = fdialog->ShowModal();
|
|
if (result == wxID_OK)
|
|
text->SetValue(fdialog->GetPath());
|
|
delete fdialog;
|
|
return (result == wxID_OK);
|
|
}
|
|
|
|
wxChoice *makeLogOptionChoiceBox(wxWindow *parent,
|
|
wxWindowID id,
|
|
int evtype,
|
|
bool includeNoChange)
|
|
{
|
|
static wxString choices[] = LOG_OPTS_CHOICES;
|
|
static int integers[LOG_OPTS_N_CHOICES] = {0, 1, 2, 3, 4, 5};
|
|
wxChoice *control = new wxChoice(parent, id, wxDefaultPosition, wxDefaultSize);
|
|
int lastChoice = 0; // remember index of last choice
|
|
int nchoice = includeNoChange? LOG_OPTS_N_CHOICES : LOG_OPTS_N_CHOICES_NORMAL;
|
|
for (int choice=0; choice<nchoice; choice++) {
|
|
// the exclude expression allows some choices not being available if they
|
|
// don't make any sense. For example, it would be stupid to ignore a panic.
|
|
if (!BX_LOG_OPTS_EXCLUDE(evtype, choice)) {
|
|
control->Append(choices[choice], &integers[choice]);
|
|
// the client data is an int* that points to the choice number.
|
|
// This is what will be returned by GetAction().
|
|
lastChoice++;
|
|
}
|
|
}
|
|
control->SetSelection(lastChoice-1);
|
|
return control;
|
|
}
|
|
|
|
#endif /* if BX_WITH_WX */
|