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

Style cleanup.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18687 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-08-29 10:32:29 +00:00
parent 0e1ba39f04
commit 2bd9d1e3d8
1 changed files with 438 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp
+438 -440
View File
@@ -1,19 +1,21 @@
/* /*
* Copyright 2004-2006, Jérôme Duval. All rights reserved. * Copyright 2004-2006, Jérôme Duval. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* Keyboard input server device addon
*/ */
#include "KeyboardInputDevice.h" #include "KeyboardInputDevice.h"
#include "kb_mouse_driver.h" #include "kb_mouse_driver.h"
#include <Directory.h> #include <Directory.h>
#include <Entry.h> #include <Entry.h>
#include <NodeMonitor.h> #include <NodeMonitor.h>
#include <Path.h> #include <Path.h>
#include <String.h> #include <String.h>
#include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h>
#if DEBUG #if DEBUG
FILE *KeyboardInputDevice::sLogFile = NULL; FILE *KeyboardInputDevice::sLogFile = NULL;
@@ -26,7 +28,7 @@ const static char *kKeyboardDevicesDirectory = "/dev/input/keyboard";
const static char *kKeyboardDevicesDirectoryPS2 = "input/keyboard/at"; const static char *kKeyboardDevicesDirectoryPS2 = "input/keyboard/at";
const static char *kKeyboardDevicesDirectoryUSB = "input/keyboard/usb"; const static char *kKeyboardDevicesDirectoryUSB = "input/keyboard/usb";
const uint32 at_keycode_map[] = { const static uint32 kATKeycodeMap[] = {
0x1, // Esc 0x1, // Esc
0x12, // 1 0x12, // 1
0x13, // 2 0x13, // 2
@@ -329,439 +331,8 @@ instantiate_input_device()
} }
KeyboardInputDevice::KeyboardInputDevice()
: fTMWindow(NULL)
{
#if DEBUG
if (sLogFile == NULL)
sLogFile = fopen("/var/log/keyboard_device_log.log", "a");
#endif
CALLED();
StartMonitoringDevice(kKeyboardDevicesDirectoryPS2);
StartMonitoringDevice(kKeyboardDevicesDirectoryUSB);
}
KeyboardInputDevice::~KeyboardInputDevice()
{
CALLED();
StopMonitoringDevice(kKeyboardDevicesDirectoryUSB);
StopMonitoringDevice(kKeyboardDevicesDirectoryPS2);
int count = fDevices.CountItems();
while (count-- > 0)
delete (keyboard_device *)fDevices.RemoveItem((int32)0);
#if DEBUG
fclose(sLogFile);
#endif
}
status_t
KeyboardInputDevice::SystemShuttingDown()
{
CALLED();
if (fTMWindow) {
fTMWindow->PostMessage(SYSTEM_SHUTTING_DOWN);
}
return B_OK;
}
status_t
KeyboardInputDevice::InitFromSettings(void *cookie, uint32 opcode)
{
CALLED();
keyboard_device *device = (keyboard_device *)cookie;
if (opcode == 0
|| opcode == B_KEY_REPEAT_RATE_CHANGED) {
if (get_key_repeat_rate(&device->settings.key_repeat_rate) != B_OK)
LOG_ERR("error when get_key_repeat_rate\n");
else
if (ioctl(device->fd, KB_SET_KEY_REPEAT_RATE, &device->settings.key_repeat_rate)!=B_OK)
LOG_ERR("error when KB_SET_KEY_REPEAT_RATE, fd:%d\n", device->fd);
}
if (opcode == 0
|| opcode == B_KEY_REPEAT_DELAY_CHANGED) {
if (get_key_repeat_delay(&device->settings.key_repeat_delay) != B_OK)
LOG_ERR("error when get_key_repeat_delay\n");
else
if (ioctl(device->fd, KB_SET_KEY_REPEAT_DELAY, &device->settings.key_repeat_delay)!=B_OK)
LOG_ERR("error when KB_SET_KEY_REPEAT_DELAY, fd:%d\n", device->fd);
}
if (opcode == 0
|| opcode == B_KEY_MAP_CHANGED
|| opcode == B_KEY_LOCKS_CHANGED) {
fKeymap.LoadCurrent();
device->modifiers = fKeymap.Locks();
SetLeds(device);
}
return B_OK;
}
status_t
KeyboardInputDevice::InitCheck()
{
CALLED();
RecursiveScan(kKeyboardDevicesDirectory);
return B_OK;
}
status_t
KeyboardInputDevice::Start(const char *name, void *cookie)
{
CALLED();
keyboard_device *device = (keyboard_device *)cookie;
if ((device->fd = open(device->path, O_RDWR)) < B_OK) {
fprintf(stderr, "error when opening %s: %s\n", device->path, strerror(errno));
return B_ERROR;
}
InitFromSettings(device);
char threadName[B_OS_NAME_LENGTH];
snprintf(threadName, B_OS_NAME_LENGTH, "%s watcher", name);
device->active = true;
device->device_watcher = spawn_thread(DeviceWatcher, threadName,
kKeyboardThreadPriority, device);
resume_thread(device->device_watcher);
return B_OK;
}
status_t
KeyboardInputDevice::Stop(const char *name, void *cookie)
{
CALLED();
keyboard_device *device = (keyboard_device *)cookie;
LOG("Stop(%s)\n", name);
close(device->fd);
device->fd = -1;
device->active = false;
if (device->device_watcher >= 0) {
suspend_thread(device->device_watcher);
resume_thread(device->device_watcher);
status_t dummy;
wait_for_thread(device->device_watcher, &dummy);
}
if (fTMWindow) {
fTMWindow->PostMessage(B_QUIT_REQUESTED);
fTMWindow = NULL;
}
return B_OK;
}
status_t
KeyboardInputDevice::Control(const char *name, void *cookie,
uint32 command, BMessage *message)
{
CALLED();
LOG("Control(%s, code: %lu)\n", name, command);
if (command == B_NODE_MONITOR)
HandleMonitor(message);
else if (command >= B_KEY_MAP_CHANGED
&& command <= B_KEY_REPEAT_RATE_CHANGED) {
InitFromSettings(cookie, command);
}
return B_OK;
}
status_t
KeyboardInputDevice::HandleMonitor(BMessage *message)
{
CALLED();
int32 opcode = 0;
status_t status;
if ((status = message->FindInt32("opcode", &opcode)) < B_OK)
return status;
if ((opcode != B_ENTRY_CREATED)
&& (opcode != B_ENTRY_REMOVED))
return B_OK;
BEntry entry;
BPath path;
dev_t device;
ino_t directory;
const char *name = NULL;
message->FindInt32("device", &device);
message->FindInt64("directory", &directory);
message->FindString("name", &name);
entry_ref ref(device, directory, name);
if ((status = entry.SetTo(&ref)) != B_OK)
return status;
if ((status = entry.GetPath(&path)) != B_OK)
return status;
if ((status = path.InitCheck()) != B_OK)
return status;
if (opcode == B_ENTRY_CREATED)
AddDevice(path.Path());
else
RemoveDevice(path.Path());
return status;
}
status_t
KeyboardInputDevice::AddDevice(const char *path)
{
CALLED();
keyboard_device *device = new keyboard_device(path);
if (!device)
return B_NO_MEMORY;
device->fd = -1;
device->device_watcher = -1;
device->active = false;
device->owner = this;
device->isAT = false;
if (strstr(device->path, "keyboard/at") != NULL)
device->isAT = true;
input_device_ref *devices[2];
devices[0] = &device->device_ref;
devices[1] = NULL;
fDevices.AddItem(device);
return RegisterDevices(devices);
}
status_t
KeyboardInputDevice::RemoveDevice(const char *path)
{
CALLED();
keyboard_device *device;
for (int i = 0; (device = (keyboard_device *)fDevices.ItemAt(i)) != NULL; i++) {
if (!strcmp(device->path, path)) {
fDevices.RemoveItem(device);
input_device_ref *devices[2];
devices[0] = &device->device_ref;
devices[1] = NULL;
UnregisterDevices(devices);
delete device;
return B_OK;
}
}
return B_ENTRY_NOT_FOUND;
}
int32
KeyboardInputDevice::DeviceWatcher(void *arg)
{
CALLED();
keyboard_device *dev = (keyboard_device *)arg;
uint8 buffer[16];
uint8 activeDeadKey = 0;
Keymap *keymap = &dev->owner->fKeymap;
uint32 lastKeyCode = 0;
uint32 repeatCount = 1;
uint8 states[16];
memset(states, 0, sizeof(states));
LOG("%s\n", __PRETTY_FUNCTION__);
while (dev->active) {
if (ioctl(dev->fd, KB_READ, &buffer) != B_OK) {
return 0;
}
uint32 keycode = 0;
bool is_keydown = false;
bigtime_t timestamp = 0;
LOG("KB_READ :");
if (dev->isAT) {
at_kbd_io *at_kbd = (at_kbd_io *)buffer;
if (at_kbd->scancode>0)
keycode = at_keycode_map[at_kbd->scancode-1];
is_keydown = at_kbd->is_keydown;
timestamp = at_kbd->timestamp;
LOG(" %02x", at_kbd->scancode);
} else {
raw_key_info *raw_kbd = (raw_key_info *)buffer;
is_keydown = raw_kbd->is_keydown;
timestamp = raw_kbd->timestamp;
keycode = raw_kbd->be_keycode;
}
if (keycode == 0)
continue;
LOG(" %Ld, %02x, %02lx\n", timestamp, is_keydown, keycode);
if (is_keydown
&& (keycode == 0x68) ) { // MENU KEY for OpenTracker 5.2.0+
bool nokey = true;
for (int32 i=0; i<16; i++)
if (states[i] != 0) {
nokey = false;
break;
}
if (nokey) {
BMessenger msger("application/x-vnd.Be-TSKB");
if (msger.IsValid())
msger.SendMessage('BeMn');
}
}
if (is_keydown)
states[(keycode)>>3] |= (1 << (7 - (keycode & 0x7)));
else
states[(keycode)>>3] &= (!(1 << (7 - (keycode & 0x7))));
if (is_keydown
&& (keycode == 0x34) // DELETE KEY
&& (states[0x5c >> 3] & (1 << (7 - (0x5c & 0x7))))
&& (states[0x5d >> 3] & (1 << (7 - (0x5d & 0x7))))) {
LOG("TeamMonitor called\n");
// show the team monitor
if (!dev->owner->fTMWindow)
dev->owner->fTMWindow = new TMWindow();
dev->owner->fTMWindow->Enable();
// cancel timer only for R5
if (ioctl(dev->fd, KB_CANCEL_CONTROL_ALT_DEL, NULL) == B_OK)
LOG("KB_CANCEL_CONTROL_ALT_DEL : OK\n");
}
uint32 modifiers = keymap->Modifier(keycode);
if (modifiers
&& ( !(modifiers & (B_CAPS_LOCK | B_NUM_LOCK | B_SCROLL_LOCK))
|| is_keydown)) {
BMessage *msg = new BMessage;
msg->AddInt64("when", timestamp);
msg->what = B_MODIFIERS_CHANGED;
msg->AddInt32("be:old_modifiers", dev->modifiers);
if ((is_keydown && !(modifiers & (B_CAPS_LOCK | B_NUM_LOCK | B_SCROLL_LOCK)))
|| (is_keydown && !(dev->modifiers & modifiers)))
dev->modifiers |= modifiers;
else
dev->modifiers &= ~modifiers;
msg->AddInt32("modifiers", dev->modifiers);
msg->AddData("states", B_UINT8_TYPE, states, 16);
if (dev->owner->EnqueueMessage(msg)!=B_OK)
delete msg;
if (modifiers & (B_CAPS_LOCK | B_NUM_LOCK | B_SCROLL_LOCK))
dev->owner->SetLeds(dev);
}
char *str = NULL, *str2 = NULL;
int32 numBytes = 0, numBytes2 = 0;
uint8 newDeadKey = 0;
if (activeDeadKey == 0) {
newDeadKey = keymap->IsDeadKey(keycode, dev->modifiers);
}
// new dead key behaviour
/*if (newDeadKey == 0) {
keymap->GetChars(keycode, dev->modifiers, activeDeadKey, &str, &numBytes);
keymap->GetChars(keycode, 0, 0, &str2, &numBytes2);
}
if (true) {
*/
// R5-like dead key behaviour
if (newDeadKey == 0) {
keymap->GetChars(keycode, dev->modifiers, activeDeadKey, &str, &numBytes);
keymap->GetChars(keycode, 0, 0, &str2, &numBytes2);
BMessage *msg = new BMessage;
if (numBytes>0)
msg->what = is_keydown ? B_KEY_DOWN : B_KEY_UP;
else
msg->what = is_keydown ? B_UNMAPPED_KEY_DOWN : B_UNMAPPED_KEY_UP;
msg->AddInt64("when", timestamp);
msg->AddInt32("key", keycode);
msg->AddInt32("modifiers", dev->modifiers);
msg->AddData("states", B_UINT8_TYPE, states, 16);
if (numBytes>0) {
for (int i=0; i<numBytes; i++)
msg->AddInt8("byte", (int8)str[i]);
msg->AddString("bytes", str);
if (numBytes2<=0) {
numBytes2 = 1;
delete[] str2;
str2 = str;
} else
delete[] str;
if (is_keydown && (lastKeyCode == keycode)) {
repeatCount++;
msg->AddInt32("be:key_repeat", repeatCount);
} else
repeatCount = 1;
} else
delete[] str;
if (numBytes2>0)
msg->AddInt32("raw_char", (uint32)((uint8)str2[0] & 0x7f));
delete[] str2;
if (dev->owner->EnqueueMessage(msg)!=B_OK)
delete msg;
}
if (!is_keydown && !modifiers) {
activeDeadKey = newDeadKey;
}
lastKeyCode = keycode;
}
return 0;
}
static char * static char *
GetShortName(const char *longName) get_short_name(const char *longName)
{ {
CALLED(); CALLED();
BString string(longName); BString string(longName);
@@ -786,6 +357,433 @@ GetShortName(const char *longName)
} }
// #pragma mark -
KeyboardInputDevice::KeyboardInputDevice()
: fTMWindow(NULL)
{
#if DEBUG
if (sLogFile == NULL)
sLogFile = fopen("/var/log/keyboard_device_log.log", "a");
#endif
CALLED();
StartMonitoringDevice(kKeyboardDevicesDirectoryPS2);
StartMonitoringDevice(kKeyboardDevicesDirectoryUSB);
}
KeyboardInputDevice::~KeyboardInputDevice()
{
CALLED();
StopMonitoringDevice(kKeyboardDevicesDirectoryUSB);
StopMonitoringDevice(kKeyboardDevicesDirectoryPS2);
int count = fDevices.CountItems();
while (count-- > 0) {
delete (keyboard_device *)fDevices.RemoveItem((int32)0);
}
#if DEBUG
fclose(sLogFile);
#endif
}
status_t
KeyboardInputDevice::SystemShuttingDown()
{
CALLED();
if (fTMWindow)
fTMWindow->PostMessage(SYSTEM_SHUTTING_DOWN);
return B_OK;
}
status_t
KeyboardInputDevice::InitFromSettings(void *cookie, uint32 opcode)
{
CALLED();
keyboard_device *device = (keyboard_device *)cookie;
if (opcode == 0
|| opcode == B_KEY_REPEAT_RATE_CHANGED) {
if (get_key_repeat_rate(&device->settings.key_repeat_rate) != B_OK)
LOG_ERR("error when get_key_repeat_rate\n");
else
if (ioctl(device->fd, KB_SET_KEY_REPEAT_RATE, &device->settings.key_repeat_rate)!=B_OK)
LOG_ERR("error when KB_SET_KEY_REPEAT_RATE, fd:%d\n", device->fd);
}
if (opcode == 0 || opcode == B_KEY_REPEAT_DELAY_CHANGED) {
if (get_key_repeat_delay(&device->settings.key_repeat_delay) != B_OK)
LOG_ERR("error when get_key_repeat_delay\n");
else if (ioctl(device->fd, KB_SET_KEY_REPEAT_DELAY,
&device->settings.key_repeat_delay)!=B_OK)
LOG_ERR("error when KB_SET_KEY_REPEAT_DELAY, fd:%d\n", device->fd);
}
if (opcode == 0
|| opcode == B_KEY_MAP_CHANGED
|| opcode == B_KEY_LOCKS_CHANGED) {
fKeymap.LoadCurrent();
device->modifiers = fKeymap.Locks();
SetLeds(device);
}
return B_OK;
}
status_t
KeyboardInputDevice::InitCheck()
{
CALLED();
// TODO: this doesn't belong here!
RecursiveScan(kKeyboardDevicesDirectory);
return B_OK;
}
status_t
KeyboardInputDevice::Start(const char *name, void *cookie)
{
CALLED();
keyboard_device *device = (keyboard_device *)cookie;
if ((device->fd = open(device->path, O_RDWR)) < B_OK) {
fprintf(stderr, "error when opening %s: %s\n", device->path, strerror(errno));
return B_ERROR;
}
InitFromSettings(device);
char threadName[B_OS_NAME_LENGTH];
snprintf(threadName, B_OS_NAME_LENGTH, "%s watcher", name);
device->active = true;
device->device_watcher = spawn_thread(DeviceWatcher, threadName,
kKeyboardThreadPriority, device);
if (device->device_watcher < B_OK)
return device->device_watcher;
resume_thread(device->device_watcher);
return B_OK;
}
status_t
KeyboardInputDevice::Stop(const char *name, void *cookie)
{
CALLED();
keyboard_device *device = (keyboard_device *)cookie;
LOG("Stop(%s)\n", name);
close(device->fd);
device->fd = -1;
device->active = false;
if (device->device_watcher >= 0) {
suspend_thread(device->device_watcher);
resume_thread(device->device_watcher);
status_t dummy;
wait_for_thread(device->device_watcher, &dummy);
}
if (fTMWindow) {
fTMWindow->PostMessage(B_QUIT_REQUESTED);
fTMWindow = NULL;
}
return B_OK;
}
status_t
KeyboardInputDevice::Control(const char *name, void *cookie,
uint32 command, BMessage *message)
{
CALLED();
LOG("Control(%s, code: %lu)\n", name, command);
if (command == B_NODE_MONITOR)
HandleMonitor(message);
else if (command >= B_KEY_MAP_CHANGED
&& command <= B_KEY_REPEAT_RATE_CHANGED) {
InitFromSettings(cookie, command);
}
return B_OK;
}
status_t
KeyboardInputDevice::HandleMonitor(BMessage *message)
{
CALLED();
int32 opcode = 0;
status_t status;
if ((status = message->FindInt32("opcode", &opcode)) < B_OK)
return status;
if (opcode != B_ENTRY_CREATED
&& opcode != B_ENTRY_REMOVED)
return B_OK;
BEntry entry;
BPath path;
dev_t device;
ino_t directory;
const char *name = NULL;
message->FindInt32("device", &device);
message->FindInt64("directory", &directory);
message->FindString("name", &name);
entry_ref ref(device, directory, name);
if ((status = entry.SetTo(&ref)) != B_OK)
return status;
if ((status = entry.GetPath(&path)) != B_OK)
return status;
if ((status = path.InitCheck()) != B_OK)
return status;
if (opcode == B_ENTRY_CREATED)
AddDevice(path.Path());
else
RemoveDevice(path.Path());
return status;
}
status_t
KeyboardInputDevice::AddDevice(const char *path)
{
CALLED();
keyboard_device *device = new keyboard_device(path);
if (!device)
return B_NO_MEMORY;
device->fd = -1;
device->device_watcher = -1;
device->active = false;
device->owner = this;
device->isAT = strstr(device->path, "keyboard/at") != NULL;
input_device_ref *devices[2];
devices[0] = &device->device_ref;
devices[1] = NULL;
fDevices.AddItem(device);
return RegisterDevices(devices);
}
status_t
KeyboardInputDevice::RemoveDevice(const char *path)
{
CALLED();
keyboard_device *device;
for (int i = 0; (device = (keyboard_device *)fDevices.ItemAt(i)) != NULL; i++) {
if (!strcmp(device->path, path)) {
fDevices.RemoveItem(device);
input_device_ref *devices[2];
devices[0] = &device->device_ref;
devices[1] = NULL;
UnregisterDevices(devices);
delete device;
return B_OK;
}
}
return B_ENTRY_NOT_FOUND;
}
int32
KeyboardInputDevice::DeviceWatcher(void *arg)
{
CALLED();
keyboard_device *dev = (keyboard_device *)arg;
uint8 buffer[16];
uint8 activeDeadKey = 0;
Keymap *keymap = &dev->owner->fKeymap;
uint32 lastKeyCode = 0;
uint32 repeatCount = 1;
uint8 states[16];
memset(states, 0, sizeof(states));
LOG("%s\n", __PRETTY_FUNCTION__);
while (dev->active) {
if (ioctl(dev->fd, KB_READ, &buffer) != B_OK)
return 0;
uint32 keycode = 0;
bool isKeyDown = false;
bigtime_t timestamp = 0;
LOG("KB_READ :");
if (dev->isAT) {
at_kbd_io *at_kbd = (at_kbd_io *)buffer;
if (at_kbd->scancode > 0)
keycode = kATKeycodeMap[at_kbd->scancode-1];
isKeyDown = at_kbd->is_keydown;
timestamp = at_kbd->timestamp;
LOG(" %02x", at_kbd->scancode);
} else {
raw_key_info *raw_kbd = (raw_key_info *)buffer;
isKeyDown = raw_kbd->is_keydown;
timestamp = raw_kbd->timestamp;
keycode = raw_kbd->be_keycode;
}
if (keycode == 0)
continue;
LOG(" %Ld, %02x, %02lx\n", timestamp, isKeyDown, keycode);
if (isKeyDown
&& (keycode == 0x68) ) { // MENU KEY for OpenTracker 5.2.0+
bool nokey = true;
for (int32 i = 0; i < 16; i++) {
if (states[i] != 0) {
nokey = false;
break;
}
}
if (nokey) {
BMessenger msger("application/x-vnd.Be-TSKB");
if (msger.IsValid())
msger.SendMessage('BeMn');
}
}
if (isKeyDown)
states[(keycode)>>3] |= (1 << (7 - (keycode & 0x7)));
else
states[(keycode)>>3] &= (!(1 << (7 - (keycode & 0x7))));
if (isKeyDown
&& keycode == 0x34 // DELETE KEY
&& (states[0x5c >> 3] & (1 << (7 - (0x5c & 0x7))))
&& (states[0x5d >> 3] & (1 << (7 - (0x5d & 0x7))))) {
LOG("TeamMonitor called\n");
// show the team monitor
if (!dev->owner->fTMWindow)
dev->owner->fTMWindow = new TMWindow();
dev->owner->fTMWindow->Enable();
// cancel timer only for R5
if (ioctl(dev->fd, KB_CANCEL_CONTROL_ALT_DEL, NULL) == B_OK)
LOG("KB_CANCEL_CONTROL_ALT_DEL : OK\n");
}
uint32 modifiers = keymap->Modifier(keycode);
if (modifiers
&& (!(modifiers & (B_CAPS_LOCK | B_NUM_LOCK | B_SCROLL_LOCK))
|| isKeyDown)) {
BMessage *msg = new BMessage;
msg->AddInt64("when", timestamp);
msg->what = B_MODIFIERS_CHANGED;
msg->AddInt32("be:old_modifiers", dev->modifiers);
if ((isKeyDown && !(modifiers & (B_CAPS_LOCK | B_NUM_LOCK | B_SCROLL_LOCK)))
|| (isKeyDown && !(dev->modifiers & modifiers)))
dev->modifiers |= modifiers;
else
dev->modifiers &= ~modifiers;
msg->AddInt32("modifiers", dev->modifiers);
msg->AddData("states", B_UINT8_TYPE, states, 16);
if (dev->owner->EnqueueMessage(msg)!=B_OK)
delete msg;
if (modifiers & (B_CAPS_LOCK | B_NUM_LOCK | B_SCROLL_LOCK))
dev->owner->SetLeds(dev);
}
char *str = NULL, *str2 = NULL;
int32 numBytes = 0, numBytes2 = 0;
uint8 newDeadKey = 0;
if (activeDeadKey == 0)
newDeadKey = keymap->IsDeadKey(keycode, dev->modifiers);
// new dead key behaviour
#if 0
if (newDeadKey == 0) {
keymap->GetChars(keycode, dev->modifiers, activeDeadKey, &str, &numBytes);
keymap->GetChars(keycode, 0, 0, &str2, &numBytes2);
}
#endif
// R5-like dead key behaviour
if (newDeadKey == 0) {
keymap->GetChars(keycode, dev->modifiers, activeDeadKey, &str, &numBytes);
keymap->GetChars(keycode, 0, 0, &str2, &numBytes2);
BMessage *msg = new BMessage;
if (numBytes > 0)
msg->what = isKeyDown ? B_KEY_DOWN : B_KEY_UP;
else
msg->what = isKeyDown ? B_UNMAPPED_KEY_DOWN : B_UNMAPPED_KEY_UP;
msg->AddInt64("when", timestamp);
msg->AddInt32("key", keycode);
msg->AddInt32("modifiers", dev->modifiers);
msg->AddData("states", B_UINT8_TYPE, states, 16);
if (numBytes > 0) {
for (int i = 0; i < numBytes; i++) {
msg->AddInt8("byte", (int8)str[i]);
}
msg->AddString("bytes", str);
if (numBytes2 <= 0) {
numBytes2 = 1;
delete[] str2;
str2 = str;
} else
delete[] str;
if (isKeyDown && lastKeyCode == keycode) {
repeatCount++;
msg->AddInt32("be:key_repeat", repeatCount);
} else
repeatCount = 1;
} else
delete[] str;
if (numBytes2 > 0)
msg->AddInt32("raw_char", (uint32)((uint8)str2[0] & 0x7f));
delete[] str2;
if (dev->owner->EnqueueMessage(msg) != B_OK)
delete msg;
}
if (!isKeyDown && !modifiers)
activeDeadKey = newDeadKey;
lastKeyCode = keycode;
}
return 0;
}
void void
KeyboardInputDevice::RecursiveScan(const char *directory) KeyboardInputDevice::RecursiveScan(const char *directory)
{ {
@@ -806,9 +804,9 @@ KeyboardInputDevice::RecursiveScan(const char *directory)
void void
KeyboardInputDevice::SetLeds(keyboard_device *device) KeyboardInputDevice::SetLeds(keyboard_device *device)
{ {
if (device->fd<0) if (device->fd < 0)
return; return;
uint32 locks = device->modifiers; 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));
@@ -818,16 +816,16 @@ KeyboardInputDevice::SetLeds(keyboard_device *device)
lock_io[1] = 1; lock_io[1] = 1;
if (locks & B_SCROLL_LOCK) if (locks & B_SCROLL_LOCK)
lock_io[2] = 1; lock_io[2] = 1;
ioctl(device->fd, KB_SET_LEDS, &lock_io); ioctl(device->fd, KB_SET_LEDS, &lock_io);
} }
keyboard_device::keyboard_device(const char *path) keyboard_device::keyboard_device(const char *path)
// todo: initialize other members
{ {
// todo: initialize other members
strcpy(this->path, path); strcpy(this->path, path);
device_ref.name = GetShortName(path); device_ref.name = get_short_name(path);
device_ref.type = B_KEYBOARD_DEVICE; device_ref.type = B_KEYBOARD_DEVICE;
device_ref.cookie = this; device_ref.cookie = this;
} }