reset / hard reset menus.

Emulators/Apple80.mm.ragel

@@ -268,13 +268,16 @@
 }
 
 
--(void)reset
+-(void)reset: (BOOL)hard
 {
 
     %%write init;
-    _context.window = iRect(0, 0, _columns, 24);
-    _context.cursor = iPoint(0,0);
     _context.flags = 0;
+
+    if (hard) {
+        _context.window = iRect(0, 0, _columns, 24);
+        _context.cursor = iPoint(0,0);
+    }
 }
 
 -(BOOL)resizable
@@ -299,7 +302,7 @@
 {
     if ((self = [super init]))
     {
-        [self reset];
+        [self reset: YES];
     }
     
     return self;
@@ -414,9 +417,9 @@
     return "appleIIe";
 }
 
--(void) reset {
+-(void) reset: (BOOL)hard {
     _columns = 40;
-    [super reset];
+    [super reset: hard];
 }
 
 -(CharacterGenerator *)characterGenerator {
@@ -448,9 +451,9 @@
     return "appleIIe";
 }
 
--(void) reset {
+-(void) reset: (BOOL)hard {
     _columns = 80;
-    [super reset];
+    [super reset: hard];
 }
 
 @end

Emulators/Emulator.h

@@ -50,7 +50,7 @@ extern "C" unsigned EventCharacters(NSEvent *event, std::u32string &rv);
 
 -(void)keyDown: (NSEvent *)event screen: (Screen *)screen output: (OutputChannel *)output;
 
--(void)reset;
+-(void)reset: (BOOL)hard;
 
 +(NSString *)name;
 -(NSString *)name;

Emulators/GNOConsole.mm.ragel

@@ -411,19 +411,19 @@
 }
 
 
--(void)reset
+-(void)reset: (BOOL)hard
 {
 
     %%write init;
 
     _context.flags = 0;
-    _context.window = iRect(0, 0, 80, 24);
-    _context.cursor = iPoint(0,0);
-    
-    
     _cursorType = Screen::CursorTypeUnderscore;
 
-    // set flags to plain text.
+    if (hard) {
+        _context.window = iRect(0, 0, 80, 24);
+        _context.cursor = iPoint(0,0);
+    }
+
 }
 
 -(BOOL)resizable
@@ -448,7 +448,7 @@
 {
     if ((self = [super init]))
     {
-        [self reset];
+        [self reset: YES];
     }
     
     return self;

Emulators/GSOSConsole.mm.ragel

@@ -496,20 +496,23 @@ static void advance(Screen *screen, gsos_context &ctx) {
 {
     if ((self = [super init]))
     {
-        [self reset];
+        [self reset: YES];
     }
     
     return self;
 }
 
--(void)reset
+-(void)reset: (BOOL)hard
 {
     
     %%write init;
 
-    _context.window = iRect(0, 0, 80, 24);
-    _context.cursor = iPoint(0,0);
+    if (hard) {
+        _context_stack.clear();
 
+        _context.window = iRect(0, 0, 80, 24);
+        _context.cursor = iPoint(0,0);
+    }
 
     _context.consWrap = true;
     _context.consAdvance = true;

Emulators/PTSE.mm.ragel

@@ -306,20 +306,15 @@
     return "proterm-special";
 }
 
--(void)reset: (Screen *)screen
-{
-    [self reset];
-
-    if (screen) screen->eraseScreen();
-}
-
--(void)reset
+-(void)reset: (BOOL)hard
 {
     %%write init;
-    
-    _context.cursor = iPoint(0,0);
-    _context.window = iRect(0,0,80,24);
     _context.flags = 0;
+
+    if (hard) {
+        _context.cursor = iPoint(0,0);
+        _context.window = iRect(0,0,80,24);
+    }
 }
 
 -(BOOL)resizable
@@ -336,7 +331,7 @@
 
 -(id)init
 {
-    [self reset];
+    [self reset: YES];
     return self;
 }
 

Emulators/VT52.mm

@@ -72,7 +72,7 @@ enum {
 -(id)init {
     if ((self = [super init])) {
         _model = ModelVT50;
-        [self reset];
+        [self reset: YES];
 
     }
     return self;
@@ -104,7 +104,7 @@ enum {
 -(id)init {
     if ((self = [super init])) {
         _model = ModelVT50H;
-        [self reset];
+        [self reset: YES];
 
     }
     return self;
@@ -141,7 +141,7 @@ enum {
 -(id)init {
     if ((self = [super init])) {
         _model = ModelVT52;
-        [self reset];
+        [self reset: YES];
     }
     return self;
 }
@@ -168,7 +168,7 @@ enum {
 -(id)init {
     if ((self = [super init])) {
         _model = ModelVT55;
-        [self reset];
+        [self reset: YES];
 
     }
     return self;
@@ -319,15 +319,18 @@ enum {
     }
 }
 
--(void)reset
+-(void)reset: (BOOL)hard
 {
     cs = StateText;
     _escape = false;
     _altKeyPad = false;
     _graphics = false;
-    _context.cursor = iPoint(0,0);
-    _context.window = iRect(0, 0, 80, 24);
-    if (_model <= ModelVT50H) _context.window = iRect(0, 0, 80, 12);
+    
+    if (hard) {
+        _context.cursor = iPoint(0,0);
+        _context.window = iRect(0, 0, 80, 24);
+        if (_model <= ModelVT50H) _context.window = iRect(0, 0, 80, 12);
+    }
     _context.flags = 0;
 }
 

English.lproj/MainMenu.xib

@@ -63,8 +63,8 @@
                         </items>
                     </menu>
                 </menuItem>
-                <menuItem title="File" id="83">
-                    <menu key="submenu" title="File" id="81">
+                <menuItem title="Shell" id="83">
+                    <menu key="submenu" title="Shell" id="81">
                         <items>
                             <menuItem title="New" keyEquivalent="n" id="82">
                                 <connections>
@@ -112,6 +112,19 @@
                                     <action selector="revertDocumentToSaved:" target="-1" id="364"/>
                                 </connections>
                             </menuItem>
+                            <menuItem isSeparatorItem="YES" id="1Bf-fE-VAI"/>
+                            <menuItem title="Reset" keyEquivalent="r" id="h3z-Y4-dyj">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="resetTerminal:" target="-1" id="Afh-EL-aOa"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Hard Reset" keyEquivalent="r" id="CX0-e3-Dg4">
+                                <modifierMask key="keyEquivalentModifierMask" control="YES" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="hardResetTerminal:" target="-1" id="bVS-nP-oag"/>
+                                </connections>
+                            </menuItem>
                             <menuItem isSeparatorItem="YES" id="74">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>

TermWindowController.h

@@ -57,6 +57,9 @@
 
 -(void)setParameters: (NSDictionary *)parameters;
 
+-(IBAction)resetTerminal: (id)sender;
+-(IBAction)hardResetTerminal: (id)sender;
+
 @end
 
 

TermWindowController.mm

@@ -248,8 +248,14 @@
     [_emulatorView processData: (uint8_t *)buffer size: size];
 }
 
+-(IBAction)resetTerminal: (id)sender {
+    [_emulator reset: NO];
+}
 
-
+-(IBAction)hardResetTerminal: (id)sender {
+    [_emulator reset: YES];
+    [_emulatorView reset];
+}
 #pragma mark -
 #pragma mark NSWindowDelegate
 
@@ -413,6 +419,7 @@
     }
 }
 
+
 - (IBAction)foregroundColor:(id)sender {
     [self updateForegroundColor];
 }
@@ -463,7 +470,6 @@
     [_emulatorView setBackgroundColor: color];
 }
 
-
 @end
 
 

Views/EmulatorView.h

@@ -111,6 +111,8 @@ private:
 -(void)processData: (uint8_t *)data size: (size_t)size;
 -(void)childFinished: (int)status;
 -(void)childBegan;
+
+-(void)reset;
 @end
 
 

Views/EmulatorView.mm

@@ -888,7 +888,12 @@
 }
 
 
-
+-(void)reset {
+    _screen.eraseScreen();
+    _screen.setCursor(iPoint(0,0));
+    _cursorOn = YES;
+    [self setNeedsDisplay: YES];
+}
 @end