xserver: Branch 'master'
Peter Hutterer
whot at kemper.freedesktop.org
Wed Sep 21 11:32:23 UTC 2016
dix/devices.c | 37 ++++++++++++++++++++++++++-----------
1 file changed, 26 insertions(+), 11 deletions(-)
New commits:
commit d0c5d205a919fc1d2eb599356090b58b1bf0176d
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Mon Sep 19 01:13:02 2016 -0700
dix: Make InitCoreDevices() failures more verbose.
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/dix/devices.c b/dix/devices.c
index 56aae85..ea3c6c8 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -709,17 +709,32 @@ CorePointerProc(DeviceIntPtr pDev, int what)
void
InitCoreDevices(void)
{
- if (AllocDevicePair(serverClient, "Virtual core",
- &inputInfo.pointer, &inputInfo.keyboard,
- CorePointerProc, CoreKeyboardProc, TRUE) != Success)
- FatalError("Failed to allocate core devices");
-
- if (ActivateDevice(inputInfo.pointer, TRUE) != Success ||
- ActivateDevice(inputInfo.keyboard, TRUE) != Success)
- FatalError("Failed to activate core devices.");
- if (!EnableDevice(inputInfo.pointer, TRUE) ||
- !EnableDevice(inputInfo.keyboard, TRUE))
- FatalError("Failed to enable core devices.");
+ int result;
+
+ result = AllocDevicePair(serverClient, "Virtual core",
+ &inputInfo.pointer, &inputInfo.keyboard,
+ CorePointerProc, CoreKeyboardProc, TRUE);
+ if (result != Success) {
+ FatalError("Failed to allocate virtual core devices: %d", result);
+ }
+
+ result = ActivateDevice(inputInfo.pointer, TRUE);
+ if (result != Success) {
+ FatalError("Failed to activate virtual core pointer: %d", result);
+ }
+
+ result = ActivateDevice(inputInfo.keyboard, TRUE);
+ if (result != Success) {
+ FatalError("Failed to activate virtual core keyboard: %d", result);
+ }
+
+ if (!EnableDevice(inputInfo.pointer, TRUE)) {
+ FatalError("Failed to enable virtual core pointer.");
+ }
+
+ if (!EnableDevice(inputInfo.keyboard, TRUE)) {
+ FatalError("Failed to enable virtual core keyboard.");
+ }
InitXTestDevices();
}
More information about the xorg-commit
mailing list