From bd20fc62a36475e7a9fff269784d0f1e5c1128b4 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Thu, 21 May 2009 19:18:38 +0000
Subject: Set display settings window position based on screen dimensions,
 rather than hard coding position.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1527
---
 setup/display.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'setup/display.c')

diff --git a/setup/display.c b/setup/display.c
index 5e9d4fcf..7bcf0d5b 100644
--- a/setup/display.c
+++ b/setup/display.c
@@ -384,7 +384,8 @@ void ConfigDisplay(void)
     
     window = TXT_NewWindow("Display Configuration");
 
-    TXT_SetWindowPosition(window, TXT_HORIZ_CENTER, TXT_VERT_TOP, 40, 5);
+    TXT_SetWindowPosition(window, TXT_HORIZ_CENTER, TXT_VERT_TOP, 
+                                  TXT_SCREEN_W / 2, 5);
 
     TXT_AddWidgets(window, 
                    fs_checkbox = TXT_NewCheckBox("Fullscreen", &fullscreen),
-- 
cgit v1.2.3


From ad9f8107f4d9d4ea636eb238205f31270cc1514a Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 16:35:43 +0000
Subject: Don't try to use the SDL DirectX driver under Windows CE.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1568
---
 setup/display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'setup/display.c')

diff --git a/setup/display.c b/setup/display.c
index 7bcf0d5b..befec91f 100644
--- a/setup/display.c
+++ b/setup/display.c
@@ -116,7 +116,7 @@ void SetDisplayDriver(void)
     }
     else
     {
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_WIN32_WCE)
         // On Windows, use DirectX over windib by default.
 
         putenv("SDL_VIDEODRIVER=directx");
-- 
cgit v1.2.3


From ef459ab99b18d26f502d423a31cd744f5bed6a88 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 17:33:19 +0000
Subject: Fix setup tool display configuration dialog when fullscreen is not
 supported.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1572
---
 setup/display.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'setup/display.c')

diff --git a/setup/display.c b/setup/display.c
index befec91f..38f301a1 100644
--- a/setup/display.c
+++ b/setup/display.c
@@ -187,7 +187,14 @@ static void BuildFullscreenModesList(void)
 
     modes = SDL_ListModes(NULL, SDL_FULLSCREEN);
 
-    for (num_modes=0; modes[num_modes] != NULL; ++num_modes);
+    if (modes == NULL || modes == (SDL_Rect **) -1)
+    {
+        num_modes = 0;
+    }
+    else
+    {
+        for (num_modes=0; modes[num_modes] != NULL; ++num_modes);
+    }
 
     // Build the screen_modes_fullscreen array
 
-- 
cgit v1.2.3


From ea3b0114bd51314ee649a74d78ce080aa581429f Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 18:18:02 +0000
Subject: Don't add DirectX/Windib selector on Windows CE.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1574
---
 setup/display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'setup/display.c')

diff --git a/setup/display.c b/setup/display.c
index 38f301a1..a0960dfe 100644
--- a/setup/display.c
+++ b/setup/display.c
@@ -312,7 +312,7 @@ static void GenerateModesTable(TXT_UNCAST_ARG(widget),
     screen_height = modes[vidmode].h;
 }
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_WIN32_WCE)
 
 static int win32_video_driver = 0;
 
@@ -405,7 +405,7 @@ void ConfigDisplay(void)
     // On Windows, there is an extra control to change between 
     // the Windows GDI and DirectX video drivers.
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_WIN32_WCE)
     {
         txt_table_t *driver_table;
         txt_dropdown_list_t *driver_list;
-- 
cgit v1.2.3


From 3a4db2509420fa89c2ee940cc0998d0d614d63a5 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Thu, 11 Jun 2009 18:19:05 +0000
Subject: Include libc_wince.h on Windows CE.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1593
---
 setup/display.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'setup/display.c')

diff --git a/setup/display.c b/setup/display.c
index a0960dfe..596b8a43 100644
--- a/setup/display.c
+++ b/setup/display.c
@@ -21,6 +21,10 @@
 
 #include <string.h>
 
+#ifdef _WIN32_WCE
+#include "libc_wince.h"
+#endif
+
 #include "textscreen.h"
 
 #include "display.h"
-- 
cgit v1.2.3