Cleanup

Eljaja · Nov 9, 2009 · 10e4fca · 10e4fca
1 parent 40f81ca
commit 10e4fca
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 26 deletions.
diff --git a/Controller.h b/Controller.h
@@ -10,7 +10,7 @@
 
 
 @interface Controller : NSObject {
-	
+
 }
 
 typedef struct { float x,y; } mtPoint;
@@ -29,8 +29,22 @@ typedef struct {
 	float unk2;
 } Finger;
 
-BOOL needToClick;
+typedef int MTDeviceRef;
+typedef int (*MTContactCallbackFunction)(int,Finger*,int,double,int);
+
+MTDeviceRef MTDeviceCreateDefault();
+void MTRegisterContactFrameCallback(MTDeviceRef, MTContactCallbackFunction);
+void MTDeviceStart(MTDeviceRef);
+CFMutableArrayRef MTDeviceCreateList(void); //returns a CFMutableArrayRef array of all multitouch devices
 
+NSDate *touchStartTime;
+float middleclickX, middleclickY;
+float middleclickX2, middleclickY2;
+MTDeviceRef dev;
+
+BOOL needToClick;
+BOOL maybeMiddleClick;
+BOOL pressed;
 
 int callback(int device, Finger *data, int nFingers, double timestamp, int frame);
 - (void) start;

diff --git a/Controller.m b/Controller.m
@@ -16,28 +16,13 @@
 #import "WakeObserver.h"
 
 
-typedef int MTDeviceRef;
-typedef int (*MTContactCallbackFunction)(int,Finger*,int,double,int);
-
-MTDeviceRef MTDeviceCreateDefault();
-void MTRegisterContactFrameCallback(MTDeviceRef, MTContactCallbackFunction);
-void MTDeviceStart(MTDeviceRef);
-CFMutableArrayRef MTDeviceCreateList(void); //returns a CFMutableArrayRef array of all multitouch devices
-
-BOOL maybeMiddleClick;
-NSDate *touchStartTime;
-float middleclickX, middleclickY;
-float middleclickX2, middleclickY2;
-MTDeviceRef dev;
-BOOL pressed = NO;
-
-
 
 
 @implementation Controller
 
 - (void) start
 {
+	pressed = NO;
 	needToClick = YES;
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];	
     [NSApplication sharedApplication];
@@ -71,7 +56,6 @@ - (void) start
 - (void)toggleMode
 {
 	needToClick = !needToClick;
-	NSLog(@"foo");
 }
 
 int callback(int device, Finger *data, int nFingers, double timestamp, int frame) {

diff --git a/main.m b/main.m
@@ -5,13 +5,7 @@
 //  Created by Clem on 21.06.09.
 //
 
-#import <Cocoa/Cocoa.h>
-#import "TrayMenu.h"
-#include <math.h>
-#include <unistd.h>
-#include <CoreFoundation/CoreFoundation.h>
-#import <Foundation/Foundation.h> 
-#import "WakeObserver.h"
+
 #import "Controller.h"
 
 Controller *con;