Use Ctrl key in EditPosition mode to copy pieces

[xboard.git] / dialogs.c

diff --git a/dialogs.c b/dialogs.c
index b802c62..a6698ca 100644 (file)
--- a/dialogs.c
+++ b/dialogs.c
@@ -237,7 +237,7 @@ GenericReadout (Option *opts, int selected)
 char *engineName, *engineChoice, *tfName;
 char *engineList[MAXENGINES] = {" "}, *engineMnemonic[MAXENGINES];
 
-static void AddToTourney P((int n));
+static void AddToTourney P((int n, int sel));
 static void CloneTourney P((void));
 static void ReplaceParticipant P((void));
 static void UpgradeParticipant P((void));
@@ -263,7 +263,7 @@ static Option matchOptions[] = {
 { 150, T_VSCRL | T_FILL | T_WRAP,
                 175, NULL, (void*) &engineName, "", NULL, TextBox, "" },
 { 150, SAME_ROW|RR,
-                175, NULL, (void*) (engineMnemonic+1), (char*) &AddToTourney, NULL, ListBox, "" },
+                175, NULL, (void*) engineMnemonic, (char*) &AddToTourney, NULL, ListBox, "" },
 //{ 0,  COMBO_CALLBACK | NO_GETTEXT,
 //               0, NULL, (void*) &AddToTourney, (char*) (engineMnemonic+1), (engineMnemonic+1), ComboBox, N_("Select Engine:") },
 { 0,  0,         10, NULL, (void*) &appData.tourneyType, "", NULL, Spin, N_("Tourney type (0 = round-robin, 1 = gauntlet):") },
@@ -313,18 +313,30 @@ CloneTourney ()
 }
 
 static void
-AddToTourney (int n)
+AddToTourney (int n, int sel)
 {
-    AddLine(&matchOptions[7], engineMnemonic[SelectedListBoxItem(&matchOptions[8])+1]);
+    int nr;
+    char buf[MSG_SIZ];
+    if(sel < 1) buf[0] = NULLCHAR; // back to top level
+    else if(engineList[sel][0] == '#') safeStrCpy(buf, engineList[sel], MSG_SIZ); // group header, open group
+    else { // normal line, select engine
+       AddLine(&matchOptions[7], engineMnemonic[sel]);
+       return;
+    }
+    nr = NamesToList(firstChessProgramNames, engineList, engineMnemonic, buf); // replace list by only the group contents
+    ASSIGN(engineMnemonic[0], buf);
+    LoadListBox(&matchOptions[8], _("# no engines are installed"));
+    HighlightWithScroll(&matchOptions[8], 0, nr);
 }
 
 void
 MatchOptionsProc ()
 {
-   NamesToList(firstChessProgramNames, engineList, engineMnemonic, "all");
+   NamesToList(firstChessProgramNames, engineList, engineMnemonic, "");
    matchOptions[9].min = -(appData.pairingEngine[0] != NULLCHAR); // with pairing engine, allow Swiss
    ASSIGN(tfName, appData.tourneyFile[0] ? appData.tourneyFile : MakeName(appData.defName));
    ASSIGN(engineName, appData.participants);
+   ASSIGN(engineMnemonic[0], "");
    GenericPopUp(matchOptions, _("Match Options"), TransientDlg, BoardWindow, MODAL, 0);
 }
 
@@ -1780,22 +1792,6 @@ DisplayTitle (char *text)
     SetWindowTitle(text, title, icon);
 }
 
-void
-DisplayWhiteClock (long timeRemaining, int highlight)
-{
-    if(appData.noGUI) return;
-    DisplayTimerLabel(11, _("White"), timeRemaining, highlight);
-    if(highlight) SetClockIcon(0);
-}
-
-void
-DisplayBlackClock (long timeRemaining, int highlight)
-{
-    if(appData.noGUI) return;
-    DisplayTimerLabel(12, _("Black"), timeRemaining, highlight);
-    if(highlight) SetClockIcon(1);
-}
-
 #define PAUSE_BUTTON "P"
 #define PIECE_MENU_SIZE 18
 static String pieceMenuStrings[2][PIECE_MENU_SIZE+1] = {
@@ -1913,7 +1909,9 @@ Exp (int n, int x, int y)
        if(but3) MovePV(x, y, lineGap + BOARD_HEIGHT * (squareSize + lineGap));
        return NULL;
     }
