From 7b70d415d1acf162e6fe6f136148cf30ba4e3daa Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Tue, 26 May 2009 21:13:18 +0000
Subject: Set appropriate vim 'tags' variable for ctags files.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1531
---
 .lvimrc | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/.lvimrc b/.lvimrc
index e37c50f9..cc2893d9 100644
--- a/.lvimrc
+++ b/.lvimrc
@@ -4,3 +4,28 @@ set tabstop=8
 set softtabstop=4
 set shiftwidth=4
 
+" Add all tag files to tags path.
+
+let topdir = findfile("configure.in", ".;")
+let topdir = substitute(topdir, "configure.in", "", "")
+
+" Check tags file in current dir:
+set tags+=tags
+
+" Add tag files in parent directories:
+let tagfiles = findfile("tags", ".;", -1)
+
+" Add tag files for libraries:
+call add(tagfiles, topdir . "textscreen/tags")
+call add(tagfiles, topdir . "pcsound/tags")
+
+for tagfile in tagfiles
+    " Don't go beyond the project top level when adding parent dirs:
+    if stridx(tagfile, topdir) >= 0
+        exec "set tags+=" . tagfile
+    endif
+endfor
+
+unlet topdir
+unlet tagfiles
+
-- 
cgit v1.2.3


From 0be19fa1fe7fabc04b8fbd593a660fdc85f57d87 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Tue, 26 May 2009 22:14:24 +0000
Subject: Fix tags for functions using TXT_UNCAST_ARG.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1532
---
 textscreen/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/textscreen/Makefile.am b/textscreen/Makefile.am
index 5d177111..b8904520 100644
--- a/textscreen/Makefile.am
+++ b/textscreen/Makefile.am
@@ -1,6 +1,8 @@
 
 AM_CFLAGS = -I../src
 
+CTAGS_ARGS=-I TXT_UNCAST_ARG+
+
 # build this directory before the examples directory.
 
 SUBDIRS= . examples
-- 
cgit v1.2.3


From 0794d30b63dbdb3eeb8c2cbed67316a1b4e7c885 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 3 Jun 2009 19:37:19 +0000
Subject: Add key_ variables for the keys used to control the menu.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1542
---
 src/m_menu.c | 232 ++++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 152 insertions(+), 80 deletions(-)

diff --git a/src/m_menu.c b/src/m_menu.c
index aab2afce..dc182569 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -71,6 +71,35 @@ extern boolean		message_dontfuckwithme;
 
 extern boolean		chat_on;		// in heads-up code
 
+//
+// menu keys:
+//
+
+int key_menu_activate  = KEY_ESCAPE;
+int key_menu_up        = KEY_UPARROW;
+int key_menu_down      = KEY_DOWNARROW;
+int key_menu_left      = KEY_LEFTARROW;
+int key_menu_right     = KEY_RIGHTARROW;
+int key_menu_back      = KEY_BACKSPACE;
+int key_menu_forward   = KEY_ENTER;
+int key_menu_confirm   = 'y';
+int key_menu_abort     = 'n';
+
+int key_menu_help      = KEY_F1;
+int key_menu_save      = KEY_F2;
+int key_menu_load      = KEY_F3;
+int key_menu_volume    = KEY_F4;
+int key_menu_detail    = KEY_F5;
+int key_menu_qsave     = KEY_F6;
+int key_menu_endgame   = KEY_F7;
+int key_menu_messages  = KEY_F8;
+int key_menu_qload     = KEY_F9;
+int key_menu_quit      = KEY_F10;
+int key_menu_gamma     = KEY_F11;
+
+int key_menu_incscreen = KEY_EQUALS;
+int key_menu_decscreen = KEY_MINUS;
+
 //
 // defaulted values
 //
@@ -672,9 +701,9 @@ void M_SaveGame (int choice)
 //
 char    tempstring[80];
 
