# HG changeset patch
# User Atul Varma <avarma@mozilla.com>
# Date 1271059770 25200
# Node ID 0e91c6d2a547ef76c341a75b9c6d8e591f54cb25
# Parent  ddc7cc16c48c124714c7ba089a835d9f97935e74
Integrated event tap code into quasimode code.

diff -r ddc7cc16c48c -r 0e91c6d2a547 Makefile
--- a/Makefile	Mon Apr 12 00:56:03 2010 -0700
+++ b/Makefile	Mon Apr 12 01:09:30 2010 -0700
@@ -1,7 +1,8 @@
 all: Quasimode TestQuasimodalEventTap
 
-Quasimode: JavaScriptQuasimode.o Quasimode.o
-	clang Quasimode.o JavaScriptQuasimode.o -oQuasimode \
+Quasimode: JavaScriptQuasimode.o Quasimode.o QuasimodalEventTap.o
+	clang QuasimodalEventTap.o Quasimode.o JavaScriptQuasimode.o \
+              -oQuasimode \
               -framework AppKit -framework WebKit \
               -framework JavaScriptCore
 
diff -r ddc7cc16c48c -r 0e91c6d2a547 Quasimode.h
--- a/Quasimode.h	Mon Apr 12 00:56:03 2010 -0700
+++ b/Quasimode.h	Mon Apr 12 01:09:30 2010 -0700
@@ -4,8 +4,9 @@
 @interface Quasimode : NSObject {
   NSWindow *window;
   WebView *view;
+  NSString *eventSource;
 }
-- (id)init;
+- (id)initWithEventSource:(NSString *)sourceName;
 - (NSWindow *)window;
 - (WebView *)view;
 @end
diff -r ddc7cc16c48c -r 0e91c6d2a547 Quasimode.m
--- a/Quasimode.m	Mon Apr 12 00:56:03 2010 -0700
+++ b/Quasimode.m	Mon Apr 12 01:09:30 2010 -0700
@@ -9,10 +9,13 @@
 
 #import "Quasimode.h"
 #import "JavaScriptQuasimode.h"
+#import "QuasimodalEventTap.h"
 
 @implementation Quasimode
-- (id)init {
+- (id)initWithEventSource:(NSString *)sourceName {
   if (self = [super init]) {
+    eventSource = [sourceName copy];
+
     NSRect rect = {{20, 20},
                    {100, 100}};
 
@@ -65,7 +68,11 @@
 
   [NSApplication sharedApplication];
 
-  Quasimode *app = [[Quasimode alloc] init];
+  QuasimodalEventTap *tap = [[QuasimodalEventTap alloc]
+                              initWithName: @"keyboard"
+                              quasimodeKey: kCGEventFlagMaskAlternate];
+
+  Quasimode *app = [[Quasimode alloc] initWithEventSource: @"keyboard"];
 
   [NSApp run];