From b92788dee979855f753e030cb8be8d19c22d00df Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Wed, 11 May 2016 15:20:01 -0400 Subject: split global window management stuff out into its own file also rename a few things for clarity --- src/term.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/term.c') diff --git a/src/term.c b/src/term.c index 49d214f..5118687 100644 --- a/src/term.c +++ b/src/term.c @@ -9,7 +9,7 @@ #include "pty-unix.h" #include "window-xlib.h" -RunesTerm *runes_term_new(int argc, char *argv[], RunesWindowBackendGlobal *wg) +RunesTerm *runes_term_new(int argc, char *argv[], RunesWindowBackend *wb) { RunesTerm *t; int width, height; @@ -18,16 +18,16 @@ RunesTerm *runes_term_new(int argc, char *argv[], RunesWindowBackendGlobal *wg) t->config = runes_config_new(argc, argv); t->display = runes_display_new(t->config->font_name); - t->w = runes_window_backend_new(wg); - t->pty = runes_pty_backend_new(); + t->w = runes_window_new(wb); + t->pty = runes_pty_new(); t->scr = vt100_screen_new(t->config->default_cols, t->config->default_rows); vt100_screen_set_scrollback_length(t->scr, t->config->scrollback_length); - runes_window_backend_create_window(t, argc, argv); - runes_pty_backend_spawn_subprocess(t); + runes_window_create_window(t, argc, argv); + runes_pty_spawn_subprocess(t); runes_display_set_context(t, t->w->backend_cr); - runes_window_backend_get_size(t, &width, &height); + runes_window_get_size(t, &width, &height); runes_term_set_window_size(t, width, height); return t; @@ -36,15 +36,15 @@ RunesTerm *runes_term_new(int argc, char *argv[], RunesWindowBackendGlobal *wg) void runes_term_register_with_loop(RunesTerm *t, RunesLoop *loop) { t->loop = loop; - runes_window_backend_init_loop(t, loop); - runes_pty_backend_init_loop(t, loop); + runes_window_init_loop(t, loop); + runes_pty_init_loop(t, loop); } void runes_term_set_window_size(RunesTerm *t, int xpixel, int ypixel) { int row = ypixel / t->display->fonty, col = xpixel / t->display->fontx; - runes_pty_backend_set_window_size(t, row, col, xpixel, ypixel); + runes_pty_set_window_size(t, row, col, xpixel, ypixel); vt100_screen_set_window_size(t->scr, row, col); } @@ -64,8 +64,8 @@ void runes_term_refcnt_dec(RunesTerm *t) void runes_term_delete(RunesTerm *t) { vt100_screen_delete(t->scr); - runes_pty_backend_delete(t->pty); - runes_window_backend_delete(t->w); + runes_pty_delete(t->pty); + runes_window_delete(t->w); runes_display_delete(t->display); runes_config_delete(t->config); -- cgit v1.2.3-54-g00ecf