Window position memory for win32

git-svn-id: https://svn.eduke32.com/eduke32@540 1a8010ca-5511-0410-912e-c29ae57300e0

polymer/build/include/build.h

@@ -218,6 +218,8 @@ EXTERN char picsiz[MAXTILES];
 EXTERN char walock[MAXTILES];
 EXTERN long pow2long[32];
 EXTERN long numtiles, picanm[MAXTILES], waloff[MAXTILES];
+
+EXTERN int windowpos, windowx, windowy;
 
     //These variables are for auto-mapping with the draw2dscreen function.
     //When you load a new board, these bits are all set to 0 - since

polymer/build/src/config.c

@@ -177,7 +177,15 @@ if (readconfig(fp, "renderer", val, VL) > 0) { i = Batoi(val); setrendermode(i);
     if (readconfig(fp, "key2dzoomout", val, VL) > 0) keys[17] = Bstrtol(val, NULL, 16);
     if (readconfig(fp, "keychat", val, VL) > 0) keys[18] = Bstrtol(val, NULL, 16);
 #endif
-    
+
+#ifdef RENDERTYPEWIN
+    if (readconfig(fp, "windowpos", val, VL) > 0) windowpos = Batoi(val);
+    windowx = -1;
+    if (readconfig(fp, "windowx", val, VL) > 0) windowx = Batoi(val);
+    windowy = -1;
+    if (readconfig(fp, "windowy", val, VL) > 0) windowy = Batoi(val);
+#endif    
+
 if (readconfig(fp, "keyconsole", val, VL) > 0) { keys[19] = Bstrtol(val, NULL, 16); OSD_CaptureKey(keys[19]); }
 
     if (readconfig(fp, "mousesensitivity", val, VL) > 0) msens = Bstrtod(val, NULL);
@@ -229,6 +237,11 @@ int writesetup(const char *fn)
              "; Maximum OpenGL mode refresh rate (Windows only, in Hertz)\n"
              "maxrefreshfreq = %d\n"
              "\n"
+             "; Window positioning, 0 = center, 1 = memory\n"
+             "windowpos = %d\n"
+             "windowx = %d\n"
+             "windowy = %d\n"
+             "\n"
 #endif
              "; 3D mode brightness setting\n"
              ";   0  - lowest\n"
@@ -313,7 +326,7 @@ int writesetup(const char *fn)
              glusetexcache, glusetexcachecompression, gltexfiltermode, glanisotropy,
 #endif
 #ifdef RENDERTYPEWIN
-             maxrefreshfreq,
+             maxrefreshfreq, windowpos, windowx, windowy,
 #endif
              brightness, 
 #if 0

polymer/build/src/winlayer.c

@@ -103,7 +103,7 @@ static void RestoreSystemColours(void);
 static long desktopxdim=0,desktopydim=0,desktopbpp=0,modesetusing=-1;
 long xres=-1, yres=-1, fullscreen=0, bpp=0, bytesperline=0, imageSize=0;
 long frameplace=0, lockcount=0;
-static int windowposx, windowposy, curvidmode = -1;
+static int curvidmode = -1;
 static int customxdim = 640, customydim = 480, custombpp = 8, customfs = 0;
 static unsigned modeschecked=0;
 unsigned maxrefreshfreq=60;
@@ -3075,13 +3075,20 @@ static BOOL CreateAppWindow(int modenum)
         w=width;
         h=height;
     }
-    SetWindowPos(hWindow, HWND_TOP, x, y, w, h, 0);
+
+    if (windowx == -1)
+        windowx = x;
+
+    if (windowy == -1)
+        windowy = y;
 
     SetWindowText(hWindow, apptitle);
     ShowWindow(hWindow, SW_SHOWNORMAL);
     SetForegroundWindow(hWindow);
     SetFocus(hWindow);
 
