Changeset 274

Timestamp:

01/01/08 07:05:49 (1 year ago)

Author:

wolf

Message:

[NEW] JRShellView: add previous uncompleted-command reinsertion upon down-arrow.

Files:

• trunk/cocoa/JRShellView/JRShellView.m (modified) (7 diffs)

trunk/cocoa/JRShellView/JRShellView.m

@@ -2 +2 @@
-
-#define PROMPT @">"
+
+typedef enum {
+    JRShellView_HistorySection,
+    JRShellView_PromptSection,
+    JRShellView_CommandSection
+}   JRShellView_Section;
-
-@interface JRShellView (Private)
-- (void)commonInit;
-- (NSString*)calcCurrentCommandString;
+- (void)setCurrentCommandString:(NSString*)command_;
-- (void)loadHistoricCommandFromCurrentCommandHistoryIndex;
-- (void)insertPrompt;
+- (JRShellView_Section)selectionSection;
+- (BOOL)selectionIsInImmutableSection;
-@end
-
@@ -39 +48 @@
-    }
-    
-(([event_ modifierFlags] & NSFunctionKeyMask) != NSFunctionKeyMask) && [self selectedRange].location < commandStart
+!([event_ modifierFlags] & NSFunctionKeyMask) && [self selectionIsInImmutableSection]
-        // User is typing while selection is in the immutable section of the text view.
-        // Cope by moving the selection to the end of the current command before letting the keyDown through.
@@ -76 +85 @@
-
-- (void)moveUp:(id)sender_ { // up
-edRange].location < commandStart
+ionIsInImmutableSection]
-        //  Selection is before the command section. Act normally.
-        [super moveUp:sender_];
@@ -83 +92 @@
-            //  User wishes to save off his uncompleted command (if any) and load previous-historic command.
-            if ([commandHistory count]) {
-[self string] length] > [self selectedRange].location
+self calcCurrentCommandString]
-                    [uncompletedCommand release];
-                    uncompletedCommand = [[self calcCurrentCommandString] retain];
@@ -140 +149 @@
-
-- (void)moveDown:(id)sender_ { // down
-edRange].location < commandStart
+ionIsInImmutableSection]
-        //  Selection is before the command section. Act normally.
-        [super moveDown:sender_];
@@ -151 +160 @@
-            if (currentCommandHistoryIndex == ([commandHistory count]-1)) {
-                //  No more historic commands.
-
+
+
+
+
+
+
+
+
-            } else {
-                ++currentCommandHistoryIndex;
@@ -360 +376 @@
-}
-
-loadHistoricCommandFromCurrentCommandHistoryIndex
+setCurrentCommandString:(NSString*)command_
-    [self setSelectedRange:NSMakeRange(commandStart,[[self string] length])];
-[commandHistory objectAtIndex:currentCommandHistoryIndex]
+command_
-    [self moveToEndOfDocument:self];
-    [self scrollRangeToVisible:[self selectedRange]];
-}
-
+- (void)loadHistoricCommandFromCurrentCommandHistoryIndex {
+    [self setCurrentCommandString:[commandHistory objectAtIndex:currentCommandHistoryIndex]];
+}
+
+- (JRShellView_Section)selectionSection {
+    unsigned selectionLocation = [self selectedRange].location;
+    if (selectionLocation >= commandStart) {
+        return JRShellView_CommandSection;
+    } else if (selectionLocation >= (commandStart - ([PROMPT length]+1))) {
+        return JRShellView_PromptSection;
+    } else {
+        return JRShellView_HistorySection;
+    }
+}
+
+- (BOOL)selectionIsInImmutableSection {
+    switch ([self selectionSection]) {
+        case JRShellView_HistorySection:
+        case JRShellView_PromptSection:
+            return YES;
+        case JRShellView_CommandSection:
+            return NO;
+        default:
+            assert(!"unknown JRShellView_Section");
+            return NO;
+    } 
+}
+
-@end