[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 e5f3b94cbf116bfa730d1aa46b6997f708a4d216
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 1 18:03:57 2002 +0000

    	Fixed:
    	2938010 - PLUGINS: right-click support
    	2938011 - PLUGINS: extended key events support
    	2970523 - Arrow key events not correctly passed to applets
    
            * Plugins.subproj/WebPluginView.m:
            (-[WebPluginView modifiersForEvent:]):
            (-[WebPluginView getCarbonEvent:withEvent:]):
            (-[WebPluginView mouseDown:]):
            (-[WebPluginView keyUp:]):
            (-[WebPluginView keyDown:]):
            (-[WebPluginView menuForEvent:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1715 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5ae00f3..a900103 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2002-08-01  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed:
+	2938010 - PLUGINS: right-click support
+	2938011 - PLUGINS: extended key events support
+	2970523 - Arrow key events not correctly passed to applets
+
+        * Plugins.subproj/WebPluginView.m:
+        (-[WebPluginView modifiersForEvent:]):
+        (-[WebPluginView getCarbonEvent:withEvent:]):
+        (-[WebPluginView mouseDown:]):
+        (-[WebPluginView keyUp:]):
+        (-[WebPluginView keyDown:]):
+        (-[WebPluginView menuForEvent:]):
+
 === Alexander-15 ===
 
 2002-08-01  Don Melton  <gramps at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 5ae00f3..a900103 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,18 @@
+2002-08-01  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed:
+	2938010 - PLUGINS: right-click support
+	2938011 - PLUGINS: extended key events support
+	2970523 - Arrow key events not correctly passed to applets
+
+        * Plugins.subproj/WebPluginView.m:
+        (-[WebPluginView modifiersForEvent:]):
+        (-[WebPluginView getCarbonEvent:withEvent:]):
+        (-[WebPluginView mouseDown:]):
+        (-[WebPluginView keyUp:]):
+        (-[WebPluginView keyDown:]):
+        (-[WebPluginView menuForEvent:]):
+
 === Alexander-15 ===
 
 2002-08-01  Don Melton  <gramps at apple.com>
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 4897885..266017c 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -23,6 +23,7 @@
 #import <WebFoundation/WebNSStringExtras.h>
 #import <WebFoundation/WebNSURLExtras.h>
 
+#import <AppKit/NSEvent_Private.h>
 #import <AppKit/NSWindow_Private.h>
 #import <Carbon/Carbon.h>
 
@@ -71,22 +72,26 @@
 
     if (modifierFlags & NSControlKeyMask || eventType == NSRightMouseDown)
         modifiers |= controlKey;
-
+    
     return modifiers;
 }
 
 - (void)getCarbonEvent:(EventRecord *)carbonEvent withEvent:(NSEvent *)cocoaEvent
 {
-    NSPoint where;
-    
-    where = [[cocoaEvent window] convertBaseToScreen:[cocoaEvent locationInWindow]];
-    
-    carbonEvent->what = nullEvent;
-    carbonEvent->message = 0;
-    carbonEvent->when = (UInt32)([cocoaEvent timestamp] * 60); // seconds to ticks
-    carbonEvent->where.h = (short)where.x;
-    carbonEvent->where.v = (short)(NSMaxY([[[NSScreen screens] objectAtIndex:0] frame]) - where.y);
-    carbonEvent->modifiers = [self modifiersForEvent:cocoaEvent];    
+    if([cocoaEvent _eventRef] && ConvertEventRefToEventRecord([cocoaEvent _eventRef], carbonEvent)){
+        return;
+    } else {
+        NSPoint where;
+        
+        where = [[cocoaEvent window] convertBaseToScreen:[cocoaEvent locationInWindow]];
+        
+        carbonEvent->what = nullEvent;
+        carbonEvent->message = 0;
+        carbonEvent->when = (UInt32)([cocoaEvent timestamp] * 60); // seconds to ticks
+        carbonEvent->where.h = (short)where.x;
+        carbonEvent->where.v = (short)(NSMaxY([[[NSScreen screens] objectAtIndex:0] frame]) - where.y);
+        carbonEvent->modifiers = [self modifiersForEvent:cocoaEvent];
+    }
 }
 
 - (UInt32)keyMessageForEvent:(NSEvent *)theEvent
@@ -175,10 +180,10 @@
 {
     EventRecord event;
     bool acceptedEvent;
-    
+
     [self getCarbonEvent:&event withEvent:theEvent];
     event.what = mouseDown;
-    
+
     acceptedEvent = NPP_HandleEvent(instance, &event);
     
     WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(mouseDown): %d pt.v=%d, pt.h=%d\n", acceptedEvent, event.where.v, event.where.h);
@@ -233,16 +238,21 @@
 
     [self getCarbonEvent:&event withEvent:theEvent];
     event.what = keyUp;
-    event.message = [self keyMessageForEvent:theEvent];
+
+    if(event.message == 0){
+        event.message = [self keyMessageForEvent:theEvent];
+    }
     
     acceptedEvent = NPP_HandleEvent(instance, &event);
-    
-    WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(keyUp): %d key:%c\n", acceptedEvent, (char) (event.message & charCodeMask));
+
+    WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(keyUp): %d charCode:%c keyCode:%lu\n",
+                     acceptedEvent, (char) (event.message & charCodeMask), (event.message & keyCodeMask));
     
     // If the plug-in didn't accept this event,
     // pass it along so that keyboard scrolling, for example, will work.
-    if (!acceptedEvent)
+    if (!acceptedEvent){
         [super keyUp:theEvent];
+    }
 }
 
 - (void)keyDown:(NSEvent *)theEvent
@@ -252,16 +262,34 @@
     
     [self getCarbonEvent:&event withEvent:theEvent];
     event.what = keyDown;
-    event.message = [self keyMessageForEvent:theEvent];
+
+    if(event.message == 0){
+        event.message = [self keyMessageForEvent:theEvent];
+    }
     
     acceptedEvent = NPP_HandleEvent(instance, &event);
-    
-    WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(keyDown): %d key:%c\n", acceptedEvent, (char) (event.message & charCodeMask));
+
+    WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(keyDown): %d charCode:%c keyCode:%lu\n",
+                     acceptedEvent, (char) (event.message & charCodeMask), (event.message & keyCodeMask));
     
     // If the plug-in didn't accept this event,
     // pass it along so that keyboard scrolling, for example, will work.
-    if (!acceptedEvent)
+    if (!acceptedEvent){
         [super keyDown:theEvent];
+    }
+}
+
+// Must subclass menuForEvent: for right-click to work.
+- (NSMenu *)menuForEvent:(NSEvent *)theEvent
+{
+    EventRecord event;
+    bool acceptedEvent;
+    
+    [self getCarbonEvent:&event withEvent:theEvent];
+    acceptedEvent = NPP_HandleEvent(instance, &event);
+    WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "NPP_HandleEvent(menuForEvent): %d pt.v=%d, pt.h=%d\n", acceptedEvent, event.where.v, event.where.h);
+
+    return nil;
 }
 
 #pragma mark WEB_PLUGIN_VIEW

-- 
WebKit Debian packaging