mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed recently added "noclient" code to let vncsrv always work this way

Browse Source 
TODO: Fix RFB gui to make work the same again
This commit is contained in:
Volker Ruppert 2013-06-04 19:10:40 +00:00
parent e06b44c866
commit e824499639
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bochs/.bochsrc
View File

@ -85,7 +85,7 @@
#display_library: rfb #display_library: rfb
#display_library: sdl, options="fullscreen" # startup in fullscreen mode #display_library: sdl, options="fullscreen" # startup in fullscreen mode
#display_library: term #display_library: term
#display_library: vncsrv, options="noclient" # simulation runs even without client #display_library: vncsrv
#display_library: win32 #display_library: win32
#display_library: wx #display_library: wx
#display_library: x #display_library: x

12
bochs/gui/vncsrv.cc
View File

@ -106,7 +106,6 @@ IMPLEMENT_GUI_PLUGIN_CODE(vncsrv)
#endif #endif
static bx_bool client_connected; static bx_bool client_connected;
static bx_bool noclient_mode;
static bx_bool desktop_resizable = 1; static bx_bool desktop_resizable = 1;
#if BX_SHOW_IPS #if BX_SHOW_IPS
static bx_bool rfbHideIPS = 0; static bx_bool rfbHideIPS = 0;
@ -271,7 +270,6 @@ void bx_vncsrv_gui_c::specific_init(int argc, char **argv, unsigned headerbar_y)
} }
} }
noclient_mode = 0;
// parse vncsrv specific options // parse vncsrv specific options
if (argc > 1) { if (argc > 1) {
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
@ -282,9 +280,6 @@ void bx_vncsrv_gui_c::specific_init(int argc, char **argv, unsigned headerbar_y)
} else { } else {
BX_INFO(("connection timeout set to %d", timeout)); BX_INFO(("connection timeout set to %d", timeout));
} }
} else if (!strcmp(argv[i], "noclient")) {
BX_INFO(("'noclient' mode: simulation runs even without client connected"));
noclient_mode = 1;
#if BX_SHOW_IPS #if BX_SHOW_IPS
} else if (!strcmp(argv[i], "hideIPS")) { } else if (!strcmp(argv[i], "hideIPS")) {
BX_INFO(("hide IPS display in status bar")); BX_INFO(("hide IPS display in status bar"));
@ -334,7 +329,7 @@ void bx_vncsrv_gui_c::specific_init(int argc, char **argv, unsigned headerbar_y)
// the ask menu doesn't work on the client side // the ask menu doesn't work on the client side
io->set_log_action(LOGLEV_PANIC, ACT_FATAL); io->set_log_action(LOGLEV_PANIC, ACT_FATAL);
if (!noclient_mode || (timeout > 0)) { if (timeout > 0) {
while ((!client_connected) && (timeout--)) { while ((!client_connected) && (timeout--)) {
fprintf(stderr, "Bochs VNC server waiting for client: %2d\r", timeout+1); fprintf(stderr, "Bochs VNC server waiting for client: %2d\r", timeout+1);
#ifdef WIN32 #ifdef WIN32
@ -369,11 +364,6 @@ void bx_vncsrv_gui_c::specific_init(int argc, char **argv, unsigned headerbar_y)
void bx_vncsrv_gui_c::handle_events(void) void bx_vncsrv_gui_c::handle_events(void)
{ {
if (!noclient_mode && !client_connected) {
BX_PANIC(("VNC client closed connection"));
return;
}
while (bKeyboardInUse) ; while (bKeyboardInUse) ;
bKeyboardInUse = 1; bKeyboardInUse = 1;