rework logic for default display; store -1 to mean "default" b/c of renumbering

Author: benfry

app/src/processing/app/ui/PreferencesFrame.java

@@ -77,6 +77,7 @@ public class PreferencesFrame {
   JComboBox<String> languageSelectionBox;
 
   int displayCount;
+  int defaultDisplayNum;
 
   String[] monoFontFamilies;
   JComboBox<String> fontSelectionBox;
@@ -620,13 +621,19 @@ protected void applyFrame() {
     // The preference will have already been reset when the window was created
     if (displaySelectionBox.isEnabled()) {
       int oldDisplayNum = Preferences.getInteger("run.display");
-      int displayNum = -1;
+      int displayNum = -1;  // use the default display
       for (int d = 0; d < displaySelectionBox.getItemCount(); d++) {
         if (displaySelectionBox.getSelectedIndex() == d) {
-          displayNum = d + 1;
+          if (d == defaultDisplayNum-1) {
+            // if it's the default display, store -1 instead of its index,
+            // because displays can get renumbered when others are attached
+            displayNum = -1;
+          } else {
+            displayNum = d + 1;
+          }
         }
       }
-      if ((displayNum != -1) && (displayNum != oldDisplayNum)) {
+      if (displayNum != oldDisplayNum) {
         Preferences.setInteger("run.display", displayNum); //$NON-NLS-1$
         // Reset the location of the sketch, the window has changed
         for (Editor editor : base.getEditors()) {
@@ -719,12 +726,12 @@ public void showFrame() {
     sketchbookLocationField.setText(Preferences.getSketchbookPath());
     checkUpdatesBox.setSelected(Preferences.getBoolean("update.check")); //$NON-NLS-1$
 
-    int defaultDisplayNum = updateDisplayList();
+    defaultDisplayNum = updateDisplayList();
     int displayNum = Preferences.getInteger("run.display"); //$NON-NLS-1$
-    //if (displayNum > 0 && displayNum <= displayCount) {
     if (displayNum < 1 || displayNum > displayCount) {
+      // set the display on close instead; too much weird logic here
+      //Preferences.setInteger("run.display", displayNum);
       displayNum = defaultDisplayNum;
-      Preferences.setInteger("run.display", displayNum);
     }
     displaySelectionBox.setSelectedIndex(displayNum-1);
 

core/todo.txt

@@ -32,10 +32,13 @@ X   two simple examples added to the issue that can be used for tests
 X copy() not working correctly
 X   https://github.com/processing/processing4/issues/169
 
+false alarm
+X setting which display to use does not work
+X   https://github.com/processing/processing4/issues/187
+X   working, though display numbers might be weird
+
 
 regressions
-_ (unconfirmed) setting which display to use does not work
-_   https://github.com/processing/processing4/issues/187
 _ mouseButton not set correctly on mouseReleased() with Java2D
 _   https://github.com/processing/processing4/issues/181
 _   https://github.com/processing/processing4/pull/188
@@ -62,8 +65,6 @@ X   https://github.com/processing/processing/issues/5880
 X Export Application broken in Processing 3.5.4 when using P2D or P3D renderers
 X   may be a JOGL bug, fixed by the 2.4 RC (therefore fixed in 4.x already?)
 _   https://github.com/processing/processing/issues/5983
-_ Profile GL3bc is not available on X11GraphicsDevice
-_   https://github.com/processing/processing/issues/5476
 X Cannot run rotateZ() within the PShape class
 _   https://github.com/processing/processing/issues/5770
 _ Profile GL4bc is not available on X11GraphicsDevice

todo.txt

@@ -28,6 +28,9 @@ X   seems that --external not getting passed
 X   https://github.com/processing/processing4/issues/158
 X   https://github.com/processing/processing/issues/5843
 X   https://github.com/processing/processing/issues/5781
+X store -1 as display number when using the default
+X   ran into weird situation where '1' was renumbered by adding a screen
+X   so the default was now the external display
 
 earlier
 o further streamline the downloader
@@ -45,6 +48,10 @@ X   https://github.com/processing/processing4/issues/201
 X   https://github.com/processing/processing/pull/4097
 
 
+_ editor windows always open on display 1
+_   https://github.com/processing/processing/issues/1566
+
+
 may be fixed
 _ Undo feature may have undesired results (4.0a4)
 _   https://github.com/processing/processing/issues/4775
@@ -330,9 +337,6 @@ _ library compilations not ordered properly w/ sorting
 _   do we still support library compilations? that was from 2016
 _   https://github.com/processing/processing/issues/4630
 
-_ editor windows always open on display 1
-_   https://github.com/processing/processing/issues/1566
-
 
 needs review
 _ createPreprocessor() added to JavaEditor, creating a mess