Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
Fixed the code so we receive Cocoa touch events
Browse files Browse the repository at this point in the history
  • Loading branch information
@slouken
slouken committed Jul 29, 2010
1 parent 75c88a4 commit 5190f5e
Show file tree
Hide file tree
Showing 4 changed files with 89 additions and 150 deletions.
122 changes: 7 additions & 115 deletions src/video/cocoa/SDL_cocoakeyboard.m
View file
Expand Up @@ -26,17 +26,11 @@
#include "../../events/SDL_keyboard_c.h"
#include "../../events/scancodes_darwin.h"

//Touch Code
#include "../../events/SDL_touch_c.h"
#include "SDL_cocoatouch.h"

#include <Carbon/Carbon.h>

//#define DEBUG_IME NSLog
#define DEBUG_IME

#define DEBUG_TOUCH NSLog

#ifndef NX_DEVICERCTLKEYMASK
#define NX_DEVICELCTLKEYMASK 0x00000001
#endif
Expand Down Expand Up @@ -71,7 +65,6 @@ @interface SDLTranslatorResponder : NSView <NSTextInput>
}
- (void) doCommandBySelector:(SEL)myselector;
- (void) setInputRect:(SDL_Rect *) rect;
- (void) handleTouches:(cocoaTouchType)type WithEvent:(NSEvent*) event;
@end

@implementation SDLTranslatorResponder
Expand Down Expand Up @@ -198,83 +191,6 @@ - (NSArray *) validAttributesForMarkedText
return [NSArray array];
}

// Touch Code Begins -----------

- (id)initWithFrame:(CGRect)frame {
if (self = [super initWithFrame:frame]) {
[self setAcceptsTouchEvents:YES];
[self setWantsRestingTouches:YES];
DEBUG_TOUCH(@"Initializing Cocoa Touch System....");

}
return self;
}

//Not an API function
- (void)handleTouches:(cocoaTouchType)type WithEvent:(NSEvent *)event {
NSSet *touches = [event touchesMatchingPhase:NSTouchPhaseBegan inView:self];

NSEnumerator *enumerator = [touches objectEnumerator];
NSTouch *touch = (NSTouch*)[enumerator nextObject];
while (touch) {
long touchId = (long)[touch device];
if(!SDL_GetTouchIndex(touchId)) {
if(Cocoa_AddTouch(touch) < 0) continue;
}
float x = [touch normalizedPosition].x;
float y = [touch normalizedPosition].y;
long fingerId = (long)[touch identity];
switch (type) {
case COCOA_TOUCH_DOWN:
SDL_SendFingerDown(touchId,fingerId,
SDL_TRUE,x,y,1);
break;
case COCOA_TOUCH_UP:
case COCOA_TOUCH_CANCELLED:
SDL_SendFingerDown(touchId,fingerId,
SDL_FALSE,x,y,1);
case COCOA_TOUCH_MOVE:
SDL_SendTouchMotion(touchId,fingerId,
SDL_FALSE,x,y,1);
}

touch = (NSTouch*)[enumerator nextObject];
}
}

- (void)touchesBeganWithEvent:(NSEvent *)event {
DEBUG_TOUCH(@"Finger Down");

[self handleTouches: COCOA_TOUCH_DOWN WithEvent: event];

//Documentation said to call super, but examples do not
//[super touchesBeganWithEvent:event]
}
- (void)touchesMovedWithEvent:(NSEvent *)event {
DEBUG_TOUCH(@"Finger Moved");

[self handleTouches: COCOA_TOUCH_MOVE WithEvent: event];

//[super touchesMovedWithEvent:event]
}
- (void)touchesEndedWithEvent:(NSEvent *)event {
DEBUG_TOUCH(@"Finger Up");

[self handleTouches: COCOA_TOUCH_UP WithEvent: event];

//[super touchesEndedWithEvent:event]
}
- (void)touchesCancelledWithEvent:(NSEvent *)event {
DEBUG_TOUCH(@"Finger Cancelled");

[self handleTouches: COCOA_TOUCH_CANCELLED WithEvent: event];

//[super touchesCancelledWithEvent:event]
}

