summaryrefslogtreecommitdiffstats
path: root/x11vnc/scan.c
diff options
context:
space:
mode:
authorrunge <runge>2006-11-13 15:33:00 +0000
committerrunge <runge>2006-11-13 15:33:00 +0000
commit4a83f87609b9d53b2983806be58ccd02498a5cd3 (patch)
treea79c96930a97fb162edd1765adece43425f8db8a /x11vnc/scan.c
parent5f9693d4a2c511f8f2ea069373807c5f36ac1459 (diff)
downloadlibvncserver-4a83f87609b9d53b2983806be58ccd02498a5cd3.zip
libvncserver-4a83f87609b9d53b2983806be58ccd02498a5cd3.tar.gz
x11vnc: Native Mac OS X support.
Diffstat (limited to 'x11vnc/scan.c')
-rw-r--r--x11vnc/scan.c20
1 files changed, 18 insertions, 2 deletions
diff --git a/x11vnc/scan.c b/x11vnc/scan.c
index 874de6d..11e867c 100644
--- a/x11vnc/scan.c
+++ b/x11vnc/scan.c
@@ -12,6 +12,7 @@
#include "cleanup.h"
#include "unixpw.h"
#include "screen.h"
+#include "macosx.h"
/*
* routines for scanning and reading the X11 display for changes, and
@@ -2943,7 +2944,15 @@ int scan_for_updates(int count_only) {
}
if (use_xdamage) {
/* first pass collecting DAMAGE events: */
- collect_xdamage(scan_count, 0);
+#ifdef MACOSX
+ if (! dpy) {
+ macosx_event_loop();
+ collect_macosx_damage(-1, -1, -1, -1, 0);
+ } else
+#endif
+ {
+ collect_xdamage(scan_count, 0);
+ }
}
}
@@ -2967,7 +2976,14 @@ int scan_for_updates(int count_only) {
* the unchanged tiles are read in again).
*/
if (use_xdamage) {
- collect_xdamage(scan_count, 1);
+#ifdef MACOSX
+ if (! dpy) {
+ ;
+ } else
+#endif
+ {
+ collect_xdamage(scan_count, 1);
+ }
}
if (count_only) {
scan_in_progress = 0;
OpenPOWER on IntegriCloud