-void M_QuickSaveResponse(int ch)
+void M_QuickSaveResponse(int key)
 {
-    if (ch == 'y')
+    if (key == key_menu_confirm)
     {
 	M_DoSave(quickSaveSlot);
 	S_StartSound(NULL,sfx_swtchx);
@@ -709,9 +738,9 @@ void M_QuickSave(void)
 //
 // M_QuickLoad
 //
-void M_QuickLoadResponse(int ch)
+void M_QuickLoadResponse(int key)
 {
-    if (ch == 'y')
+    if (key == key_menu_confirm)
     {
 	M_LoadSelect(quickSaveSlot);
 	S_StartSound(NULL,sfx_swtchx);
@@ -924,9 +953,9 @@ void M_DrawEpisode(void)
     V_DrawPatchDirect (54,38,0,W_CacheLumpName(DEH_String("M_EPISOD"),PU_CACHE));
 }
 
-void M_VerifyNightmare(int ch)
+void M_VerifyNightmare(int key)
 {
-    if (ch != 'y')
+    if (key != key_menu_confirm)
 	return;
 		
     G_DeferedInitNew(nightmare,epi+1,1);
@@ -1024,9 +1053,9 @@ void M_ChangeMessages(int choice)
 //
 // M_EndGame
 //
-void M_EndGameResponse(int ch)
+void M_EndGameResponse(int key)
 {
-    if (ch != 'y')
+    if (key != key_menu_confirm)
 	return;
 		
     currentMenu->lastOn = itemOn;
@@ -1120,9 +1149,9 @@ int     quitsounds2[8] =
 
 
 
-void M_QuitResponse(int ch)
+void M_QuitResponse(int key)
 {
-    if (ch != 'y')
+    if (key != key_menu_confirm)
 	return;
     if (!netgame)
     {
@@ -1421,34 +1450,34 @@ boolean M_Responder (event_t* ev)
     {
 	if (ev->data3 == -1)
 	{
-	    key = KEY_UPARROW;
+	    key = key_menu_up;
 	    joywait = I_GetTime() + 5;
 	}
 	else if (ev->data3 == 1)
 	{
-	    key = KEY_DOWNARROW;
+	    key = key_menu_down;
 	    joywait = I_GetTime() + 5;
 	}
 		
 	if (ev->data2 == -1)
 	{
-	    key = KEY_LEFTARROW;
+	    key = key_menu_left;
 	    joywait = I_GetTime() + 2;
 	}
 	else if (ev->data2 == 1)
 	{
-	    key = KEY_RIGHTARROW;
+	    key = key_menu_right;
 	    joywait = I_GetTime() + 2;
 	}
 		
 	if (ev->data1&1)
 	{
-	    key = KEY_ENTER;
+	    key = key_menu_forward;
 	    joywait = I_GetTime() + 5;
 	}
 	if (ev->data1&2)
 	{
-	    key = KEY_BACKSPACE;
+	    key = key_menu_back;
 	    joywait = I_GetTime() + 5;
 	}
     }
@@ -1459,13 +1488,13 @@ boolean M_Responder (event_t* ev)
 	    mousey += ev->data3;
 	    if (mousey < lasty-30)
 	    {
-		key = KEY_DOWNARROW;
+		key = key_menu_down;
 		mousewait = I_GetTime() + 5;
 		mousey = lasty -= 30;
 	    }
 	    else if (mousey > lasty+30)
 	    {
-		key = KEY_UPARROW;
+		key = key_menu_up;
 		mousewait = I_GetTime() + 5;
 		mousey = lasty += 30;
 	    }
@@ -1473,26 +1502,26 @@ boolean M_Responder (event_t* ev)
 	    mousex += ev->data2;
 	    if (mousex < lastx-30)
 	    {
-		key = KEY_LEFTARROW;
+		key = key_menu_left;
 		mousewait = I_GetTime() + 5;
 		mousex = lastx -= 30;
 	    }
 	    else if (mousex > lastx+30)
 	    {
-		key = KEY_RIGHTARROW;
+		key = key_menu_right;
 		mousewait = I_GetTime() + 5;
 		mousex = lastx += 30;
 	    }
 		
 	    if (ev->data1&1)
 	    {
-		key = KEY_ENTER;
+		key = key_menu_forward;
 		mousewait = I_GetTime() + 15;
 	    }
 			
 	    if (ev->data1&2)
 	    {
-		key = KEY_BACKSPACE;
+		key = key_menu_back;
 		mousewait = I_GetTime() + 15;
 	    }
 	}
@@ -1514,7 +1543,7 @@ boolean M_Responder (event_t* ev)
 
     if (testcontrols)
     {
-        if (key == KEY_ESCAPE || key == KEY_F10)
+        if (key == key_menu_activate || key == key_menu_quit)
         {
             I_Quit();
             return true;
@@ -1574,121 +1603,136 @@ boolean M_Responder (event_t* ev)
     // Take care of any messages that need input
     if (messageToPrint)
     {
-	if (messageNeedsInput == true &&
-	    !(ch == ' ' || ch == 'n' || ch == 'y' || key == KEY_ESCAPE))
-	    return false;
-		
+	if (messageNeedsInput)
+        {
+            if (ch != ' ' && ch != KEY_ESCAPE
+             && ch != key_menu_confirm && ch != key_menu_abort)
+            {
+                return false;
+            }
+	}
+
 	menuactive = messageLastMenuActive;
 	messageToPrint = 0;
 	if (messageRoutine)
 	    messageRoutine(ch);
-			
+
 	menuactive = false;
 	S_StartSound(NULL,sfx_swtchx);
 	return true;
     }
-	
-    if (devparm && key == KEY_F1)
+
+    if (devparm && key == key_menu_help)
     {
 	G_ScreenShot ();
 	return true;
     }
-		
-    
+
     // F-Keys
     if (!menuactive)
-	switch(key)
-	{
-	  case KEY_MINUS:         // Screen size down
+    {
+	if (key == key_menu_decscreen)      // Screen size down
+        {
 	    if (automapactive || chat_on)
 		return false;
 	    M_SizeDisplay(0);
 	    S_StartSound(NULL,sfx_stnmov);
 	    return true;
-				
-	  case KEY_EQUALS:        // Screen size up
+	}
+        else if (key == key_menu_incscreen) // Screen size up
+        {
 	    if (automapactive || chat_on)
 		return false;
 	    M_SizeDisplay(1);
 	    S_StartSound(NULL,sfx_stnmov);
 	    return true;
-				
-	  case KEY_F1:            // Help key
+	}
+        else if (key == key_menu_help)     // Help key
+        {
 	    M_StartControlPanel ();
 
 	    if ( gamemode == retail )
 	      currentMenu = &ReadDef2;
 	    else
 	      currentMenu = &ReadDef1;
-	    
+
 	    itemOn = 0;
 	    S_StartSound(NULL,sfx_swtchn);
 	    return true;
-				
-	  case KEY_F2:            // Save
+	}
+        else if (key == key_menu_save)     // Save
+        {
 	    M_StartControlPanel();
 	    S_StartSound(NULL,sfx_swtchn);
 	    M_SaveGame(0);
 	    return true;
-				
-	  case KEY_F3:            // Load
+        }
+        else if (key == key_menu_load)     // Load
+        {
 	    M_StartControlPanel();
 	    S_StartSound(NULL,sfx_swtchn);
 	    M_LoadGame(0);
 	    return true;
-				
-	  case KEY_F4:            // Sound Volume
+        }
+        else if (key == key_menu_volume)   // Sound Volume
+        {
 	    M_StartControlPanel ();
 	    currentMenu = &SoundDef;
 	    itemOn = sfx_vol;
 	    S_StartSound(NULL,sfx_swtchn);
 	    return true;
-				
-	  case KEY_F5:            // Detail toggle
+	}
+        else if (key == key_menu_detail)   // Detail toggle
+        {
 	    M_ChangeDetail(0);
 	    S_StartSound(NULL,sfx_swtchn);
 	    return true;
-				
-	  case KEY_F6:            // Quicksave
+        }
+        else if (key == key_menu_qsave)    // Quicksave
+        {
 	    S_StartSound(NULL,sfx_swtchn);
 	    M_QuickSave();
 	    return true;
-				
-	  case KEY_F7:            // End game
+        }
+        else if (key == key_menu_endgame)  // End game
+        {
 	    S_StartSound(NULL,sfx_swtchn);
 	    M_EndGame(0);
 	    return true;
-				
-	  case KEY_F8:            // Toggle messages
+        }
+        else if (key == key_menu_messages) // Toggle messages
+        {
 	    M_ChangeMessages(0);
 	    S_StartSound(NULL,sfx_swtchn);
 	    return true;
-				
-	  case KEY_F9:            // Quickload
+        }
+        else if (key == key_menu_qload)    // Quickload
+        {
 	    S_StartSound(NULL,sfx_swtchn);
 	    M_QuickLoad();
 	    return true;
-				
-	  case KEY_F10:           // Quit DOOM
+        }
+        else if (key == key_menu_quit)     // Quit DOOM
+        {
 	    S_StartSound(NULL,sfx_swtchn);
 	    M_QuitDOOM(0);
 	    return true;
-				
-	  case KEY_F11:           // gamma toggle
+        }
+        else if (key == key_menu_gamma)    // gamma toggle
+        {
 	    usegamma++;
 	    if (usegamma > 4)
 		usegamma = 0;
 	    players[consoleplayer].message = DEH_String(gammamsg[usegamma]);
             I_SetPalette (W_CacheLumpName (DEH_String("PLAYPAL"),PU_CACHE));
 	    return true;
-				
 	}
+    }
 
-    
     // Pop-up menu?
     if (!menuactive)
     {
-	if (key == KEY_ESCAPE)
+	if (key == key_menu_activate)
 	{
 	    M_StartControlPanel ();
 	    S_StartSound(NULL,sfx_swtchn);
@@ -1699,19 +1743,25 @@ boolean M_Responder (event_t* ev)
 
     
     // Keys usable within menu
-    switch (key)
+
+    if (key == key_menu_down)
     {
-      case KEY_DOWNARROW:
-	do
+        // Move down to next item
+
+        do
 	{
 	    if (itemOn+1 > currentMenu->numitems-1)
 		itemOn = 0;
 	    else itemOn++;
 	    S_StartSound(NULL,sfx_pstop);
 	} while(currentMenu->menuitems[itemOn].status==-1);
+
 	return true;
-		
-      case KEY_UPARROW:
+    }
+    else if (key == key_menu_up)
+    {
+        // Move back up to previous item
+
 	do
 	{
 	    if (!itemOn)
@@ -1719,9 +1769,13 @@ boolean M_Responder (event_t* ev)
 	    else itemOn--;
 	    S_StartSound(NULL,sfx_pstop);
 	} while(currentMenu->menuitems[itemOn].status==-1);
+
 	return true;
+    }
+    else if (key == key_menu_left)
+    {
+        // Slide slider left
 
-      case KEY_LEFTARROW:
 	if (currentMenu->menuitems[itemOn].routine &&
 	    currentMenu->menuitems[itemOn].status == 2)
 	{
@@ -1729,8 +1783,11 @@ boolean M_Responder (event_t* ev)
 	    currentMenu->menuitems[itemOn].routine(0);
 	}
 	return true;
-		
-      case KEY_RIGHTARROW:
+    }
+    else if (key == key_menu_right)
+    {
+        // Slide slider right
+
 	if (currentMenu->menuitems[itemOn].routine &&
 	    currentMenu->menuitems[itemOn].status == 2)
 	{
@@ -1738,8 +1795,11 @@ boolean M_Responder (event_t* ev)
 	    currentMenu->menuitems[itemOn].routine(1);
 	}
 	return true;
+    }
+    else if (key == key_menu_forward)
+    {
+        // Activate menu item
 
-      case KEY_ENTER:
 	if (currentMenu->menuitems[itemOn].routine &&
 	    currentMenu->menuitems[itemOn].status)
 	{
@@ -1756,14 +1816,20 @@ boolean M_Responder (event_t* ev)
 	    }
 	}
 	return true;
-		
-      case KEY_ESCAPE:
+    }
+    else if (key == key_menu_activate)
+    {
+        // Deactivate menu
+
 	currentMenu->lastOn = itemOn;
 	M_ClearMenus ();
 	S_StartSound(NULL,sfx_swtchx);
 	return true;
-		
-      case KEY_BACKSPACE:
+    }
+    else if (key == key_menu_back)
+    {
+        // Go back to previous menu
+
 	currentMenu->lastOn = itemOn;
 	if (currentMenu->prevMenu)
 	{
@@ -1772,24 +1838,30 @@ boolean M_Responder (event_t* ev)
 	    S_StartSound(NULL,sfx_swtchn);
 	}
 	return true;
-	
-      default:
+    }
+    else
+    {
+        // Keyboard shortcut?
+
 	for (i = itemOn+1;i < currentMenu->numitems;i++)
+        {
 	    if (currentMenu->menuitems[i].alphaKey == ch)
 	    {
 		itemOn = i;
 		S_StartSound(NULL,sfx_pstop);
 		return true;
 	    }
+        }
+
 	for (i = 0;i <= itemOn;i++)
+        {
 	    if (currentMenu->menuitems[i].alphaKey == ch)
 	    {
 		itemOn = i;
 		S_StartSound(NULL,sfx_pstop);
 		return true;
 	    }
-	break;
-	
+        }
     }
 
     return false;
-- 
cgit v1.2.3


From 5a19f1d85430f2cb3a4812842c834f2d6e41e0f4 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 3 Jun 2009 19:55:50 +0000
Subject: Add configuration file entries for menu key bindings.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1543
---
 src/m_config.c | 148 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 148 insertions(+)

diff --git a/src/m_config.c b/src/m_config.c
index 4066cb3c..8acdf415 100644
--- a/src/m_config.c
+++ b/src/m_config.c
@@ -87,6 +87,33 @@ extern int	key_use;
 extern int	key_strafe;
 extern int	key_speed;
 
+// Menu control keys:
+
+extern int key_menu_activate;
+extern int key_menu_up;
+extern int key_menu_down;
+extern int key_menu_left;
+extern int key_menu_right;
+extern int key_menu_back;
+extern int key_menu_forward;
+extern int key_menu_confirm;
+extern int key_menu_abort;
+
+extern int key_menu_help;
+extern int key_menu_save;
+extern int key_menu_load;
+extern int key_menu_volume;
+extern int key_menu_detail;
+extern int key_menu_qsave;
+extern int key_menu_endgame;
+extern int key_menu_messages;
+extern int key_menu_qload;
+extern int key_menu_quit;
+extern int key_menu_gamma;
+
+extern int key_menu_incscreen;
+extern int key_menu_decscreen;
+
 extern int	mousebfire;
 extern int	mousebstrafe;
 extern int	mousebforward;
@@ -710,6 +737,127 @@ static default_t extra_defaults_list[] =
     //
 
     CONFIG_VARIABLE_INT(use_libsamplerate,         use_libsamplerate),
+
+    //!
+    // Key that activates the menu when pressed.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_activate,         key_menu_activate),
+
+    //!
+    // Key that moves the cursor up on the menu.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_up,               key_menu_up),
+
+    //!
+    // Key that moves the cursor down on the menu.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_down,             key_menu_down),
+
+    //!
+    // Key that moves the currently selected slider on the menu left.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_left,             key_menu_left),
+
+    //!
+    // Key that moves the currently selected slider on the menu right.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_right,            key_menu_right),
+
+    //!
+    // Key to go back to the previous menu.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_back,             key_menu_back),
+
+    //!
+    // Key to activate the currently selected menu item.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_forward,          key_menu_forward),
+
+    //!
+    // Key to answer 'yes' to a question in the menu.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_confirm,          key_menu_confirm),
+
+    //!
+    // Key to answer 'no' to a question in the menu.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_abort,            key_menu_abort),
+
+    //!
+    // Keyboard shortcut to bring up the help screen.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_help,             key_menu_help),
+
+    //!
+    // Keyboard shortcut to bring up the save game menu.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_save,             key_menu_save),
+
+    //!
+    // Keyboard shortcut to bring up the load game menu.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_load,             key_menu_load),
+
+    //!
+    // Keyboard shortcut to bring up the sound volume menu.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_volume,           key_menu_volume),
+
+    //!
+    // Keyboard shortcut to toggle the detail level.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_detail,           key_menu_detail),
+
+    //!
+    // Keyboard shortcut to quicksave the current game.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_qsave,            key_menu_qsave),
+
+    //!
+    // Keyboard shortcut to end the game.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_endgame,          key_menu_endgame),
+
+    //!
+    // Keyboard shortcut to toggle heads-up messages.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_messages,         key_menu_messages),
+
+    //!
+    // Keyboard shortcut to load the last quicksave.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_qload,            key_menu_qload),
+
+    //!
+    // Keyboard shortcut to quit the game.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_quit,             key_menu_quit),
+
+    //!
+    // Keyboard shortcut to toggle the gamma correction level.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_gamma,            key_menu_gamma),
+
 };
 
 static default_collection_t extra_defaults =
-- 
cgit v1.2.3


From b3a03a40660e7bc4cbc2720aeb5c9c35c5de030a Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 3 Jun 2009 19:59:26 +0000
Subject: Fix shortcut keys for menu items.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1544
---
 src/m_menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/m_menu.c b/src/m_menu.c
index dc182569..6809e6c0 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1839,7 +1839,7 @@ boolean M_Responder (event_t* ev)
 	}
 	return true;
     }
-    else
+    else if (ch != 0)
     {
         // Keyboard shortcut?
 
-- 
cgit v1.2.3


From 334af5fd565c261f070a42d17a1429cfca1b6651 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 3 Jun 2009 20:18:04 +0000
Subject: Add config file variables to increase/decrease screen size.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1545
---
 src/m_config.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/m_config.c b/src/m_config.c
index 8acdf415..251588a1 100644
--- a/src/m_config.c
+++ b/src/m_config.c
@@ -858,6 +858,18 @@ static default_t extra_defaults_list[] =
 
     CONFIG_VARIABLE_KEY(key_menu_gamma,            key_menu_gamma),
 
+    //!
+    // Keyboard shortcut to increase the screen size.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_incscreen,        key_menu_incscreen),
+
+    //!
+    // Keyboard shortcut to decrease the screen size.
+    //
+
+    CONFIG_VARIABLE_KEY(key_menu_decscreen,        key_menu_decscreen),
+
 };
 
 static default_collection_t extra_defaults =
-- 
cgit v1.2.3


From adcd838e72854528dec15016b32b6e0bfa292fcd Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 3 Jun 2009 20:45:54 +0000
Subject: Add dialog to setup tool for editing menu shortcuts.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1546
---
 setup/configfile.c | 23 +++++++++++++++
 setup/keyboard.c   | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 setup/keyboard.h   | 25 ++++++++++++++++
 3 files changed, 134 insertions(+), 1 deletion(-)

diff --git a/setup/configfile.c b/setup/configfile.c
index 3f75d7f1..97e06744 100644
--- a/setup/configfile.c
+++ b/setup/configfile.c
@@ -239,6 +239,7 @@ static default_t doom_defaults_list[] =
     {"chatmacro7", &chat_macros[7], DEFAULT_STRING, 0, 0 },
     {"chatmacro8", &chat_macros[8], DEFAULT_STRING, 0, 0 },
     {"chatmacro9", &chat_macros[9], DEFAULT_STRING, 0, 0 },
+
 };
 
 static default_collection_t doom_defaults = 
@@ -282,6 +283,28 @@ static default_t extra_defaults_list[] =
     {"mouseb_use",                  &mousebuse, DEFAULT_INT, 0, 0},
     {"mouseb_backward",             &mousebbackward, DEFAULT_INT, 0, 0},
     {"use_libsamplerate",           &use_libsamplerate, DEFAULT_INT, 0, 0},
+    {"key_menu_activate",           &key_menu_activate, DEFAULT_KEY, 0, 0},
+    {"key_menu_up",                 &key_menu_up, DEFAULT_KEY, 0, 0},
+    {"key_menu_down",               &key_menu_down, DEFAULT_KEY, 0, 0},
+    {"key_menu_left",               &key_menu_left, DEFAULT_KEY, 0, 0},
+    {"key_menu_right",              &key_menu_right, DEFAULT_KEY, 0, 0},
+    {"key_menu_back",               &key_menu_back, DEFAULT_KEY, 0, 0},
+    {"key_menu_forward",            &key_menu_forward, DEFAULT_KEY, 0, 0},
+    {"key_menu_confirm",            &key_menu_confirm, DEFAULT_KEY, 0, 0},
+    {"key_menu_abort",              &key_menu_abort, DEFAULT_KEY, 0, 0},
+    {"key_menu_help",               &key_menu_help, DEFAULT_KEY, 0, 0},
+    {"key_menu_save",               &key_menu_save, DEFAULT_KEY, 0, 0},
+    {"key_menu_load",               &key_menu_load, DEFAULT_KEY, 0, 0},
+    {"key_menu_volume",             &key_menu_volume, DEFAULT_KEY, 0, 0},
+    {"key_menu_detail",             &key_menu_detail, DEFAULT_KEY, 0, 0},
+    {"key_menu_qsave",              &key_menu_qsave, DEFAULT_KEY, 0, 0},
+    {"key_menu_endgame",            &key_menu_endgame, DEFAULT_KEY, 0, 0},
+    {"key_menu_messages",           &key_menu_messages, DEFAULT_KEY, 0, 0},
+    {"key_menu_qload",              &key_menu_qload, DEFAULT_KEY, 0, 0},
+    {"key_menu_quit",               &key_menu_quit, DEFAULT_KEY, 0, 0},
+    {"key_menu_gamma",              &key_menu_gamma, DEFAULT_KEY, 0, 0},
+    {"key_menu_incscreen",          &key_menu_incscreen, DEFAULT_KEY, 0, 0},
+    {"key_menu_decscreen",          &key_menu_decscreen, DEFAULT_KEY, 0, 0},
 };
 
 static default_collection_t extra_defaults =
diff --git a/setup/keyboard.c b/setup/keyboard.c
index 3a7ccb8f..c4d4fbec 100644
--- a/setup/keyboard.c
+++ b/setup/keyboard.c
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 // 02111-1307, USA.
 //
+
 #include "textscreen.h"
 #include "doomtype.h"
 
@@ -38,6 +39,33 @@ int key_use = ' ';
 int key_strafe = KEY_RALT;
 int key_speed = KEY_RSHIFT;
 
+// Menu keys:
+
+int key_menu_activate  = KEY_ESCAPE;
+int key_menu_up        = KEY_UPARROW;
+int key_menu_down      = KEY_DOWNARROW;
+int key_menu_left      = KEY_LEFTARROW;
+int key_menu_right     = KEY_RIGHTARROW;
+int key_menu_back      = KEY_BACKSPACE;
+int key_menu_forward   = KEY_ENTER;
+int key_menu_confirm   = 'y';
+int key_menu_abort     = 'n';
+
+int key_menu_help      = KEY_F1;
+int key_menu_save      = KEY_F2;
+int key_menu_load      = KEY_F3;
+int key_menu_volume    = KEY_F4;
+int key_menu_detail    = KEY_F5;
+int key_menu_qsave     = KEY_F6;
+int key_menu_endgame   = KEY_F7;
+int key_menu_messages  = KEY_F8;
+int key_menu_qload     = KEY_F9;
+int key_menu_quit      = KEY_F10;
+int key_menu_gamma     = KEY_F11;
+
+int key_menu_incscreen = KEY_EQUALS;
+int key_menu_decscreen = KEY_MINUS;
+
 int vanilla_keyboard_mapping = 1;
 
 static int always_run = 0;
@@ -86,16 +114,72 @@ static void KeySetCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(variable))
     }
 }
 
-static void AddKeyControl(txt_table_t *table, char *name, int *var)
+// Add a label and keyboard input to the specified table.
+
+static txt_key_input_t *AddKeyInput(txt_table_t *table, char *name, int *var)
 {
     txt_key_input_t *key_input;
 
     TXT_AddWidget(table, TXT_NewLabel(name));
     key_input = TXT_NewKeyInput(var);
     TXT_AddWidget(table, key_input);
+
+    return key_input;
+}
+
+// Add a keyboard input for a game control.  Each key can only be bound
+// to one game control at a time.
+
+static void AddKeyControl(txt_table_t *table, char *name, int *var)
+{
+    txt_key_input_t *key_input;
+
+    key_input = AddKeyInput(table, name, var);
     TXT_SignalConnect(key_input, "set", KeySetCallback, var);
 }
 
+static void MenuKeysDialog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
+{
+    txt_window_t *window;
+    txt_table_t *table;
+    txt_scrollpane_t *scrollpane;
+
+    window = TXT_NewWindow("Menu keys");
+
+    table = TXT_NewTable(2);
+
+    TXT_SetColumnWidths(table, 25, 10);
+
+    AddKeyInput(table, "Activate menu",         &key_menu_activate);
+    AddKeyInput(table, "Move cursor up",        &key_menu_up);
+    AddKeyInput(table, "Move cursor down",      &key_menu_down);
+    AddKeyInput(table, "Move slider left",      &key_menu_left);
+    AddKeyInput(table, "Move slider right",     &key_menu_right);
+    AddKeyInput(table, "Go to previous menu",   &key_menu_back);
+    AddKeyInput(table, "Activate menu item",    &key_menu_forward);
+    AddKeyInput(table, "Confirm action",        &key_menu_confirm);
+    AddKeyInput(table, "Cancel action",         &key_menu_abort);
+
+    AddKeyInput(table, "Help screen",           &key_menu_help);
+    AddKeyInput(table, "Save game",             &key_menu_save);
+    AddKeyInput(table, "Load game",             &key_menu_load);
+    AddKeyInput(table, "Sound volume",          &key_menu_volume);
+    AddKeyInput(table, "Toggle detail",         &key_menu_detail);
+    AddKeyInput(table, "Quick save",            &key_menu_qsave);
+    AddKeyInput(table, "End game",              &key_menu_endgame);
+    AddKeyInput(table, "Toggle messages",       &key_menu_messages);
+    AddKeyInput(table, "Quick load",            &key_menu_qload);
+    AddKeyInput(table, "Quit game",             &key_menu_quit);
+    AddKeyInput(table, "Toggle gamma",          &key_menu_gamma);
+
+    AddKeyInput(table, "Increase screen size",  &key_menu_incscreen);
+    AddKeyInput(table, "Decrease screen size",  &key_menu_decscreen);
+
+    scrollpane = TXT_NewScrollPane(0, 10, table);
+
+    TXT_AddWidget(window, scrollpane);
+}
+
 void ConfigKeyboard(void)
 {
     txt_window_t *window;
@@ -113,6 +197,7 @@ void ConfigKeyboard(void)
 
                    TXT_NewSeparator("Action"),
                    action_table = TXT_NewTable(2),
+                   TXT_NewButton2("Menu keys...", MenuKeysDialog, NULL),
 
                    TXT_NewSeparator("Misc."),
                    run_control = TXT_NewCheckBox("Always run", &always_run),
diff --git a/setup/keyboard.h b/setup/keyboard.h
index 6442e1e4..19ce7147 100644
--- a/setup/keyboard.h
+++ b/setup/keyboard.h
@@ -35,6 +35,31 @@ extern int key_speed;
 extern int joybspeed;
 extern int vanilla_keyboard_mapping;
 
+extern int key_menu_activate;
+extern int key_menu_up;
+extern int key_menu_down;
+extern int key_menu_left;
+extern int key_menu_right;
+extern int key_menu_back;
+extern int key_menu_forward;
+extern int key_menu_confirm;
+extern int key_menu_abort;
+
+extern int key_menu_help;
+extern int key_menu_save;
+extern int key_menu_load;
+extern int key_menu_volume;
+extern int key_menu_detail;
+extern int key_menu_qsave;
+extern int key_menu_endgame;
+extern int key_menu_messages;
+extern int key_menu_qload;
+extern int key_menu_quit;
+extern int key_menu_gamma;
+
+extern int key_menu_incscreen;
+extern int key_menu_decscreen;
+
 void ConfigKeyboard(void);
 
 #endif /* #ifndef SETUP_KEYBOARD_H */
-- 
cgit v1.2.3


From 500bcb6919887185f4f98763a36c5c243e11bae5 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 3 Jun 2009 23:20:06 +0000
Subject: Use key for confirming menu messages, not typed char.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1547
---
 src/m_menu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/m_menu.c b/src/m_menu.c
index 6809e6c0..1ced1d16 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1605,8 +1605,8 @@ boolean M_Responder (event_t* ev)
     {
 	if (messageNeedsInput)
         {
-            if (ch != ' ' && ch != KEY_ESCAPE
-             && ch != key_menu_confirm && ch != key_menu_abort)
+            if (key != ' ' && key != KEY_ESCAPE
+             && key != key_menu_confirm && key != key_menu_abort)
             {
                 return false;
             }
@@ -1615,7 +1615,7 @@ boolean M_Responder (event_t* ev)
 	menuactive = messageLastMenuActive;
 	messageToPrint = 0;
 	if (messageRoutine)
-	    messageRoutine(ch);
+	    messageRoutine(key);
 
 	menuactive = false;
 	S_StartSound(NULL,sfx_swtchx);
-- 
cgit v1.2.3


From 3c2e7735a0134c5ce6af9624b65b7f3d27c752f1 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 3 Jun 2009 23:20:37 +0000
Subject: Add unique key groups for menu navigation and shortcuts.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1548
---
 setup/keyboard.c | 137 ++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 85 insertions(+), 52 deletions(-)

diff --git a/setup/keyboard.c b/setup/keyboard.c
index c4d4fbec..2e791c7a 100644
--- a/setup/keyboard.c
+++ b/setup/keyboard.c
@@ -70,9 +70,21 @@ int vanilla_keyboard_mapping = 1;
 
 static int always_run = 0;
 
-static int *allkeys[] = {&key_left, &key_right, &key_up, &key_down, 
-                         &key_strafeleft, &key_straferight, &key_fire, 
-                         &key_use, &key_strafe, &key_speed};
+// Keys within these groups cannot have the same value.
+
+static int *controls[] = { &key_left, &key_right, &key_up, &key_down,
+                           &key_strafeleft, &key_straferight, &key_fire,
+                           &key_use, &key_strafe, &key_speed, NULL };
+
+static int *menu_nav[] = { &key_menu_activate, &key_menu_up, &key_menu_down,
+                           &key_menu_left, &key_menu_right, &key_menu_back,
+                           &key_menu_forward, NULL };
+
+static int *shortcuts[] = { &key_menu_help, &key_menu_save, &key_menu_load,
+                            &key_menu_volume, &key_menu_detail, &key_menu_qsave,
+                            &key_menu_endgame, &key_menu_messages,
+                            &key_menu_qload, &key_menu_quit, &key_menu_gamma,
+                            &key_menu_incscreen, &key_menu_decscreen, NULL };
 
 static void UpdateJoybSpeed(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(var))
 {
@@ -94,47 +106,68 @@ static void UpdateJoybSpeed(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(var))
     }
 }
 
-// Callback invoked when a key control is set
+static int VarInGroup(int *variable, int **group)
+{
+    unsigned int i;
 
-static void KeySetCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(variable))
+    for (i=0; group[i] != NULL; ++i)
+    {
+        if (group[i] == variable)
+        {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+static void CheckKeyGroup(int *variable, int **group)
 {
-    TXT_CAST_ARG(int, variable);
     unsigned int i;
 
-    for (i=0; i<arrlen(allkeys); ++i)
+    // Don't check unless the variable is in this group.
+
+    if (!VarInGroup(variable, group))
+    {
+        return;
+    }
+
+    // If another variable has the same value as the new value, reset it.
+
+    for (i=0; group[i] != NULL; ++i)
     {
-        if (*variable == *allkeys[i] && allkeys[i] != variable)
+        if (*variable == *group[i] && group[i] != variable)
         {
             // A different key has the same value.  Clear the existing
             // value. This ensures that no two keys can have the same
             // value.
 
-            *allkeys[i] = 0;
+            *group[i] = 0;
         }
     }
 }
 
-// Add a label and keyboard input to the specified table.
+// Callback invoked when a key control is set
 
-static txt_key_input_t *AddKeyInput(txt_table_t *table, char *name, int *var)
+static void KeySetCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(variable))
 {
-    txt_key_input_t *key_input;
-
-    TXT_AddWidget(table, TXT_NewLabel(name));
-    key_input = TXT_NewKeyInput(var);
-    TXT_AddWidget(table, key_input);
+    TXT_CAST_ARG(int, variable);
 
-    return key_input;
+    CheckKeyGroup(variable, controls);
+    CheckKeyGroup(variable, menu_nav);
+    CheckKeyGroup(variable, shortcuts);
 }
 
-// Add a keyboard input for a game control.  Each key can only be bound
-// to one game control at a time.
+// Add a label and keyboard input to the specified table.
 
 static void AddKeyControl(txt_table_t *table, char *name, int *var)
 {
     txt_key_input_t *key_input;
 
-    key_input = AddKeyInput(table, name, var);
+    TXT_AddWidget(table, TXT_NewLabel(name));
+    key_input = TXT_NewKeyInput(var);
+    TXT_AddWidget(table, key_input);
+
     TXT_SignalConnect(key_input, "set", KeySetCallback, var);
 }
 
@@ -150,30 +183,30 @@ static void MenuKeysDialog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
 
     TXT_SetColumnWidths(table, 25, 10);
 
-    AddKeyInput(table, "Activate menu",         &key_menu_activate);
-    AddKeyInput(table, "Move cursor up",        &key_menu_up);
-    AddKeyInput(table, "Move cursor down",      &key_menu_down);
-    AddKeyInput(table, "Move slider left",      &key_menu_left);
-    AddKeyInput(table, "Move slider right",     &key_menu_right);
-    AddKeyInput(table, "Go to previous menu",   &key_menu_back);
-    AddKeyInput(table, "Activate menu item",    &key_menu_forward);
-    AddKeyInput(table, "Confirm action",        &key_menu_confirm);
-    AddKeyInput(table, "Cancel action",         &key_menu_abort);
-
-    AddKeyInput(table, "Help screen",           &key_menu_help);
-    AddKeyInput(table, "Save game",             &key_menu_save);
-    AddKeyInput(table, "Load game",             &key_menu_load);
-    AddKeyInput(table, "Sound volume",          &key_menu_volume);
-    AddKeyInput(table, "Toggle detail",         &key_menu_detail);
-    AddKeyInput(table, "Quick save",            &key_menu_qsave);
-    AddKeyInput(table, "End game",              &key_menu_endgame);
-    AddKeyInput(table, "Toggle messages",       &key_menu_messages);
-    AddKeyInput(table, "Quick load",            &key_menu_qload);
-    AddKeyInput(table, "Quit game",             &key_menu_quit);
-    AddKeyInput(table, "Toggle gamma",          &key_menu_gamma);
-
-    AddKeyInput(table, "Increase screen size",  &key_menu_incscreen);
-    AddKeyInput(table, "Decrease screen size",  &key_menu_decscreen);
+    AddKeyControl(table, "Activate menu",         &key_menu_activate);
+    AddKeyControl(table, "Move cursor up",        &key_menu_up);
+    AddKeyControl(table, "Move cursor down",      &key_menu_down);
+    AddKeyControl(table, "Move slider left",      &key_menu_left);
+    AddKeyControl(table, "Move slider right",     &key_menu_right);
+    AddKeyControl(table, "Go to previous menu",   &key_menu_back);
+    AddKeyControl(table, "Activate menu item",    &key_menu_forward);
+    AddKeyControl(table, "Confirm action",        &key_menu_confirm);
+    AddKeyControl(table, "Cancel action",         &key_menu_abort);
+
+    AddKeyControl(table, "Help screen",           &key_menu_help);
+    AddKeyControl(table, "Save game",             &key_menu_save);
+    AddKeyControl(table, "Load game",             &key_menu_load);
+    AddKeyControl(table, "Sound volume",          &key_menu_volume);
+    AddKeyControl(table, "Toggle detail",         &key_menu_detail);
+    AddKeyControl(table, "Quick save",            &key_menu_qsave);
+    AddKeyControl(table, "End game",              &key_menu_endgame);
+    AddKeyControl(table, "Toggle messages",       &key_menu_messages);
+    AddKeyControl(table, "Quick load",            &key_menu_qload);
+    AddKeyControl(table, "Quit game",             &key_menu_quit);
+    AddKeyControl(table, "Toggle gamma",          &key_menu_gamma);
+
+    AddKeyControl(table, "Increase screen size",  &key_menu_incscreen);
+    AddKeyControl(table, "Decrease screen size",  &key_menu_decscreen);
 
     scrollpane = TXT_NewScrollPane(0, 10, table);
 
@@ -209,18 +242,18 @@ void ConfigKeyboard(void)
 
     TXT_SignalConnect(run_control, "changed", UpdateJoybSpeed, NULL);
 
-    AddKeyControl(movement_table, "Move Forward", &key_up);
+    AddKeyControl(movement_table, "Move Forward",  &key_up);
     AddKeyControl(movement_table, "Move Backward", &key_down);
-    AddKeyControl(movement_table, "Turn Left", &key_left);
-    AddKeyControl(movement_table, "Turn Right", &key_right);
-    AddKeyControl(movement_table, "Strafe Left", &key_strafeleft);
-    AddKeyControl(movement_table, "Strafe Right", &key_straferight);
-    AddKeyControl(movement_table, "Speed On", &key_speed);
-    AddKeyControl(movement_table, "Strafe On", &key_strafe);
+    AddKeyControl(movement_table, "Turn Left",     &key_left);
+    AddKeyControl(movement_table, "Turn Right",    &key_right);
+    AddKeyControl(movement_table, "Strafe Left",   &key_strafeleft);
+    AddKeyControl(movement_table, "Strafe Right",  &key_straferight);
+    AddKeyControl(movement_table, "Speed On",      &key_speed);
+    AddKeyControl(movement_table, "Strafe On",     &key_strafe);
 
     TXT_SetColumnWidths(action_table, 20, 8);
 
-    AddKeyControl(action_table, "Use", &key_use);
+    AddKeyControl(action_table, "Use",  &key_use);
     AddKeyControl(action_table, "Fire", &key_fire);
 
     TXT_SetWindowAction(window, TXT_HORIZ_CENTER, TestConfigAction());
-- 
cgit v1.2.3


From 22a70fe67cad311feb190ad4f52c7f8f2ec4c892 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 3 Jun 2009 23:35:05 +0000
Subject: Use newer keyboard bindings dialog layout from raven-branch.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1549
---
 setup/keyboard.c | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/setup/keyboard.c b/setup/keyboard.c
index 2e791c7a..de04ac32 100644
--- a/setup/keyboard.c
+++ b/setup/keyboard.c
@@ -224,37 +224,39 @@ void ConfigKeyboard(void)
 
     window = TXT_NewWindow("Keyboard configuration");
 
-    TXT_AddWidgets(window, 
+    TXT_AddWidgets(window,
                    TXT_NewSeparator("Movement"),
-                   movement_table = TXT_NewTable(2),
+                   movement_table = TXT_NewTable(4),
 
                    TXT_NewSeparator("Action"),
-                   action_table = TXT_NewTable(2),
+                   action_table = TXT_NewTable(4),
                    TXT_NewButton2("Menu keys...", MenuKeysDialog, NULL),
+                   NULL);
 
+    TXT_AddWidgets(window,
                    TXT_NewSeparator("Misc."),
                    run_control = TXT_NewCheckBox("Always run", &always_run),
                    TXT_NewInvertedCheckBox("Use native keyboard mapping", 
                                            &vanilla_keyboard_mapping),
                    NULL);
 
-    TXT_SetColumnWidths(movement_table, 20, 8);
+    TXT_SetColumnWidths(movement_table, 15, 4, 15, 4);
 
     TXT_SignalConnect(run_control, "changed", UpdateJoybSpeed, NULL);
 
-    AddKeyControl(movement_table, "Move Forward",  &key_up);
+    AddKeyControl(movement_table, "Move Forward", &key_up);
+    AddKeyControl(movement_table, " Strafe Left", &key_strafeleft);
     AddKeyControl(movement_table, "Move Backward", &key_down);
-    AddKeyControl(movement_table, "Turn Left",     &key_left);
-    AddKeyControl(movement_table, "Turn Right",    &key_right);
-    AddKeyControl(movement_table, "Strafe Left",   &key_strafeleft);
-    AddKeyControl(movement_table, "Strafe Right",  &key_straferight);
-    AddKeyControl(movement_table, "Speed On",      &key_speed);
-    AddKeyControl(movement_table, "Strafe On",     &key_strafe);
+    AddKeyControl(movement_table, " Strafe Right", &key_straferight);
+    AddKeyControl(movement_table, "Turn Left", &key_left);
+    AddKeyControl(movement_table, " Speed On", &key_speed);
+    AddKeyControl(movement_table, "Turn Right", &key_right);
+    AddKeyControl(movement_table, " Strafe On", &key_strafe);
 
-    TXT_SetColumnWidths(action_table, 20, 8);
+    TXT_SetColumnWidths(action_table, 15, 4, 15, 4);
 
-    AddKeyControl(action_table, "Use",  &key_use);
-    AddKeyControl(action_table, "Fire", &key_fire);
+    AddKeyControl(action_table, "Fire/Attack", &key_fire);
+    AddKeyControl(action_table, " Use", &key_use);
 
     TXT_SetWindowAction(window, TXT_HORIZ_CENTER, TestConfigAction());
 }
-- 
cgit v1.2.3


From b30d83c55a749994d95ebe4d7320db6db3bd43da Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 3 Jun 2009 23:37:02 +0000
Subject: Increase height of menu bindings dialog.

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

diff --git a/setup/keyboard.c b/setup/keyboard.c
index de04ac32..c587f80e 100644
--- a/setup/keyboard.c
+++ b/setup/keyboard.c
@@ -208,7 +208,7 @@ static void MenuKeysDialog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
     AddKeyControl(table, "Increase screen size",  &key_menu_incscreen);
     AddKeyControl(table, "Decrease screen size",  &key_menu_decscreen);
 
-    scrollpane = TXT_NewScrollPane(0, 10, table);
+    scrollpane = TXT_NewScrollPane(0, 12, table);
 
     TXT_AddWidget(window, scrollpane);
 }
-- 
cgit v1.2.3


From e3e71290f86c785a29ec6b9eeb609c7625776255 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Fri, 5 Jun 2009 16:58:48 +0000
Subject: Add key binding variables for automap and weapon keys.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1551
---
 setup/configfile.c |  22 ++++++
 setup/keyboard.c   |  84 ++++++++++++++++++++-
 setup/keyboard.h   |  28 +++++++
 src/am_map.c       | 210 ++++++++++++++++++++++++++++-------------------------
 src/g_game.c       |  33 ++++++++-
 src/m_config.c     | 143 ++++++++++++++++++++++++++++++++++++
 6 files changed, 414 insertions(+), 106 deletions(-)

diff --git a/setup/configfile.c b/setup/configfile.c
index 97e06744..5013e3ce 100644
--- a/setup/configfile.c
+++ b/setup/configfile.c
@@ -283,6 +283,7 @@ static default_t extra_defaults_list[] =
     {"mouseb_use",                  &mousebuse, DEFAULT_INT, 0, 0},
     {"mouseb_backward",             &mousebbackward, DEFAULT_INT, 0, 0},
     {"use_libsamplerate",           &use_libsamplerate, DEFAULT_INT, 0, 0},
+
     {"key_menu_activate",           &key_menu_activate, DEFAULT_KEY, 0, 0},
     {"key_menu_up",                 &key_menu_up, DEFAULT_KEY, 0, 0},
     {"key_menu_down",               &key_menu_down, DEFAULT_KEY, 0, 0},
@@ -305,6 +306,27 @@ static default_t extra_defaults_list[] =
     {"key_menu_gamma",              &key_menu_gamma, DEFAULT_KEY, 0, 0},
     {"key_menu_incscreen",          &key_menu_incscreen, DEFAULT_KEY, 0, 0},
     {"key_menu_decscreen",          &key_menu_decscreen, DEFAULT_KEY, 0, 0},
+
+    {"key_map_toggle",              &key_map_toggle, DEFAULT_KEY, 0, 0},
+    {"key_map_north",               &key_map_north, DEFAULT_KEY, 0, 0},
+    {"key_map_south",               &key_map_south, DEFAULT_KEY, 0, 0},
+    {"key_map_east",                &key_map_east, DEFAULT_KEY, 0, 0},
+    {"key_map_west",                &key_map_west, DEFAULT_KEY, 0, 0},
+    {"key_map_zoomin",              &key_map_zoomin, DEFAULT_KEY, 0, 0},
+    {"key_map_zoomout",             &key_map_zoomout, DEFAULT_KEY, 0, 0},
+    {"key_map_maxzoom",             &key_map_maxzoom, DEFAULT_KEY, 0, 0},
+    {"key_map_follow",              &key_map_follow, DEFAULT_KEY, 0, 0},
+    {"key_map_grid",                &key_map_grid, DEFAULT_KEY, 0, 0},
+    {"key_map_mark",                &key_map_mark, DEFAULT_KEY, 0, 0},
+    {"key_map_clearmark",           &key_map_clearmark, DEFAULT_KEY, 0, 0},
+    {"key_weapon1",                 &key_weapon1, DEFAULT_KEY, 0, 0},
+    {"key_weapon2",                 &key_weapon2, DEFAULT_KEY, 0, 0},
+    {"key_weapon3",                 &key_weapon3, DEFAULT_KEY, 0, 0},
+    {"key_weapon4",                 &key_weapon4, DEFAULT_KEY, 0, 0},
+    {"key_weapon5",                 &key_weapon5, DEFAULT_KEY, 0, 0},
+    {"key_weapon6",                 &key_weapon6, DEFAULT_KEY, 0, 0},
+    {"key_weapon7",                 &key_weapon7, DEFAULT_KEY, 0, 0},
+    {"key_weapon8",                 &key_weapon8, DEFAULT_KEY, 0, 0},
 };
 
 static default_collection_t extra_defaults =
diff --git a/setup/keyboard.c b/setup/keyboard.c
index c587f80e..27ade663 100644
--- a/setup/keyboard.c
+++ b/setup/keyboard.c
@@ -66,6 +66,28 @@ int key_menu_gamma     = KEY_F11;
 int key_menu_incscreen = KEY_EQUALS;
 int key_menu_decscreen = KEY_MINUS;
 
+int key_map_north      = KEY_UPARROW;
+int key_map_south      = KEY_DOWNARROW;
+int key_map_east       = KEY_RIGHTARROW;
+int key_map_west       = KEY_LEFTARROW;
+int key_map_zoomin     = '=';
+int key_map_zoomout    = '-';
+int key_map_toggle     = KEY_TAB;
+int key_map_maxzoom    = '0';
+int key_map_follow     = 'f';
+int key_map_grid       = 'g';
+int key_map_mark       = 'm';
+int key_map_clearmark  = 'c';
+
+int key_weapon1        = '1';
+int key_weapon2        = '2';
+int key_weapon3        = '3';
+int key_weapon4        = '4';
+int key_weapon5        = '5';
+int key_weapon6        = '6';
+int key_weapon7        = '7';
+int key_weapon8        = '8';
+
 int vanilla_keyboard_mapping = 1;
 
 static int always_run = 0;
@@ -74,7 +96,10 @@ static int always_run = 0;
 
 static int *controls[] = { &key_left, &key_right, &key_up, &key_down,
                            &key_strafeleft, &key_straferight, &key_fire,
-                           &key_use, &key_strafe, &key_speed, NULL };
+                           &key_use, &key_strafe, &key_speed, 
+                           &key_weapon1, &key_weapon2, &key_weapon3,
+                           &key_weapon4, &key_weapon5, &key_weapon6,
+                           &key_weapon7, &key_weapon8, NULL };
 
 static int *menu_nav[] = { &key_menu_activate, &key_menu_up, &key_menu_down,
                            &key_menu_left, &key_menu_right, &key_menu_back,
@@ -86,6 +111,12 @@ static int *shortcuts[] = { &key_menu_help, &key_menu_save, &key_menu_load,
                             &key_menu_qload, &key_menu_quit, &key_menu_gamma,
                             &key_menu_incscreen, &key_menu_decscreen, NULL };
 
+static int *map_keys[] = { &key_map_north, &key_map_south, &key_map_east,
+                           &key_map_west, &key_map_zoomin, &key_map_zoomout,
+                           &key_map_toggle, &key_map_maxzoom, &key_map_follow,
+                           &key_map_grid, &key_map_mark, &key_map_clearmark,
+                           NULL };
+
 static void UpdateJoybSpeed(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(var))
 {
     if (always_run)
@@ -156,6 +187,7 @@ static void KeySetCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(variable))
     CheckKeyGroup(variable, controls);
     CheckKeyGroup(variable, menu_nav);
     CheckKeyGroup(variable, shortcuts);
+    CheckKeyGroup(variable, map_keys);
 }
 
 // Add a label and keyboard input to the specified table.
@@ -171,18 +203,37 @@ static void AddKeyControl(txt_table_t *table, char *name, int *var)
     TXT_SignalConnect(key_input, "set", KeySetCallback, var);
 }
 
-static void MenuKeysDialog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
+static void OtherKeysDialog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
 {
     txt_window_t *window;
     txt_table_t *table;
     txt_scrollpane_t *scrollpane;
 
-    window = TXT_NewWindow("Menu keys");
+    window = TXT_NewWindow("Other keys");
 
     table = TXT_NewTable(2);
 
     TXT_SetColumnWidths(table, 25, 10);
 
+    TXT_AddWidgets(table, TXT_NewLabel(" - Weapons - "),
+                          TXT_NewStrut(0, 0),
+                          NULL);
+
+    AddKeyControl(table, "Weapon 1",              &key_weapon1);
+    AddKeyControl(table, "Weapon 2",              &key_weapon2);
+    AddKeyControl(table, "Weapon 3",              &key_weapon3);
+    AddKeyControl(table, "Weapon 4",              &key_weapon4);
+    AddKeyControl(table, "Weapon 5",              &key_weapon5);
+    AddKeyControl(table, "Weapon 6",              &key_weapon6);
+    AddKeyControl(table, "Weapon 7",              &key_weapon7);
+    AddKeyControl(table, "Weapon 8",              &key_weapon8);
+
+    TXT_AddWidgets(table, TXT_NewStrut(0, 1),
+                          TXT_NewStrut(0, 1),
+                          TXT_NewLabel(" - Menu navigation - "),
+                          TXT_NewStrut(0, 0),
+                          NULL);
+
     AddKeyControl(table, "Activate menu",         &key_menu_activate);
     AddKeyControl(table, "Move cursor up",        &key_menu_up);
     AddKeyControl(table, "Move cursor down",      &key_menu_down);
@@ -193,6 +244,12 @@ static void MenuKeysDialog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
     AddKeyControl(table, "Confirm action",        &key_menu_confirm);
     AddKeyControl(table, "Cancel action",         &key_menu_abort);
 
+    TXT_AddWidgets(table, TXT_NewStrut(0, 1),
+                          TXT_NewStrut(0, 1),
+                          TXT_NewLabel(" - Shortcut keys - "),
+                          TXT_NewStrut(0, 0),
+                          NULL);
+
     AddKeyControl(table, "Help screen",           &key_menu_help);
     AddKeyControl(table, "Save game",             &key_menu_save);
     AddKeyControl(table, "Load game",             &key_menu_load);
@@ -208,6 +265,25 @@ static void MenuKeysDialog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
     AddKeyControl(table, "Increase screen size",  &key_menu_incscreen);
     AddKeyControl(table, "Decrease screen size",  &key_menu_decscreen);
 
+    TXT_AddWidgets(table, TXT_NewStrut(0, 1),
+                          TXT_NewStrut(0, 1),
+                          TXT_NewLabel(" - Map - "),
+                          TXT_NewStrut(0, 0),
+                          NULL);
+
+    AddKeyControl(table, "Toggle map",            &key_map_toggle);
+    AddKeyControl(table, "Zoom in",               &key_map_zoomin);
+    AddKeyControl(table, "Zoom out",              &key_map_zoomout);
+    AddKeyControl(table, "Maximum zoom out",      &key_map_maxzoom);
+    AddKeyControl(table, "Follow mode",           &key_map_follow);
+    AddKeyControl(table, "Pan north",             &key_map_north);
+    AddKeyControl(table, "Pan south",             &key_map_south);
+    AddKeyControl(table, "Pan east",              &key_map_east);
+    AddKeyControl(table, "Pan west",              &key_map_west);
+    AddKeyControl(table, "Toggle grid",           &key_map_grid);
+    AddKeyControl(table, "Mark location",         &key_map_mark);
+    AddKeyControl(table, "Clear all marks",       &key_map_clearmark);
+
     scrollpane = TXT_NewScrollPane(0, 12, table);
 
     TXT_AddWidget(window, scrollpane);
@@ -230,7 +306,7 @@ void ConfigKeyboard(void)
 
                    TXT_NewSeparator("Action"),
                    action_table = TXT_NewTable(4),
-                   TXT_NewButton2("Menu keys...", MenuKeysDialog, NULL),
+                   TXT_NewButton2("Other keys...", OtherKeysDialog, NULL),
                    NULL);
 
     TXT_AddWidgets(window,
diff --git a/setup/keyboard.h b/setup/keyboard.h
index 19ce7147..29ff2a1a 100644
--- a/setup/keyboard.h
+++ b/setup/keyboard.h
@@ -35,6 +35,8 @@ extern int key_speed;
 extern int joybspeed;
 extern int vanilla_keyboard_mapping;
 
+// Menu keys:
+
 extern int key_menu_activate;
 extern int key_menu_up;
 extern int key_menu_down;
@@ -60,6 +62,32 @@ extern int key_menu_gamma;
 extern int key_menu_incscreen;
 extern int key_menu_decscreen;
 
+// Automap keys:
+
+extern int key_map_north;
+extern int key_map_south;
+extern int key_map_east;
+extern int key_map_west;
+extern int key_map_zoomin;
+extern int key_map_zoomout;
+extern int key_map_toggle;
+extern int key_map_maxzoom;
+extern int key_map_follow;
+extern int key_map_grid;
+extern int key_map_mark;
+extern int key_map_clearmark;
+
+// Weapon keys:
+
+extern int key_weapon1;
+extern int key_weapon2;
+extern int key_weapon3;
+extern int key_weapon4;
+extern int key_weapon5;
+extern int key_weapon6;
+extern int key_weapon7;
+extern int key_weapon8;
+
 void ConfigKeyboard(void);
 
 #endif /* #ifndef SETUP_KEYBOARD_H */
diff --git a/src/am_map.c b/src/am_map.c
index 5fbe748a..9a81d62c 100644
--- a/src/am_map.c
+++ b/src/am_map.c
@@ -90,19 +90,18 @@
 // drawing stuff
 #define	FB		0
 
-#define AM_PANDOWNKEY	KEY_DOWNARROW
-#define AM_PANUPKEY	KEY_UPARROW
-#define AM_PANRIGHTKEY	KEY_RIGHTARROW
-#define AM_PANLEFTKEY	KEY_LEFTARROW
-#define AM_ZOOMINKEY	'='
-#define AM_ZOOMOUTKEY	'-'
-#define AM_STARTKEY	KEY_TAB
-#define AM_ENDKEY	KEY_TAB
-#define AM_GOBIGKEY	'0'
-#define AM_FOLLOWKEY	'f'
-#define AM_GRIDKEY	'g'
-#define AM_MARKKEY	'm'
-#define AM_CLEARMARKKEY	'c'
+int key_map_north     = KEY_UPARROW;
+int key_map_south     = KEY_DOWNARROW;
+int key_map_east      = KEY_RIGHTARROW;
+int key_map_west      = KEY_LEFTARROW;
+int key_map_zoomin    = '=';
+int key_map_zoomout   = '-';
+int key_map_toggle    = KEY_TAB;
+int key_map_maxzoom   = '0';
+int key_map_follow    = 'f';
+int key_map_grid      = 'g';
+int key_map_mark      = 'm';
+int key_map_clearmark = 'c';
 
 #define AM_NUMMARKPOINTS 10
 
@@ -632,121 +631,136 @@ AM_Responder
     static int cheatstate=0;
     static int bigstate=0;
     static char buffer[20];
+    int key;
 
     rc = false;
 
     if (!automapactive)
     {
-	if (ev->type == ev_keydown && ev->data1 == AM_STARTKEY)
+	if (ev->type == ev_keydown && ev->data1 == key_map_toggle)
 	{
 	    AM_Start ();
 	    viewactive = false;
 	    rc = true;
 	}
     }
-
     else if (ev->type == ev_keydown)
     {
-
 	rc = true;
-	switch(ev->data1)
-	{
-	  case AM_PANRIGHTKEY: // pan right
-	    if (!followplayer) m_paninc.x = FTOM(F_PANINC);
-	    else rc = false;
-	    break;
-	  case AM_PANLEFTKEY: // pan left
-	    if (!followplayer) m_paninc.x = -FTOM(F_PANINC);
-	    else rc = false;
-	    break;
-	  case AM_PANUPKEY: // pan up
-	    if (!followplayer) m_paninc.y = FTOM(F_PANINC);
-	    else rc = false;
-	    break;
-	  case AM_PANDOWNKEY: // pan down
-	    if (!followplayer) m_paninc.y = -FTOM(F_PANINC);
-	    else rc = false;
-	    break;
-	  case AM_ZOOMOUTKEY: // zoom out
-	    mtof_zoommul = M_ZOOMOUT;
-	    ftom_zoommul = M_ZOOMIN;
-	    break;
-	  case AM_ZOOMINKEY: // zoom in
-	    mtof_zoommul = M_ZOOMIN;
-	    ftom_zoommul = M_ZOOMOUT;
-	    break;
-	  case AM_ENDKEY:
-	    bigstate = 0;
-	    viewactive = true;
-	    AM_Stop ();
-	    break;
-	  case AM_GOBIGKEY:
-	    bigstate = !bigstate;
-	    if (bigstate)
-	    {
-		AM_saveScaleAndLoc();
-		AM_minOutWindowScale();
-	    }
-	    else AM_restoreScaleAndLoc();
-	    break;
-	  case AM_FOLLOWKEY:
-	    followplayer = !followplayer;
-	    f_oldloc.x = INT_MAX;
+        key = ev->data1;
+
+        if (key == key_map_east)          // pan right
+        {
+            if (!followplayer) m_paninc.x = FTOM(F_PANINC);
+            else rc = false;
+        }
+        else if (key == key_map_west)     // pan left
+        {
+            if (!followplayer) m_paninc.x = -FTOM(F_PANINC);
+            else rc = false;
+        }
+        else if (key == key_map_north)    // pan up
+        {
+            if (!followplayer) m_paninc.y = FTOM(F_PANINC);
+            else rc = false;
+        }
+        else if (key == key_map_south)    // pan down
+        {
+            if (!followplayer) m_paninc.y = -FTOM(F_PANINC);
+            else rc = false;
+        }
+        else if (key == key_map_zoomout)  // zoom out
+        {
+            mtof_zoommul = M_ZOOMOUT;
+            ftom_zoommul = M_ZOOMIN;
+        }
+        else if (key == key_map_zoomin)   // zoom in
+        {
+            mtof_zoommul = M_ZOOMIN;
+            ftom_zoommul = M_ZOOMOUT;
+        }
+        else if (key == key_map_toggle)
+        {
+            bigstate = 0;
+            viewactive = true;
+            AM_Stop ();
+        }
+        else if (key == key_map_maxzoom)
+        {
+            bigstate = !bigstate;
+            if (bigstate)
+            {
+                AM_saveScaleAndLoc();
+                AM_minOutWindowScale();
+            }
+            else AM_restoreScaleAndLoc();
+        }
+        else if (key == key_map_follow)
+        {
+            followplayer = !followplayer;
+            f_oldloc.x = INT_MAX;
             if (followplayer)
                 plr->message = DEH_String(AMSTR_FOLLOWON);
             else
                 plr->message = DEH_String(AMSTR_FOLLOWOFF);
-	    break;
-	  case AM_GRIDKEY:
-	    grid = !grid;
+        }
+        else if (key == key_map_grid)
+        {
+            grid = !grid;
             if (grid)
                 plr->message = DEH_String(AMSTR_GRIDON);
             else
                 plr->message = DEH_String(AMSTR_GRIDOFF);
-	    break;
-	  case AM_MARKKEY:
-	    sprintf(buffer, "%s %d", DEH_String(AMSTR_MARKEDSPOT), markpointnum);
-	    plr->message = buffer;
-	    AM_addMark();
-	    break;
-	  case AM_CLEARMARKKEY:
-	    AM_clearMarks();
-	    plr->message = DEH_String(AMSTR_MARKSCLEARED);
-	    break;
-	  default:
-	    cheatstate=0;
-	    rc = false;
-	}
+        }
+        else if (key == key_map_mark)
+        {
+            sprintf(buffer, "%s %d", DEH_String(AMSTR_MARKEDSPOT), markpointnum);
+            plr->message = buffer;
+            AM_addMark();
+        }
+        else if (key == key_map_clearmark)
+        {
+            AM_clearMarks();
+            plr->message = DEH_String(AMSTR_MARKSCLEARED);
+        }
+        else
+        {
+            cheatstate=0;
+            rc = false;
+        }
+
 	if (!deathmatch && cht_CheckCheat(&cheat_amap, ev->data2))
 	{
 	    rc = false;
 	    cheating = (cheating+1) % 3;
 	}
     }
-
     else if (ev->type == ev_keyup)
     {
-	rc = false;
-	switch (ev->data1)
-	{
-	  case AM_PANRIGHTKEY:
-	    if (!followplayer) m_paninc.x = 0;
-	    break;
-	  case AM_PANLEFTKEY:
-	    if (!followplayer) m_paninc.x = 0;
-	    break;
-	  case AM_PANUPKEY:
-	    if (!followplayer) m_paninc.y = 0;
-	    break;
-	  case AM_PANDOWNKEY:
-	    if (!followplayer) m_paninc.y = 0;
-	    break;
-	  case AM_ZOOMOUTKEY:
-	  case AM_ZOOMINKEY:
-	    mtof_zoommul = FRACUNIT;
-	    ftom_zoommul = FRACUNIT;
-	    break;
-	}
+        rc = false;
+        key = ev->data1;
+
+        if (key == key_map_east)
+        {
+            if (!followplayer) m_paninc.x = 0;
+        }
+        else if (key == key_map_west)
+        {
+            if (!followplayer) m_paninc.x = 0;
+        }
+        else if (key == key_map_north)
+        {
+            if (!followplayer) m_paninc.y = 0;
+        }
+        else if (key == key_map_south)
+        {
+            if (!followplayer) m_paninc.y = 0;
+        }
+        else if (key == key_map_zoomout || key == key_map_zoomin)
+        {
+            mtof_zoommul = FRACUNIT;
+            ftom_zoommul = FRACUNIT;
+        }
     }
 
     return rc;
diff --git a/src/g_game.c b/src/g_game.c
index 44e77a74..cd070884 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -173,6 +173,15 @@ int             key_fire = KEY_RCTRL;
 int		key_use = ' ';
 int		key_strafe = KEY_RALT;
 int		key_speed = KEY_RSHIFT; 
+
+int             key_weapon1 = '1';
+int             key_weapon2 = '2';
+int             key_weapon3 = '3';
+int             key_weapon4 = '4';
+int             key_weapon5 = '5';
+int             key_weapon6 = '6';
+int             key_weapon7 = '7';
+int             key_weapon8 = '8';
  
 int             mousebfire = 0;
 int             mousebstrafe = 1;
@@ -211,6 +220,17 @@ fixed_t         forwardmove[2] = {0x19, 0x32};
 fixed_t         sidemove[2] = {0x18, 0x28}; 
 fixed_t         angleturn[3] = {640, 1280, 320};    // + slow turn 
 
+static int *weapon_keys[] = {
+    &key_weapon1,
+    &key_weapon2,
+    &key_weapon3,
+    &key_weapon4,
+    &key_weapon5,
+    &key_weapon6,
+    &key_weapon7,
+    &key_weapon8
+};
+
 #define SLOWTURNTICS	6 
  
 #define NUMKEYS		256 
@@ -501,13 +521,18 @@ void G_BuildTiccmd (ticcmd_t* cmd)
     } 
 
     // chainsaw overrides 
-    for (i=0 ; i<NUMWEAPONS-1 ; i++)        
-	if (gamekeydown['1'+i]) 
-	{ 
+
+    for (i=0; i<arrlen(weapon_keys); ++i)
+    {
+        int key = *weapon_keys[i];
+
+        if (gamekeydown[key])
+        {
 	    cmd->buttons |= BT_CHANGE; 
 	    cmd->buttons |= i<<BT_WEAPONSHIFT; 
 	    break; 
-	}
+        }
+    }
     
     // mouse
     if (mousebuttons[mousebforward]) 
diff --git a/src/m_config.c b/src/m_config.c
index 251588a1..cca4bec1 100644
--- a/src/m_config.c
+++ b/src/m_config.c
@@ -99,6 +99,8 @@ extern int key_menu_forward;
 extern int key_menu_confirm;
 extern int key_menu_abort;
 
+// Keyboard shortcuts:
+
 extern int key_menu_help;
 extern int key_menu_save;
 extern int key_menu_load;
@@ -114,6 +116,28 @@ extern int key_menu_gamma;
 extern int key_menu_incscreen;
 extern int key_menu_decscreen;
 
+extern int key_map_north;
+extern int key_map_south;
+extern int key_map_east;
+extern int key_map_west;
+extern int key_map_zoomin;
+extern int key_map_zoomout;
+extern int key_map_toggle;
+extern int key_map_maxzoom;
+extern int key_map_follow;
+extern int key_map_grid;
+extern int key_map_mark;
+extern int key_map_clearmark;
+
+extern int key_weapon1;
+extern int key_weapon2;
+extern int key_weapon3;
+extern int key_weapon4;
+extern int key_weapon5;
+extern int key_weapon6;
+extern int key_weapon7;
+extern int key_weapon8;
+ 
 extern int	mousebfire;
 extern int	mousebstrafe;
 extern int	mousebforward;
@@ -870,6 +894,125 @@ static default_t extra_defaults_list[] =
 
     CONFIG_VARIABLE_KEY(key_menu_decscreen,        key_menu_decscreen),
 
+    //!
+    // Key to toggle the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_toggle,            key_map_toggle),
+
+    //!
+    // Key to pan north when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_north,             key_map_north),
+
+    //!
+    // Key to pan south when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_south,             key_map_south),
+
+    //!
+    // Key to pan east when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_east,              key_map_east),
+
+    //!
+    // Key to pan west when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_west,              key_map_west),
+
+    //!
+    // Key to zoom in when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_zoomin,            key_map_zoomin),
+
+    //!
+    // Key to zoom out when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_zoomout,           key_map_zoomout),
+
+    //!
+    // Key to zoom out the maximum amount when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_maxzoom,           key_map_maxzoom),
+
+    //!
+    // Key to toggle follow mode when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_follow,            key_map_follow),
+
+    //!
+    // Key to toggle the grid display when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_grid,              key_map_grid),
+
+    //!
+    // Key to set a mark when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_mark,              key_map_mark),
+
+    //!
+    // Key to clear all marks when in the map view.
+    //
+
+    CONFIG_VARIABLE_KEY(key_map_clearmark,         key_map_clearmark),
+
+    //!
+    // Key to select weapon 1.
+    //
+
+    CONFIG_VARIABLE_KEY(key_weapon1,               key_weapon1),
+
+    //!
+    // Key to select weapon 2.
+    //
+
+    CONFIG_VARIABLE_KEY(key_weapon2,               key_weapon2),
+
+    //!
+    // Key to select weapon 3.
+    //
+
+    CONFIG_VARIABLE_KEY(key_weapon3,               key_weapon3),
+
+    //!
+    // Key to select weapon 4.
+    //
+
+    CONFIG_VARIABLE_KEY(key_weapon4,               key_weapon4),
+
+    //!
+    // Key to select weapon 5.
+    //
+
+    CONFIG_VARIABLE_KEY(key_weapon5,               key_weapon5),
+
+    //!
+    // Key to select weapon 6.
+    //
+
+    CONFIG_VARIABLE_KEY(key_weapon6,               key_weapon6),
+
+    //!
+    // Key to select weapon 7.
+    //
+
+    CONFIG_VARIABLE_KEY(key_weapon7,               key_weapon7),
+
+    //!
+    // Key to select weapon 8.
+    //
+
+    CONFIG_VARIABLE_KEY(key_weapon8,               key_weapon8),
 };
 
 static default_collection_t extra_defaults =
