X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=80e622e4ebaa48665943f4fb4616b3dedb9aad9f;hb=1f84be6944ee48b72a33cf064661fa1a2129b885;hp=9a073d0451f1e0fcf501902a98e47cbf0d633cad;hpb=6b443e7b875f25eaceb11f64d17660260587829e;p=xboard.git diff --git a/xboard.c b/xboard.c index 9a073d0..80e622e 100644 --- a/xboard.c +++ b/xboard.c @@ -141,6 +141,12 @@ extern char *getenv(); # endif #endif + +# if HAVE_LIBREADLINE /* add gnu-readline support */ +#include +#include +# endif + #include #include #include @@ -468,6 +474,11 @@ void SettingsPopDown P(()); void update_ics_width P(()); int get_term_width P(()); int CopyMemoProc P(()); + +# if HAVE_LIBREADLINE /* add gnu-readline support */ +static void ReadlineCompleteHandler P((char *)); +# endif + /* * XBoard depends on Xt R4 or higher */ @@ -503,6 +514,13 @@ FileProc fileProc; char *fileOpenMode; char installDir[] = "."; // [HGM] UCI: needed for UCI; probably needs run-time initializtion +# if HAVE_LIBREADLINE /* gnu readline support */ +static char* readline_buffer; +static int readline_complete=0; +extern int sending_ICS_login; +extern int sending_ICS_password; +#endif + Position commentX = -1, commentY = -1; Dimension commentW, commentH; typedef unsigned int BoardSize; @@ -1061,8 +1079,9 @@ char globalTranslations[] = \"Send to second chess program:\",,2) \n"; char boardTranslations[] = - ": HandleUserMove() \n \ - : HandleUserMove() \n \ + ": HandleUserMove(0) \n \ + Shift: HandleUserMove(1) \n \ + : HandleUserMove(0) \n \ : AnimateUserMove() \n \ : HandlePV() \n \ : PieceMenuPopup(menuB) \n \ @@ -1773,6 +1792,12 @@ main(argc, argv) setbuf(stdout, NULL); setbuf(stderr, NULL); debugFP = stderr; + +# if HAVE_LIBREADLINE + /* install gnu-readline handler */ + rl_callback_handler_install("> ", ReadlineCompleteHandler); + rl_readline_name="XBoard"; +# endif if(argc > 1 && (!strcmp(argv[1], "-v" ) || !strcmp(argv[1], "--version" ))) { printf("%s version %s\n", PACKAGE_NAME, PACKAGE_VERSION); @@ -2596,6 +2621,13 @@ ShutDownFrontEnd() if (saveSettingsOnExit) SaveSettings(settingsFileName); unlink(gameCopyFilename); unlink(gamePasteFilename); + +# if HAVE_LIBREADLINE + /* remove gnu-readline handler. */ + rl_callback_handler_remove(); +#endif + + return; } RETSIGTYPE TermSizeSigHandler(int sig) @@ -4184,6 +4216,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); @@ -4619,6 +4652,7 @@ void HandleUserMove(w, event, prms, nprms) Cardinal *nprms; { if (w != boardWidget || errorExitStatus != -1) return; + if(nprms) shiftKey = !strcmp(prms[0], "1"); if (promotionUp) { if (event->type == ButtonPress) { @@ -8075,16 +8109,98 @@ DoInputCallback(closure, source, xid) } q = is->buf; while (p < is->unused) { - *q++ = *p++; + *q++ = *p++; } is->unused = q; } else { - count = read(is->fd, is->buf, INPUT_SOURCE_BUF_SIZE); - if (count == -1) - error = errno; - else - error = 0; - (is->func)(is, is->closure, is->buf, count, error); +# if HAVE_LIBREADLINE + /* check if input is from stdin, if yes, use gnu-readline */ + if( is->fd==fileno(stdin) ) + { + /* to clear the line */ + printf("\r \r"); + + /* read from stdin */ + rl_callback_read_char(); + + /* redisplay the current line, check special case for login and password */ + if(sending_ICS_password) + { + int i; char buf[MSG_SIZ]; + + bzero(buf,MSG_SIZ); + + /* blank the password */ + count = strlen(rl_line_buffer); + if(count>MSG_SIZ-1) + { + printf("PROBLEM with readline\n"); + count=MSG_SIZ; + } + for(i=0;iINPUT_SOURCE_BUF_SIZE-1) + { + printf("PROBLEM with readline\n"); + count = INPUT_SOURCE_BUF_SIZE; + }; + strncpy(is->buf,readline_buffer,count); + is->buf[count]='\n';count++; + + /* reset gnu-readline state */ + free(readline_buffer); + readline_buffer=NULL; + readline_complete=0; + + if (count == -1) + error = errno; + else + error = 0; + (is->func)(is, is->closure, is->buf, count, error); + + /* are we done with the password? */ + if(sending_ICS_password) + sending_ICS_password=0; + if(sending_ICS_login) + sending_ICS_login=0; + } + } + else + { + /* input not from stdin, use default method */ + count = read(is->fd, is->buf, INPUT_SOURCE_BUF_SIZE); + if (count == -1) + error = errno; + else + error = 0; + (is->func)(is, is->closure, is->buf, count, error); + }; +#else /* no readline support */ + count = read(is->fd, is->buf, INPUT_SOURCE_BUF_SIZE); + if (count == -1) + error = errno; + else + error = 0; + (is->func)(is, is->closure, is->buf, count, error); +#endif + } } @@ -8140,28 +8256,36 @@ int OutputToProcess(pr, message, count, outError) ChildProc *cp = (ChildProc *) pr; int outCount; + if (pr == NoProc) { - if (appData.noJoin || !appData.useInternalWrap) - outCount = fwrite(message, 1, count, stdout); - else + if (appData.noJoin || !appData.useInternalWrap) + outCount = fwrite(message, 1, count, stdout); + else { - int width = get_term_width(); - int len = wrap(NULL, message, count, width, &line); - char *msg = malloc(len); - int dbgchk; - - if (!msg) - outCount = fwrite(message, 1, count, stdout); - else + int width = get_term_width(); + int len = wrap(NULL, message, count, width, &line); + char *msg = malloc(len); + int dbgchk; + + if (!msg) + outCount = fwrite(message, 1, count, stdout); + else { - dbgchk = wrap(msg, message, count, width, &line); - if (dbgchk != len && appData.debugMode) - fprintf(debugFP, "wrap(): dbgchk(%d) != len(%d)\n", dbgchk, len); - outCount = fwrite(msg, 1, dbgchk, stdout); - free(msg); + dbgchk = wrap(msg, message, count, width, &line); + if (dbgchk != len && appData.debugMode) + fprintf(debugFP, "wrap(): dbgchk(%d) != len(%d)\n", dbgchk, len); + outCount = fwrite(msg, 1, dbgchk, stdout); + free(msg); } } + +# if HAVE_LIBREADLINE + /* readline support */ + if(strlen(rl_line_buffer)) + printf("\n> %s",rl_line_buffer); +#endif + } else outCount = write(cp->fdTo, message, count); @@ -8621,6 +8745,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, @@ -8964,3 +9089,18 @@ void NotifyFrontendLogin() { update_ics_width(); } + +# if HAVE_LIBREADLINE +static void +ReadlineCompleteHandler(char* ptr) +{ + /* make gnu-readline keep the history */ + readline_buffer = ptr; + readline_complete = 1; + + if (ptr && *ptr && !sending_ICS_password && !sending_ICS_login) + add_history(ptr); + + return; +} +#endif