reindent some functions

[xboard.git] / xgamelist.c

diff --git a/xgamelist.c b/xgamelist.c
index c0a19ff..40294af 100644 (file)
--- a/xgamelist.c
+++ b/xgamelist.c
@@ -1,6 +1,5 @@
 /*
  * xgamelist.c -- Game list window, part of X front end for XBoard
- * $Id$
  *
  * Copyright 1995,2009 Free Software Foundation, Inc.
  * ------------------------------------------------------------------------
@@ -92,8 +91,7 @@ extern char *getenv();
 #endif
 
 
-extern Widget formWidget, shellWidget, boardWidget, menuBarWidget;
-extern Display *xDisplay;
+extern Widget formWidget, boardWidget, menuBarWidget, gameListShell;
 extern int squareSize;
 extern Pixmap xMarkPixmap;
 extern char *layoutName;
@@ -138,13 +136,13 @@ GameListCreate(name, callback, client_data)
     XtSetArg(args[j], XtNresizable, True);  j++;
     XtSetArg(args[j], XtNallowShellResize, True);  j++;
 #if TOPLEVEL
-    shell =
-      XtCreatePopupShell(name, topLevelShellWidgetClass,
-                        shellWidget, args, j);
+//    shell = gameListShell =
+//      XtCreatePopupShell(name, topLevelShellWidgetClass,
+//                      shellWidget, args, j);
 #else
-    shell =
-      XtCreatePopupShell(name, transientShellWidgetClass,
-                        shellWidget, args, j);
+//    shell = gameListShell =
+//      XtCreatePopupShell(name, transientShellWidgetClass,
+//                      shellWidget, args, j);
 #endif
     layout =
       XtCreateManagedWidget(layoutName, formWidgetClass, shell,
@@ -219,6 +217,13 @@ GameListCreate(name, callback, client_data)
       XtCreateManagedWidget(_("close"), commandWidgetClass, form, args, j);
     XtAddCallback(b_close, XtNcallback, callback, client_data);
 
+    if(wpGameList.width > 0) {
+       glc->x = wpGameList.x;
+       glc->y = wpGameList.y;
+       glc->w = wpGameList.width;
+       glc->h = wpGameList.height;
+    }
+
     if (glc->x == -1) {
        Position y1;
        Dimension h1;
@@ -232,21 +237,21 @@ GameListCreate(name, callback, client_data)
        glc->w = fw_width * 3/4;
        glc->h = squareSize * 3;
 
-       XSync(xDisplay, False);
+       //      XSync(xDisplay, False);
 #ifdef NOTDEF
        /* This code seems to tickle an X bug if it is executed too soon
           after xboard starts up.  The coordinates get transformed as if
           the main window was positioned at (0, 0).
        */
-       XtTranslateCoords(shellWidget, (fw_width - glc->w) / 2,
-                         y1 + (h1 - glc->h + appData.borderYoffset) / 2,
-                         &glc->x, &glc->y);
+//     XtTranslateCoords(shellWidget, (fw_width - glc->w) / 2,
+//                       y1 + (h1 - glc->h + appData.borderYoffset) / 2,
+//                       &glc->x, &glc->y);
 #else /*!NOTDEF*/
-        XTranslateCoordinates(xDisplay, XtWindow(shellWidget),
-                             RootWindowOfScreen(XtScreen(shellWidget)),
-                             (fw_width - glc->w) / 2,
-                             y1 + (h1 - glc->h + appData.borderYoffset) / 2,
-                             &xx, &yy, &junk);
+//        XTranslateCoordinates(xDisplay, XtWindow(shellWidget),
+//                           RootWindowOfScreen(XtScreen(shellWidget)),
+//                           (fw_width - glc->w) / 2,
+//                           y1 + (h1 - glc->h + appData.borderYoffset) / 2,
+//                           &xx, &yy, &junk);
        glc->x = xx;
        glc->y = yy;
 #endif /*!NOTDEF*/
@@ -260,7 +265,7 @@ GameListCreate(name, callback, client_data)
     XtSetValues(shell, args, j);
 
     XtRealizeWidget(shell);
-    CatchDeleteWindow(shell, "GameListPopDown");
+    //    CatchDeleteWindow(shell, "GameListPopDown");
 
     return shell;
 }
@@ -456,8 +461,12 @@ GameListPopDown()
     XtSetArg(args[j], XtNheight, &glc->h); j++;
     XtSetArg(args[j], XtNwidth, &glc->w); j++;
     XtGetValues(glc->shell, args, j);
+    wpGameList.x = glc->x - 4;
+    wpGameList.y = glc->y - 23;
+    wpGameList.width = glc->w;
+    wpGameList.height = glc->h;
     XtPopdown(glc->shell);
-    XtSetKeyboardFocus(shellWidget, formWidget);
+//    XtSetKeyboardFocus(shellWidget, formWidget);
     glc->up = False;
     j = 0;
     XtSetArg(args[j], XtNleftBitmap, None); j++;
@@ -474,3 +483,9 @@ GameListHighlight(index)
     listwidg = XtNameToWidget(glc->shell, "*form.viewport.list");
     XawListHighlight(listwidg, index - 1);
 }
+
+Boolean
+GameListIsUp()
+{
+    return glc && glc->up;
+}