diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2014-11-11 13:31:08 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2014-12-17 12:44:01 +0100 |
| commit | 0d01b7ce617b5f511c852ad770fd7fdce6bf353d (patch) | |
| tree | 50750ded193bceb1b4222a11d166e2da6273a33c /ui | |
| parent | 2c3056f182e16038c8b0663f68b3b5105899fb75 (diff) | |
sdl2: add+use sdl2_2d_redraw function.
Add a new sdl2_2d_redraw function for a complete screen refresh,
so we can stop using graphic_hw_invalidate for that. There is
no need to bother console / gfx emulation code if we are just
going to re-blit the screen after window resizes.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/sdl2-2d.c | 11 | ||||
| -rw-r--r-- | ui/sdl2.c | 17 |
2 files changed, 17 insertions, 11 deletions
diff --git a/ui/sdl2-2d.c b/ui/sdl2-2d.c index 29ada53552..40a552c7cb 100644 --- a/ui/sdl2-2d.c +++ b/ui/sdl2-2d.c @@ -100,4 +100,15 @@ void sdl2_2d_switch(DisplayChangeListener *dcl, SDL_TEXTUREACCESS_STREAMING, surface_width(new_surface), surface_height(new_surface)); + sdl2_2d_redraw(scon); +} + +void sdl2_2d_redraw(struct sdl2_console *scon) +{ + if (!scon->surface) { + return; + } + sdl2_2d_update(&scon->dcl, 0, 0, + surface_width(scon->surface), + surface_height(scon->surface)); } @@ -316,8 +316,7 @@ static void toggle_full_screen(struct sdl2_console *scon) } SDL_SetWindowFullscreen(scon->real_window, 0); } - graphic_hw_invalidate(scon->dcl.con); - graphic_hw_update(scon->dcl.con); + sdl2_2d_redraw(scon); } static void handle_keydown(SDL_Event *ev) @@ -365,8 +364,8 @@ static void handle_keydown(SDL_Event *ev) case SDL_SCANCODE_U: sdl2_window_destroy(scon); sdl2_window_create(scon); - graphic_hw_invalidate(scon->dcl.con); - graphic_hw_update(scon->dcl.con); + /* re-create texture */ + sdl2_2d_switch(&scon->dcl, scon->surface); gui_keysym = 1; break; #if 0 @@ -385,8 +384,7 @@ static void handle_keydown(SDL_Event *ev) fprintf(stderr, "%s: scale to %dx%d\n", __func__, width, height); sdl_scale(scon, width, height); - graphic_hw_invalidate(NULL); - graphic_hw_update(NULL); + sdl2_2d_redraw(scon); gui_keysym = 1; } #endif @@ -511,7 +509,6 @@ static void handle_mousewheel(SDL_Event *ev) static void handle_windowevent(DisplayChangeListener *dcl, SDL_Event *ev) { - int w, h; struct sdl2_console *scon = get_scon_from_window(ev->key.windowID); switch (ev->window.event) { @@ -523,12 +520,10 @@ static void handle_windowevent(DisplayChangeListener *dcl, SDL_Event *ev) info.height = ev->window.data2; dpy_set_ui_info(scon->dcl.con, &info); } - graphic_hw_invalidate(scon->dcl.con); - graphic_hw_update(scon->dcl.con); + sdl2_2d_redraw(scon); break; case SDL_WINDOWEVENT_EXPOSED: - SDL_GetWindowSize(SDL_GetWindowFromID(ev->window.windowID), &w, &h); - sdl2_2d_update(dcl, 0, 0, w, h); + sdl2_2d_redraw(scon); break; case SDL_WINDOWEVENT_FOCUS_GAINED: case SDL_WINDOWEVENT_ENTER: |