Fix merging bug

[xboard.git] / xboard.c

diff --git a/xboard.c b/xboard.c
index 0f12af6..d9f382a 100644 (file)
--- a/xboard.c
+++ b/xboard.c
@@ -4215,6 +4215,7 @@ static void colorDrawPieceImage(piece, square_color, x, y, dest)
        }
        break;
     }
+    if(appData.upsideDown && flipView) kind ^= 2; // swap white and black pieces
     XCopyArea(xDisplay, xpmPieceBitmap[kind][piece],
              dest, wlPieceGC, 0, 0,
              squareSize, squareSize, x, y);
@@ -8119,7 +8120,8 @@ DoInputCallback(closure, source, xid)
          
          /* read from stdin */
          rl_callback_read_char(); 
-         /* redisplay the current line */
+
+         /* redisplay the current line, check special case for login and password */
          if(sending_ICS_password)
            {
              int i; char buf[MSG_SIZ];
@@ -8741,6 +8743,7 @@ OverlayPiece(piece, clip, outline,  dest)
       kind = 0;
     else
       kind = 2;
+    if(appData.upsideDown && flipView) kind ^= 2;
     XCopyArea(xDisplay, xpmPieceBitmap[kind][piece],
              dest, clip,
              0, 0, squareSize, squareSize,