diff options
| author | runge <runge> | 2006-05-07 00:50:13 +0000 |
|---|---|---|
| committer | runge <runge> | 2006-05-07 00:50:13 +0000 |
| commit | 279f35495a122c9892198545f83e03c6fc50fa08 (patch) | |
| tree | 7ce00691a9f77432cead7a5f4ae702fc62878019 /x11vnc/xdamage.c | |
| parent | 0d734ad8967eafab1fb058280a0db04e7470e569 (diff) | |
| download | libtdevnc-279f35495a122c9892198545f83e03c6fc50fa08.tar.gz libtdevnc-279f35495a122c9892198545f83e03c6fc50fa08.zip | |
x11vnc: support for video4linux webcams & tv-tuners, -24to32 bpp option, -rawfb console.
Diffstat (limited to 'x11vnc/xdamage.c')
| -rw-r--r-- | x11vnc/xdamage.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/x11vnc/xdamage.c b/x11vnc/xdamage.c index 0c3e5d5..4c9319a 100644 --- a/x11vnc/xdamage.c +++ b/x11vnc/xdamage.c @@ -169,6 +169,8 @@ void clear_xdamage_mark_region(sraRegionPtr markregion, int flush) { sraRegionPtr tmpregion; int count = 0; + RAWFB_RET_VOID + if (! xdamage_present || ! use_xdamage) { return; } @@ -182,7 +184,7 @@ void clear_xdamage_mark_region(sraRegionPtr markregion, int flush) { X_LOCK; if (flush) { - XFlush(dpy); + XFlush_wr(dpy); } while (XCheckTypedEvent(dpy, xdamage_base_event_type+XDamageNotify, &ev)) { count++; @@ -225,6 +227,8 @@ int collect_xdamage(int scancnt, int call) { int dup_x[DUPSZ], dup_y[DUPSZ], dup_w[DUPSZ], dup_h[DUPSZ]; double tm, dt; + RAWFB_RET(0) + if (scancnt) {} /* unused vars warning: */ if (! xdamage_present || ! use_xdamage) { @@ -252,7 +256,7 @@ int collect_xdamage(int scancnt, int call) { X_LOCK; -if (0) XFlush(dpy); +if (0) XFlush_wr(dpy); if (0) XEventsQueued(dpy, QueuedAfterFlush); while (XCheckTypedEvent(dpy, xdamage_base_event_type+XDamageNotify, &ev)) { /* @@ -472,7 +476,7 @@ void initialize_xdamage(void) { void create_xdamage_if_needed(void) { - if (raw_fb && ! dpy) return; /* raw_fb hack */ + RAWFB_RET_VOID #if LIBVNCSERVER_HAVE_LIBXDAMAGE if (! xdamage) { @@ -487,14 +491,14 @@ void create_xdamage_if_needed(void) { void destroy_xdamage_if_needed(void) { - if (raw_fb && ! dpy) return; /* raw_fb hack */ + RAWFB_RET_VOID #if LIBVNCSERVER_HAVE_LIBXDAMAGE if (xdamage) { XEvent ev; X_LOCK; XDamageDestroy(dpy, xdamage); - XFlush(dpy); + XFlush_wr(dpy); if (xdamage_base_event_type) { while (XCheckTypedEvent(dpy, xdamage_base_event_type+XDamageNotify, &ev)) { |