Only in mobileterminal-316s+iPhone/Artwork: .svn Only in mobileterminal-316s+iPhone: build Only in mobileterminal-316s+iPhone: dstools diff -ru mobileterminal-316s/Makefile.build mobileterminal-316s+iPhone/Makefile.build --- mobileterminal-316s/Makefile.build 2008-08-23 05:14:22.000000000 +0000 +++ mobileterminal-316s+iPhone/Makefile.build 2008-08-27 00:30:38.000000000 +0000 @@ -2,18 +2,10 @@ CFLAGS=-Wall -O7 -std=gnu99 -ifeq ($(PKG_ARCH),iphoneos-arm) -QUARTZ=QuartzCore -framework ImageIO -i20=-I/apl/i20 -else -QUARTZ=LayerKit -i20= -endif - LDFLAGS=-lobjc -framework CoreFoundation -framework Foundation \ - -framework UIKit -framework $(QUARTZ) -framework CoreGraphics \ - -framework GraphicsServices -lcurses -lobjc \ - -F${PKG_ROOT}/System/Library/PrivateFrameworks + -framework UIKit -framework QuartzCore -framework ImageIO \ + -framework CoreGraphics -framework GraphicsServices \ + -lcurses -lobjc -F${PKG_ROOT}/System/Library/PrivateFrameworks all: svnversion Terminal @@ -33,10 +25,10 @@ Sources/UI/GestureView.o \ Sources/UI/Menu.o \ Sources/UI/PieView.o \ - Sources/Preferences/ColorWidgets.m \ - Sources/Preferences/Preferences.m \ - Sources/Preferences/PreferencesGroup.m \ - Sources/Preferences/PreferencesDataSource.m \ + Sources/Preferences/ColorWidgets.o \ + Sources/Preferences/Preferences.o \ + Sources/Preferences/PreferencesGroup.o \ + Sources/Preferences/PreferencesDataSource.o \ Sources/Misc/Constants.o \ Sources/Misc/Tools.o \ Sources/Misc/Log.o Only in mobileterminal-316s+iPhone/Resources: .svn diff -ru mobileterminal-316s/Sources/main.m mobileterminal-316s+iPhone/Sources/main.m --- mobileterminal-316s/Sources/main.m 2008-08-23 05:14:22.000000000 +0000 +++ mobileterminal-316s+iPhone/Sources/main.m 2008-08-27 00:22:40.000000000 +0000 @@ -25,7 +25,7 @@ } UIApplicationUseLegacyEvents(1); - int ret = UIApplicationMain(argc, argv, [MobileTerminal class]); + int ret = UIApplicationMain(argc, argv, @"MobileTerminal", @"MobileTerminal"); [pool release]; return ret; Only in mobileterminal-316s+iPhone/Sources: main.o diff -ru mobileterminal-316s/Sources/Misc/Color.h mobileterminal-316s+iPhone/Sources/Misc/Color.h --- mobileterminal-316s/Sources/Misc/Color.h 2008-08-23 00:08:34.000000000 +0000 +++ mobileterminal-316s+iPhone/Sources/Misc/Color.h 2008-08-27 00:29:12.000000000 +0000 @@ -3,6 +3,7 @@ // Terminal #import +#import UIColor *colorWithRGBA(float red, float green, float blue, float alpha); diff -ru mobileterminal-316s/Sources/Misc/Color.m mobileterminal-316s+iPhone/Sources/Misc/Color.m --- mobileterminal-316s/Sources/Misc/Color.m 2008-08-23 04:37:49.000000000 +0000 +++ mobileterminal-316s+iPhone/Sources/Misc/Color.m 2008-08-27 01:32:07.000000000 +0000 @@ -35,6 +35,7 @@ + (NSArray *)arrayWithColor:(UIColor *)color { const CGFloat * rgba = CGColorGetComponents([color CGColor]); + NSLog(@" %f:%f:%f:%f", rgba[0], rgba[1], rgba[2], rgba[3]); return [NSArray arrayWithObjects: [NSNumber numberWithFloat:rgba[0]], Only in mobileterminal-316s+iPhone/Sources/Misc: ColorMap.o Only in mobileterminal-316s+iPhone/Sources/Misc: Color.o Only in mobileterminal-316s+iPhone/Sources/Misc: Constants.o Only in mobileterminal-316s+iPhone/Sources/Misc: Log.o diff -ru mobileterminal-316s/Sources/Misc/Settings.m mobileterminal-316s+iPhone/Sources/Misc/Settings.m --- mobileterminal-316s/Sources/Misc/Settings.m 2008-08-23 05:14:22.000000000 +0000 +++ mobileterminal-316s+iPhone/Sources/Misc/Settings.m 2008-08-27 01:43:56.000000000 +0000 @@ -163,17 +163,19 @@ NSArray *colorValues; switch (i) { // bg color - default: colorValues = [NSArray arrayWithColor:[UIColor blackColor]]; break; + default: colorValues = [NSArray arrayWithColor:colorWithRGBA(0, 0, 0, 1)]; break; case 1: colorValues = [NSArray arrayWithColor:colorWithRGBA(0, 0.05f, 0, 1)]; break; case 2: colorValues = [NSArray arrayWithColor:colorWithRGBA(0, 0, 0.1f, 1)]; break; case 3: colorValues = [NSArray arrayWithColor:colorWithRGBA(0.1f, 0, 0, 1)]; break; }; [ca addObject:colorValues]; - [ca addObject:[NSArray arrayWithColor:[UIColor whiteColor]]]; // fg color - [ca addObject:[NSArray arrayWithColor:[UIColor yellowColor]]]; // bold color - [ca addObject:[NSArray arrayWithColor:[UIColor redColor]]]; // cursor text - [ca addObject:[NSArray arrayWithColor:[UIColor yellowColor]]]; // cursor color + UIColor *yellow = colorWithRGBA(1, 1, 0, 1); + + [ca addObject:[NSArray arrayWithColor:colorWithRGBA(1, 1, 1, 1)]]; // fg color + [ca addObject:[NSArray arrayWithColor:yellow]]; // bold color + [ca addObject:[NSArray arrayWithColor:colorWithRGBA(1, 0, 0, 1)]]; // cursor text + [ca addObject:[NSArray arrayWithColor:yellow]]; // cursor color [tc setObject:ca forKey:@"colors"]; [tcs addObject:tc]; Only in mobileterminal-316s+iPhone/Sources/Misc: Settings.o Only in mobileterminal-316s+iPhone/Sources/Misc: .svn Only in mobileterminal-316s+iPhone/Sources/Misc: Tools.o Only in mobileterminal-316s+iPhone/Sources: MobileTerminal.o diff -ru mobileterminal-316s/Sources/Preferences/ColorWidgets.m mobileterminal-316s+iPhone/Sources/Preferences/ColorWidgets.m --- mobileterminal-316s/Sources/Preferences/ColorWidgets.m 2008-08-26 11:46:29.000000000 +0000 +++ mobileterminal-316s+iPhone/Sources/Preferences/ColorWidgets.m 2008-08-27 00:35:39.000000000 +0000 @@ -15,7 +15,7 @@ - (void)drawRect:(struct CGRect)rect { - CGContextRef context = UICurrentContext(); + CGContextRef context = UIGraphicsGetCurrentContext(); CGContextSetFillColorWithColor(context, [[self color] CGColor]); CGContextSetStrokeColorWithColor(context, [colorWithRGBA(0.5,0.5,0.5,1) CGColor]); @@ -60,7 +60,7 @@ - (void)drawRect:(CGRect)rect { - CGContextRef context = UICurrentContext(); + CGContextRef context = UIGraphicsGetCurrentContext(); CGContextSetFillColorWithColor(context, [color CGColor]); CGContextSetStrokeColorWithColor(context, [colorWithRGBA(0.0,0.0,0.0,0.8) CGColor]); Only in mobileterminal-316s+iPhone/Sources/Preferences: ColorWidgets.o Only in mobileterminal-316s+iPhone/Sources/Preferences: PreferencesDataSource.o Only in mobileterminal-316s+iPhone/Sources/Preferences: PreferencesGroup.o diff -ru mobileterminal-316s/Sources/Preferences/Preferences.h mobileterminal-316s+iPhone/Sources/Preferences/Preferences.h --- mobileterminal-316s/Sources/Preferences/Preferences.h 2008-08-26 11:46:29.000000000 +0000 +++ mobileterminal-316s+iPhone/Sources/Preferences/Preferences.h 2008-08-27 00:31:39.000000000 +0000 @@ -2,7 +2,7 @@ // Preferences.h // Terminal -#import +#import @class MobileTerminal; diff -ru mobileterminal-316s/Sources/Preferences/Preferences.m mobileterminal-316s+iPhone/Sources/Preferences/Preferences.m --- mobileterminal-316s/Sources/Preferences/Preferences.m 2008-08-26 11:46:29.000000000 +0000 +++ mobileterminal-316s+iPhone/Sources/Preferences/Preferences.m 2008-08-27 00:27:31.000000000 +0000 @@ -74,7 +74,7 @@ - (void)drawBackgroundInRect:(struct CGRect)fp8 withFade:(float)fp24 { [super drawBackgroundInRect: fp8 withFade: fp24]; - CGContextRef context = UICurrentContext(); + CGContextRef context = UIGraphicsGetCurrentContext(); CGContextSaveGState(context); CGContextAddPath(context, [_fillPath _pathRef]); CGContextClip(context); @@ -355,7 +355,7 @@ - (void)drawBackgroundInRect:(struct CGRect)fp8 withFade:(float)fp24 { [super drawBackgroundInRect: fp8 withFade: fp24]; - CGContextRef context = UICurrentContext(); + CGContextRef context = UIGraphicsGetCurrentContext(); CGContextSaveGState(context); CGContextAddPath(context, [_fillPath _pathRef]); CGContextClip(context); Only in mobileterminal-316s+iPhone/Sources/Preferences: Preferences.o Only in mobileterminal-316s+iPhone/Sources/Preferences: .svn Only in mobileterminal-316s+iPhone/Sources: .svn Only in mobileterminal-316s+iPhone/Sources/Terminal: SubProcess.o Only in mobileterminal-316s+iPhone/Sources/Terminal: .svn Only in mobileterminal-316s+iPhone/Sources/Terminal: VT100Screen.o Only in mobileterminal-316s+iPhone/Sources/Terminal: VT100Terminal.o diff -ru mobileterminal-316s/Sources/UI/GestureView.m mobileterminal-316s+iPhone/Sources/UI/GestureView.m --- mobileterminal-316s/Sources/UI/GestureView.m 2008-08-23 05:14:22.000000000 +0000 +++ mobileterminal-316s+iPhone/Sources/UI/GestureView.m 2008-08-27 00:27:08.000000000 +0000 @@ -294,7 +294,7 @@ { CGRect rect = [self bounds]; rect.size.height -= 2; - CGContextRef context = UICurrentContext(); + CGContextRef context = UIGraphicsGetCurrentContext(); CGColorRef c = [[[Settings sharedInstance] gestureFrameColor] CGColor]; const float pattern[2] = {1,4}; CGContextSetLineDash(context, 0, pattern, 2); Only in mobileterminal-316s+iPhone/Sources/UI: GestureView.o diff -ru mobileterminal-316s/Sources/UI/Keyboard.h mobileterminal-316s+iPhone/Sources/UI/Keyboard.h --- mobileterminal-316s/Sources/UI/Keyboard.h 2008-08-23 04:37:49.000000000 +0000 +++ mobileterminal-316s+iPhone/Sources/UI/Keyboard.h 2008-08-27 00:25:55.000000000 +0000 @@ -2,6 +2,7 @@ #import #import +#import @protocol KeyboardInputProtocol diff -ru mobileterminal-316s/Sources/UI/Keyboard.m mobileterminal-316s+iPhone/Sources/UI/Keyboard.m --- mobileterminal-316s/Sources/UI/Keyboard.m 2008-08-24 13:23:01.000000000 +0000 +++ mobileterminal-316s+iPhone/Sources/UI/Keyboard.m 2008-08-27 00:26:13.000000000 +0000 @@ -4,6 +4,7 @@ #include #import +#import @interface TextInputHandler : UIDefaultKeyboardInput { Only in mobileterminal-316s+iPhone/Sources/UI: Keyboard.o diff -ru mobileterminal-316s/Sources/UI/Menu.m mobileterminal-316s+iPhone/Sources/UI/Menu.m --- mobileterminal-316s/Sources/UI/Menu.m 2008-08-23 05:14:22.000000000 +0000 +++ mobileterminal-316s+iPhone/Sources/UI/Menu.m 2008-08-27 00:27:31.000000000 +0000 @@ -517,7 +517,7 @@ - (void)drawRect:(struct CGRect)rect { - CGContextRef context = UICurrentContext(); + CGContextRef context = UIGraphicsGetCurrentContext(); float w = rect.size.width; float h = rect.size.height; CGContextBeginPath (context); Only in mobileterminal-316s+iPhone/Sources/UI: Menu.o diff -ru mobileterminal-316s/Sources/UI/PieView.m mobileterminal-316s+iPhone/Sources/UI/PieView.m --- mobileterminal-316s/Sources/UI/PieView.m 2008-08-23 05:14:22.000000000 +0000 +++ mobileterminal-316s+iPhone/Sources/UI/PieView.m 2008-08-27 00:27:31.000000000 +0000 @@ -62,7 +62,7 @@ - (void)drawTitleAtPoint:(CGPoint)point width:(float)width { - CGContextRef context = UICurrentContext(); + CGContextRef context = UIGraphicsGetCurrentContext(); CGContextSaveGState(context); float height = 14.0f; Only in mobileterminal-316s+iPhone/Sources/UI: PieView.o diff -ru mobileterminal-316s/Sources/UI/PTYTextView.h mobileterminal-316s+iPhone/Sources/UI/PTYTextView.h --- mobileterminal-316s/Sources/UI/PTYTextView.h 2008-08-23 04:37:49.000000000 +0000 +++ mobileterminal-316s+iPhone/Sources/UI/PTYTextView.h 2008-08-27 00:24:11.000000000 +0000 @@ -6,6 +6,8 @@ #import #import #import +#import +#import #include diff -ru mobileterminal-316s/Sources/UI/PTYTextView.m mobileterminal-316s+iPhone/Sources/UI/PTYTextView.m --- mobileterminal-316s/Sources/UI/PTYTextView.m 2008-08-23 04:37:49.000000000 +0000 +++ mobileterminal-316s+iPhone/Sources/UI/PTYTextView.m 2008-08-27 00:27:31.000000000 +0000 @@ -292,7 +292,7 @@ { //if (DEBUGLOG) log(@"row %d", row); - CGContextRef context = UICurrentContext(); + CGContextRef context = UIGraphicsGetCurrentContext(); [dataSource acquireLock]; Only in mobileterminal-316s+iPhone/Sources/UI: PTYTextView.o Only in mobileterminal-316s+iPhone/Sources/UI: .svn Only in mobileterminal-316s+iPhone: .svn Only in mobileterminal-316s+iPhone: svnversion.h Only in mobileterminal-316s+iPhone: Terminal Only in mobileterminal-316s+iPhone/Terminal.xcodeproj: .svn