Skip to content

Commit

Permalink
sdl: stop using DisplayState
Browse files Browse the repository at this point in the history 
Rework DisplayStateListener callbacks to not use the DisplayState
any more.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
  • Loading branch information
@kraxel
kraxel committed Mar 18, 2013
1 parent d39fa6d commit 8db9bae
Showing 1 changed file with 51 additions and 41 deletions.
92 changes: 51 additions & 41 deletions ui/sdl.c
View file
Expand Up @@ -35,6 +35,7 @@
#include "sdl_zoom.h"

static DisplayChangeListener *dcl;
static DisplaySurface *surface;
static SDL_Surface *real_screen;
static SDL_Surface *guest_screen = NULL;
static int gui_grab; /* if true, all keyboard/mouse events are grabbed */
Expand All @@ -60,7 +61,7 @@ static int scaling_active = 0;
static Notifier mouse_mode_notifier;

static void sdl_update(DisplayChangeListener *dcl,
DisplayState *ds,
DisplayState *dontuse,
int x, int y, int w, int h)
{
// printf("updating x=%d y=%d w=%d h=%d\n", x, y, w, h);
Expand All @@ -83,17 +84,6 @@ static void sdl_update(DisplayChangeListener *dcl,
SDL_UpdateRect(real_screen, rec.x, rec.y, rec.w, rec.h);
}

static void sdl_setdata(DisplayChangeListener *dcl,
DisplayState *ds)
{
if (guest_screen != NULL) SDL_FreeSurface(guest_screen);

guest_screen = SDL_CreateRGBSurfaceFrom(ds_get_data(ds), ds_get_width(ds), ds_get_height(ds),
ds_get_bits_per_pixel(ds), ds_get_linesize(ds),
ds->surface->pf.rmask, ds->surface->pf.gmask,
ds->surface->pf.bmask, ds->surface->pf.amask);
}

static void do_sdl_resize(int width, int height, int bpp)
{
int flags;
Expand All @@ -118,16 +108,32 @@ static void do_sdl_resize(int width, int height, int bpp)
}

static void sdl_switch(DisplayChangeListener *dcl,
DisplayState *ds,
DisplaySurface *surface)
DisplayState *dontuse,
DisplaySurface *new_surface)
{

/* temporary hack: allows to call sdl_switch to handle scaling changes */
if (new_surface) {
surface = new_surface;
}

if (!scaling_active) {
do_sdl_resize(ds_get_width(ds), ds_get_height(ds), 0);
} else if (real_screen->format->BitsPerPixel != ds_get_bits_per_pixel(ds)) {
do_sdl_resize(surface_width(surface), surface_height(surface), 0);
} else if (real_screen->format->BitsPerPixel !=
surface_bits_per_pixel(surface)) {
do_sdl_resize(real_screen->w, real_screen->h,
ds_get_bits_per_pixel(ds));
surface_bits_per_pixel(surface));
}
sdl_setdata(dcl, ds);

if (guest_screen != NULL) {
SDL_FreeSurface(guest_screen);
}
guest_screen = SDL_CreateRGBSurfaceFrom
(surface_data(surface),
surface_width(surface), surface_height(surface),
surface_bits_per_pixel(surface), surface_stride(surface),
surface->pf.rmask, surface->pf.gmask,
surface->pf.bmask, surface->pf.amask);
}

/* generic keyboard conversion */
Expand Down Expand Up @@ -450,7 +456,7 @@ static void sdl_send_mouse_event(int dx, int dy, int dz, int x, int y, int state
kbd_mouse_event(dx, dy, dz, buttons);
}

static void sdl_scale(DisplayState *ds, int width, int height)
static void sdl_scale(int width, int height)
{
int bpp = real_screen->format->BitsPerPixel;

Expand All @@ -461,25 +467,28 @@ static void sdl_scale(DisplayState *ds, int width, int height)
scaling_active = 1;
}

