diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-08-22 15:35:49 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-08-22 15:35:49 +0200 |
| commit | 9f4eb6a0bbfc2035bb096d5cbcdf27afb50363d7 (patch) | |
| tree | 455941dd589ae349e522ec9d3883b8e0f454d4d0 /nx-X11/programs/Xserver/hw/nxagent/Window.c | |
| parent | c0bef5e3962e7f2f056ff7c4b0798099ac867293 (diff) | |
| parent | 129d1cc910227717ec113a9008693afb741047ab (diff) | |
| download | nx-libs-9f4eb6a0bbfc2035bb096d5cbcdf27afb50363d7.tar.gz nx-libs-9f4eb6a0bbfc2035bb096d5cbcdf27afb50363d7.tar.bz2 nx-libs-9f4eb6a0bbfc2035bb096d5cbcdf27afb50363d7.zip | |
Merge branch 'uli42-pr/refactor_defaulteventmask' into 3.6.x
Attributes GH PR #692: https://github.com/ArcticaProject/nx-libs/pull/692
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Window.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Window.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index b12fe76de..5373d4889 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -345,10 +345,7 @@ FIXME: We need to set save under on the real display? if (mask & CWEventMask) { - /* Assume that the mask fits in int... broken on Big Endian 64bit systems. */ - Mask tmp_mask = attributes.event_mask; - nxagentGetEventMask(pWin, &tmp_mask); - attributes.event_mask = (int)tmp_mask; + attributes.event_mask = nxagentGetEventMask(pWin); } #ifdef WARNING else @@ -2970,10 +2967,7 @@ FIXME: Do we need to set save unders attribute here? if (mask & CWEventMask) { - /* Assume that the mask fits in int... broken on Big Endian 64bit systems. */ - Mask tmp_mask = attributes.event_mask; - nxagentGetEventMask(pWin, &tmp_mask); - attributes.event_mask = (int)tmp_mask; + attributes.event_mask = nxagentGetEventMask(pWin); } #ifdef WARNING else @@ -3446,10 +3440,7 @@ void nxagentSetTopLevelEventMask(pWin) if (nxagentOption(Rootless) && nxagentWindowTopLevel(pWin)) { - /* Assume that the mask fits in int... broken on Big Endian 64bit systems. */ - Mask tmp_mask = attributes.event_mask = NoEventMask; - nxagentGetEventMask(pWin, &tmp_mask); - attributes.event_mask = (int)tmp_mask; + attributes.event_mask = nxagentGetEventMask(pWin); XChangeWindowAttributes(nxagentDisplay, nxagentWindow(pWin), mask, &attributes); } |