From 5868097debec0d156a62c8a0c27ba471092e8f6a Mon Sep 17 00:00:00 2001 From: helixhorned Date: Mon, 20 May 2013 19:31:18 +0000 Subject: [PATCH] Windows: allow desktop-sized windowed modes, add 1680x1050 to defaults list. git-svn-id: https://svn.eduke32.com/eduke32@3793 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/baselayer.c | 2 +- polymer/eduke32/build/src/winlayer.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/polymer/eduke32/build/src/baselayer.c b/polymer/eduke32/build/src/baselayer.c index e03943ea9..6b5869e04 100644 --- a/polymer/eduke32/build/src/baselayer.c +++ b/polymer/eduke32/build/src/baselayer.c @@ -48,7 +48,7 @@ char scantoasc[128] = int32_t defaultres[][2] = { - {1920, 1440}, {1920, 1200}, {1920, 1080}, {1600, 1200}, {1600, 900}, {1366, 768}, {1280, 1024}, + {1920, 1440}, {1920, 1200}, {1920, 1080}, {1680, 1050}, {1600, 1200}, {1600, 900}, {1366, 768}, {1280, 1024}, {1280, 960}, {1152, 864}, {1024, 768}, {1024, 600}, {800, 600}, {640, 480}, {640, 400}, {512, 384}, {480, 360}, {400, 300}, {320, 240}, {320, 200}, {0, 0} }; diff --git a/polymer/eduke32/build/src/winlayer.c b/polymer/eduke32/build/src/winlayer.c index 16c3649d9..472ac3864 100644 --- a/polymer/eduke32/build/src/winlayer.c +++ b/polymer/eduke32/build/src/winlayer.c @@ -13,9 +13,9 @@ #define bDIPROP_DEADZONE MAKEDIPROP(5) #define bDIPROP_SATURATION MAKEDIPROP(6) #else -#define bMAKEDIPROP(prop) ((REFGUID)(prop)) -#define bDIPROP_BUFFERSIZE bMAKEDIPROP(1) -#define bDIPROP_DEADZONE bMAKEDIPROP(5) +#define bMAKEDIPROP(prop) ((REFGUID)(prop)) +#define bDIPROP_BUFFERSIZE bMAKEDIPROP(1) +#define bDIPROP_DEADZONE bMAKEDIPROP(5) #define bDIPROP_SATURATION bMAKEDIPROP(6) #endif @@ -1838,9 +1838,9 @@ void getvalidmodes(void) cdsenummodes(); #endif - // windowed modes cant be bigger than the current desktop resolution - maxx = desktopxdim-1; - maxy = desktopydim-1; + // Windowed modes can be as big as the current desktop resolution, but not bigger. + maxx = desktopxdim+1; + maxy = desktopydim+1; // add windowed modes next for (j=0; j < 2; j++)