Codebase refactor and disconnect fix for v1.7.0

Major refactor: main.c reduced from 3,478 to 494 lines (86% reduction).
Extracted dialogs.c, menus.c, input.c, clipboard.c, macutil.c as new
modules. Data-driven key mapping, per-menu dispatch handlers, shared
utilities. Removed dead code (conn_open_dialog, 6 TCP wrappers).
Total compiled LOC reduced from 12,027 to 10,036 (17% reduction).

Fixed remote disconnect to preserve terminal screen content instead of
wiping the buffer. Window repaint after disconnect alert now works in
all modes.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: ecliptik

CHANGELOG.md

@@ -2,6 +2,42 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.7.0] - 2026-03-10
+
+### Changed
+- Major codebase refactor: main.c reduced from 3,478 to ~494 lines (86% reduction)
+- Extracted dialogs.c: all dialog handling (connect, bookmarks, about, disconnect)
+- Extracted menus.c: menu management with per-menu dispatch handlers
+- Extracted input.c: keyboard/mouse handling with data-driven key mapping tables
+- Extracted clipboard.c: copy/paste/select all operations
+- Extracted macutil.c: shared utilities (c2pstr, sprintfp, set_wtitlef, clear_window_bg)
+- Extended session.c: font presets, ttype/font string helpers, window resize, init from prefs
+- Collapsed identical telnet option handlers with fallthrough in telnet.c
+- Extracted conn_resolve_host() from conn_connect() in connection.c
+- Split handle_menu() into per-menu handlers (handle_file_menu, handle_edit_menu, etc.)
+- Data-driven key mapping replaces if/else chain in handle_key_down()
+- Total compiled LOC reduced from 12,027 to 10,036 (17% reduction)
+
+### Fixed
+- Remote disconnect preserves terminal screen content (was wiped by terminal_reset)
+- Window repaint after disconnect alert restores terminal content in all modes
+
+### Removed
+- Dead conn_open_dialog() from connection.c
+- 6 unused TCP wrapper functions from tcp.c (~256 lines)
+
+## [1.6.1] - 2026-03-10
+
+### Fixed
+- MacTCP.h: add forward declarations for struct GetAddrParamBlock,
+  ICMPParamBlock, TCPiopb, and UDPiopb to eliminate "declared inside
+  parameter list" compiler warnings
+- tcp.h: alias proc typedefs (TCPIOCompletionProc, TCPNotifyProc, etc.)
+  to actual MacTCP UPP types instead of incompatible ProcPtr/re-declared
+  function pointers, eliminating all -Wincompatible-pointer-types warnings
+- MacTCP.h: convert from classic Mac CR to Unix LF line endings for
+  consistent cross-platform source formatting
+
 ## [1.6.0] - 2026-03-10
 
 ### Added

CMakeLists.txt

