diff options
| author | Daniel Kamil Kozar <dkk089@gmail.com> | 2017-09-22 13:59:58 +0200 |
|---|---|---|
| committer | Daniel Kamil Kozar <dkk089@gmail.com> | 2017-09-22 13:59:58 +0200 |
| commit | fa8a8a8a262fd3c9fad367d3fe18703f59fcd10f (patch) | |
| tree | fb55bf90aae54eb32816420a18abc96b98df6370 | |
| parent | 48414b384b20d26fde67106777fa377092d56db3 (diff) | |
| download | pidgin-fa8a8a8a262fd3c9fad367d3fe18703f59fcd10f.tar.gz | |
Use accessors when accessing ncurses structures
Imported from https://developer.pidgin.im/ticket/16764 , authored by
dimstar. Fixes build failures when ncurses defines NCURSES_OPAQUE.
| -rw-r--r-- | finch/libgnt/gntwm.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/finch/libgnt/gntwm.c b/finch/libgnt/gntwm.c index 310d6c621c..705a487539 100644 --- a/finch/libgnt/gntwm.c +++ b/finch/libgnt/gntwm.c @@ -174,37 +174,37 @@ work_around_for_ncurses_bug(void) cchar_t ch; PANEL *below = panel; - sx = panel->win->_begx; - ex = panel->win->_maxx + sx; - sy = panel->win->_begy; - ey = panel->win->_maxy + sy; + sx = getbegx(panel->win); + ex = getmaxx(panel->win) + sx; + sy = getbegy(panel->win); + ey = getmaxy(panel->win) + sy; while ((below = panel_below(below)) != NULL) { - if (sy > below->win->_begy + below->win->_maxy || - ey < below->win->_begy) + if (sy > getbegy(below->win) + getmaxy(below->win) || + ey < getbegy(below->win)) continue; - if (sx > below->win->_begx + below->win->_maxx || - ex < below->win->_begx) + if (sx > getbegx(below->win) + getmaxx(below->win) || + ex < getbegx(below->win)) continue; - for (y = MAX(sy, below->win->_begy); y <= MIN(ey, below->win->_begy + below->win->_maxy); y++) { - if (mvwin_wch(below->win, y - below->win->_begy, sx - 1 - below->win->_begx, &ch) != OK) + 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) goto right; w = widestringwidth(ch.chars); if (w > 1 && (ch.attr & 1)) { ch.chars[0] = ' '; ch.attr &= ~ A_CHARTEXT; - mvwadd_wch(below->win, y - below->win->_begy, sx - 1 - below->win->_begx, &ch); - touchline(below->win, y - below->win->_begy, 1); + mvwadd_wch(below->win, y - getbegy(below->win), sx - 1 - getbegx(below->win), &ch); + touchline(below->win, y - getbegy(below->win), 1); } right: - if (mvwin_wch(below->win, y - below->win->_begy, ex + 1 - below->win->_begx, &ch) != OK) + if (mvwin_wch(below->win, y - getbegy(below->win), ex + 1 - getbegx(below->win), &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 - below->win->_begy, ex + 1 - below->win->_begx, &ch); - touchline(below->win, y - below->win->_begy, 1); + mvwadd_wch(below->win, y - getbegy(below->win), ex + 1 - getbegx(below->win), &ch); + touchline(below->win, y - getbegy(below->win), 1); } } } |