-- 
cgit v1.2.3


From dc8c45c667bc327e5e84e1d98d3f8b468d7a1553 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 6 Jun 2009 21:13:44 +0000
Subject: Don't check for Steam/CD installer versions on Windows CE.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1552
---
 src/d_iwad.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/d_iwad.c b/src/d_iwad.c
index 4fcaafcb..8794e9be 100644
--- a/src/d_iwad.c
+++ b/src/d_iwad.c
@@ -63,7 +63,7 @@ static void AddIWADDir(char *dir)
 // keys installed by the Windows installers for various CD versions
 // of Doom.  From these keys we can deduce where to find an IWAD.
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_WIN32_WCE)
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -487,7 +487,7 @@ static void BuildIWADDirList(void)
 
     AddDoomWadPath();
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_WIN32_WCE)
 
     // Search the registry and find where IWADs have been installed.
 
-- 
cgit v1.2.3


From 6d0bf9181121b4c117c80d05a7f097363c531774 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 00:56:23 +0000
Subject: Add Windows CE implementations of some ANSI C functions that are
 missing.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1553
---
 wince/Makefile.am |  8 ++++++
 wince/env.c       | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 wince/env.h       | 13 ++++++++++
 wince/errno.c     | 20 +++++++++++++++
 wince/errno.h     | 15 +++++++++++
 wince/fileops.c   | 49 +++++++++++++++++++++++++++++++++++
 wince/fileops.h   | 14 ++++++++++
 7 files changed, 196 insertions(+)
 create mode 100644 wince/Makefile.am
 create mode 100644 wince/env.c
 create mode 100644 wince/env.h
 create mode 100644 wince/errno.c
 create mode 100644 wince/errno.h
 create mode 100644 wince/fileops.c
 create mode 100644 wince/fileops.h

