Attachment 158509 Details for Bug 86158 – Proposed patch

[patch] Proposed patch

vnc-defer_update.patch (text/plain), 2.46 KB, created by Adam Tkac on 2007-07-04 09:35:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Tkac

Created: 2007-07-04 09:35:03 UTC

Size: 2.46 KB

patch

obsolete

>--- vnc-4.0-unixsrc/xc/programs/Xserver/vnc/XserverDesktop.h.defer_update	2007-03-28 19:04:20.000000000 +0200
>+++ vnc-4.0-unixsrc/xc/programs/Xserver/vnc/XserverDesktop.h	2007-03-28 19:04:47.000000000 +0200
>@@ -85,6 +85,7 @@
>   void setColourMapEntries(int firstColour, int nColours);
>   static CARD32 deferredUpdateTimerCallback(OsTimerPtr timer, CARD32 now,
>                                             pointer arg);
>+  void deferUpdate();
>   ScreenPtr pScreen;
>   OsTimerPtr deferredUpdateTimer, dummyTimer;
>   rfb::VNCServerST* server;
>--- vnc-4.0-unixsrc/xc/programs/Xserver/vnc/XserverDesktop.cc.defer_update	2007-03-28 19:05:17.000000000 +0200
>+++ vnc-4.0-unixsrc/xc/programs/Xserver/vnc/XserverDesktop.cc	2007-03-28 21:21:21.000000000 +0200
>@@ -414,6 +414,20 @@
>   return 0;
> }
> 
>+void XserverDesktop::deferUpdate()
>+{
>+  if (deferUpdateTime != 0) {
>+    if (!deferredUpdateTimerSet || alwaysSetDeferUpdateTimer) {
>+      deferredUpdateTimerSet = true;
>+      deferredUpdateTimer = TimerSet(deferredUpdateTimer, 0,
>+                                     deferUpdateTime,
>+                                     deferredUpdateTimerCallback, this);
>+    }
>+  } else {
>+    server->tryUpdate();
>+  }
>+}
>+
> void XserverDesktop::add_changed(RegionPtr reg)
> {
>   if (ignoreHooks_) return;
>@@ -424,12 +438,7 @@
>                                      REGION_NUM_RECTS(reg),
>                                      (ShortRect*)REGION_RECTS(reg));
>     server->add_changed(rfbReg);
>-    if (!deferredUpdateTimerSet || alwaysSetDeferUpdateTimer) {
>-      deferredUpdateTimer = TimerSet(deferredUpdateTimer, 0,
>-                                     deferUpdateTime,
>-                                     deferredUpdateTimerCallback, this);
>-      deferredUpdateTimerSet = true;
>-    }
>+    deferUpdate();
>   } catch (rdr::Exception& e) {
>     vlog.error("XserverDesktop::add_changed: %s",e.str());
>   }
>@@ -445,12 +454,7 @@
>                                      REGION_NUM_RECTS(dst),
>                                      (ShortRect*)REGION_RECTS(dst));
>     server->add_copied(rfbReg, rfb::Point(dx, dy));
>-    if (!deferredUpdateTimerSet || alwaysSetDeferUpdateTimer) {
>-      deferredUpdateTimer = TimerSet(deferredUpdateTimer, 0,
>-                                     deferUpdateTime,
>-                                     deferredUpdateTimerCallback, this);
>-      deferredUpdateTimerSet = true;
>-    }
>+    deferUpdate();
>   } catch (rdr::Exception& e) {
>     vlog.error("XserverDesktop::add_copied: %s",e.str());
>   }

Actions: View | Diff

Attachments on bug 86158: 90640 | 158509