libgnt/libgnt

Merged in default (pull request #55)

2019-04-27, Gary Kramlich
4e0a440980ba
Parents 1eaceab078ca5a897fca6db6
Children 2a0ecf6203f6
Merged in default (pull request #55)

Fix building of test programs

Approved-by: Gary Kramlich
3 files changed, 20 insertions(+), 20 deletions(-)
  • +3 -1
    test/combo.c
  • +2 -4
    test/meson.build
  • +15 -15
    test/tv.c
    • --- a/test/combo.c Sat Apr 27 21:36:01 2019 +0000
    +++ b/test/combo.c Sat Apr 27 21:40:01 2019 +0000
    @@ -22,8 +22,10 @@
    static void
    update_label(GntSlider *slider, int current_value, GntEntry *entry)
    {
    + gint min, max;
    char value[256];
    - g_snprintf(value, sizeof(value), "%d/%d", current_value, slider->max);
    + gnt_slider_get_range(slider, &max, &min);
    + g_snprintf(value, sizeof(value), "%d/%d", current_value, max);
    /*gnt_label_set_text(label, value);*/
    /*gnt_widget_draw(GNT_WIDGET(label));*/
    gnt_entry_set_text(entry, value);
    --- a/test/meson.build Sat Apr 27 21:36:01 2019 +0000
    +++ b/test/meson.build Sat Apr 27 21:40:01 2019 +0000
    @@ -2,12 +2,10 @@
    executable(prog,
    prog + '.c',
    c_args : '-DSTANDALONE',
    - dependencies : [libgnt_dep, gobject, gmodule],
    - build_by_default : false)
    + dependencies : [libgnt_dep, gobject, gmodule])
    endforeach
    shared_library('wm',
    'wm.c',
    name_prefix : '',
    - dependencies : [libgnt_dep, gobject, gmodule],
    - build_by_default : false)
    + dependencies : [libgnt_dep, gobject, gmodule])
    --- a/test/tv.c Sat Apr 27 21:36:01 2019 +0000
    +++ b/test/tv.c Sat Apr 27 21:40:01 2019 +0000
    @@ -26,20 +26,19 @@
    gnt_entry_remove_suggest(GNT_ENTRY(w), "acb");
    return TRUE;
    - }
    - else if (strcmp(key, "\033" "e") == 0)
    - {
    - if (fork() == 0) {
    - endwin();
    - printf("%s\n", GNT_TEXT_VIEW(view)->string->str);
    - fflush(stdout);
    - getch();
    - refresh();
    - exit(0);
    - }
    - }
    - else if (key[0] == 27)
    - {
    +
    + } else if (strcmp(key, "\033e") == 0) {
    + if (fork() == 0) {
    + endwin();
    + printf("%s\n",
    + gnt_text_view_get_text(GNT_TEXT_VIEW(view)));
    + fflush(stdout);
    + getch();
    + refresh();
    + exit(0);
    + }
    +
    + } else if (key[0] == 27) {
    if (strcmp(key, GNT_KEY_UP) == 0)
    gnt_text_view_scroll(GNT_TEXT_VIEW(view), -1);
    else if (strcmp(key, GNT_KEY_DOWN) == 0)
    @@ -55,8 +54,9 @@
    static void
    completion_cb(GntEntry *entry, const char *start, G_GNUC_UNUSED const char *end)
    {
    - if (start == entry->start)
    + if (start == gnt_entry_get_text(entry)) {
    gnt_widget_key_pressed(GNT_WIDGET(entry), ": ");
    + }
    }
    int