aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2009-11-27 18:42:26 +0100
committerAurelien Jarno <aurelien@aurel32.net>2009-11-27 18:46:04 +0100
commitf2ab277bd18e4962fe99cc4e04af371e38fb8c4d (patch)
treef99b9edca7fe9e655748f04bdaf757d1d2b3b836
parentefd4bd838d7b951a8eededfbfb56b73b49e746bc (diff)
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.
-rw-r--r--hw/vga.c6
-rw-r--r--hw/vga_int.h1
2 files changed, 3 insertions, 4 deletions
diff --git a/hw/vga.c b/hw/vga.c
index 27612aca43..c5abd299f5 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 8fdf51dc61..631b1b0fc3 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,