libgnt/libgnt

Use panel_window instead of directly accessing the struct member
release-2.x.y
4 months ago, Gary Kramlich
2da723f790d6
Parents 73d8724225e7
Children 17a641c949d6
Use panel_window instead of directly accessing the struct member

This is necessary to fix a FTBFS in Debian. For more information see
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057570.

Testing Done:
Compiled and ran `test/focus` without issue.

Reviewed at https://reviews.imfreedom.org/r/2883/
1 files changed, 17 insertions(+), 15 deletions(-)
  • +17 -15
    gntwm.c
    • --- a/gntwm.c Thu Jun 15 20:22:30 2023 -0500
    +++ b/gntwm.c Sat Dec 16 23:29:21 2023 -0600
    @@ -166,38 +166,40 @@
    int sx, ex, sy, ey, w, y;
    cchar_t ch;
    PANEL *below = panel;
    + WINDOW *window = panel_window(panel);
    - sx = getbegx(panel->win);
    - ex = getmaxx(panel->win) + sx;
    - sy = getbegy(panel->win);
    - ey = getmaxy(panel->win) + sy;
    + sx = getbegx(window);
    + ex = getmaxx(window) + sx;
    + sy = getbegy(window);
    + ey = getmaxy(window) + sy;
    while ((below = panel_below(below)) != NULL) {
    - if (sy > getbegy(below->win) + getmaxy(below->win) ||
    - ey < getbegy(below->win))
    + window = panel_window(below);
    + if (sy > getbegy(window) + getmaxy(window) ||
    + ey < getbegy(window))
    continue;
    - if (sx > getbegx(below->win) + getmaxx(below->win) ||
    - ex < getbegx(below->win))
    + if (sx > getbegx(window) + getmaxx(window) ||
    + ex < getbegx(window))
    continue;
    - for (y = MAX(sy, getbegy(below->win)); y <= MIN(ey, getbegy(below->win) + getmaxy(below->win)); y++) {
    - if (mvwin_wch(below->win, y - getbegy(below->win), sx - 1 - getbegx(below->win), &ch) != OK)
    + for (y = MAX(sy, getbegy(window)); y <= MIN(ey, getbegy(window) + getmaxy(window)); y++) {
    + if (mvwin_wch(window, y - getbegy(window), sx - 1 - getbegx(window), &ch) != OK)
    goto right;
    w = widestringwidth(ch.chars);
    if (w > 1 && (ch.attr & 1)) {
    ch.chars[0] = ' ';
    ch.attr &= ~ A_CHARTEXT;
    - mvwadd_wch(below->win, y - getbegy(below->win), sx - 1 - getbegx(below->win), &ch);
    - touchline(below->win, y - getbegy(below->win), 1);
    + mvwadd_wch(window, y - getbegy(window), sx - 1 - getbegx(window), &ch);
    + touchline(window, y - getbegy(window), 1);
    }
    right:
    - if (mvwin_wch(below->win, y - getbegy(below->win), ex + 1 - getbegx(below->win), &ch) != OK)
    + if (mvwin_wch(window, y - getbegy(window), ex + 1 - getbegx(window), &ch) != OK)
    continue;
    w = widestringwidth(ch.chars);
    if (w > 1 && !(ch.attr & 1)) {
    ch.chars[0] = ' ';
    ch.attr &= ~ A_CHARTEXT;
    - mvwadd_wch(below->win, y - getbegy(below->win), ex + 1 - getbegx(below->win), &ch);
    - touchline(below->win, y - getbegy(below->win), 1);
    + mvwadd_wch(window, y - getbegy(window), ex + 1 - getbegx(window), &ch);
    + touchline(window, y - getbegy(window), 1);
    }
    }
    }