qulogic/libgnt

Use a define to make handling escape character a bit easier

2019-10-03, Gary Kramlich
bb981abe9bed
Parents a78a89e1578b
Children bc6e878f81cf
Use a define to make handling escape character a bit easier
5 files changed, 10 insertions(+), 8 deletions(-)
  • +1 -1
    gntentry.c
  • +2 -0
    gntinternal.h
  • +5 -5
    gntmain.c
  • +1 -1
    gntstyle.c
  • +1 -1
    gntwm.c
    • --- a/gntentry.c Thu Oct 03 05:11:27 2019 -0500
    +++ b/gntentry.c Thu Oct 03 05:48:01 2019 -0500
    @@ -1058,7 +1058,7 @@
    {
    GntBindableClass *bindable = GNT_BINDABLE_CLASS(klass);
    GntWidgetClass *widget_class = GNT_WIDGET_CLASS(klass);
    - char s[3] = {033, erasechar(), 0};
    + char s[3] = {GNT_ESCAPE, erasechar(), 0};
    widget_class->clicked = gnt_entry_clicked;
    widget_class->destroy = gnt_entry_destroy;
    --- a/gntinternal.h Thu Oct 03 05:11:27 2019 -0500
    +++ b/gntinternal.h Thu Oct 03 05:48:01 2019 -0500
    @@ -26,6 +26,8 @@
    #undef G_LOG_DOMAIN
    #define G_LOG_DOMAIN "Gnt"
    +#define GNT_ESCAPE '\033'
    +
    #ifdef __GNUC__
    # ifndef GNT_LOG_DOMAIN
    # define GNT_LOG_DOMAIN ""
    --- a/gntmain.c Thu Oct 03 05:11:27 2019 -0500
    +++ b/gntmain.c Thu Oct 03 05:48:01 2019 -0500
    @@ -315,7 +315,7 @@
    is_escape = TRUE;
    }
    if (is_escape) {
    - *k = '\033';
    + *k = GNT_ESCAPE;
    k++;
    }
    @@ -328,7 +328,7 @@
    if (ch == 0xE0 || ch == 0xE1) {
    is_special = TRUE;
    if (!is_escape) {
    - *k = '\033';
    + *k = GNT_ESCAPE;
    k++;
    }
    *k = ch;
    @@ -397,7 +397,7 @@
    rd += HOLDING_ESCAPE;
    if (HOLDING_ESCAPE) {
    - keys[0] = 033;
    + keys[0] = GNT_ESCAPE;
    g_source_remove(escape_stuff.timer);
    escape_stuff.timer = 0;
    }
    @@ -413,7 +413,7 @@
    char back;
    int p;
    - if (k[0] == 033 && rd == 1) {
    + if (k[0] == GNT_ESCAPE && rd == 1) {
    escape_stuff.timer = g_timeout_add(250, escape_timeout, NULL);
    break;
    }
    @@ -939,7 +939,7 @@
    newc = g_locale_from_utf8(x, -1, NULL, NULL, &error);
    if(error != NULL) {
    - gnt_warning("Error: %s\n", error ? error->message : "(unknown)");
    + gnt_warning("Error: %s\n", error->message ? error->message : "(unknown)");
    g_error_free(error);
    --- a/gntstyle.c Thu Oct 03 05:11:27 2019 -0500
    +++ b/gntstyle.c Thu Oct 03 05:48:01 2019 -0500
    @@ -136,7 +136,7 @@
    {
    if (*s == '^' && *(s + 1) == '[')
    {
    - *t = 033; /* escape */
    + *t = GNT_ESCAPE;
    s++;
    }
    else if (*s == '\\')
    --- a/gntwm.c Thu Oct 03 05:11:27 2019 -0500
    +++ b/gntwm.c Thu Oct 03 05:48:01 2019 -0500
    @@ -2191,7 +2191,7 @@
    gnt_widget_destroy(priv->list.window);
    return TRUE;
    }
    - } else if (keys[0] == 033 && isdigit(keys[1]) && keys[2] == '\0') {
    + } else if (keys[0] == GNT_ESCAPE && isdigit(keys[1]) && keys[2] == '\0') {
    /* Alt+x for quick switch */
    int n = *(keys + 1) - '0';
    GList *list = NULL;