aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2014-04-15 00:01:16 -0400
committerJesse Luehrs <doy@tozt.net>2014-04-15 00:01:16 -0400
commit15a00e8d873bdbee0c00e8cfd4926e1e7594fc56 (patch)
treeb0be2be841c7dfeb259a0dfe9c359074c784a95b
parentc607eaf5aab33b8bddb8391efb4eb5729634da28 (diff)
downloadrunes-15a00e8d873bdbee0c00e8cfd4926e1e7594fc56.tar.gz
runes-15a00e8d873bdbee0c00e8cfd4926e1e7594fc56.zip
rename these for consistency
-rw-r--r--pty-unix.c24
-rw-r--r--pty-unix.h2
-rw-r--r--term.c4
-rw-r--r--window-xlib.c2
-rw-r--r--window-xlib.h2
5 files changed, 17 insertions, 17 deletions
diff --git a/pty-unix.c b/pty-unix.c
index df53e61..25540d0 100644
--- a/pty-unix.c
+++ b/pty-unix.c
@@ -53,18 +53,7 @@ void runes_pty_backend_init(RunesTerm *t)
}
}
-void runes_pty_backend_set_window_size(RunesTerm *t)
-{
- struct winsize size;
-
- size.ws_row = t->rows;
- size.ws_col = t->cols;
- size.ws_xpixel = t->xpixel;
- size.ws_ypixel = t->ypixel;
- ioctl(t->pty.master, TIOCSWINSZ, &size);
-}
-
-void runes_pty_backend_loop_init(RunesTerm *t)
+void runes_pty_backend_post_init(RunesTerm *t)
{
void *data;
@@ -78,6 +67,17 @@ void runes_pty_backend_loop_init(RunesTerm *t)
t->loop, data, runes_pty_backend_read, runes_pty_backend_got_data);
}
+void runes_pty_backend_set_window_size(RunesTerm *t)
+{
+ struct winsize size;
+
+ size.ws_row = t->rows;
+ size.ws_col = t->cols;
+ size.ws_xpixel = t->xpixel;
+ size.ws_ypixel = t->ypixel;
+ ioctl(t->pty.master, TIOCSWINSZ, &size);
+}
+
void runes_pty_backend_write(RunesTerm *t, char *buf, size_t len)
{
write(t->pty.master, buf, len);
diff --git a/pty-unix.h b/pty-unix.h
index 175baa7..b431790 100644
--- a/pty-unix.h
+++ b/pty-unix.h
@@ -16,8 +16,8 @@ typedef struct {
} RunesPtyLoopData;
void runes_pty_backend_init(RunesTerm *t);
+void runes_pty_backend_post_init(RunesTerm *t);
void runes_pty_backend_set_window_size(RunesTerm *t);
-void runes_pty_backend_loop_init(RunesTerm *t);
void runes_pty_backend_write(RunesTerm *t, char *buf, size_t len);
void runes_pty_backend_request_close(RunesTerm *t);
void runes_pty_backend_cleanup(RunesTerm *t);
diff --git a/term.c b/term.c
index b1b9276..08618fd 100644
--- a/term.c
+++ b/term.c
@@ -14,8 +14,8 @@ void runes_term_init(RunesTerm *t, int argc, char *argv[])
runes_display_init(t);
t->loop = uv_default_loop();
- runes_pty_backend_loop_init(t);
- runes_window_backend_loop_init(t, argc, argv);
+ runes_pty_backend_post_init(t);
+ runes_window_backend_post_init(t, argc, argv);
runes_display_post_init(t);
}
diff --git a/window-xlib.c b/window-xlib.c
index 4bcb45b..a8823f6 100644
--- a/window-xlib.c
+++ b/window-xlib.c
@@ -107,7 +107,7 @@ void runes_window_backend_init(RunesTerm *t)
XDefineCursor(w->dpy, w->w, cursor);
}
-void runes_window_backend_loop_init(RunesTerm *t, int argc, char *argv[])
+void runes_window_backend_post_init(RunesTerm *t, int argc, char *argv[])
{
RunesWindowBackend *w = &t->w;
unsigned long mask;
diff --git a/window-xlib.h b/window-xlib.h
index 222a68c..4537901 100644
--- a/window-xlib.h
+++ b/window-xlib.h
@@ -30,7 +30,7 @@ typedef struct {
} RunesXlibLoopData;
void runes_window_backend_init(RunesTerm *t);
-void runes_window_backend_loop_init(RunesTerm *t, int argc, char *argv[]);
+void runes_window_backend_post_init(RunesTerm *t, int argc, char *argv[]);
cairo_surface_t *runes_window_backend_surface_create(RunesTerm *t);
void runes_window_backend_request_flush(RunesTerm *t);
void runes_window_backend_get_size(RunesTerm *t, int *xpixel, int *ypixel);