From 68edfafdc6be646370bcb83a108ec1ad9abb4e92 Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 30 Sep 2014 21:24:28 +0000 Subject: [PATCH] Draw the TreeView debugging graphs using unicode box-drawing characters. FossilOrigin-Name: 0efc6859d104e1b12ec4bce5bb6db4e91f0837b5 --- manifest | 15 +++++++++------ manifest.uuid | 2 +- src/printf.c | 12 ++++++++++-- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 4f1b85c92d..8e1c5f3612 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Improvements\sto\sthe\snew\ssyntax-tree\soutput\sroutines:\s\sOmit\sthe\s"END\sSELECT"\nmark\sand\sinstead\sterminate\sthe\sgraph\sat\sthe\slast\sitem.\s\sIncrease\sthe\smaximum\ntree\sdepth\sto\s100. -D 2014-09-30T19:04:41.396 +C Draw\sthe\sTreeView\sdebugging\sgraphs\susing\sunicode\sbox-drawing\scharacters. +D 2014-09-30T21:24:28.680 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -223,7 +223,7 @@ F src/pcache.h 9b559127b83f84ff76d735c8262f04853be0c59a F src/pcache1.c dab8ab930d4a73b99768d881185994f34b80ecaa F src/pragma.c 3f3e959390a10c0131676f0e307acce372777e0f F src/prepare.c 6ef0cf2f9274982988ed6b7cab1be23147e94196 -F src/printf.c 6b79bbd063dcbadca4cf617a4cde255bcc13ea64 +F src/printf.c ecbec6fce896305839ca1420ae09ef845dcb832d F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece F src/resolve.c a3466128b52a86c466e47ac1a19e2174f7b5cf89 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e @@ -1200,7 +1200,10 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P b6b289182f6590288ebc7b9efbcb29b6b4480538 -R cfd4c6e5c7836f29218c39baf2122e42 +P 5ce05757aac80b99c3b2141cd301809f8e28e661 +R 762197ef191f38dcf6716ed39705f21d +T *branch * box-character-graph +T *sym-box-character-graph * +T -sym-trunk * U drh -Z 3bfcd52f8fd5ecba827fd0c1ccf2615c +Z 6b87c74938e16927939c272619e5f8d2 diff --git a/manifest.uuid b/manifest.uuid index f78de65f58..183c8ad80a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5ce05757aac80b99c3b2141cd301809f8e28e661 \ No newline at end of file +0efc6859d104e1b12ec4bce5bb6db4e91f0837b5 \ No newline at end of file diff --git a/src/printf.c b/src/printf.c index c0b3c70f6b..6a9231aeca 100644 --- a/src/printf.c +++ b/src/printf.c @@ -1100,9 +1100,17 @@ void sqlite3TreeViewLine(TreeView *p, const char *zFormat, ...){ acc.useMalloc = 0; if( p ){ for(i=0; iiLevel && ibLine)-1; i++){ - sqlite3StrAccumAppend(&acc, p->bLine[i] ? "| " : " ", 4); + if( p->bLine[i] ){ + sqlite3StrAccumAppend(&acc, "\342\224\202 ", 5); + }else{ + sqlite3StrAccumAppend(&acc, " ", 3); + } + } + if( p->bLine[i] ){ + sqlite3StrAccumAppend(&acc, "\342\224\234\342\224\200 ", 7); + }else{ + sqlite3StrAccumAppend(&acc, "\342\224\224\342\224\200 ", 7); } - sqlite3StrAccumAppend(&acc, p->bLine[i] ? "|-- " : "'-- ", 4); } va_start(ap, zFormat); sqlite3VXPrintf(&acc, 0, zFormat, ap); -- 2.39.5