isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-18 14:14:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

* clutter/fruity/clutter-fruity.c: removed dead code and unused

Browse Source 
variables.
This commit is contained in:
Øyvind Kolås 2008-06-24 11:34:22 +00:00
parent 1a449bbac9
commit eac5e21f1c
2 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-06-24 Øyvind Kolås <pippin@o-hand.com>
* clutter/fruity/clutter-fruity.c: removed dead code and unused
variables.
2008-06-24 Øyvind Kolås <pippin@o-hand.com> 2008-06-24 Øyvind Kolås <pippin@o-hand.com>
* configure.ac: better alignment of list of enabled experimental * configure.ac: better alignment of list of enabled experimental

33
clutter/fruity/clutter-fruity.c
View File

@ -18,10 +18,6 @@
#import <UIKit/UIView-Geometry.h> #import <UIKit/UIView-Geometry.h>
#include "clutter-fruity.h" #include "clutter-fruity.h"
static EGLDisplay mEGLDisplay;
static EGLContext mEGLContext;
static EGLSurface mEGLSurface;
static CoreSurfaceBufferRef mScreenSurface;
static gboolean alive = TRUE; static gboolean alive = TRUE;
@interface StageView : UIView @interface StageView : UIView
@ -30,23 +26,6 @@ static gboolean alive = TRUE;
@end @end
static CoreSurfaceBufferRef CreateSurface(int w, int h)
{
int pitch = w * 2, allocSize = 2 * w * h;
char *pixelFormat = "565L";
CFMutableDictionaryRef dict;
dict = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
CFDictionarySetValue(dict, kCoreSurfaceBufferGlobal, kCFBooleanTrue);
CFDictionarySetValue(dict, kCoreSurfaceBufferMemoryRegion, CFSTR("PurpleGFXMem"));
CFDictionarySetValue(dict, kCoreSurfaceBufferPitch, CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &pitch));
CFDictionarySetValue(dict, kCoreSurfaceBufferWidth, CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &w));
CFDictionarySetValue(dict, kCoreSurfaceBufferHeight, CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &h));
CFDictionarySetValue(dict, kCoreSurfaceBufferPixelFormat, CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, pixelFormat));
CFDictionarySetValue(dict, kCoreSurfaceBufferAllocSize, CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &allocSize));
return CoreSurfaceBufferCreate(dict);
}
@implementation StageView @implementation StageView
@ -85,6 +64,7 @@ typedef struct {
struct GSPathPoint points[10]; struct GSPathPoint points[10];
} MEvent; } MEvent;
#define MAX_FINGERS 5
- (void)doEvent:(GSEvent*)gs_event - (void)doEvent:(GSEvent*)gs_event
{ {
@ -92,13 +72,12 @@ typedef struct {
int i, j; int i, j;
ClutterMainContext *context; ClutterMainContext *context;
ClutterStage *stage = CLUTTER_STAGE_EGL(ba->stage)->wrapper; ClutterStage *stage = CLUTTER_STAGE_EGL(ba->stage)->wrapper;
int n_fingers = 0;
MEvent *event = (MEvent*)gs_event; MEvent *event = (MEvent*)gs_event;
context = clutter_context_get_default (); context = clutter_context_get_default ();
bool mapped[5] = {false, false, false, false, false}; /* an event has been mapped to this device */ bool mapped[MAX_FINGERS] = {false, false, false, false, false}; /* an event has been mapped to this device */
int evs[5] = {0,0,0,0,0}; int evs[MAX_FINGERS] = {0,0,0,0,0};
for (i = 0; i < event->fingerCount; i++) for (i = 0; i < event->fingerCount; i++)
{ {
@ -107,7 +86,7 @@ typedef struct {
/* NSLog(@"IncomingEvent: %d, pos: %f, %f", i, event->points[i].x, event->points[i].y);*/ /* NSLog(@"IncomingEvent: %d, pos: %f, %f", i, event->points[i].x, event->points[i].y);*/
/* check if this finger maps to one of the existing devices */ /* check if this finger maps to one of the existing devices */
for (j = 0; j < 5; j++) for (j = 0; j < MAX_FINGERS; j++)
{ {
ClutterFruityFingerDevice *dev; ClutterFruityFingerDevice *dev;
@ -142,7 +121,7 @@ typedef struct {
{ {
ClutterFruityFingerDevice *dev; ClutterFruityFingerDevice *dev;
for (j = 0; j < 5 /*n_fingers*/; j++) for (j = 0; j < MAX_FINGERS; j++)
{ {
dev = g_slist_nth_data (context->input_devices, j); dev = g_slist_nth_data (context->input_devices, j);
if (!dev->is_down) if (!dev->is_down)
@ -161,7 +140,7 @@ typedef struct {
} }
} }
for (j = 0; j < 5; j++) for (j = 0; j < MAX_FINGERS; j++)
{ {
ClutterFruityFingerDevice *dev; ClutterFruityFingerDevice *dev;