citrun

commit 11cdb5eb60b78f4a3e6b3a6a33ac06a9eeb71cc3
parent 5e3bb871b406f7c54a5b9731875e7035055a282a
Author: Kyle Milz <kyle@getaddrinfo.net>
Date:   Sun, 20 Mar 2016 16:08:46 -0600

viewer: uncomment socket listening code

Diffstat:
M
viewer/main.cxx
 | 
23
+++++++++++++++--------

1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/viewer/main.cxx b/viewer/main.cxx
@@ -12,7 +12,6 @@
 #include "demo-font.h"
 
 
-
 class window {
 public:
 	window(int argc, char *argv[]);
@@ -23,6 +22,12 @@ public:
 	static void timed_step(int);
 	static void next_frame(View *);
 
+	static FT_Library ft_library;
+	static FT_Face ft_face;
+
+	static demo_font_t *font;
+	static demo_buffer_t *buffer;
+
 	static View *static_vu;
 	static af_unix socket;
 	static std::vector<drawable*> drawables;
@@ -35,14 +40,18 @@ private:
 	static void motion_func(int, int);
 
 	demo_glstate_t *st;
-	demo_buffer_t *buffer;
-	demo_font_t *font;
 };
 
 std::vector<drawable*> window::drawables;
 af_unix window::socket;
 View *window::static_vu;
 
+FT_Library window::ft_library;
+FT_Face window::ft_face;
+
+demo_font_t *window::font;
+demo_buffer_t *window::buffer;
+
 window::window(int argc, char *argv[])
 {
 	glutInit(&argc, argv);
@@ -64,18 +73,18 @@ window::window(int argc, char *argv[])
 
 	st = demo_glstate_create();
 	buffer = demo_buffer_create();
-	//vu = demo_view_create(st);
+
 	static_vu = new View(st, buffer);
 	static_vu->print_help();
 
-	FT_Library ft_library;
 	FT_Init_FreeType(&ft_library);
 
-	FT_Face ft_face = NULL;
+	ft_face = NULL;
 	FT_New_Face(ft_library, "DejaVuSansMono.ttf", /* face_index */ 0, &ft_face);
 
 	font = demo_font_create(ft_face, demo_glstate_get_atlas(st));
 
+
 	glyphy_point_t top_left = { 0, 0 };
 	demo_buffer_move_to(buffer, &top_left);
 	demo_buffer_add_text(buffer, default_text, font, 1);
@@ -141,14 +150,12 @@ current_time (void)
 void
 window::next_frame(View *vu)
 {
-	/*
 	af_unix *temp_socket = window::socket.accept();
 	if (temp_socket)
 		window::drawables.push_back(new RuntimeClient(temp_socket, buffer, font));
 
 	for (auto &i : window::drawables)
 		i->idle();
-	*/
 
 	glutPostRedisplay ();
 }