X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=ea5560f0f11265df49f4a89e0ac7486806f23cf4;hb=c6d278ec04f7618d636dbedc18b062bb07cf8a74;hp=b599a8d2b3ab13739a008f842163cd360649b10e;hpb=9384069316e400042076bd749ba0c6e0b07427fa;p=xboard.git

diff --git a/xboard.c b/xboard.c
index b599a8d..ea5560f 100644
--- a/xboard.c
+++ b/xboard.c
@@ -456,6 +456,7 @@ Display *xDisplay;
 Window xBoardWindow;
 Pixel lightSquareColor, darkSquareColor, whitePieceColor, blackPieceColor,
   jailSquareColor, highlightSquareColor, premoveHighlightColor;
+Pixel lowTimeWarningColor;
 GC lightSquareGC, darkSquareGC, jailSquareGC, lineGC, wdPieceGC, wlPieceGC,
   bdPieceGC, blPieceGC, wbPieceGC, bwPieceGC, coordGC, highlineGC,
   wjPieceGC, bjPieceGC, prelineGC, countGC;
@@ -1195,6 +1196,12 @@ XtResource clientResources[] = {
     { "showButtonBar", "showButtonBar", XtRBoolean,
 	sizeof(Boolean), XtOffset(AppDataPtr, showButtonBar),
 	XtRImmediate, (XtPointer) True },
+    { "lowTimeWarningColor", "lowTimeWarningColor", XtRString,
+      sizeof(String), XtOffset(AppDataPtr, lowTimeWarningColor),
+      XtRString, COLOR_LOWTIMEWARNING },
+    { "lowTimeWarning", "lowTimeWarning", XtRBoolean,
+      sizeof(Boolean), XtOffset(AppDataPtr, lowTimeWarning),
+      XtRImmediate, (XtPointer) False },
     {"icsEngineAnalyze", "icsEngineAnalyze", XtRBoolean,        /* [DM] icsEngineAnalyze */
         sizeof(Boolean), XtOffset(AppDataPtr, icsEngineAnalyze),
         XtRImmediate, (XtPointer) False },
@@ -1673,6 +1680,8 @@ XrmOptionDescRec shellOptions[] = {
     { "-showButtonBar", "showButtonBar", XrmoptionSepArg, NULL },
     { "-buttons", "showButtonBar", XrmoptionNoArg, "True" },
     { "-xbuttons", "showButtonBar", XrmoptionNoArg, "False" },
+    { "-lowTimeWarningColor", "lowTimeWarningColor", XrmoptionSepArg, NULL },
+    { "-lowTimeWarning", "lowTimeWarning", XrmoptionSepArg, NULL },
     /* [AS,HR] New features */
     { "-firstScoreAbs", "firstScoreAbs", XrmoptionSepArg, NULL },
     { "-secondScoreAbs", "secondScoreAbs", XrmoptionSepArg, NULL },
@@ -2320,6 +2329,20 @@ main(argc, argv)
     if (argc > 1) {
 	fprintf(stderr, _("%s: unrecognized argument %s\n"),
 		programName, argv[1]);
+	fprintf(stderr, "Recognized options:\n");
+	for(i = 0; i < XtNumber(shellOptions); i++) {
+	    j = fprintf(stderr, "  %s%s", shellOptions[i].option,
+		        (shellOptions[i].argKind == XrmoptionSepArg
+			 ? " ARG" : ""));
+	    if (i++ < XtNumber(shellOptions)) {
+		fprintf(stderr, "%*c%s%s\n", 40 - j, ' ',
+			shellOptions[i].option,
+			(shellOptions[i].argKind == XrmoptionSepArg
+			 ? " ARG" : ""));
+	    } else {
+		fprintf(stderr, "\n");
+	    }
+	}
 	exit(2);
     }
 
@@ -2577,6 +2600,20 @@ XBoard square size (hint): %d\n\
     if (forceMono) {
       fprintf(stderr, _("%s: too few colors available; trying monochrome mode\n"),
 	      programName);
+      
+      if (appData.bitmapDirectory == NULL ||
+	      appData.bitmapDirectory[0] == NULLCHAR)
+	    appData.bitmapDirectory = DEF_BITMAP_DIR;
+    }
+
+    if (appData.lowTimeWarning && !appData.monoMode) {
+      vFrom.addr = (caddr_t) appData.lowTimeWarningColor;
+      vFrom.size = strlen(appData.lowTimeWarningColor);
+      XtConvert(shellWidget, XtRString, &vFrom, XtRPixel, &vTo);
+      if (vTo.addr == NULL) 
+		appData.monoMode = True;
+      else
+		lowTimeWarningColor = *(Pixel *) vTo.addr;
     }
 
     if (appData.monoMode && appData.debugMode) {
@@ -8092,6 +8129,14 @@ DisplayTimerLabel(w, color, timer, highlight)
     char buf[MSG_SIZ];
     Arg args[16];
 
+    Pixel foregroundOrWarningColor = timerForegroundPixel;
+
+    if (timer > 0
+	&& appData.lowTimeWarning
+	&& (timer / 1000) < appData.icsAlarmTime)
+
+      foregroundOrWarningColor = lowTimeWarningColor;
+
     if (appData.clockMode) {
 	sprintf(buf, "%s: %s", color, TimeString(timer));
 	XtSetArg(args[0], XtNlabel, buf);
@@ -8101,11 +8146,12 @@ DisplayTimerLabel(w, color, timer, highlight)
     }
 
     if (highlight) {
-	XtSetArg(args[1], XtNbackground, timerForegroundPixel);
+
+	XtSetArg(args[1], XtNbackground, foregroundOrWarningColor);
 	XtSetArg(args[2], XtNforeground, timerBackgroundPixel);
     } else {
 	XtSetArg(args[1], XtNbackground, timerBackgroundPixel);
-	XtSetArg(args[2], XtNforeground, timerForegroundPixel);
+	XtSetArg(args[2], XtNforeground, foregroundOrWarningColor);
     }
 
     XtSetValues(w, args, 3);