c4c00922cc
Because some VMs in QEMU can get GPU virtualization (using technologies such as iGVT-g, as mentioned previously), they could produce a video output that had a higher display refresh rate than of what the GTK display was displaying. (fxp. Playing a video game inside of a Windows VM at 60 Hz, while the output stood locked at 33 Hz because of defaults set in include/ui/console.h) Since QEMU does indeed have internal systems for determining frame times as defined in ui/console.c. The code checks for a variable called update_interval that it later uses for time calculation. This variable, however, isn't defined anywhere in ui/gtk.c and instead ui/console.c just sets it to GUI_REFRESH_INTERVAL_DEFAULT which is 30 update_interval represents the number of milliseconds per display refresh, and by doing some math we get that 1000/30 = 33.33... Hz This creates the mentioned problem and what this patch does is that it checks for the display refresh rate reported by GTK itself (we can take this as a safe value) and just converts it back to a number of milliseconds per display refresh. Signed-off-by: Nikola Pavlica <pavlica.nikola@gmail.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-id: 20200108121342.29597-1-pavlica.nikola@gmail.com [ kraxel: style tweak: add blank line between vars and code ] Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
156 lines
4.8 KiB
C
156 lines
4.8 KiB
C
#ifndef UI_GTK_H
|
|
#define UI_GTK_H
|
|
|
|
#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE
|
|
/* Work around an -Wstrict-prototypes warning in GTK headers */
|
|
#pragma GCC diagnostic push
|
|
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
|
|
#endif
|
|
#include <gtk/gtk.h>
|
|
#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE
|
|
#pragma GCC diagnostic pop
|
|
#endif
|
|
|
|
#include <gdk/gdkkeysyms.h>
|
|
|
|
#ifdef GDK_WINDOWING_X11
|
|
#include <gdk/gdkx.h>
|
|
#include <X11/XKBlib.h>
|
|
#endif
|
|
|
|
#ifdef GDK_WINDOWING_WAYLAND
|
|
#include <gdk/gdkwayland.h>
|
|
#endif
|
|
|
|
#include "ui/kbd-state.h"
|
|
#if defined(CONFIG_OPENGL)
|
|
#include "ui/egl-helpers.h"
|
|
#include "ui/egl-context.h"
|
|
#endif
|
|
|
|
#define MILLISEC_PER_SEC 1000000
|
|
|
|
typedef struct GtkDisplayState GtkDisplayState;
|
|
|
|
typedef struct VirtualGfxConsole {
|
|
GtkWidget *drawing_area;
|
|
DisplayChangeListener dcl;
|
|
QKbdState *kbd;
|
|
DisplaySurface *ds;
|
|
pixman_image_t *convert;
|
|
cairo_surface_t *surface;
|
|
double scale_x;
|
|
double scale_y;
|
|
#if defined(CONFIG_OPENGL)
|
|
QemuGLShader *gls;
|
|
EGLContext ectx;
|
|
EGLSurface esurface;
|
|
int glupdates;
|
|
int x, y, w, h;
|
|
egl_fb guest_fb;
|
|
egl_fb win_fb;
|
|
egl_fb cursor_fb;
|
|
int cursor_x;
|
|
int cursor_y;
|
|
bool y0_top;
|
|
bool scanout_mode;
|
|
#endif
|
|
} VirtualGfxConsole;
|
|
|
|
#if defined(CONFIG_VTE)
|
|
typedef struct VirtualVteConsole {
|
|
GtkWidget *box;
|
|
GtkWidget *scrollbar;
|
|
GtkWidget *terminal;
|
|
Chardev *chr;
|
|
bool echo;
|
|
} VirtualVteConsole;
|
|
#endif
|
|
|
|
typedef enum VirtualConsoleType {
|
|
GD_VC_GFX,
|
|
GD_VC_VTE,
|
|
} VirtualConsoleType;
|
|
|
|
typedef struct VirtualConsole {
|
|
GtkDisplayState *s;
|
|
char *label;
|
|
GtkWidget *window;
|
|
GtkWidget *menu_item;
|
|
GtkWidget *tab_item;
|
|
GtkWidget *focus;
|
|
VirtualConsoleType type;
|
|
union {
|
|
VirtualGfxConsole gfx;
|
|
#if defined(CONFIG_VTE)
|
|
VirtualVteConsole vte;
|
|
#endif
|
|
};
|
|
} VirtualConsole;
|
|
|
|
extern bool gtk_use_gl_area;
|
|
|
|
/* ui/gtk.c */
|
|
void gd_update_windowsize(VirtualConsole *vc);
|
|
|
|
/* ui/gtk-egl.c */
|
|
void gd_egl_init(VirtualConsole *vc);
|
|
void gd_egl_draw(VirtualConsole *vc);
|
|
void gd_egl_update(DisplayChangeListener *dcl,
|
|
int x, int y, int w, int h);
|
|
void gd_egl_refresh(DisplayChangeListener *dcl);
|
|
void gd_egl_switch(DisplayChangeListener *dcl,
|
|
DisplaySurface *surface);
|
|
QEMUGLContext gd_egl_create_context(DisplayChangeListener *dcl,
|
|
QEMUGLParams *params);
|
|
void gd_egl_scanout_disable(DisplayChangeListener *dcl);
|
|
void gd_egl_scanout_texture(DisplayChangeListener *dcl,
|
|
uint32_t backing_id,
|
|
bool backing_y_0_top,
|
|
uint32_t backing_width,
|
|
uint32_t backing_height,
|
|
uint32_t x, uint32_t y,
|
|
uint32_t w, uint32_t h);
|
|
void gd_egl_scanout_dmabuf(DisplayChangeListener *dcl,
|
|
QemuDmaBuf *dmabuf);
|
|
void gd_egl_cursor_dmabuf(DisplayChangeListener *dcl,
|
|
QemuDmaBuf *dmabuf, bool have_hot,
|
|
uint32_t hot_x, uint32_t hot_y);
|
|
void gd_egl_cursor_position(DisplayChangeListener *dcl,
|
|
uint32_t pos_x, uint32_t pos_y);
|
|
void gd_egl_release_dmabuf(DisplayChangeListener *dcl,
|
|
QemuDmaBuf *dmabuf);
|
|
void gd_egl_scanout_flush(DisplayChangeListener *dcl,
|
|
uint32_t x, uint32_t y, uint32_t w, uint32_t h);
|
|
void gtk_egl_init(DisplayGLMode mode);
|
|
int gd_egl_make_current(DisplayChangeListener *dcl,
|
|
QEMUGLContext ctx);
|
|
|
|
/* ui/gtk-gl-area.c */
|
|
void gd_gl_area_init(VirtualConsole *vc);
|
|
void gd_gl_area_draw(VirtualConsole *vc);
|
|
void gd_gl_area_update(DisplayChangeListener *dcl,
|
|
int x, int y, int w, int h);
|
|
void gd_gl_area_refresh(DisplayChangeListener *dcl);
|
|
void gd_gl_area_switch(DisplayChangeListener *dcl,
|
|
DisplaySurface *surface);
|
|
QEMUGLContext gd_gl_area_create_context(DisplayChangeListener *dcl,
|
|
QEMUGLParams *params);
|
|
void gd_gl_area_destroy_context(DisplayChangeListener *dcl,
|
|
QEMUGLContext ctx);
|
|
void gd_gl_area_scanout_texture(DisplayChangeListener *dcl,
|
|
uint32_t backing_id,
|
|
bool backing_y_0_top,
|
|
uint32_t backing_width,
|
|
uint32_t backing_height,
|
|
uint32_t x, uint32_t y,
|
|
uint32_t w, uint32_t h);
|
|
void gd_gl_area_scanout_flush(DisplayChangeListener *dcl,
|
|
uint32_t x, uint32_t y, uint32_t w, uint32_t h);
|
|
void gtk_gl_area_init(void);
|
|
QEMUGLContext gd_gl_area_get_current_context(DisplayChangeListener *dcl);
|
|
int gd_gl_area_make_current(DisplayChangeListener *dcl,
|
|
QEMUGLContext ctx);
|
|
|
|
#endif /* UI_GTK_H */
|