summaryrefslogtreecommitdiffstats
path: root/x11vnc/screen.c
diff options
context:
space:
mode:
authorrunge <runge@karlrunge.com>2010-12-29 10:05:52 -0500
committerrunge <runge@karlrunge.com>2010-12-29 10:05:52 -0500
commit596331a5c3124f080cdcbb400c188c095048ef35 (patch)
tree66eb904b6c0181703d8f3c9ec81352a970d52601 /x11vnc/screen.c
parent0c03b989407f9e5ea66b403011baaaad09fcd536 (diff)
downloadlibtdevnc-596331a5c3124f080cdcbb400c188c095048ef35.tar.gz
libtdevnc-596331a5c3124f080cdcbb400c188c095048ef35.zip
x11vnc: Use opengl to read screen on macosx. non-deprecated macosx interfaces for input injection.
Diffstat (limited to 'x11vnc/screen.c')
-rw-r--r--x11vnc/screen.c10
1 files changed, 9 insertions, 1 deletions
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",