From 33f4aad8c58ff824e6fbad89a03f364beeac14fd Mon Sep 17 00:00:00 2001 From: Jay Freeman Date: Thu, 8 May 2008 19:08:48 +0000 Subject: Moved to unstable MobileTerminal branch. git-svn-id: http://svn.telesphoreo.org/trunk@269 514c082c-b64e-11dc-b46d-3d985efe055d --- data/mobileterminal/_metadata/postinst | 13 +++ data/mobileterminal/_metadata/version | 2 +- data/mobileterminal/cstring.diff | 134 ++++++++++++++++++++--------- data/mobileterminal/drawrect.diff | 12 --- data/mobileterminal/gcc42.diff | 50 +++++------ data/mobileterminal/gliw.diff | 59 +++++++++---- data/mobileterminal/import.diff | 79 +++++++++-------- data/mobileterminal/make.sh | 6 +- data/mobileterminal/mobileterminal-273.tgz | Bin 82560 -> 0 bytes data/mobileterminal/mobileterminal-286.tgz | Bin 0 -> 854578 bytes data/mobileterminal/werror.diff | 10 --- 11 files changed, 221 insertions(+), 144 deletions(-) create mode 100644 data/mobileterminal/_metadata/postinst delete mode 100644 data/mobileterminal/drawrect.diff delete mode 100644 data/mobileterminal/mobileterminal-273.tgz create mode 100644 data/mobileterminal/mobileterminal-286.tgz delete mode 100644 data/mobileterminal/werror.diff diff --git a/data/mobileterminal/_metadata/postinst b/data/mobileterminal/_metadata/postinst new file mode 100644 index 000000000..c0b1fb066 --- /dev/null +++ b/data/mobileterminal/_metadata/postinst @@ -0,0 +1,13 @@ +#!/bin/bash +shopt -s extglob + +if [[ $# -gt 1 && $1 == configure ]]; then + ver=${2%%?(u)-*([0-9])} + rev=${2##*-} + + if [[ ${ver} -lt 286 || ${ver} -eq 286 && ${rev} -lt 6 ]]; then + rm -f ~mobile/Library/Preferences/com.googlecode.mobileterminal.plist + fi +fi + +exit 0 diff --git a/data/mobileterminal/_metadata/version b/data/mobileterminal/_metadata/version index 305aa9857..61ccac771 100644 --- a/data/mobileterminal/_metadata/version +++ b/data/mobileterminal/_metadata/version @@ -1 +1 @@ -273 +286u diff --git a/data/mobileterminal/cstring.diff b/data/mobileterminal/cstring.diff index 7a31a47c1..ba9499b34 100644 --- a/data/mobileterminal/cstring.diff +++ b/data/mobileterminal/cstring.diff @@ -1,52 +1,108 @@ -diff -ru mobileterminal-273/MobileTerminal.m mobileterminal-273+iPhone/MobileTerminal.m ---- mobileterminal-273/MobileTerminal.m 2008-03-29 02:42:18.000000000 +0000 -+++ mobileterminal-273+iPhone/MobileTerminal.m 2008-04-09 11:50:57.000000000 +0000 -@@ -174,7 +174,7 @@ +diff -r -ru 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]]; + } - - (void)handleInputFromMenu:(NSString*)input - { -- [process write:[input cString] length:[input length]]; -+ [process write:[input UTF8String] length:[input length]]; + //_______________________________________________________________________________ +diff -r -ru 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-05-07 08:13:49.000000000 +0000 +@@ -356,7 +356,7 @@ + } + else + { +- [[self activeProcess] write:[input cString] length:[input length]]; ++ [[self activeProcess] write:[input UTF8String] length:[input length]]; + } } - - (void)toggleKeyboard -diff -ru mobileterminal-273/PTYTextView.m mobileterminal-273+iPhone/PTYTextView.m ---- mobileterminal-273/PTYTextView.m 2007-10-01 08:23:11.000000000 +0000 -+++ mobileterminal-273+iPhone/PTYTextView.m 2008-04-09 11:59:25.000000000 +0000 -@@ -179,7 +179,7 @@ +diff -r -ru 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; - - (void)setupTextForContext:(CGContextRef)context - { -- const char* font = [[[Settings sharedInstance] font] cString]; -+ const char* font = [[[Settings sharedInstance] font] UTF8String]; + NSString *fontName = @"HelveticaBold"; +- CGContextSelectFont(context, [fontName cString], height, kCGEncodingMacRoman); ++ CGContextSelectFont(context, [fontName UTF8String], height, kCGEncodingMacRoman); + CGFontRef font = CGContextGetFont(context); - if(!fontRef) { + NSString * text = [self title]; +diff -r -ru 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-05-07 08:13:35.000000000 +0000 +@@ -238,7 +238,7 @@ + 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. -diff -ru mobileterminal-273/SubProcess.m mobileterminal-273+iPhone/SubProcess.m ---- mobileterminal-273/SubProcess.m 2008-02-06 14:40:02.000000000 +0000 -+++ mobileterminal-273+iPhone/SubProcess.m 2008-04-09 11:55:42.000000000 +0000 -@@ -134,7 +134,7 @@ - - (void)failure:(NSString*)message; + fontSize = config.fontSize; + CGContextSelectFont(context, font, floor(lineHeight), kCGEncodingMacRoman); +diff -r -ru 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 -- [delegate handleStreamOutput:[message cString] length:[message length]]; -+ [delegate handleStreamOutput:[message UTF8String] length:[message length]]; + 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 -ru mobileterminal-273/VT100Terminal.m mobileterminal-273+iPhone/VT100Terminal.m ---- mobileterminal-273/VT100Terminal.m 2007-10-01 08:23:11.000000000 +0000 -+++ mobileterminal-273+iPhone/VT100Terminal.m 2008-04-09 11:55:55.000000000 +0000 -@@ -1226,10 +1226,10 @@ - - int i; - int r; -- setupterm((char *)[termtype cString], fileno(stdout), &r); -+ setupterm((char *)[termtype UTF8String], fileno(stdout), &r); +diff -r -ru 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 +@@ -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 -ru 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) { -- NSLog(@"Terminal type %s is not defined.\n",[termtype cString]); -+ NSLog(@"Terminal type %s is not defined.\n",[termtype UTF8String]); - for(i = 0; i < TERMINFO_KEYS; i ++) { + 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]); - key_strings[i]=NULL; diff --git a/data/mobileterminal/drawrect.diff b/data/mobileterminal/drawrect.diff deleted file mode 100644 index e92f81b22..000000000 --- a/data/mobileterminal/drawrect.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru mobileterminal-273/GestureView.m mobileterminal-273+iPhone/GestureView.m ---- mobileterminal-273/GestureView.m 2007-10-08 05:00:47.000000000 +0000 -+++ mobileterminal-273+iPhone/GestureView.m 2008-04-09 12:02:22.000000000 +0000 -@@ -95,7 +95,7 @@ - return NO; - } - --- (void)drawRect: (CGRect *)rect -+- (void)drawRect: (CGRect)rect - { - } - diff --git a/data/mobileterminal/gcc42.diff b/data/mobileterminal/gcc42.diff index fd8740e78..f4fa9245e 100644 --- a/data/mobileterminal/gcc42.diff +++ b/data/mobileterminal/gcc42.diff @@ -1,31 +1,31 @@ -diff -ru mobileterminal-273/ColorMap.m mobileterminal-273+iPhone/ColorMap.m ---- mobileterminal-273/ColorMap.m 2007-10-01 08:23:11.000000000 +0000 -+++ mobileterminal-273+iPhone/ColorMap.m 2008-04-09 11:57:06.000000000 +0000 -@@ -144,7 +144,7 @@ +diff -r -ru 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]; + } - - (CGColorRef)colorForCode:(unsigned int) index - { -- CGColorRef color; -+ CGColorRef color = NULL; + - (NSString*) fontDescription; ++- (RGBAColor *) colors; - if (index & DEFAULT_FG_COLOR_CODE) { // special colors? - switch (index) { -diff -ru mobileterminal-273/ShellKeyboard.m mobileterminal-273+iPhone/ShellKeyboard.m ---- mobileterminal-273/ShellKeyboard.m 2007-10-01 08:23:11.000000000 +0000 -+++ mobileterminal-273+iPhone/ShellKeyboard.m 2008-04-09 11:52:43.000000000 +0000 -@@ -37,6 +37,7 @@ - - (BOOL)webView:(id)fp8 shouldDeleteDOMRange:(id)fp12 - { - [shellKeyboard handleKeyPress:0x08]; -+ return YES; +-@property RGBAColor * colors; ++@property (getter = colors) RGBAColor *colors; + @property BOOL autosize; + @property int width; + @property int fontSize; +diff -r -ru 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-05-07 08:30:20.000000000 +0000 +@@ -62,7 +62,7 @@ } - - (BOOL)webView:(id)fp8 shouldInsertText:(id)character -@@ -48,6 +49,7 @@ - return false; - } - [shellKeyboard handleKeyPress:[character characterAtIndex:0]]; -+ return YES; + - (RGBAColor*) colors { +- return colors; ++ return _colors; } - @end + //_______________________________________________________________________________ diff --git a/data/mobileterminal/gliw.diff b/data/mobileterminal/gliw.diff index 00753b5c0..7e0c9af4e 100644 --- a/data/mobileterminal/gliw.diff +++ b/data/mobileterminal/gliw.diff @@ -1,21 +1,42 @@ -diff -ru mobileterminal-273/GestureView.m mobileterminal-273+iPhone/GestureView.m ---- mobileterminal-273/GestureView.m 2007-10-08 05:00:47.000000000 +0000 -+++ mobileterminal-273+iPhone/GestureView.m 2008-04-09 12:02:22.000000000 +0000 -@@ -19,7 +19,7 @@ - - (void)mouseDown:(GSEvent *)event - { - gesture = NO; -- start = GSEventGetLocationInWindow(event); -+ start = GSEventGetLocationInWindow(event).origin; - [delegate showMenu:start]; - } - -@@ -29,7 +29,7 @@ - return; - } +diff -r -ru 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-05-07 08:22:32.000000000 +0000 +@@ -79,7 +79,7 @@ -- CGPoint end = GSEventGetLocationInWindow(event); -+ CGPoint end = GSEventGetLocationInWindow(event).origin; - CGPoint vector = CGPointMake(end.x - start.x, end.y - start.y); + - (void) mouseDown:(GSEvent*)event + { +- mouseDownPos = [delegate viewPointForWindowPoint:GSEventGetLocationInWindow(event)]; ++ mouseDownPos = [delegate viewPointForWindowPoint:GSEventGetLocationInWindow(event).origin]; + [delegate showMenu:mouseDownPos]; + + [super mouseDown:event]; +@@ -132,7 +132,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 absx = (vector.x > 0) ? vector.x : -vector.x; + float r = sqrtf(vector.x*vector.x + vector.y*vector.y); +@@ -168,7 +168,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 -ru 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-05-07 08:13:49.000000000 +0000 +@@ -404,7 +404,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) + { diff --git a/data/mobileterminal/import.diff b/data/mobileterminal/import.diff index aacabb5fc..45b7d9a12 100644 --- a/data/mobileterminal/import.diff +++ b/data/mobileterminal/import.diff @@ -1,36 +1,45 @@ -diff -ru mobileterminal-273/MobileTerminal.h mobileterminal-273+iPhone/MobileTerminal.h ---- mobileterminal-273/MobileTerminal.h 2007-10-08 05:00:47.000000000 +0000 -+++ mobileterminal-273+iPhone/MobileTerminal.h 2008-04-09 11:50:48.000000000 +0000 -@@ -1,5 +1,6 @@ - // MobileTermina.h - #import -+#import - #import - - @class PTYTextView; -diff -ru mobileterminal-273/PieView.m mobileterminal-273+iPhone/PieView.m ---- mobileterminal-273/PieView.m 2007-10-08 05:00:47.000000000 +0000 -+++ mobileterminal-273+iPhone/PieView.m 2008-04-09 12:06:49.000000000 +0000 -@@ -1,3 +1,4 @@ -+#import - #import "PieView.h" - - @implementation PieView -diff -ru mobileterminal-273/PTYTextView.h mobileterminal-273+iPhone/PTYTextView.h ---- mobileterminal-273/PTYTextView.h 2007-10-01 08:23:11.000000000 +0000 -+++ mobileterminal-273+iPhone/PTYTextView.h 2008-04-09 11:55:17.000000000 +0000 -@@ -1,4 +1,5 @@ - // PTYTextView.h -+#import - #import - #import - -diff -ru mobileterminal-273/ShellKeyboard.h mobileterminal-273+iPhone/ShellKeyboard.h ---- mobileterminal-273/ShellKeyboard.h 2007-10-08 05:00:47.000000000 +0000 -+++ mobileterminal-273+iPhone/ShellKeyboard.h 2008-04-09 11:51:26.000000000 +0000 -@@ -1,4 +1,5 @@ - // ShellKeyboard.h -+#import - #import - #import +diff -r -ru 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 ++#import + + #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 -ru 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-05-07 08:22:11.000000000 +0000 +@@ -13,7 +13,7 @@ + #import "Log.h" + + #import +-#import "UIFieldEditor.h" ++#import + + //_______________________________________________________________________________ + //_______________________________________________________________________________ +diff -r -ru 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 -ru 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" ++#import + + //_______________________________________________________________________________ + //_______________________________________________________________________________ diff --git a/data/mobileterminal/make.sh b/data/mobileterminal/make.sh index b4bb8862c..21fe72d2d 100644 --- a/data/mobileterminal/make.sh +++ b/data/mobileterminal/make.sh @@ -1,4 +1,4 @@ pkg:setup -make CC="${PKG_TARG}-gcc" package -pkg: mkdir -p /Applications -pkg: cp -a Terminal.app /Applications +make -f Makefile.build CC="${PKG_TARG}-gcc" +pkg: mkdir -p /Applications/Terminal.app +pkg: cp -a Info.plist Resources/* Terminal /Applications/Terminal.app diff --git a/data/mobileterminal/mobileterminal-273.tgz b/data/mobileterminal/mobileterminal-273.tgz deleted file mode 100644 index 46894a65c..000000000 Binary files a/data/mobileterminal/mobileterminal-273.tgz and /dev/null differ diff --git a/data/mobileterminal/mobileterminal-286.tgz b/data/mobileterminal/mobileterminal-286.tgz new file mode 100644 index 000000000..e93fac6fc Binary files /dev/null and b/data/mobileterminal/mobileterminal-286.tgz differ diff --git a/data/mobileterminal/werror.diff b/data/mobileterminal/werror.diff deleted file mode 100644 index 76f6a9ff3..000000000 --- a/data/mobileterminal/werror.diff +++ /dev/null @@ -1,10 +0,0 @@ -diff -ru mobileterminal-273/Makefile mobileterminal-273+iPhone/Makefile ---- mobileterminal-273/Makefile 2007-10-01 08:23:11.000000000 +0000 -+++ mobileterminal-273+iPhone/Makefile 2008-04-09 12:22:02.000000000 +0000 -@@ -1,5 +1,5 @@ - CC=arm-apple-darwin-gcc --CFLAGS=-Wall -Werror -O7 -+CFLAGS=-Wall -O7 - LDFLAGS=-lobjc -framework CoreFoundation -framework Foundation \ - -framework UIKit -framework LayerKit -framework CoreGraphics \ - -framework GraphicsServices -lcurses -- cgit v1.2.3