diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-06-27 09:10:42 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-07-01 08:46:28 +1000 |
| commit | 87d4f90bfcb509471ac9e7886e14a92b33223fd7 (patch) | |
| tree | c211c23e866f53f6862d7e468bf3df07229083d7 /hw/xquartz | |
| parent | e084ac30b37c36016bb0dbb1b79e60a7799aee02 (diff) | |
input: free the EQ allocated memory on shutdown (#38634)
mieqFini() already does the right thing, but it needs to be called by the
various DDXs and the XTest Extension.
X.Org Bug 38634 <http://bugs.freedesktop.org/show_bug.cgi?id=38634>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Acked-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'hw/xquartz')
| -rw-r--r-- | hw/xquartz/darwin.c | 4 | ||||
| -rw-r--r-- | hw/xquartz/darwinEvents.c | 4 | ||||
| -rw-r--r-- | hw/xquartz/darwinEvents.h | 1 | ||||
| -rw-r--r-- | hw/xquartz/darwinXinput.c | 5 |
4 files changed, 9 insertions, 5 deletions
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index 29ab83677..73685b0d4 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -505,6 +505,10 @@ void InitInput( int argc, char **argv ) QuartzInitInput(argc, argv); } +void CloseInput(void) +{ + DarwinEQFini(); +} /* * DarwinAdjustScreenOrigins diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c index fe744b741..1f22099d6 100644 --- a/hw/xquartz/darwinEvents.c +++ b/hw/xquartz/darwinEvents.c @@ -371,6 +371,10 @@ Bool DarwinEQInit(void) { return TRUE; } +Bool DarwinEQFini(void) { + mieqFini(); +} + /* * ProcessInputEvents * Read and process events from the event queue until it is empty. diff --git a/hw/xquartz/darwinEvents.h b/hw/xquartz/darwinEvents.h index 6769c8bd8..bd29d51fd 100644 --- a/hw/xquartz/darwinEvents.h +++ b/hw/xquartz/darwinEvents.h @@ -32,6 +32,7 @@ #define XQUARTZ_VALUATOR_LIMIT (1 << 16) Bool DarwinEQInit(void); +Bool DarwinEQFini(void); void DarwinEQEnqueue(const xEventPtr e); void DarwinEQPointerPost(DeviceIntPtr pDev, xEventPtr e); void DarwinEQSwitchScreen(ScreenPtr pScreen, Bool fromDIX); diff --git a/hw/xquartz/darwinXinput.c b/hw/xquartz/darwinXinput.c index 3ef34fec0..94c31bb23 100644 --- a/hw/xquartz/darwinXinput.c +++ b/hw/xquartz/darwinXinput.c @@ -149,8 +149,3 @@ DeleteInputDeviceRequest(DeviceIntPtr dev) DEBUG_LOG("DeleteInputDeviceRequest(%p)\n", dev); } -void -CloseInput (void) -{ -} - |