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 /nx-X11/programs/Xserver/hw/nxagent/NXevents.c | |
| 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 'nx-X11/programs/Xserver/hw/nxagent/NXevents.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXevents.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c index 78d74a0d5..031e62431 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c @@ -147,6 +147,16 @@ extern Display *nxagentDisplay; extern WindowPtr nxagentLastEnteredWindow; +#ifdef VIEWPORT_FRAME +extern void nxagentInitViewportFrame(ScreenPtr, WindowPtr); +#endif +extern int nxagentShadowInit(ScreenPtr, WindowPtr); + +#ifdef NXAGENT_CLIPBOARD +extern int nxagentSendNotify(xEvent*); +#endif + + void ActivatePointerGrab(register DeviceIntPtr mouse, register GrabPtr grab, TimeStamp time, Bool autoGrab) @@ -466,11 +476,6 @@ void DefineInitialRootWindow(register WindowPtr win) { register ScreenPtr pScreen = win->drawable.pScreen; - #ifdef VIEWPORT_FRAME - extern void nxagentInitViewportFrame(ScreenPtr, WindowPtr); - #endif - extern int nxagentShadowInit(ScreenPtr, WindowPtr); - sprite.hotPhys.pScreen = pScreen; sprite.hotPhys.x = pScreen->width / 2; sprite.hotPhys.y = pScreen->height / 2; @@ -537,7 +542,6 @@ ProcSendEvent(ClientPtr client) if (stuff -> event.u.u.type == SelectionNotify) { - extern int nxagentSendNotify(xEvent*); if (nxagentSendNotify(&stuff->event) == 1) return Success; } |