static void toggle_full_screen(DisplayState *ds)
static void toggle_full_screen(void)
{
int width = surface_width(surface);
int height = surface_height(surface);
int bpp = surface_bits_per_pixel(surface);

gui_fullscreen = !gui_fullscreen;
if (gui_fullscreen) {
gui_saved_width = real_screen->w;
gui_saved_height = real_screen->h;
gui_saved_scaling = scaling_active;

do_sdl_resize(ds_get_width(ds), ds_get_height(ds),
ds_get_bits_per_pixel(ds));
do_sdl_resize(width, height, bpp);
scaling_active = 0;

gui_saved_grab = gui_grab;
sdl_grab_start();
} else {
if (gui_saved_scaling) {
sdl_scale(ds, gui_saved_width, gui_saved_height);
sdl_scale(gui_saved_width, gui_saved_height);
} else {
do_sdl_resize(ds_get_width(ds), ds_get_height(ds), 0);
do_sdl_resize(width, height, 0);
}
if (!gui_saved_grab || !is_graphic_console()) {
sdl_grab_end();
Expand All @@ -489,7 +498,7 @@ static void toggle_full_screen(DisplayState *ds)
vga_hw_update();
}

static void handle_keydown(DisplayState *ds, SDL_Event *ev)
static void handle_keydown(SDL_Event *ev)
{
int mod_state;
int keycode;
Expand All @@ -508,13 +517,13 @@ static void handle_keydown(DisplayState *ds, SDL_Event *ev)
keycode = sdl_keyevent_to_keycode(&ev->key);
switch (keycode) {
case 0x21: /* 'f' key on US keyboard */
toggle_full_screen(ds);
toggle_full_screen();
gui_keysym = 1;
break;
case 0x16: /* 'u' key on US keyboard */
if (scaling_active) {
scaling_active = 0;
sdl_switch(dcl, ds, ds->surface);
sdl_switch(dcl, NULL, NULL);
vga_hw_invalidate();
vga_hw_update();
}
Expand Down Expand Up @@ -545,9 +554,10 @@ static void handle_keydown(DisplayState *ds, SDL_Event *ev)
if (!gui_fullscreen) {
int width = MAX(real_screen->w + (keycode == 0x1b ? 50 : -50),
160);
int height = (ds_get_height(ds) * width) / ds_get_width(ds);
int height = (surface_height(surface) * width) /
surface_width(surface);

sdl_scale(ds, width, height);
sdl_scale(width, height);
vga_hw_invalidate();
vga_hw_update();
gui_keysym = 1;
Expand Down Expand Up @@ -634,7 +644,7 @@ static void handle_keydown(DisplayState *ds, SDL_Event *ev)
}
}

static void handle_keyup(DisplayState *ds, SDL_Event *ev)
static void handle_keyup(SDL_Event *ev)
{
int mod_state;

Expand Down Expand Up @@ -666,7 +676,7 @@ static void handle_keyup(DisplayState *ds, SDL_Event *ev)
}
}

static void handle_mousemotion(DisplayState *ds, SDL_Event *ev)
static void handle_mousemotion(SDL_Event *ev)
{
int max_x, max_y;

Expand All @@ -690,7 +700,7 @@ static void handle_mousemotion(DisplayState *ds, SDL_Event *ev)
}
}

static void handle_mousebutton(DisplayState *ds, SDL_Event *ev)
static void handle_mousebutton(SDL_Event *ev)
{
int buttonstate = SDL_GetMouseState(NULL, NULL);
SDL_MouseButtonEvent *bev;
Expand Down Expand Up @@ -726,7 +736,7 @@ static void handle_mousebutton(DisplayState *ds, SDL_Event *ev)
}
}

static void handle_activation(DisplayState *ds, SDL_Event *ev)
static void handle_activation(SDL_Event *ev)
{
#ifdef _WIN32
/* Disable grab if the window no longer has the focus
Expand Down Expand Up @@ -754,7 +764,7 @@ static void handle_activation(DisplayState *ds, SDL_Event *ev)
}

static void sdl_refresh(DisplayChangeListener *dcl,
DisplayState *ds)
DisplayState *dontuse)
{
SDL_Event ev1, *ev = &ev1;

Expand All @@ -769,13 +779,13 @@ static void sdl_refresh(DisplayChangeListener *dcl,
while (SDL_PollEvent(ev)) {
switch (ev->type) {
case SDL_VIDEOEXPOSE:
sdl_update(dcl, ds, 0, 0, real_screen->w, real_screen->h);
sdl_update(dcl, dontuse, 0, 0, real_screen->w, real_screen->h);
break;
case SDL_KEYDOWN:
handle_keydown(ds, ev);
handle_keydown(ev);
break;
case SDL_KEYUP:
handle_keyup(ds, ev);
handle_keyup(ev);
break;
case SDL_QUIT:
if (!no_quit) {
Expand All @@ -784,17 +794,17 @@ static void sdl_refresh(DisplayChangeListener *dcl,
}
break;
case SDL_MOUSEMOTION:
handle_mousemotion(ds, ev);
handle_mousemotion(ev);
break;
case SDL_MOUSEBUTTONDOWN:
case SDL_MOUSEBUTTONUP:
handle_mousebutton(ds, ev);
handle_mousebutton(ev);
break;
case SDL_ACTIVEEVENT:
handle_activation(ds, ev);
handle_activation(ev);
break;
case SDL_VIDEORESIZE:
sdl_scale(ds, ev->resize.w, ev->resize.h);
sdl_scale(ev->resize.w, ev->resize.h);
vga_hw_invalidate();
vga_hw_update();
break;
Expand Down

0 comments on commit 8db9bae

Please sign in to comment.