X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Flist_keys.c;h=31c057a0a7f6ef29c38b2340fc37bdf7b0b11982;hp=bc0e7c5d03ba6d2e8ba75340bc827aae7c012fc3;hb=07e31b3b587a07281ff7c71e5c13248a31048257;hpb=bf66beed16926edb72b65b5ac3e7610fb8f04523;ds=sidebyside

diff --git a/test/list_keys.c b/test/list_keys.c
index bc0e7c5d..31c057a0 100644
--- a/test/list_keys.c
+++ b/test/list_keys.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2016 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2016,2017 Free Software Foundation, Inc.                   *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: list_keys.c,v 1.4 2016/06/04 22:39:47 tom Exp $
+ * $Id: list_keys.c,v 1.19 2017/04/08 22:57:26 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -49,9 +49,27 @@
 #if defined(HAVE_CURSES_DATA_BOOLNAMES) || defined(DECL_CURSES_DATA_BOOLNAMES)
 
 static bool f_opt = FALSE;
+static bool m_opt = FALSE;
 static bool t_opt = FALSE;
 static bool x_opt = FALSE;
 
+typedef enum {
+    ktCursor
+    ,ktFunction
+    ,ktOther
+#if HAVE_USE_EXTENDED_NAMES
+    ,ktExtended
+#endif
+} KEYTYPE;
+
+typedef struct {
+    KEYTYPE type;
+    const char *name;
+} KEYNAMES;
+
+#define Type(n) list[n].type
+#define Name(n) list[n].name
+
 static const char *
 full_name(const char *name)
 {
@@ -71,7 +89,7 @@ show_key(const char *name, bool show)
 {
     int width = 0;
     char buffer[10];
-    char *value = tigetstr(name);
+    NCURSES_CONST char *value = tigetstr(name);
 
     if (show && t_opt)
 	fputc('"', stdout);
@@ -81,47 +99,50 @@ show_key(const char *name, bool show)
 	    int ch = UChar(*value++);
 	    switch (ch) {
 	    case '\177':
-		strcpy(buffer, "^?");
+		_nc_STRCPY(buffer, "^?", sizeof(buffer));
 		break;
 	    case '\033':
-		strcpy(buffer, "\\E");
+		_nc_STRCPY(buffer, "\\E", sizeof(buffer));
 		break;
 	    case '\b':
-		strcpy(buffer, "\\b");
+		_nc_STRCPY(buffer, "\\b", sizeof(buffer));
 		break;
 	    case '\f':
-		strcpy(buffer, "\\f");
+		_nc_STRCPY(buffer, "\\f", sizeof(buffer));
 		break;
 	    case '\n':
-		strcpy(buffer, "\\n");
+		_nc_STRCPY(buffer, "\\n", sizeof(buffer));
 		break;
 	    case '\r':
-		strcpy(buffer, "\\r");
+		_nc_STRCPY(buffer, "\\r", sizeof(buffer));
 		break;
 	    case ' ':
-		strcpy(buffer, "\\s");
+		_nc_STRCPY(buffer, "\\s", sizeof(buffer));
 		break;
 	    case '\t':
-		strcpy(buffer, "\\t");
+		_nc_STRCPY(buffer, "\\t", sizeof(buffer));
 		break;
 	    case '^':
-		strcpy(buffer, "\\^");
+		_nc_STRCPY(buffer, "\\^", sizeof(buffer));
 		break;
 	    case ':':
-		strcpy(buffer, "\\072");
+		_nc_STRCPY(buffer, "\\072", sizeof(buffer));
 		break;
 	    case '\\':
-		strcpy(buffer, "\\\\");
+		_nc_STRCPY(buffer, "\\\\", sizeof(buffer));
 		break;
 	    default:
 		if (t_opt && ch == '"') {
-		    strcpy(buffer, "\"\"");
+		    _nc_STRCPY(buffer, "\"\"", sizeof(buffer));
 		} else if (isgraph(ch)) {
-		    sprintf(buffer, "%c", ch);
+		    _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
+				"%c", ch);
 		} else if (ch < 32) {
-		    sprintf(buffer, "^%c", ch + '@');
+		    _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
+				"^%c", ch + '@');
 		} else {
-		    sprintf(buffer, "\\%03o", ch);
+		    _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer))
+				"\\%03o", ch);
 		}
 		break;
 	    }
