From f2ab277bd18e4962fe99cc4e04af371e38fb8c4d Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Fri, 27 Nov 2009 18:42:26 +0100 Subject: [PATCH] Revert "vga: do not resize the screen on hw_invalidate" This causes ctrl+alt+u or ctrl+alt+f to not work when windows hasn't been resized first. Other graphic emulators do resize the screen on hw_invalidate. This reverts commit 0bd8246bfec1dfb2eb959f52db535572c0260f4c. --- hw/vga.c | 6 +++--- hw/vga_int.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/vga.c b/hw/vga.c index 27612aca439..c5abd299f55 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -1839,8 +1839,7 @@ static void vga_update_display(void *opaque) if (ds_get_bits_per_pixel(s->ds) == 0) { /* nothing to do */ } else { - full_update = s->full_update; - s->full_update = 0; + full_update = 0; if (!(s->ar_index & 0x20)) { graphic_mode = GMODE_BLANK; } else { @@ -1870,7 +1869,8 @@ static void vga_invalidate_display(void *opaque) { VGAState *s = (VGAState *)opaque; - s->full_update = 1; + s->last_width = -1; + s->last_height = -1; } void vga_reset(void *opaque) diff --git a/hw/vga_int.h b/hw/vga_int.h index 8fdf51dc619..631b1b0fc35 100644 --- a/hw/vga_int.h +++ b/hw/vga_int.h @@ -158,7 +158,6 @@ typedef struct VGACommonState { uint32_t last_width, last_height; /* in chars or pixels */ uint32_t last_scr_width, last_scr_height; /* in pixels */ uint32_t last_depth; /* in bits */ - uint8_t full_update; uint8_t cursor_start, cursor_end; uint32_t cursor_offset; unsigned int (*rgb_to_pixel)(unsigned int r, -- 2.39.5