[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:53:59 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 0d6e98f17337ae39ac98c703523b0bf909ce3e5c
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 10 00:26:10 2002 +0000
Passing mouse events to plug-ins
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@533 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/WKPluginView.h b/WebCore/kwq/WKPluginView.h
index a01fd6c..d7dd66b 100644
--- a/WebCore/kwq/WKPluginView.h
+++ b/WebCore/kwq/WKPluginView.h
@@ -28,7 +28,8 @@ typedef NPStream* NPS;
bool transferred;
NPWindow window;
NP_Port nPort;
-
+ uint16 transferMode;
+
NPP_NewProcPtr NPP_New;
NPP_DestroyProcPtr NPP_Destroy;
NPP_SetWindowProcPtr NPP_SetWindow;
@@ -49,7 +50,8 @@ typedef NPStream* NPS;
-(void)drawRect:(NSRect)rect;
-(BOOL)acceptsFirstResponder;
-(void)sendNullEvents;
--(void)mouseDown:(NSEvent *)event;
+-(void)mouseDown:(NSEvent *)theEvent;
+-(void)mouseUp:(NSEvent *)theEvent;
-(void)dealloc;
@end
diff --git a/WebCore/kwq/WKPluginView.mm b/WebCore/kwq/WKPluginView.mm
index d905256..1db88c0 100644
--- a/WebCore/kwq/WKPluginView.mm
+++ b/WebCore/kwq/WKPluginView.mm
@@ -11,6 +11,7 @@
#include <WCURICache.h>
#include <Carbon/Carbon.h>
+
@implementation WKPluginView
- initWithFrame: (NSRect) r widget: (QWidget *)w plugin: (WKPlugin *)plug url: (NSString *)location mime:(NSString *)mimeType
@@ -48,7 +49,6 @@
- (void)drawRect:(NSRect)rect {
NPError npErr;
char cMime[200], cURL[800];
- uint16 stype;
id <WCURICache> cache;
NSRect frame;
@@ -86,19 +86,19 @@
stream->notifyData = NULL;
[mime getCString:cMime];
- npErr = NPP_NewStream(instance, cMime, stream, TRUE, &stype);
+ npErr = NPP_NewStream(instance, cMime, stream, TRUE, &transferMode);
KWQDebug("NPP_NewStream: %d\n", npErr);
cache = WCGetDefaultURICache();
- if(stype == NP_NORMAL){
+ if(transferMode == NP_NORMAL){
KWQDebug("Stream type: NP_NORMAL\n");
[cache requestWithString:url requestor:self userData:nil];
- }else if(stype == NP_ASFILEONLY){
- KWQDebug("Stream type: NP_ASFILEONLY\n");
- }else if(stype == NP_ASFILE){
- KWQDebug("Stream type: NP_ASFILE\n");
- }else if(stype == NP_SEEK){
- KWQDebug("Stream type: NP_SEEK\n");
+ }else if(transferMode == NP_ASFILEONLY){
+ KWQDebug("Stream type: NP_ASFILEONLY not yet supported\n");
+ }else if(transferMode == NP_ASFILE){
+ KWQDebug("Stream type: NP_ASFILE not yet supported\n");
+ }else if(transferMode == NP_SEEK){
+ KWQDebug("Stream type: NP_SEEK not yet supported\n");
}
transferred = TRUE;
}
@@ -137,7 +137,7 @@
EventRecord event;
bool acceptedEvent;
- event.what = 0;
+ event.what = nullEvent;
acceptedEvent = NPP_HandleEvent(instance, &event);
//KWQDebug("NPP_HandleEvent: %d\n", acceptedEvent);
[self performSelector:@selector(sendNullEvents) withObject:nil afterDelay:0];
@@ -145,7 +145,42 @@
-(void)mouseDown:(NSEvent *)theEvent
{
+ EventRecord event;
+ bool acceptedEvent;
+ Point pt;
+ NSPoint viewPoint;
+ NSRect frame;
+
+ viewPoint = [self convertPoint:[theEvent locationInWindow] fromView:[[theEvent window] contentView]];
+ frame = [self frame];
+
+ pt.v = (short)viewPoint.y;
+ pt.h = (short)viewPoint.x;
+ event.what = mouseDown;
+ event.where = pt;
+ event.when = (uint32)[theEvent timestamp] / 60; // seconds to ticks
+ acceptedEvent = NPP_HandleEvent(instance, &event);
+ KWQDebug("NPP_HandleEvent(mouseDown): %d pt.v=%d, pt.h=%d ticks=%d\n", acceptedEvent, pt.v, pt.h, event.when);
+}
+-(void)mouseUp:(NSEvent *)theEvent
+{
+ EventRecord event;
+ bool acceptedEvent;
+ Point pt;
+ NSPoint viewPoint;
+ NSRect frame;
+
+ viewPoint = [self convertPoint:[theEvent locationInWindow] fromView:[[theEvent window] contentView]];
+ frame = [self frame];
+
+ pt.v = (short)viewPoint.y;
+ pt.h = (short)viewPoint.x;
+ event.what = mouseUp;
+ event.where = pt;
+ event.when = (uint32)[theEvent timestamp] / 60; // seconds to ticks
+ acceptedEvent = NPP_HandleEvent(instance, &event);
+ KWQDebug("NPP_HandleEvent(mouseUp): %d pt.v=%d, pt.h=%d ticks=%d\n", acceptedEvent, pt.v, pt.h, event.when);
}
-(void)dealloc
diff --git a/WebCore/src/kwq/WKPluginView.h b/WebCore/src/kwq/WKPluginView.h
index a01fd6c..d7dd66b 100644
--- a/WebCore/src/kwq/WKPluginView.h
+++ b/WebCore/src/kwq/WKPluginView.h
@@ -28,7 +28,8 @@ typedef NPStream* NPS;
bool transferred;
NPWindow window;
NP_Port nPort;
-
+ uint16 transferMode;
+
NPP_NewProcPtr NPP_New;
NPP_DestroyProcPtr NPP_Destroy;
NPP_SetWindowProcPtr NPP_SetWindow;
@@ -49,7 +50,8 @@ typedef NPStream* NPS;
-(void)drawRect:(NSRect)rect;
-(BOOL)acceptsFirstResponder;
-(void)sendNullEvents;
--(void)mouseDown:(NSEvent *)event;
+-(void)mouseDown:(NSEvent *)theEvent;
+-(void)mouseUp:(NSEvent *)theEvent;
-(void)dealloc;
@end
diff --git a/WebCore/src/kwq/WKPluginView.mm b/WebCore/src/kwq/WKPluginView.mm
index d905256..1db88c0 100644
--- a/WebCore/src/kwq/WKPluginView.mm
+++ b/WebCore/src/kwq/WKPluginView.mm
@@ -11,6 +11,7 @@
#include <WCURICache.h>
#include <Carbon/Carbon.h>
+
@implementation WKPluginView
- initWithFrame: (NSRect) r widget: (QWidget *)w plugin: (WKPlugin *)plug url: (NSString *)location mime:(NSString *)mimeType
@@ -48,7 +49,6 @@
- (void)drawRect:(NSRect)rect {
NPError npErr;
char cMime[200], cURL[800];
- uint16 stype;
id <WCURICache> cache;
NSRect frame;
@@ -86,19 +86,19 @@
stream->notifyData = NULL;
[mime getCString:cMime];
- npErr = NPP_NewStream(instance, cMime, stream, TRUE, &stype);
+ npErr = NPP_NewStream(instance, cMime, stream, TRUE, &transferMode);
KWQDebug("NPP_NewStream: %d\n", npErr);
cache = WCGetDefaultURICache();
- if(stype == NP_NORMAL){
+ if(transferMode == NP_NORMAL){
KWQDebug("Stream type: NP_NORMAL\n");
[cache requestWithString:url requestor:self userData:nil];
- }else if(stype == NP_ASFILEONLY){
- KWQDebug("Stream type: NP_ASFILEONLY\n");
- }else if(stype == NP_ASFILE){
- KWQDebug("Stream type: NP_ASFILE\n");
- }else if(stype == NP_SEEK){
- KWQDebug("Stream type: NP_SEEK\n");
+ }else if(transferMode == NP_ASFILEONLY){
+ KWQDebug("Stream type: NP_ASFILEONLY not yet supported\n");
+ }else if(transferMode == NP_ASFILE){
+ KWQDebug("Stream type: NP_ASFILE not yet supported\n");
+ }else if(transferMode == NP_SEEK){
+ KWQDebug("Stream type: NP_SEEK not yet supported\n");
}
transferred = TRUE;
}
@@ -137,7 +137,7 @@
EventRecord event;
bool acceptedEvent;
- event.what = 0;
+ event.what = nullEvent;
acceptedEvent = NPP_HandleEvent(instance, &event);
//KWQDebug("NPP_HandleEvent: %d\n", acceptedEvent);
[self performSelector:@selector(sendNullEvents) withObject:nil afterDelay:0];
@@ -145,7 +145,42 @@
-(void)mouseDown:(NSEvent *)theEvent
{
+ EventRecord event;
+ bool acceptedEvent;
+ Point pt;
+ NSPoint viewPoint;
+ NSRect frame;
+
+ viewPoint = [self convertPoint:[theEvent locationInWindow] fromView:[[theEvent window] contentView]];
+ frame = [self frame];
+
+ pt.v = (short)viewPoint.y;
+ pt.h = (short)viewPoint.x;
+ event.what = mouseDown;
+ event.where = pt;
+ event.when = (uint32)[theEvent timestamp] / 60; // seconds to ticks
+ acceptedEvent = NPP_HandleEvent(instance, &event);
+ KWQDebug("NPP_HandleEvent(mouseDown): %d pt.v=%d, pt.h=%d ticks=%d\n", acceptedEvent, pt.v, pt.h, event.when);
+}
+-(void)mouseUp:(NSEvent *)theEvent
+{
+ EventRecord event;
+ bool acceptedEvent;
+ Point pt;
+ NSPoint viewPoint;
+ NSRect frame;
+
+ viewPoint = [self convertPoint:[theEvent locationInWindow] fromView:[[theEvent window] contentView]];
+ frame = [self frame];
+
+ pt.v = (short)viewPoint.y;
+ pt.h = (short)viewPoint.x;
+ event.what = mouseUp;
+ event.where = pt;
+ event.when = (uint32)[theEvent timestamp] / 60; // seconds to ticks
+ acceptedEvent = NPP_HandleEvent(instance, &event);
+ KWQDebug("NPP_HandleEvent(mouseUp): %d pt.v=%d, pt.h=%d ticks=%d\n", acceptedEvent, pt.v, pt.h, event.when);
}
-(void)dealloc
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list