[Bochs-cvs] SF.net SVN: bochs:[11000] trunk/bochs/gui

[<vru...@us...>]

Revision: 11000
          http://bochs.svn.sourceforge.net/bochs/?rev=11000&view=rev
Author:   vruppert
Date:     2012-01-22 09:08:59 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
- store max. x / y resolution in the gui object and use it in win32.cc. Now it
  no longer needs to incluse vga.h

Modified Paths:
--------------
    trunk/bochs/gui/Makefile.in
    trunk/bochs/gui/gui.cc
    trunk/bochs/gui/gui.h
    trunk/bochs/gui/win32.cc

Modified: trunk/bochs/gui/Makefile.in
===================================================================
--- trunk/bochs/gui/Makefile.in	2012-01-21 20:54:55 UTC (rev 10999)
+++ trunk/bochs/gui/Makefile.in	2012-01-22 09:08:59 UTC (rev 11000)
@@ -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
 # modify it under the terms of the GNU Lesser General Public
@@ -253,7 +253,7 @@
   ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \
   ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.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
 win32_enh_dbg_osdep.o: win32_enh_dbg_osdep.@CPP_SUFFIX@ ../config.h
 win32paramdlg.o: win32paramdlg.@CPP_SUFFIX@ win32dialog.h ../config.h
@@ -351,7 +351,7 @@
   ../config.h ../osdep.h ../bxversion.h ../gui/siminterface.h \
   ../gui/paramtree.h ../memory/memory.h ../pc_system.h ../plugin.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
 win32_enh_dbg_osdep.lo: win32_enh_dbg_osdep.@CPP_SUFFIX@ ../config.h
 win32paramdlg.lo: win32paramdlg.@CPP_SUFFIX@ win32dialog.h ../config.h

Modified: trunk/bochs/gui/gui.cc
===================================================================
--- trunk/bochs/gui/gui.cc	2012-01-21 20:54:55 UTC (rev 10999)
+++ trunk/bochs/gui/gui.cc	2012-01-22 09:08:59 UTC (rev 11000)
@@ -2,7 +2,7 @@
 // $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
 //  modify it under the terms of the GNU Lesser General Public
@@ -115,6 +115,8 @@
   BX_GUI_THIS host_xres = 640;
   BX_GUI_THIS host_yres = 480;
   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 y_tilesize = tileheight;
   BX_GUI_THIS dialog_caps = BX_GUI_DLG_RUNTIME | BX_GUI_DLG_SAVE_RESTORE;

Modified: trunk/bochs/gui/gui.h
===================================================================
--- trunk/bochs/gui/gui.h	2012-01-21 20:54:55 UTC (rev 10999)
+++ trunk/bochs/gui/gui.h	2012-01-22 09:08:59 UTC (rev 11000)
@@ -2,7 +2,7 @@
 // $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
 //  modify it under the terms of the GNU Lesser General Public
@@ -210,6 +210,8 @@
   Bit16u host_yres;
   Bit16u host_pitch;
   Bit8u host_bpp;
+  unsigned max_xres;
+  unsigned max_yres;
   unsigned x_tilesize;
   unsigned y_tilesize;
   Bit8u *framebuffer;

Modified: trunk/bochs/gui/win32.cc
===================================================================
--- trunk/bochs/gui/win32.cc	2012-01-21 20:54:55 UTC (rev 10999)
+++ trunk/bochs/gui/win32.cc	2012-01-22 09:08:59 UTC (rev 11000)
@@ -2,7 +2,7 @@
 // $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
 //  modify it under the terms of the GNU Lesser General Public
@@ -32,7 +32,6 @@
 #include "param_names.h"
 #include "keymap.h"
 #include "iodev/iodev.h"
-#include "iodev/vga.h"
 #if BX_WITH_WIN32
 
 #include "zmouse.h"
@@ -104,6 +103,7 @@
 
 // Graphics screen stuff
 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 RGBQUAD* cmap_index;  // indeces into system colormap
 static HBITMAP MemoryBitmap = NULL;
@@ -618,6 +618,8 @@
 
   x_tilesize = tilewidth;
   y_tilesize = tileheight;
+  win32_max_xres = this->max_xres;
+  win32_max_yres = this->max_yres;
 
   bx_bitmap_entries = 0;
   bx_headerbar_entries = 0;
@@ -906,7 +908,7 @@
     cursorWarped();
 
     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);
     ReleaseDC(stInfo.simWnd, hdc);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.