[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit b89a9004fdd2a7c68fbd42673b5e5ff5fa01eac1
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 13 00:17:38 2004 +0000

    WebKit:
    
    	Fixed:
    	<rdar://problem/3633296>: (Japanese input is not working properly in Carbon Web Kit applications (including CarbonWeb))
    	<rdar://problem/3631390>: (can't toggle between Input Methods (IMEs) using cmd-space in Carbon Web Kit applications)
    
            Reviewed by rjw.
    
    	* Carbon.subproj/CarbonWindowAdapter.m:
            (-[CarbonWindowAdapter sendSuperEvent:]): call [NSInputContext processInputKeyBindings:inEvent] just as NSApp does
            * Carbon.subproj/HIWebView.m:
            (HIWebViewEventHandler): [NSApp setWindowsNeedUpdate:YES] must be called before events so that ActivateTSMDocument is called to set an active document. Without an active document, TSM will use a default document which uses a bottom-line input window which we don't want.
    
    WebKitExamples:
    
    	Workaround for:
    	<rdar://problem/3633296>: (Japanese input is not working properly in Carbon Web Kit applications (including CarbonWeb))
    	<rdar://problem/3631390>: (can't toggle between Input Methods (IMEs) using cmd-space in Carbon Web Kit applications)
    
            Reviewed by rjw.
    
            * CarbonWeb/CarbonWeb.pbproj/project.pbxproj: xcode project update
            * CarbonWeb/TWebWindow.cp:
    		- [NSApp setWindowsNeedUpdate:YES] must be called before events so that ActivateTSMDocument is called to set an active document. Without an active document, TSM will use a default document which uses a bottom-line input window which we don't want.
    		- use Larry's command-space workaround for cmd-space toggling
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6582 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Carbon.subproj/CarbonWindowAdapter.m b/WebKit/Carbon.subproj/CarbonWindowAdapter.m
index bb1f34a..8e75295 100644
--- a/WebKit/Carbon.subproj/CarbonWindowAdapter.m
+++ b/WebKit/Carbon.subproj/CarbonWindowAdapter.m
@@ -112,6 +112,11 @@ extern const OSType NSCarbonWindowPropertyTag;
 @interface NSApplication(HIWebFrameView)
 - (void)setIsActive:(BOOL)aFlag;
 - (id)_setMouseActivationInProgress:(BOOL)flag;
+- (BOOL)_handleKeyEquivalent:(NSEvent*)theEvent;
+ at end
+
+ at interface NSInputContext
+- (BOOL)processInputKeyBindings:(NSEvent *)event;
 @end
 
 @implementation CarbonWindowAdapter
@@ -397,11 +402,15 @@ extern const OSType NSCarbonWindowPropertyTag;
         if (eventSubtype==7) {
             ignoreEvent = YES;
         }
+    } else if (eventType == NSKeyDown) {
+        // Handle command-space as [NSApp sendEvent:] does.
+        if ([NSInputContext processInputKeyBindings:inEvent]) {
+            return;
+        }
     }
-
+    
     // Simple.
     if (!ignoreEvent) [super sendEvent:inEvent];
-
 }
 
 
diff --git a/WebKit/Carbon.subproj/HIWebView.m b/WebKit/Carbon.subproj/HIWebView.m
index c57af56..4219207 100644
--- a/WebKit/Carbon.subproj/HIWebView.m
+++ b/WebKit/Carbon.subproj/HIWebView.m
@@ -1301,6 +1301,10 @@ HIWebViewEventHandler(
 	ControlPartCode		part;
 	HIWebView*			view = (HIWebView*)inUserData;
 
+        // [NSApp setWindowsNeedUpdate:YES] must be called before events so that ActivateTSMDocument is called to set an active document. 
+        // Without an active document, TSM will use a default document which uses a bottom-line input window which we don't want.
+        [NSApp setWindowsNeedUpdate:YES];
+        
 	switch ( GetEventClass( inEvent ) )
 	{
 		case kEventClassHIObject:
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c5fc0ad..8b9dd19 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2004-05-12  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 
+	<rdar://problem/3633296>: (Japanese input is not working properly in Carbon Web Kit applications (including CarbonWeb))
+	<rdar://problem/3631390>: (can't toggle between Input Methods (IMEs) using cmd-space in Carbon Web Kit applications)
+
+        Reviewed by rjw.
+
+	* Carbon.subproj/CarbonWindowAdapter.m:
+        (-[CarbonWindowAdapter sendSuperEvent:]): call [NSInputContext processInputKeyBindings:inEvent] just as NSApp does
+        * Carbon.subproj/HIWebView.m:
+        (HIWebViewEventHandler): [NSApp setWindowsNeedUpdate:YES] must be called before events so that ActivateTSMDocument is called to set an active document. Without an active document, TSM will use a default document which uses a bottom-line input window which we don't want.
+
 2004-05-11  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed:

-- 
WebKit Debian packaging