- rewrite of the "show ips" feature similar to other guis

- implemented "hideIPS" option
- minor other cleanups and updates
- TODO: make "show ips" feature work on Windows host

bochs/.bochsrc

@@ -69,7 +69,7 @@
 # behaviour. These options are supported by more than one display library:
 #
 # "gui_debug"   - use GTK debugger gui (sdl, x) / Win32 debugger gui (sdl, win32)
-# "hideIPS"     - disable IPS output in status bar (sdl, wx, x)
+# "hideIPS"     - disable IPS output in status bar (rfb, sdl, wx, x)
 # "nokeyrepeat" - turn off host keyboard repeat (sdl, win32, x)
 #
 # See the examples below for other currently supported options.

bochs/CHANGES

@@ -113,7 +113,7 @@ Detailed change log :
 
 - GUI and display libraries
   - implemented "auto-off" timer for status LEDs indicating a data transfer
-  - Implemented "hideIPS" option in sdl and wx libraries
+  - Implemented "hideIPS" option in rfb, sdl and wx libraries
   - Added support for sending absolute mouse position values from the gui if an
     absolute pointing device (USB tablet) is active (rfb, sdl, win32, wx, x).
   - Gui debugger now supported when using sdl gui on Windows

bochs/doc/docbook/user/user.dbk

@@ -3564,7 +3564,7 @@ Some display libraries now support specific options to control their
 behaviour. These options are supported by more than one display library:
 <screen>
   "gui_debug"   - use GTK debugger gui (sdl, x) / Win32 debugger gui (sdl, win32)
-  "hideIPS"     - disable IPS output in status bar (sdl, wx, x)
+  "hideIPS"     - disable IPS output in status bar (rfb, sdl, wx, x)
   "nokeyrepeat" - turn off host keyboard repeat (sdl, win32, x)
 </screen>
 See the examples below for other currently supported options.

bochs/doc/man/bochsrc.5

@@ -1,5 +1,5 @@
 .\"Document Author:  Timothy R. Butler   -   tbutler@uninetsolutions.com"
-.TH bochsrc 5 "16 Aug 2012" "bochsrc" "The Bochs Project"
+.TH bochsrc 5 "28 Aug 2012" "bochsrc" "The Bochs Project"
 .\"SKIP_SECTION"
 .SH NAME
 bochsrc \- Configuration file for Bochs.
@@ -108,7 +108,7 @@ Some display libraries now support specific options to control their
 behaviour. These options are supported by more than one display library:
 
   "gui_debug"   - use GTK debugger gui (sdl, x)
-  "hideIPS"     - disable IPS output in status bar (sdl, wx, x)
+  "hideIPS"     - disable IPS output in status bar (rfb, sdl, wx, x)
   "nokeyrepeat" - turn off host keyboard repeat (sdl, x)
 
 See the examples below for other currently supported options.

bochs/gui/rfb.cc

@@ -7,6 +7,8 @@
 //    Donald Becker
 //    http://www.psyon.org
 //
+//  Copyright (C) 2001-2012  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
@@ -96,10 +98,14 @@ typedef int SOCKET;
 
 #endif
 
-static bool keep_alive;
-static bool client_connected;
-static bool desktop_resizable;
-
+static bx_bool keep_alive;
+static bx_bool client_connected;
+static bx_bool desktop_resizable;
+#if BX_SHOW_IPS
+static bx_bool rfbHideIPS = 0;
+static bx_bool rfbIPSupdate = 0;
+static char rfbIPStext[40];
+#endif
 static unsigned short rfbPort;
 
 // Headerbar stuff
