|
| From: | Alexander Pipelka <address@hidden> |
| Subject: | [paragui-cvs] CVS: paragui/src/core pgapplication.cpp,1.9,1.10 pgmessageobject.cpp,1.7,1.8 |
| Date: | Mon, 06 May 2002 07:18:07 -0400 |
Update of /cvsroot/paragui/paragui/src/core
In directory subversions:/tmp/cvs-serv12549/src/core
Modified Files:
pgapplication.cpp pgmessageobject.cpp
Log Message:
message cleanup
moved some (more) functions from PG_MessageObject to PG_Application
Index: pgapplication.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgapplication.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** pgapplication.cpp 6 May 2002 06:24:29 -0000 1.9
--- pgapplication.cpp 6 May 2002 11:18:03 -0000 1.10
***************
*** 933,948 ****
}
- SDL_Event PG_Application::WaitEvent(Uint32 delay) {
- static SDL_Event event;
-
- while(SDL_PollEvent(&event) == 0) {
- if(delay > 0) {
- SDL_Delay(delay);
- }
- }
-
- return event;
- }
-
bool PG_Application::PumpIntoEventQueue(const SDL_Event* event) {
PG_Widget* widget = NULL;
--- 933,936 ----
***************
*** 969,973 ****
// do we have a capture hook?
if(captureObject) {
! return captureObject->ProcessEvent(event);
}
break;
--- 957,963 ----
// do we have a capture hook?
if(captureObject) {
! if(captureObject->ProcessEvent(event)) {
! return true;
! }
}
break;
***************
*** 984,991 ****
return true;
}
- // if the focus object doesn't respond ->
forget it
- return false;
}
! break;
case SDL_MOUSEMOTION:
--- 974,980 ----
return true;
}
}
! // if the focus object doesn't respond -> try to
process it
! return ProcessEvent(event);
case SDL_MOUSEMOTION:
***************
*** 1014,1029 ****
}
- // send to all receivers
- /*bool processed = false;
- std::vector<PG_MessageObject*>::iterator list = objectList.begin();
- while(list != objectList.end()) {
- if((*list)->ProcessEvent(event)) {
- processed = true;
- break; // exit loop if an object responds
- }
- list++;
- }
-
- return processed;*/
return false;
}
--- 1003,1006 ----
***************
*** 1066,1069 ****
--- 1043,1200 ----
}
+ void PG_Application::TranslateNumpadKeys(SDL_KeyboardEvent *key) {
+ // note: works on WIN, test this on other platforms
+
+ // numeric keypad translation
+ if (key->keysym.unicode==0) { // just optimalisation
+ if (key->keysym.mod & KMOD_NUM) {
+ // numeric keypad is enabled
+ switch (key->keysym.sym) {
+ case SDLK_KP0 :
+ key->keysym.sym = SDLK_0;
+ key->keysym.unicode = SDLK_0;
+ break;
+ case SDLK_KP1 :
+ key->keysym.sym = SDLK_1;
+ key->keysym.unicode = SDLK_1;
+ break;
+ case SDLK_KP2 :
+ key->keysym.sym = SDLK_2;
+ key->keysym.unicode = SDLK_2;
+ break;
+ case SDLK_KP3 :
+ key->keysym.sym = SDLK_3;
+ key->keysym.unicode = SDLK_3;
+ break;
+ case SDLK_KP4 :
+ key->keysym.sym = SDLK_4;
+ key->keysym.unicode = SDLK_4;
+ break;
+ case SDLK_KP5 :
+ key->keysym.sym = SDLK_5;
+ key->keysym.unicode = SDLK_5;
+ break;
+ case SDLK_KP6 :
+ key->keysym.sym = SDLK_6;
+ key->keysym.unicode = SDLK_6;
+ break;
+ case SDLK_KP7 :
+ key->keysym.sym = SDLK_7;
+ key->keysym.unicode = SDLK_7;
+ break;
+ case SDLK_KP8 :
+ key->keysym.sym = SDLK_8;
+ key->keysym.unicode = SDLK_8;
+ break;
+ case SDLK_KP9 :
+ key->keysym.sym = SDLK_9;
+ key->keysym.unicode = SDLK_9;
+ break;
+ case SDLK_KP_PERIOD :
+ key->keysym.sym = SDLK_PERIOD;
+ key->keysym.unicode = SDLK_PERIOD;
+ break;
+ case SDLK_KP_DIVIDE :
+ key->keysym.sym = SDLK_BACKSLASH;
+ key->keysym.unicode = SDLK_BACKSLASH;
+ break;
+ case SDLK_KP_MULTIPLY:
+ key->keysym.sym = SDLK_ASTERISK;
+ key->keysym.unicode = SDLK_ASTERISK;
+ break;
+ case SDLK_KP_MINUS :
+ key->keysym.sym = SDLK_MINUS;
+ key->keysym.unicode = SDLK_MINUS;
+ break;
+ case SDLK_KP_PLUS :
+ key->keysym.sym = SDLK_PLUS;
+ key->keysym.unicode = SDLK_PLUS;
+ break;
+ case SDLK_KP_ENTER :
+ key->keysym.sym = SDLK_RETURN;
+ key->keysym.unicode = SDLK_RETURN;
+ break;
+ case SDLK_KP_EQUALS :
+ key->keysym.sym = SDLK_EQUALS;
+ key->keysym.unicode = SDLK_EQUALS;
+ break;
+
+ default:
+ break;
+ }
+ } else {
+ // numeric keypad is disabled
+ switch (key->keysym.sym) {
+ case SDLK_KP0 :
+ key->keysym.sym = SDLK_INSERT;
+ key->keysym.unicode = 0;
+ break;
+ case SDLK_KP1 :
+ key->keysym.sym = SDLK_END;
+ key->keysym.unicode = 0;
+ break;
+ case SDLK_KP2 :
+ key->keysym.sym = SDLK_DOWN;
+ key->keysym.unicode = 0;
+ break;
+ case SDLK_KP3 :
+ key->keysym.sym = SDLK_PAGEDOWN;
+ key->keysym.unicode = 0;
+ break;
+ case SDLK_KP4 :
+ key->keysym.sym = SDLK_LEFT;
+ key->keysym.unicode = 0;
+ break;
+ case SDLK_KP6 :
+ key->keysym.sym = SDLK_RIGHT;
+ key->keysym.unicode = 0;
+ break;
+ case SDLK_KP7 :
+ key->keysym.sym = SDLK_HOME;
+ key->keysym.unicode = 0;
+ break;
+ case SDLK_KP8 :
+ key->keysym.sym = SDLK_UP;
+ key->keysym.unicode = 0;
+ break;
+ case SDLK_KP9 :
+ key->keysym.sym = SDLK_PAGEUP;
+ key->keysym.unicode = 0;
+ break;
+ case SDLK_KP_PERIOD :
+ key->keysym.sym = SDLK_DELETE;
+ key->keysym.unicode = 0;
+ break;
+ case SDLK_KP_DIVIDE :
+ key->keysym.sym = SDLK_BACKSLASH;
+ key->keysym.unicode = SDLK_BACKSLASH;
+ break;
+ case SDLK_KP_MULTIPLY:
+ key->keysym.sym = SDLK_ASTERISK;
+ key->keysym.unicode = SDLK_ASTERISK;
+ break;
+ case SDLK_KP_MINUS :
+ key->keysym.sym = SDLK_MINUS;
+ key->keysym.unicode = SDLK_MINUS;
+ break;
+ case SDLK_KP_PLUS :
+ key->keysym.sym = SDLK_PLUS;
+ key->keysym.unicode = SDLK_PLUS;
+ break;
+ case SDLK_KP_ENTER :
+ key->keysym.sym = SDLK_RETURN;
+ key->keysym.unicode = SDLK_RETURN;
+ break;
+ case SDLK_KP_EQUALS :
+ key->keysym.sym = SDLK_EQUALS;
+ key->keysym.unicode = SDLK_EQUALS;
+ break;
+
+ default:
+ break;
+ }
+ }
+ }
+ }
/*
Index: pgmessageobject.cpp
===================================================================
RCS file: /cvsroot/paragui/paragui/src/core/pgmessageobject.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** pgmessageobject.cpp 6 May 2002 06:24:29 -0000 1.7
--- pgmessageobject.cpp 6 May 2002 11:18:03 -0000 1.8
***************
*** 195,353 ****
- void PG_MessageObject::TranslateNumpadKeys(SDL_KeyboardEvent *key) {
- // note: works on WIN, test this on other platforms
-
- // numeric keypad translation
- if (key->keysym.unicode==0) { // just optimalisation
- if (key->keysym.mod & KMOD_NUM) {
- // numeric keypad is enabled
- switch (key->keysym.sym) {
- case SDLK_KP0 :
- key->keysym.sym = SDLK_0;
- key->keysym.unicode = SDLK_0;
- break;
- case SDLK_KP1 :
- key->keysym.sym = SDLK_1;
- key->keysym.unicode = SDLK_1;
- break;
- case SDLK_KP2 :
- key->keysym.sym = SDLK_2;
- key->keysym.unicode = SDLK_2;
- break;
- case SDLK_KP3 :
- key->keysym.sym = SDLK_3;
- key->keysym.unicode = SDLK_3;
- break;
- case SDLK_KP4 :
- key->keysym.sym = SDLK_4;
- key->keysym.unicode = SDLK_4;
- break;
- case SDLK_KP5 :
- key->keysym.sym = SDLK_5;
- key->keysym.unicode = SDLK_5;
- break;
- case SDLK_KP6 :
- key->keysym.sym = SDLK_6;
- key->keysym.unicode = SDLK_6;
- break;
- case SDLK_KP7 :
- key->keysym.sym = SDLK_7;
- key->keysym.unicode = SDLK_7;
- break;
- case SDLK_KP8 :
- key->keysym.sym = SDLK_8;
- key->keysym.unicode = SDLK_8;
- break;
- case SDLK_KP9 :
- key->keysym.sym = SDLK_9;
- key->keysym.unicode = SDLK_9;
- break;
- case SDLK_KP_PERIOD :
- key->keysym.sym = SDLK_PERIOD;
- key->keysym.unicode = SDLK_PERIOD;
- break;
- case SDLK_KP_DIVIDE :
- key->keysym.sym = SDLK_BACKSLASH;
- key->keysym.unicode = SDLK_BACKSLASH;
- break;
- case SDLK_KP_MULTIPLY:
- key->keysym.sym = SDLK_ASTERISK;
- key->keysym.unicode = SDLK_ASTERISK;
- break;
- case SDLK_KP_MINUS :
- key->keysym.sym = SDLK_MINUS;
- key->keysym.unicode = SDLK_MINUS;
- break;
- case SDLK_KP_PLUS :
- key->keysym.sym = SDLK_PLUS;
- key->keysym.unicode = SDLK_PLUS;
- break;
- case SDLK_KP_ENTER :
- key->keysym.sym = SDLK_RETURN;
- key->keysym.unicode = SDLK_RETURN;
- break;
- case SDLK_KP_EQUALS :
- key->keysym.sym = SDLK_EQUALS;
- key->keysym.unicode = SDLK_EQUALS;
- break;
-
- default:
- break;
- }
- } else {
- // numeric keypad is disabled
- switch (key->keysym.sym) {
- case SDLK_KP0 :
- key->keysym.sym = SDLK_INSERT;
- key->keysym.unicode = 0;
- break;
- case SDLK_KP1 :
- key->keysym.sym = SDLK_END;
- key->keysym.unicode = 0;
- break;
- case SDLK_KP2 :
- key->keysym.sym = SDLK_DOWN;
- key->keysym.unicode = 0;
- break;
- case SDLK_KP3 :
- key->keysym.sym = SDLK_PAGEDOWN;
- key->keysym.unicode = 0;
- break;
- case SDLK_KP4 :
- key->keysym.sym = SDLK_LEFT;
- key->keysym.unicode = 0;
- break;
- case SDLK_KP6 :
- key->keysym.sym = SDLK_RIGHT;
- key->keysym.unicode = 0;
- break;
- case SDLK_KP7 :
- key->keysym.sym = SDLK_HOME;
- key->keysym.unicode = 0;
- break;
- case SDLK_KP8 :
- key->keysym.sym = SDLK_UP;
- key->keysym.unicode = 0;
- break;
- case SDLK_KP9 :
- key->keysym.sym = SDLK_PAGEUP;
- key->keysym.unicode = 0;
- break;
- case SDLK_KP_PERIOD :
- key->keysym.sym = SDLK_DELETE;
- key->keysym.unicode = 0;
- break;
- case SDLK_KP_DIVIDE :
- key->keysym.sym = SDLK_BACKSLASH;
- key->keysym.unicode = SDLK_BACKSLASH;
- break;
- case SDLK_KP_MULTIPLY:
- key->keysym.sym = SDLK_ASTERISK;
- key->keysym.unicode = SDLK_ASTERISK;
- break;
- case SDLK_KP_MINUS :
- key->keysym.sym = SDLK_MINUS;
- key->keysym.unicode = SDLK_MINUS;
- break;
- case SDLK_KP_PLUS :
- key->keysym.sym = SDLK_PLUS;
- key->keysym.unicode = SDLK_PLUS;
- break;
- case SDLK_KP_ENTER :
- key->keysym.sym = SDLK_RETURN;
- key->keysym.unicode = SDLK_RETURN;
- break;
- case SDLK_KP_EQUALS :
- key->keysym.sym = SDLK_EQUALS;
- key->keysym.unicode = SDLK_EQUALS;
- break;
-
- default:
- break;
- }
- }
- }
- }
-
PG_MessageObject* PG_MessageObject::GetCapture() {
return captureObject;
--- 195,198 ----
| [Prev in Thread] | Current Thread | [Next in Thread] |