qulogic/libgnt

'\n' (ctrl-j) should behave similar to '\r' (ctrl-m). Fixes #4833.

2008-02-13, Sadrul Habib Chowdhury
0d1b10f2a89d
Parents 778306eb9674
Children 0809ae106f5d
'\n' (ctrl-j) should behave similar to '\r' (ctrl-m). Fixes #4833.
5 files changed, 8 insertions(+), 6 deletions(-)
  • +2 -1
    gntbutton.c
  • +1 -0
    gntcombobox.c
  • +2 -2
    gntentry.c
  • +2 -2
    gntfilesel.c
  • +1 -1
    gnttree.c
    • --- a/gntbutton.c Thu Jan 31 07:53:22 2008 +0000
    +++ b/gntbutton.c Wed Feb 13 05:57:54 2008 +0000
    @@ -79,7 +79,8 @@
    static gboolean
    gnt_button_key_pressed(GntWidget *widget, const char *key)
    {
    - if (strcmp(key, GNT_KEY_ENTER) == 0)
    + if (strcmp(key, GNT_KEY_ENTER) == 0 ||
    + strcmp(key, SAFE(cursor_down)) == 0)
    {
    gnt_widget_activate(widget);
    return TRUE;
    --- a/gntcombobox.c Thu Jan 31 07:53:22 2008 +0000
    +++ b/gntcombobox.c Wed Feb 13 05:57:54 2008 +0000
    @@ -155,6 +155,7 @@
    {
    case '\r':
    case '\t':
    + case '\n':
    hide_popup(box, TRUE);
    return TRUE;
    case 27:
    --- a/gntentry.c Thu Jan 31 07:53:22 2008 +0000
    +++ b/gntentry.c Wed Feb 13 05:57:54 2008 +0000
    @@ -713,7 +713,7 @@
    return FALSE;
    }
    - if ((text[0] == '\r' || text[0] == ' ') && entry->ddown)
    + if ((text[0] == '\r' || text[0] == ' ' || text[0] == '\n') && entry->ddown)
    {
    char *text = g_strdup(gnt_tree_get_selection_data(GNT_TREE(entry->ddown)));
    destroy_suggest(entry);
    @@ -782,7 +782,7 @@
    return TRUE;
    }
    - if (text[0] == '\r') {
    + if (text[0] == '\r' || text[0] == '\n') {
    gnt_widget_activate(widget);
    return TRUE;
    }
    --- a/gntfilesel.c Thu Jan 31 07:53:22 2008 +0000
    +++ b/gntfilesel.c Wed Feb 13 05:57:54 2008 +0000
    @@ -342,7 +342,7 @@
    static gboolean
    dir_key_pressed(GntTree *tree, const char *key, GntFileSel *sel)
    {
    - if (strcmp(key, "\r") == 0) {
    + if (strcmp(key, "\r") == 0 || strcmp(key, "\n") == 0) {
    char *str = g_strdup(gnt_tree_get_selection_data(tree));
    char *path, *dir;
    @@ -376,7 +376,7 @@
    struct stat st;
    int glob_ret;
    #endif
    - if (strcmp(key, "\r"))
    + if (strcmp(key, "\r") && strcmp(key, "\n"))
    return FALSE;
    str = (char*)gnt_entry_get_text(GNT_ENTRY(sel->location));
    --- a/gnttree.c Thu Jan 31 07:53:22 2008 +0000
    +++ b/gnttree.c Wed Feb 13 05:57:54 2008 +0000
    @@ -798,7 +798,7 @@
    GntTree *tree = GNT_TREE(widget);
    GntTreeRow *old = tree->current;
    - if (text[0] == '\r') {
    + if (text[0] == '\r' || text[0] == '\n') {
    end_search(tree);
    gnt_widget_activate(widget);
    } else if (tree->priv->search) {