Fossil SCM

Wider columns on the /help page, so that longer command names do not overflow the available column width.

drh 2024-07-18 10:22 trunk
Commit b919738dc5372114fa4ff5930cdc4c3d3d35980e78cfb7694a8f927fe2c5e073
Parent b8b22d795e5b51b…
1 file changed +5 -4
~ src/dispatch.c
M src/dispatch.c
+5 -4
--- src/dispatch.c
+++ src/dispatch.c
@@ -869,17 +869,18 @@
869869
 @ </div>
870870
 }
871871
 }
872872
 }else{
873873
 int i;
874
+ const char *zWidth = "28ex";
874875
 unsigned char occHelp[FOSSIL_MX_CMDIDX] = {0}; /* Help str occurrences */
875876
 int bktHelp[FOSSIL_MX_CMDIDX][MX_HELP_DUP] = {{0}};/* Help str->commands */
876877
 style_header("Help");
877878
878879
 @ <a name='commands'></a>
879880
 @ <h1>Available commands:</h1>
880
- @ <div class="columns" style="column-width: 12ex;">
881
+ @ <div class="columns" style="column-width: %s(zWidth);">
881882
 @ <ul>
882883
 /* Fill in help string buckets */
883884
 for(i=0; i<MX_COMMAND; i++){
884885
 if(aCommand[i].eCmdFlags & CMDFLAG_HIDDEN) continue;
885886
 bktHelp[aCommand[i].iHelp][occHelp[aCommand[i].iHelp]++] = i;
@@ -920,11 +921,11 @@
920921
921922
 @ </ul></div>
922923
923924
 @ <a name='webpages'></a>
924925
 @ <h1>Available web UI pages:</h1>
925
- @ <div class="columns" style="column-width: 18ex;">
926
+ @ <div class="columns" style="column-width: %s(zWidth);">
926927
 @ <ul>
927928
 for(i=0; i<MX_COMMAND; i++){
928929
 const char *z = aCommand[i].zName;
929930
 if( '/'!=*z ) continue;
930931
 else if( (aCommand[i].eCmdFlags & CMDFLAG_HIDDEN)!=0 ) continue;
@@ -936,11 +937,11 @@
936937
 }
937938
 @ </ul></div>
938939
939940
 @ <a name='unsupported'></a>
940941
 @ <h1>Unsupported commands:</h1>
941
- @ <div class="columns" style="column-width: 20ex;">
942
+ @ <div class="columns" style="column-width: %s(zWidth);">
942943
 @ <ul>
943944
 for(i=0; i<MX_COMMAND; i++){
944945
 const char *z = aCommand[i].zName;
945946
 if( strncmp(z,"test",4)!=0 ) continue;
946947
 else if( (aCommand[i].eCmdFlags & CMDFLAG_HIDDEN)!=0 ) continue;
@@ -952,11 +953,11 @@
952953
 }
953954
 @ </ul></div>
954955
955956
 @ <a name='settings'></a>
956957
 @ <h1>Settings:</h1>
957
- @ <div class="columns" style="column-width: 20ex;">
958
+ @ <div class="columns" style="column-width: %s(zWidth);">
958959
 @ <ul>
959960
 for(i=0; i<MX_COMMAND; i++){
960961
 const char *z = aCommand[i].zName;
961962
 if( (aCommand[i].eCmdFlags & CMDFLAG_SETTING)==0 ) continue;
962963
 else if( (aCommand[i].eCmdFlags & CMDFLAG_HIDDEN)!=0 ) continue;
963964
--- src/dispatch.c
+++ src/dispatch.c
@@ -869,17 +869,18 @@
869 @ </div>
870 }
871 }
872 }else{
873 int i;
 
874 unsigned char occHelp[FOSSIL_MX_CMDIDX] = {0}; /* Help str occurrences */
875 int bktHelp[FOSSIL_MX_CMDIDX][MX_HELP_DUP] = {{0}};/* Help str->commands */
876 style_header("Help");
877
878 @ <a name='commands'></a>
879 @ <h1>Available commands:</h1>
880 @ <div class="columns" style="column-width: 12ex;">
881 @ <ul>
882 /* Fill in help string buckets */
883 for(i=0; i<MX_COMMAND; i++){
884 if(aCommand[i].eCmdFlags & CMDFLAG_HIDDEN) continue;
885 bktHelp[aCommand[i].iHelp][occHelp[aCommand[i].iHelp]++] = i;
@@ -920,11 +921,11 @@
920
921 @ </ul></div>
922
923 @ <a name='webpages'></a>
924 @ <h1>Available web UI pages:</h1>
925 @ <div class="columns" style="column-width: 18ex;">
926 @ <ul>
927 for(i=0; i<MX_COMMAND; i++){
928 const char *z = aCommand[i].zName;
929 if( '/'!=*z ) continue;
930 else if( (aCommand[i].eCmdFlags & CMDFLAG_HIDDEN)!=0 ) continue;
@@ -936,11 +937,11 @@
936 }
937 @ </ul></div>
938
939 @ <a name='unsupported'></a>
940 @ <h1>Unsupported commands:</h1>
941 @ <div class="columns" style="column-width: 20ex;">
942 @ <ul>
943 for(i=0; i<MX_COMMAND; i++){
944 const char *z = aCommand[i].zName;
945 if( strncmp(z,"test",4)!=0 ) continue;
946 else if( (aCommand[i].eCmdFlags & CMDFLAG_HIDDEN)!=0 ) continue;
@@ -952,11 +953,11 @@
952 }
953 @ </ul></div>
954
955 @ <a name='settings'></a>
956 @ <h1>Settings:</h1>
957 @ <div class="columns" style="column-width: 20ex;">
958 @ <ul>
959 for(i=0; i<MX_COMMAND; i++){
960 const char *z = aCommand[i].zName;
961 if( (aCommand[i].eCmdFlags & CMDFLAG_SETTING)==0 ) continue;
962 else if( (aCommand[i].eCmdFlags & CMDFLAG_HIDDEN)!=0 ) continue;
963
--- src/dispatch.c
+++ src/dispatch.c
@@ -869,17 +869,18 @@
869 @ </div>
870 }
871 }
872 }else{
873 int i;
874 const char *zWidth = "28ex";
875 unsigned char occHelp[FOSSIL_MX_CMDIDX] = {0}; /* Help str occurrences */
876 int bktHelp[FOSSIL_MX_CMDIDX][MX_HELP_DUP] = {{0}};/* Help str->commands */
877 style_header("Help");
878
879 @ <a name='commands'></a>
880 @ <h1>Available commands:</h1>
881 @ <div class="columns" style="column-width: %s(zWidth);">
882 @ <ul>
883 /* Fill in help string buckets */
884 for(i=0; i<MX_COMMAND; i++){
885 if(aCommand[i].eCmdFlags & CMDFLAG_HIDDEN) continue;
886 bktHelp[aCommand[i].iHelp][occHelp[aCommand[i].iHelp]++] = i;
@@ -920,11 +921,11 @@
921
922 @ </ul></div>
923
924 @ <a name='webpages'></a>
925 @ <h1>Available web UI pages:</h1>
926 @ <div class="columns" style="column-width: %s(zWidth);">
927 @ <ul>
928 for(i=0; i<MX_COMMAND; i++){
929 const char *z = aCommand[i].zName;
930 if( '/'!=*z ) continue;
931 else if( (aCommand[i].eCmdFlags & CMDFLAG_HIDDEN)!=0 ) continue;
@@ -936,11 +937,11 @@
937 }
938 @ </ul></div>
939
940 @ <a name='unsupported'></a>
941 @ <h1>Unsupported commands:</h1>
942 @ <div class="columns" style="column-width: %s(zWidth);">
943 @ <ul>
944 for(i=0; i<MX_COMMAND; i++){
945 const char *z = aCommand[i].zName;
946 if( strncmp(z,"test",4)!=0 ) continue;
947 else if( (aCommand[i].eCmdFlags & CMDFLAG_HIDDEN)!=0 ) continue;
@@ -952,11 +953,11 @@
953 }
954 @ </ul></div>
955
956 @ <a name='settings'></a>
957 @ <h1>Settings:</h1>
958 @ <div class="columns" style="column-width: %s(zWidth);">
959 @ <ul>
960 for(i=0; i<MX_COMMAND; i++){
961 const char *z = aCommand[i].zName;
962 if( (aCommand[i].eCmdFlags & CMDFLAG_SETTING)==0 ) continue;
963 else if( (aCommand[i].eCmdFlags & CMDFLAG_HIDDEN)!=0 ) continue;
964

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button