mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- store max. x / y resolution in the gui object and use it in win32.cc. Now it

Browse Source 
no longer needs to incluse vga.h
This commit is contained in:
Volker Ruppert 2012-01-22 09:08:59 +00:00
parent 795a21ec6d
commit 63ab13fe09
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/gui/Makefile.in
View File

@ -1,4 +1,4 @@
# Copyright (C) 2001 The Bochs Project # Copyright (C) 2001-2012 The Bochs Project
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
@ -253,7 +253,7 @@ win32.o: win32.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug.
../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \
../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \
../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \
../param_names.h keymap.h ../iodev/iodev.h ../iodev/vga.h ../param_names.h keymap.h ../iodev/iodev.h
win32dialog.o: win32dialog.@CPP_SUFFIX@ win32dialog.h ../config.h win32dialog.o: win32dialog.@CPP_SUFFIX@ win32dialog.h ../config.h
win32_enh_dbg_osdep.o: win32_enh_dbg_osdep.@CPP_SUFFIX@ ../config.h win32_enh_dbg_osdep.o: win32_enh_dbg_osdep.@CPP_SUFFIX@ ../config.h
win32paramdlg.o: win32paramdlg.@CPP_SUFFIX@ win32dialog.h ../config.h win32paramdlg.o: win32paramdlg.@CPP_SUFFIX@ win32dialog.h ../config.h
@ -351,7 +351,7 @@ win32.lo: win32.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../bx_debug/debug
../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \ ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \
../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \ ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.h \
../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \ ../extplugin.h ../ltdl.h ../gui/gui.h ../instrument/stubs/instrument.h \
../param_names.h keymap.h ../iodev/iodev.h ../iodev/vga.h ../param_names.h keymap.h ../iodev/iodev.h
win32dialog.lo: win32dialog.@CPP_SUFFIX@ win32dialog.h ../config.h win32dialog.lo: win32dialog.@CPP_SUFFIX@ win32dialog.h ../config.h
win32_enh_dbg_osdep.lo: win32_enh_dbg_osdep.@CPP_SUFFIX@ ../config.h win32_enh_dbg_osdep.lo: win32_enh_dbg_osdep.@CPP_SUFFIX@ ../config.h
win32paramdlg.lo: win32paramdlg.@CPP_SUFFIX@ win32dialog.h ../config.h win32paramdlg.lo: win32paramdlg.@CPP_SUFFIX@ win32dialog.h ../config.h

4
bochs/gui/gui.cc
View File

@ -2,7 +2,7 @@
// $Id$ // $Id$
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2002-2011 The Bochs Project // Copyright (C) 2002-2012 The Bochs Project
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -115,6 +115,8 @@ void bx_gui_c::init(int argc, char **argv, unsigned max_xres, unsigned max_yres,
BX_GUI_THIS host_xres = 640; BX_GUI_THIS host_xres = 640;
BX_GUI_THIS host_yres = 480; BX_GUI_THIS host_yres = 480;
BX_GUI_THIS host_bpp = 8; BX_GUI_THIS host_bpp = 8;
BX_GUI_THIS max_xres = max_xres;
BX_GUI_THIS max_yres = max_yres;
BX_GUI_THIS x_tilesize = tilewidth; BX_GUI_THIS x_tilesize = tilewidth;
BX_GUI_THIS y_tilesize = tileheight; BX_GUI_THIS y_tilesize = tileheight;
BX_GUI_THIS dialog_caps = BX_GUI_DLG_RUNTIME | BX_GUI_DLG_SAVE_RESTORE; BX_GUI_THIS dialog_caps = BX_GUI_DLG_RUNTIME | BX_GUI_DLG_SAVE_RESTORE;

4
bochs/gui/gui.h
View File

@ -2,7 +2,7 @@
// $Id$ // $Id$
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2002-2011 The Bochs Project // Copyright (C) 2002-2012 The Bochs Project
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -210,6 +210,8 @@ protected:
Bit16u host_yres; Bit16u host_yres;
Bit16u host_pitch; Bit16u host_pitch;
Bit8u host_bpp; Bit8u host_bpp;
unsigned max_xres;
unsigned max_yres;
unsigned x_tilesize; unsigned x_tilesize;
unsigned y_tilesize; unsigned y_tilesize;
Bit8u *framebuffer; Bit8u *framebuffer;

8
bochs/gui/win32.cc
View File

@ -2,7 +2,7 @@
// $Id$ // $Id$
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2002-2011 The Bochs Project // Copyright (C) 2002-2012 The Bochs Project
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -32,7 +32,6 @@
#include "param_names.h" #include "param_names.h"
#include "keymap.h" #include "keymap.h"
#include "iodev/iodev.h" #include "iodev/iodev.h"
#include "iodev/vga.h"
#if BX_WITH_WIN32 #if BX_WITH_WIN32
#include "zmouse.h" #include "zmouse.h"
@ -104,6 +103,7 @@ static bx_bool win32_nokeyrepeat = 0;
// Graphics screen stuff // Graphics screen stuff
static unsigned x_tilesize = 0, y_tilesize = 0; static unsigned x_tilesize = 0, y_tilesize = 0;
static unsigned win32_max_xres = 0, win32_max_yres = 0;
static BITMAPINFO* bitmap_info=(BITMAPINFO*)0; static BITMAPINFO* bitmap_info=(BITMAPINFO*)0;
static RGBQUAD* cmap_index; // indeces into system colormap static RGBQUAD* cmap_index; // indeces into system colormap
static HBITMAP MemoryBitmap = NULL; static HBITMAP MemoryBitmap = NULL;
@ -618,6 +618,8 @@ void bx_win32_gui_c::specific_init(int argc, char **argv, unsigned
x_tilesize = tilewidth; x_tilesize = tilewidth;
y_tilesize = tileheight; y_tilesize = tileheight;
win32_max_xres = this->max_xres;
win32_max_yres = this->max_yres;
bx_bitmap_entries = 0; bx_bitmap_entries = 0;
bx_headerbar_entries = 0; bx_headerbar_entries = 0;
@ -906,7 +908,7 @@ VOID CDECL UIThread(PVOID pvoid)
cursorWarped(); cursorWarped();
hdc = GetDC(stInfo.simWnd); hdc = GetDC(stInfo.simWnd);
MemoryBitmap = CreateCompatibleBitmap(hdc, BX_MAX_XRES, BX_MAX_YRES); MemoryBitmap = CreateCompatibleBitmap(hdc, win32_max_xres, win32_max_yres);
MemoryDC = CreateCompatibleDC(hdc); MemoryDC = CreateCompatibleDC(hdc);
ReleaseDC(stInfo.simWnd, hdc); ReleaseDC(stInfo.simWnd, hdc);