//Touch Code Ends --------------


@end

/* This is the original behavior, before support was added for
Expand Down Expand Up @@ -712,14 +628,13 @@ - (void)touchesCancelledWithEvent:(NSEvent *)event {
* it to the front most window's content view */
if (!data->fieldEdit) {
data->fieldEdit =
[[SDLTranslatorResponder alloc] initWithFrame: NSMakeRect(0.0, 0.0, 0.0, 0.0)];
DEBUG_TOUCH(@"Accepts Touch events? %i",[data->fieldEdit acceptsTouchEvents]);
[[SDLTranslatorResponder alloc] initWithFrame: NSMakeRect(0.0, 0.0, 0.0, 0.0)];
}

if (![[data->fieldEdit superview] isEqual: parentView])
{
// DEBUG_IME(@"add fieldEdit to window contentView");
[data->fieldEdit removeFromSuperview];
[data->fieldEdit removeFromSuperview];
[parentView addSubview: data->fieldEdit];
[[NSApp keyWindow] makeFirstResponder: data->fieldEdit];
}
Expand Down Expand Up @@ -776,14 +691,14 @@ - (void)touchesCancelledWithEvent:(NSEvent *)event {
if (![event isARepeat]) {
/* See if we need to rebuild the keyboard layout */
UpdateKeymap(data);
}

SDL_SendKeyboardKey(SDL_PRESSED, code);
SDL_SendKeyboardKey(SDL_PRESSED, code);
#if 1
if (code == SDL_SCANCODE_UNKNOWN) {
fprintf(stderr, "The key you just pressed is not recognized by SDL. To help get this fixed, report this to the SDL mailing list <sdl@libsdl.org> or to Christian Walther <cwalther@gmx.ch>. Mac virtual key code is %d.\n", scancode);
}
#endif
if (code == SDL_SCANCODE_UNKNOWN) {
fprintf(stderr, "The key you just pressed is not recognized by SDL. To help get this fixed, report this to the SDL mailing list <sdl@libsdl.org> or to Christian Walther <cwalther@gmx.ch>. Mac virtual key code is %d.\n", scancode);
}
#endif
if (SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) {
/* FIXME CW 2007-08-16: only send those events to the field editor for which we actually want text events, not e.g. esc or function keys. Arrow keys in particular seem to produce crashes sometimes. */
[data->fieldEdit interpretKeyEvents:[NSArray arrayWithObject:event]];
Expand All @@ -808,29 +723,6 @@ - (void)touchesCancelledWithEvent:(NSEvent *)event {
}
}

Cocoa_AddTouch(NSTouch* finger) {
SDL_Touch touch;
touch.id = (long)[finger device];
//NSSize size = [finger deviceSize];
//touch.driverdata = SDL_malloc(sizeof(EventTouchData));
//EventTouchData* data = (EventTouchData*)(touch.driverdata);

touch.x_min = 0;
touch.x_max = 1;
touch.xres = touch.x_max - touch.x_min;
touch.y_min = 0;
touch.y_max = 1;
touch.yres = touch.y_max - touch.y_min;
touch.pressure_min = 0;
touch.pressure_max = 1;
touch.pressureres = touch.pressure_max - touch.pressure_min;


return SDL_AddTouch(&touch, "");

}


void
Cocoa_QuitKeyboard(_THIS)
{
Expand Down
35 changes: 0 additions & 35 deletions src/video/cocoa/SDL_cocoatouch.h
View file

This file was deleted.

14 changes: 14 additions & 0 deletions src/video/cocoa/SDL_cocoawindow.h
View file
Expand Up @@ -64,6 +64,20 @@ typedef struct SDL_WindowData SDL_WindowData;
-(void) rightMouseDragged:(NSEvent *) theEvent;
-(void) otherMouseDragged:(NSEvent *) theEvent;
-(void) scrollWheel:(NSEvent *) theEvent;
-(void) touchesBeganWithEvent:(NSEvent *) theEvent;
-(void) touchesMovedWithEvent:(NSEvent *) theEvent;
-(void) touchesEndedWithEvent:(NSEvent *) theEvent;
-(void) touchesCancelledWithEvent:(NSEvent *) theEvent;

/* Touch event handling */
typedef enum {
COCOA_TOUCH_DOWN,
COCOA_TOUCH_UP,
COCOA_TOUCH_MOVE,
COCOA_TOUCH_CANCELLED
} cocoaTouchType;
-(void) handleTouches:(cocoaTouchType)type withEvent:(NSEvent*) event;

@end
/* *INDENT-ON* */

Expand Down
68 changes: 68 additions & 0 deletions src/video/cocoa/SDL_cocoawindow.m
View file
Expand Up @@ -25,6 +25,7 @@
#include "../SDL_sysvideo.h"
#include "../../events/SDL_keyboard_c.h"
#include "../../events/SDL_mouse_c.h"
#include "../../events/SDL_touch_c.h"
#include "../../events/SDL_windowevents_c.h"

#include "SDL_cocoavideo.h"
Expand Down Expand Up @@ -60,6 +61,7 @@ - (void)listen:(SDL_WindowData *)data
[center addObserver:self selector:@selector(windowDidUnhide:) name:NSApplicationDidUnhideNotification object:NSApp];

[_data->nswindow setAcceptsMouseMovedEvents:YES];
[[_data->nswindow contentView] setAcceptsTouchEvents:YES];
}

- (void)close
Expand Down Expand Up @@ -268,6 +270,72 @@ - (void)scrollWheel:(NSEvent *)theEvent
SDL_SendMouseWheel(_data->window, (int)x, (int)y);
}

