Skip to content

Commit 5f46460

Browse files
committed
Use ASCII code in XTOP to clear the screen by default
1 parent 62317d5 commit 5f46460

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

tools/xcrypt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#define XCRYPT_VER_MIN 1
2626
#define XCRYPT_BUILD_NUM 21
2727

28-
#define XAES_KEY_LENGTH 128
28+
#define XAES_KEY_LENGTH 256
2929
#define XHEX_COLUMNS 16
3030
extern char *optarg;
3131

tools/xtop.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ typedef struct xtop_args_ {
6767
xbool_t bDaemon;
6868
xbool_t bServer;
6969
xbool_t bClient;
70-
xbool_t bAscii;
70+
xbool_t bClear;
7171

7272
char sLink[XLINK_MAX];
7373
char sAddr[XLINK_MAX];
@@ -135,7 +135,7 @@ void XTOPApp_DisplayUsage(const char *pName)
135135
printf(" %s-m%s <seconds> # Monitoring interval seconds\n", XSTR_CLR_CYAN, XSTR_FMT_RESET);
136136
printf(" %s-t%s <type> # Sort result by selected type%s*%s\n", XSTR_CLR_CYAN, XSTR_FMT_RESET, XSTR_CLR_RED, XSTR_FMT_RESET);
137137
printf(" %s-u%s <pid> # Track process CPU and memory usage\n", XSTR_CLR_CYAN, XSTR_FMT_RESET);
138-
printf(" %s-x%s # Use ASCII code to clear screen\n", XSTR_CLR_CYAN, XSTR_FMT_RESET);
138+
printf(" %s-x%s # Use system clear instead of ASCII code\n", XSTR_CLR_CYAN, XSTR_FMT_RESET);
139139
printf(" %s-h%s # Print version and usage\n\n", XSTR_CLR_CYAN, XSTR_FMT_RESET);
140140

141141
printf("%sXTOP has a REST API server and client mode to send%s\n", XSTR_FMT_DIM, XSTR_FMT_RESET);
@@ -159,8 +159,8 @@ void XTOPApp_DisplayUsage(const char *pName)
159159
printf(" %sf%s: Free on top\n", XSTR_CLR_CYAN, XSTR_FMT_RESET);
160160
printf(" %sn%s: Sort by name\n\n", XSTR_CLR_CYAN, XSTR_FMT_RESET);
161161

162-
printf("%sIf XTOP window is blinking during refresh, try to use ASCII code%s\n", XSTR_FMT_DIM, XSTR_FMT_RESET);
163-
printf("%sfor screen clearing. Use CLI argument -x to enable ASCII mode.%s\n\n", XSTR_FMT_DIM, XSTR_FMT_RESET);
162+
printf("%sIf XTOP refresh does not clear the window, try system clear%s\n", XSTR_FMT_DIM, XSTR_FMT_RESET);
163+
printf("%sfor screen clearing. Use CLI argument -x to system clear mode.%s\n\n", XSTR_FMT_DIM, XSTR_FMT_RESET);
164164

165165
printf("Examples:\n");
166166
printf("1) %s -x -e 8\n", pName);
@@ -179,11 +179,11 @@ uint8_t XTOPApp_GetSortType(const char *pArg)
179179
}
180180

181181
int XTOPApp_ParseArgs(xtop_args_t *pArgs, int argc, char *argv[])
182-
{
182+
{bClear
183183
pArgs->bDaemon = XFALSE;
184184
pArgs->bServer = XFALSE;
185185
pArgs->bClient = XFALSE;
186-
pArgs->bAscii = XFALSE;
186+
pArgs->bClear = XFALSE;
187187
pArgs->pStats = NULL;
188188
pArgs->nSort = XTOP_SORT_LEN;
189189

@@ -253,7 +253,7 @@ int XTOPApp_ParseArgs(xtop_args_t *pArgs, int argc, char *argv[])
253253
pArgs->bServer = XTRUE;
254254
break;
255255
case 'x':
256-
pArgs->bAscii = XTRUE;
256+
pArgs->bClear = XTRUE;
257257
break;
258258
case 'v':
259259
bVerbose = XTRUE;
@@ -1645,7 +1645,7 @@ int main(int argc, char *argv[])
16451645
}
16461646

16471647
xcli_win_t win;
1648-
XWindow_Init(&win, args.bAscii);
1648+
XWindow_Init(&win, !args.bClear);
16491649

16501650
xcli_bar_t bar;
16511651
XProgBar_GetDefaults(&bar);

0 commit comments

Comments
 (0)