Add Increase Column and Decrease Column function

salexkidd · Jan 2, 2016 · 47041ce · 47041ce
1 parent 04f7271
commit 47041ce
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 6 deletions.
diff --git a/Interfaces/MainMenu.xib b/Interfaces/MainMenu.xib
@@ -961,13 +961,25 @@ DQ
                             <menuItem title="Decrease Row" keyEquivalent="" id="E89-Mw-yOH">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                 <connections>
-                                    <action selector="shrinkRow:" target="-1" id="tdy-uB-OZJ"/>
+                                    <action selector="decreaseRow:" target="-1" id="cNH-bz-I6n"/>
                                 </connections>
                             </menuItem>
                             <menuItem title="Increase Row" keyEquivalent="" id="1L5-Nc-laa">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                 <connections>
-                                    <action selector="expandRow:" target="-1" id="pS5-lB-FrP"/>
+                                    <action selector="increaseRow:" target="-1" id="33c-SV-e65"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Decrease Column" id="XkO-DN-h6r">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="decreaseColumn:" target="-1" id="8x7-l6-wYq"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Increase Column" id="ql8-uk-qRc">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="increaseColumn:" target="-1" id="4Sw-UR-VwZ"/>
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="vXn-Fa-KDE"/>

diff --git a/Interfaces/iTermEditKeyActionWindowController.xib b/Interfaces/iTermEditKeyActionWindowController.xib
@@ -114,6 +114,12 @@
                                             <menuItem title="Increase Row" tag="50" id="76W-hp-334">
                                                 <modifierMask key="keyEquivalentModifierMask"/>
                                             </menuItem>
+                                            <menuItem title="Decrease Column" tag="51" id="TdK-gh-sNx">
+                                                <modifierMask key="keyEquivalentModifierMask"/>
+                                            </menuItem>
+                                            <menuItem title="Increase Column" tag="52" id="mHj-xJ-MJH">
+                                                <modifierMask key="keyEquivalentModifierMask"/>
+                                            </menuItem>
                                             <menuItem isSeparatorItem="YES" id="xVG-IF-xul"/>
                                             <menuItem title="Scroll to End" tag="4" id="Mrs-CO-Zqo"/>
                                             <menuItem title="Scroll to Top" tag="5" id="Gnz-HA-ehs"/>

diff --git a/sources/PTYSession.m b/sources/PTYSession.m
@@ -4814,7 +4814,15 @@ - (void)keyDown:(NSEvent *)event {
             case KEY_ACTION_INCREASE_ROW:
                 [[[iTermController sharedInstance] currentTerminal] increaseRow:nil];
                 break;
-
+
+            case KEY_ACTION_DECREASE_COLUMN:
+                [[[iTermController sharedInstance] currentTerminal] decreaseColumn:nil];
+                break;
+
+            case KEY_ACTION_INCREASE_COLUMN:
+                [[[iTermController sharedInstance] currentTerminal] increaseColumn:nil];
+                break;
+
             default:
                 NSLog(@"Unknown key action %d", keyBindingAction);
                 break;

diff --git a/sources/PseudoTerminal.m b/sources/PseudoTerminal.m
@@ -5647,6 +5647,16 @@ - (IBAction)decreaseRow:(id)sender {
                                      andColumns:self.currentSession.columns];
 }
 
+- (IBAction)increaseColumn:(id)sender {
+    [self.currentSession.screen terminalSetRows:self.currentSession.rows
+                                     andColumns:self.currentSession.columns + 1];
+}
+
+- (IBAction)decreaseColumn:(id)sender {
+    [self.currentSession.screen terminalSetRows:self.currentSession.rows
+                                     andColumns:self.currentSession.columns - 1];
+}
+
 - (void)refreshTmuxLayoutsAndWindow
 {
     for (PTYTab *aTab in [self tabs]) {

diff --git a/sources/WindowControllerInterface.h b/sources/WindowControllerInterface.h
@@ -176,9 +176,11 @@ typedef NS_ENUM(NSInteger, BroadcastMode) {
 - (void)moveTabLeft:(id)sender;
 - (void)moveTabRight:(id)sender;
 
-// Expand and shrink window rows.
+// Increase and Decrease
 - (void)increaseRow:(id)sender;
 - (void)decreaseRow:(id)sender;
+- (void)increaseColumn:(id)sender;
+- (void)decreaseColumn:(id)sender;
 
 // If soft is true, don't kill tmux session. Otherwise is just like closeTab.
 - (void)closeTab:(PTYTab *)aTab soft:(BOOL)soft;

diff --git a/sources/iTermKeyBindingMgr.h b/sources/iTermKeyBindingMgr.h
@@ -133,6 +133,9 @@
 #define KEY_ACTION_MOVE_START_OF_SELECTION_RIGHT 48
 #define KEY_ACTION_DECREASE_ROW 49
 #define KEY_ACTION_INCREASE_ROW 50
+#define KEY_ACTION_DECREASE_COLUMN 51
+#define KEY_ACTION_INCREASE_COLUMN 52
+
 
 @interface iTermKeyBindingMgr : NSObject {
 }

diff --git a/sources/iTermKeyBindingMgr.m b/sources/iTermKeyBindingMgr.m
@@ -472,13 +472,21 @@ + (NSString *)formatAction:(NSDictionary *)keyInfo
             break;
 
         case KEY_ACTION_DECREASE_ROW:
-            actionString = @"Shrink Row";
+            actionString = @"Decrease Row";
             break;
 
         case KEY_ACTION_INCREASE_ROW:
-            actionString = @"Expand Row";
+            actionString = @"Increase Row";
+            break;
+
+        case KEY_ACTION_DECREASE_COLUMN:
+            actionString = @"Decrease Column";
             break;
 
+        case KEY_ACTION_INCREASE_COLUMN:
+            actionString = @"Increase Column";
+            break;
+
         default:
             actionString = [NSString stringWithFormat: @"%@ %d", @"Unknown Action ID", action];
             break;