Changeset 26429 in vbox for trunk/src/VBox/Frontends/VBoxSDL

Timestamp:

Feb 11, 2010 2:04:38 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

57557

Message:

VBoxSDL: fixed title bar according to public ticket #3331

File:

• trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -4239 +4239 @@
     strcpy(szPrevTitle, szTitle);
 
-
-    strcpy(szTitle, VBOX_PRODUCT " - ");
-
     Bstr name;
     gMachine->COMGETTER(Name)(name.asOutParam());
-    if (name)
-        strcat(szTitle, Utf8Str(name).raw());
-    else
-        strcat(szTitle, "<noname>");
-
+
+    RTStrPrintf(szTitle, sizeof(szTitle), "%s - " VBOX_PRODUCT,
+                name ? Utf8Str(name).raw() : "<noname>");
 
     /* which mode are we in? */
@@ -4258 +4253 @@
             gMachine->COMGETTER(State)(&machineState);
             if (machineState == MachineState_Paused)
-                strcat(szTitle, " - [Paused]");
+                RTStrPrintf(szTitle + strlen(szTitle), sizeof(szTitle) - strlen(szTitle), " - [Paused]");
 
             if (gfGrabbed)
-                strcat(szTitle, " - [Input captured]");
-
+                RTStrPrintf(szTitle + strlen(szTitle), sizeof(szTitle) - strlen(szTitle), " - [Input captured]");
+
+#if defined(DEBUG) || defined(VBOX_WITH_STATISTICS)
             // do we have a debugger interface
             if (gMachineDebugger)
             {
-#if defined(DEBUG) || defined(VBOX_WITH_STATISTICS)
                 // query the machine state
                 BOOL recompileSupervisor = FALSE;
@@ -4294 +4289 @@
                 else
                     RTStrPrintf(psz, &szTitle[sizeof(szTitle)] - psz, "]");
-#else
-                BOOL hwVirtEnabled = FALSE;
-                gMachineDebugger->COMGETTER(HWVirtExEnabled)(&hwVirtEnabled);
-                RTStrPrintf(szTitle + strlen(szTitle), sizeof(szTitle) - strlen(szTitle),
-                            "%s", hwVirtEnabled ? " (HWVirtEx)" : "");
-#endif /* DEBUG */
-            }
+            }
+#endif /* DEBUG || VBOX_WITH_STATISTICS */
             break;
         }
@@ -4312 +4302 @@
             gMachine->COMGETTER(State)(&machineState);
             if (machineState == MachineState_Starting)
-                strcat(szTitle, " - Starting...");
+                RTStrPrintf(szTitle + strlen(szTitle), sizeof(szTitle) - strlen(szTitle),
+                            " - Starting...");
             else if (machineState == MachineState_Restoring)
             {