Mon Jan 20 17:32:49 2020 UTC ()
ekg: updated to 20200119
20200119:
- fix for OpenSSL < 1.1.0
- check for systems with separate libncurses and libtinfo
- use LIBS instead of LDFLAGS
- fix some warnings
(adam)
diff -r1.57 -r1.58 pkgsrc/chat/ekg/Makefile
diff -r1.12 -r1.13 pkgsrc/chat/ekg/PLIST
diff -r1.23 -r1.24 pkgsrc/chat/ekg/distinfo
diff -r0 -r1.1 pkgsrc/chat/ekg/patches/patch-Makefile.in
diff -r0 -r1.1 pkgsrc/chat/ekg/patches/patch-src_Makefile.in
diff -r0 -r1.1 pkgsrc/chat/ekg/patches/patch-src_ui-ncurses.c
diff -r1.9 -r0 pkgsrc/chat/ekg/patches/patch-aa
diff -r1.4 -r0 pkgsrc/chat/ekg/patches/patch-ab
diff -r1.6 -r0 pkgsrc/chat/ekg/patches/patch-ac
diff -r1.6 -r0 pkgsrc/chat/ekg/patches/patch-ad
--- pkgsrc/chat/ekg/Makefile 2020/01/18 21:47:58 1.57
+++ pkgsrc/chat/ekg/Makefile 2020/01/20 17:32:49 1.58
| @@ -1,40 +1,42 @@ | | | @@ -1,40 +1,42 @@ |
1 | # $NetBSD: Makefile,v 1.57 2020/01/18 21:47:58 jperkin Exp $ | | 1 | # $NetBSD: Makefile,v 1.58 2020/01/20 17:32:49 adam Exp $ |
2 | | | 2 | |
3 | DISTNAME= ekg-1.7 | | 3 | DISTNAME= ekg-20200116 |
4 | PKGREVISION= 12 | | | |
5 | CATEGORIES= chat | | 4 | CATEGORIES= chat |
6 | MASTER_SITES= http://ekg.chmurka.net/ | | 5 | MASTER_SITES= http://ekg.chmurka.net/ |
7 | MASTER_SITES+= http://ekg.chmurka.net/archive/ | | 6 | MASTER_SITES+= http://ekg.chmurka.net/archive/ |
8 | | | 7 | |
9 | MAINTAINER= adam@NetBSD.org | | 8 | MAINTAINER= adam@NetBSD.org |
10 | HOMEPAGE= http://ekg.chmurka.net/ | | 9 | HOMEPAGE= http://ekg.chmurka.net/ |
11 | COMMENT= Experimental Gadu-Gadu Client (Polish instant messaging system) | | 10 | COMMENT= Experimental Gadu-Gadu Client (Polish instant messaging system) |
| | | 11 | LICENSE= gnu-gpl-v2 |
12 | | | 12 | |
13 | USE_LIBTOOL= yes | | 13 | USE_LIBTOOL= yes |
14 | USE_NCURSES= yes | | 14 | USE_NCURSES= yes |
15 | USE_TOOLS+= gmake pkg-config | | 15 | USE_TOOLS+= gmake pkg-config |
16 | GNU_CONFIGURE= yes | | 16 | GNU_CONFIGURE= yes |
17 | PKGCONFIG_OVERRIDE= lib/libgadu.pc.in | | | |
18 | CONFIGURE_ARGS+= --enable-ui-ncurses | | 17 | CONFIGURE_ARGS+= --enable-ui-ncurses |
19 | CONFIGURE_ARGS+= --enable-ui-readline | | 18 | CONFIGURE_ARGS+= --enable-ui-readline |
20 | CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.ncurses} | | 19 | CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.curses} |
21 | CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} | | 20 | CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} |
22 | CONFIGURE_ARGS+= --without-debug | | 21 | CONFIGURE_ARGS+= --without-debug |
| | | 22 | PKGCONFIG_OVERRIDE= lib/libgadu.pc.in |
23 | | | 23 | |
24 | .include "../../mk/pthread.buildlink3.mk" | | 24 | FAKE_NCURSES= yes |
25 | | | 25 | |
| | | 26 | .include "../../mk/pthread.buildlink3.mk" |
26 | .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none") | | 27 | .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none") |
27 | CONFIGURE_ARGS+= --with-pthread | | 28 | CONFIGURE_ARGS+= --with-pthread |
28 | .endif | | 29 | .endif |
29 | | | 30 | |
30 | # for backtrace | | 31 | # for backtrace |
31 | .if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h) | | 32 | .if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h) |
32 | LIBS+= -lexecinfo | | 33 | LIBS+= -lexecinfo |
33 | .endif | | 34 | .endif |
34 | | | 35 | |
35 | .include "../../devel/ncurses/buildlink3.mk" | | 36 | .include "../../chat/libgadu/buildlink3.mk" |
36 | .include "../../devel/readline/buildlink3.mk" | | 37 | .include "../../devel/readline/buildlink3.mk" |
37 | .include "../../devel/zlib/buildlink3.mk" | | 38 | .include "../../devel/zlib/buildlink3.mk" |
38 | .include "../../mk/jpeg.buildlink3.mk" | | | |
39 | .include "../../security/openssl/buildlink3.mk" | | 39 | .include "../../security/openssl/buildlink3.mk" |
| | | 40 | .include "../../mk/curses.buildlink3.mk" |
| | | 41 | .include "../../mk/jpeg.buildlink3.mk" |
40 | .include "../../mk/bsd.pkg.mk" | | 42 | .include "../../mk/bsd.pkg.mk" |
--- pkgsrc/chat/ekg/PLIST 2009/06/14 17:37:44 1.12
+++ pkgsrc/chat/ekg/PLIST 2020/01/20 17:32:49 1.13
| @@ -1,24 +1,22 @@ | | | @@ -1,24 +1,22 @@ |
1 | @comment $NetBSD: PLIST,v 1.12 2009/06/14 17:37:44 joerg Exp $ | | 1 | @comment $NetBSD: PLIST,v 1.13 2020/01/20 17:32:49 adam Exp $ |
2 | bin/ekg | | 2 | bin/ekg |
3 | include/libgadu-config.h | | | |
4 | include/libgadu.h | | | |
5 | lib/libgadu.la | | | |
6 | lib/pkgconfig/libgadu.pc | | | |
7 | man/man1/ekg.1 | | 3 | man/man1/ekg.1 |
8 | man/pl/man1/ekg.1 | | 4 | man/pl/man1/ekg.1 |
9 | share/ekg/themes/arim.theme | | 5 | share/ekg/themes/arim.theme |
10 | share/ekg/themes/dj.theme | | 6 | share/ekg/themes/dj.theme |
11 | share/ekg/themes/eileen.theme | | 7 | share/ekg/themes/eileen.theme |
12 | share/ekg/themes/emers.theme | | 8 | share/ekg/themes/emers.theme |
13 | share/ekg/themes/feeg.theme | | 9 | share/ekg/themes/feeg.theme |
| | | 10 | share/ekg/themes/fi9o.theme |
| | | 11 | share/ekg/themes/gophi.theme |
14 | share/ekg/themes/irc.theme | | 12 | share/ekg/themes/irc.theme |
15 | share/ekg/themes/jamzed.theme | | 13 | share/ekg/themes/jamzed.theme |
16 | share/ekg/themes/klith.theme | | 14 | share/ekg/themes/klith.theme |
17 | share/ekg/themes/krzyk.theme | | 15 | share/ekg/themes/krzyk.theme |
18 | share/ekg/themes/lcamtuf.theme | | 16 | share/ekg/themes/lcamtuf.theme |
19 | share/ekg/themes/leon.theme | | 17 | share/ekg/themes/leon.theme |
20 | share/ekg/themes/matik.theme | | 18 | share/ekg/themes/matik.theme |
21 | share/ekg/themes/old.theme | | 19 | share/ekg/themes/old.theme |
22 | share/ekg/themes/sic.theme | | 20 | share/ekg/themes/sic.theme |
23 | share/ekg/themes/tohver.theme | | 21 | share/ekg/themes/tohver.theme |
24 | share/ekg/vars.txt | | 22 | share/ekg/vars.txt |
--- pkgsrc/chat/ekg/distinfo 2015/11/03 01:20:18 1.23
+++ pkgsrc/chat/ekg/distinfo 2020/01/20 17:32:49 1.24
| @@ -1,11 +1,10 @@ | | | @@ -1,11 +1,10 @@ |
1 | $NetBSD: distinfo,v 1.23 2015/11/03 01:20:18 agc Exp $ | | 1 | $NetBSD: distinfo,v 1.24 2020/01/20 17:32:49 adam Exp $ |
2 | | | 2 | |
3 | SHA1 (ekg-1.7.tar.gz) = 3b02d2e9fff440783a202f343bda62dc6ad24815 | | 3 | SHA1 (ekg-20200116.tar.gz) = fd07911e92218c7a0a79f9732ca17ec1ff033a47 |
4 | RMD160 (ekg-1.7.tar.gz) = 1832b34e5d8081fd8b04c85cd87be8cc07908b05 | | 4 | RMD160 (ekg-20200116.tar.gz) = 033133c290178b59fc650004ecea2a55c94a94cc |
5 | SHA512 (ekg-1.7.tar.gz) = 5ddfbe422d0e958d739f9847d949ab6509f3d478973af87de3dba8d9a58cda35c09fd4827a470f3c9cc91aad6d0fbd43dd17fc1363279d3641e99df7e3d0a3fe | | 5 | SHA512 (ekg-20200116.tar.gz) = db5c26973ebd0b7a622ba25c0a6f099eb94eefa43cb5c57fc7afedb7a1aed1285445d66d24de0d61ff08a2dce78a416107fe061e0118be7406e33fbd9d0ea2d3 |
6 | Size (ekg-1.7.tar.gz) = 530314 bytes | | 6 | Size (ekg-20200116.tar.gz) = 4254772 bytes |
7 | SHA1 (patch-aa) = 8da65a969af2eac2dfcfee1d34e4581094c71adc | | 7 | SHA1 (patch-Makefile.in) = 7a08b075b62bc72eac773cb86e0826dbe55de908 |
8 | SHA1 (patch-ab) = 26323cd967c5358e3e5bbab5ab61b9d8d0ee7f1e | | 8 | SHA1 (patch-src_Makefile.in) = 2012b518cd643275d7a603864f3bc2c336a7bc32 |
9 | SHA1 (patch-ac) = f9c0acdda1665bed11b1c5d0d47b2c708d122eac | | 9 | SHA1 (patch-src_ui-ncurses.c) = f526452651b793d68e69d0aaac72307e0e4033f8 |
10 | SHA1 (patch-ad) = 228df5c7890dfbb863956cb258f994b08e168c04 | | | |
11 | SHA1 (patch-src_ui-readline.c) = ab216cff95baa7121f80e4f70b922e188a6a17be | | 10 | SHA1 (patch-src_ui-readline.c) = ab216cff95baa7121f80e4f70b922e188a6a17be |
$NetBSD: patch-Makefile.in,v 1.1 2020/01/20 17:32:49 adam Exp $
Do not run 'configure' when building.
--- Makefile.in.orig 2020-01-16 21:00:11.000000000 +0000
+++ Makefile.in
@@ -16,7 +16,7 @@ INSTALL = @INSTALL@
#
-all: configure compat @ekg@ @make_ekgwap@
+all: compat @ekg@ @make_ekgwap@
ekg:
cd src && $(MAKE) all
$NetBSD: patch-src_Makefile.in,v 1.1 2020/01/20 17:32:49 adam Exp $
Use LIBTOOL.
--- src/Makefile.in.orig 2020-01-16 21:00:12.000000000 +0000
+++ src/Makefile.in
@@ -34,6 +34,7 @@ all: dep ekg @ioctld@
ekg: $(OBJS) $(srcdir)/comptime.c
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o comptime.o $(srcdir)/comptime.c
+ ${LIBTOOL} --mode=link \
$(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o $(LDFLAGS) $(LIBS)
ioctld: $(srcdir)/ioctld.c
@@ -48,9 +49,9 @@ dep: .depend
install: all install-ekg @install_ioctld@
-install-ekg: @strip_ekg@
+install-ekg:
$(INSTALL) -d $(DESTDIR)$(bindir)
- $(INSTALL) -m 755 ekg $(DESTDIR)$(bindir)
+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} ekg $(DESTDIR)$(bindir)
install-ioctld: @strip_ioctld@
$(INSTALL) -d $(DESTDIR)$(libexecdir)
$NetBSD: patch-src_ui-ncurses.c,v 1.1 2020/01/20 17:32:49 adam Exp $
Fix curses.
--- src/ui-ncurses.c.orig 2020-01-20 16:47:44.000000000 +0000
+++ src/ui-ncurses.c
@@ -351,7 +351,7 @@ int contacts_size()
if (!config_contacts)
return 0;
- if (config_contacts_size + 2 > (stdscr->_maxx + 1) / 2)
+ if (config_contacts_size + 2 > (getmaxx(stdscr) + 1) / 2)
return 0;
return config_contacts_size + (contacts_frame) ? 1 : 0;
@@ -618,9 +618,9 @@ void window_resize()
list_t l;
left = 0;
- right = stdscr->_maxx + 1;
+ right = getmaxx(stdscr) + 1;
top = config_header_size;
- bottom = stdscr->_maxy + 1 - input_size - config_statusbar_size;
+ bottom = getmaxy(stdscr) + 1 - input_size - config_statusbar_size;
width = right - left;
height = bottom - top;
@@ -737,13 +737,13 @@ void window_resize()
if (w->left < 0)
w->left = 0;
- if (w->left > stdscr->_maxx)
- w->left = stdscr->_maxx;
+ if (w->left > getmaxx(stdscr))
+ w->left = getmaxx(stdscr);
if (w->top < 0)
w->top = 0;
- if (w->top > stdscr->_maxy)
- w->top = stdscr->_maxy;
+ if (w->top > getmaxy(stdscr))
+ w->top = getmaxy(stdscr);
mvwin(w->window, w->top, w->left);
@@ -756,8 +756,8 @@ void window_resize()
}
if (window_current) {
- mouse_area_resize("window_current", window_current->window->_maxy, window_current->window->_maxx);
- mouse_area_move("window_current", window_current->window->_begy, window_current->window->_begx);
+ mouse_area_resize("window_current", getmaxy(window_current->window), getmaxx(window_current->window));
+ mouse_area_move("window_current", getbegy(window_current->window), getbegx(window_current->window));
}
ui_screen_width = width;
@@ -1055,11 +1055,11 @@ static void window_refresh()
wnoutrefresh(w->window);
}
- mvwin(status, stdscr->_maxy + 1 - input_size - config_statusbar_size, 0);
- mouse_area_move("status", stdscr->_maxy + 1 - input_size - config_statusbar_size, 0);
+ mvwin(status, getmaxy(stdscr) + 1 - input_size - config_statusbar_size, 0);
+ mouse_area_move("status", getmaxy(stdscr) + 1 - input_size - config_statusbar_size, 0);
- wresize(input, input_size, input->_maxx + 1);
- mvwin(input, stdscr->_maxy - input_size + 1, 0);
+ wresize(input, input_size, getmaxx(input) + 1);
+ mvwin(input, getmaxy(stdscr) - input_size + 1, 0);
}
/*
@@ -1234,14 +1234,14 @@ static struct window *window_new(const c
array_free(argv);
- if (w.left > stdscr->_maxx)
- w.left = stdscr->_maxx;
- if (w.top > stdscr->_maxy)
- w.top = stdscr->_maxy;
- if (w.left + w.width > stdscr->_maxx)
- w.width = stdscr->_maxx + 1 - w.left;
- if (w.top + w.height > stdscr->_maxy)
- w.height = stdscr->_maxy + 1 - w.top;
+ if (w.left > getmaxx(stdscr))
+ w.left = getmaxx(stdscr);
+ if (w.top > getmaxy(stdscr))
+ w.top = getmaxy(stdscr);
+ if (w.left + w.width > getmaxx(stdscr))
+ w.width = getmaxx(stdscr) + 1 - w.left;
+ if (w.top + w.height > getmaxy(stdscr))
+ w.height = getmaxy(stdscr) + 1 - w.top;
}
if (!w.target) {
@@ -1787,7 +1787,7 @@ static void update_header(int commit)
wmove(header, y, 0);
- for (x = 0; x <= status->_maxx; x++)
+ for (x = 0; x <= getmaxx(status); x++)
waddch(header, ' ');
}
@@ -1836,13 +1836,13 @@ int window_printat(WINDOW *w, int x, int
wmove(w, y, 0);
- for (i = 0; i <= w->_maxx; i++)
+ for (i = 0; i <= getmaxx(w); i++)
waddch(w, ' ');
}
wmove(w, y, x);
- while (*p && *p != '}' && x <= w->_maxx) {
+ while (*p && *p != '}' && x <= getmaxx(w)) {
int i, nest;
if (*p != '%') {
@@ -1886,7 +1886,7 @@ int window_printat(WINDOW *w, int x, int
bold = 0;
break;
case '|':
- while (x <= w->_maxx) {
+ while (x <= getmaxx(w)) {
waddch(w, ' ');
x++;
}
@@ -2081,7 +2081,7 @@ static int mouse_statusbar_update (int x
}
}
- while (p && *p && *p != '}' && x <= status->_maxx) {
+ while (p && *p && *p != '}' && x <= getmaxx(status)) {
int i, nest;
if (*p != '%') {
@@ -2097,7 +2097,7 @@ static int mouse_statusbar_update (int x
if (*p != '{') {
switch (*p) {
case '|':
- while (x <= status->_maxx)
+ while (x <= getmaxx(status))
x++;
break;
case '}':
@@ -3078,8 +3078,8 @@ void ui_ncurses_init()
use_default_colors();
}
- ui_screen_width = stdscr->_maxx + 1;
- ui_screen_height = stdscr->_maxy + 1;
+ ui_screen_width = getmaxx(stdscr) + 1;
+ ui_screen_height = getmaxy(stdscr) + 1;
ui_need_refresh = 0;
#ifndef GG_DEBUG_DISABLE
@@ -3087,16 +3087,16 @@ void ui_ncurses_init()
#endif
window_current = window_new(NULL, 0);
- status = newwin(1, stdscr->_maxx + 1, stdscr->_maxy - 1, 0);
- input = newwin(1, stdscr->_maxx + 1, stdscr->_maxy, 0);
+ status = newwin(1, getmaxx(stdscr) + 1, getmaxy(stdscr) - 1, 0);
+ input = newwin(1, getmaxx(stdscr) + 1, getmaxy(stdscr), 0);
keypad(input, TRUE);
nodelay(input, TRUE);
mouse_event("disable");
area.name = "status";
area.size.y = 1;
- area.size.x = stdscr->_maxx + 1;
- area.start.y = stdscr->_maxy - 1;
+ area.size.x = getmaxx(stdscr) + 1;
+ area.start.y = getmaxy(stdscr) - 1;
area.start.x = 0;
area.bevents = NULL;
@@ -3106,10 +3106,10 @@ void ui_ncurses_init()
mouse_area_add(&area);
area.name = "window_current";
- area.size.y = window_current->window->_maxy;
- area.size.x = window_current->window->_maxx;
- area.start.y = window_current->window->_begy;
- area.start.x = window_current->window->_begx;
+ area.size.y = getmaxy(window_current->window);
+ area.size.x = getmaxx(window_current->window);
+ area.start.y = getbegy(window_current->window);
+ area.start.x = getbegx(window_current->window);
area.bevents = NULL;
mouse_bevent_add(&area, BUTTON1_PRESSED, mouse_bevent_current);
@@ -3322,10 +3322,10 @@ static void line_adjust()
int prompt_len = (lines) ? 0 : window_current->prompt_len;
line_index = strlen(line);
- if (strlen(line) < input->_maxx - 9 - prompt_len)
+ if (strlen(line) < getmaxx(input) - 9 - prompt_len)
line_start = 0;
else
- line_start = strlen(line) - strlen(line) % (input->_maxx - 9 - prompt_len);
+ line_start = strlen(line) - strlen(line) % (getmaxx(input) - 9 - prompt_len);
}
/*
@@ -4846,10 +4846,10 @@ static void ui_ncurses_loop()
redraw_prompt:
- if (line_index - line_start > input->_maxx - 9 - window_current->prompt_len)
- line_start += input->_maxx - 19 - window_current->prompt_len;
+ if (line_index - line_start > getmaxx(input) - 9 - window_current->prompt_len)
+ line_start += getmaxx(input) - 19 - window_current->prompt_len;
if (line_index - line_start < 10) {
- line_start -= input->_maxx - 19 - window_current->prompt_len;
+ line_start -= getmaxx(input) - 19 - window_current->prompt_len;
if (line_start < 0)
line_start = 0;
}
@@ -4876,7 +4876,7 @@ redraw_prompt:
if (config_aspell == 1)
spellcheck(p, aspell_line);
- for (j = 0; j + line_start < strlen(p) && j < input->_maxx + 1; j++) {
+ for (j = 0; j + line_start < strlen(p) && j < getmaxx(input) + 1; j++) {
if (aspell_line[line_start + j] == ASPELLBADCHAR) /* jesli błędny to wyświetlamy podkreślony */
print_char_underlined(input, i, j, p[line_start + j]);
@@ -4884,7 +4884,7 @@ redraw_prompt:
print_char(input, i, j, p[j + line_start]);
}
#else
- for (j = 0; j + line_start < strlen((char*) p) && j < input->_maxx + 1; j++)
+ for (j = 0; j + line_start < strlen((char*) p) && j < getmaxx(input) + 1; j++)
print_char(input, i, j, p[j + line_start]);
#endif
}
@@ -4902,7 +4902,7 @@ redraw_prompt:
if (config_aspell == 1)
spellcheck(line, aspell_line);
- for (i = 0; i < input->_maxx + 1 - window_current->prompt_len && i < strlen(line) - line_start; i++) {
+ for (i = 0; i < getmaxx(input) + 1 - window_current->prompt_len && i < strlen(line) - line_start; i++) {
if (aspell_line[line_start + i] == ASPELLBADCHAR) /* jesli błędny to wyświetlamy podkreślony */
print_char_underlined(input, 0, i + window_current->prompt_len, line[line_start + i]);
@@ -4910,15 +4910,15 @@ redraw_prompt:
print_char(input, 0, i + window_current->prompt_len, line[line_start + i]);
}
#else
- for (i = 0; i < input->_maxx + 1 - window_current->prompt_len && i < strlen(line) - line_start; i++)
+ for (i = 0; i < getmaxx(input) + 1 - window_current->prompt_len && i < strlen(line) - line_start; i++)
print_char(input, 0, i + window_current->prompt_len, line[line_start + i]);
#endif
wattrset(input, color_pair(COLOR_BLACK, 1, COLOR_BLACK));
if (line_start > 0)
mvwaddch(input, 0, window_current->prompt_len, '<');
- if (strlen(line) - line_start > input->_maxx + 1 - window_current->prompt_len)
- mvwaddch(input, 0, input->_maxx, '>');
+ if (strlen(line) - line_start > getmaxx(input) + 1 - window_current->prompt_len)
+ mvwaddch(input, 0, getmaxx(input), '>');
wattrset(input, color_pair(COLOR_WHITE, 0, COLOR_BLACK));
wmove(input, 0, line_index - line_start + window_current->prompt_len);
}
@@ -5856,11 +5856,11 @@ static int ui_ncurses_event(const char *
array_free(argv);
- if (w->left + w->width > stdscr->_maxx + 1)
- w->left = stdscr->_maxx + 1 - w->width;
+ if (w->left + w->width > getmaxx(stdscr) + 1)
+ w->left = getmaxx(stdscr) + 1 - w->width;
- if (w->top + w->height > stdscr->_maxy + 1)
- w->top = stdscr->_maxy + 1 - w->height;
+ if (w->top + w->height > getmaxy(stdscr) + 1)
+ w->top = getmaxy(stdscr) + 1 - w->height;
if (w->floating)
mvwin(w->window, w->top, w->left);
@@ -6111,12 +6111,12 @@ void header_statusbar_resize(const char
if (!header) {
struct mouse_area_t a;
- header = newwin(config_header_size, stdscr->_maxx + 1, 0, 0);
+ header = newwin(config_header_size, getmaxx(stdscr) + 1, 0, 0);
a.name = "header";
a.start.x = 0;
a.start.y = 0;
- a.size.x = stdscr->_maxx + 1;
+ a.size.x = getmaxx(stdscr) + 1;
a.size.y = config_header_size;
a.bevents = NULL;
@@ -6124,8 +6124,8 @@ void header_statusbar_resize(const char
mouse_bevent_add(&a, BUTTON1_DOUBLE_CLICKED, mouse_bevent_header);
mouse_area_add(&a);
} else {
- wresize(header, config_header_size, stdscr->_maxx + 1);
- mouse_area_resize("header", config_header_size, stdscr->_maxx + 1);
+ wresize(header, config_header_size, getmaxx(stdscr) + 1);
+ mouse_area_resize("header", config_header_size, getmaxx(stdscr) + 1);
}
update_header(0);
@@ -6139,10 +6139,10 @@ void header_statusbar_resize(const char
window_resize();
- wresize(status, config_statusbar_size, stdscr->_maxx + 1);
- mvwin(status, stdscr->_maxy + 1 - input_size - config_statusbar_size, 0);
- mouse_area_resize("status", config_statusbar_size, stdscr->_maxx + 1);
- mouse_area_move("status", stdscr->_maxy + 1 - input_size - config_statusbar_size, 0);
+ wresize(status, config_statusbar_size, getmaxx(stdscr) + 1);
+ mvwin(status, getmaxy(stdscr) + 1 - input_size - config_statusbar_size, 0);
+ mouse_area_resize("status", config_statusbar_size, getmaxx(stdscr) + 1);
+ mouse_area_move("status", getmaxy(stdscr) + 1 - input_size - config_statusbar_size, 0);
update_statusbar(0);