CWS-TOOLING: integrate CWS vcl97

2008-12-11 20:47:52 +0100 pl  r265361 : #i93173# revert change, event listeners on the toolbar can lead to crashes
2008-12-11 17:55:54 +0100 pl  r265344 : #i92715# fix some border cases
2008-12-11 16:36:01 +0100 pl  r265334 : remove forgotten debug printf
2008-12-11 15:54:25 +0100 pl  r265323 : add missing pointer initializer
2008-12-11 14:08:44 +0100 as  r265297 : #i86520# dont show start module twice
2008-12-11 12:56:34 +0100 as  r265289 : #i86520# dont show start module twice
2008-12-11 12:22:18 +0100 pl  r265280 : fix a snafu
2008-12-11 12:15:27 +0100 hdu  r265279 : #i96549# change some dbg_assert to dbg_warn
2008-12-11 11:57:22 +0100 pl  r265276 : #i86520# startcenter on dock item click for mac
2008-12-11 11:31:47 +0100 pl  r265271 : #i96964# fix a wrong condition
2008-12-11 11:21:49 +0100 as  r265268 : #i86520# new framework slot for ShowStartModule
2008-12-11 10:17:32 +0100 hdu  r265251 : #i97127# use fontconfig fallbacks for psprinting too (thanks CMC!)
2008-12-09 10:18:41 +0100 hdu  r265060 : #i96549# workaround MAC_OS_X_VERSION_* macros not defined in older SDKs
2008-12-09 09:39:47 +0100 hdu  r265057 : #i89650# workaround bogus device resolutions
2008-12-09 09:14:23 +0100 hdu  r265054 : #i96549# set MAC_OS_X_VERSION_MIN_REQUIRED=1040
2008-12-08 19:17:42 +0100 pl  r265016 : CWS-TOOLING: rebase CWS vcl97 to trunk@264807 (milestone: DEV300:m37)
2008-12-08 16:06:58 +0100 hdu  r265004 : #i96549# set MAC_OS_X_VERSION_MIN_REQUIRED=1040 only for the Aqua port
2008-12-08 12:16:26 +0100 hdu  r264988 : #i96549# prepare for MAC_OS_X_VERSION_MIN_REQUIRED>=1050
2008-12-08 11:59:25 +0100 hdu  r264982 : #i96549# set MAC_OS_X_VERSION_MIN_REQUIRED=1040
2008-12-04 18:19:43 +0100 pl  r264866 : #i86520# install a handler to be called on dock icon clicked
2008-12-03 13:04:32 +0100 pl  r264769 : #i96551# on quartz build neither gtk nor cups in psprint is needed
2008-11-26 15:07:07 +0100 hdu  r264400 : #i96317# adjust to extented SAL_DISABLE_FC_SUBST semantic
2008-11-21 16:15:31 +0100 pl  r264147 : #i94443# generalize focus behavior when a child window becomes invisible
2008-11-21 15:45:03 +0100 pl  r264144 : #i96433# improve torn off toolbar behavior
2008-11-21 11:50:01 +0100 pl  r264119 : #i90083# improve key event dispatching
2008-11-20 17:28:03 +0100 pl  r264076 : #i92715# do not execute app events during document recovery
2008-11-20 15:04:32 +0100 pl  r264057 : #i92224# #i93249# more aqua key codes
2008-11-20 14:03:00 +0100 pl  r264052 : #i92224# #i93249# remove debug printf
2008-11-20 14:00:29 +0100 pl  r264049 : #i92224# #i93249# more aqua key codes
2008-11-20 13:59:34 +0100 pl  r264048 : #i92224# #i93249# more aqua key codes
2008-11-20 13:52:38 +0100 pl  r264047 : #i92224# #i93249# more aqua key codes
2008-11-19 18:42:17 +0100 pl  r264017 : #i93249# support some mac specifc key codes: select to line end/begin
2008-11-19 18:40:26 +0100 pl  r264016 : #i93249# support some mac specifc key codes: select to line end/begin
2008-11-19 18:32:31 +0100 pl  r264014 : #i92224# support some mac specifc key codes: select to line end/begin
2008-11-19 17:34:50 +0100 pl  r264009 : #i92224# some more needed keycodes
2008-11-19 16:11:33 +0100 pl  r264003 : #i93249# support some mac specifc key codes
2008-11-19 16:10:31 +0100 pl  r264002 : #i93249# support some mac specifc key codes
2008-11-19 15:50:03 +0100 pl  r264000 : #i93249# support some mac specifc key codes
2008-11-19 14:17:41 +0100 pl  r263993 : #i90015# strip appended parenthese entries from menubar
2008-11-17 18:30:37 +0100 pl  r263737 : #i94601# emulate menu functionality for non vcl dialogs
2008-11-17 17:31:12 +0100 pl  r263731 : #i95263# set inactive tab color on mac more distinct from the active tab color
2008-11-17 17:13:38 +0100 pl  r263729 : #i93173# delete toolbar window in a more stack aware manner