diff --git a/wince/Makefile.am b/wince/Makefile.am
new file mode 100644
index 00000000..f6c87759
--- /dev/null
+++ b/wince/Makefile.am
@@ -0,0 +1,8 @@
+
+noinst_LIBRARIES=libc_wince.a
+
+libc_wince_a_SOURCES =                            \
+        env.c            env.h                    \
+	errno.c          errno.h                  \
+        fileops.c        fileops.h
+
diff --git a/wince/env.c b/wince/env.c
new file mode 100644
index 00000000..ceba6402
--- /dev/null
+++ b/wince/env.c
@@ -0,0 +1,77 @@
+//
+// "Extension" implementation of getenv for Windows CE.
+//
+// I (Simon Howard) release this file to the public domain.
+//
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <windows.h>
+#include <lmcons.h>
+#include <shlobj.h>
+
+#include "env.h"
+
+static int buffers_loaded = 0;
+static char username_buf[UNLEN + 1];
+static char temp_buf[MAX_PATH + 1];
+static char home_buf[MAX_PATH + 1];
+
+static void WCharToChar(wchar_t *src, char *dest, int buf_len)
+{
+    unsigned int len;
+
+    len = wcslen(src);
+
+    WideCharToMultiByte(CP_OEMCP, 0, src, len, dest, buf_len, NULL, NULL);
+}
+
+static void LoadBuffers(void)
+{
+    wchar_t temp[MAX_PATH];
+    DWORD buf_len;
+
+    // Username:
+
+    buf_len = UNLEN;
+    GetUserNameW(temp, &buf_len);
+    WCharToChar(temp, temp_buf, MAX_PATH);
+
+    // Temp dir:
+
+    GetTempPathW(MAX_PATH, temp);
+    WCharToChar(temp, temp_buf, MAX_PATH);
+
+    // Use My Documents dir as home:
+
+    SHGetSpecialFolderPath(NULL, temp, CSIDL_PERSONAL, 0);
+    WCharToChar(temp, home_buf, MAX_PATH);
+}
+
+char *getenv(const char *name)
+{
+    if (!buffers_loaded)
+    {
+        LoadBuffers();
+        buffers_loaded = 1;
+    }
+
+    if (!strcmp(name, "USER") || !strcmp(name, "USERNAME"))
+    {
+        return username_buf;
+    }
+    else if (!strcmp(name, "TEMP"))
+    {
+        return temp_buf;
+    }
+    else if (!strcmp(name, "HOME"))
+    {
+        return home_buf;
+    }
+    else
+    {
+        return NULL;
+    }
+}
+
diff --git a/wince/env.h b/wince/env.h
new file mode 100644
index 00000000..c2cb4243
--- /dev/null
+++ b/wince/env.h
@@ -0,0 +1,13 @@
+//
+// "Extension" implementation of getenv for Windows CE.
+//
+// I (Simon Howard) release this file to the public domain.
+//
+
+#ifndef WINCE_ENV_H
+#define WINCE_ENV_H
+
+extern char *getenv(const char *name);
+
+#endif /* #ifndef WINCE_ENV_H */
+
diff --git a/wince/errno.c b/wince/errno.c
new file mode 100644
index 00000000..28cd0899
--- /dev/null
+++ b/wince/errno.c
@@ -0,0 +1,20 @@
+//
+// "Extension" implementation of errno.h for Windows CE.
+//
+// I (Simon Howard) release this file to the public domain.
+//
+
+#include <windows.h>
+
+#include "errno.h"
+
+// This should really be a thread-local variable.  Oh well.
+
+static int my_errno;
+
+int *_GetErrno()
+{
+    my_errno = GetLastError();
+    return &my_errno;
+}
+
diff --git a/wince/errno.h b/wince/errno.h
new file mode 100644
index 00000000..e9b4721a
--- /dev/null
+++ b/wince/errno.h
@@ -0,0 +1,15 @@
+//
+// "Extension" implementation of errno.h for Windows CE.
+//
+// I (Simon Howard) release this file to the public domain.
+//
+
+#ifndef WINCE_ERRNO_H
+#define WINCE_ERRNO_H
+
+extern int *_GetErrno();
+
+#define errno (*_GetErrno())
+
+#endif /* #ifndef WINCE_ERROR_H */
+
diff --git a/wince/fileops.c b/wince/fileops.c
new file mode 100644
index 00000000..b0617bd3
--- /dev/null
+++ b/wince/fileops.c
@@ -0,0 +1,49 @@
+//
+// "Extension" implementation of ANSI C file functions for Windows CE.
+//
+// I (Simon Howard) release this file to the public domain.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <windows.h>
+
+#include "fileops.h"
+
+int remove(const char *pathname)
+{
+    wchar_t temp[MAX_PATH + 1];
+
+    MultiByteToWideChar(CP_OEMCP,
+                        0,
+                        pathname,
+                        strlen(pathname) + 1,
+                        temp,
+                        MAX_PATH);
+
+    return DeleteFileW(temp) != 0;
+}
+
+int rename(const char *oldpath, const char *newpath)
+{
+    wchar_t oldpath1[MAX_PATH + 1];
+    wchar_t newpath1[MAX_PATH + 1];
+
+    MultiByteToWideChar(CP_OEMCP,
+                        0,
+                        oldpath,
+                        strlen(oldpath) + 1,
+                        oldpath1,
+                        MAX_PATH);
+    MultiByteToWideChar(CP_OEMCP,
+                        0,
+                        newpath,
+                        strlen(newpath) + 1,
+                        newpath1,
+                        MAX_PATH);
+
+    return MoveFileW(oldpath1, newpath1);
+}
+
diff --git a/wince/fileops.h b/wince/fileops.h
new file mode 100644
index 00000000..757a34fd
--- /dev/null
+++ b/wince/fileops.h
@@ -0,0 +1,14 @@
+//
+// "Extension" implementation of ANSI C file functions for Windows CE.
+//
+// I (Simon Howard) release this file to the public domain.
+//
+
+#ifndef WINCE_FILEOPS_H
+#define WINCE_FILEOPS_H
+
+int remove(const char *pathname);
+int rename(const char *oldpath, const char *newpath);
+
+#endif /* #ifndef WINCE_FILEOPS_H */
+
-- 
cgit v1.2.3