@@ -203,8 +209,8 @@ static const rfbPixelFormat BGR233Format = {
 // Called from gui.cc, once upon program startup, to allow for the
 // specific GUI code (X11, Win32, ...) to be initialized.
 //
-// argc, argv: not used right now, but the intention is to pass native GUI
-//     specific options from the command line.  (X11 options, Win32 options,...)
+// argc, argv: used to pass display library specific options to the init code
+//     (X11 options, Win32 options,...)
 //
 // headerbar_y:  A headerbar (toolbar) is display on the top of the
 //     VGA window, showing floppy status, and other information.  It
@@ -253,9 +259,9 @@ void bx_rfb_gui_c::specific_init(int argc, char **argv, unsigned headerbar_y)
   clientEncodingsCount=0;
   clientEncodings=NULL;
 
-  keep_alive = true;
-  client_connected = false;
-  desktop_resizable = false;
+  keep_alive = 1;
+  client_connected = 0;
+  desktop_resizable = 0;
   StartThread();
 
 #ifdef WIN32
@@ -276,6 +282,11 @@ void bx_rfb_gui_c::specific_init(int argc, char **argv, unsigned headerbar_y)
     for (i = 1; i < argc; i++) {
       if (!strncmp(argv[i], "timeout=", 8)) {
         timeout = atoi(&argv[i][8]);
+#if BX_SHOW_IPS
+      } else if (!strcmp(argv[i], "hideIPS")) {
+        BX_INFO(("hide IPS display in status bar"));
+        rfbHideIPS = 1;
+#endif
       } else {
         BX_PANIC(("Unknown rfb option '%s'", argv[i]));
       }
@@ -409,7 +420,7 @@ void CDECL ServerThreadInit(void *indata)
     }
     BX_INFO (("listening for connections on port %i", rfbPort));
     sai_size = sizeof(sai);
-    while(keep_alive) {
+    while (keep_alive) {
         sClient = accept(sServer, (struct sockaddr *)&sai, (socklen_t*)&sai_size);
         if(sClient != INVALID_SOCKET) {
             HandleRfbClient(sClient);
@@ -485,9 +496,9 @@ void HandleRfbClient(SOCKET sClient)
     return;
   }
 
-  client_connected = true;
+  client_connected = 1;
   sGlobal = sClient;
-  while(keep_alive) {
+  while (keep_alive) {
     U8 msgType;
     int n;
 
@@ -574,7 +585,7 @@ void HandleRfbClient(SOCKET sClient)
                 BX_INFO(("%08x %s", rfbEncodings[j].id, rfbEncodings[j].name));
                 found=1;
                 if (clientEncodings[i] == rfbEncodingDesktopSize) {
-                  desktop_resizable = true;
+                  desktop_resizable = 1;
                 }
                 break;
               }
@@ -694,6 +705,12 @@ void bx_rfb_gui_c::handle_events(void)
         rfbUpdateRegion.height = 0;
     }
     rfbUpdateRegion.updated = false;
+#if BX_SHOW_IPS
+  if (rfbIPSupdate) {
+    rfbIPSupdate = 0;
+    rfbSetStatusText(0, rfbIPStext, 1);
+  }
+#endif
 }
 
 // ::FLUSH()
@@ -1110,7 +1127,7 @@ void bx_rfb_gui_c::replace_bitmap(unsigned hbar_id, unsigned bmap_id)
 void bx_rfb_gui_c::exit(void)
 {
     unsigned int i;
-    keep_alive = false;
+    keep_alive = 0;
 #ifdef WIN32
     StopWinsock();
 #endif
@@ -1704,10 +1721,11 @@ void bx_rfb_gui_c::set_mouse_mode_absxy(bx_bool mode)
 #if BX_SHOW_IPS
 void bx_rfb_gui_c::show_ips(Bit32u ips_count)
 {
-  char ips_text[40];
-  ips_count /= 1000;
-  sprintf(ips_text, "IPS: %u.%3.3uM", ips_count / 1000, ips_count % 1000);
-  rfbSetStatusText(0, ips_text, 1);
+  if (!rfbIPSupdate && !rfbHideIPS) {
+    ips_count /= 1000;
+    sprintf(rfbIPStext, "IPS: %u.%3.3uM", ips_count / 1000, ips_count % 1000);
+    rfbIPSupdate = 1;
+  }
 }
 #endif
 

bochs/gui/rfb.h

@@ -2,7 +2,7 @@
 // $Id$
 /////////////////////////////////////////////////////////////////////////
 //
-//  Copyright (C) 2000-2009  The Bochs Project
+//  Copyright (C) 2001-2012  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