i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for leds and modifiers

Browse Source 
NOTE : modifiers are per device


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8997 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2004-09-18 13:13:30 +00:00
parent c319524a0a
commit 711d19bd29
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
+8 -5
View File
@@ -34,7 +34,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#define DEBUG 1
#if DEBUG #if DEBUG
inline void LOG(const char *fmt, ...) { char buf[1024]; va_list ap; va_start(ap, fmt); vsprintf(buf, fmt, ap); va_end(ap); \ inline void LOG(const char *fmt, ...) { char buf[1024]; va_list ap; va_start(ap, fmt); vsprintf(buf, fmt, ap); va_end(ap); \
fputs(buf, KeyboardInputDevice::sLogFile); fflush(KeyboardInputDevice::sLogFile); } fputs(buf, KeyboardInputDevice::sLogFile); fflush(KeyboardInputDevice::sLogFile); }
@@ -419,8 +418,8 @@ KeyboardInputDevice::InitFromSettings(void *cookie, uint32 opcode)
|| opcode == B_KEY_MAP_CHANGED || opcode == B_KEY_MAP_CHANGED
|| opcode == B_KEY_LOCKS_CHANGED) { || opcode == B_KEY_LOCKS_CHANGED) {
fKeymap.LoadCurrent(); fKeymap.LoadCurrent();
SetLeds(device);
device->modifiers = fKeymap.Locks(); device->modifiers = fKeymap.Locks();
SetLeds(device);
} }
return B_OK; return B_OK;
@@ -678,11 +677,15 @@ KeyboardInputDevice::DeviceWatcher(void *arg)
|| (is_keydown && !(dev->modifiers & modifiers))) || (is_keydown && !(dev->modifiers & modifiers)))
dev->modifiers |= modifiers; dev->modifiers |= modifiers;
else else
dev->modifiers &= !modifiers; dev->modifiers ^= modifiers;
msg->AddInt32("modifiers", dev->modifiers); msg->AddInt32("modifiers", dev->modifiers);
msg->AddData("states", B_UINT8_TYPE, states, 16); msg->AddData("states", B_UINT8_TYPE, states, 16);
if (dev->owner->EnqueueMessage(msg)!=B_OK) if (dev->owner->EnqueueMessage(msg)!=B_OK)
delete msg; delete msg;
if (modifiers & (B_CAPS_LOCK | B_NUM_LOCK | B_SCROLL_LOCK))
dev->owner->SetLeds(dev);
} }
char *str = NULL, *str2 = NULL; char *str = NULL, *str2 = NULL;
@@ -798,7 +801,7 @@ KeyboardInputDevice::SetLeds(keyboard_device *device)
if (device->fd<0) if (device->fd<0)
return; return;
uint32 locks = device->owner->fKeymap.Locks(); uint32 locks = device->modifiers;
char lock_io[3]; char lock_io[3];
memset(lock_io, 0, sizeof(lock_io)); memset(lock_io, 0, sizeof(lock_io));
if (locks & B_NUM_LOCK) if (locks & B_NUM_LOCK)
@@ -809,4 +812,4 @@ KeyboardInputDevice::SetLeds(keyboard_device *device)
lock_io[2] = 1; lock_io[2] = 1;
ioctl(device->fd, kSetLeds, &lock_io); ioctl(device->fd, kSetLeds, &lock_io);
} }