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

Made modifications to send keyboard messages to client applications

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10888 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm
2005-01-19 18:59:41 +00:00
parent aea21365e7
commit 7a5829aab1
2 changed files with 209 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/server/RootLayer.cpp
+194 -59
View File
@@ -1055,16 +1055,20 @@ void RootLayer::KeyboardEventHandler(int32 code, BPortLink& msg)
int32 scancode, modifiers; int32 scancode, modifiers;
int8 utf[3]; int8 utf[3];
char *string = NULL; char *string = NULL;
int32 keystate; int8 keystates[16];
int32 raw_char;
int32 repeatcount;
*((int32*)utf)=0;
msg.Read<bigtime_t>(&time); msg.Read<bigtime_t>(&time);
msg.Read<int32>(&scancode); msg.Read<int32>(&scancode);
msg.Read<int32>(&raw_char);
msg.Read<int32>(&modifiers); msg.Read<int32>(&modifiers);
msg.Read<int32>(&repeatcount);
msg.Read(utf, sizeof(utf)); msg.Read(utf, sizeof(utf));
msg.ReadString(&string); msg.ReadString(&string);
msg.Read<int32>(&keystate); msg.Read(keystates,sizeof(int8)*16);
if (string)
free(string);
if(DISPLAYDRIVER==HWDRIVER) if(DISPLAYDRIVER==HWDRIVER)
{ {
@@ -1078,6 +1082,8 @@ void RootLayer::KeyboardEventHandler(int32 code, BPortLink& msg)
{ {
// TODO: Set to Safe Mode in KeyboardEventHandler:B_KEY_DOWN. (DisplayDriver API change) // TODO: Set to Safe Mode in KeyboardEventHandler:B_KEY_DOWN. (DisplayDriver API change)
STRACE(("Safe Video Mode invoked - code unimplemented\n")); STRACE(("Safe Video Mode invoked - code unimplemented\n"));
if (string)
free(string);
break; break;
} }
} }
@@ -1089,6 +1095,8 @@ void RootLayer::KeyboardEventHandler(int32 code, BPortLink& msg)
//TODO: SetWorkspace in KeyboardEventHandler //TODO: SetWorkspace in KeyboardEventHandler
//SetWorkspace(scancode-2); //SetWorkspace(scancode-2);
if (string)
free(string);
break; break;
} }
@@ -1099,6 +1107,8 @@ void RootLayer::KeyboardEventHandler(int32 code, BPortLink& msg)
//if(deskbar) //if(deskbar)
//{ //{
printf("Send Twitcher message key to Deskbar - unimplmemented\n"); printf("Send Twitcher message key to Deskbar - unimplmemented\n");
if (string)
free(string);
break; break;
//} //}
} }
@@ -1121,6 +1131,8 @@ void RootLayer::KeyboardEventHandler(int32 code, BPortLink& msg)
} }
fScreenShotIndex++; fScreenShotIndex++;
GetDisplayDriver()->DumpToFile(filename); GetDisplayDriver()->DumpToFile(filename);
if (string)
free(string);
break; break;
} }
} }
@@ -1136,6 +1148,8 @@ void RootLayer::KeyboardEventHandler(int32 code, BPortLink& msg)
{ {
// TODO: Set to Safe Mode in KeyboardEventHandler:B_KEY_DOWN. (DisplayDriver API change) // TODO: Set to Safe Mode in KeyboardEventHandler:B_KEY_DOWN. (DisplayDriver API change)
STRACE(("Safe Video Mode invoked - code unimplemented\n")); STRACE(("Safe Video Mode invoked - code unimplemented\n"));
if (string)
free(string);
break; break;
} }
} }
@@ -1144,6 +1158,8 @@ void RootLayer::KeyboardEventHandler(int32 code, BPortLink& msg)
STRACE(("Set Workspace %ld\n",scancode-1)); STRACE(("Set Workspace %ld\n",scancode-1));
//TODO: SetWorkspace in KeyboardEventHandler //TODO: SetWorkspace in KeyboardEventHandler
//SetWorkspace(scancode-2); //SetWorkspace(scancode-2);
if (string)
free(string);
break; break;
} }
} }
@@ -1156,6 +1172,8 @@ void RootLayer::KeyboardEventHandler(int32 code, BPortLink& msg)
//if(deskbar) //if(deskbar)
//{ //{
printf("Send Twitcher message key to Deskbar - unimplmemented\n"); printf("Send Twitcher message key to Deskbar - unimplmemented\n");
if (string)
free(string);
break; break;
//} //}
} }
@@ -1179,6 +1197,8 @@ void RootLayer::KeyboardEventHandler(int32 code, BPortLink& msg)
fScreenShotIndex++; fScreenShotIndex++;
GetDisplayDriver()->DumpToFile(filename); GetDisplayDriver()->DumpToFile(filename);
if (string)
free(string);
break; break;
} }
} }
@@ -1187,7 +1207,41 @@ void RootLayer::KeyboardEventHandler(int32 code, BPortLink& msg)
// We got this far, so apparently it's safe to pass to the active // We got this far, so apparently it's safe to pass to the active
// window. // window.
// TODO: Pass on key down message to client window with the focus Workspace *ws=ActiveWorkspace();
desktop->fGeneralLock.Lock();
fMainLock.Lock();
WinBorder *target=ws->FocusLayer();
if(target)
{
ServerWindow *win=target->Window();
if(win)
{
BMessage keymsg(B_KEY_DOWN);
keymsg.AddInt64("when",time);
keymsg.AddInt32("key",scancode);
keymsg.AddInt32("be:key_repeat",scancode);
keymsg.AddInt32("modifiers",modifiers);
keymsg.AddData("states",B_INT8_TYPE,keystates,sizeof(int8)*16);
for(uint8 i=0;i<4; i++)
{
if(utf[i])
keymsg.AddInt8("byte",utf[i]);
}
keymsg.AddString("bytes",string);
keymsg.AddInt32("raw_char",raw_char);
win->Lock();
win->SendMessageToClient(&keymsg);
win->Unlock();
}
}
fMainLock.Unlock();
desktop->fGeneralLock.Unlock();
if (string)
free(string);
break; break;
} }
case B_KEY_UP: case B_KEY_UP:
@@ -1204,24 +1258,21 @@ void RootLayer::KeyboardEventHandler(int32 code, BPortLink& msg)
// 8) int8[16] state of all keys // 8) int8[16] state of all keys
bigtime_t time; bigtime_t time;
int32 scancode; int32 scancode, modifiers;
int32 ascii;
int32 modifiers;
int8 utf[3]; int8 utf[3];
int8 bytes; char *string = NULL;
char *string; int8 keystates[16];
int8 keystate[16]; int32 raw_char;
*((int32*)utf)=0;
msg.Read<bigtime_t>(&time); msg.Read<bigtime_t>(&time);
msg.Read<int32>(&scancode); msg.Read<int32>(&scancode);
msg.Read<int32>(&ascii); msg.Read<int32>(&raw_char);
msg.Read<int32>(&modifiers); msg.Read<int32>(&modifiers);
msg.Read(utf, sizeof(utf)); msg.Read(utf, sizeof(utf));
msg.Read<int8>(&bytes);
msg.ReadString(&string); msg.ReadString(&string);
msg.Read(keystate, sizeof(keystate)); msg.Read(keystates,sizeof(int8)*16);
if (string)
free(string);
STRACE(("Key Up: 0x%lx\n",scancode)); STRACE(("Key Up: 0x%lx\n",scancode));
@@ -1254,7 +1305,40 @@ void RootLayer::KeyboardEventHandler(int32 code, BPortLink& msg)
// We got this far, so apparently it's safe to pass to the active // We got this far, so apparently it's safe to pass to the active
// window. // window.
// TODO: Pass on key up message to client window with the focus Workspace *ws=ActiveWorkspace();
desktop->fGeneralLock.Lock();
fMainLock.Lock();
WinBorder *target=ws->FocusLayer();
if(target)
{
ServerWindow *win=target->Window();
if(win)
{
BMessage keymsg(B_KEY_UP);
keymsg.AddInt64("when",time);
keymsg.AddInt32("key",scancode);
keymsg.AddInt32("modifiers",modifiers);
keymsg.AddData("states",B_INT8_TYPE,keystates,sizeof(int8)*16);
for(uint8 i=0;i<4; i++)
{
if(utf[i])
keymsg.AddInt8("byte",utf[i]);
}
keymsg.AddString("bytes",string);
keymsg.AddInt32("raw_char",raw_char);
win->Lock();
win->SendMessageToClient(&keymsg);
win->Unlock();
}
}
fMainLock.Unlock();
desktop->fGeneralLock.Unlock();
if (string)
free(string);
break; break;
} }
case B_UNMAPPED_KEY_DOWN: case B_UNMAPPED_KEY_DOWN:
@@ -1263,26 +1347,44 @@ void RootLayer::KeyboardEventHandler(int32 code, BPortLink& msg)
// 1) int64 bigtime_t object of when the message was sent // 1) int64 bigtime_t object of when the message was sent
// 2) int32 raw key code (scancode) // 2) int32 raw key code (scancode)
// 3) int32 modifiers // 3) int32 modifiers
// 4) int32 number of elements in the key state array to follow // 4) int8 state of all keys
// 5) int8 state of all keys
bigtime_t time; bigtime_t time;
int32 scancode; int32 scancode, modifiers;
int32 modifiers; int8 keystates[16];
int32 elements;
//int8 keystate[16];
msg.Read<bigtime_t>(&time); msg.Read<bigtime_t>(&time);
msg.Read<int32>(&scancode); msg.Read<int32>(&scancode);
msg.Read<int32>(&modifiers); msg.Read<int32>(&modifiers);
msg.Read<int32>(&elements); msg.Read(keystates,sizeof(int8)*16);
//msg.Read(keystate, elements);
STRACE(("Unmapped Key Down: 0x%lx\n",scancode));
#ifdef DEBUG_KEYHANDLING
printf("Unmapped Key Down: 0x%lx\n", scancode);
#endif
// TODO: Pass on unmapped key down message to client window with the focus Workspace *ws=ActiveWorkspace();
desktop->fGeneralLock.Lock();
fMainLock.Lock();
WinBorder *target=ws->FocusLayer();
if(target)
{
ServerWindow *win=target->Window();
if(win)
{
BMessage keymsg(B_UNMAPPED_KEY_DOWN);
keymsg.AddInt64("when",time);
keymsg.AddInt32("key",scancode);
keymsg.AddInt32("modifiers",modifiers);
keymsg.AddData("states",B_INT8_TYPE,keystates,sizeof(int8)*16);
win->Lock();
win->SendMessageToClient(&keymsg);
win->Unlock();
}
}
fMainLock.Unlock();
desktop->fGeneralLock.Unlock();
break; break;
} }
case B_UNMAPPED_KEY_UP: case B_UNMAPPED_KEY_UP:
@@ -1291,26 +1393,44 @@ void RootLayer::KeyboardEventHandler(int32 code, BPortLink& msg)
// 1) int64 bigtime_t object of when the message was sent // 1) int64 bigtime_t object of when the message was sent
// 2) int32 raw key code (scancode) // 2) int32 raw key code (scancode)
// 3) int32 modifiers // 3) int32 modifiers
// 4) int32 number of elements in the key state array to follow // 4) int8 state of all keys
// 5) int8 state of all keys
bigtime_t time; bigtime_t time;
int32 scancode; int32 scancode, modifiers;
int32 modifiers; int8 keystates[16];
int32 elements;
//int8 keystate[16];
msg.Read<bigtime_t>(&time); msg.Read<bigtime_t>(&time);
msg.Read<int32>(&scancode); msg.Read<int32>(&scancode);
msg.Read<int32>(&modifiers); msg.Read<int32>(&modifiers);
msg.Read<int32>(&elements); msg.Read(keystates,sizeof(int8)*16);
//msg.Read(keystate, elements);
STRACE(("Unmapped Key Up: 0x%lx\n",scancode));
#ifdef DEBUG_KEYHANDLING
printf("Unmapped Key Up: 0x%lx\n", scancode); Workspace *ws=ActiveWorkspace();
#endif
desktop->fGeneralLock.Lock();
// TODO: Pass on unmapped key up message to client window with the focus fMainLock.Lock();
WinBorder *target=ws->FocusLayer();
if(target)
{
ServerWindow *win=target->Window();
if(win)
{
BMessage keymsg(B_UNMAPPED_KEY_UP);
keymsg.AddInt64("when",time);
keymsg.AddInt32("key",scancode);
keymsg.AddInt32("modifiers",modifiers);
keymsg.AddData("states",B_INT8_TYPE,keystates,sizeof(int8)*16);
win->Lock();
win->SendMessageToClient(&keymsg);
win->Unlock();
}
}
fMainLock.Unlock();
desktop->fGeneralLock.Unlock();
break; break;
} }
case B_MODIFIERS_CHANGED: case B_MODIFIERS_CHANGED:
@@ -1319,26 +1439,41 @@ void RootLayer::KeyboardEventHandler(int32 code, BPortLink& msg)
// 1) int64 bigtime_t object of when the message was sent // 1) int64 bigtime_t object of when the message was sent
// 2) int32 modifiers // 2) int32 modifiers
// 3) int32 old modifiers // 3) int32 old modifiers
// 4) int32 number of elements in the key state array to follow // 4) int8 state of all keys
// 5) int8 state of all keys
bigtime_t time; bigtime_t time;
int32 scancode; int32 modifiers,oldmodifiers;
int32 modifiers; int8 keystates[16];
int32 elements;
//int8 keystate[16];
msg.Read<bigtime_t>(&time); msg.Read<bigtime_t>(&time);
msg.Read<int32>(&scancode);
msg.Read<int32>(&modifiers); msg.Read<int32>(&modifiers);
msg.Read<int32>(&elements); msg.Read<int32>(&oldmodifiers);
//msg.Read(keystate, elements); msg.Read(keystates,sizeof(int8)*16);
#ifdef DEBUG_KEYHANDLING Workspace *ws=ActiveWorkspace();
printf("Modifiers Changed\n");
#endif desktop->fGeneralLock.Lock();
fMainLock.Lock();
// TODO: Pass on modifier change message to client window with the focus
WinBorder *target=ws->FocusLayer();
if(target)
{
ServerWindow *win=target->Window();
if(win)
{
BMessage keymsg(B_MODIFIERS_CHANGED);
keymsg.AddInt64("when",time);
keymsg.AddInt32("modifiers",modifiers);
keymsg.AddInt32("be:old_modifiers",oldmodifiers);
keymsg.AddData("states",B_INT8_TYPE,keystates,sizeof(int8)*16);
win->Lock();
win->SendMessageToClient(&keymsg);
win->Unlock();
}
}
fMainLock.Unlock();
desktop->fGeneralLock.Unlock();
break; break;
} }
default: default:
src/servers/app/server/ViewDriver.cpp
+15 -5
View File
@@ -280,7 +280,7 @@ void VDWindow::MessageReceived(BMessage *msg)
// 10) int8[16] state of all keys // 10) int8[16] state of all keys
bigtime_t systime; bigtime_t systime;
int32 scancode, asciicode,repeatcount,modifiers; int32 scancode, asciicode,repeatcount,modifiers;
int8 utf8data[3]; int8 utf8data[4];
BString string; BString string;
int8 keyarray[16]; int8 keyarray[16];
@@ -289,9 +289,14 @@ void VDWindow::MessageReceived(BMessage *msg)
msg->FindInt32("be:key_repeat",&repeatcount); msg->FindInt32("be:key_repeat",&repeatcount);
msg->FindInt32("modifiers",&modifiers); msg->FindInt32("modifiers",&modifiers);
msg->FindInt32("raw_char",&asciicode); msg->FindInt32("raw_char",&asciicode);
msg->FindInt8("byte",0,utf8data); msg->FindInt8("byte",0,utf8data);
msg->FindInt8("byte",1,utf8data+1); if(msg->FindInt8("byte",1,utf8data+1)!=B_OK)
msg->FindInt8("byte",2,utf8data+2); utf8data[1]=0;
if(msg->FindInt8("byte",1,utf8data+2)!=B_OK)
utf8data[2]=0;
if(msg->FindInt8("byte",1,utf8data+3)!=B_OK)
utf8data[3]=0;
msg->FindString("bytes",&string); msg->FindString("bytes",&string);
for(int8 i=0;i<15;i++) for(int8 i=0;i<15;i++)
msg->FindInt8("states",i,&keyarray[i]); msg->FindInt8("states",i,&keyarray[i]);
@@ -331,8 +336,12 @@ void VDWindow::MessageReceived(BMessage *msg)
msg->FindInt32("raw_char",&asciicode); msg->FindInt32("raw_char",&asciicode);
msg->FindInt32("modifiers",&modifiers); msg->FindInt32("modifiers",&modifiers);
msg->FindInt8("byte",0,utf8data); msg->FindInt8("byte",0,utf8data);
msg->FindInt8("byte",1,utf8data+1); if(msg->FindInt8("byte",1,utf8data+1)!=B_OK)
msg->FindInt8("byte",2,utf8data+2); utf8data[1]=0;
if(msg->FindInt8("byte",1,utf8data+2)!=B_OK)
utf8data[2]=0;
if(msg->FindInt8("byte",1,utf8data+3)!=B_OK)
utf8data[3]=0;
msg->FindString("bytes",&string); msg->FindString("bytes",&string);
for(int8 i=0;i<15;i++) for(int8 i=0;i<15;i++)
msg->FindInt8("states",i,&keyarray[i]); msg->FindInt8("states",i,&keyarray[i]);
@@ -413,6 +422,7 @@ void VDWindow::MessageReceived(BMessage *msg)
msg->FindInt32("be:old_modifiers",&oldmodifiers); msg->FindInt32("be:old_modifiers",&oldmodifiers);
for(int8 i=0;i<15;i++) for(int8 i=0;i<15;i++)
msg->FindInt8("states",i,&keyarray[i]); msg->FindInt8("states",i,&keyarray[i]);
view->serverlink->StartMessage(B_MODIFIERS_CHANGED); view->serverlink->StartMessage(B_MODIFIERS_CHANGED);
view->serverlink->Attach(&systime,sizeof(bigtime_t)); view->serverlink->Attach(&systime,sizeof(bigtime_t));
view->serverlink->Attach(scancode); view->serverlink->Attach(scancode);