Changeset 275

Timestamp:

01/01/08 09:04:11 (1 year ago)

Author:

wolf

Message:

[NEW] JRShellView:
- Completed left+right-moving logic.
- Add NSText (UndocumentedSelectionMovement?) category to suppress compiler warnings.
- Disable debug logging of -doCommandBySelector:
- Allow left-arrow when it wouldn't otherwise be allowed (selection directly to right of prompt section) when the selection's length is nonzero. Otherwise you can't kill the selection with the left arrow key when the whole command is selected.

Files:

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

trunk/cocoa/JRShellView/JRShellView.m

@@ -1 +1 @@
-#import "JRShellView.h"
+
+@interface NSText (UndocumentedSelectionMovement)
+- (IBAction)moveParagraphBackwardAndModifySelection:(id)sender;
+- (IBAction)moveToBeginningOfDocumentAndModifySelection:(id)sender;
+- (IBAction)moveParagraphForwardAndModifySelection:(id)sender;
+- (IBAction)moveToEndOfDocumentAndModifySelection:(id)sender;
+- (IBAction)moveToBeginningOfLineAndModifySelection:(id)sender;
+- (IBAction)pageUpAndModifySelection:(id)sender;
+- (IBAction)pageDownAndModifySelection:(id)sender;
+@end
-
-#define PROMPT @">"
@@ -17 +27 @@
-- (JRShellView_Section)selectionSection;
-- (BOOL)selectionIsInImmutableSection;
+- (BOOL)canMoveSelectionBackwards;
-@end
-
@@ -57 +68 @@
-}
-
+#if 0
-- (void)doCommandBySelector:(SEL)selector_ {
-    NSLog(@"doCommandBySelector %@", NSStringFromSelector(selector_));
-    [super doCommandBySelector:selector_];
-}
+#endif
-
-#pragma mark Misc
@@ -210 +223 @@
-
-- (void)moveLeft:(id)sender_ { // left
-
-       
+
+        
-}
-- (void)moveToBeginningOfLine:(id)sender_ { // ctl-left, cmd-left
-
-
+
+
+
+
+
+
+
+
+
+
-}
-- (void)moveWordLeft:(id)sender_ { // opt-left
-
-       
+
+        
-}
-- (void)moveLeftAndModifySelection:(id)sender_ { // shift-left
-
-       
+
+        
-}
-- (void)moveToBeginningOfLineAndModifySelection:(id)sender_ { // ctl-shift-left, cmd-shift-left
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-- (void)moveWordLeftAndModifySelection:(id)sender_ { // opt-shift-left
-selectedRange].location > commandStart
+canMoveSelectionBackwards]
-        [super moveWordLeftAndModifySelection:sender_];
-}
-- (void)changeBaseWritingDirectionToRTL:(id)sender_ { // cmd-ctl-left, cmd-ctl-shift-left
-
-
+
+
+
+
+
-}
-
-#pragma mark Right
+
+#ifdef CommandsWeJustLetPassThrough
-
-- (void)moveRight:(id)sender_ { // right
@@ -264 +299 @@
-        [super moveWordRightAndModifySelection:sender_];
-}
+
+#endif
+
-- (void)changeBaseWritingDirectionToLTR:(id)sender_ { // cmd-ctl-right, cmd-ctl-shift-right
-
-
-
+
+
+
+
+
+
+
+
-
-#pragma mark pageUp
@@ -291 +334 @@
-}
-
-#pragma mark -
-#pragma mark OLD
-#pragma mark - 
-
-#if 0
-
-- (void)moveToBeginningOfLine:(id)sender_ { // [cmd|ctl] <- (left arrow)
-    [self setSelectedRange:NSMakeRange(start,0)];
-}
-
-- (void)moveToEndOfLine:(id)sender_ { // [cmd|ctl] -> (right arrow)
-    [self moveToEndOfDocument:sender_];
-}
-
-- (void)moveToBeginningOfParagraph:(id)sender_ { // ctrl-a
-    NSLog(@"moveToBeginningOfParagraph"); moveToBeginningOfDocumentAndModifySelection
-    [self setSelectedRange:NSMakeRange(start,0)];
-}
-
-- (void)moveToEndOfParagraph:(id)sender_ { // ctrl-e
-    [self moveToEndOfDocument:sender_];
-}
-
-- (void)moveLeft:(id)sender_ {
-}
-
-- (void)moveWordLeftAndModifySelection:(id)sender_ {
-    if ([self selectedRange].location > start)
-        [super moveWordLeftAndModifySelection:sender_];
-}
-
-- (void)moveWordLeft:(id)sender_ {
-    if ([self selectedRange].location > start)
-        [super moveWordLeft:sender_];
-}
-
-- (void)moveUp:(id)sender_ {
-    NSLog(@"TODO moveUp");
-    [super moveUp:sender_];
-}
-
-- (void)moveDown:(id)sender_ {
-    NSLog(@"TODO moveDown");
-    [super moveDown:sender_];
-}
-#endif
-
@@ -411 +409 @@
-}
-
+- (BOOL)canMoveSelectionBackwards {
+    switch ([self selectionSection]) {
+        case JRShellView_HistorySection:
+        case JRShellView_PromptSection:
+            return YES;
+        case JRShellView_CommandSection: {
+            NSRange range = [self selectedRange];
+            return range.length ? YES : [self selectedRange].location > commandStart;
+        }   break;
+        default:
+            assert(!"unknown JRShellView_Section");
+            return NO;
+    }
+}
+
-@end