- (void)touchesBeganWithEvent:(NSEvent *) theEvent
{
[self handleTouches:COCOA_TOUCH_DOWN withEvent:theEvent];
}

- (void)touchesMovedWithEvent:(NSEvent *) theEvent
{
[self handleTouches:COCOA_TOUCH_MOVE withEvent:theEvent];
}

- (void)touchesEndedWithEvent:(NSEvent *) theEvent
{
[self handleTouches:COCOA_TOUCH_UP withEvent:theEvent];
}

- (void)touchesCancelledWithEvent:(NSEvent *) theEvent
{
[self handleTouches:COCOA_TOUCH_CANCELLED withEvent:theEvent];
}

- (void)handleTouches:(cocoaTouchType)type withEvent:(NSEvent *)event
{
NSSet *touches = [event touchesMatchingPhase:NSTouchPhaseBegan inView:nil];

NSEnumerator *enumerator = [touches objectEnumerator];
NSTouch *touch = (NSTouch*)[enumerator nextObject];
while (touch) {
long touchId = (long)[touch device];
if (!SDL_GetTouch(touchId)) {
SDL_Touch touch;

touch.id = touchId;
touch.x_min = 0;
touch.x_max = 1;
touch.xres = touch.x_max - touch.x_min;
touch.y_min = 0;
touch.y_max = 1;
touch.yres = touch.y_max - touch.y_min;
touch.pressure_min = 0;
touch.pressure_max = 1;
touch.pressureres = touch.pressure_max - touch.pressure_min;

if (SDL_AddTouch(&touch, "") < 0) {
return;
}
}
float x = [touch normalizedPosition].x;
float y = [touch normalizedPosition].y;
long fingerId = (long)[touch identity];
switch (type) {
case COCOA_TOUCH_DOWN:
SDL_SendFingerDown(touchId, fingerId, SDL_TRUE, x, y, 1);
break;
case COCOA_TOUCH_UP:
case COCOA_TOUCH_CANCELLED:
SDL_SendFingerDown(touchId, fingerId, SDL_FALSE, x, y, 1);
break;
case COCOA_TOUCH_MOVE:
SDL_SendTouchMotion(touchId, fingerId, SDL_FALSE, x, y, 1);
break;
}

touch = (NSTouch*)[enumerator nextObject];
}
}

@end

@interface SDLWindow : NSWindow
Expand Down

0 comments on commit 5190f5e

Please sign in to comment.