X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=xerebus%2Fsrc%2Fmain.c;h=0eda94d4569bf92c0e3ea6ff0bf1a80f45f78c06;hb=7572b3ea92bec83c2a256eb1d6c1b0b77233c6b9;hp=7f288abdabf9074adc5334c4b0f2c128bcdace58;hpb=29ae0aac16008cd44d73f2ac8320504b907be607;p=erebus2020

diff --git a/xerebus/src/main.c b/xerebus/src/main.c
index 7f288ab..0eda94d 100644
--- a/xerebus/src/main.c
+++ b/xerebus/src/main.c
@@ -1,18 +1,36 @@
 #include <stdio.h>
+#include <string.h>
+#include <errno.h>
 #include "opengl.h"
-#include "miniglut.h"
+#include <GL/freeglut.h>
 #include "erebus.h"
 #include "sdr.h"
 
+#ifdef __unix__
+#include <unistd.h>
+#include <sys/select.h>
+#include <X11/Xlib.h>
+#include <GL/glx.h>
+
+static Display *dpy;
+static int pfd[2];
+#endif
+
+#define post_redisplay()  do { glutPostRedisplay(); redisp_pending = 1; } while(0)
+
+static void jobdone(unsigned int job, struct erb_rect *rect, void *cls);
 static void display(void);
 static void reshape(int x, int y);
 static void keyb(unsigned char key, int x, int y);
 static void mouse(int bn, int st, int x, int y);
 static void motion(int x, int y);
 
+static void dummy_idle(void) {}
+
 static int win_width, win_height;
 static float win_aspect;
-static int reshape_pending;
+static int reshape_pending, redisp_pending;
+static int quit;
 
 static struct erb_rend *erb;
 
@@ -48,12 +66,19 @@ int main(int argc, char **argv)
 {
 	unsigned int vs, ps;
 
+#ifdef __unix__
+	int xfd, maxfd;
+
+	pipe(pfd);
+#endif
+
 	glutInit(&argc, argv);
 	glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE);
 	glutInitWindowSize(1280, 800);
 	glutCreateWindow("X erebus");
 
 	glutDisplayFunc(display);
+	glutIdleFunc(dummy_idle);	/* we want to be blocking in select, not in glutMainLoopEvent */
 	glutReshapeFunc(reshape);
 	glutKeyboardFunc(keyb);
 	glutMouseFunc(mouse);
@@ -73,18 +98,58 @@ int main(int argc, char **argv)
 	if(!(erb = erb_create())) {
 		return 1;
 	}
-	reshape_pending = 1;
+	erb_set_done_callback(erb, jobdone, 0);
+
+	reshape_pending = redisp_pending = 1;
 
 	glGenTextures(1, &fbtex);
 	glBindTexture(GL_TEXTURE_2D, fbtex);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 
-	glutMainLoop();
+#ifdef __unix__
+	dpy = glXGetCurrentDisplay();
+	xfd = ConnectionNumber(dpy);
+	maxfd = xfd > pfd[0] ? xfd : pfd[0];
+
+	while(!quit) {
+		struct timeval tv = {0, 0};
+		fd_set rdset;
+
+		FD_ZERO(&rdset);
+		FD_SET(xfd, &rdset);
+		FD_SET(pfd[0], &rdset);
+
+		if(select(maxfd + 1, &rdset, 0, 0, redisp_pending ? &tv : 0) == -1) {
+			if(errno == EINTR) continue;
+			fprintf(stderr, "select failed: %s\n", strerror(errno));
+			break;
+		}
+
+		if(FD_ISSET(pfd[0], &rdset)) {
+			struct erb_rect rect;
+			read(pfd[0], &rect, sizeof rect);
+			glTexSubImage2D(GL_TEXTURE_2D, 0, rect.x, rect.y, rect.w, rect.h,
+					GL_RGBA, GL_FLOAT, erb_getframe(erb) + (rect.y * win_width + rect.x) * 4);
+			post_redisplay();
+		}
+
+		if(FD_ISSET(xfd, &rdset) || redisp_pending) {
+			redisp_pending = 0;
+			glutMainLoopEvent();
+		}
+	}
+#endif	/* __unix__ */
+
 	erb_destroy(erb);
 	return 0;
 }
 
+static void jobdone(unsigned int job, struct erb_rect *rect, void *cls)
+{
+	write(pfd[1], rect, sizeof *rect);
+}
+
 static void display(void)
 {
 	if(reshape_pending) {
@@ -93,14 +158,11 @@ static void display(void)
 		erb_allocframe(erb, win_width, win_height);
 		erb_begin(erb);
 
+		glPixelStorei(GL_UNPACK_ROW_LENGTH, win_width);
+
 		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, win_width, win_height, 0,
 				GL_RGBA, GL_FLOAT, erb_getframe(erb));
-	} else {
-		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, win_width, win_height,
-				GL_RGBA, GL_FLOAT, erb_getframe(erb));
 	}
-	/* TODO: continue with getting notified when a block is done rendering */
-
 
 	glClear(GL_COLOR_BUFFER_BIT);
 
@@ -151,15 +213,16 @@ static void reshape(int x, int y)
 	glOrtho(0, x, y, 0, -1, 1);
 
 	reshape_pending = 1;
-	glutPostRedisplay();
+	post_redisplay();
 }
 
 static void keyb(unsigned char key, int x, int y)
 {
 	if(key == 27) {
 		glutExit();
+		quit = 1;
 	}
-	glutPostRedisplay();
+	post_redisplay();
 }
 
 static void mouse(int bn, int st, int x, int y)
@@ -175,18 +238,24 @@ static void mouse(int bn, int st, int x, int y)
 			drag_x = x;
 			drag_y = y;
 		} else {
-			drag = 0;
+			if(drag) {
+				drag = 0;
 
-			rect[0] = x < drag_x ? x : drag_x;
-			rect[1] = y < drag_y ? y : drag_y;
-			rect[2] = abs(x - drag_x);
-			rect[3] = abs(y - drag_y);
+				rect[0] = x < drag_x ? x : drag_x;
+				rect[1] = y < drag_y ? y : drag_y;
+				rect[2] = abs(x - drag_x);
+				rect[3] = abs(y - drag_y);
 
-			erb_queue_block(erb, rect[0], rect[1], rect[2], rect[3]);
-			printf("rect: %d,%d %dx%d\n", rect[0], rect[1], rect[2], rect[3]);
+				erb_queue_block(erb, 0, rect[0], rect[1], rect[2], rect[3]);
+				printf("rect: %d,%d %dx%d\n", rect[0], rect[1], rect[2], rect[3]);
+			}
 		}
 
-		glutPostRedisplay();
+		post_redisplay();
+	}
+	if(bn == 2 && st == GLUT_DOWN) {
+		drag = 0;
+		post_redisplay();
 	}
 }
 
@@ -195,5 +264,5 @@ static void motion(int x, int y)
 	mouse_x = x;
 	mouse_y = y;
 
-	glutPostRedisplay();
+	post_redisplay();
 }