sdl2: Align ui/sdl2.c with upstream

This commit is contained in:
Matt Borgerson 2020-03-12 01:49:42 -07:00
parent c25c186f0e
commit 2eef3c0461
1 changed files with 5 additions and 12 deletions

View File

@ -25,7 +25,6 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qemu-version.h"
#include "ui/console.h" #include "ui/console.h"
#include "ui/input.h" #include "ui/input.h"
#include "ui/sdl2.h" #include "ui/sdl2.h"
@ -49,7 +48,7 @@ static int guest_x, guest_y;
static SDL_Cursor *guest_sprite; static SDL_Cursor *guest_sprite;
static Notifier mouse_mode_notifier; static Notifier mouse_mode_notifier;
#define SDL2_REFRESH_INTERVAL_BUSY 16 #define SDL2_REFRESH_INTERVAL_BUSY 10
#define SDL2_MAX_IDLE_COUNT (2 * GUI_REFRESH_INTERVAL_DEFAULT \ #define SDL2_MAX_IDLE_COUNT (2 * GUI_REFRESH_INTERVAL_DEFAULT \
/ SDL2_REFRESH_INTERVAL_BUSY + 1) / SDL2_REFRESH_INTERVAL_BUSY + 1)
@ -135,8 +134,6 @@ static void sdl_update_caption(struct sdl2_console *scon)
char win_title[1024]; char win_title[1024];
char icon_title[1024]; char icon_title[1024];
const char *status = ""; const char *status = "";
const char *project_name = "XQEMU";
const char *hash_indicator = "Revision";
if (!runstate_is_running()) { if (!runstate_is_running()) {
status = " [Stopped]"; status = " [Stopped]";
@ -151,16 +148,12 @@ static void sdl_update_caption(struct sdl2_console *scon)
} }
if (qemu_name) { if (qemu_name) {
snprintf(win_title, sizeof(win_title), "%s (%s: %s) (%s-%d)%s", snprintf(win_title, sizeof(win_title), "QEMU (%s-%d)%s", qemu_name,
project_name, hash_indicator, QEMU_PKGVERSION, qemu_name,
scon->idx, status); scon->idx, status);
snprintf(icon_title, sizeof(icon_title), "%s (%s: %s) (%s)", snprintf(icon_title, sizeof(icon_title), "QEMU (%s)", qemu_name);
project_name, hash_indicator, QEMU_PKGVERSION, qemu_name);
} else { } else {
snprintf(win_title, sizeof(win_title), "%s (%s: %s)%s", snprintf(win_title, sizeof(win_title), "QEMU%s", status);
project_name, hash_indicator, QEMU_PKGVERSION, status); snprintf(icon_title, sizeof(icon_title), "QEMU");
snprintf(icon_title, sizeof(icon_title), "%s (%s: %s)",
project_name, hash_indicator, QEMU_PKGVERSION);
} }
if (scon->real_window) { if (scon->real_window) {