From 8a262fb95d8f335cf7930a8ae667fe5e01552cf4 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 01:24:40 +0000
Subject: Fix compile with FEATURE_SOUND disabled.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1554
---
 src/m_config.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/m_config.c b/src/m_config.c
index cca4bec1..be329cba 100644
--- a/src/m_config.c
+++ b/src/m_config.c
@@ -747,6 +747,8 @@ static default_t extra_defaults_list[] =
 
     CONFIG_VARIABLE_INT(dclick_use,                dclick_use),
 
+#ifdef FEATURE_SOUND
+
     //!
     // Controls whether libsamplerate support is used for performing
     // sample rate conversions of sound effects.  Support for this
@@ -762,6 +764,8 @@ static default_t extra_defaults_list[] =
 
     CONFIG_VARIABLE_INT(use_libsamplerate,         use_libsamplerate),
 
+#endif
+
     //!
     // Key that activates the menu when pressed.
     //
-- 
cgit v1.2.3


From 2df46868ae68060f3eb681a5dd1943ee522a88b4 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 01:26:45 +0000
Subject: Fix compile with FEATURE_MULTIPLAYER disabled.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1555
---
 src/d_net.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/d_net.c b/src/d_net.c
index 4e87a813..f5890769 100644
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -429,6 +429,7 @@ static int GetLowTic(void)
     int i;
     int lowtic;
 
