xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src: Make code more readable, assert function calls that shouldn't fail

Browse Source 
Should help clarify what the issue is in #1972.
This commit is contained in:
Frank LENORMAND 2018-03-31 15:00:19 +03:00
parent fab3dc642a
commit e06d048d2f
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/ncurses_ui.cc
View File

@ -475,39 +475,39 @@ void NCursesUI::check_resize(bool force)
resize_pending = 0; resize_pending = 0;
const int fd = open("/dev/tty", O_RDWR); const int fd = open("/dev/tty", O_RDWR);
auto close_fd = on_scope_end([fd]{ close(fd); }); auto close_fd = on_scope_end([fd]{ ::close(fd); });
winsize ws; winsize ws;
if (ioctl(fd, TIOCGWINSZ, (void*)&ws) == 0)
{
const bool info = (bool)m_info;
const bool menu = (bool)m_menu;
if (m_window) delwin(m_window);
if (info) m_info.destroy();
if (menu) m_menu.destroy();
resize_term(ws.ws_row, ws.ws_col); kak_assert(fd > -1);
if (::ioctl(fd, TIOCGWINSZ, &ws) != 0)
m_window = (NCursesWin*)newpad(ws.ws_row, ws.ws_col);
intrflush(m_window, false);
keypad(m_window, true);
meta(m_window, true);
m_dimensions = DisplayCoord{ws.ws_row-1, ws.ws_col};
if (char* csr = tigetstr((char*)"csr"))
putp(tparm(csr, 0, ws.ws_row));
if (menu)
{
auto items = std::move(m_menu.items);
menu_show(items, m_menu.anchor, m_menu.fg, m_menu.bg, m_menu.style);
}
if (info)
info_show(m_info.title, m_info.content, m_info.anchor, m_info.face, m_info.style);
}
else
kak_assert(false); kak_assert(false);
const bool info = (bool)m_info;
const bool menu = (bool)m_menu;
if (m_window) delwin(m_window);
if (info) m_info.destroy();
if (menu) m_menu.destroy();
resize_term(ws.ws_row, ws.ws_col);
m_window = (NCursesWin*)newpad(ws.ws_row, ws.ws_col);
intrflush(m_window, false);
keypad(m_window, true);
meta(m_window, true);
m_dimensions = DisplayCoord{ws.ws_row-1, ws.ws_col};
if (char* csr = tigetstr((char*)"csr"))
putp(tparm(csr, 0, ws.ws_row));
if (menu)
{
auto items = std::move(m_menu.items);
menu_show(items, m_menu.anchor, m_menu.fg, m_menu.bg, m_menu.style);
}
if (info)
info_show(m_info.title, m_info.content, m_info.anchor, m_info.face, m_info.style);
ungetch(KEY_RESIZE); ungetch(KEY_RESIZE);
clearok(curscr, true); clearok(curscr, true);
werase(curscr); werase(curscr);