From 596331a5c3124f080cdcbb400c188c095048ef35 Mon Sep 17 00:00:00 2001
From: runge <runge@karlrunge.com>
Date: Wed, 29 Dec 2010 10:05:52 -0500
Subject: x11vnc: Use opengl to read screen on macosx. non-deprecated macosx
 interfaces for input injection.

---
 x11vnc/screen.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'x11vnc/screen.c')

diff --git a/x11vnc/screen.c b/x11vnc/screen.c
index 067d144..d0851f6 100644
--- a/x11vnc/screen.c
+++ b/x11vnc/screen.c
@@ -1028,6 +1028,11 @@ void do_new_fb(int reset_mem) {
 		settle_clients(1);
 	}
 
+#ifdef MACOSX
+	if (macosx_console) {
+		macosxCG_fini();
+	}
+#endif
 	if (reset_mem == 1) {
 		/* reset_mem == 2 is a hack for changing users... */
 		clean_shm(0);
@@ -1694,7 +1699,7 @@ if (db) fprintf(stderr, "initialize_raw_fb reset\n");
 		raw_fb_addr = NULL;
 	}
 #endif
-	
+
 	if (raw_fb_addr || raw_fb_seek) {
 		if (raw_fb_shm) {
 			shmdt(raw_fb_addr);
@@ -3196,6 +3201,9 @@ void initialize_screen(int *argc, char **argv, XImage *fb) {
 		if (screen && http_dir) {
 			http_connections(1);
 		}
+		if (unix_sock) {
+			unix_sock_fd = listen_unix(unix_sock);
+		}
 	} else {
 		/* set set frameBuffer member below. */
 		rfbLog("rfbNewFramebuffer(0x%x, 0x%x, %d, %d, %d, %d, %d)\n",
-- 
cgit v1.2.1