Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Send BMessages to Haiku's app_server instead of PortLink ones. This is untested, but should work fine.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14521 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adi Oanca 2005-10-25 18:44:48 +00:00
parent 28d42d6e75
commit 3e5b79a7c6
2 changed files with 5 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

219
src/servers/input/InputServer.cpp
View File

@ -51,8 +51,6 @@
#include "MethodReplicant.h" #include "MethodReplicant.h"
#ifndef USE_R5_STYLE_COMM #ifndef USE_R5_STYLE_COMM
// include app_server headers for communication
#include <PortLink.h>
#include <ServerProtocol.h> #include <ServerProtocol.h>
#endif #endif
@ -181,11 +179,10 @@ InputServer::InputServer(void) : BApplication(INPUTSERVER_SIGNATURE),
PRINTERR(("error when send_data %s\n", strerror(err))); PRINTERR(("error when send_data %s\n", strerror(err)));
} }
#endif #endif
#ifdef APPSERVER_PORTLINK_COMM #ifdef HAIKU_APPSERVER_COMM
port_id input_port = find_port(SERVER_INPUT_PORT); fAsPort = find_port(SERVER_INPUT_PORT);
if (input_port == B_NAME_NOT_FOUND) if (fAsPort == B_NAME_NOT_FOUND)
PRINTERR(("input_server couldn't find app_server's input port\n")); PRINTERR(("input_server couldn't find app_server's input port\n"));
fAppServerLink = new BPrivate::PortLink(input_port);
#endif #endif
InitKeyboardMouseStates(); InitKeyboardMouseStates();
@ -1206,214 +1203,6 @@ InputServer::DispatchEvent(BMessage *message)
} }
} }
#ifdef APPSERVER_PORTLINK_COMM
if (!fAppServerLink) {
debugger("InputServer::DispatchEvent(): app_server link not valid\n");
return false;
}
switch(message->what){
case B_MOUSE_MOVED:{
uint32 buttons;
BPoint pt;
int64 time;
message->FindPoint("where",&pt);
message->FindInt64("when", &time);
fAppServerLink->StartMessage(B_MOUSE_MOVED);
fAppServerLink->Attach(&time,sizeof(int64));
fAppServerLink->Attach(&pt.x,sizeof(float));
fAppServerLink->Attach(&pt.y,sizeof(float));
message->FindInt32("buttons",buttons);
fAppServerLink->Attach(&buttons,sizeof(uint32));
fAppServerLink->Flush();
PRINT(("B_MOUSE_MOVED: x = %f: y = %f: time = %llu: buttons = %lu\n",pt.x,pt.y,time,buttons));
break;
}
case B_MOUSE_DOWN:{
BPoint pt;
int32 buttons,clicks,mod;
int64 time;
message->FindInt64("when", &time);
if(message->FindPoint("where",&pt)!=B_OK ||
message->FindInt32("modifiers",&mod)!=B_OK ||
message->FindInt32("buttons",&buttons)!=B_OK ||
message->FindInt32("clicks",&clicks)!=B_OK)
break;
fAppServerLink->StartMessage(B_MOUSE_DOWN);
fAppServerLink->Attach(&time, sizeof(int64));
fAppServerLink->Attach(&pt.x,sizeof(float));
fAppServerLink->Attach(&pt.y,sizeof(float));
fAppServerLink->Attach(&mod, sizeof(uint32));
fAppServerLink->Attach(&buttons, sizeof(uint32));
fAppServerLink->Attach(&clicks, sizeof(uint32));
fAppServerLink->Flush();
break;
}
case B_MOUSE_UP:{
BPoint pt;
int32 mod;
int64 time;
message->FindInt64("when", &time);
if(message->FindPoint("where",&pt)!=B_OK ||
message->FindInt32("modifiers",&mod)!=B_OK)
break;
fAppServerLink->StartMessage(B_MOUSE_UP);
fAppServerLink->Attach(&time, sizeof(int64));
fAppServerLink->Attach(&pt.x,sizeof(float));
fAppServerLink->Attach(&pt.y,sizeof(float));
fAppServerLink->Attach(&mod, sizeof(uint32));
fAppServerLink->Flush();
break;
}
case B_MOUSE_WHEEL_CHANGED:{
float x,y;
message->FindFloat("be:wheel_delta_x",&x);
message->FindFloat("be:wheel_delta_y",&y);
bigtime_t time;
message->FindInt64("when", &time);
fAppServerLink->StartMessage(B_MOUSE_WHEEL_CHANGED);
fAppServerLink->Attach(&time,sizeof(int64));
fAppServerLink->Attach(x);
fAppServerLink->Attach(y);
fAppServerLink->Flush();
break;
}
case B_KEY_DOWN:{
bigtime_t time;
int32 scancode, asciicode,repeatcount,modifiers;
int8 utf8data[3];
BString string;
uint8 keyarray[16];
message->FindInt64("when", &time);
message->FindInt32("key",&scancode);
message->FindInt32("be:key_repeat",&repeatcount);
message->FindInt32("modifiers",&modifiers);
message->FindInt32("raw_char",&asciicode);
message->FindInt8("byte",0,utf8data);
message->FindInt8("byte",1,utf8data+1);
message->FindInt8("byte",2,utf8data+2);
message->FindString("bytes",&string);
uint8 *data = NULL;
ssize_t size = 0;
if ((message->FindData("states", B_UINT8_TYPE, (const void**)&data, &size) == B_OK)
&& (size == (ssize_t)sizeof(keyarray))) {
memcpy(keyarray, data, size);
}
fAppServerLink->StartMessage(B_KEY_DOWN);
fAppServerLink->Attach(&time,sizeof(bigtime_t));
fAppServerLink->Attach(scancode);
fAppServerLink->Attach(asciicode);
fAppServerLink->Attach(repeatcount);
fAppServerLink->Attach(modifiers);
fAppServerLink->Attach(utf8data,sizeof(int8)*3);
fAppServerLink->AttachString(string.String());
fAppServerLink->Attach(keyarray,sizeof(int8)*16);
fAppServerLink->Flush();
break;
}
case B_KEY_UP:{
bigtime_t time;
int32 scancode, asciicode,modifiers;
int8 utf8data[3];
BString string;
uint8 keyarray[16];
message->FindInt64("when", &time);
message->FindInt32("key",&scancode);
message->FindInt32("raw_char",&asciicode);
message->FindInt32("modifiers",&modifiers);
message->FindInt8("byte",0,utf8data);
message->FindInt8("byte",1,utf8data+1);
message->FindInt8("byte",2,utf8data+2);
message->FindString("bytes",&string);
uint8 *data = NULL;
ssize_t size = 0;
if ((message->FindData("states", B_UINT8_TYPE, (const void**)&data, &size) == B_OK)
&& (size == (ssize_t)sizeof(keyarray))) {
memcpy(keyarray, data, size);
}
fAppServerLink->StartMessage(B_KEY_UP);
fAppServerLink->Attach(&time,sizeof(bigtime_t));
fAppServerLink->Attach(scancode);
fAppServerLink->Attach(asciicode);
fAppServerLink->Attach(modifiers);
fAppServerLink->Attach(utf8data,sizeof(int8)*3);
fAppServerLink->AttachString(string.String());
fAppServerLink->Attach(keyarray,sizeof(int8)*16);
fAppServerLink->Flush();
break;
}
case B_UNMAPPED_KEY_DOWN:{
bigtime_t time;
int32 scancode,modifiers;
int8 keyarray[16];
message->FindInt64("when", &time);
message->FindInt32("key",&scancode);
message->FindInt32("modifiers",&modifiers);
for(int8 i=0;i<15;i++)
message->FindInt8("states",i,&keyarray[i]);
fAppServerLink->StartMessage(B_UNMAPPED_KEY_DOWN);
fAppServerLink->Attach(&time,sizeof(bigtime_t));
fAppServerLink->Attach(scancode);
fAppServerLink->Attach(modifiers);
fAppServerLink->Attach(keyarray,sizeof(int8)*16);
fAppServerLink->Flush();
break;
}
case B_UNMAPPED_KEY_UP:{
bigtime_t time;
int32 scancode,modifiers;
int8 keyarray[16];
message->FindInt64("when", &time);
message->FindInt32("key",&scancode);
message->FindInt32("modifiers",&modifiers);
for(int8 i=0;i<15;i++)
message->FindInt8("states",i,&keyarray[i]);
fAppServerLink->StartMessage(B_UNMAPPED_KEY_UP);
fAppServerLink->Attach(&time,sizeof(bigtime_t));
fAppServerLink->Attach(scancode);
fAppServerLink->Attach(modifiers);
fAppServerLink->Attach(keyarray,sizeof(int8)*16);
fAppServerLink->Flush();
break;
}
case B_MODIFIERS_CHANGED:{
bigtime_t time;
int32 scancode,modifiers,oldmodifiers;
int8 keyarray[16];
message->FindInt64("when", &time);
message->FindInt32("key",&scancode);
message->FindInt32("modifiers",&modifiers);
message->FindInt32("be:old_modifiers",&oldmodifiers);
for(int8 i=0;i<15;i++)
message->FindInt8("states",i,&keyarray[i]);
fAppServerLink->StartMessage(B_MODIFIERS_CHANGED);
fAppServerLink->Attach(&time,sizeof(bigtime_t));
fAppServerLink->Attach(scancode);
fAppServerLink->Attach(modifiers);
fAppServerLink->Attach(oldmodifiers);
fAppServerLink->Attach(keyarray,sizeof(int8)*16);
fAppServerLink->Flush();
break;
}
default:
break;
}
#else // APPSERVER_PORTLINK_COMM
status_t err; status_t err;
ssize_t length = message->FlattenedSize(); ssize_t length = message->FlattenedSize();
@ -1423,8 +1212,6 @@ InputServer::DispatchEvent(BMessage *message)
if (fAsPort>0) if (fAsPort>0)
write_port(fAsPort, 0, buffer, length); write_port(fAsPort, 0, buffer, length);
#endif // APPSERVER_PORTLINK_COMM
return true; return true;
} }