+#ifdef FEATURE_MULTIPLAYER
     if (net_client_connected)
     {
         lowtic = INT_MAX;
@@ -443,6 +444,7 @@ static int GetLowTic(void)
         }
     }
     else
+#endif
     {
         lowtic = maketic;
     }
-- 
cgit v1.2.3


From 52c831999bddb7b68b855d0fec644240863cbee2 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 01:27:30 +0000
Subject: Use GetUserNameExW, not GetUserName (doesn't exist on WinCE)

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1556
---
 wince/env.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wince/env.c b/wince/env.c
index ceba6402..a678de2d 100644
--- a/wince/env.c
+++ b/wince/env.c
@@ -9,6 +9,7 @@
 
 #include <windows.h>
 #include <lmcons.h>
+#include <secext.h>
 #include <shlobj.h>
 
 #include "env.h"
@@ -35,7 +36,7 @@ static void LoadBuffers(void)
     // Username:
 
     buf_len = UNLEN;
-    GetUserNameW(temp, &buf_len);
+    GetUserNameExW(NameDisplay, temp, &buf_len);
     WCharToChar(temp, temp_buf, MAX_PATH);
 
     // Temp dir:
-- 
cgit v1.2.3


From 203e7e79a1a20b83fea8a91b46c8241c056a23b1 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 01:27:58 +0000
Subject: Add libc_wince.h header, and EISDIR error value.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1557
---
 wince/errno.h      | 2 ++
 wince/libc_wince.h | 4 ++++
 2 files changed, 6 insertions(+)
 create mode 100644 wince/libc_wince.h

diff --git a/wince/errno.h b/wince/errno.h
index e9b4721a..a2149b45 100644
--- a/wince/errno.h
+++ b/wince/errno.h
@@ -7,6 +7,8 @@
 #ifndef WINCE_ERRNO_H
 #define WINCE_ERRNO_H
 
+#define EISDIR          21      /* Is a directory */
+
 extern int *_GetErrno();
 
 #define errno (*_GetErrno())
diff --git a/wince/libc_wince.h b/wince/libc_wince.h
new file mode 100644
index 00000000..0d6fac05
--- /dev/null
+++ b/wince/libc_wince.h
@@ -0,0 +1,4 @@
+
+#include "env.h"
+#include "fileops.h"
+
-- 
cgit v1.2.3


From 7f9b5d41173c7db6465a5f7666fe7913106a8c1c Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 01:32:15 +0000
Subject: Add CPU affinity function for Windows CE.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1558
---
 src/i_main.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i_main.c b/src/i_main.c
index 3a9ec696..e1de5881 100644
--- a/src/i_main.c
+++ b/src/i_main.c
@@ -34,7 +34,15 @@
 #include "m_argv.h"
 #include "d_main.h"
 
-#if defined(_WIN32)
+#if defined(_WIN32_WCE)
+
+// Windows CE?  I doubt it even supports SMP..
+
+static void LockCPUAffinity(void)
+{
+}
+
+#elif defined(_WIN32)
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-- 
cgit v1.2.3


From 3831ece14e28284302cc1a49f568b5c0b6858f90 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 01:33:58 +0000
Subject: Include libc_wince.h when on Windows CE.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1559
---
 src/doomtype.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/doomtype.h b/src/doomtype.h
index 2c9680b3..0a5b5e38 100644
--- a/src/doomtype.h
+++ b/src/doomtype.h
@@ -29,6 +29,13 @@
 #ifndef __DOOMTYPE__
 #define __DOOMTYPE__
 
+// Windows CE is missing some vital ANSI C functions.  We have to
+// use our own replacements.
+
+#ifdef _WIN32_WCE
+#include "libc_wince.h"
+#endif
+
 // C99 integer types; with gcc we just use this.  Other compilers 
 // should add conditional statements that define the C99 types.
 
-- 
cgit v1.2.3


From abc69c7cf92181461612d7126f2bdc8da6b9eb76 Mon Sep 17 00:00:00 2001
From: Russell Rice
Date: Sun, 7 Jun 2009 01:50:47 +0000
Subject: - Update textscreen codeblocks project to include txt_scrollpane.*
 and txt_smallfont.h

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1560
---
 codeblocks/textscreen.cbp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/codeblocks/textscreen.cbp b/codeblocks/textscreen.cbp
index bee3040a..8db957b1 100644
--- a/codeblocks/textscreen.cbp
+++ b/codeblocks/textscreen.cbp
@@ -81,6 +81,10 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\textscreen\txt_radiobutton.h" />
+		<Unit filename="..\textscreen\txt_scrollpane.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="..\textscreen\txt_scrollpane.h" />
 		<Unit filename="..\textscreen\txt_sdl.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -89,6 +93,7 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\textscreen\txt_separator.h" />
+		<Unit filename="..\textscreen\txt_smallfont.h" />
 		<Unit filename="..\textscreen\txt_spinctrl.c">
 			<Option compilerVar="CC" />
 		</Unit>
-- 
cgit v1.2.3


From 61d40373640c0cabdaef4d4381ac5ae636fab642 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 01:56:21 +0000
Subject: Detect Windows CE target and build/include libc_wince files as
 necessary.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1561
---
 Makefile.am       |  2 +-
 configure.in      | 15 +++++++++++++++
 src/Makefile.am   |  1 +
 wince/Makefile.am |  8 ++++++++
 4 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 40de5828..e4b7c825 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,7 @@ EXTRA_DIST=                             \
 MAINTAINERCLEANFILES =  $(AUX_DIST_GEN)
 
 docdir=$(prefix)/share/doc/@PACKAGE@
-SUBDIRS=textscreen pcsound src man setup
+SUBDIRS=wince textscreen pcsound src man setup
 
 if HAVE_PYTHON
 
diff --git a/configure.in b/configure.in
index 15ef200a..5a1dfab2 100644
--- a/configure.in
+++ b/configure.in
@@ -53,6 +53,19 @@ AC_CHECK_LIB(SDL_net,SDLNet_UDP_Send,[
     exit -1
 ])
 
+# Windows CE build?
+
+WINDOWS_CE=false
+
+case "$host" in
+    *mingw32ce*|*cegcc*|*wince*)
+        CFLAGS="-I../wince $CFLAGS"
+        WINDOWS_CE=true
+        ;;
+    *)
+        ;;
+esac
+
 AC_CHECK_HEADERS([linux/kd.h dev/isa/spkrio.h dev/speaker/speaker.h])
 AC_CHECK_FUNCS(mmap sched_setaffinity)
 
