be multi-monitor aware

Since I'm here, avoid scope-hiding globals 'fullscreen' and 'bpp'.

Author: jonof

include/baselayer.h

@@ -33,6 +33,7 @@ extern int startwin_run(struct startwin_settings *);
 extern int xres, yres, bpp, fullscreen, bytesperline, imageSize;
 extern char offscreenrendering;
 extern intptr_t frameplace;
+extern int displaycnt;
 
 extern void (*baselayer_videomodewillchange)(void);
 extern void (*baselayer_videomodedidchange)(void);
@@ -87,10 +88,14 @@ unsigned int getticks(void);
 unsigned int getusecticks(void);
 int gettimerfreq(void);
 
-int checkvideomode(int *x, int *y, int c, int fs, int forced);
-int setvideomode(int x, int y, int c, int fs);
+// If 'strict' is zero and 'fullsc' is zero, only 'bitspp' needs be valid
+// and VIDEOMODE_RELAXED is returned, otherwise the mode matched, or -1 if none.
+#define VIDEOMODE_RELAXED 0x7fffffff
+int checkvideomode(int *xdim, int *ydim, int bitspp, int fullsc, int strict);
+int setvideomode(int xdim, int ydim, int bitspp, int fullsc);
 void getvalidmodes(void);
 void resetvideomode(void);
+const char *getdisplayname(int display);
 
 void showframe(void);
 

include/build.h

@@ -202,9 +202,10 @@ EXTERN int validmodecnt;
 struct validmode_t {
 	int xdim,ydim;
 	unsigned char bpp;
-	unsigned char fs;	// bit 0 = fullscreen flag
-	char filler[2];
-	int extra;	// internal use
+	unsigned char fs;
+	unsigned char display; // 0 for windowed modes or the primary display.
+	unsigned char filler;
+	int extra;			// *layer-defined use
 };
 EXTERN struct validmode_t validmode[MAXVALIDMODES];
 
@@ -404,7 +405,8 @@ void   setbrightness(int dabrightness, unsigned char *dapal, char noapply);
 void   setpalettefade(unsigned char r, unsigned char g, unsigned char b, unsigned char offset);
 void   squarerotatetile(short tilenume);
 
-int   setgamemode(char davidoption, int daxdim, int daydim, int dabpp);
+#define SETGAMEMODE_FULLSCREEN(display,fulls) ((((int)(display)&255)<<8)|((int)(fulls)&255))
+int   setgamemode(int dafullscreen, int daxdim, int daydim, int dabpp);
 void   nextpage(void);
 void   setview(int x1, int y1, int x2, int y2);
 void   setaspect(int daxrange, int daaspect);

include/buildres.h

@@ -8,6 +8,7 @@
 #define IDC_FULLSCREEN              1101
 #define IDC_VMODE3D                 1102
 #define IDC_VMODE2D                 1103
+#define IDC_DISPLAY                 1104
 
 #define IDD_PAGE_MESSAGES           1200
 #define IDC_MESSAGES                1201

kenbuild/rsrc/startgtk_build.glade

@@ -19,6 +19,7 @@ @interface StartupWinController : NSWindowController <NSWindowDelegate>
     IBOutlet NSTabViewItem *tabConfig;
     IBOutlet NSTabViewItem *tabMessages;
     IBOutlet NSPopUpButton *videoMode3DPUButton;
+    IBOutlet NSPopUpButton *displayPUButton;
 
     IBOutlet NSButton *singlePlayerButton;
     IBOutlet NSButton *joinMultiButton;
@@ -35,7 +36,7 @@ - (int)modalRun;
 - (void)closeQuietly;
 - (void)populateVideoModes:(BOOL)firstTime;
 
-- (IBAction)fullscreenClicked:(id)sender;
+- (IBAction)fullscreenOrDisplayClicked:(id)sender;
 
 - (IBAction)multiPlayerModeClicked:(id)sender;
 
