Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

routing key events to new app routine

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-06-21 16:09:15 +00:00
parent f11afffe01
commit ac2d1ca6c6
4 changed files with 262 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/mac/app.cpp
View File

@@ -1031,7 +1031,7 @@ bool wxApp::OnInit()
if ( ! wxAppBase::OnInit() ) if ( ! wxAppBase::OnInit() )
return FALSE ; return FALSE ;
#if TARGET_CARBON #if 0 // TARGET_CARBON
static const EventTypeSpec eventList[] = static const EventTypeSpec eventList[] =
{ {
{ kEventClassKeyboard, kEventRawKeyDown } , { kEventClassKeyboard, kEventRawKeyDown } ,
@@ -1726,26 +1726,39 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
short keychar ; short keychar ;
keychar = short(ev->message & charCodeMask); keychar = short(ev->message & charCodeMask);
keycode = short(ev->message & keyCodeMask) >> 8 ; keycode = short(ev->message & keyCodeMask) >> 8 ;
// it is wxWindows Convention to have Ctrl Key Combinations at ASCII char value
if ( ev->modifiers & controlKey && keychar >= 0 && keychar < 0x20 )
{
keychar += 0x40 ;
}
long keyval = wxMacTranslateKey(keychar, keycode) ; long keyval = wxMacTranslateKey(keychar, keycode) ;
bool handled = false ;
wxWindow* focus = wxWindow::FindFocus() ; wxWindow* focus = wxWindow::FindFocus() ;
if ( focus )
{
if ( MacSendKeyDownEvent( focus , keyval , ev->modifiers , ev->when , ev->where.h , ev->where.v ) == false )
{
// has not been handled -> perform default
wxControl* control = wxDynamicCast( focus , wxControl ) ;
if ( control && control->GetMacControl() != NULL )
{
::HandleControlKey( (ControlHandle) control->GetMacControl() , keycode , keychar , ev->modifiers ) ;
}
}
}
}
bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey )
{
bool handled = false ;
// it is wxWindows Convention to have Ctrl Key Combinations at ASCII char value
if ( modifiers & controlKey && keyval >= 0 && keyval < 0x20 )
{
keyval += 0x40 ;
}
wxKeyEvent event(wxEVT_KEY_DOWN); wxKeyEvent event(wxEVT_KEY_DOWN);
event.m_shiftDown = ev->modifiers & shiftKey; event.m_shiftDown = modifiers & shiftKey;
event.m_controlDown = ev->modifiers & controlKey; event.m_controlDown = modifiers & controlKey;
event.m_altDown = ev->modifiers & optionKey; event.m_altDown = modifiers & optionKey;
event.m_metaDown = ev->modifiers & cmdKey; event.m_metaDown = modifiers & cmdKey;
event.m_keyCode = keyval; event.m_keyCode = keyval;
event.m_x = ev->where.h;
event.m_y = ev->where.v; event.m_x = wherex;
event.m_timeStamp = ev->when; event.m_y = wherey;
event.m_timeStamp = when;
event.SetEventObject(focus); event.SetEventObject(focus);
handled = focus->GetEventHandler()->ProcessEvent( event ) ; handled = focus->GetEventHandler()->ProcessEvent( event ) ;
if ( handled && event.GetSkipped() ) if ( handled && event.GetSkipped() )
@@ -1774,16 +1787,9 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
} }
if (!handled) if (!handled)
{ {
wxKeyEvent event(wxEVT_CHAR); event.Skip( FALSE ) ;
event.m_shiftDown = ev->modifiers & shiftKey; event.SetEventType( wxEVT_CHAR ) ;
event.m_controlDown = ev->modifiers & controlKey;
event.m_altDown = ev->modifiers & optionKey;
event.m_metaDown = ev->modifiers & cmdKey;
event.m_keyCode = keyval;
event.m_x = ev->where.h;
event.m_y = ev->where.v;
event.m_timeStamp = ev->when;
event.SetEventObject(focus);
handled = focus->GetEventHandler()->ProcessEvent( event ) ; handled = focus->GetEventHandler()->ProcessEvent( event ) ;
if ( handled && event.GetSkipped() ) if ( handled && event.GetSkipped() )
handled = false ; handled = false ;
@@ -1810,12 +1816,12 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
if ( handled && new_event.GetSkipped() ) if ( handled && new_event.GetSkipped() )
handled = false ; handled = false ;
} }
} // backdoor handler for default return and command escape
if ( !handled ) if ( !handled && (!focus->IsKindOf(CLASSINFO(wxControl) ) || !focus->MacCanFocus() ) )
{ {
// if window is not having a focus still testing for default enter or cancel // if window is not having a focus still testing for default enter or cancel
// TODO add the UMA version for ActiveNonFloatingWindow // TODO add the UMA version for ActiveNonFloatingWindow
focus = wxFindWinFromMacWindow( FrontWindow() ) ; wxWindow* focus = wxFindWinFromMacWindow( FrontWindow() ) ;
if ( focus ) if ( focus )
{ {
if ( keyval == WXK_RETURN ) if ( keyval == WXK_RETURN )
@@ -1827,11 +1833,11 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
event.SetEventObject(def); event.SetEventObject(def);
def->Command(event); def->Command(event);
return ; return true ;
} }
} }
/* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */ /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
else if (keyval == WXK_ESCAPE || (keyval == '.' && ev->modifiers & cmdKey ) ) else if (keyval == WXK_ESCAPE || (keyval == '.' && modifiers & cmdKey ) )
{ {
wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL); wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
new_event.SetEventObject( focus ); new_event.SetEventObject( focus );
@@ -1839,9 +1845,10 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
} }
} }
} }
} return handled ;
} }
void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr ) void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr )
{ {
EventRecord* ev = (EventRecord*) evr ; EventRecord* ev = (EventRecord*) evr ;
@@ -1857,27 +1864,39 @@ void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr )
short keychar ; short keychar ;
keychar = short(ev->message & charCodeMask); keychar = short(ev->message & charCodeMask);
keycode = short(ev->message & keyCodeMask) >> 8 ; keycode = short(ev->message & keyCodeMask) >> 8 ;
wxWindow* focus = wxWindow::FindFocus() ;
if ( focus )
{
long keyval = wxMacTranslateKey(keychar, keycode) ; long keyval = wxMacTranslateKey(keychar, keycode) ;
wxKeyEvent event(wxEVT_KEY_UP); wxWindow* focus = wxWindow::FindFocus() ;
event.m_shiftDown = ev->modifiers & shiftKey; bool handled = MacSendKeyUpEvent( focus , keyval , ev->modifiers , ev->when , ev->where.h , ev->where.v ) ;
event.m_controlDown = ev->modifiers & controlKey; // we don't have to do anything under classic here
event.m_altDown = ev->modifiers & optionKey;
event.m_metaDown = ev->modifiers & cmdKey;
event.m_keyCode = keyval;
event.m_x = ev->where.h;
event.m_y = ev->where.v;
event.m_timeStamp = ev->when;
event.SetEventObject(focus);
bool handled = focus->GetEventHandler()->ProcessEvent( event ) ;
}
} }
} }
bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey )
{
bool handled = false ;
// it is wxWindows Convention to have Ctrl Key Combinations at ASCII char value
if ( modifiers & controlKey && keyval >= 0 && keyval < 0x20 )
{
keyval += 0x40 ;
}
if ( focus )
{
wxKeyEvent event(wxEVT_KEY_UP);
event.m_shiftDown = modifiers & shiftKey;
event.m_controlDown = modifiers & controlKey;
event.m_altDown = modifiers & optionKey;
event.m_metaDown = modifiers & cmdKey;
event.m_keyCode = keyval;
event.m_x = wherex;
event.m_y = wherey;
event.m_timeStamp = when;
event.SetEventObject(focus);
handled = focus->GetEventHandler()->ProcessEvent( event ) ;
}
return handled ;
}
void wxApp::MacHandleActivateEvent( WXEVENTREF evr ) void wxApp::MacHandleActivateEvent( WXEVENTREF evr )
{ {
EventRecord* ev = (EventRecord*) evr ; EventRecord* ev = (EventRecord*) evr ;

115
src/mac/carbon/app.cpp
View File

@@ -1031,7 +1031,7 @@ bool wxApp::OnInit()
if ( ! wxAppBase::OnInit() ) if ( ! wxAppBase::OnInit() )
return FALSE ; return FALSE ;
#if TARGET_CARBON #if 0 // TARGET_CARBON
static const EventTypeSpec eventList[] = static const EventTypeSpec eventList[] =
{ {
{ kEventClassKeyboard, kEventRawKeyDown } , { kEventClassKeyboard, kEventRawKeyDown } ,
@@ -1726,26 +1726,39 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
short keychar ; short keychar ;
keychar = short(ev->message & charCodeMask); keychar = short(ev->message & charCodeMask);
keycode = short(ev->message & keyCodeMask) >> 8 ; keycode = short(ev->message & keyCodeMask) >> 8 ;
// it is wxWindows Convention to have Ctrl Key Combinations at ASCII char value
if ( ev->modifiers & controlKey && keychar >= 0 && keychar < 0x20 )
{
keychar += 0x40 ;
}
long keyval = wxMacTranslateKey(keychar, keycode) ; long keyval = wxMacTranslateKey(keychar, keycode) ;
bool handled = false ;
wxWindow* focus = wxWindow::FindFocus() ; wxWindow* focus = wxWindow::FindFocus() ;
if ( focus )
{
if ( MacSendKeyDownEvent( focus , keyval , ev->modifiers , ev->when , ev->where.h , ev->where.v ) == false )
{
// has not been handled -> perform default
wxControl* control = wxDynamicCast( focus , wxControl ) ;
if ( control && control->GetMacControl() != NULL )
{
::HandleControlKey( (ControlHandle) control->GetMacControl() , keycode , keychar , ev->modifiers ) ;
}
}
}
}
bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey )
{
bool handled = false ;
// it is wxWindows Convention to have Ctrl Key Combinations at ASCII char value
if ( modifiers & controlKey && keyval >= 0 && keyval < 0x20 )
{
keyval += 0x40 ;
}
wxKeyEvent event(wxEVT_KEY_DOWN); wxKeyEvent event(wxEVT_KEY_DOWN);
event.m_shiftDown = ev->modifiers & shiftKey; event.m_shiftDown = modifiers & shiftKey;
event.m_controlDown = ev->modifiers & controlKey; event.m_controlDown = modifiers & controlKey;
event.m_altDown = ev->modifiers & optionKey; event.m_altDown = modifiers & optionKey;
event.m_metaDown = ev->modifiers & cmdKey; event.m_metaDown = modifiers & cmdKey;
event.m_keyCode = keyval; event.m_keyCode = keyval;
event.m_x = ev->where.h;
event.m_y = ev->where.v; event.m_x = wherex;
event.m_timeStamp = ev->when; event.m_y = wherey;
event.m_timeStamp = when;
event.SetEventObject(focus); event.SetEventObject(focus);
handled = focus->GetEventHandler()->ProcessEvent( event ) ; handled = focus->GetEventHandler()->ProcessEvent( event ) ;
if ( handled && event.GetSkipped() ) if ( handled && event.GetSkipped() )
@@ -1774,16 +1787,9 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
} }
if (!handled) if (!handled)
{ {
wxKeyEvent event(wxEVT_CHAR); event.Skip( FALSE ) ;
event.m_shiftDown = ev->modifiers & shiftKey; event.SetEventType( wxEVT_CHAR ) ;
event.m_controlDown = ev->modifiers & controlKey;
event.m_altDown = ev->modifiers & optionKey;
event.m_metaDown = ev->modifiers & cmdKey;
event.m_keyCode = keyval;
event.m_x = ev->where.h;
event.m_y = ev->where.v;
event.m_timeStamp = ev->when;
event.SetEventObject(focus);
handled = focus->GetEventHandler()->ProcessEvent( event ) ; handled = focus->GetEventHandler()->ProcessEvent( event ) ;
if ( handled && event.GetSkipped() ) if ( handled && event.GetSkipped() )
handled = false ; handled = false ;
@@ -1810,12 +1816,12 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
if ( handled && new_event.GetSkipped() ) if ( handled && new_event.GetSkipped() )
handled = false ; handled = false ;
} }
} // backdoor handler for default return and command escape
if ( !handled ) if ( !handled && (!focus->IsKindOf(CLASSINFO(wxControl) ) || !focus->MacCanFocus() ) )
{ {
// if window is not having a focus still testing for default enter or cancel // if window is not having a focus still testing for default enter or cancel
// TODO add the UMA version for ActiveNonFloatingWindow // TODO add the UMA version for ActiveNonFloatingWindow
focus = wxFindWinFromMacWindow( FrontWindow() ) ; wxWindow* focus = wxFindWinFromMacWindow( FrontWindow() ) ;
if ( focus ) if ( focus )
{ {
if ( keyval == WXK_RETURN ) if ( keyval == WXK_RETURN )
@@ -1827,11 +1833,11 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() );
event.SetEventObject(def); event.SetEventObject(def);
def->Command(event); def->Command(event);
return ; return true ;
} }
} }
/* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */ /* generate wxID_CANCEL if command-. or <esc> has been pressed (typically in dialogs) */
else if (keyval == WXK_ESCAPE || (keyval == '.' && ev->modifiers & cmdKey ) ) else if (keyval == WXK_ESCAPE || (keyval == '.' && modifiers & cmdKey ) )
{ {
wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL); wxCommandEvent new_event(wxEVT_COMMAND_BUTTON_CLICKED,wxID_CANCEL);
new_event.SetEventObject( focus ); new_event.SetEventObject( focus );
@@ -1839,9 +1845,10 @@ void wxApp::MacHandleKeyDownEvent( WXEVENTREF evr )
} }
} }
} }
} return handled ;
} }
void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr ) void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr )
{ {
EventRecord* ev = (EventRecord*) evr ; EventRecord* ev = (EventRecord*) evr ;
@@ -1857,27 +1864,39 @@ void wxApp::MacHandleKeyUpEvent( WXEVENTREF evr )
short keychar ; short keychar ;
keychar = short(ev->message & charCodeMask); keychar = short(ev->message & charCodeMask);
keycode = short(ev->message & keyCodeMask) >> 8 ; keycode = short(ev->message & keyCodeMask) >> 8 ;
wxWindow* focus = wxWindow::FindFocus() ;
if ( focus )
{
long keyval = wxMacTranslateKey(keychar, keycode) ; long keyval = wxMacTranslateKey(keychar, keycode) ;
wxKeyEvent event(wxEVT_KEY_UP); wxWindow* focus = wxWindow::FindFocus() ;
event.m_shiftDown = ev->modifiers & shiftKey; bool handled = MacSendKeyUpEvent( focus , keyval , ev->modifiers , ev->when , ev->where.h , ev->where.v ) ;
event.m_controlDown = ev->modifiers & controlKey; // we don't have to do anything under classic here
event.m_altDown = ev->modifiers & optionKey;
event.m_metaDown = ev->modifiers & cmdKey;
event.m_keyCode = keyval;
event.m_x = ev->where.h;
event.m_y = ev->where.v;
event.m_timeStamp = ev->when;
event.SetEventObject(focus);
bool handled = focus->GetEventHandler()->ProcessEvent( event ) ;
}
} }
} }
bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey )
{
bool handled = false ;
// it is wxWindows Convention to have Ctrl Key Combinations at ASCII char value
if ( modifiers & controlKey && keyval >= 0 && keyval < 0x20 )
{
keyval += 0x40 ;
}
if ( focus )
{
wxKeyEvent event(wxEVT_KEY_UP);
event.m_shiftDown = modifiers & shiftKey;
event.m_controlDown = modifiers & controlKey;
event.m_altDown = modifiers & optionKey;
event.m_metaDown = modifiers & cmdKey;
event.m_keyCode = keyval;
event.m_x = wherex;
event.m_y = wherey;
event.m_timeStamp = when;
event.SetEventObject(focus);
handled = focus->GetEventHandler()->ProcessEvent( event ) ;
}
return handled ;
}
void wxApp::MacHandleActivateEvent( WXEVENTREF evr ) void wxApp::MacHandleActivateEvent( WXEVENTREF evr )
{ {
EventRecord* ev = (EventRecord*) evr ; EventRecord* ev = (EventRecord*) evr ;

14
src/mac/carbon/toplevel.cpp
View File

@@ -234,6 +234,8 @@ void wxTopLevelWindowMac::SetIcon(const wxIcon& icon)
EventHandlerUPP wxMacWindowEventHandlerUPP = NULL ; EventHandlerUPP wxMacWindowEventHandlerUPP = NULL ;
extern long wxMacTranslateKey(unsigned char key, unsigned char code) ;
pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
{ {
OSStatus result = eventNotHandledErr ; OSStatus result = eventNotHandledErr ;
@@ -243,9 +245,19 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef
case kEventClassTextInput : case kEventClassTextInput :
if ( wxMacConvertEventToRecord( event , &rec ) ) if ( wxMacConvertEventToRecord( event , &rec ) )
{ {
wxTheApp->MacHandleOneEvent( &rec ) ; short keycode ;
short keychar ;
keychar = short(rec.message & charCodeMask);
keycode = short(rec.message & keyCodeMask) >> 8 ;
long keyval = wxMacTranslateKey(keychar, keycode) ;
wxWindow* focus = wxWindow::FindFocus() ;
if ( wxTheApp->MacSendKeyDownEvent( focus , keyval , rec.modifiers , rec.when , rec.where.h , rec.where.v ) )
{
// was handled internally
result = noErr ; result = noErr ;
} }
}
break ; break ;
default : default :
break ; break ;

14
src/mac/toplevel.cpp
View File

@@ -234,6 +234,8 @@ void wxTopLevelWindowMac::SetIcon(const wxIcon& icon)
EventHandlerUPP wxMacWindowEventHandlerUPP = NULL ; EventHandlerUPP wxMacWindowEventHandlerUPP = NULL ;
extern long wxMacTranslateKey(unsigned char key, unsigned char code) ;
pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
{ {
OSStatus result = eventNotHandledErr ; OSStatus result = eventNotHandledErr ;
@@ -243,9 +245,19 @@ pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef
case kEventClassTextInput : case kEventClassTextInput :
if ( wxMacConvertEventToRecord( event , &rec ) ) if ( wxMacConvertEventToRecord( event , &rec ) )
{ {
wxTheApp->MacHandleOneEvent( &rec ) ; short keycode ;
short keychar ;
keychar = short(rec.message & charCodeMask);
keycode = short(rec.message & keyCodeMask) >> 8 ;
long keyval = wxMacTranslateKey(keychar, keycode) ;
wxWindow* focus = wxWindow::FindFocus() ;
if ( wxTheApp->MacSendKeyDownEvent( focus , keyval , rec.modifiers , rec.when , rec.where.h , rec.where.v ) )
{
// was handled internally
result = noErr ; result = noErr ;
} }
}
break ; break ;
default : default :
break ; break ;