@@ -61,6 +74,7 @@ AC_CHECK_LIB(samplerate, src_new)
 
 AC_CHECK_TOOL(WINDRES, windres, )
 
+AM_CONDITIONAL(WINDOWS_CE, $WINDOWS_CE)
 AM_CONDITIONAL(HAVE_WINDRES, test "$WINDRES" != "")
 AM_CONDITIONAL(HAVE_PYTHON, $HAVE_PYTHON)
 
@@ -86,6 +100,7 @@ AC_DEFUN([AC_DATAROOTDIR_CHECKED])
 
 AC_OUTPUT([
 Makefile
+wince/Makefile
 textscreen/Makefile
 textscreen/examples/Makefile
 setup/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 63ddc98f..64e23b79 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -170,6 +170,7 @@ chocolate_doom_SOURCES=$(SOURCE_FILES)
 endif
 
 chocolate_doom_LDADD =                               \
+                       ../wince/libc_wince.a         \
                        ../textscreen/libtextscreen.a \
                        ../pcsound/libpcsound.a       \
                        @LDFLAGS@                     \
diff --git a/wince/Makefile.am b/wince/Makefile.am
index f6c87759..7d694377 100644
--- a/wince/Makefile.am
+++ b/wince/Makefile.am
@@ -1,8 +1,16 @@
 
 noinst_LIBRARIES=libc_wince.a
 
+if WINDOWS_CE
+
 libc_wince_a_SOURCES =                            \
         env.c            env.h                    \
 	errno.c          errno.h                  \
         fileops.c        fileops.h
 
+else
+
+libc_wince_a_SOURCES =
+
+endif
+
-- 
cgit v1.2.3


From cd07b206fa4e7ffa30aa1ef2e8e138603171fc9e Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 01:59:49 +0000
Subject: Add README file for Windows CE library.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1562
---
 wince/README | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 wince/README

diff --git a/wince/README b/wince/README
new file mode 100644
index 00000000..76f282f4
--- /dev/null
+++ b/wince/README
@@ -0,0 +1,8 @@
+Windows CE is a horribly crippled operating system.  The poor thing doesn't
+even include a complete implementation of the ANSI standard C library.  This
+is a mini-library called libc_wince that implements some of the missing
+library functions.  I've only implemented those necessary to get Chocolate
+Doom to compile.
+
+On non-Windows CE platforms it is just built as an empty library.
+
-- 
cgit v1.2.3


From 45359954fe5054f27637962a272177d9c8115b90 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 02:10:21 +0000
Subject: Use MessageBoxW instead of MessageBox (doesn't exist on Windows CE)

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1563
---
 src/i_system.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/i_system.c b/src/i_system.c
index fe596a60..07218142 100644
--- a/src/i_system.c
+++ b/src/i_system.c
@@ -246,13 +246,18 @@ void I_Error (char *error, ...)
     // On Windows, pop up a dialog box with the error message.
     {
         char msgbuf[512];
+        wchar_t wmsgbuf[512];
 
         va_start(argptr, error);
         memset(msgbuf, 0, sizeof(msgbuf));
         vsnprintf(msgbuf, sizeof(msgbuf) - 1, error, argptr);
         va_end(argptr);
 
-        MessageBox(NULL, msgbuf, "Error", MB_OK);
+        MultiByteToWideChar(CP_ACP, 0,
+                            msgbuf, strlen(msgbuf) + 1,
+                            wmsgbuf, sizeof(wmsgbuf));
+
+        MessageBoxW(NULL, wmsgbuf, L"Error", MB_OK);
     }
 #endif
 
-- 
cgit v1.2.3


From 5a1443a3685eb02b3b97b0be74ebf5936546d02b Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 14:20:46 +0000
Subject: Exit with an error on failure to allocate zone memory.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1564
---
 src/i_system.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/i_system.c b/src/i_system.c
index 07218142..714f63cc 100644
--- a/src/i_system.c
+++ b/src/i_system.c
@@ -95,6 +95,11 @@ byte *I_ZoneBase (int *size)
     *size = I_GetHeapSize();
 
     zonemem = malloc(*size);
+
+    if (zonemem == NULL)
+    {
+        I_Error("Failed to allocate %i bytes for zone memory", *size);
+    }
     
     printf("zone memory: %p, %x allocated for zone\n", 
            zonemem, *size);
-- 
cgit v1.2.3


From 7b7076a20c7042b2f71c82317bfbc48e8854dd32 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 14:35:27 +0000
Subject: Add IWAD search dirs for Windows CE.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1565
---
 src/d_iwad.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/d_iwad.c b/src/d_iwad.c
index 8794e9be..d1c2f0bf 100644
--- a/src/d_iwad.c
+++ b/src/d_iwad.c
@@ -487,7 +487,14 @@ static void BuildIWADDirList(void)
 
     AddDoomWadPath();
 
-#if defined(_WIN32) && !defined(_WIN32_WCE)
+#if defined(_WIN32_WCE)
+
+    // Windows CE locations:
+
+    AddIWADDir("\\Storage Card");
+    AddIWADDir(getenv("HOME"));
+
+#elif defined(_WIN32) 
 
     // Search the registry and find where IWADs have been installed.
 
-- 
cgit v1.2.3


From fdfff2b9e72c8a1d3975277cad80b9d3afec032f Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 15:15:40 +0000
Subject: Remove call to setbuf.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1566
---
 src/d_main.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/d_main.c b/src/d_main.c
index 849897fe..29a366a1 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -878,8 +878,7 @@ void D_DoomMain (void)
         I_Error("Game mode indeterminate.  No IWAD file was found.  Try\n"
                 "specifying one with the '-iwad' command line parameter.\n");
     }
-	
-    setbuf (stdout, NULL);
+
     modifiedgame = false;
 
     //!
-- 
cgit v1.2.3


From 1a54277adf6413026ccd77435601bcb50f1aa169 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 15:21:41 +0000
Subject: Fix setup tool compile on Windows CE.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1567
---
 setup/Makefile.am |  5 ++++-
 setup/execute.c   | 27 ++++++++++++++++++++++-----
 setup/mainmenu.c  |  2 ++
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/setup/Makefile.am b/setup/Makefile.am
index b7b05520..22bcb224 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -31,7 +31,10 @@ else
 chocolate_setup_SOURCES=$(SOURCE_FILES)
 endif
 
-chocolate_setup_LDADD = ../textscreen/libtextscreen.a @LDFLAGS@
+chocolate_setup_LDADD =                              \
+                       ../wince/libc_wince.a         \
+                       ../textscreen/libtextscreen.a \
+                       @LDFLAGS@
 
 .rc.o:
 	$(WINDRES) $^ -o $@
diff --git a/setup/execute.c b/setup/execute.c
index b5b8a7c6..8f082de7 100644
--- a/setup/execute.c
+++ b/setup/execute.c
@@ -28,11 +28,19 @@
 
 #include <sys/types.h>
 
-#ifndef _WIN32
-    #include <sys/wait.h>
-    #include <unistd.h>
+#if defined(_WIN32_WCE)
+
+#include "libc_wince.h"
+
+#elif defined(_WIN32)
+
+#include <sys/wait.h>
+#include <unistd.h>
+
 #else
-    #include <process.h>
+
+#include <process.h>
+
 #endif
 
 #include "textscreen.h"
@@ -139,7 +147,16 @@ void AddCmdLineParameter(execute_context_t *context, char *s, ...)
     fprintf(context->stream, "\n");
 }
 
-#ifdef _WIN32
+#if defined(_WIN32_WCE)
+
+static int ExecuteCommand(const char **argv)
+{
+    // Windows CE version.
+    // TODO
+    return 0;
+}
+
+#elif defined(_WIN32)
 
 static int ExecuteCommand(const char **argv)
 {
diff --git a/setup/mainmenu.c b/setup/mainmenu.c
index d4dfe0db..d340661b 100644
--- a/setup/mainmenu.c
+++ b/setup/mainmenu.c
@@ -18,7 +18,9 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 // 02111-1307, USA.
 //
+
 #include <stdlib.h>
+#include <string.h>
 
 #include "config.h"
 #include "textscreen.h"
-- 
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 +-
 src/i_video.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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");
diff --git a/src/i_video.c b/src/i_video.c
index 0ed4d716..fa7dfff9 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -1353,7 +1353,7 @@ static void SetSDLVideoDriver(void)
         free(env_string);
     }
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_WIN32_WCE)
 
     // Allow -gdi as a shortcut for using the windib driver.
 
-- 
cgit v1.2.3


From cf6e976f371dfe19af0bd3917745698d778586dc Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 16:39:08 +0000
Subject: Add missing SDL_thread include.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1569
---
 pcsound/pcsound_win32.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pcsound/pcsound_win32.c b/pcsound/pcsound_win32.c
index 7976b444..0eb8cd6a 100644
--- a/pcsound/pcsound_win32.c
+++ b/pcsound/pcsound_win32.c
@@ -26,6 +26,7 @@
 #ifdef _WIN32
 
 #include "SDL.h"
+#include "SDL_thread.h"
 #include <windows.h>
 
 #include "pcsound.h"
-- 
cgit v1.2.3


From 895f440628c8c45aa98bd7af996ca6ae48065224 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 16:41:46 +0000
Subject: Catch errors when initialising SDL. Use the small textscreen font by
 default on Windows CE if no fullscreen modes are available.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1570
---
 textscreen/txt_sdl.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/textscreen/txt_sdl.c b/textscreen/txt_sdl.c
index 1bc42d7c..6cfee614 100644
--- a/textscreen/txt_sdl.c
+++ b/textscreen/txt_sdl.c
@@ -142,6 +142,9 @@ static void ChooseFont(void)
 
     if (modes == NULL || modes == (SDL_Rect **) -1 || *modes == NULL)
     {
+#ifdef _WIN32_WCE
+        font = &small_font;
+#endif
         return;
     }
 
@@ -166,7 +169,10 @@ static void ChooseFont(void)
 
 int TXT_Init(void)
 {
-    SDL_InitSubSystem(SDL_INIT_VIDEO);
+    if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
+    {
+        return 0;
+    }
 
     ChooseFont();
 
-- 
cgit v1.2.3


From 5d99eee5a4509f42d635156bfb1d6c495d8de221 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 17:10:05 +0000
Subject: Make auto-adjust code switch to windowed mode if no fullscreen modes
 are available.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1571
---
 src/i_video.c | 196 +++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 113 insertions(+), 83 deletions(-)

diff --git a/src/i_video.c b/src/i_video.c
index fa7dfff9..c3055b5d 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -964,125 +964,155 @@ static screen_mode_t *I_FindScreenMode(int w, int h)
     return best_mode;
 }
 
-// If the video mode set in the configuration file is not available,
-// try to choose a different mode.
+// Adjust to an appropriate fullscreen mode.
+// Returns true if successful.
 
