summaryrefslogtreecommitdiff
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:42:26 +0100
commit3098b9fde97a224e803048c83bebeea176966358 (patch)
treea8b0a340dedfc892665bf88df1494e6718296ab6
parent63e86b2e13396310feff1fe1a5988b5742487636 (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 2cde362cf1..740fe28352 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -1852,8 +1852,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 {
@@ -1883,7 +1882,8 @@ static void vga_invalidate_display(void *opaque)
{
VGACommonState *s = opaque;
- s->full_update = 1;
+ s->last_width = -1;
+ s->last_height = -1;
}
void vga_common_reset(VGACommonState *s)
diff --git a/hw/vga_int.h b/hw/vga_int.h
index e70032cf20..c03c220f31 100644
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -159,7 +159,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,