@@ -138,7 +159,7 @@ show_key(const char *name, bool show)
 }
 
 static bool
-valid_key(const char *name, TERMINAL ** terms, int count)
+valid_key(const char *name, TERMINAL **terms, int count)
 {
     bool result = FALSE;
     if (*name == 'k') {
@@ -154,16 +175,110 @@ valid_key(const char *name, TERMINAL ** terms, int count)
     return result;
 }
 
+static int
+compare_keys(const void *a, const void *b)
+{
+    const KEYNAMES *p = (const KEYNAMES *) a;
+    const KEYNAMES *q = (const KEYNAMES *) b;
+    int result = (int) (p->type - q->type);
+    int pn, qn;
+    if (result == 0) {
+	if (p->type == ktFunction &&
+	    sscanf(p->name, "kf%d", &pn) == 1 &&
+	    sscanf(q->name, "kf%d", &qn) == 1) {
+	    result = (pn - qn);
+	} else {
+	    result = strcmp(p->name, q->name);
+	}
+    }
+    return result;
+}
+
+static void
+draw_line(int width)
+{
+    int j;
+    if (!t_opt) {
+	for (j = 0; j < width; ++j) {
+	    printf("-");
+	}
+	printf("\n");
+    }
+}
+
+static const char *
+modified_key(const char *name)
+{
+    static char result[80];
+    char buffer[sizeof(result)];
+    int value;
+    char chr;
+    static const char *modifiers[][2] =
+    {
+	{"", ""},
+	{"s-", "shift-"},
+	{"a-", "alt-"},
+	{"as-", "alt-shift-"},
+	{"c-", "ctrl-"},
+	{"sc-", "ctrl-shift-"},
+	{"ac-", "alt-ctrl-"},
+	{"acs-" "alt-ctrl-shift-"},
+    };
+
+    if (strlen(name) > (sizeof(result) - 3)) {
+	*result = '\0';
+    } else if (sscanf(name, "kf%d%c", &value, &chr) == 1 &&
+	       value >= 1 &&
+	       value <= 63) {
+	/* map 1,2,3,4,5,6,7 to 1,2,5,... */
+	int map = ((value - 1) / 12);
+	int key = ((value - 1) % 12);
+	int bit1 = (map & 2);
+	int bit2 = (map & 4);
+	map &= ~6;
+	map |= (bit1 << 1) | (bit2 >> 1);
+	_nc_SPRINTF(result, _nc_SLIMIT(sizeof(result))
+		    "%sF%d", modifiers[map][f_opt], 1 + key);
+    } else if (sscanf(name, "k%[A-Z]%d%c", buffer, &value, &chr) == 2 &&
+	       (value > 1 &&
+		value <= 8) &&
+	       (!strcmp(buffer, "UP") ||
+		!strcmp(buffer, "DN") ||
+		!strcmp(buffer, "LFT") ||
+		!strcmp(buffer, "RIT") ||
+		!strcmp(buffer, "IC") ||
+		!strcmp(buffer, "DC") ||
+		!strcmp(buffer, "HOM") ||
+		!strcmp(buffer, "END") ||
+		!strcmp(buffer, "NXT") ||
+		!strcmp(buffer, "PRV"))) {
+	_nc_SPRINTF(result, _nc_SLIMIT(sizeof(result))
+		    "%sk%s", modifiers[value - 1][f_opt], buffer);
+    } else if (sscanf(name, "k%[A-Z]%c", buffer, &chr) == 1 &&
+	       (!strcmp(buffer, "UP") ||
+		!strcmp(buffer, "DN"))) {
+	_nc_SPRINTF(result, _nc_SLIMIT(sizeof(result))
+		    "%sk%s", modifiers[1][f_opt], buffer);
+    } else {
+	*result = '\0';
+    }
+    return result;
+}
+
 static void
-list_keys(TERMINAL ** terms, int count)
+list_keys(TERMINAL **terms, int count)
 {
     int j, k;
     int widths0 = 0;
     int widths1 = 0;
+    int widths2 = 0;
+    int widthsx;
     int check;
-    int total = 0;
+    size_t total = 0;
+    size_t actual = 0;
     const char *name = f_opt ? "strfname" : "strname";
-    const char **list;
+    const char *modifier = "extended";
+    KEYNAMES *list;
 
     for (total = 0; strnames[total]; ++total) {
 	;
@@ -173,14 +288,20 @@ list_keys(TERMINAL ** terms, int count)
 	TERMTYPE *term;
 	for (k = 0; k < count; ++k) {
 	    set_curterm(terms[k]);
-	    term = &(cur_term->type);
-	    total += NUM_STRINGS(term) - STRCOUNT;
+	    term = (TERMTYPE *) cur_term;
+	    total += (size_t) (NUM_STRINGS(term) - STRCOUNT);
 	}
     }
 #endif
-    list = typeCalloc(const char *, total + 1);
+    list = typeCalloc(KEYNAMES, total + 1);
     for (j = 0; strnames[j]; ++j) {
-	list[j] = strnames[j];
+	Type(j) = ktOther;
+	if (sscanf(strnames[j], "kf%d", &k) == 1) {
+	    Type(j) = ktFunction;
+	} else if (!strncmp(strnames[j], "kcu", 3)) {
+	    Type(j) = ktCursor;
+	}
+	Name(j) = strnames[j];
     }
 #if NCURSES_XNAMES
     if (x_opt) {
@@ -188,50 +309,65 @@ list_keys(TERMINAL ** terms, int count)
 	int m, n;
 	for (k = 0; k < count; ++k) {
 	    set_curterm(terms[k]);
-	    term = &(cur_term->type);
+	    term = (TERMTYPE *) cur_term;
 	    for (n = STRCOUNT; n < NUM_STRINGS(term); ++n) {
 		bool found = FALSE;
 		const char *estr = ExtStrname(term, (int) n, strnames);
 		for (m = STRCOUNT; m < j; ++m) {
-		    if (!strcmp(estr, list[m])) {
+		    if (!strcmp(estr, Name(m))) {
 			found = TRUE;
 			break;
 		    }
 		}
 		if (!found) {
-		    list[j++] = estr;
+		    Type(j) = ktExtended;
+		    Name(j++) = estr;
 		}
 	    }
 	}
     }
 #endif
+    actual = (size_t) j;
+    qsort(list, actual, sizeof(KEYNAMES), compare_keys);
 
     widths0 = (int) strlen(name);
+    if (m_opt)
+	widths1 = (int) strlen(modifier);
+
     for (k = 0; k < count; ++k) {
 	set_curterm(terms[k]);
-	check = (int) strlen(name);
-	if (widths1 < check)
-	    widths1 = check;
+	check = (int) strlen(termname());
+	if (widths2 < check)
+	    widths2 = check;
     }
-    for (j = 0; list[j] != 0; ++j) {
-	if (valid_key(list[j], terms, count)) {
-	    const char *label = f_opt ? full_name(list[j]) : list[j];
+    for (j = 0; Name(j) != 0; ++j) {
+	if (valid_key(Name(j), terms, count)) {
+	    const char *label = f_opt ? full_name(Name(j)) : Name(j);
 	    check = (int) strlen(label);
 	    if (widths0 < check)
 		widths0 = check;
 	    for (k = 0; k < count; ++k) {
 		set_curterm(terms[k]);
-		check = show_key(list[j], FALSE);
-		if (widths1 < check)
-		    widths1 = check;
+		check = show_key(Name(j), FALSE) + 1;
+		if (widths2 < check)
+		    widths2 = check;
+		if (m_opt) {
+		    check = (int) strlen(modified_key(Name(j)));
+		    if (widths1 < check)
+			widths1 = check;
+		}
 	    }
 	}
     }
 
     if (t_opt) {
 	printf("\"%s\"", name);
+	if (m_opt)
+	    printf(",\"%s\"", modifier);
     } else {
 	printf("%-*s", widths0, name);
+	if (m_opt)
+	    printf(" %-*s", widths1, modifier);
     }
     for (k = 0; k < count; ++k) {
 	set_curterm(terms[k]);
@@ -240,32 +376,41 @@ list_keys(TERMINAL ** terms, int count)
 	} else if (k + 1 >= count) {
 	    printf(" %s", termname());
 	} else {
-	    printf(" %-*s", widths1, termname());
+	    printf(" %-*s", widths2, termname());
 	}
     }
     printf("\n");
 
-    for (j = 0; list[j] != 0; ++j) {
-	if (valid_key(list[j], terms, count)) {
-	    const char *label = f_opt ? full_name(list[j]) : list[j];
+    widthsx = widths0 + ((count + 1) * widths2);
+
+    for (j = 0; Name(j) != 0; ++j) {
+	if (j == 0 || (Type(j) != Type(j - 1)))
+	    draw_line(widthsx);
+	if (valid_key(Name(j), terms, count)) {
+	    const char *label = f_opt ? full_name(Name(j)) : Name(j);
 	    if (t_opt) {
 		printf("\"%s\"", label);
+		if (m_opt)
+		    printf(",\"%s\"", modified_key(Name(j)));
 	    } else {
 		printf("%-*s", widths0, label);
+		if (m_opt)
+		    printf(" %-*s", widths1, modified_key(Name(j)));
 	    }
 	    for (k = 0; k < count; ++k) {
 		printf(t_opt ? "," : " ");
 		set_curterm(terms[k]);
-		check = show_key(list[j], TRUE);
+		check = show_key(Name(j), TRUE);
 		if (!t_opt) {
 		    if (k + 1 < count) {
-			printf("%*s", widths1 + 1 - check, " ");
+			printf("%*s", widths2 - check, " ");
 		    }
 		}
 	    }
 	    printf("\n");
 	}
     }
+    free(list);
 }
 
 static void
@@ -279,6 +424,7 @@ usage(void)
 	"",
 	"Options:",
 	" -f       print full names",
+	" -m       print modifier-column for shift/control keys",
 	" -t       print result as CSV table",
 #ifdef NCURSES_VERSION
 	" -x       print extended capabilities",
@@ -295,13 +441,16 @@ int
 main(int argc, char *argv[])
 {
     int n;
-    TERMINAL **terms = typeCalloc(TERMINAL *, argc);
+    TERMINAL **terms = typeCalloc(TERMINAL *, argc + 1);
 
-    while ((n = getopt(argc, argv, "ftx")) != -1) {
+    while ((n = getopt(argc, argv, "fmtx")) != -1) {
 	switch (n) {
 	case 'f':
 	    f_opt = TRUE;
 	    break;
+	case 'm':
+	    m_opt = TRUE;
+	    break;
 	case 't':
 	    t_opt = TRUE;
 	    break;
@@ -320,11 +469,24 @@ main(int argc, char *argv[])
     use_extended_names(x_opt);
 #endif
 
-    for (n = optind; n < argc; ++n) {
-	setupterm((NCURSES_CONST char *) argv[n], 1, (int *) 0);
-	terms[n - optind] = cur_term;
+    if (optind < argc) {
+	int found = 0;
+	int status;
+	for (n = optind; n < argc; ++n) {
+	    setupterm((NCURSES_CONST char *) argv[n], 1, &status);
+	    if (status > 0 && cur_term != 0) {
+		terms[found++] = cur_term;
+	    }
+	}
+	if (found)
+	    list_keys(terms, found);
+    } else {
+	setupterm(NULL, 1, (int *) 0);
+	terms[0] = cur_term;
+	list_keys(terms, 1);
     }
-    list_keys(terms, argc - optind);
+
+    free(terms);
 
     ExitProgram(EXIT_SUCCESS);
 }