-    shiftKey = (ShiftKeys() & 3) != 0;
+    shiftKey = ShiftKeys();
+    controlKey = (shiftKey & 0xC) != 0;
+    shiftKey = (shiftKey & 3) != 0;
     switch(n) {
        case  1: LeftClick(Press,   x, y), but1 = 1; break;
        case -1: LeftClick(Release, x, y), but1 = 0; break;
@@ -1923,11 +1921,6 @@ Exp (int n, int x, int y)
        case -3: menuNr = RightClick(Release, x, y, &pmFromX, &pmFromY), but3 = 0; break;
        case 10:
            DrawPosition(True, NULL);
-           if(twoBoards) { // [HGM] dual: draw other board in other orientation
-               flipView = !flipView; partnerUp = !partnerUp;
-               DrawPosition(True, NULL);
-               flipView = !flipView; partnerUp = !partnerUp;
-           }
        default:
            return NULL;
     }
@@ -1963,6 +1956,64 @@ BoardPopUp (int squareSize, int lineGap, void *clockFontThingy)
     return mainOptions;
 }
 
+static Option *
+SlaveExp (int n, int x, int y)
+{
+    if(n == 10) { // expose event
+       flipView = !flipView; partnerUp = !partnerUp;
+       DrawPosition(True, NULL); // [HGM] dual: draw other board in other orientation
+       flipView = !flipView; partnerUp = !partnerUp;
+    }
+    return NULL;
+}
+
+Option dualOptions[] = { // auxiliary board window
+{ 0, L2L|T2T,              198, NULL, NULL, NULL, NULL, Label, "White" }, // white clock
+{ 0, R2R|T2T|SAME_ROW,     198, NULL, NULL, NULL, NULL, Label, "Black" }, // black clock
+{ 0, LR|T2T|BORDER,        401, NULL, NULL, NULL, NULL, Label, "message" }, // message field
+{ 401, LR|TT, 401, NULL, (char*) &SlaveExp, NULL, NULL, Graph, "shadow board" }, // board
+{ 0,  NO_OK, 0, NULL, NULL, "", NULL, EndMark , "" }
+};
+
+void
+SlavePopUp ()
+{
+    // copy params from main board
+    dualOptions[0].choice = mainOptions[11].choice;
+    dualOptions[1].choice = mainOptions[12].choice;
+    dualOptions[3].value = mainOptions[22].value;
+    dualOptions[3].max = dualOptions[2].max = mainOptions[22].max; // board size
+    dualOptions[0].max = dualOptions[1].max = mainOptions[11].max; // clock width
+    GenericPopUp(dualOptions, "XBoard", DummyDlg, BoardWindow, NONMODAL, 1);
+}
+
+void
+DisplayWhiteClock (long timeRemaining, int highlight)
+{
+    if(appData.noGUI) return;
+    if(twoBoards && partnerUp) {
+       DisplayTimerLabel(&dualOptions[0], _("White"), timeRemaining, highlight);
+       return;
+    }
+    DisplayTimerLabel(&mainOptions[11], _("White"), timeRemaining, highlight);
+    if(highlight) SetClockIcon(0);
+}
+
+void
+DisplayBlackClock (long timeRemaining, int highlight)
+{
+    if(appData.noGUI) return;
+    if(twoBoards && partnerUp) {
+       DisplayTimerLabel(&dualOptions[1], _("Black"), timeRemaining, highlight);
+       return;
+    }
+    DisplayTimerLabel(&mainOptions[12], _("Black"), timeRemaining, highlight);
+    if(highlight) SetClockIcon(1);
+}
+
+
+//---------------------------------------------
+
 void
 DisplayMessage (char *message, char *extMessage)
 {