aboutsummaryrefslogtreecommitdiff
path: root/nxcompshad/Core.cpp
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2011-11-13 09:53:12 +0100
committerReinhard Tartler <siretart@tauware.de>2011-11-13 09:53:12 +0100
commit9f7021392b921ad44163024ed8ca538195d3ac9c (patch)
tree82329db43a3a07d1843a84f7c187131c12592079 /nxcompshad/Core.cpp
parentc7dc0c3cdec2e0f2fa2d52f8d446d0e83623a8a0 (diff)
downloadnx-libs-9f7021392b921ad44163024ed8ca538195d3ac9c.tar.gz
nx-libs-9f7021392b921ad44163024ed8ca538195d3ac9c.tar.bz2
nx-libs-9f7021392b921ad44163024ed8ca538195d3ac9c.zip
Imported nxcompshad-3.2.0-3.tar.gznxcompshad/3.2.0-3
Summary: Imported nxcompshad-3.2.0-3.tar.gz Keywords: Imported nxcompshad-3.2.0-3.tar.gz into Git repository
Diffstat (limited to 'nxcompshad/Core.cpp')
-rw-r--r--nxcompshad/Core.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/nxcompshad/Core.cpp b/nxcompshad/Core.cpp
index 351fa8f45..44327cd3f 100644
--- a/nxcompshad/Core.cpp
+++ b/nxcompshad/Core.cpp
@@ -538,6 +538,15 @@ void CorePoller::update(char *src, XRectangle r)
for (unsigned int i = 0; i < r.height; i++)
{
+ if(((r.x * bpp_ + r.y * bpl_) + bpl) > (bpl_ * height_))
+ {
+ //
+ // Out of bounds. Maybe a resize is going on.
+ //
+
+ continue;
+ }
+
memcpy(dst, src, bpl);
src += bpl;
@@ -574,6 +583,13 @@ void CorePoller::handleEvent(Display *display, XEvent *event)
}
}
+void CorePoller::handleWebKeyEvent(KeySym keysym, Bool isKeyPress)
+{
+ logTrace("CorePoller::handleWebKeyEvent");
+
+ handleWebKeyboardEvent(keysym, isKeyPress);
+}
+
void CorePoller::handleInput()
{
while (input_ -> checkIfEvent())