** May you find forgiveness for yourself and forgive others.
** May you share freely, never taking more than you give.
**
-*************************************************************************
+********************************************************************************
** This file implements various interfaces used for console I/O by the
** SQLite project command-line tools, as explained in console_io.h .
*/
# ifdef SHELL_LEGACY_CONSOLE_IO
# define SHELL_CON_TRANSLATE 2 /* Use UTF-8/MBCS translation for console I/O */
# else
-# define SHELL_CON_TRANSLATE 1 /* Use wchar APIs for console I/O */
+# define SHELL_CON_TRANSLATE 1 /* Use WCHAR Windows APIs for console I/O */
# endif
#else
# include <unistd.h>
}
#endif
-static short fileOfConsole(FILE *pf){
+typedef struct PerStreamTags {
#if SHELL_CON_TRANSLATE
+ DWORD consMode;
+ HANDLE hx;
+#endif
+ FILE *pf;
+} PerStreamTags;
+
+static short fileOfConsole(FILE *pf, PerStreamTags *ppst){
+#if SHELL_CON_TRANSLATE
+ short rv = 0;
DWORD dwj;
HANDLE fh = handleOfFile(pf);
if( INVALID_HANDLE_VALUE != fh ){
- return (GetFileType(fh) == FILE_TYPE_CHAR && GetConsoleMode(fh,&dwj));
- }else return 0;
+ rv = (GetFileType(fh) == FILE_TYPE_CHAR && GetConsoleMode(fh,&dwj));
+ if( rv ){
+ ppst->hx = fh;
+ ppst->pf = pf;
+ GetConsoleMode(fh, &ppst->consMode);
+ }
+ }
+ return rv;
#else
return (short)isatty(fileno(pf));
#endif
}
#define SHELL_INVALID_FILE_PTR ((FILE *)sizeof(FILE*))
+#define SHELL_INVALID_CONS_MODE 0xFFFF0000
+
+#if SHELL_CON_TRANSLATE
+# define SHELL_CONI_MODE \
+ (ENABLE_ECHO_INPUT | ENABLE_INSERT_MODE | ENABLE_LINE_INPUT | 0x80 \
+ | ENABLE_QUICK_EDIT_MODE | ENABLE_EXTENDED_FLAGS | ENABLE_PROCESSED_INPUT)
+# define SHELL_CONO_MODE (ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT \
+ | ENABLE_VIRTUAL_TERMINAL_PROCESSING)
+#endif
typedef struct ConsoleInfo {
- /* int iDefaultFmode; */
- ConsoleStdConsStreams cscs;
+ /* int iInitialFmode[3];
+ ** Above only needed for legacy console I/O for callable CLI.
+ ** Because that state cannot be obtained from each FILE *,
+ ** there will be no exact restoration of console state for
+ ** the CLI when built with SHELL_LEGACY_CONSOLE_IO defined.
+ */
+ PerStreamTags pst[3];
#if SHELL_CON_TRANSLATE
- HANDLE hIn; HANDLE hOut; HANDLE hErr;
- HANDLE hLowest;
+ unsigned char haveInput;
+ unsigned char outputIx;
+ unsigned char stdinEof;
#endif
- FILE *pfIn; FILE *pfOut; FILE *pfErr;
+ ConsoleStdConsStreams cscs;
} ConsoleInfo;
-static ConsoleInfo consoleInfo = {
- /* 0, iDefaultFmode */
- CSCS_NoConsole,
#if SHELL_CON_TRANSLATE
- INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE,
- INVALID_HANDLE_VALUE,
+# define CI_INITIALIZER \
+ {SHELL_INVALID_CONS_MODE, INVALID_HANDLE_VALUE, SHELL_INVALID_FILE_PTR }
+#else
+# define CI_INITIALIZER { SHELL_INVALID_FILE_PTR }
#endif
- SHELL_INVALID_FILE_PTR, SHELL_INVALID_FILE_PTR, SHELL_INVALID_FILE_PTR
-};
-#undef SHELL_INVALID_FILE_PTR
-#if SHELL_CON_TRANSLATE == 1
-# define SHELL_CON_MODE_CSZ _O_U16TEXT
-#elif SHELL_CON_TRANSLATE == 2
-# define SHELL_CON_MODE_CSZ _O_U8TEXT
+static ConsoleInfo consoleInfo = {
+ /* {0,0,0}, // iInitialFmode */
+ { /* pst */ CI_INITIALIZER, CI_INITIALIZER, CI_INITIALIZER },
+#if SHELL_CON_TRANSLATE
+ 0, 0, 1, /* haveInput, outputIx, stdinEof */
#endif
+ CSCS_NoConsole
+};
+#undef CI_INITIALIZER
INT_LINKAGE ConsoleStdConsStreams
consoleClassifySetup( FILE *pfIn, FILE *pfOut, FILE *pfErr ){
ConsoleStdConsStreams rv = CSCS_NoConsole;
- if( fileOfConsole(pfErr) ){
- rv |= CSCS_ErrConsole;
- consoleInfo.pfErr = pfErr;
+ FILE *apf[3] = { pfIn, pfOut, pfErr };
+ int ix;
+ for( ix = 2; ix >= 0; --ix ){
+ PerStreamTags *ppst = &consoleInfo.pst[ix];
+ if( fileOfConsole(apf[ix], ppst) ){
#if SHELL_CON_TRANSLATE
- fflush(pfErr);
-# if SHELL_CON_TRANSLATE == 1
- _setmode(_fileno(pfErr), _O_U16TEXT);
- _setmode(_fileno(pfErr), _O_BINARY);
-# elif SHELL_CON_TRANSLATE == 2
- _setmode(_fileno(pfErr), _O_U8TEXT);
- _setmode(_fileno(pfErr), _O_TEXT);
-# endif
- consoleInfo.hLowest = consoleInfo.hErr = handleOfFile(pfErr);
-#endif
- }
- if( fileOfConsole(pfOut) ){
- rv |= CSCS_OutConsole;
- consoleInfo.pfOut = pfOut;
-#if SHELL_CON_TRANSLATE
- fflush(pfOut);
-# if SHELL_CON_TRANSLATE == 1
- _setmode(_fileno(pfOut), _O_U16TEXT);
- _setmode(_fileno(pfOut), _O_BINARY);
-# elif SHELL_CON_TRANSLATE == 2
- _setmode(_fileno(pfOut), _O_U8TEXT);
- _setmode(_fileno(pfOut), _O_TEXT);
-# endif
- consoleInfo.hLowest = consoleInfo.hOut = handleOfFile(pfOut);
+ DWORD cm = (ix==0)? SHELL_CONI_MODE : SHELL_CONO_MODE;
+ if( ix==0 ){
+ consoleInfo.haveInput = 1;
+ consoleInfo.stdinEof = 0;
+ }else{
+ consoleInfo.outputIx |= ix;
+ }
+ SetConsoleMode(ppst->hx, cm);
+ fprintf(stderr, "consMode[%d]: %02x -> %02x\n", ix, ppst->consMode, cm);
#endif
- }
- if( fileOfConsole(pfIn) ){
- rv |= CSCS_InConsole;
- consoleInfo.pfIn = pfIn;
-#if SHELL_CON_TRANSLATE == 1
- _setmode(_fileno(pfIn), _O_U16TEXT);
- _setmode(_fileno(pfIn), _O_BINARY);
- consoleInfo.hLowest = consoleInfo.hIn = handleOfFile(pfIn);
-#elif SHELL_CON_TRANSLATE == 2
- _setmode(_fileno(pfIn), _O_U8TEXT);
- _setmode(_fileno(pfIn), _O_TEXT);
- consoleInfo.hLowest = consoleInfo.hIn = handleOfFile(pfIn);
+ rv |= (CSCS_InConsole<<ix);
+ }
+ if( ix > 0 ) fflush(apf[ix]);
+#if SHELL_CON_TRANSLATE == 2
+ _setmode(_fileno(apf[ix]), _O_U8TEXT);
+ _setmode(_fileno(apf[ix]), _O_TEXT);
#endif
}
consoleInfo.cscs = rv;
}
INT_LINKAGE void SQLITE_CDECL consoleRestore( void ){
-#if SHELL_CON_TRANSLATE
if( consoleInfo.cscs ){
- /* ToDo: Read these modes in consoleClassifySetup somehow.
- ** A _get_fmode() call almost works. But not with gcc, yet.
- ** This has to be done to make the CLI a callable function.
- */
- int tmode = _O_TEXT, xmode = _O_U8TEXT;
- if( consoleInfo.cscs & CSCS_InConsole ){
- _setmode(_fileno(consoleInfo.pfIn), tmode);
- _setmode(_fileno(consoleInfo.pfIn), xmode);
- }
- if( consoleInfo.cscs & CSCS_OutConsole ){
- _setmode(_fileno(consoleInfo.pfOut), tmode);
- _setmode(_fileno(consoleInfo.pfOut), xmode);
- }
- if( consoleInfo.cscs & CSCS_ErrConsole ){
- _setmode(_fileno(consoleInfo.pfErr), tmode);
- _setmode(_fileno(consoleInfo.pfErr), xmode);
- }
- }
+ int ix;
+ for( ix=0; ix<3; ++ix ){
+ if( consoleInfo.cscs & (CSCS_InConsole<<ix) ){
+ PerStreamTags *ppst = &consoleInfo.pst[ix];
+#if SHELL_CON_TRANSLATE == 2
+ static int tmode = _O_TEXT, xmode = _O_U8TEXT;
+ /* Consider: Read these modes in consoleClassifySetup somehow.
+ ** A _get_fmode() call almost works. But not with gcc, yet.
+ ** This has to be done to make the CLI a callable function
+ ** when legacy console I/O is done. (This may never happen.)
+ */
+ _setmode(_fileno(consoleInfo.pst[ix].pf), tmode);
+ _setmode(_fileno(consoleInfo.pst[ix].pf), xmode);
#endif
-#ifdef TEST_CIO
+#if SHELL_CON_TRANSLATE
+ SetConsoleMode(ppst->hx, ppst->consMode);
+ ppst->hx = INVALID_HANDLE_VALUE;
#endif
+ ppst->pf = SHELL_INVALID_FILE_PTR;
+ }
+ consoleInfo.cscs = CSCS_NoConsole;
+#if SHELL_CON_TRANSLATE
+ consoleInfo.stdinEof = consoleInfo.haveInput = consoleInfo.outputIx= 0;
+#endif
+ }
+ }
}
+#undef SHELL_INVALID_FILE_PTR
static short isConOut(FILE *pf){
- if( pf==consoleInfo.pfOut ) return 1;
- else if( pf==consoleInfo.pfErr ) return 2;
+ if( pf==consoleInfo.pst[1].pf ) return 1;
+ else if( pf==consoleInfo.pst[2].pf ) return 2;
else return 0;
}
-INT_LINKAGE void setBinaryMode(FILE *pf, short bFlush){
+#if SHELL_CON_TRANSLATE
+static void setModeFlushQ(FILE *pf, short bFlush, int mode){
short ico = isConOut(pf);
- if( ico || bFlush ) fflush(pf);
-#if SHELL_CON_TRANSLATE == 2
- _setmode(_fileno(pf), _O_BINARY);
-#elif SHELL_CON_TRANSLATE == 1
- /* Never change between text/binary on UTF-16 console streamss. */
- if( !ico && !(consoleInfo.pfIn==pf)) _setmode(_fileno(pf), _O_BINARY);
+ if( ico>1 || bFlush ) fflush(pf);
+ _setmode(_fileno(pf), mode);
+}
+#else
+# define setModeFlushQ(f, b, m) if(isConOut(f)>0||b) fflush(f)
#endif
+
+INT_LINKAGE void setBinaryMode(FILE *pf, short bFlush){
+ setModeFlushQ(pf, bFlush, _O_BINARY);
}
INT_LINKAGE void setTextMode(FILE *pf, short bFlush){
- short ico = isConOut(pf);
- if( ico || bFlush ) fflush(pf);
-#if SHELL_CON_TRANSLATE == 2
- _setmode(_fileno(pf), _O_TEXT);
-#elif SHELL_CON_TRANSLATE == 1
- /* Never change between text/binary on UTF-16 console streamss. */
- if( !ico && !(consoleInfo.pfIn==pf)) _setmode(_fileno(pf), _O_TEXT);
-#endif
+ setModeFlushQ(pf, bFlush, _O_TEXT);
}
-/* Later: Factor common code out of above 2 procs. */
+#undef setModeFlushQ
INT_LINKAGE int fprintfUtf8(FILE *pfO, const char *zFormat, ...){
va_list ap;
int rv = 0;
+#if SHELL_CON_TRANSLATE
short on = isConOut(pfO);
+#endif
va_start(ap, zFormat);
- if( on > 0 ){
#if SHELL_CON_TRANSLATE
+ if( on > 0 ){
char *z1 = sqlite3_vmprintf(zFormat, ap);
# if SHELL_CON_TRANSLATE == 2
/* Legacy translation to active code page, then MBCS chars out. */
if( nwc>0 ){
zw2 = sqlite3_malloc64((nwc+1)*sizeof(WCHAR));
if( zw2!=NULL ){
- HANDLE ho = (on==1)? consoleInfo.hOut : consoleInfo.hErr;
+ HANDLE ho = (on==1)? consoleInfo.pst[1].hx : consoleInfo.pst[2].hx;
nwc = MultiByteToWideChar(CP_UTF8,0,z1,rv,zw2,nwc);
zw2[nwc] = 0;
WriteConsoleW(ho, zw2, nwc, 0, NULL);
}
# endif
sqlite3_free(z1);
-#else
-#endif
}else{
+#endif
rv = vfprintf(pfO, zFormat, ap);
+#if SHELL_CON_TRANSLATE
}
+#endif
va_end(ap);
return rv;
}
-INT_LINKAGE int fgetsUtf8(char *buf, int ncMax, FILE *pfIn){
- return 0;
+INT_LINKAGE char* fgetsUtf8(char *cBuf, int ncMax, FILE *pfIn){
+ if( pfIn==0 ) pfIn = stdin;
+#if SHELL_CON_TRANSLATE
+ if( pfIn == consoleInfo.pst[0].pf ){
+ static const int nwcLen = 150;
+ WCHAR wcBuf[nwcLen+1];
+ int lend = 0, noc = 0;
+ if( consoleInfo.stdinEof ) return 0;
+ if( ncMax > 0 ) cBuf[0] = 0;
+ while( noc < ncMax-8-1 && !lend ){
+ /* There is room for at least 2 more characters and a 0-terminator. */
+ int na = (ncMax > nwcLen*4+1 + noc)? nwcLen : (ncMax-1 - noc)/4;
+ DWORD nbr = 0;
+ BOOL bRC = ReadConsoleW(consoleInfo.pst[0].hx, wcBuf, na, &nbr, 0);
+ if( bRC && nbr>0 && (wcBuf[nbr-1]&0xF800)==0xD800 ){
+ /* Last WHAR read is first of a UTF-16 surrogate pair. Grab its mate. */
+ DWORD nbrx;
+ bRC &= ReadConsoleW(consoleInfo.pst[0].hx, wcBuf+nbr, 1, &nbrx, 0);
+ if( bRC ) nbr += nbrx;
+ }
+ hd(wcBuf,nbr);
+ if( !bRC || (noc==0 && nbr==0) ) return 0;
+ if( nbr > 0 ){
+ int nmb = WideCharToMultiByte(CP_UTF8, 0, wcBuf,nbr,0,0,0,0);
+ if( nmb != 0 && noc+nmb <= ncMax ){
+ int iseg = noc;
+ nmb = WideCharToMultiByte(CP_UTF8, 0, wcBuf,nbr,cBuf+noc,nmb,0,0);
+ noc += nmb;
+ /* Fixup line-ends as coded by Windows for CR (or "Enter".)
+ ** Note that this is done without regard for any setModeText()
+ ** call that might have been done on the interactive input.
+ */
+ if( noc > 0 ){
+ if( cBuf[noc-1]=='\n' ){
+ lend = 1;
+ if( noc > 1 && cBuf[noc-2]=='\r' ){
+ cBuf[noc-2] = '\n';
+ --noc;
+ }
+ }
+ }
+ /* Check for ^Z (anywhere in line) too. */
+ while( iseg < noc ){
+ if( cBuf[iseg]==0x1a ){
+ consoleInfo.stdinEof = 1;
+ noc = iseg; /* Chop ^Z and anything following. */
+ break;
+ }
+ ++iseg;
+ }
+ }else break; /* Drop apparent garbage in. (Could assert.) */
+ }else break;
+ }
+ /* If got nothing, (after ^Z chop), must be at end-of-file. */
+ if( noc == 0 ) return 0;
+ cBuf[noc] = 0;
+ return cBuf;
+ }else{
+#endif
+ return fgets(cBuf, ncMax, pfIn);
+#if SHELL_CON_TRANSLATE
+ }
+#endif
}
#ifdef TEST_CIO
// cl -Zi -I. -DWIN32 -DTEST_CIO sqlite3.c src/console_io.c -Fecio.exe
-// gcc -I. -DWIN32 -DTEST_CIO -o cio sqlite3.c src/console_io.c -o cio.exe
+// gcc -I. -DWIN32 -DTEST_CIO sqlite3.c src/console_io.c -o cio.exe
const char *prompts[] = { "main", "cont" };
Prompts goofy = { 2, prompts };
int main(int na, char *av[]){
ConsoleStdConsStreams cc = consoleClassifySetup(stdin, stdout, stderr);
+ const char *zt = "Math: ±×÷∂∆∙√∞∩∫≈≠≡≤≥\n"
+ "Hiragana: 亜唖娃阿哀愛挨姶逢葵茜穐悪握渥旭葦芦鯵梓圧斡扱"
+ "宛姐虻飴絢綾鮎或粟袷安庵按暗案闇鞍杏\n"
+ "Simplified Chinese: 餐参蚕残惭惨灿掺孱骖璨粲黪\n"
+ "Geometric Shapes: ■□▪▫▲△▼▽◆◇◊○◌◎●◢◣◤◥◦\n"
+ "Boxes single: ─━│┃┄┅┆┇┈┉┊┋ ┌┍┎┏┐┑┒┓└┕┖┗┘┙┚┛├┝┞┟┠┡┢┣┤┥┦┧┨┩┪┫┬┭┮┯┰┱┲┳"
+ "┴┵┶┷┸┹┺┻┼┽┾┿╀╁╂╃╄╅╆╇╈╉╊╋\n"
+ "Boxes double: ═║╒╓╔╕╖╗╘╙╚╛╜╝╞╟╠╡╢╣╤╥╦╧╨╩╪╫╬\n"
+ "Rounded corners and diagonals: ╭╮╯╰╱╲╳\n"
+ ;
+ char inBuf[150];
setTextMode(stdout, 1);
setTextMode(stderr, 1);
- fprintfUtf8(stderr, "%d\n", cc);
+ fprintfUtf8(stderr, "Console streams: %d, CP_UTF8 valid: %d\n", cc,
+ IsValidCodePage(CP_UTF8));
fprintfUtf8(stdout, "%s=%d\n", "∑(1st 7 primes)", 42);
fprintfUtf8(stderr, "%s\n", "∫ (1/x) dx ≡ ln(x)");
+ fprintfUtf8(stdout, "%s", zt);
+ fprintfUtf8(stderr, "Entering input/echo loop."
+ " Type or copy/paste, or EOF to exit.\n");
+ while( fprintfUtf8(stdout,"? ") && fgetsUtf8(inBuf, sizeof(inBuf), stdin) ){
+ fprintfUtf8(stdout, "! %s", inBuf);
+ }
consoleRestore();
return 0;
}
projects / thirdparty / sqlite.git / commitdiff
