Browse Source

tui_main.c - rename cont_window to window_main

master
heck 2 years ago
parent
commit
4db20a7284
  1. 22
      src/tui_main.c

22
src/tui_main.c

@ -120,7 +120,7 @@ enum
}; };
Ged ged; Ged ged;
WINDOW *cont_window = NULL; WINDOW *window_main = NULL;
Tui tui; Tui tui;
void main_init(int argc, char **argv) void main_init(int argc, char **argv)
@ -274,7 +274,7 @@ void main_init(int argc, char **argv)
wtimeout(stdscr, 0); wtimeout(stdscr, 0);
tui_adjust_term_size(&tui, &cont_window); tui_adjust_term_size(&tui, &window_main);
bool grid_initialized = false; bool grid_initialized = false;
if (osolen(tui.file_name)) { if (osolen(tui.file_name)) {
@ -346,14 +346,14 @@ event_loop:;
ged_do_stuff(&ged); ged_do_stuff(&ged);
bool drew_any = false; bool drew_any = false;
if (ged_is_draw_dirty(&ged) || qnav_stack.occlusion_dirty) { if (ged_is_draw_dirty(&ged) || qnav_stack.occlusion_dirty) {
werase(cont_window); werase(window_main);
ged_draw( ged_draw(
&ged, &ged,
cont_window, window_main,
osoc(tui.file_name), osoc(tui.file_name),
tui.fancy_grid_dots, tui.fancy_grid_dots,
tui.fancy_grid_rulers); tui.fancy_grid_rulers);
wnoutrefresh(cont_window); wnoutrefresh(window_main);
drew_any = true; drew_any = true;
} }
drew_any |= qnav_draw(); // clears qnav_stack.occlusion_dirty drew_any |= qnav_draw(); // clears qnav_stack.occlusion_dirty
@ -417,17 +417,17 @@ event_loop:;
// END Case: ERR // END Case: ERR
// clang-format on // clang-format on
case KEY_RESIZE: case KEY_RESIZE:
tui_adjust_term_size(&tui, &cont_window); tui_adjust_term_size(&tui, &window_main);
qnav_adjust_term_size(); qnav_adjust_term_size();
goto event_loop; goto event_loop;
#ifndef FEAT_NOMOUSE #ifndef FEAT_NOMOUSE
case KEY_MOUSE: { case KEY_MOUSE: {
MEVENT mevent; MEVENT mevent;
if (cont_window && getmouse(&mevent) == OK) { if (window_main && getmouse(&mevent) == OK) {
int win_y, win_x; int win_y, win_x;
int win_h, win_w; int win_h, win_w;
getbegyx(cont_window, win_y, win_x); getbegyx(window_main, win_y, win_x);
getmaxyx(cont_window, win_h, win_w); getmaxyx(window_main, win_h, win_w);
int inwin_y = mevent.y - win_y; int inwin_y = mevent.y - win_y;
int inwin_x = mevent.x - win_x; int inwin_x = mevent.x - win_x;
if (inwin_y >= win_h) if (inwin_y >= win_h)
@ -758,8 +758,8 @@ event_loop:;
quit: quit:
ged_stop_all_sustained_notes(&ged); ged_stop_all_sustained_notes(&ged);
qnav_deinit(); qnav_deinit();
if (cont_window) if (window_main)
delwin(cont_window); delwin(window_main);
#ifndef FEAT_NOMOUSE #ifndef FEAT_NOMOUSE
printf("\033[?1003l\n"); // turn off console mouse events if they were active printf("\033[?1003l\n"); // turn off console mouse events if they were active
#endif #endif

Loading…
Cancel
Save