+    SetWindowPos(hWindow, HWND_TOP, windowpos?windowx:x, windowpos?windowy:y, w, h, 0);
+
     // fullscreen?
     if (!fs) {
         if (bitspp > 8) {
@@ -3663,10 +3670,18 @@ static LRESULT CALLBACK WndProcCallback(HWND hWnd, UINT uMsg, WPARAM wParam, LPA
         return TRUE;
 
     case WM_MOVE:
-        windowposx = LOWORD(lParam);
-        windowposy = HIWORD(lParam);
+//        windowx = LOWORD(lParam);
+//        windowy = HIWORD(lParam);
         return 0;
 
+    case WM_MOVING:
+    {
+        RECT *RECTYMcRECT = (LPRECT)lParam;
+
+        windowx = RECTYMcRECT->left;
+        windowy = RECTYMcRECT->top;
+        return 0;
+    }
     case WM_CLOSE:
         quitevent = 1;
         return 0;

polymer/eduke32/names.h

@@ -622,7 +622,7 @@ Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
 #define BORNTOBEWILDSCREEN 3370
 #define BLIMP 3400
 #define FEM9 3450
-#define FOOTPRINT 3701
+#define FOOTPRINT 3701
 #define FRAMEEFFECT1_13 3999
 #define POOP 4094
 #define FRAMEEFFECT1 4095

polymer/eduke32/source/astub.c

@@ -5630,7 +5630,7 @@ int parsetilegroups(scriptfile *script)
             if (scriptfile_getbraces(script,&end)) break;
 
             s_TileGroups[tile_groups].pIds = Bcalloc(MAX_TILE_GROUP_ENTRIES,sizeof(long));
-            s_TileGroups[tile_groups].szText = strdup(name);
+            s_TileGroups[tile_groups].szText = Bstrdup(name);
 
             while (script->textptr < end)
             {

polymer/eduke32/source/config.c

@@ -771,6 +771,11 @@ int32 CONFIG_ReadSetup(void)
 #ifdef _WIN32
         SCRIPT_GetNumber(scripthandle, "Updates", "CheckForUpdates", &checkforupdates);
         SCRIPT_GetNumber(scripthandle, "Updates", "LastUpdateCheck", &lastupdatecheck);
+        SCRIPT_GetNumber(scripthandle, "Screen Setup", "WindowPositioning", (int32 *)&windowpos);
+        windowx = -1;
+        SCRIPT_GetNumber(scripthandle, "Screen Setup", "WindowPosX", (int32 *)&windowx);
+        windowy = -1;
+        SCRIPT_GetNumber(scripthandle, "Screen Setup", "WindowPosY", (int32 *)&windowy);
 #endif
     }
 
@@ -894,6 +899,9 @@ void CONFIG_WriteSetup(void)
 #ifdef _WIN32
     SCRIPT_PutNumber(scripthandle, "Updates", "CheckForUpdates", checkforupdates, false, false);
     SCRIPT_PutNumber(scripthandle, "Updates", "LastUpdateCheck", lastupdatecheck, false, false);
+    SCRIPT_PutNumber(scripthandle, "Screen Setup", "WindowPositioning", windowpos, false, false);
+    SCRIPT_PutNumber(scripthandle, "Screen Setup", "WindowPosX", windowx, false, false);
+    SCRIPT_PutNumber(scripthandle, "Screen Setup", "WindowPosY", windowy, false, false);
 #endif
 
     // JBF 20031211

polymer/eduke32/tiles.cfg

@@ -1,7 +1,7 @@
 // Mapster32 tile grouping configuration file
 // Press T on the tile selection screen to access the tileset selection menu
 
-#include NAMES.H
+#include "names.h"
 
 tilegroup "Actors"
 {
@@ -9,7 +9,7 @@ tilegroup "Actors"
 
     tiles 
     {
-    	LIZTROOP LIZTROOPRUNNING LIZTROOPSTAYPUT LIZTROOPSHOOT LIZTROOPJETPACK
+    	APLAYER LIZTROOP LIZTROOPRUNNING LIZTROOPSTAYPUT LIZTROOPSHOOT LIZTROOPJETPACK
     	LIZTROOPONTOILET LIZTROOPJUSTSIT LIZTROOPDUCKING
     	PIGCOP PIGCOPSTAYPUT PIGCOPDIVE
     	LIZMAN LIZMANSTAYPUT LIZMANSPITTING LIZMANFEEDING LIZMANJUMP
@@ -92,7 +92,7 @@ tilegroup "Items"
     }
 }
 
-tilegroup "Respawning items"
+tilegroup "Respawn triggers"
 {
     hotkey "R"
 
@@ -118,12 +118,13 @@ tilegroup "Exploding stuff"
     	FIREVASE 2066 BURNING FIRE BURNING2 FIRE2
     }
 }
-tilegroup "Letters"
-{
-    hotkey "L"
-    
-    tilerange 2822 2915
-    tilerange 2929 3022
-    tilerange 3072 3135
-    tilerange 3162 3165
-}
+
+tilegroup "Letters"
+{
+    hotkey "L"
+    
+    tilerange 2822 2915
+    tilerange 2929 3022
+    tilerange 3072 3135
+    tilerange 3162 3165
+}