diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-09-29 17:39:48 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-09-29 17:39:48 +0200 |
| commit | 3a3a3373c36b5af6208ee5fdfe25e64b5766b75a (patch) | |
| tree | 619edfb91b22fe9e604b115b6f88616e942709f9 /nxcompshad/src/X11.cpp | |
| parent | 796c8e421fd9df658fd5b324fcaa5182566e6905 (diff) | |
| parent | 085f8a4f672ed3e167bdd7791835f7ab2bebb723 (diff) | |
| download | nx-libs-3a3a3373c36b5af6208ee5fdfe25e64b5766b75a.tar.gz nx-libs-3a3a3373c36b5af6208ee5fdfe25e64b5766b75a.tar.bz2 nx-libs-3a3a3373c36b5af6208ee5fdfe25e64b5766b75a.zip | |
Merge branch 'uli42-pr/various2' into 3.6.x
Attributes GH PR #827: https://github.com/ArcticaProject/nx-libs/pull/827
Diffstat (limited to 'nxcompshad/src/X11.cpp')
| -rw-r--r-- | nxcompshad/src/X11.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nxcompshad/src/X11.cpp b/nxcompshad/src/X11.cpp index 7a84b7340..9ad43101f 100644 --- a/nxcompshad/src/X11.cpp +++ b/nxcompshad/src/X11.cpp @@ -236,7 +236,7 @@ char *Poller::getRect(XRectangle r) else { image_ -> width = r.width; - image_ -> height = r.height; + image_ -> height = r.height; image_ -> bytes_per_line = ROUNDUP((image_ -> bits_per_pixel * image_ -> width), image_ -> bitmap_pad); @@ -1155,11 +1155,11 @@ SendKeycode: if (XKeysymToKeycode(event -> xkey.display, XK_A) != keycode) { KeySym keysym = XKeycodeToKeysym(event -> xkey.display, event -> xkey.keycode, 0); - + if (keysym == XK_Mode_switch || keysym == XK_ISO_Level3_Shift) { logUser("Poller::handleKeyboardEvent: keysym [%x].\n", (unsigned int)keysym); - + if (XKeycodeToKeysym(display_, 113, 0) == XK_ISO_Level3_Shift || (XKeycodeToKeysym(display_, 124, 0) == XK_ISO_Level3_Shift)) { @@ -1169,7 +1169,7 @@ SendKeycode: { event -> xkey.keycode = XKeysymToKeycode(display_, XK_Mode_switch); } - + logUser("Poller::handleKeyboardEvent: keycode translated to [%x].\n", (unsigned int)event -> xkey.keycode); } else @@ -1503,7 +1503,7 @@ void Poller::updateDamagedAreas(void) int i; int y; - + for (i = 0; i < lastUpdatedRegion_ -> numRects; i++) { boxPtr = lastUpdatedRegion_ -> rects + i; @@ -1515,7 +1515,7 @@ void Poller::updateDamagedAreas(void) image_ -> bytes_per_line = ROUNDUP((image_ -> bits_per_pixel * image_ -> width), image_ -> bitmap_pad); - + if (XShmGetImage(display_, DefaultRootWindow(display_), image_, boxPtr -> x1, boxPtr -> y1, AllPlanes) == 0) { @@ -1554,7 +1554,7 @@ void Poller::updateDamagedAreas(void) { update(image_ -> data + y * image_ -> bytes_per_line, rectangle); - rectangle.y++; + rectangle.y++; } if (shmExtension_ != 1) |