qulogic/libgnt

Merged in default (pull request #17)

2019-04-05, Gary Kramlich
df0204d0a9ed
Parents 23e9dd45efa6991ed13cf797
Children e53045dbed62
Merged in default (pull request #17)

Use flag accessor functions everywhere.

Approved-by: Gary Kramlich
24 files changed, 125 insertions(+), 114 deletions(-)
  • +15 -19
    gntbox.c
  • +6 -4
    gntbutton.c
  • +2 -2
    gntcheckbox.c
  • +7 -4
    gntcombobox.c
  • +5 -4
    gntentry.c
  • +3 -2
    gntlabel.c
  • +4 -3
    gntline.c
  • +2 -2
    gntmain.c
  • +7 -5
    gntmenu.c
  • +12 -8
    gntprogressbar.c
  • +5 -3
    gntslider.c
  • +6 -4
    gnttextview.c
  • +6 -5
    gnttree.c
  • +2 -8
    gntutils.c
  • +22 -24
    gntwidget.c
  • +3 -2
    gntwindow.c
  • +7 -7
    gntwm.c
  • +1 -1
    gntws.c
  • +4 -2
    test.c
  • +2 -1
    test/focus.c
  • +1 -1
    test/multiwin.c
  • +1 -1
    test/tv.c
  • +1 -1
    wms/irssi.c
  • +1 -1
    wms/s.c
    • --- a/gntbox.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/gntbox.c Fri Apr 05 23:39:12 2019 +0000
    @@ -114,8 +114,7 @@
    max = 0;
    curx = widget->priv.x;
    cury = widget->priv.y;
    - if (!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_NO_BORDER))
    - {
    + if (gnt_widget_get_has_border(widget)) {
    has_border = TRUE;
    curx += 1;
    cury += 1;
    @@ -320,9 +319,9 @@
    /* This dance is necessary to make sure that the child widgets get a chance
    to trigger their bindings first */
    - GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_DISABLE_ACTIONS);
    + gnt_widget_set_disable_actions(widget, FALSE);
    ret = gnt_widget_key_pressed(widget, text);
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_DISABLE_ACTIONS);
    + gnt_widget_set_disable_actions(widget, TRUE);
    return ret;
    }
    @@ -621,9 +620,12 @@
    GntWidget *widget = GNT_WIDGET(box);
    /* Initially make both the height and width resizable.
    * Update the flags as necessary when widgets are added to it. */
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_GROW_X | GNT_WIDGET_GROW_Y);
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_CAN_TAKE_FOCUS | GNT_WIDGET_DISABLE_ACTIONS);
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
    + gnt_widget_set_grow_x(widget, TRUE);
    + gnt_widget_set_grow_y(widget, TRUE);
    + gnt_widget_set_take_focus(widget, TRUE);
    + gnt_widget_set_disable_actions(widget, TRUE);
    + gnt_widget_set_has_border(widget, FALSE);
    + gnt_widget_set_has_shadow(widget, FALSE);
    box->pad = 1;
    box->fill = TRUE;
    GNTDEBUG;
    @@ -679,16 +681,10 @@
    void gnt_box_set_toplevel(GntBox *box, gboolean set)
    {
    GntWidget *widget = GNT_WIDGET(box);
    - if (set)
    - {
    - GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_CAN_TAKE_FOCUS);
    - }
    - else
    - {
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
    - GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_CAN_TAKE_FOCUS);
    - }
    +
    + gnt_widget_set_has_border(widget, set);
    + gnt_widget_set_has_shadow(widget, set);
    + gnt_widget_set_take_focus(widget, set);
    }
    void gnt_box_sync_children(GntBox *box)
    @@ -812,14 +808,14 @@
    gnt_box_readjust(GNT_BOX(w));
    else
    {
    - GNT_WIDGET_UNSET_FLAGS(w, GNT_WIDGET_MAPPED);
    + gnt_widget_set_mapped(w, FALSE);
    w->priv.width = 0;
    w->priv.height = 0;
    }
    }
    wid = GNT_WIDGET(box);
    - GNT_WIDGET_UNSET_FLAGS(wid, GNT_WIDGET_MAPPED);
    + gnt_widget_set_mapped(wid, FALSE);
    wid->priv.width = 0;
    wid->priv.height = 0;
    --- a/gntbutton.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/gntbutton.c Fri Apr 05 23:39:12 2019 +0000
    @@ -136,10 +136,12 @@
    widget->priv.minw = 4;
    widget->priv.minh = small_button ? 1 : 3;
    - if (small_button)
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
    - GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_GROW_X | GNT_WIDGET_GROW_Y);
    - GNTDEBUG;
    + if (small_button) {
    + gnt_widget_set_has_border(widget, FALSE);
    + gnt_widget_set_has_shadow(widget, FALSE);
    + }
    + gnt_widget_set_grow_x(widget, FALSE);
    + gnt_widget_set_grow_y(widget, FALSE);
    }
    /******************************************************************************
    --- a/gntcheckbox.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/gntcheckbox.c Fri Apr 05 23:39:12 2019 +0000
    @@ -114,8 +114,8 @@
    GntWidget *widget = GNT_WIDGET(box);
    widget->priv.minh = 1;
    widget->priv.minw = 4;
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
    - GNTDEBUG;
    + gnt_widget_set_has_border(widget, FALSE);
    + gnt_widget_set_has_shadow(widget, FALSE);
    }
    /******************************************************************************
    --- a/gntcombobox.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/gntcombobox.c Fri Apr 05 23:39:12 2019 +0000
    @@ -142,7 +142,7 @@
    parent->priv.width = widget->priv.width;
    parent->priv.height = height + 2;
    - GNT_WIDGET_UNSET_FLAGS(parent, GNT_WIDGET_INVISIBLE);
    + gnt_widget_set_visible(parent, TRUE);
    gnt_widget_draw(parent);
    }
    @@ -302,12 +302,15 @@
    GntWidget *widget = GNT_WIDGET(combo);
    GntWidget *box;
    - GNT_WIDGET_SET_FLAGS(widget,
    - GNT_WIDGET_GROW_X | GNT_WIDGET_CAN_TAKE_FOCUS | GNT_WIDGET_NO_SHADOW);
    + gnt_widget_set_grow_x(widget, TRUE);
    + gnt_widget_set_take_focus(widget, TRUE);
    + gnt_widget_set_has_shadow(widget, FALSE);
    combo->dropdown = gnt_tree_new();
    box = gnt_box_new(FALSE, FALSE);
    - GNT_WIDGET_SET_FLAGS(box, GNT_WIDGET_NO_SHADOW | GNT_WIDGET_NO_BORDER | GNT_WIDGET_TRANSIENT);
    + gnt_widget_set_has_shadow(box, FALSE);
    + gnt_widget_set_has_border(box, FALSE);
    + gnt_widget_set_transient(box, TRUE);
    gnt_box_set_pad(GNT_BOX(box), 0);
    gnt_box_add_widget(GNT_BOX(box), combo->dropdown);
    --- a/gntentry.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/gntentry.c Fri Apr 05 23:39:12 2019 +0000
    @@ -209,7 +209,7 @@
    gnt_tree_set_compare_func(GNT_TREE(entry->ddown), (GCompareFunc)g_utf8_collate);
    gnt_box_add_widget(GNT_BOX(box), entry->ddown);
    - GNT_WIDGET_SET_FLAGS(box, GNT_WIDGET_TRANSIENT);
    + gnt_widget_set_transient(box, TRUE);
    gnt_widget_get_position(GNT_WIDGET(entry), &x, &y);
    x += offset;
    @@ -1047,9 +1047,10 @@
    entry->killring = new_killring();
    entry->search = g_new0(GntEntrySearch, 1);
    - GNT_WIDGET_SET_FLAGS(GNT_WIDGET(entry),
    - GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW | GNT_WIDGET_CAN_TAKE_FOCUS);
    - GNT_WIDGET_SET_FLAGS(GNT_WIDGET(entry), GNT_WIDGET_GROW_X);
    + gnt_widget_set_has_border(widget, FALSE);
    + gnt_widget_set_has_shadow(widget, FALSE);
    + gnt_widget_set_take_focus(widget, TRUE);
    + gnt_widget_set_grow_x(widget, TRUE);
    widget->priv.minw = 3;
    widget->priv.minh = 1;
    --- a/gntlabel.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/gntlabel.c Fri Apr 05 23:39:12 2019 +0000
    @@ -146,8 +146,9 @@
    {
    GntWidget *widget = GNT_WIDGET(label);
    gnt_widget_set_take_focus(widget, FALSE);
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_GROW_X);
    + gnt_widget_set_has_border(widget, FALSE);
    + gnt_widget_set_has_shadow(widget, FALSE);
    + gnt_widget_set_grow_x(widget, TRUE);
    widget->priv.minw = 3;
    widget->priv.minh = 1;
    GNTDEBUG;
    --- a/gntline.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/gntline.c Fri Apr 05 23:39:12 2019 +0000
    @@ -80,9 +80,9 @@
    case PROP_VERTICAL:
    line->vertical = g_value_get_boolean(value);
    if (line->vertical) {
    - GNT_WIDGET_SET_FLAGS(line, GNT_WIDGET_GROW_Y);
    + gnt_widget_set_grow_y(GNT_WIDGET(line), TRUE);
    } else {
    - GNT_WIDGET_SET_FLAGS(line, GNT_WIDGET_GROW_X);
    + gnt_widget_set_grow_x(GNT_WIDGET(line), TRUE);
    }
    break;
    default:
    @@ -130,7 +130,8 @@
    gnt_line_init(GntLine *line)
    {
    GntWidget *widget = GNT_WIDGET(line);
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_SHADOW | GNT_WIDGET_NO_BORDER);
    + gnt_widget_set_has_shadow(widget, FALSE);
    + gnt_widget_set_has_border(widget, FALSE);
    widget->priv.minw = 1;
    widget->priv.minh = 1;
    GNTDEBUG;
    --- a/gntmain.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/gntmain.c Fri Apr 05 23:39:12 2019 +0000
    @@ -723,7 +723,7 @@
    if (wm->cws->ordered && wm->cws->ordered->data == widget)
    return;
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_URGENT);
    + gnt_widget_set_is_urgent(widget, TRUE);
    gnt_wm_update_window(wm, widget);
    }
    @@ -793,7 +793,7 @@
    }
    wm->menu = newmenu;
    - GNT_WIDGET_UNSET_FLAGS(GNT_WIDGET(wm->menu), GNT_WIDGET_INVISIBLE);
    + gnt_widget_set_visible(GNT_WIDGET(wm->menu), TRUE);
    gnt_widget_draw(GNT_WIDGET(wm->menu));
    g_signal_connect(G_OBJECT(wm->menu), "hide", G_CALLBACK(reset_menu), NULL);
    --- a/gntmenu.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/gntmenu.c Fri Apr 05 23:39:12 2019 +0000
    @@ -236,7 +236,7 @@
    item->priv.y = widget->priv.y + gnt_tree_get_selection_visible_line(GNT_TREE(menu));
    }
    gnt_widget_set_position(GNT_WIDGET(sub), item->priv.x, item->priv.y);
    - GNT_WIDGET_UNSET_FLAGS(GNT_WIDGET(sub), GNT_WIDGET_INVISIBLE);
    + gnt_widget_set_visible(GNT_WIDGET(sub), TRUE);
    gnt_widget_draw(GNT_WIDGET(sub));
    } else {
    menu_hide_all(menu);
    @@ -461,9 +461,11 @@
    {
    GntWidget *widget = GNT_WIDGET(menu);
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_SHADOW | GNT_WIDGET_NO_BORDER |
    - GNT_WIDGET_CAN_TAKE_FOCUS | GNT_WIDGET_TRANSIENT | GNT_WIDGET_DISABLE_ACTIONS);
    - GNTDEBUG;
    + gnt_widget_set_has_shadow(widget, FALSE);
    + gnt_widget_set_has_border(widget, FALSE);
    + gnt_widget_set_take_focus(widget, TRUE);
    + gnt_widget_set_transient(widget, TRUE);
    + gnt_widget_set_disable_actions(widget, TRUE);
    }
    /******************************************************************************
    @@ -487,7 +489,7 @@
    gnt_tree_set_column_resizable(GNT_TREE(widget), ITEM_TRIGGER, FALSE);
    gnt_tree_set_col_width(GNT_TREE(widget), ITEM_SUBMENU, 1);
    gnt_tree_set_column_resizable(GNT_TREE(widget), ITEM_SUBMENU, FALSE);
    - GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_NO_BORDER);
    + gnt_widget_set_has_border(widget, TRUE);
    }
    return widget;
    --- a/gntprogressbar.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/gntprogressbar.c Fri Apr 05 23:39:12 2019 +0000
    @@ -129,7 +129,9 @@
    gnt_progress_bar_get_instance_private (progress_bar);
    gnt_widget_set_take_focus (widget, FALSE);
    - GNT_WIDGET_SET_FLAGS (widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW | GNT_WIDGET_GROW_X);
    + gnt_widget_set_has_border(widget, FALSE);
    + gnt_widget_set_has_shadow(widget, FALSE);
    + gnt_widget_set_grow_x(widget, TRUE);
    widget->priv.minw = 8;
    widget->priv.minh = 1;
    @@ -157,8 +159,9 @@
    else
    priv->fraction = fraction;
    - if ((GNT_WIDGET_FLAGS(pbar) & GNT_WIDGET_MAPPED))
    + if (gnt_widget_get_mapped(GNT_WIDGET(pbar))) {
    gnt_widget_draw(GNT_WIDGET(pbar));
    + }
    }
    void
    @@ -172,19 +175,20 @@
    priv->orientation = orientation;
    if (orientation == GNT_PROGRESS_LEFT_TO_RIGHT ||
    orientation == GNT_PROGRESS_RIGHT_TO_LEFT) {
    - GNT_WIDGET_SET_FLAGS(pbar, GNT_WIDGET_GROW_X);
    - GNT_WIDGET_UNSET_FLAGS(pbar, GNT_WIDGET_GROW_Y);
    + gnt_widget_set_grow_x(widget, TRUE);
    + gnt_widget_set_grow_y(widget, FALSE);
    widget->priv.minw = 8;
    widget->priv.minh = 1;
    } else {
    - GNT_WIDGET_UNSET_FLAGS(pbar, GNT_WIDGET_GROW_X);
    - GNT_WIDGET_SET_FLAGS(pbar, GNT_WIDGET_GROW_Y);
    + gnt_widget_set_grow_x(widget, FALSE);
    + gnt_widget_set_grow_y(widget, TRUE);
    widget->priv.minw = 1;
    widget->priv.minh = 8;
    }
    - if ((GNT_WIDGET_FLAGS(pbar) & GNT_WIDGET_MAPPED))
    - gnt_widget_draw(GNT_WIDGET(pbar));
    + if (gnt_widget_get_mapped(widget)) {
    + gnt_widget_draw(widget);
    + }
    }
    void
    --- a/gntslider.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/gntslider.c Fri Apr 05 23:39:12 2019 +0000
    @@ -226,7 +226,9 @@
    gnt_slider_init(GntSlider *slider)
    {
    GntWidget *widget = GNT_WIDGET(slider);
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_SHADOW | GNT_WIDGET_NO_BORDER | GNT_WIDGET_CAN_TAKE_FOCUS);
    + gnt_widget_set_has_shadow(widget, FALSE);
    + gnt_widget_set_has_border(widget, FALSE);
    + gnt_widget_set_take_focus(widget, TRUE);
    widget->priv.minw = 1;
    widget->priv.minh = 1;
    GNTDEBUG;
    @@ -243,9 +245,9 @@
    slider->vertical = vertical;
    if (vertical) {
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_GROW_Y);
    + gnt_widget_set_grow_y(widget, TRUE);
    } else {
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_GROW_X);
    + gnt_widget_set_grow_x(widget, TRUE);
    }
    gnt_slider_set_range(slider, max, min);
    --- a/gnttextview.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/gnttextview.c Fri Apr 05 23:39:12 2019 +0000
    @@ -399,7 +399,7 @@
    view->string = g_string_set_size(view->string, string->len);
    view->string->len = 0;
    - GNT_WIDGET_SET_FLAGS(GNT_WIDGET(view), GNT_WIDGET_DRAWING);
    + gnt_widget_set_drawing(GNT_WIDGET(view), TRUE);
    for (; back; back = back->prev) {
    line = back->data;
    @@ -428,7 +428,7 @@
    list = list->next;
    }
    view->list = list;
    - GNT_WIDGET_UNSET_FLAGS(GNT_WIDGET(view), GNT_WIDGET_DRAWING);
    + gnt_widget_set_drawing(GNT_WIDGET(view), FALSE);
    if (GNT_WIDGET(view)->window)
    gnt_widget_draw(GNT_WIDGET(view));
    g_string_free(string, TRUE);
    @@ -462,8 +462,10 @@
    GntWidget *widget = GNT_WIDGET(view);
    GntTextLine *line = g_new0(GntTextLine, 1);
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW |
    - GNT_WIDGET_GROW_Y | GNT_WIDGET_GROW_X);
    + gnt_widget_set_has_border(widget, FALSE);
    + gnt_widget_set_has_shadow(widget, FALSE);
    + gnt_widget_set_grow_x(widget, TRUE);
    + gnt_widget_set_grow_y(widget, TRUE);
    widget->priv.minw = 5;
    widget->priv.minh = 2;
    view->string = g_string_new(NULL);
    --- a/gnttree.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/gnttree.c Fri Apr 05 23:39:12 2019 +0000
    @@ -792,7 +792,7 @@
    g_string_free(tree->priv->search, TRUE);
    tree->priv->search = NULL;
    tree->priv->search_timeout = 0;
    - GNT_WIDGET_UNSET_FLAGS(GNT_WIDGET(tree), GNT_WIDGET_DISABLE_ACTIONS);
    + gnt_widget_set_disable_actions(GNT_WIDGET(tree), FALSE);
    }
    }
    @@ -943,7 +943,7 @@
    GntTree *tree = GNT_TREE(bindable);
    if (tree->priv->search)
    return FALSE;
    - GNT_WIDGET_SET_FLAGS(GNT_WIDGET(tree), GNT_WIDGET_DISABLE_ACTIONS);
    + gnt_widget_set_disable_actions(GNT_WIDGET(tree), TRUE);
    tree->priv->search = g_string_new(NULL);
    tree->priv->search_timeout = g_timeout_add_seconds(SEARCH_TIMEOUT_S, search_timeout, tree);
    return TRUE;
    @@ -955,7 +955,7 @@
    GntTree *tree = GNT_TREE(bindable);
    if (tree->priv->search == NULL)
    return FALSE;
    - GNT_WIDGET_UNSET_FLAGS(GNT_WIDGET(tree), GNT_WIDGET_DISABLE_ACTIONS);
    + gnt_widget_set_disable_actions(GNT_WIDGET(tree), FALSE);
    end_search(tree);
    redraw_tree(tree);
    return TRUE;
    @@ -1131,8 +1131,9 @@
    tree->show_separator = TRUE;
    tree->priv = g_new0(GntTreePriv, 1);
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_GROW_X | GNT_WIDGET_GROW_Y |
    - GNT_WIDGET_CAN_TAKE_FOCUS | GNT_WIDGET_NO_SHADOW);
    + gnt_widget_set_grow_x(widget, TRUE);
    + gnt_widget_set_grow_y(widget, TRUE);
    + gnt_widget_set_has_shadow(widget, FALSE);
    gnt_widget_set_take_focus(widget, TRUE);
    widget->priv.minw = 4;
    widget->priv.minh = 1;
    --- a/gntutils.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/gntutils.c Fri Apr 05 23:39:12 2019 +0000
    @@ -324,10 +324,7 @@
    if (prop) {
    int val;
    if (sscanf(prop, "%d", &val) == 1) {
    - if (val)
    - GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_NO_BORDER);
    - else
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER);
    + gnt_widget_set_has_border(widget, !!val);
    }
    xmlFree(prop);
    }
    @@ -336,10 +333,7 @@
    if (prop) {
    int val;
    if (sscanf(prop, "%d", &val) == 1) {
    - if (val)
    - GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_NO_BORDER);
    - else
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER);
    + gnt_widget_set_has_border(widget, !!val);
    }
    xmlFree(prop);
    }
    --- a/gntwidget.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/gntwidget.c Fri Apr 05 23:39:12 2019 +0000
    @@ -68,7 +68,7 @@
    /* Get some default size for the widget */
    GNTDEBUG;
    g_signal_emit(widget, signals[SIG_MAP], 0);
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_MAPPED);
    + gnt_widget_set_mapped(widget, TRUE);
    }
    static void
    @@ -82,8 +82,9 @@
    static void
    gnt_widget_focus_change(GntWidget *widget)
    {
    - if (GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_MAPPED)
    + if (gnt_widget_get_mapped(widget)) {
    gnt_widget_draw(widget);
    + }
    }
    static gboolean
    @@ -262,7 +263,7 @@
    {
    g_return_if_fail(GNT_IS_WIDGET(widget));
    - if(!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_DESTROYING)) {
    + if (!gnt_widget_in_destruction(widget)) {
    GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_DESTROYING);
    gnt_widget_hide(widget);
    delwin(widget->window);
    @@ -284,11 +285,11 @@
    gnt_widget_draw(GntWidget *widget)
    {
    /* Draw the widget */
    - if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_DRAWING))
    + if (gnt_widget_get_drawing(widget))
    return;
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_DRAWING);
    - if (!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_MAPPED)) {
    + gnt_widget_set_drawing(widget, TRUE);
    + if (!gnt_widget_get_mapped(widget)) {
    gnt_widget_map(widget);
    }
    @@ -301,7 +302,7 @@
    g_signal_emit(widget, signals[SIG_DRAW], 0);
    gnt_widget_queue_update(widget);
    - GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_DRAWING);
    + gnt_widget_set_drawing(widget, FALSE);
    }
    gboolean
    @@ -342,8 +343,8 @@
    g_signal_emit(widget, signals[SIG_HIDE], 0);
    wbkgdset(widget->window, '\0' | gnt_color_pair(GNT_COLOR_NORMAL));
    gnt_screen_release(widget);
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_INVISIBLE);
    - GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_MAPPED);
    + gnt_widget_set_visible(widget, FALSE);
    + gnt_widget_set_mapped(widget, FALSE);
    }
    void
    @@ -394,8 +395,7 @@
    wbkgd(widget->window, gnt_color_pair(GNT_COLOR_NORMAL));
    werase(widget->window);
    - if (!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_NO_BORDER))
    - {
    + if (gnt_widget_get_has_border(widget)) {
    /* - This is ugly. */
    /* - What's your point? */
    mvwvline(widget->window, 0, 0, ACS_VLINE | gnt_color_pair(GNT_COLOR_NORMAL), widget->priv.height);
    @@ -465,10 +465,11 @@
    {
    init_widget(widget);
    }
    - if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
    + if (gnt_widget_get_mapped(widget)) {
    init_widget(widget);
    - else
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_MAPPED);
    + } else {
    + gnt_widget_set_mapped(widget, TRUE);
    + }
    }
    return ret;
    @@ -480,18 +481,15 @@
    if (!(GNT_WIDGET_FLAGS(widget) & GNT_WIDGET_CAN_TAKE_FOCUS))
    return FALSE;
    - if (set && !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_HAS_FOCUS))
    - {
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_HAS_FOCUS);
    + if (set && !gnt_widget_get_has_focus(widget)) {
    + gnt_widget_set_has_focus(widget, TRUE);
    g_signal_emit(widget, signals[SIG_GIVE_FOCUS], 0);
    + } else if (!set && gnt_widget_get_has_focus(widget)) {
    + gnt_widget_set_has_focus(widget, FALSE);
    + g_signal_emit(widget, signals[SIG_LOST_FOCUS], 0);
    + } else {
    + return FALSE;
    }
    - else if (!set && GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_HAS_FOCUS))
    - {
    - GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_HAS_FOCUS);
    - g_signal_emit(widget, signals[SIG_LOST_FOCUS], 0);
    - }
    - else
    - return FALSE;
    return TRUE;
    }
    --- a/gntwindow.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/gntwindow.c Fri Apr 05 23:39:12 2019 +0000
    @@ -117,8 +117,9 @@
    {
    GntWidget *widget = GNT_WIDGET(win);
    - GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
    - GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_CAN_TAKE_FOCUS);
    + gnt_widget_set_has_border(widget, TRUE);
    + gnt_widget_set_has_shadow(widget, TRUE);
    + gnt_widget_set_take_focus(widget, TRUE);
    win->priv = g_new0(GntWindowPriv, 1);
    win->priv->accels = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
    --- a/gntwm.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/gntwm.c Fri Apr 05 23:39:12 2019 +0000
    @@ -222,8 +222,8 @@
    g_string_erase(text, text->len - 2, 2);
    message = gnt_vbox_new(FALSE);
    label = gnt_label_new_with_format(text->str, GNT_TEXT_FLAG_BOLD | GNT_TEXT_FLAG_HIGHLIGHT);
    - GNT_WIDGET_UNSET_FLAGS(GNT_BOX(message), GNT_WIDGET_CAN_TAKE_FOCUS);
    - GNT_WIDGET_SET_FLAGS(GNT_BOX(message), GNT_WIDGET_TRANSIENT);
    + gnt_widget_set_take_focus(message, FALSE);
    + gnt_widget_set_transient(message, TRUE);
    gnt_box_add_widget(GNT_BOX(message), label);
    gnt_widget_set_name(message, "wm-message");
    gnt_widget_set_position(message, 0, 0);
    @@ -565,7 +565,7 @@
    win = wm->_list.window = gnt_box_new(FALSE, FALSE);
    gnt_box_set_toplevel(GNT_BOX(win), TRUE);
    gnt_box_set_pad(GNT_BOX(win), 0);
    - GNT_WIDGET_SET_FLAGS(win, GNT_WIDGET_TRANSIENT);
    + gnt_widget_set_transient(win, TRUE);
    tree = wm->_list.tree = gnt_tree_new();
    gnt_box_add_widget(GNT_BOX(win), tree);
    @@ -967,7 +967,7 @@
    tree = wm->actions->tree;
    gnt_box_set_title(GNT_BOX(win), "Actions");
    - GNT_WIDGET_SET_FLAGS(tree, GNT_WIDGET_NO_BORDER);
    + gnt_widget_set_has_border(tree, FALSE);
    /* XXX: Do we really want this? */
    gnt_tree_set_compare_func(GNT_TREE(tree), compare_action);
    @@ -1151,8 +1151,8 @@
    }
    text = gnt_get_clipboard_string();
    clip = gnt_hwindow_new(FALSE);
    - GNT_WIDGET_SET_FLAGS(clip, GNT_WIDGET_TRANSIENT);
    - GNT_WIDGET_SET_FLAGS(clip, GNT_WIDGET_NO_BORDER);
    + gnt_widget_set_transient(clip, TRUE);
    + gnt_widget_set_has_border(clip, FALSE);
    gnt_box_set_pad(GNT_BOX(clip), 0);
    gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(" "));
    gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(text));
    @@ -2160,7 +2160,7 @@
    }
    gnt_widget_set_focus(widget, TRUE);
    - GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_URGENT);
    + gnt_widget_set_is_urgent(widget, FALSE);
    gnt_widget_draw(widget);
    top_panel(node->panel);
    --- a/gntws.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/gntws.c Fri Apr 05 23:39:12 2019 +0000
    @@ -49,7 +49,7 @@
    widget_show(gpointer data, gpointer nodes)
    {
    GntNode *node = g_hash_table_lookup(nodes, data);
    - GNT_WIDGET_UNSET_FLAGS(GNT_WIDGET(data), GNT_WIDGET_INVISIBLE);
    + gnt_widget_set_visible(GNT_WIDGET(data), TRUE);
    if (node) {
    show_panel(node->panel);
    gnt_wm_copy_win(GNT_WIDGET(data), node);
    --- a/test.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/test.c Fri Apr 05 23:39:12 2019 +0000
    @@ -12,7 +12,8 @@
    GntWidget *label = gnt_label_new("so wassup!!");
    gnt_box_add_widget(GNT_BOX(box), label);
    - GNT_WIDGET_UNSET_FLAGS(box, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
    + gnt_widget_set_has_border(box, TRUE);
    + gnt_widget_set_has_shadow(box, TRUE);
    gnt_box_set_title(GNT_BOX(box), "This is a test");
    gnt_widget_show(box);
    @@ -79,7 +80,8 @@
    gnt_tree_add_row_after(GNT_TREE(tree), "e", "e", "a", NULL);
    gnt_tree_add_row_after(GNT_TREE(tree), "b", "b", "d", NULL);
    - GNT_WIDGET_UNSET_FLAGS(hbox, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
    + gnt_widget_set_has_border(hbox, TRUE);
    + gnt_widget_set_has_shadow(hbox, TRUE);
    gnt_box_set_title(GNT_BOX(hbox), "111111111111111111111111111111111111111111111111111111111111111This is the title …");
    gnt_widget_show(hbox);
    --- a/test/focus.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/test/focus.c Fri Apr 05 23:39:12 2019 +0000
    @@ -60,7 +60,8 @@
    gnt_tree_add_row_after(GNT_TREE(tree), "e", gnt_tree_create_row(GNT_TREE(tree), "e"), "a", NULL);
    gnt_tree_add_choice(GNT_TREE(tree), "b", gnt_tree_create_row(GNT_TREE(tree), "b"), "d", NULL);
    - GNT_WIDGET_UNSET_FLAGS(hbox, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
    + gnt_widget_set_has_border(hbox, TRUE);
    + gnt_widget_set_has_shadow(hbox, TRUE);
    gnt_box_set_title(GNT_BOX(hbox), "\u4e0a\u6d77\u6700\u4f4e\u6708\u5de5 \u4e0a\u6d77\u6700\u4f4e\u6708\u5de5 ……\u4e0a\u6d77\u6700\u4f4e\u6708\u5de5 …");
    g_signal_connect(G_OBJECT(tree), "toggled", G_CALLBACK(toggled), NULL);
    --- a/test/multiwin.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/test/multiwin.c Fri Apr 05 23:39:12 2019 +0000
    @@ -30,7 +30,7 @@
    tree = gnt_tree_new_with_columns(3);
    gnt_tree_set_search_column(GNT_TREE(tree), 1);
    - GNT_WIDGET_SET_FLAGS(tree, GNT_WIDGET_NO_BORDER);
    + gnt_widget_set_has_border(tree, FALSE);
    gnt_tree_set_column_titles(GNT_TREE(tree), "12345678901234567890", "column 2", "column3");
    gnt_tree_set_show_title(GNT_TREE(tree), TRUE);
    gnt_widget_set_name(tree, "tree");
    --- a/test/tv.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/test/tv.c Fri Apr 05 23:39:12 2019 +0000
    @@ -79,7 +79,7 @@
    entry = gnt_entry_new(NULL);
    gnt_widget_set_name(entry, "entry");
    - GNT_WIDGET_SET_FLAGS(entry, GNT_WIDGET_CAN_TAKE_FOCUS);
    + gnt_widget_set_take_focus(entry, TRUE);
    g_signal_connect(G_OBJECT(entry), "completion", G_CALLBACK(completion_cb), NULL);
    --- a/wms/irssi.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/wms/irssi.c Fri Apr 05 23:39:12 2019 +0000
    @@ -143,7 +143,7 @@
    int y, int w, int h)
    {
    gnt_box_set_toplevel(GNT_BOX(win), FALSE);
    - GNT_WIDGET_SET_FLAGS(win, GNT_WIDGET_CAN_TAKE_FOCUS);
    + gnt_widget_set_take_focus(win, TRUE);
    gnt_widget_set_position(win, x, y);
    mvwin(win->window, y, x);
    --- a/wms/s.c Fri Apr 05 23:22:08 2019 +0000
    +++ b/wms/s.c Fri Apr 05 23:39:12 2019 +0000
    @@ -123,7 +123,7 @@
    main_window = TRUE;
    gnt_box_set_toplevel(GNT_BOX(win), FALSE);
    - GNT_WIDGET_SET_FLAGS(win, GNT_WIDGET_CAN_TAKE_FOCUS);
    + gnt_widget_set_take_focus(win, TRUE);
    gnt_widget_set_position(win, x, y);
    mvwin(win->window, y, x);