@@ -91,64 +92,74 @@ - (void)closeQuietly
 
 - (void)populateVideoModes:(BOOL)firstTime
 {
-    int i, mode3d = -1;
-    int idx3d = -1;
-    int xdim = 0, ydim = 0, bpp = 0, fullscreen = 0;
-    int cd[] = {
-#if USE_POLYMOST && USE_OPENGL
-        32, 24, 16, 15,
-#endif
-        8, 0
-    };
+    int i, mode3d = -1, idx3d = -1;
+    int xdim = 0, ydim = 0, bitspp = 0, display = 0, fullsc = 0;
+    int cd[] = { 32, 24, 16, 15, 8, 0 };
     NSMenu *menu3d = nil;
     NSMenuItem *menuitem = nil;
 
     if (firstTime) {
         getvalidmodes();
         xdim = settings->xdim3d;
         ydim = settings->ydim3d;
-        bpp  = settings->bpp3d;
-        fullscreen = settings->fullscreen;
+        bitspp = settings->bpp3d;
+        fullsc = settings->fullscreen & 255;
+        display = min(displaycnt, max(0, (settings->fullscreen >> 8)));
+
+        NSMenu *menu = [displayPUButton menu];
+        [menu removeAllItems];
+        for (int i = 0; i < displaycnt; i++) {
+            menuitem = [menu addItemWithTitle:[NSString stringWithFormat:@"Display %d \u2013 %s",
+                                               i, getdisplayname(i)]
+                                       action:nil
+                                keyEquivalent:@""];
+            [menuitem setTag:i];
+        }
+        if (displaycnt < 2) [displayPUButton setHidden:YES];
     } else {
-        fullscreen = ([fullscreenButton state] == NSControlStateValueOn);
-        mode3d = (int)[[videoMode3DPUButton selectedItem] tag];
+        fullsc = ([fullscreenButton state] == NSControlStateValueOn);
+        if (fullsc) display = max(0, (int)[displayPUButton selectedTag]);
+        mode3d = (int)[videoMode3DPUButton selectedTag];
         if (mode3d >= 0) {
             xdim = validmode[mode3d].xdim;
             ydim = validmode[mode3d].ydim;
-            bpp = validmode[mode3d].bpp;
+            bitspp = validmode[mode3d].bpp;
         }
     }
 
     // Find an ideal match.
-    mode3d = checkvideomode(&xdim, &ydim, bpp, fullscreen, 1);
-    if (mode3d < 0) {
-        for (i=0; cd[i]; ) { if (cd[i] >= bpp) i++; else break; }
-        for ( ; cd[i]; i++) {
-            mode3d = checkvideomode(&xdim, &ydim, cd[i], fullscreen, 1);
-            if (mode3d < 0) continue;
-            break;
-        }
+    mode3d = checkvideomode(&xdim, &ydim, bitspp, SETGAMEMODE_FULLSCREEN(display, fullsc), 1);
+    for (i=0; mode3d < 0 && cd[i]; i++) {
+        mode3d = checkvideomode(&xdim, &ydim, cd[i], SETGAMEMODE_FULLSCREEN(display, fullsc), 1);
     }
+    if (mode3d < 0) mode3d = 0;
+    fullsc = validmode[mode3d].fs;
+    display = validmode[mode3d].display;
 
-    // Repopulate the lists.
+    // Repopulate the mode lists.
     menu3d = [videoMode3DPUButton menu];
     [menu3d removeAllItems];
 
     for (i = 0; i < validmodecnt; i++) {
-        if (validmode[i].fs != fullscreen) continue;
+        if (validmode[i].fs != fullsc) continue;
+        if (validmode[i].display != display) continue;
 
-        if (i == mode3d) idx3d = i;
-        menuitem = [menu3d addItemWithTitle:[NSString stringWithFormat:@"%d %C %d %d-bpp",
-                                          validmode[i].xdim, 0xd7, validmode[i].ydim, validmode[i].bpp]
+        if (i == mode3d || idx3d < 0) idx3d = i;
+        menuitem = [menu3d addItemWithTitle:[NSString stringWithFormat:@"%d \u00d7 %d %d-bpp",
+                                             validmode[i].xdim, validmode[i].ydim,
+                                             validmode[i].bpp]
                                      action:nil
                               keyEquivalent:@""];
         [menuitem setTag:i];
     }
-
     if (idx3d >= 0) [videoMode3DPUButton selectItemWithTag:idx3d];
+
+    [displayPUButton selectItemWithTag:validmode[mode3d].display];
+    [displayPUButton setEnabled: validmode[mode3d].fs ? YES : NO];
+    [fullscreenButton setState: validmode[mode3d].fs ? NSControlStateValueOn : NSControlStateValueOff];
 }
 
-- (IBAction)fullscreenClicked:(id)sender
+- (IBAction)fullscreenOrDisplayClicked:(id)sender
 {
     [self populateVideoModes:NO];
 }
@@ -177,12 +188,12 @@ - (IBAction)start:(id)sender
 {
     int mode = -1;
 
-    mode = (int)[[videoMode3DPUButton selectedItem] tag];
+    mode = (int)[videoMode3DPUButton selectedTag];
     if (mode >= 0) {
         settings->xdim3d = validmode[mode].xdim;
         settings->ydim3d = validmode[mode].ydim;
         settings->bpp3d = validmode[mode].bpp;
-        settings->fullscreen = validmode[mode].fs;
+        settings->fullscreen = SETGAMEMODE_FULLSCREEN(validmode[mode].display, validmode[mode].fs);
     }
 
     settings->numplayers = 0;
@@ -210,9 +221,9 @@ - (void)setupConfigMode
     [alwaysShowButton setEnabled:YES];
 
     [videoMode3DPUButton setEnabled:YES];
-    [self populateVideoModes:YES];
     [fullscreenButton setEnabled:YES];
-    [fullscreenButton setState: (settings->fullscreen ? NSControlStateValueOn : NSControlStateValueOff)];
+    [displayPUButton setEnabled:YES];
+    [self populateVideoModes:YES];
 
     if (!settings->netoverride) {
         [singlePlayerButton setEnabled:YES];

kenbuild/rsrc/startgtk_build_gresource.c

@@ -44,9 +44,10 @@ FONT 8, "MS Shell Dlg", 0, 0, 1
 {
     LTEXT           "&2D Video mode:", IDC_STATIC, 7, 9, 52, 9, NOT WS_GROUP | SS_LEFT, WS_EX_LEFT
     COMBOBOX        IDC_VMODE2D, 75, 7, 95, 99, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST, WS_EX_LEFT
-    AUTOCHECKBOX    "&Fullscreen", IDC_FULLSCREEN, 179, 8, 49, 10, WS_TABSTOP, WS_EX_LEFT
     LTEXT           "&3D Video mode:", IDC_STATIC, 7, 27, 52, 9, NOT WS_GROUP | SS_LEFT, WS_EX_LEFT
     COMBOBOX        IDC_VMODE3D, 75, 25, 95, 99, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST, WS_EX_LEFT
+    AUTOCHECKBOX    "&Fullscreen", IDC_FULLSCREEN, 75, 43, 49, 10, WS_TABSTOP, WS_EX_LEFT
+    COMBOBOX        IDC_DISPLAY, 129, 41, 95, 99, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST, WS_EX_LEFT
 }
 
 

kenbuild/rsrc/startgtk_game.glade

@@ -64,6 +64,7 @@ enum {
 #if USE_POLYMOST
 static int tmprenderer = -1;
 #endif
+static int tmpfullscreen = -1, tmpdisplay = -1;
 static int tmpbrightness = -1;
 static int tmpsamplerate = -1;
 static int tmpmusic = -1;
@@ -84,11 +85,15 @@ static struct {
 		";   0 - No\n"
 		";   1 - Yes\n"
 	},
-	{ "fullscreen", type_bool, &fullscreen,
+	{ "fullscreen", type_bool, &tmpfullscreen,
 		"; Video mode selection\n"
 		";   0 - Windowed\n"
 		";   1 - Fullscreen\n"
 	},
+	{ "display", type_int, &tmpdisplay,
+		"; Video display number\n"
+		";   0 - Primary display\n"
+	},
 	{ "xdim", type_int, &xdimgame,
 		"; Video resolution\n"
 	},
@@ -273,6 +278,13 @@ int loadsetup(const char *fn)
 	if (tmpbrightness >= 0) {
 		brightness = min(max(tmpbrightness,0),15);
 	}
+	fullscreen = 0;
+	if (tmpfullscreen >= 0) {
+		fullscreen = tmpfullscreen;
+	}
+	if (tmpdisplay >= 0) {
+		fullscreen |= tmpdisplay<<8;
+	}
 	if (tmpsamplerate >= 0) {
 		option[7] = (tmpsamplerate & 0x0f) << 4;
 		option[7] |= 1|2|4;
@@ -307,6 +319,8 @@ int writesetup(const char *fn)
 	if (!fp) return -1;
 
 	tmpbrightness = brightness;
+	tmpfullscreen = !!(fullscreen&255);
+	tmpdisplay = fullscreen>>8;
 #if USE_POLYMOST
 	tmprenderer = getrendermode();
 #endif