diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-11-15 17:10:46 +1030 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2007-11-15 17:10:46 +1030 |
| commit | c86686664c80cc1221430f050b8e7fbc7d7f65bb (patch) | |
| tree | 1c3cc2ad3d4bdfbdce9ec54cd7b82a3a067be4ab | |
| parent | 43ebc80ff1634281c8816a19403cb4d0bf04c8f5 (diff) | |
Ignore slave devices, don't append keyboards to dock.
Keyboards can't be repaired anyway, so what's the point.
| -rw-r--r-- | src/DockKeyboard.cpp | 4 | ||||
| -rw-r--r-- | src/Manager.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/DockKeyboard.cpp b/src/DockKeyboard.cpp index a9fa5f0..a5c786f 100644 --- a/src/DockKeyboard.cpp +++ b/src/DockKeyboard.cpp @@ -34,6 +34,6 @@ void DockKeyboard::handleButtonEvent(PointerDevice* ptr, XDeviceButtonEvent* ev) { TRACE("Pairing %s with %s\n", ptr->getName().c_str(), kbd->getName().c_str()); - XChangePointerKeyboardPairing(x11->dpy, ptr->getDevice(), kbd->getDevice()); - kbd->setPaired(ptr); + //XChangePointerKeyboardPairing(x11->dpy, ptr->getDevice(), kbd->getDevice()); + //kbd->setPaired(ptr); } diff --git a/src/Manager.cpp b/src/Manager.cpp index 697ce79..b6e3030 100644 --- a/src/Manager.cpp +++ b/src/Manager.cpp @@ -130,8 +130,8 @@ void Manager::initXi() XDeviceInfo* currDevice; currDevice = &devices[--devicecount]; - - if ((currDevice->use == IsXExtensionPointer)) + /* ignore slave devices, only masters are interesting */ + if ((currDevice->use == IsXPointer)) { try { @@ -142,13 +142,13 @@ void Manager::initXi() { ERR("%s\n", e->message.c_str()); } - } else if ((currDevice->use == IsXExtensionKeyboard)) + } else if ((currDevice->use == IsXKeyboard)) { try { KeyboardDevice *k = new KeyboardDevice(currDevice, x11, this); keyboards.push_back(k); - dock->appendKeyboard(k); + //dock->appendKeyboard(k); } catch (DeviceError* e) { ERR("%s\n", e->message.c_str()); @@ -827,7 +827,7 @@ void Manager::handlePresenceNotify(XDevicePresenceNotifyEvent* ev) { KeyboardDevice *k = new KeyboardDevice(current, x11, this); keyboards.push_back(k); - dock->appendKeyboard(k); + //dock->appendKeyboard(k); dock->setPointerEvents(&pointers); rescanPairings(); } catch (DeviceError* e) |