-static void I_AutoAdjustSettings(void)
+static boolean AutoAdjustFullscreen(void)
 {
-    if (fullscreen)
-    {
-        SDL_Rect **modes;
-        SDL_Rect *best_mode;
-        screen_mode_t *screen_mode;
-        int target_pixels, diff, best_diff;
-        int i;
-
-        modes = SDL_ListModes(NULL, SDL_FULLSCREEN);
-
-        // Find the best mode that matches the mode specified in the
-        // configuration file
-
-        best_mode = NULL;
-        best_diff = INT_MAX;
-        target_pixels = screen_width * screen_height;
+    SDL_Rect **modes;
+    SDL_Rect *best_mode;
+    screen_mode_t *screen_mode;
+    int target_pixels, diff, best_diff;
+    int i;
 
-        for (i=0; modes[i] != NULL; ++i) 
-        {
-            //printf("%ix%i?\n", modes[i]->w, modes[i]->h);
+    modes = SDL_ListModes(NULL, SDL_FULLSCREEN);
 
-            // What screen_mode_t would be used for this video mode?
+    // No fullscreen modes available at all?
 
-            screen_mode = I_FindScreenMode(modes[i]->w, modes[i]->h);
+    if (modes == NULL || modes == (SDL_Rect **) -1 || *modes == NULL)
+    {
+        return false;
+    }
 
-            // Never choose a screen mode that we cannot run in, or
-            // is poor quality for fullscreen
+    // Find the best mode that matches the mode specified in the
+    // configuration file
 
-            if (screen_mode == NULL || screen_mode->poor_quality)
-            {
-            //    printf("\tUnsupported / poor quality\n");
-                continue;
-            }
+    best_mode = NULL;
+    best_diff = INT_MAX;
+    target_pixels = screen_width * screen_height;
 
-            // Do we have the exact mode?
-            // If so, no autoadjust needed
+    for (i=0; modes[i] != NULL; ++i) 
+    {
+        //printf("%ix%i?\n", modes[i]->w, modes[i]->h);
 
-            if (screen_width == modes[i]->w && screen_height == modes[i]->h)
-            {
-            //    printf("\tExact mode!\n");
-                return;
-            }
+        // What screen_mode_t would be used for this video mode?
 
-            // Is this mode better than the current mode?
+        screen_mode = I_FindScreenMode(modes[i]->w, modes[i]->h);
 
-            diff = (screen_width - modes[i]->w) 
-                     * (screen_width - modes[i]->w)
-                 + (screen_height - modes[i]->h)
-                     * (screen_height - modes[i]->h);
+        // Never choose a screen mode that we cannot run in, or
+        // is poor quality for fullscreen
 
-            if (diff < best_diff)
-            {
-            //    printf("\tA valid mode\n");
-                best_mode = modes[i];
-                best_diff = diff;
-            }
+        if (screen_mode == NULL || screen_mode->poor_quality)
+        {
+        //    printf("\tUnsupported / poor quality\n");
+            continue;
         }
 
-        if (best_mode == NULL)
-        {
-            // Unable to find a valid mode!
+        // Do we have the exact mode?
+        // If so, no autoadjust needed
 
-            I_Error("Unable to find any valid video mode at all!");
+        if (screen_width == modes[i]->w && screen_height == modes[i]->h)
+        {
+        //    printf("\tExact mode!\n");
+            return true;
         }
 
-        printf("I_InitGraphics: %ix%i mode not supported on this machine.\n",
-               screen_width, screen_height);
+        // Is this mode better than the current mode?
 
-        screen_width = best_mode->w;
-        screen_height = best_mode->h;
+        diff = (screen_width - modes[i]->w) * (screen_width - modes[i]->w)
+             + (screen_height - modes[i]->h) * (screen_height - modes[i]->h);
 
+        if (diff < best_diff)
+        {
+        //    printf("\tA valid mode\n");
+            best_mode = modes[i];
+            best_diff = diff;
+        }
     }
-    else
+
+    if (best_mode == NULL)
     {
-        screen_mode_t *best_mode;
+        // Unable to find a valid mode!
 
-        //
-        // Windowed mode.
-        //
-        // Find a screen_mode_t to fit within the current settings
-        //
+        return false;
+    }
 
-        best_mode = I_FindScreenMode(screen_width, screen_height);
+    printf("I_InitGraphics: %ix%i mode not supported on this machine.\n",
+           screen_width, screen_height);
 
-        if (best_mode == NULL) 
-        {
-            // Nothing fits within the current settings.
-            // Pick the closest to 320x200 possible.
+    screen_width = best_mode->w;
+    screen_height = best_mode->h;
 
-            best_mode = I_FindScreenMode(SCREENWIDTH, SCREENHEIGHT_4_3);
-        }
+    return true;
+}
 
-        // Do we have the exact mode already?
+// Auto-adjust to a valid windowed mode.
 
-        if (best_mode->width == screen_width 
-         && best_mode->height == screen_height)
-        {
-            return;
-        }
+static void AutoAdjustWindowed(void)
+{
+    screen_mode_t *best_mode;
 
+    // Find a screen_mode_t to fit within the current settings
+
+    best_mode = I_FindScreenMode(screen_width, screen_height);
+
+    if (best_mode == NULL)
+    {
+        // Nothing fits within the current settings.
+        // Pick the closest to 320x200 possible.
+
+        best_mode = I_FindScreenMode(SCREENWIDTH, SCREENHEIGHT_4_3);
+    }
+
+    // Switch to the best mode if necessary.
+
+    if (best_mode->width != screen_width || best_mode->height != screen_height)
+    {
         printf("I_InitGraphics: Cannot run at specified mode: %ix%i\n",
                screen_width, screen_height);
 
         screen_width = best_mode->width;
         screen_height = best_mode->height;
     }
+}
 
-    printf("I_InitGraphics: Auto-adjusted to %ix%i.\n",
-           screen_width, screen_height);
+// If the video mode set in the configuration file is not available,
+// try to choose a different mode.
+
+static void I_AutoAdjustSettings(void)
+{
+    int old_screen_w, old_screen_h;
+
+    old_screen_w = screen_width;
+    old_screen_h = screen_height;
+
+    // If we are running fullscreen, try to autoadjust to a valid fullscreen
+    // mode.  If this is impossible, switch to windowed.
+
+    if (fullscreen && !AutoAdjustFullscreen())
+    {
+        fullscreen = 0;
+    }
 
-    printf("NOTE: Your video settings have been adjusted.  "
-           "To disable this behavior,\n"
-           "set autoadjust_video_settings to 0 in your "
-           "configuration file.\n");
+    // If we are running windowed, pick a valid window size.
+
+    if (!fullscreen)
+    {
+        AutoAdjustWindowed();
+    }
+
+    // Have the settings changed?  Show a message.
+
+    if (screen_width != old_screen_w || screen_height != old_screen_h)
+    {
+        printf("I_InitGraphics: Auto-adjusted to %ix%i.\n",
+               screen_width, screen_height);
+
+        printf("NOTE: Your video settings have been adjusted.  "
+               "To disable this behavior,\n"
+               "set autoadjust_video_settings to 0 in your "
+               "configuration file.\n");
+    }
 }
 
 // Set video size to a particular scale factor (1x, 2x, 3x, etc.)
-- 
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(-)

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 0e3e4653f8df775fdd41e18e956f465fd334f275 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 17:53:25 +0000
Subject: Use home dir to store configuration and savegames under Windows CE.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1573
---
 setup/configfile.c | 15 +++++++++------
 src/m_config.c     | 10 ++++++----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/setup/configfile.c b/setup/configfile.c
index 5013e3ce..3714a35f 100644
--- a/setup/configfile.c
+++ b/setup/configfile.c
@@ -74,7 +74,7 @@ void M_MakeDirectory(char *path)
 
 
 // 
-// SetConfigDir:
+// M_SetConfigDir:
 //
 // Sets the location of the configuration directory, where configuration
 // files are stored - default.cfg, chocolate-doom.cfg, savegames, etc.
@@ -82,9 +82,11 @@ void M_MakeDirectory(char *path)
 
 void M_SetConfigDir(void)
 {
-#ifndef _WIN32
-    // Ignore the HOME environment variable on Windows - just behave
-    // like Vanilla Doom.
+#if !defined(_WIN32) || defined(_WIN32_WCE)
+
+    // Configuration settings are stored in ~/.chocolate-doom/,
+    // except on Windows, where we behave like Vanilla Doom and
+    // save in the current directory.
 
     char *homedir;
 
@@ -97,7 +99,8 @@ void M_SetConfigDir(void)
 
         configdir = malloc(strlen(homedir) + strlen(PACKAGE_TARNAME) + 5);
 
-        sprintf(configdir, "%s/.%s/", homedir, PACKAGE_TARNAME);
+        sprintf(configdir, "%s%c.%s%c", homedir, DIR_SEPARATOR,
+			                PACKAGE_TARNAME, DIR_SEPARATOR);
 
         // make the directory if it doesnt already exist
 
@@ -106,7 +109,7 @@ void M_SetConfigDir(void)
     else
 #endif /* #ifndef _WIN32 */
     {
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_WIN32_WCE)
         // when given the -cdrom option, save config+savegames in 
         // c:\doomdata.  This only applies under Windows.
 
diff --git a/src/m_config.c b/src/m_config.c
index be329cba..5bc46ca3 100644
--- a/src/m_config.c
+++ b/src/m_config.c
@@ -1313,9 +1313,11 @@ void M_LoadDefaults (void)
 
 void M_SetConfigDir(void)
 {
-#ifndef _WIN32
-    // Ignore the HOME environment variable on Windows - just behave
-    // like Vanilla Doom.
+#if !defined(_WIN32) || defined(_WIN32_WCE)
+
+    // Configuration settings are stored in ~/.chocolate-doom/,
+    // except on Windows, where we behave like Vanilla Doom and
+    // save in the current directory.
 
     char *homedir;
 
@@ -1338,7 +1340,7 @@ void M_SetConfigDir(void)
     else
 #endif /* #ifndef _WIN32 */
     {
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_WIN32_WCE)
         //!
         // @platform windows
         // @vanilla
-- 
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(-)

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 d9be068243f518d50bd4577db58693219b3acd57 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 19:08:08 +0000
Subject: Fix header includes (thanks exp[x])

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1575
---
 setup/execute.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup/execute.c b/setup/execute.c
index 8f082de7..cbcab29e 100644
--- a/setup/execute.c
+++ b/setup/execute.c
@@ -34,12 +34,12 @@
 
 #elif defined(_WIN32)
 
-#include <sys/wait.h>
-#include <unistd.h>
+#include <process.h>
 
 #else
 
-#include <process.h>
+#include <sys/wait.h>
+#include <unistd.h>
 
 #endif
 
-- 
cgit v1.2.3


From bdeaec12d0f79c5cd15b49105a11988ac5ec545c Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 7 Jun 2009 23:41:10 +0000
Subject: Use CreateFileW instead of OpenFile (doesn't exist on Windows CE)

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1576
---
 src/w_file_win32.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/w_file_win32.c b/src/w_file_win32.c
index d5e60579..ec17cf6c 100644
--- a/src/w_file_win32.c
+++ b/src/w_file_win32.c
@@ -94,12 +94,24 @@ unsigned int GetFileLength(HANDLE handle)
 static wad_file_t *W_Win32_OpenFile(char *path)
 {
     win32_wad_file_t *result;
+    wchar_t wpath[MAX_PATH + 1];
     HANDLE handle;
-    OFSTRUCT fileinfo;
 
-    handle = (HANDLE) OpenFile(path, &fileinfo, OF_READ);
+    // Open the file:
 
-    if (handle == (HANDLE) HFILE_ERROR)
+    MultiByteToWideChar(CP_OEMCP, 0,
+                        path, strlen(path) + 1,
+                        wpath, sizeof(wpath));
+
+    handle = CreateFileW(wpath,
+                         GENERIC_READ,
+                         FILE_SHARE_READ,
+                         NULL,
+                         OPEN_EXISTING,
+                         FILE_ATTRIBUTE_NORMAL,
+                         NULL);
+
+    if (handle == INVALID_HANDLE_VALUE)
     {
         return NULL;
     }
-- 
cgit v1.2.3


From a91a1c60f544d26195c2df9dd9cd1ef042deacf9 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Mon, 8 Jun 2009 18:15:57 +0000
Subject: Use SDL's getenv/putenv implementation, and populate at startup.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1577
---
 pcsound/pcsound.c |  1 +
 setup/mainmenu.c  | 13 ++++++++++++
 src/i_main.c      |  9 +++++++++
 wince/env.c       | 60 ++++++++++++++++++++++++++-----------------------------
 wince/env.h       |  6 +++++-
 5 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/pcsound/pcsound.c b/pcsound/pcsound.c
index 0746e24e..09ef2752 100644
--- a/pcsound/pcsound.c
+++ b/pcsound/pcsound.c
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "SDL_getenv.h"
 #include "config.h"
 #include "pcsound.h"
 #include "pcsound_internal.h"
diff --git a/setup/mainmenu.c b/setup/mainmenu.c
index d340661b..6a1f01c2 100644
--- a/setup/mainmenu.c
+++ b/setup/mainmenu.c
@@ -22,6 +22,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef _WIN32_WCE
+#include "libc_wince.h"
+#endif
+
 #include "config.h"
 #include "textscreen.h"
 
@@ -214,6 +218,15 @@ int main(int argc, char *argv[])
     myargc = argc;
     myargv = argv;
 
+#ifdef _WIN32_WCE
+
+    // Windows CE has no environment, but SDL provides an implementation.
+    // Populate the environment with the values we normally find.
+
+    PopulateEnvironment();
+
+#endif
+
     InitConfig();
     RunGUI();
 
diff --git a/src/i_main.c b/src/i_main.c
index e1de5881..03f8a5ac 100644
--- a/src/i_main.c
+++ b/src/i_main.c
@@ -133,6 +133,15 @@ int main(int argc, char **argv)
     myargc = argc;
     myargv = argv;
 
+#ifdef _WIN32_WCE
+
+    // Windows CE has no environment, but SDL provides an implementation.
+    // Populate the environment with the values we normally find.
+
+    PopulateEnvironment();
+
+#endif
+
     // Only schedule on a single core, if we have multiple
     // cores.  This is to work around a bug in SDL_mixer.
 
diff --git a/wince/env.c b/wince/env.c
index a678de2d..bedeb434 100644
--- a/wince/env.c
+++ b/wince/env.c
@@ -14,21 +14,33 @@
 
 #include "env.h"
 
-static int buffers_loaded = 0;
-static char username_buf[UNLEN + 1];
-static char temp_buf[MAX_PATH + 1];
-static char home_buf[MAX_PATH + 1];
-
 static void WCharToChar(wchar_t *src, char *dest, int buf_len)
 {
     unsigned int len;
 
-    len = wcslen(src);
+    len = wcslen(src) + 1;
 
     WideCharToMultiByte(CP_OEMCP, 0, src, len, dest, buf_len, NULL, NULL);
 }
 
-static void LoadBuffers(void)
+static void SetEnvironment(char *env_string, wchar_t *wvalue)
+{
+    char value[MAX_PATH + 10];
+    int env_len;
+
+    // Construct the string for putenv: NAME=value
+
+    env_len = strlen(env_string);
+    strcpy(value, env_string);
+
+    WCharToChar(wvalue, value + env_len, sizeof(value) - env_len);
+
+    // Set the environment variable:
+
+    putenv(value);
+}
+
+void PopulateEnvironment(void)
 {
     wchar_t temp[MAX_PATH];
     DWORD buf_len;
@@ -37,42 +49,26 @@ static void LoadBuffers(void)
 
     buf_len = UNLEN;
     GetUserNameExW(NameDisplay, temp, &buf_len);
-    WCharToChar(temp, temp_buf, MAX_PATH);
+    SetEnvironment("USER=", temp);
+    SetEnvironment("USERNAME=", temp);
 
     // Temp dir:
 
     GetTempPathW(MAX_PATH, temp);
-    WCharToChar(temp, temp_buf, MAX_PATH);
+    SetEnvironment("TEMP=", temp);
 
     // Use My Documents dir as home:
 
     SHGetSpecialFolderPath(NULL, temp, CSIDL_PERSONAL, 0);
-    WCharToChar(temp, home_buf, MAX_PATH);
-}
+    SetEnvironment("HOME=", temp);
 
-char *getenv(const char *name)
-{
-    if (!buffers_loaded)
     {
-        LoadBuffers();
-        buffers_loaded = 1;
-    }
+        char *home = getenv("HOME");
 
-    if (!strcmp(name, "USER") || !strcmp(name, "USERNAME"))
-    {
-        return username_buf;
-    }
-    else if (!strcmp(name, "TEMP"))
-    {
-        return temp_buf;
-    }
-    else if (!strcmp(name, "HOME"))
-    {
-        return home_buf;
-    }
-    else
-    {
-        return NULL;
+        MultiByteToWideChar(CP_ACP, 0,
+                            home, strlen(home) + 1,
+                            temp, sizeof(temp));
+        MessageBoxW(NULL, temp, L"Home", MB_OK);
     }
 }
 
diff --git a/wince/env.h b/wince/env.h
index c2cb4243..d91f3fab 100644
--- a/wince/env.h
+++ b/wince/env.h
@@ -7,7 +7,11 @@
 #ifndef WINCE_ENV_H
 #define WINCE_ENV_H
 
-extern char *getenv(const char *name);
+// SDL provides an implementation of getenv/putenv:
+
+#include "SDL_getenv.h"
+
+extern void PopulateEnvironment(void);
 
 #endif /* #ifndef WINCE_ENV_H */
 
-- 
cgit v1.2.3


From b6491fa4aefc073a760d4bad51f55c2d6c0f5f35 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Mon, 8 Jun 2009 19:26:29 +0000
Subject: Remove debugging code.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1578
---
 wince/env.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/wince/env.c b/wince/env.c
index bedeb434..72af2212 100644
--- a/wince/env.c
+++ b/wince/env.c
@@ -61,14 +61,5 @@ void PopulateEnvironment(void)
 
     SHGetSpecialFolderPath(NULL, temp, CSIDL_PERSONAL, 0);
     SetEnvironment("HOME=", temp);
-
-    {
-        char *home = getenv("HOME");
-
-        MultiByteToWideChar(CP_ACP, 0,
-                            home, strlen(home) + 1,
-                            temp, sizeof(temp));
-        MessageBoxW(NULL, temp, L"Home", MB_OK);
-    }
 }
 
-- 
cgit v1.2.3