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

I hate forgetting to check in files. :(

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8552 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm
2004-08-12 12:43:36 +00:00
parent 5b97efc5d8
commit 5a9fed59c3
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/Window.h
+3 -4
View File
@@ -51,7 +51,7 @@
// Local Includes -------------------------------------------------------------- // Local Includes --------------------------------------------------------------
// Local Defines --------------------------------------------------------------- // Local Defines ---------------------------------------------------------------
class PortLink; class BPortLink;
// Globals --------------------------------------------------------------------- // Globals ---------------------------------------------------------------------
@@ -122,7 +122,6 @@ enum {
//---------------------------------------------------------------- //----------------------------------------------------------------
class BSession;
class BButton; class BButton;
class BMenuBar; class BMenuBar;
class BMenuItem; class BMenuItem;
@@ -444,7 +443,7 @@ virtual BMessage *ConvertToMessage(void* raw, int32 code);
BView *top_view; // used BView *top_view; // used
BView *fFocus; // used BView *fFocus; // used
BView *fLastMouseMovedView; // used BView *fLastMouseMovedView; // used
BSession *session; // used void *a_session; // unused //changed from _BSession_
BMenuBar *fKeyMenuBar; // used BMenuBar *fKeyMenuBar; // used
BButton *fDefaultButton; // used BButton *fDefaultButton; // used
BList accelList; // used BList accelList; // used
@@ -468,7 +467,7 @@ virtual BMessage *ConvertToMessage(void* raw, int32 code);
ViewAttr *fCurDrawViewState; ViewAttr *fCurDrawViewState;
window_feel fFeel; // used window_feel fFeel; // used
int32 fLastViewToken; int32 fLastViewToken;
PortLink *fServerLink; // changed from: _CEventPort_* fEventPort; BPortLink *fLink; // used // changed from: _CEventPort_* fEventPort;
BMessageRunner *fPulseRunner; // used BMessageRunner *fPulseRunner; // used
BRect fCurrentFrame; BRect fCurrentFrame;
src/servers/input/InputServer.cpp
+11 -11
View File
@@ -34,7 +34,7 @@
#include <stdio.h> #include <stdio.h>
#include "InputServer.h" #include <InputServer.h>
#include <Path.h> #include <Path.h>
#include <Directory.h> #include <Directory.h>
#include <FindDirectory.h> #include <FindDirectory.h>
@@ -1069,13 +1069,13 @@ int InputServer::DispatchEvent(BMessage *message)
printf("[DispatchEvent] x = %lu:\n",xValue); printf("[DispatchEvent] x = %lu:\n",xValue);
port_id pid = find_port(SERVER_INPUT_PORT); port_id pid = find_port(SERVER_INPUT_PORT);
PortLink *appsvrlink = new PortLink(pid); BPortLink *appsvrlink = new BPortLink(pid);
switch(message->what){ switch(message->what){
case B_MOUSE_MOVED:{ case B_MOUSE_MOVED:{
// get point and button from msg // get point and button from msg
if((message->FindInt32(X_VALUE,&xValue) == B_OK) && (message->FindInt32(Y_VALUE,&yValue) == B_OK)){ if((message->FindInt32(X_VALUE,&xValue) == B_OK) && (message->FindInt32(Y_VALUE,&yValue) == B_OK)){
int64 time=(int64)real_time_clock(); int64 time=(int64)real_time_clock();
appsvrlink->SetOpCode(B_MOUSE_MOVED); appsvrlink->StartMessage(B_MOUSE_MOVED);
appsvrlink->Attach(&time,sizeof(int64)); appsvrlink->Attach(&time,sizeof(int64));
appsvrlink->Attach((float)xValue); appsvrlink->Attach((float)xValue);
appsvrlink->Attach((float)yValue); appsvrlink->Attach((float)yValue);
@@ -1098,7 +1098,7 @@ int InputServer::DispatchEvent(BMessage *message)
message->FindInt32("clicks",&clicks)!=B_OK) message->FindInt32("clicks",&clicks)!=B_OK)
break; break;
appsvrlink->SetOpCode(B_MOUSE_DOWN); appsvrlink->StartMessage(B_MOUSE_DOWN);
appsvrlink->Attach(&time, sizeof(int64)); appsvrlink->Attach(&time, sizeof(int64));
appsvrlink->Attach(&pt.x,sizeof(float)); appsvrlink->Attach(&pt.x,sizeof(float));
appsvrlink->Attach(&pt.y,sizeof(float)); appsvrlink->Attach(&pt.y,sizeof(float));
@@ -1117,7 +1117,7 @@ int InputServer::DispatchEvent(BMessage *message)
message->FindInt32("modifiers",&mod)!=B_OK) message->FindInt32("modifiers",&mod)!=B_OK)
break; break;
appsvrlink->SetOpCode(B_MOUSE_UP); appsvrlink->StartMessage(B_MOUSE_UP);
appsvrlink->Attach(&time, sizeof(int64)); appsvrlink->Attach(&time, sizeof(int64));
appsvrlink->Attach(&pt.x,sizeof(float)); appsvrlink->Attach(&pt.x,sizeof(float));
appsvrlink->Attach(&pt.y,sizeof(float)); appsvrlink->Attach(&pt.y,sizeof(float));
@@ -1131,7 +1131,7 @@ int InputServer::DispatchEvent(BMessage *message)
message->FindFloat("be:wheel_delta_y",&y); message->FindFloat("be:wheel_delta_y",&y);
int64 time=real_time_clock(); int64 time=real_time_clock();
appsvrlink->SetOpCode(B_MOUSE_WHEEL_CHANGED); appsvrlink->StartMessage(B_MOUSE_WHEEL_CHANGED);
appsvrlink->Attach(&time,sizeof(int64)); appsvrlink->Attach(&time,sizeof(int64));
appsvrlink->Attach(x); appsvrlink->Attach(x);
appsvrlink->Attach(y); appsvrlink->Attach(y);
@@ -1156,7 +1156,7 @@ int InputServer::DispatchEvent(BMessage *message)
message->FindString("bytes",&string); message->FindString("bytes",&string);
for(int8 i=0;i<15;i++) for(int8 i=0;i<15;i++)
message->FindInt8("states",i,&keyarray[i]); message->FindInt8("states",i,&keyarray[i]);
appsvrlink->SetOpCode(B_KEY_DOWN); appsvrlink->StartMessage(B_KEY_DOWN);
appsvrlink->Attach(&systime,sizeof(bigtime_t)); appsvrlink->Attach(&systime,sizeof(bigtime_t));
appsvrlink->Attach(scancode); appsvrlink->Attach(scancode);
appsvrlink->Attach(asciicode); appsvrlink->Attach(asciicode);
@@ -1186,7 +1186,7 @@ int InputServer::DispatchEvent(BMessage *message)
message->FindString("bytes",&string); message->FindString("bytes",&string);
for(int8 i=0;i<15;i++) for(int8 i=0;i<15;i++)
message->FindInt8("states",i,&keyarray[i]); message->FindInt8("states",i,&keyarray[i]);
appsvrlink->SetOpCode(B_KEY_UP); appsvrlink->StartMessage(B_KEY_UP);
appsvrlink->Attach(&systime,sizeof(bigtime_t)); appsvrlink->Attach(&systime,sizeof(bigtime_t));
appsvrlink->Attach(scancode); appsvrlink->Attach(scancode);
appsvrlink->Attach(asciicode); appsvrlink->Attach(asciicode);
@@ -1208,7 +1208,7 @@ int InputServer::DispatchEvent(BMessage *message)
message->FindInt32("modifiers",&modifiers); message->FindInt32("modifiers",&modifiers);
for(int8 i=0;i<15;i++) for(int8 i=0;i<15;i++)
message->FindInt8("states",i,&keyarray[i]); message->FindInt8("states",i,&keyarray[i]);
appsvrlink->SetOpCode(B_UNMAPPED_KEY_DOWN); appsvrlink->StartMessage(B_UNMAPPED_KEY_DOWN);
appsvrlink->Attach(&systime,sizeof(bigtime_t)); appsvrlink->Attach(&systime,sizeof(bigtime_t));
appsvrlink->Attach(scancode); appsvrlink->Attach(scancode);
appsvrlink->Attach(modifiers); appsvrlink->Attach(modifiers);
@@ -1226,7 +1226,7 @@ int InputServer::DispatchEvent(BMessage *message)
message->FindInt32("modifiers",&modifiers); message->FindInt32("modifiers",&modifiers);
for(int8 i=0;i<15;i++) for(int8 i=0;i<15;i++)
message->FindInt8("states",i,&keyarray[i]); message->FindInt8("states",i,&keyarray[i]);
appsvrlink->SetOpCode(B_UNMAPPED_KEY_UP); appsvrlink->StartMessage(B_UNMAPPED_KEY_UP);
appsvrlink->Attach(&systime,sizeof(bigtime_t)); appsvrlink->Attach(&systime,sizeof(bigtime_t));
appsvrlink->Attach(scancode); appsvrlink->Attach(scancode);
appsvrlink->Attach(modifiers); appsvrlink->Attach(modifiers);
@@ -1245,7 +1245,7 @@ int InputServer::DispatchEvent(BMessage *message)
message->FindInt32("be:old_modifiers",&oldmodifiers); message->FindInt32("be:old_modifiers",&oldmodifiers);
for(int8 i=0;i<15;i++) for(int8 i=0;i<15;i++)
message->FindInt8("states",i,&keyarray[i]); message->FindInt8("states",i,&keyarray[i]);
appsvrlink->SetOpCode(B_MODIFIERS_CHANGED); appsvrlink->StartMessage(B_MODIFIERS_CHANGED);
appsvrlink->Attach(&systime,sizeof(bigtime_t)); appsvrlink->Attach(&systime,sizeof(bigtime_t));
appsvrlink->Attach(scancode); appsvrlink->Attach(scancode);
appsvrlink->Attach(modifiers); appsvrlink->Attach(modifiers);
src/servers/input/InputServer.h
+2 -2
View File
@@ -47,7 +47,7 @@
#include <OS.h> #include <OS.h>
#include <SupportDefs.h> #include <SupportDefs.h>
class PortLink; class BPortLink;
class InputDeviceListItem class InputDeviceListItem
{ {
@@ -174,7 +174,7 @@ private:
// added this to communicate via portlink // added this to communicate via portlink
PortLink *serverlink; BPortLink *serverlink;
//fMouseState; //fMouseState;
}; };