2 files changed, 61 insertions, 7 deletions

diff --git a/vcl/aqua/source/app/saldata.cxx b/vcl/aqua/source/app/saldata.cxx
index b5092126790b..b110141fb224 100644
--- a/vcl/aqua/source/app/saldata.cxx
+++ b/vcl/aqua/source/app/saldata.cxx
@@ -61,7 +61,8 @@ SalData::SalData()
     mbIsScrollbarDoubleMax( false ),
     mnSystemVersion( VER_TIGER ),
     mpMainController( NULL ),
-    mbIsTestTool( false )
+    mbIsTestTool( false ),
+    mpDockIconClickHandler( nil )
 {
     if( s_aAutoReleaseKey == 0 )
         s_aAutoReleaseKey = osl_createThreadKey( releasePool );
diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm
index 4e7678e17a8d..9e933c7410b6 100755
--- a/vcl/aqua/source/app/vclnsapp.mm
+++ b/vcl/aqua/source/app/vclnsapp.mm
@@ -96,6 +96,10 @@
                since they tend to clash with system shortcuts on all platforms so
                we can skip this case here.
             */
+            // get information whether the event was handled; keyDown returns nothing
+            GetSalData()->maKeyEventAnswer[ pEvent ] = false;
+            bool bHandled = false;
+            
             if( nModMask != (NSCommandKeyMask | NSAlternateKeyMask) )
             {
                 // dispatch to view directly to avoid the key event being consumed by the menubar
@@ -105,7 +109,7 @@
                 if( pFrame->mpParent && (pFrame->mnStyle & SAL_FRAME_STYLE_FLOAT) == 0 ) 
                 {
                     [[pKeyWin contentView] keyDown: pEvent];
-                    return;
+                    bHandled = GetSalData()->maKeyEventAnswer[ pEvent ];
                 }
                 
                 // see whether the main menu consumes this event
@@ -113,13 +117,46 @@
                 // the main menu just beeps for an unknown or disabled key equivalent
                 // and swallows the event wholesale
                 NSMenu* pMainMenu = [NSApp mainMenu];
-                if( pMainMenu == 0 || ! [pMainMenu performKeyEquivalent: pEvent] )
+                if( ! bHandled && (pMainMenu == 0 || ! [pMainMenu performKeyEquivalent: pEvent]) )
+                {
                     [[pKeyWin contentView] keyDown: pEvent];
-                
-                // at this point either the menu has executed the accelerator
-                // or we have dispatched the event
-                // so no need to dispatch further
+                    bHandled = GetSalData()->maKeyEventAnswer[ pEvent ];
+                }
+                else
+                    bHandled = true;  // event handled already or main menu just handled it
+            }
+            GetSalData()->maKeyEventAnswer.erase( pEvent );
+            if( bHandled )
                 return;
+        }
+        else if( pKeyWin )
+        {
+            // #i94601# a window not of vcl's making has the focus.
+            // Since our menus do not invoke the usual commands
+            // try to play nice with native windows like the file dialog
+            // and emulate them
+            // precondition: this ONLY works because CMD-V (paste), CMD-C (copy) and CMD-X (cut) are
+            // NOT localized, that is the same in all locales. Should this be
+            // different in any locale, this hack will fail.
+            unsigned int nModMask = ([pEvent modifierFlags] & (NSShiftKeyMask|NSControlKeyMask|NSAlternateKeyMask|NSCommandKeyMask));
+            if( nModMask == NSCommandKeyMask )
+            {
+                
+                if( [[pEvent charactersIgnoringModifiers] isEqualToString: @"v"] )
+                {
+                    if( [NSApp sendAction: @selector(paste:) to: nil from: nil] )
+                        return;
+                }
+                else if( [[pEvent charactersIgnoringModifiers] isEqualToString: @"c"] )
+                {
+                    if( [NSApp sendAction: @selector(copy:) to: nil from: nil] )
+                        return;
+                }
+                else if( [[pEvent charactersIgnoringModifiers] isEqualToString: @"x"] )
+                {
+                    if( [NSApp sendAction: @selector(cut:) to: nil from: nil] )
+                        return;
+                }
             }
         }
     }
@@ -381,5 +418,21 @@
     }
 }
 
+- (MacOSBOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (MacOSBOOL) bWinVisible
+{
+    NSObject* pHdl = GetSalData()->mpDockIconClickHandler;
+    if( pHdl && [pHdl respondsToSelector: @selector(dockIconClicked:)] )
+    {
+        [pHdl performSelector:@selector(dockIconClicked:) withObject: self];
+    }
+    return YES;
+}
+
+-(void)setDockIconClickHandler: (NSObject*)pHandler
+{
+    GetSalData()->mpDockIconClickHandler = pHandler;
+}
+
+
 @end