14
src/servers/input/InputServer.h
View File

@ -53,7 +53,7 @@
#include <Screen.h> #include <Screen.h>
#include <SupportDefs.h> #include <SupportDefs.h>
#define APPSERVER_PORTLINK_COMM #define HAIKU_APPSERVER_COMM
#define R5_CURSOR_COMM // define this when R5 cursor communication should be used #define R5_CURSOR_COMM // define this when R5 cursor communication should be used
//#define APPSERVER_R5_COMM // define this when R5 app_server communication should be used //#define APPSERVER_R5_COMM // define this when R5 app_server communication should be used
@ -61,13 +61,7 @@
#ifdef APPSERVER_R5_COMM #ifdef APPSERVER_R5_COMM
#define R5_CURSOR_COMM #define R5_CURSOR_COMM
#undef APPSERVER_PORTLINK_COMM #undef HAIKU_APPSERVER_COMM
#endif
#ifdef APPSERVER_PORTLINK_COMM
namespace BPrivate {
class PortLink;
};
#endif #endif
class InputDeviceListItem class InputDeviceListItem
@ -241,10 +235,6 @@ private:
BottomlineWindow *fBLWindow; BottomlineWindow *fBLWindow;
bool fIMAware; bool fIMAware;
#ifdef APPSERVER_PORTLINK_COMM
// added this to communicate via portlink
BPrivate::PortLink *fAppServerLink;
#endif
#ifdef R5_CURSOR_COMM #ifdef R5_CURSOR_COMM
sem_id fCursorSem; sem_id fCursorSem;
port_id fAsPort; port_id fAsPort;