@@ -3,6 +3,10 @@ project(Flynn VERSION 1.6.1)
 
 add_application(Flynn
     src/main.c
+    src/menus.c
+    src/input.c
+    src/clipboard.c
+    src/dialogs.c
     src/session.c
     src/connection.c
     src/telnet.c
@@ -11,7 +15,7 @@ add_application(Flynn
     src/tcp.c
     src/dns.c
     src/glyphs.c
-    src/dnr.c
+    src/macutil.c
     src/sysutil.c
     src/settings.c
     resources/telnet.r

README.md

@@ -29,16 +29,12 @@ No build toolchain required — just download and run.
 ## Features
 
 - **Multiple sessions** (up to 4 simultaneous windows)
-- **VT100/VT220/xterm terminal emulation**
-- **Box-drawing characters**
-- **Unicode glyph rendering**
-- **Resizable window** (80x24 up to 132x50)
+- **VT100/VT220/xterm/xterm-256color terminal emulation**
+- **Box-drawing characters, Unicode glyph rendering**
+- **Resizable window and scrollback** (80x24 up to 132x50)
 - **6 fonts** (Monaco 9/12, Courier 10, Chicago 12, Geneva 9/10)
 - **Session bookmarks**
-- **Username auto-login**
 - **Mouse text selection**
-- **Scrollback** (96 lines)
-- **Control menu**
 - **Keystroke buffering**
 - **M0110 keyboard support**
 - **Dark mode**
@@ -62,6 +58,7 @@ Flynn is designed for the Apple M0110/M0110A keyboard, which lacks Escape and Co
 | Extend selection | Shift+click | Extends selection to click point |
 | Copy | Cmd+C | Copies selection, or full screen if none |
 | Paste | Cmd+V | Sends clipboard to connection |
+| Select All | Cmd+A | Selects entire terminal screen |
 | F1-F10 | Cmd+1..0 | For M0110 keyboards without function keys |
 | Bookmarks | Cmd+B | Open bookmark manager |
 | New Session | Cmd+N | New session (new window if connected) |

include/MacTCP.h

@@ -0,0 +1,178 @@
+/*
+ * clipboard.c - Clipboard operations for Flynn
+ * Extracted from main.c
+ */
+
+#include <Quickdraw.h>
+#include <Windows.h>
+#include <Memory.h>
+#include <Multiverse.h>
+
+#include "main.h"
+#include "session.h"
+#include "connection.h"
+#include "terminal.h"
+#include "terminal_ui.h"
+#include "glyphs.h"
+#include "clipboard.h"
+
+/* External references to main.c globals */
+extern Session *active_session;
+
+void
+do_copy(void)
+{
+	long buf_size;
+	char *buf;
+	short row, col, len, last_nonspace;
+	TermCell *cell;
+	Session *s = active_session;
+
+	if (!s)
+		return;
+
+	/* Ensure global sel reflects this session's selection */
+	term_ui_load_state(&s->ui);
+
+	buf_size = (long)s->terminal.active_rows *
+	    (s->terminal.active_cols + 1);
+	buf = (char *)NewPtr(buf_size);
+	if (!buf)
+		return;
+
+	if (!term_ui_sel_active()) {
+		DisposePtr((Ptr)buf);
+		return;
+	}
+
+	{
+		short sr, sc, er, ec;
+		short c_start, c_end;
+
+		term_ui_sel_get_range(&sr, &sc, &er, &ec);
+
+		len = 0;
+		for (row = sr; row <= er; row++) {
+			if (sr == er) {
+				c_start = sc;
+				c_end = ec;
+			} else if (row == sr) {
+				c_start = sc;
+				c_end = s->terminal.active_cols - 1;
+			} else if (row == er) {
+				c_start = 0;
+				c_end = ec;
+			} else {
+				c_start = 0;
+				c_end = s->terminal.active_cols - 1;
+			}
+
+			last_nonspace = -1;
+			for (col = c_start; col <= c_end; col++) {
+				char cc;
+				const GlyphInfo *gi;
+
+				cell = terminal_get_display_cell(
+				    &s->terminal, row, col);
+				if ((cell->attr & ATTR_GLYPH) &&
+				    cell->ch == GLYPH_WIDE_SPACER) {
+					buf[len + (col - c_start)] = ' ';
+					continue;
+				}
+				if (cell->attr & ATTR_GLYPH) {
+					gi = glyph_get_info(cell->ch);
+					cc = gi ? gi->copy_char : '?';
+				} else if (cell->attr & ATTR_BRAILLE) {
+					cc = '.';
+				} else {
+					cc = cell->ch;
+				}
+				buf[len + (col - c_start)] = cc;
+				if (cc != ' ')
+					last_nonspace = col - c_start;
+			}
+			len += last_nonspace + 1;
+			if (row < er)
+				buf[len++] = '\r';
+		}
+	}
+
+	ZeroScrap();
+	PutScrap(len, 'TEXT', buf);
+	DisposePtr((Ptr)buf);
+}
+
+void
+do_paste(void)
+{
+	Handle h;
+	long offset, len;
+	Session *s = active_session;
+
+	if (!s || s->conn.state != CONN_STATE_CONNECTED)
+		return;
+
+	h = NewHandle(0);
+	if (!h)
+		return;
+
+	len = GetScrap(h, 'TEXT', &offset);
+	if (len > 0) {
+		char *p;
+		long sent;
+
+		HLock(h);
+		p = *h;
+
+		if (s->terminal.bracketed_paste)
+			conn_send(&s->conn, "\033[200~", 6);
+
+		sent = 0;
+		while (sent < len) {
+			short chunk;
+
+			chunk = len - sent;
+			if (chunk > 256)
+				chunk = 256;
+			conn_send(&s->conn, p + sent, chunk);
+			sent += chunk;
+		}
+
+		if (s->terminal.bracketed_paste)
+			conn_send(&s->conn, "\033[201~", 6);
+
+		HUnlock(h);
+	}
+	DisposeHandle(h);
+}
+
+void
+do_select_all(void)
+{
+	Session *s = active_session;
+
+	if (!s || s->conn.state != CONN_STATE_CONNECTED)
+		return;
+
+	term_ui_sel_start(0, 0, 0);
+	term_ui_sel_extend(s->terminal.active_rows - 1,
+	    s->terminal.active_cols - 1, &s->terminal);
+	term_ui_sel_finalize();
+	term_ui_sel_dirty_all(&s->terminal);
+
+	{
+		GrafPtr save;
+
+		GetPort(&save);
+		SetPort(s->window);
+		term_ui_draw(s->window, &s->terminal);
+		SetPort(save);
+	}
+
+	/* Need to update menus to reflect selection state.
+	 * Call through extern since menus.c owns this. */
+	{
+		extern void update_menus(void);
+		update_menus();
+	}
+}

src/clipboard.c

@@ -0,0 +1,18 @@
+/*
+ * clipboard.h - Clipboard operations for Flynn
+ * Extracted from main.c
+ */
+
+#ifndef CLIPBOARD_H
+#define CLIPBOARD_H
+
+/* Copy selected text to system clipboard */
+void do_copy(void);
+
+/* Paste system clipboard into active session */
+void do_paste(void);
+
+/* Select all text in active session */
+void do_select_all(void);
+
+#endif /* CLIPBOARD_H */