From b2f64049d930fc303bec3090a65e030940ef5831 Mon Sep 17 00:00:00 2001 From: Jay Freeman Date: Wed, 27 Aug 2008 01:16:58 +0000 Subject: Upgraded to the ashikase mobileterminal. git-svn-id: http://svn.telesphoreo.org/trunk@457 514c082c-b64e-11dc-b46d-3d985efe055d --- data/mobileterminal/_metadata/depiction | 1 + data/mobileterminal/_metadata/homepage | 2 +- data/mobileterminal/_metadata/version | 2 +- data/mobileterminal/build.diff | 231 +++++++++ data/mobileterminal/legacy.diff | 0 data/mobileterminal/mobileterminal-286.tgz | Bin 854578 -> 0 bytes data/mobileterminal/mobileterminal-316s.tgz | Bin 0 -> 241305 bytes data/mobileterminal/port.diff | 733 ---------------------------- 8 files changed, 234 insertions(+), 735 deletions(-) create mode 100644 data/mobileterminal/_metadata/depiction create mode 100644 data/mobileterminal/build.diff delete mode 100644 data/mobileterminal/legacy.diff delete mode 100644 data/mobileterminal/mobileterminal-286.tgz create mode 100644 data/mobileterminal/mobileterminal-316s.tgz delete mode 100644 data/mobileterminal/port.diff (limited to 'data') diff --git a/data/mobileterminal/_metadata/depiction b/data/mobileterminal/_metadata/depiction new file mode 100644 index 000000000..42de17a9c --- /dev/null +++ b/data/mobileterminal/_metadata/depiction @@ -0,0 +1 @@ +http://cydia.saurik.com/info/mobileterminal/ diff --git a/data/mobileterminal/_metadata/homepage b/data/mobileterminal/_metadata/homepage index 2c41abb75..a1b78414e 100644 --- a/data/mobileterminal/_metadata/homepage +++ b/data/mobileterminal/_metadata/homepage @@ -1 +1 @@ -http://cydia.saurik.com/terminal.html +http://code.google.com/p/mobileterminal/ diff --git a/data/mobileterminal/_metadata/version b/data/mobileterminal/_metadata/version index 61ccac771..14efbacbd 100644 --- a/data/mobileterminal/_metadata/version +++ b/data/mobileterminal/_metadata/version @@ -1 +1 @@ -286u +316s diff --git a/data/mobileterminal/build.diff b/data/mobileterminal/build.diff new file mode 100644 index 000000000..03f60d98a --- /dev/null +++ b/data/mobileterminal/build.diff @@ -0,0 +1,231 @@ +Only in mobileterminal-316s+iPhone/Artwork: .svn +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); + +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 +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 diff --git a/data/mobileterminal/legacy.diff b/data/mobileterminal/legacy.diff deleted file mode 100644 index e69de29bb..000000000 diff --git a/data/mobileterminal/mobileterminal-286.tgz b/data/mobileterminal/mobileterminal-286.tgz deleted file mode 100644 index e93fac6fc..000000000 Binary files a/data/mobileterminal/mobileterminal-286.tgz and /dev/null differ diff --git a/data/mobileterminal/mobileterminal-316s.tgz b/data/mobileterminal/mobileterminal-316s.tgz new file mode 100644 index 000000000..d348595ba Binary files /dev/null and b/data/mobileterminal/mobileterminal-316s.tgz differ diff --git a/data/mobileterminal/port.diff b/data/mobileterminal/port.diff deleted file mode 100644 index 220463525..000000000 --- a/data/mobileterminal/port.diff +++ /dev/null @@ -1,733 +0,0 @@ -diff -r -u mobileterminal-286/GestureView.m mobileterminal-286+iPhone/GestureView.m ---- mobileterminal-286/GestureView.m 2008-05-07 08:33:09.000000000 +0000 -+++ mobileterminal-286+iPhone/GestureView.m 2008-07-06 19:51:22.000000000 +0000 -@@ -13,6 +13,11 @@ - #import "Tools.h" - #include - -+@protocol UITouchCompatibility -+- (CGPoint)locationInView:(UIView *)view; -+- (CGPoint)previousLocationInView:(UIView *)view; -+@end -+ - @implementation GestureView - - //_______________________________________________________________________________ -@@ -77,9 +82,23 @@ - - //_______________________________________________________________________________ - -+- (BOOL)beginTrackingWithTouch:(id)touch withEvent:(id)event { -+ return [self beginTrackingAt:[touch locationInView:self] withEvent:event]; -+} -+ -+- (BOOL)continueTrackingWithTouch:(id)touch withEvent:(id)event { -+ return [self continueTrackingAt:[touch locationInView:self] previous:[touch previousLocationInView:self] withEvent:event]; -+} -+ -+- (void)endTrackingWithTouch:(id)touch withEvent:(id)event { -+ return [self endTrackingAt:[touch locationInView:self] previous:[touch previousLocationInView:self] withEvent:event]; -+} -+ -+//_______________________________________________________________________________ -+ - - (void) mouseDown:(GSEvent*)event - { -- mouseDownPos = [delegate viewPointForWindowPoint:GSEventGetLocationInWindow(event)]; -+ mouseDownPos = [delegate viewPointForWindowPoint:GSEventGetLocationInWindow(event).origin]; - [delegate showMenu:mouseDownPos]; - - [super mouseDown:event]; -@@ -132,7 +151,7 @@ - - if (![[MenuView sharedInstance] visible]) - { -- CGPoint end = [delegate viewPointForWindowPoint:GSEventGetLocationInWindow(event)]; -+ CGPoint end = [delegate viewPointForWindowPoint:GSEventGetLocationInWindow(event).origin]; - CGPoint vector = CGPointMake(end.x - mouseDownPos.x, end.y - mouseDownPos.y); - - float r = sqrtf(vector.x*vector.x + vector.y*vector.y); -@@ -168,7 +187,7 @@ - } - else if (r < 10.0f) - { -- mouseDownPos = [delegate viewPointForWindowPoint:GSEventGetLocationInWindow(event)]; -+ mouseDownPos = [delegate viewPointForWindowPoint:GSEventGetLocationInWindow(event).origin]; - if ([[MenuView sharedInstance] visible]) - { - [[MenuView sharedInstance] hide]; -diff -r -u mobileterminal-286/Log.h mobileterminal-286+iPhone/Log.h ---- mobileterminal-286/Log.h 2008-05-07 08:33:09.000000000 +0000 -+++ mobileterminal-286+iPhone/Log.h 2008-05-07 08:15:04.000000000 +0000 -@@ -1,6 +1,7 @@ - - #include - #include -+#include - - #define logf(s,...) [FileLog logFile:__FILE__ lineNumber:__LINE__ format:(s),##__VA_ARGS__] - #define logfRect(s, r) [FileLog logFile:__FILE__ lineNumber:__LINE__ string:(s) rect:(r)] -diff -r -u mobileterminal-286/Log.m mobileterminal-286+iPhone/Log.m ---- mobileterminal-286/Log.m 2008-05-07 08:33:09.000000000 +0000 -+++ mobileterminal-286+iPhone/Log.m 2008-05-07 08:16:51.000000000 +0000 -@@ -21,7 +21,7 @@ - aFileHandle = [NSFileHandle fileHandleForWritingAtPath:aFile]; - [aFileHandle truncateFileAtOffset:[aFileHandle seekToEndOfFile]]; - -- [aFileHandle writeData:[[NSString stringWithFormat: @"%@\n", str] dataUsingEncoding:nil]]; -+ [aFileHandle writeData:[[NSString stringWithFormat: @"%@\n", str] dataUsingEncoding:kCFStringEncodingUTF8]]; - } - - //_______________________________________________________________________________ -diff -r -u mobileterminal-286/main.m mobileterminal-286+iPhone/main.m ---- mobileterminal-286/main.m 2008-05-07 08:07:55.000000000 +0000 -+++ mobileterminal-286+iPhone/main.m 2008-08-02 09:38:12.000000000 +0000 -@@ -2,6 +2,9 @@ - #import - #import "MobileTerminal.h" - #import "Settings.h" -+#include -+ -+void UIApplicationUseLegacyEvents(BOOL use); - - int main(int argc, char **argv) - { -@@ -27,5 +30,6 @@ - [[Settings sharedInstance] setArguments:args]; - } - -+ UIApplicationUseLegacyEvents(1); - return UIApplicationMain(argc, argv, [MobileTerminal class]); - } -diff -r -u mobileterminal-286/Makefile.build mobileterminal-286+iPhone/Makefile.build ---- mobileterminal-286/Makefile.build 2008-05-07 08:07:55.000000000 +0000 -+++ mobileterminal-286+iPhone/Makefile.build 2008-07-20 04:23:48.000000000 +0000 -@@ -2,9 +2,18 @@ - - CFLAGS=-Wall -O7 - -+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 LayerKit -framework CoreGraphics \ -- -framework GraphicsServices -lcurses -lobjc -+ -framework UIKit -framework $(QUARTZ) -framework CoreGraphics \ -+ -framework GraphicsServices -lcurses -lobjc \ -+ -F${PKG_ROOT}/System/Library/PrivateFrameworks - - all: Terminal - -@@ -27,7 +36,7 @@ - $(CC) $(LDFLAGS) -o $@ $^ - - %.o: %.m -- $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ $(i20) - - depend: - @makedepend *.m &> /dev/null -diff -r -u mobileterminal-286/Menu.m mobileterminal-286+iPhone/Menu.m ---- mobileterminal-286/Menu.m 2008-05-07 08:07:55.000000000 +0000 -+++ mobileterminal-286+iPhone/Menu.m 2008-07-05 21:29:08.000000000 +0000 -@@ -127,7 +127,7 @@ - + (Menu*) menuWithArray:(NSArray*)array - { - int i; -- Menu * menu = [[Menu alloc] init]; -+ Menu * menu = [[[Menu alloc] init] autorelease]; - for (i = 0; i < 12; i++) - { - MenuItem * item = [[menu items] objectAtIndex:i]; -diff -r -u mobileterminal-286/MobileTerminal.m mobileterminal-286+iPhone/MobileTerminal.m ---- mobileterminal-286/MobileTerminal.m 2008-05-07 08:33:09.000000000 +0000 -+++ mobileterminal-286+iPhone/MobileTerminal.m 2008-08-02 09:40:25.000000000 +0000 -@@ -17,9 +17,17 @@ - #import - #import - #import --#import - #import - -+#ifdef __OBJC2__ -+#import -+#define LKAnimation CAAnimation -+#define LKTimingFunction CAMediaTimingFunction -+#define LKTransition CATransition -+#else -+#import -+#endif -+ - //_______________________________________________________________________________ - //_______________________________________________________________________________ - -@@ -57,7 +65,7 @@ - [settings registerDefaults]; - [settings readUserDefaults]; - -- menu = [Menu menuWithArray:[settings menu]]; -+ menu = [[Menu menuWithArray:[settings menu]] retain]; - - activeTerminal = 0; - -@@ -78,10 +86,10 @@ - - for (numTerminals = 0; numTerminals < ([settings multipleTerminals] ? MAXTERMINALS : 1); numTerminals++) - { -- VT100Terminal * terminal = [[VT100Terminal alloc] init]; -- VT100Screen * screen = [[VT100Screen alloc] initWithIdentifier: numTerminals]; -- SubProcess * process = [[SubProcess alloc] initWithDelegate:self identifier: numTerminals]; -- UIScroller * scroller = [[UIScroller alloc] init]; -+ VT100Terminal * terminal = [[[VT100Terminal alloc] init] autorelease]; -+ VT100Screen * screen = [[[VT100Screen alloc] initWithIdentifier: numTerminals] autorelease]; -+ SubProcess * process = [[[SubProcess alloc] initWithDelegate:self identifier: numTerminals] autorelease]; -+ UIScroller * scroller = [[[UIScroller alloc] init] autorelease]; - - [screens addObject: screen]; - [terminals addObject: terminal]; -@@ -91,10 +99,10 @@ - [screen setTerminal:terminal]; - [terminal setScreen:screen]; - -- PTYTextView * textview = [[PTYTextView alloc] initWithFrame: CGRectMake(0.0f, 0.0f, 320.0f, 244.0f) -+ PTYTextView * textview = [[[PTYTextView alloc] initWithFrame: CGRectMake(0.0f, 0.0f, 320.0f, 244.0f) - source: screen - scroller: scroller -- identifier: numTerminals]; -+ identifier: numTerminals] autorelease]; - [textviews addObject:textview]; - } - -@@ -112,7 +120,6 @@ - [mainView addSubview:[scrollers objectAtIndex:i]]; - } - [mainView addSubview:keyboardView]; -- [mainView addSubview:[keyboardView inputView]]; - [mainView addSubview:gestureView]; - [mainView addSubview:[MenuView sharedInstance]]; - activeView = mainView; -@@ -131,7 +138,7 @@ - [[MenuView sharedInstance] hideSlow:YES]; - - // Input focus -- [[keyboardView inputView] becomeFirstResponder]; -+ [keyboardView enable]; - - if (numTerminals > 1) - { -@@ -165,10 +172,9 @@ - [keyboardView setAlpha:0.0f]; - } - -- [mainView addSubview:[keyboardView inputView]]; - [mainView bringSubviewToFront:gestureView]; - [mainView bringSubviewToFront:[MenuView sharedInstance]]; -- [[keyboardView inputView] becomeFirstResponder]; -+ [keyboardView enable]; - - [self setActiveTerminal:0]; - [self updateStatusBar]; -@@ -198,7 +204,6 @@ - if (activeView != mainView) // preferences active - [self togglePreferences]; - -- [[keyboardView inputView] removeFromSuperview]; - [keyboardView removeFromSuperview]; - - for (i = 0; i < MAXTERMINALS; i++) -@@ -356,7 +361,7 @@ - } - else - { -- [[self activeProcess] write:[input cString] length:[input length]]; -+ [[self activeProcess] write:[input UTF8String] length:[input length]]; - } - } - -@@ -404,7 +409,7 @@ - { - if (numTerminals > 1) - { -- CGPoint pos = GSEventGetLocationInWindow(event); -+ CGPoint pos = GSEventGetLocationInWindow(event).origin; - float width = landscape ? window.frame.size.height : window.frame.size.width; - if (pos.x > width/2 && pos.x < width*3/4) - { -@@ -679,20 +684,18 @@ - { - //log(@"create terminal"); - VT100Terminal * terminal = [[VT100Terminal alloc] init]; -+ [terminals addObject: terminal]; - //log(@"create screen"); - VT100Screen * screen = [[VT100Screen alloc] initWithIdentifier: numTerminals]; -+ [screens addObject: screen]; -+ [screen setTerminal:terminal]; -+ [terminal setScreen:screen]; - //log(@"create process"); -- SubProcess * process = [[SubProcess alloc] initWithDelegate:self identifier: numTerminals]; - //log(@"process created"); - UIScroller * scroller = [[UIScroller alloc] init]; -- -- [screens addObject: screen]; -- [terminals addObject: terminal]; -- [processes addObject: process]; - [scrollers addObject: scroller]; -+ - -- [screen setTerminal:terminal]; -- [terminal setScreen:screen]; - - //log(@"create textview"); - -@@ -702,6 +705,8 @@ - identifier: numTerminals]; - //log(@"textview created"); - [textviews addObject:textview]; -+ SubProcess * process = [[SubProcess alloc] initWithDelegate:self identifier: numTerminals]; -+ [processes addObject: process]; - } - - [self addStatusBarImageNamed:[NSString stringWithFormat:@"MobileTerminal0"] removeOnAbnormalExit:YES]; -diff -r -u mobileterminal-286/PieView.m mobileterminal-286+iPhone/PieView.m ---- mobileterminal-286/PieView.m 2008-05-07 08:33:09.000000000 +0000 -+++ mobileterminal-286+iPhone/PieView.m 2008-05-07 08:13:35.000000000 +0000 -@@ -71,7 +71,7 @@ - float height = 14.0f; - - NSString *fontName = @"HelveticaBold"; -- CGContextSelectFont(context, [fontName cString], height, kCGEncodingMacRoman); -+ CGContextSelectFont(context, [fontName UTF8String], height, kCGEncodingMacRoman); - CGFontRef font = CGContextGetFont(context); - - NSString * text = [self title]; -diff -r -u mobileterminal-286/Preferences.h mobileterminal-286+iPhone/Preferences.h ---- mobileterminal-286/Preferences.h 2008-05-07 08:07:55.000000000 +0000 -+++ mobileterminal-286+iPhone/Preferences.h 2008-07-04 09:50:46.000000000 +0000 -@@ -10,7 +10,6 @@ - #import - #import "UINavigationController.h" - #import --#import - #import - #import "Color.h" - -@@ -24,7 +23,7 @@ - - //_______________________________________________________________________________ - --@interface UIPickerTable (PickerTableExtensions) -+@interface UITable (PickerTableExtensions) - @end - - @interface UIPickerView (PickerViewExtensions) -@@ -39,7 +38,7 @@ - NSArray * fontNames; - - UIPickerView * fontPicker; -- UIPickerTable * pickerTable; -+ UITable * pickerTable; - - NSString * selectedFont; - } -diff -r -u mobileterminal-286/Preferences.m mobileterminal-286+iPhone/Preferences.m ---- mobileterminal-286/Preferences.m 2008-05-07 08:33:09.000000000 +0000 -+++ mobileterminal-286+iPhone/Preferences.m 2008-07-04 09:51:01.000000000 +0000 -@@ -13,12 +13,12 @@ - #import "Log.h" - - #import --#import "UIFieldEditor.h" -+#import - - //_______________________________________________________________________________ - //_______________________________________________________________________________ - --@implementation UIPickerTable (PickerTableExtensions) -+@implementation UITable (PickerTableExtensions) - - //_______________________________________________________________________________ - -@@ -40,7 +40,9 @@ - @implementation UIPickerView (PickerViewExtensions) - - -(float) tableRowHeight { return 22.0f; } -+#ifndef __OBJC2__ - -(id) delegate { return _delegate; } -+#endif - - //_______________________________________________________________________________ - -@@ -50,7 +52,7 @@ - - for (c = 0; c < [self numberOfColumns]; c++) - { -- UIPickerTable * table = [self tableForColumn:c]; -+ UITable * table = [self tableForColumn:c]; - for (r = 0; r < [table numberOfRows]; r++) - { - [[[table cellAtRow:r column:0] iconImageView] setFrame:CGRectMake(0,0,0,0)]; -diff -r -u mobileterminal-286/PTYTextView.m mobileterminal-286+iPhone/PTYTextView.m ---- mobileterminal-286/PTYTextView.m 2008-05-07 08:33:09.000000000 +0000 -+++ mobileterminal-286+iPhone/PTYTextView.m 2008-07-05 21:25:52.000000000 +0000 -@@ -238,11 +238,13 @@ - if (!fontRef) - { - TerminalConfig * config = [[[Settings sharedInstance] terminalConfigs] objectAtIndex:termid]; -- const char * font = [config.font cString]; -+ const char * font = [config.font UTF8String]; - // First time through: cache the fontRef. This lookup is expensive. - fontSize = config.fontSize; - CGContextSelectFont(context, font, floor(lineHeight), kCGEncodingMacRoman); -- fontRef = (CGFontRef)CFRetain(CGContextGetFont(context)); -+ fontRef = CGContextGetFont(context); -+ if (fontRef != NULL) -+ fontRef = (CGFontRef)CFRetain(fontRef); - } - else - { -diff -r -u mobileterminal-286/Settings.h mobileterminal-286+iPhone/Settings.h ---- mobileterminal-286/Settings.h 2008-05-07 08:33:09.000000000 +0000 -+++ mobileterminal-286+iPhone/Settings.h 2008-05-07 08:30:30.000000000 +0000 -@@ -18,12 +18,13 @@ - NSString * font; - NSString * args; - -- RGBAColor colors[NUM_TERMINAL_COLORS]; -+ RGBAColor _colors[NUM_TERMINAL_COLORS]; - } - - - (NSString*) fontDescription; -+- (RGBAColor *) colors; - --@property RGBAColor * colors; -+@property (getter = colors) RGBAColor *colors; - @property BOOL autosize; - @property int width; - @property int fontSize; -diff -r -u mobileterminal-286/Settings.m mobileterminal-286+iPhone/Settings.m ---- mobileterminal-286/Settings.m 2008-05-07 08:33:09.000000000 +0000 -+++ mobileterminal-286+iPhone/Settings.m 2008-07-20 04:29:04.000000000 +0000 -@@ -24,7 +24,7 @@ - width = 45; - fontSize = 12; - fontWidth = 0.6f; -- font = @"CourierNewBold"; -+ font = @"CourierNewPS-BoldMT"; - args = @""; - - return self; -@@ -62,7 +62,7 @@ - } - - - (RGBAColor*) colors { -- return colors; -+ return _colors; - } - - //_______________________________________________________________________________ -@@ -97,11 +97,11 @@ - { - self = [super init]; - -- terminalConfigs = [NSArray arrayWithObjects: -+ terminalConfigs = [[NSArray arrayWithObjects: - [[TerminalConfig alloc] init], - [[TerminalConfig alloc] init], - [[TerminalConfig alloc] init], -- [[TerminalConfig alloc] init], nil]; -+ [[TerminalConfig alloc] init], nil] retain]; - - gestureFrameColor = RGBAColorMake(1.0f, 1.0f, 1.0f, 0.05f); - multipleTerminals = NO; -@@ -154,7 +154,7 @@ - [tc setObject:[NSNumber numberWithInt:45] forKey:@"width"]; - [tc setObject:[NSNumber numberWithInt:12] forKey:@"fontSize"]; - [tc setObject:[NSNumber numberWithFloat:0.6f] forKey:@"fontWidth"]; -- [tc setObject:@"CourierNewBold" forKey:@"font"]; -+ [tc setObject:@"CourierNewPS-BoldMT" forKey:@"font"]; - [tc setObject:(i > 0 ? @"clear" : @"") forKey:@"args"]; - - NSMutableArray * ca = [NSMutableArray arrayWithCapacity:NUM_TERMINAL_COLORS]; -diff -r -u mobileterminal-286/ShellKeyboard.h mobileterminal-286+iPhone/ShellKeyboard.h ---- mobileterminal-286/ShellKeyboard.h 2008-05-07 08:07:55.000000000 +0000 -+++ mobileterminal-286+iPhone/ShellKeyboard.h 2008-08-02 09:40:25.000000000 +0000 -@@ -11,12 +11,12 @@ - @interface ShellKeyboard : UIKeyboard - { - id inputDelegate; -- UITextView* inputView; -+ id handler; - } - - - (id)initWithFrame:(CGRect)frame; --- (UITextView*)inputView; - - (void)setInputDelegate:(id)delegate; - - (void)handleKeyPress:(unichar)c; -+- (void)enable; - - @end -diff -r -u mobileterminal-286/ShellKeyboard.m mobileterminal-286+iPhone/ShellKeyboard.m ---- mobileterminal-286/ShellKeyboard.m 2008-05-07 08:07:55.000000000 +0000 -+++ mobileterminal-286+iPhone/ShellKeyboard.m 2008-08-02 09:40:49.000000000 +0000 -@@ -1,22 +1,69 @@ - // ShellKeyboard.m - #import "ShellKeyboard.h" -+#include -+#import - --// Override settings of the default keyboard implementation --@implementation UIKeyboardImpl (DisableFeatures) -+/* iPhoneOS 2.0 Compatibility {{{ */ -+#ifdef __OBJC2__ -+@interface UICGColor : NSObject { -+} - --- (BOOL)autoCapitalizationPreference --{ -- return false; -+- (id) initWithCGColor:(CGColorRef)color; -+@end -+ -+@interface UIFont { - } - --- (BOOL)autoCorrectionPreference --{ -- return false; -+- (UIFont *) fontWithSize:(CGFloat)size; -+@end -+ -+@interface NSObject (iPhoneOS) -+- (CGColorRef) cgColor; -+- (CGColorRef) CGColor; -+- (void) set; -+@end -+ -+@implementation NSObject (iPhoneOS) -+ -+- (CGColorRef) cgColor { -+ return [self CGColor]; - } - -+- (CGColorRef) CGColor { -+ return (CGColorRef) self; -+} -+ -+- (void) set { -+ [[[[objc_getClass("UICGColor") alloc] initWithCGColor:[self CGColor]] autorelease] set]; -+} -+ -+@end -+ -+@interface UITextView (iPhoneOS) -+- (void) setTextSize:(float)size; -+@end -+ -+@implementation UITextView (iPhoneOS) -+ -+- (void) setTextSize:(float)size { -+ [self setFont:[[self font] fontWithSize:size]]; -+} -+ -+@end -+ -+@interface UIDefaultKeyboardInput (iPhoneOS) -+- (id)textInputTraits; -+@end -+ -+@interface UITextInputTraits -+- (void)setAutocorrectionType:(int)type; -+- (void)setAutocapitalizationType:(int)type; -+- (void)setEnablesReturnKeyAutomatically:(BOOL)val; - @end -+#endif -+/* }}} */ - --@interface TextInputHandler : UITextView -+@interface TextInputHandler : UIDefaultKeyboardInput - { - ShellKeyboard* shellKeyboard; - } -@@ -30,26 +77,49 @@ - - (id)initWithKeyboard:(ShellKeyboard*)keyboard; - { - self = [super initWithFrame:CGRectMake(0.0f, 0.0f, 0.0f, 0.0f)]; -- shellKeyboard = keyboard; -+ if ( self ) { -+ shellKeyboard = keyboard; -+ [[self textInputTraits] setAutocorrectionType:1]; -+ [[self textInputTraits] setAutocapitalizationType:0]; -+ [[self textInputTraits] setEnablesReturnKeyAutomatically:NO]; -+ } - return self; - } - -+#if 0 - - (BOOL)webView:(id)fp8 shouldDeleteDOMRange:(id)fp12 - { - [shellKeyboard handleKeyPress:0x08]; -+ return false; -+} -+ -+#endif -+ -+- (void)deleteBackward -+{ -+ [shellKeyboard handleKeyPress:0x08]; - } - --- (BOOL)webView:(id)fp8 shouldInsertText:(id)character -- replacingDOMRange:(id)fp16 -- givenAction:(int)fp20 -+- (void)insertText:(id)character - { - if ([character length] != 1) { - [NSException raise:@"Unsupported" format:@"Unhandled multi-char insert!"]; -- return false; - } - [shellKeyboard handleKeyPress:[character characterAtIndex:0]]; - } - -+#if 0 // for Debugging -+- (NSMethodSignature *) methodSignatureForSelector:(SEL)selector { -+ fprintf(stderr, "[%s]S-%s\n", class_getName(self->isa), sel_getName(selector)); -+ return [super methodSignatureForSelector:selector]; -+} -+ -+- (BOOL) respondsToSelector:(SEL)selector { -+ fprintf(stderr, "[%s]R-%s\n", class_getName(self->isa), sel_getName(selector)); -+ return [super respondsToSelector:selector]; -+} -+#endif -+ - @end - - // ShellKeyboard -@@ -59,16 +129,12 @@ - - (id)initWithFrame:(CGRect)frame - { - self = [super initWithFrame:frame]; -- inputDelegate = nil; -- inputView = [[TextInputHandler alloc] initWithKeyboard:self]; -+ if ( self ) { -+ handler = [[TextInputHandler alloc] initWithKeyboard:self]; -+ } - return self; - } - --- (UITextView*)inputView --{ -- return inputView; --} -- - - (void)setInputDelegate:(id)delegate; - { - inputDelegate = delegate; -@@ -79,4 +145,17 @@ - [inputDelegate handleKeyPress:c]; - } - -+- (void)enable -+{ -+ [self activate]; -+ [[UIKeyboardImpl activeInstance] setDelegate:handler]; -+} -+ -+- (void)dealloc -+{ -+ [handler release]; -+ -+ [super dealloc]; -+} -+ - @end -diff -r -u mobileterminal-286/SubProcess.m mobileterminal-286+iPhone/SubProcess.m ---- mobileterminal-286/SubProcess.m 2008-05-07 08:33:09.000000000 +0000 -+++ mobileterminal-286+iPhone/SubProcess.m 2008-05-07 08:13:35.000000000 +0000 -@@ -140,7 +140,7 @@ - if (arg != nil && [arg length] > 0) - { - // A command line argument was passed to the program -- const char* path = [arg cString]; -+ const char* path = [arg UTF8String]; - struct stat st; - if ((stat(path, &st) == 0) && ((st.st_mode & S_IFDIR) != 0)) // it's a path, issue a cd command - { -@@ -150,7 +150,7 @@ - } - else // just print the command - { -- write(fd, [arg cString], [arg length]); -+ write(fd, [arg UTF8String], [arg length]); - write(fd, "\n", 1); - } - } -@@ -186,7 +186,7 @@ - { - // HACK: Just pretend the message came from the child - NSLog(message); -- [delegate handleStreamOutput:[message cString] length:[message length] identifier:termid]; -+ [delegate handleStreamOutput:[message UTF8String] length:[message length] identifier:termid]; - } - - - (void)setWidth:(int)width height:(int)height -diff -r -u mobileterminal-286/svnversion.h mobileterminal-286+iPhone/svnversion.h ---- mobileterminal-286/svnversion.h 2008-05-07 08:13:19.000000000 +0000 -+++ mobileterminal-286+iPhone/svnversion.h 2008-07-06 19:26:10.000000000 +0000 -@@ -1 +1 @@ --#define SVN_VERSION @"287" -+#define SVN_VERSION @"298" -diff -r -u mobileterminal-286/Tools.h mobileterminal-286+iPhone/Tools.h ---- mobileterminal-286/Tools.h 2008-05-07 08:33:09.000000000 +0000 -+++ mobileterminal-286+iPhone/Tools.h 2008-05-07 08:19:04.000000000 +0000 -@@ -3,6 +3,7 @@ - // Terminal - - #import -+#import - - //_______________________________________________________________________________ - -diff -r -u mobileterminal-286/Tools.m mobileterminal-286+iPhone/Tools.m ---- mobileterminal-286/Tools.m 2008-05-07 08:33:09.000000000 +0000 -+++ mobileterminal-286+iPhone/Tools.m 2008-05-07 08:21:40.000000000 +0000 -@@ -4,6 +4,7 @@ - - #import "Tools.h" - #import "Log.h" -+#include - - //_______________________________________________________________________________ - //_______________________________________________________________________________ -@@ -28,7 +29,7 @@ - BOOL writeImageToPNG (CGImageRef image, NSString * filePath) - { - if (image == nil) { log(@"[ERROR] no image"); return NO; } -- CFURLRef cfurl = CFURLCreateFromFileSystemRepresentation (NULL, (const UInt8 *)[filePath cString], [filePath length], 0); -+ CFURLRef cfurl = CFURLCreateFromFileSystemRepresentation (NULL, (const UInt8 *)[filePath UTF8String], [filePath length], 0); - CGImageDestinationRef imageDest = CGImageDestinationCreateWithURL(cfurl, (CFStringRef)@"public.png", 1, nil); - if (imageDest==nil) { log(@"[ERROR] no image destination"); return NO; } - CGImageDestinationAddImage(imageDest, image, nil); -diff -r -u mobileterminal-286/VT100Terminal.m mobileterminal-286+iPhone/VT100Terminal.m ---- mobileterminal-286/VT100Terminal.m 2008-05-07 08:33:09.000000000 +0000 -+++ mobileterminal-286+iPhone/VT100Terminal.m 2008-05-07 08:13:35.000000000 +0000 -@@ -1226,12 +1226,12 @@ - static int issetup = 0; - if (!issetup) { issetup = 1; - // this crashes on non-Cydia systems when called multiple times -- setupterm((char *)[termType cString], fileno(stdout), &r); -+ setupterm((char *)[termType UTF8String], fileno(stdout), &r); - } - - if (r!=1) - { -- log(@"Terminal type %s is not defined (%d)", [termType cString], r); -+ log(@"Terminal type %s is not defined (%d)", [termType UTF8String], r); - for(i = 0; i < TERMINFO_KEYS; i ++) - { - if (key_strings[i]) free(key_strings[i]); -- cgit v1.2.3