nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

First attempt at multiple-session support. This has broken meta handling,

Browse Source 
since mac.c needs to know whether to grab Cmd-keys or not.

[originally from svn r138]
This commit is contained in:
Ben Harris 1999-03-29 19:50:24 +00:00
parent b9bc97dd25
commit 82fecf970f
5 changed files with 504 additions and 461 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mac.c
View File

@ -1,4 +1,4 @@
/* $Id: mac.c,v 1.1.2.19 1999/03/28 02:06:10 ben Exp $ */ /* $Id: mac.c,v 1.1.2.20 1999/03/29 19:50:22 ben Exp $ */
/* /*
* Copyright (c) 1999 Ben Harris * Copyright (c) 1999 Ben Harris
* All rights reserved. * All rights reserved.
@ -299,9 +299,9 @@ static void mac_keypress(EventRecord *event) {
* Check for a command-key combination, but ignore it if it counts * Check for a command-key combination, but ignore it if it counts
* as a meta-key combination and we're in a terminal window. * as a meta-key combination and we're in a terminal window.
*/ */
if (event->what == keyDown && (event->modifiers & cmdKey) && if (event->what == keyDown && (event->modifiers & cmdKey) /*&&
!((event->modifiers & cfg.meta_modifiers) == cfg.meta_modifiers && !((event->modifiers & cfg.meta_modifiers) == cfg.meta_modifiers &&
mac_windowtype(window) == wTerminal)) { mac_windowtype(window) == wTerminal)*/) {
mac_adjustmenus(); mac_adjustmenus();
mac_menucommand(MenuKey(event->message & charCodeMask)); mac_menucommand(MenuKey(event->message & charCodeMask));
} else { } else {

302
macterm.c
View File

@ -1,4 +1,4 @@
/* $Id: macterm.c,v 1.1.2.31 1999/03/28 15:27:03 ben Exp $ */ /* $Id: macterm.c,v 1.1.2.32 1999/03/29 19:50:23 ben Exp $ */
/* /*
* Copyright (c) 1999 Simon Tatham * Copyright (c) 1999 Simon Tatham
* Copyright (c) 1999 Ben Harris * Copyright (c) 1999 Ben Harris
@ -64,31 +64,21 @@
#define CURSOR_BG 22 #define CURSOR_BG 22
#define CURSOR_BG_BOLD 23 #define CURSOR_BG_BOLD 23
#define PTOCC(x) ((x) < 0 ? -(-(x - font_width - 1) / font_width) : \ #define PTOCC(x) ((x) < 0 ? -(-(x - s->font_width - 1) / s->font_width) : \
(x) / font_width) (x) / s->font_width)
#define PTOCR(y) ((y) < 0 ? -(-(y - font_height - 1) / font_height) : \ #define PTOCR(y) ((y) < 0 ? -(-(y - s->font_height - 1) / s->font_height) : \
(y) / font_height) (y) / s->font_height)
struct mac_session { static void mac_initfont(Session *);
short fontnum; static void mac_initpalette(Session *);
int font_ascent; static void mac_adjustwinbg(Session *);
int font_leading; static void mac_adjustsize(Session *, int, int);
WindowPtr window; static void mac_drawgrowicon(Session *s);
PaletteHandle palette;
ControlHandle scrollbar;
WCTabHandle wctab;
};
static void mac_initfont(struct mac_session *);
static void mac_initpalette(struct mac_session *);
static void mac_adjustwinbg(struct mac_session *);
static void mac_adjustsize(struct mac_session *, int, int);
static void mac_drawgrowicon(struct mac_session *s);
static pascal void mac_scrolltracker(ControlHandle, short); static pascal void mac_scrolltracker(ControlHandle, short);
static pascal void do_text_for_device(short, short, GDHandle, long); static pascal void do_text_for_device(short, short, GDHandle, long);
static pascal void mac_set_attr_mask(short, short, GDHandle, long); static pascal void mac_set_attr_mask(short, short, GDHandle, long);
static int mac_keytrans(struct mac_session *, EventRecord *, unsigned char *); static int mac_keytrans(Session *, EventRecord *, unsigned char *);
static void text_click(struct mac_session *, EventRecord *); static void text_click(Session *, EventRecord *);
#if TARGET_RT_MAC_CFM #if TARGET_RT_MAC_CFM
static RoutineDescriptor mac_scrolltracker_upp = static RoutineDescriptor mac_scrolltracker_upp =
@ -111,19 +101,17 @@ static RoutineDescriptor mac_set_attr_mask_upp =
* sessions * sessions
*/ */
static struct mac_session *onlysession; static void inbuf_putc(Session *s, int c) {
s->inbuf[s->inbuf_head] = c;
static void inbuf_putc(int c) { s->inbuf_head = (s->inbuf_head+1) & INBUF_MASK;
inbuf[inbuf_head] = c;
inbuf_head = (inbuf_head+1) & INBUF_MASK;
} }
static void inbuf_putstr(const char *c) { static void inbuf_putstr(Session *s, const char *c) {
while (*c) while (*c)
inbuf_putc(*c++); inbuf_putc(s, *c++);
} }
static void display_resource(unsigned long type, short id) { static void display_resource(Session *s, unsigned long type, short id) {
Handle h; Handle h;
int len, i; int len, i;
char *t; char *t;
@ -135,8 +123,8 @@ static void display_resource(unsigned long type, short id) {
t = *h; t = *h;
len = GetResourceSizeOnDisk(h); len = GetResourceSizeOnDisk(h);
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
inbuf_putc(t[i]); inbuf_putc(s, t[i]);
term_out(); term_out(s);
} }
SetResAttrs(h, GetResAttrs(h) & ~resLocked); SetResAttrs(h, GetResAttrs(h) & ~resLocked);
ReleaseResource(h); ReleaseResource(h);
@ -144,16 +132,15 @@ static void display_resource(unsigned long type, short id) {
void mac_newsession(void) { void mac_newsession(void) {
struct mac_session *s; Session *s;
UInt32 starttime; UInt32 starttime;
char msg[128]; char msg[128];
/* This should obviously be initialised by other means */ /* This should obviously be initialised by other means */
mac_loadconfig(&cfg);
back = &hexdump_backend;
s = smalloc(sizeof(*s)); s = smalloc(sizeof(*s));
memset(s, 0, sizeof(*s)); memset(s, 0, sizeof(*s));
onlysession = s; mac_loadconfig(&s->cfg);
s->back = &hexdump_backend;
/* XXX: Own storage management? */ /* XXX: Own storage management? */
if (mac_gestalts.qdvers == gestaltOriginalQD) if (mac_gestalts.qdvers == gestaltOriginalQD)
@ -162,38 +149,38 @@ void mac_newsession(void) {
s->window = GetNewCWindow(wTerminal, NULL, (WindowPtr)-1); s->window = GetNewCWindow(wTerminal, NULL, (WindowPtr)-1);
SetWRefCon(s->window, (long)s); SetWRefCon(s->window, (long)s);
s->scrollbar = GetNewControl(cVScroll, s->window); s->scrollbar = GetNewControl(cVScroll, s->window);
term_init(); term_init(s);
term_size(cfg.height, cfg.width, cfg.savelines); term_size(s, s->cfg.height, s->cfg.width, s->cfg.savelines);
mac_initfont(s); mac_initfont(s);
mac_initpalette(s); mac_initpalette(s);
attr_mask = ATTR_MASK; s->attr_mask = ATTR_MASK;
/* Set to FALSE to not get palette updates in the background. */ /* Set to FALSE to not get palette updates in the background. */
SetPalette(s->window, s->palette, TRUE); SetPalette(s->window, s->palette, TRUE);
ActivatePalette(s->window); ActivatePalette(s->window);
ShowWindow(s->window); ShowWindow(s->window);
starttime = TickCount(); starttime = TickCount();
display_resource('pTST', 128); display_resource(s, 'pTST', 128);
sprintf(msg, "Elapsed ticks: %d\015\012", TickCount() - starttime); sprintf(msg, "Elapsed ticks: %d\015\012", TickCount() - starttime);
inbuf_putstr(msg); inbuf_putstr(s, msg);
term_out(); term_out(s);
} }
static void mac_initfont(struct mac_session *s) { static void mac_initfont(Session *s) {
Str255 macfont; Str255 macfont;
FontInfo fi; FontInfo fi;
SetPort(s->window); SetPort(s->window);
macfont[0] = sprintf((char *)&macfont[1], "%s", cfg.font); macfont[0] = sprintf((char *)&macfont[1], "%s", s->cfg.font);
GetFNum(macfont, &s->fontnum); GetFNum(macfont, &s->fontnum);
TextFont(s->fontnum); TextFont(s->fontnum);
TextFace(cfg.fontisbold ? bold : 0); TextFace(s->cfg.fontisbold ? bold : 0);
TextSize(cfg.fontheight); TextSize(s->cfg.fontheight);
GetFontInfo(&fi); GetFontInfo(&fi);
font_width = CharWidth('W'); /* Well, it's what NCSA uses. */ s->font_width = CharWidth('W'); /* Well, it's what NCSA uses. */
s->font_ascent = fi.ascent; s->font_ascent = fi.ascent;
s->font_leading = fi.leading; s->font_leading = fi.leading;
font_height = s->font_ascent + fi.descent + s->font_leading; s->font_height = s->font_ascent + fi.descent + s->font_leading;
mac_adjustsize(s, rows, cols); mac_adjustsize(s, s->rows, s->cols);
} }
/* /*
@ -202,11 +189,11 @@ static void mac_initfont(struct mac_session *s) {
* It's assumed the terminal emulator will be informed, and will set rows * It's assumed the terminal emulator will be informed, and will set rows
* and cols for us. * and cols for us.
*/ */
static void mac_adjustsize(struct mac_session *s, int newrows, int newcols) { static void mac_adjustsize(Session *s, int newrows, int newcols) {
int winwidth, winheight; int winwidth, winheight;
winwidth = newcols * font_width + 15; winwidth = newcols * s->font_width + 15;
winheight = newrows * font_height; winheight = newrows * s->font_height;
SizeWindow(s->window, winwidth, winheight, true); SizeWindow(s->window, winwidth, winheight, true);
HideControl(s->scrollbar); HideControl(s->scrollbar);
MoveControl(s->scrollbar, winwidth - 15, -1); MoveControl(s->scrollbar, winwidth - 15, -1);
@ -214,14 +201,16 @@ static void mac_adjustsize(struct mac_session *s, int newrows, int newcols) {
ShowControl(s->scrollbar); ShowControl(s->scrollbar);
} }
static void mac_initpalette(struct mac_session *s) { static void mac_initpalette(Session *s) {
if (mac_gestalts.qdvers == gestaltOriginalQD) if (mac_gestalts.qdvers == gestaltOriginalQD)
return; return;
s->palette = NewPalette((*cfg.colours)->pmEntries, NULL, pmCourteous, 0); s->palette = NewPalette((*s->cfg.colours)->pmEntries,
NULL, pmCourteous, 0);
if (s->palette == NULL) if (s->palette == NULL)
fatalbox("Unable to create palette"); fatalbox("Unable to create palette");
CopyPalette(cfg.colours, s->palette, 0, 0, (*cfg.colours)->pmEntries); CopyPalette(s->cfg.colours, s->palette, 0, 0,
(*s->cfg.colours)->pmEntries);
mac_adjustwinbg(s); mac_adjustwinbg(s);
} }
@ -229,9 +218,9 @@ static void mac_initpalette(struct mac_session *s) {
* Set the background colour of the window correctly. Should be * Set the background colour of the window correctly. Should be
* called whenever the default background changes. * called whenever the default background changes.
*/ */
static void mac_adjustwinbg(struct mac_session *s) { static void mac_adjustwinbg(Session *s) {
#if 0 /* XXX doesn't link (at least for 68k) */ #if TARGET_RT_CFM /* XXX doesn't link (at least for 68k) */
if (mac_gestalts.windattr & gestaltWindowMgrPresent) if (mac_gestalts.windattr & gestaltWindowMgrPresent)
SetWindowContentColor(s->window, SetWindowContentColor(s->window,
&(*s->palette)->pmInfo[DEFAULT_BG].ciRGB); &(*s->palette)->pmInfo[DEFAULT_BG].ciRGB);
@ -255,13 +244,13 @@ static void mac_adjustwinbg(struct mac_session *s) {
* Set the cursor shape correctly * Set the cursor shape correctly
*/ */
void mac_adjusttermcursor(WindowPtr window, Point mouse, RgnHandle cursrgn) { void mac_adjusttermcursor(WindowPtr window, Point mouse, RgnHandle cursrgn) {
struct mac_session *s; Session *s;
ControlHandle control; ControlHandle control;
short part; short part;
int x, y; int x, y;
SetPort(window); SetPort(window);
s = (struct mac_session *)GetWRefCon(window); s = (Session *)GetWRefCon(window);
GlobalToLocal(&mouse); GlobalToLocal(&mouse);
part = FindControl(mouse, window, &control); part = FindControl(mouse, window, &control);
if (control == s->scrollbar) { if (control == s->scrollbar) {
@ -269,12 +258,12 @@ void mac_adjusttermcursor(WindowPtr window, Point mouse, RgnHandle cursrgn) {
RectRgn(cursrgn, &(*s->scrollbar)->contrlRect); RectRgn(cursrgn, &(*s->scrollbar)->contrlRect);
SectRgn(cursrgn, window->visRgn, cursrgn); SectRgn(cursrgn, window->visRgn, cursrgn);
} else { } else {
x = mouse.h / font_width; x = mouse.h / s->font_width;
y = mouse.v / font_height; y = mouse.v / s->font_height;
SetCursor(*GetCursor(iBeamCursor)); SetCursor(*GetCursor(iBeamCursor));
/* Ask for shape changes if we leave this character cell. */ /* Ask for shape changes if we leave this character cell. */
SetRectRgn(cursrgn, x * font_width, y * font_height, SetRectRgn(cursrgn, x * s->font_width, y * s->font_height,
(x + 1) * font_width, (y + 1) * font_height); (x + 1) * s->font_width, (y + 1) * s->font_height);
SectRgn(cursrgn, window->visRgn, cursrgn); SectRgn(cursrgn, window->visRgn, cursrgn);
} }
} }
@ -283,16 +272,16 @@ void mac_adjusttermcursor(WindowPtr window, Point mouse, RgnHandle cursrgn) {
* Enable/disable menu items based on the active terminal window. * Enable/disable menu items based on the active terminal window.
*/ */
void mac_adjusttermmenus(WindowPtr window) { void mac_adjusttermmenus(WindowPtr window) {
struct mac_session *s; Session *s;
MenuHandle menu; MenuHandle menu;
long offset; long offset;
s = (struct mac_session *)GetWRefCon(window); s = (Session *)GetWRefCon(window);
menu = GetMenuHandle(mEdit); menu = GetMenuHandle(mEdit);
EnableItem(menu, 0); EnableItem(menu, 0);
DisableItem(menu, iUndo); DisableItem(menu, iUndo);
DisableItem(menu, iCut); DisableItem(menu, iCut);
if (term_hasselection()) if (term_hasselection(s))
EnableItem(menu, iCopy); EnableItem(menu, iCopy);
else else
DisableItem(menu, iCopy); DisableItem(menu, iCopy);
@ -305,29 +294,29 @@ void mac_adjusttermmenus(WindowPtr window) {
} }
void mac_menuterm(WindowPtr window, short menu, short item) { void mac_menuterm(WindowPtr window, short menu, short item) {
struct mac_session *s; Session *s;
s = (struct mac_session *)GetWRefCon(window); s = (Session *)GetWRefCon(window);
switch (menu) { switch (menu) {
case mEdit: case mEdit:
switch (item) { switch (item) {
case iCopy: case iCopy:
term_copy(); term_copy(s);
break; break;
case iPaste: case iPaste:
term_paste(); term_paste(s);
break; break;
} }
} }
} }
void mac_clickterm(WindowPtr window, EventRecord *event) { void mac_clickterm(WindowPtr window, EventRecord *event) {
struct mac_session *s; Session *s;
Point mouse; Point mouse;
ControlHandle control; ControlHandle control;
int part; int part;
s = (struct mac_session *)GetWRefCon(window); s = (Session *)GetWRefCon(window);
SetPort(window); SetPort(window);
mouse = event->where; mouse = event->where;
GlobalToLocal(&mouse); GlobalToLocal(&mouse);
@ -336,7 +325,7 @@ void mac_clickterm(WindowPtr window, EventRecord *event) {
switch (part) { switch (part) {
case kControlIndicatorPart: case kControlIndicatorPart:
if (TrackControl(control, mouse, NULL) == kControlIndicatorPart) if (TrackControl(control, mouse, NULL) == kControlIndicatorPart)
term_scroll(+1, GetControlValue(control)); term_scroll(s, +1, GetControlValue(control));
break; break;
case kControlUpButtonPart: case kControlUpButtonPart:
case kControlDownButtonPart: case kControlDownButtonPart:
@ -350,11 +339,11 @@ void mac_clickterm(WindowPtr window, EventRecord *event) {
} }
} }
static void text_click(struct mac_session *s, EventRecord *event) { static void text_click(Session *s, EventRecord *event) {
Point localwhere; Point localwhere;
int row, col; int row, col;
static UInt32 lastwhen = 0; static UInt32 lastwhen = 0;
static struct mac_session *lastsess = NULL; static Session *lastsess = NULL;
static int lastrow = -1, lastcol = -1; static int lastrow = -1, lastcol = -1;
static Mouse_Action lastact = MA_NOTHING; static Mouse_Action lastact = MA_NOTHING;
@ -371,7 +360,7 @@ static void text_click(struct mac_session *s, EventRecord *event) {
lastact == MA_3CLK ? MA_CLICK : MA_NOTHING); lastact == MA_3CLK ? MA_CLICK : MA_NOTHING);
else else
lastact = MA_CLICK; lastact = MA_CLICK;
term_mouse(event->modifiers & shiftKey ? MB_EXTEND : MB_SELECT, lastact, term_mouse(s, event->modifiers & shiftKey ? MB_EXTEND : MB_SELECT, lastact,
col, row); col, row);
lastsess = s; lastsess = s;
lastrow = row; lastrow = row;
@ -380,15 +369,15 @@ static void text_click(struct mac_session *s, EventRecord *event) {
GetMouse(&localwhere); GetMouse(&localwhere);
col = PTOCC(localwhere.h); col = PTOCC(localwhere.h);
row = PTOCR(localwhere.v); row = PTOCR(localwhere.v);
term_mouse(event->modifiers & shiftKey ? MB_EXTEND : MB_SELECT, term_mouse(s, event->modifiers & shiftKey ? MB_EXTEND : MB_SELECT,
MA_DRAG, col, row); MA_DRAG, col, row);
if (row > rows - 1) if (row > s->rows - 1)
term_scroll(0, row - (rows - 1)); term_scroll(s, 0, row - (s->rows - 1));
else if (row < 0) else if (row < 0)
term_scroll(0, row); term_scroll(s, 0, row);
} }
term_mouse(event->modifiers & shiftKey ? MB_EXTEND : MB_SELECT, MA_RELEASE, term_mouse(s, event->modifiers & shiftKey ? MB_EXTEND : MB_SELECT,
col, row); MA_RELEASE, col, row);
lastwhen = TickCount(); lastwhen = TickCount();
} }
@ -423,21 +412,21 @@ void get_clip(void **p, int *lenp) {
} }
static pascal void mac_scrolltracker(ControlHandle control, short part) { static pascal void mac_scrolltracker(ControlHandle control, short part) {
struct mac_session *s; Session *s;
s = (struct mac_session *)GetWRefCon((*control)->contrlOwner); s = (Session *)GetWRefCon((*control)->contrlOwner);
switch (part) { switch (part) {
case kControlUpButtonPart: case kControlUpButtonPart:
term_scroll(0, -1); term_scroll(s, 0, -1);
break; break;
case kControlDownButtonPart: case kControlDownButtonPart:
term_scroll(0, +1); term_scroll(s, 0, +1);
break; break;
case kControlPageUpPart: case kControlPageUpPart:
term_scroll(0, -(rows - 1)); term_scroll(s, 0, -(s->rows - 1));
break; break;
case kControlPageDownPart: case kControlPageDownPart:
term_scroll(0, +(rows - 1)); term_scroll(s, 0, +(s->rows - 1));
break; break;
} }
} }
@ -490,11 +479,11 @@ static pascal void mac_scrolltracker(ControlHandle control, short part) {
void mac_keyterm(WindowPtr window, EventRecord *event) { void mac_keyterm(WindowPtr window, EventRecord *event) {
unsigned char buf[20]; unsigned char buf[20];
int len; int len;
struct mac_session *s; Session *s;
s = (struct mac_session *)GetWRefCon(window); s = (Session *)GetWRefCon(window);
len = mac_keytrans(s, event, buf); len = mac_keytrans(s, event, buf);
back->send((char *)buf, len); s->back->send(s, (char *)buf, len);
} }
static UInt32 mac_rekey(EventModifiers newmodifiers, UInt32 oldmessage) { static UInt32 mac_rekey(EventModifiers newmodifiers, UInt32 oldmessage) {
@ -516,7 +505,7 @@ static UInt32 mac_rekey(EventModifiers newmodifiers, UInt32 oldmessage) {
} }
static int mac_keytrans(struct mac_session *s, EventRecord *event, static int mac_keytrans(Session *s, EventRecord *event,
unsigned char *output) { unsigned char *output) {
unsigned char *p = output; unsigned char *p = output;
int code; int code;
@ -525,9 +514,9 @@ static int mac_keytrans(struct mac_session *s, EventRecord *event,
/* Check if the meta "key" was held down */ /* Check if the meta "key" was held down */
if ((event->modifiers & cfg.meta_modifiers) == cfg.meta_modifiers) { if ((event->modifiers & s->cfg.meta_modifiers) == s->cfg.meta_modifiers) {
*p++ = '\033'; *p++ = '\033';
event->modifiers &= ~cfg.meta_modifiers; event->modifiers &= ~s->cfg.meta_modifiers;
event->message = mac_rekey(event->modifiers, event->message); event->message = mac_rekey(event->modifiers, event->message);
} }
@ -535,10 +524,10 @@ static int mac_keytrans(struct mac_session *s, EventRecord *event,
if (event->modifiers & shiftKey) { if (event->modifiers & shiftKey) {
switch (event->message & keyCodeMask) { switch (event->message & keyCodeMask) {
case K_PRIOR: /* shift-pageup */ case K_PRIOR: /* shift-pageup */
term_scroll(0, -(rows - 1)); term_scroll(s, 0, -(s->rows - 1));
return 0; return 0;
case K_NEXT: /* shift-pagedown */ case K_NEXT: /* shift-pagedown */
term_scroll(0, +(rows - 1)); term_scroll(s, 0, +(s->rows - 1));
return 0; return 0;
} }
} }
@ -598,11 +587,11 @@ static int mac_keytrans(struct mac_session *s, EventRecord *event,
case K_PRIOR: code = 5; break; case K_PRIOR: code = 5; break;
case K_NEXT: code = 6; break; case K_NEXT: code = 6; break;
} }
if (cfg.linux_funkeys && code >= 11 && code <= 15) { if (s->cfg.linux_funkeys && code >= 11 && code <= 15) {
p += sprintf((char *)p, "\x1B[[%c", code + 'A' - 11); p += sprintf((char *)p, "\x1B[[%c", code + 'A' - 11);
return p - output; return p - output;
} }
if (cfg.rxvt_homeend && (code == 1 || code == 4)) { if (s->cfg.rxvt_homeend && (code == 1 || code == 4)) {
p += sprintf((char *)p, code == 1 ? "\x1B[H" : "\x1BOw"); p += sprintf((char *)p, code == 1 ? "\x1B[H" : "\x1BOw");
return p - output; return p - output;
} }
@ -611,7 +600,7 @@ static int mac_keytrans(struct mac_session *s, EventRecord *event,
return p - output; return p - output;
} }
if (app_keypad_keys) { if (s->app_keypad_keys) {
switch (event->message & keyCodeMask) { switch (event->message & keyCodeMask) {
case KP_ENTER: p += sprintf((char *)p, "\x1BOM"); return p - output; case KP_ENTER: p += sprintf((char *)p, "\x1BOM"); return p - output;
case KP_CLEAR: p += sprintf((char *)p, "\x1BOP"); return p - output; case KP_CLEAR: p += sprintf((char *)p, "\x1BOP"); return p - output;
@ -636,22 +625,22 @@ static int mac_keytrans(struct mac_session *s, EventRecord *event,
switch (event->message & keyCodeMask) { switch (event->message & keyCodeMask) {
case K_UP: case K_UP:
p += sprintf((char *)p, app_cursor_keys ? "\x1BOA" : "\x1B[A"); p += sprintf((char *)p, s->app_cursor_keys ? "\x1BOA" : "\x1B[A");
return p - output; return p - output;
case K_DOWN: case K_DOWN:
p += sprintf((char *)p, app_cursor_keys ? "\x1BOB" : "\x1B[B"); p += sprintf((char *)p, s->app_cursor_keys ? "\x1BOB" : "\x1B[B");
return p - output; return p - output;
case K_RIGHT: case K_RIGHT:
p += sprintf((char *)p, app_cursor_keys ? "\x1BOC" : "\x1B[C"); p += sprintf((char *)p, s->app_cursor_keys ? "\x1BOC" : "\x1B[C");
return p - output; return p - output;
case K_LEFT: case K_LEFT:
p += sprintf((char *)p, app_cursor_keys ? "\x1BOD" : "\x1B[D"); p += sprintf((char *)p, s->app_cursor_keys ? "\x1BOD" : "\x1B[D");
return p - output; return p - output;
case KP_ENTER: case KP_ENTER:
*p++ = 0x0d; *p++ = 0x0d;
return p - output; return p - output;
case K_BS: case K_BS:
*p++ = (cfg.bksp_is_delete ? 0x7f : 0x08); *p++ = (s->cfg.bksp_is_delete ? 0x7f : 0x08);
return p - output; return p - output;
default: default:
*p++ = event->message & charCodeMask; *p++ = event->message & charCodeMask;
@ -663,25 +652,25 @@ void mac_growterm(WindowPtr window, EventRecord *event) {
Rect limits; Rect limits;
long grow_result; long grow_result;
int newrows, newcols; int newrows, newcols;
struct mac_session *s; Session *s;
s = (struct mac_session *)GetWRefCon(window); s = (Session *)GetWRefCon(window);
SetRect(&limits, font_width + 15, font_height, SHRT_MAX, SHRT_MAX); SetRect(&limits, s->font_width + 15, s->font_height, SHRT_MAX, SHRT_MAX);
grow_result = GrowWindow(window, event->where, &limits); grow_result = GrowWindow(window, event->where, &limits);
if (grow_result != 0) { if (grow_result != 0) {
newrows = HiWord(grow_result) / font_height; newrows = HiWord(grow_result) / s->font_height;
newcols = (LoWord(grow_result) - 15) / font_width; newcols = (LoWord(grow_result) - 15) / s->font_width;
mac_adjustsize(s, newrows, newcols); mac_adjustsize(s, newrows, newcols);
term_size(newrows, newcols, cfg.savelines); term_size(s, newrows, newcols, s->cfg.savelines);
} }
} }
void mac_activateterm(WindowPtr window, Boolean active) { void mac_activateterm(WindowPtr window, Boolean active) {
struct mac_session *s; Session *s;
s = (struct mac_session *)GetWRefCon(window); s = (Session *)GetWRefCon(window);
has_focus = active; s->has_focus = active;
term_update(); term_update(s);
if (active) if (active)
ShowControl(s->scrollbar); ShowControl(s->scrollbar);
else { else {
@ -692,11 +681,12 @@ void mac_activateterm(WindowPtr window, Boolean active) {
} }
void mac_updateterm(WindowPtr window) { void mac_updateterm(WindowPtr window) {
struct mac_session *s; Session *s;
s = (struct mac_session *)GetWRefCon(window); s = (Session *)GetWRefCon(window);
SetPort(window);
BeginUpdate(window); BeginUpdate(window);
get_ctx(); pre_paint(s);
term_paint(s, term_paint(s,
(*window->visRgn)->rgnBBox.left, (*window->visRgn)->rgnBBox.left,
(*window->visRgn)->rgnBBox.top, (*window->visRgn)->rgnBBox.top,
@ -709,11 +699,11 @@ void mac_updateterm(WindowPtr window) {
EraseRect(&(*s->scrollbar)->contrlRect); EraseRect(&(*s->scrollbar)->contrlRect);
UpdateControls(window, window->visRgn); UpdateControls(window, window->visRgn);
mac_drawgrowicon(s); mac_drawgrowicon(s);
free_ctx(NULL); post_paint(s);
EndUpdate(window); EndUpdate(window);
} }
static void mac_drawgrowicon(struct mac_session *s) { static void mac_drawgrowicon(Session *s) {
Rect clip; Rect clip;
SetPort(s->window); SetPort(s->window);
@ -727,7 +717,7 @@ static void mac_drawgrowicon(struct mac_session *s) {
} }
struct do_text_args { struct do_text_args {
struct mac_session *s; Session *s;
Rect textrect; Rect textrect;
Rect leadrect; Rect leadrect;
char *text; char *text;
@ -740,7 +730,7 @@ struct do_text_args {
* *
* x and y are text row and column (zero-based) * x and y are text row and column (zero-based)
*/ */
void do_text(struct mac_session *s, int x, int y, char *text, int len, void do_text(Session *s, int x, int y, char *text, int len,
unsigned long attr) { unsigned long attr) {
int style = 0; int style = 0;
struct do_text_args a; struct do_text_args a;
@ -749,10 +739,10 @@ void do_text(struct mac_session *s, int x, int y, char *text, int len,
SetPort(s->window); SetPort(s->window);
/* First check this text is relevant */ /* First check this text is relevant */
a.textrect.top = y * font_height; a.textrect.top = y * s->font_height;
a.textrect.bottom = (y + 1) * font_height; a.textrect.bottom = (y + 1) * s->font_height;
a.textrect.left = x * font_width; a.textrect.left = x * s->font_width;
a.textrect.right = (x + len) * font_width; a.textrect.right = (x + len) * s->font_width;
if (!RectInRgn(&a.textrect, s->window->visRgn)) if (!RectInRgn(&a.textrect, s->window->visRgn))
return; return;
@ -768,12 +758,12 @@ void do_text(struct mac_session *s, int x, int y, char *text, int len,
SetRect(&a.leadrect, 0, 0, 0, 0); SetRect(&a.leadrect, 0, 0, 0, 0);
SetPort(s->window); SetPort(s->window);
TextFont(s->fontnum); TextFont(s->fontnum);
if (cfg.fontisbold || (attr & ATTR_BOLD) && !cfg.bold_colour) if (s->cfg.fontisbold || (attr & ATTR_BOLD) && !s->cfg.bold_colour)
style |= bold; style |= bold;
if (attr & ATTR_UNDER) if (attr & ATTR_UNDER)
style |= underline; style |= underline;
TextFace(style); TextFace(style);
TextSize(cfg.fontheight); TextSize(s->cfg.fontheight);
SetFractEnable(FALSE); /* We want characters on pixel boundaries */ SetFractEnable(FALSE); /* We want characters on pixel boundaries */
textrgn = NewRgn(); textrgn = NewRgn();
RectRgn(textrgn, &a.textrect); RectRgn(textrgn, &a.textrect);
@ -790,7 +780,7 @@ static pascal void do_text_for_device(short depth, short devflags,
a = (struct do_text_args *)cookie; a = (struct do_text_args *)cookie;
bright = (a->attr & ATTR_BOLD) && cfg.bold_colour; bright = (a->attr & ATTR_BOLD) && a->s->cfg.bold_colour;
TextMode(a->attr & ATTR_REVERSE ? notSrcCopy : srcCopy); TextMode(a->attr & ATTR_REVERSE ? notSrcCopy : srcCopy);
@ -856,28 +846,28 @@ static pascal void do_text_for_device(short depth, short devflags,
* Call from the terminal emulator to get its graphics context. * Call from the terminal emulator to get its graphics context.
* Should probably be called start_redraw or something. * Should probably be called start_redraw or something.
*/ */
struct mac_session *get_ctx(void) { void pre_paint(Session *s) {
struct mac_session *s = onlysession;
attr_mask = ATTR_INVALID; s->attr_mask = ATTR_INVALID;
DeviceLoop(s->window->visRgn, &mac_set_attr_mask_upp, (long)s, 0); DeviceLoop(s->window->visRgn, &mac_set_attr_mask_upp, (long)s, 0);
return s;
} }
static pascal void mac_set_attr_mask(short depth, short devflags, static pascal void mac_set_attr_mask(short depth, short devflags,
GDHandle device, long cookie) { GDHandle device, long cookie) {
Session *s = (Session *)cookie;
switch (depth) { switch (depth) {
default: default:
attr_mask |= ATTR_FGMASK | ATTR_BGMASK; s->attr_mask |= ATTR_FGMASK | ATTR_BGMASK;
/* FALLTHROUGH */ /* FALLTHROUGH */
case 2: case 2:
attr_mask |= ATTR_BOLD; s->attr_mask |= ATTR_BOLD;
/* FALLTHROUGH */ /* FALLTHROUGH */
case 1: case 1:
attr_mask |= ATTR_UNDER | ATTR_REVERSE | ATTR_ACTCURS | s->attr_mask |= ATTR_UNDER | ATTR_REVERSE | ATTR_ACTCURS |
ATTR_PASCURS | ATTR_ASCII | ATTR_GBCHR | ATTR_LINEDRW | ATTR_PASCURS | ATTR_ASCII | ATTR_GBCHR | ATTR_LINEDRW |
(cfg.bold_colour ? 0 : ATTR_BOLD); (s->cfg.bold_colour ? 0 : ATTR_BOLD);
break; break;
} }
} }
@ -885,7 +875,7 @@ static pascal void mac_set_attr_mask(short depth, short devflags,
/* /*
* Presumably this does something in Windows * Presumably this does something in Windows
*/ */
void free_ctx(struct mac_session *ctx) { void post_paint(Session *s) {
} }
@ -896,14 +886,13 @@ void free_ctx(struct mac_session *ctx) {
* start is the line number of the top of the display * start is the line number of the top of the display
* page is the length of the displayed page * page is the length of the displayed page
*/ */
void set_sbar(int total, int start, int page) { void set_sbar(Session *s, int total, int start, int page) {
struct mac_session *s = onlysession;
/* We don't redraw until we've set everything up, to avoid glitches */ /* We don't redraw until we've set everything up, to avoid glitches */
(*s->scrollbar)->contrlMin = 0; (*s->scrollbar)->contrlMin = 0;
(*s->scrollbar)->contrlMax = total - page; (*s->scrollbar)->contrlMax = total - page;
SetControlValue(s->scrollbar, start); SetControlValue(s->scrollbar, start);
#if 0 #if TARGET_RT_CFM
/* XXX: This doesn't link for me. */ /* XXX: This doesn't link for me. */
if (mac_gestalts.cntlattr & gestaltControlMgrPresent) if (mac_gestalts.cntlattr & gestaltControlMgrPresent)
SetControlViewSize(s->scrollbar, page); SetControlViewSize(s->scrollbar, page);
@ -913,7 +902,7 @@ void set_sbar(int total, int start, int page) {
/* /*
* Beep * Beep
*/ */
void beep(void) { void beep(Session *s) {
SysBeep(30); SysBeep(30);
/* /*
@ -925,16 +914,15 @@ void beep(void) {
/* /*
* Set icon string -- a no-op here (Windowshade?) * Set icon string -- a no-op here (Windowshade?)
*/ */
void set_icon(char *icon) { void set_icon(Session *s, char *icon) {
} }
/* /*
* Set the window title * Set the window title
*/ */
void set_title(char *title) { void set_title(Session *s, char *title) {
Str255 mactitle; Str255 mactitle;
struct mac_session *s = onlysession;
mactitle[0] = sprintf((char *)&mactitle[1], "%s", title); mactitle[0] = sprintf((char *)&mactitle[1], "%s", title);
SetWTitle(s->window, mactitle); SetWTitle(s->window, mactitle);
@ -943,19 +931,18 @@ void set_title(char *title) {
/* /*
* Resize the window at the emulator's request * Resize the window at the emulator's request
*/ */
void request_resize(int w, int h) { void request_resize(Session *s, int w, int h) {
cols = w; s->cols = w;
rows = h; s->rows = h;
mac_initfont(onlysession); mac_initfont(s);
} }
/* /*
* Set the logical palette * Set the logical palette
*/ */
void palette_set(int n, int r, int g, int b) { void palette_set(Session *s, int n, int r, int g, int b) {
RGBColor col; RGBColor col;
struct mac_session *s = onlysession;
static const int first[21] = { static const int first[21] = {
0, 2, 4, 6, 8, 10, 12, 14, 0, 2, 4, 6, 8, 10, 12, 14,
1, 3, 5, 7, 9, 11, 13, 15, 1, 3, 5, 7, 9, 11, 13, 15,
@ -978,12 +965,12 @@ void palette_set(int n, int r, int g, int b) {
/* /*
* Reset to the default palette * Reset to the default palette
*/ */
void palette_reset(void) { void palette_reset(Session *s) {
struct mac_session *s = onlysession;
if (mac_gestalts.qdvers == gestaltOriginalQD) if (mac_gestalts.qdvers == gestaltOriginalQD)
return; return;
CopyPalette(cfg.colours, s->palette, 0, 0, (*cfg.colours)->pmEntries); CopyPalette(s->cfg.colours, s->palette, 0, 0,
(*s->cfg.colours)->pmEntries);
mac_adjustwinbg(s); mac_adjustwinbg(s);
ActivatePalette(s->window); ActivatePalette(s->window);
/* Palette Manager will generate update events as required. */ /* Palette Manager will generate update events as required. */
@ -993,17 +980,16 @@ void palette_reset(void) {
* Scroll the screen. (`lines' is +ve for scrolling forward, -ve * Scroll the screen. (`lines' is +ve for scrolling forward, -ve
* for backward.) * for backward.)
*/ */
void do_scroll(int topline, int botline, int lines) { void do_scroll(Session *s, int topline, int botline, int lines) {
struct mac_session *s = onlysession;
Rect r; Rect r;
RgnHandle update; RgnHandle update;
SetPort(s->window); SetPort(s->window);
PmBackColor(DEFAULT_BG); PmBackColor(DEFAULT_BG);
update = NewRgn(); update = NewRgn();
SetRect(&r, 0, topline * font_height, SetRect(&r, 0, topline * s->font_height,
cols * font_width, (botline + 1) * font_height); s->cols * s->font_width, (botline + 1) * s->font_height);
ScrollRect(&r, 0, - lines * font_height, update); ScrollRect(&r, 0, - lines * s->font_height, update);
/* XXX: move update region? */ /* XXX: move update region? */
InvalRgn(update); InvalRgn(update);
DisposeRgn(update); DisposeRgn(update);

170
putty.h
View File

@ -10,6 +10,8 @@
#ifdef macintosh #ifdef macintosh
#include <MacTypes.h> #include <MacTypes.h>
#include <Palettes.h> #include <Palettes.h>
#include <Controls.h>
#include <Windows.h>
typedef UInt32 DWORD; typedef UInt32 DWORD;
struct mac_session; struct mac_session;
#endif /* macintosh */ #endif /* macintosh */
@ -70,25 +72,11 @@ typedef HDC Context;
#define GLOBAL extern #define GLOBAL extern
#endif #endif
GLOBAL unsigned long attr_mask;
GLOBAL int rows, cols, savelines;
GLOBAL int font_width, font_height;
#define INBUF_SIZE 2048 #define INBUF_SIZE 2048
#define INBUF_MASK (INBUF_SIZE-1) #define INBUF_MASK (INBUF_SIZE-1)
GLOBAL unsigned char inbuf[INBUF_SIZE];
GLOBAL int inbuf_head, inbuf_reap;
#define OUTBUF_SIZE 2048 #define OUTBUF_SIZE 2048
#define OUTBUF_MASK (OUTBUF_SIZE-1) #define OUTBUF_MASK (OUTBUF_SIZE-1)
GLOBAL unsigned char outbuf[OUTBUF_SIZE];
GLOBAL int outbuf_head, outbuf_reap;
GLOBAL int has_focus;
GLOBAL int app_cursor_keys, app_keypad_keys;
#define WM_NETEVENT (WM_USER + 1) #define WM_NETEVENT (WM_USER + 1)
@ -109,21 +97,21 @@ typedef enum {
VT_XWINDOWS, VT_OEMANSI, VT_OEMONLY, VT_POORMAN VT_XWINDOWS, VT_OEMANSI, VT_OEMONLY, VT_POORMAN
} VT_Mode; } VT_Mode;
typedef struct Session Session;
typedef struct { typedef struct {
#ifdef macintosh #ifdef macintosh
char *(*init) (char *host, int port, char **realhost); char *(*init) (Session *, char *host, int port, char **realhost);
int (*msg)(void); int (*msg)(Session *);
#else /* not macintosh */ #else /* not macintosh */
char *(*init) (HWND hwnd, char *host, int port, char **realhost); char *(*init) (HWND hwnd, char *host, int port, char **realhost);
int (*msg) (WPARAM wParam, LPARAM lParam); int (*msg) (WPARAM wParam, LPARAM lParam);
#endif /* not macintosh */ #endif /* not macintosh */
void (*send) (char *buf, int len); void (*send) (Session *, char *buf, int len);
void (*size) (void); void (*size) (Session *);
void (*special) (Telnet_Special code); void (*special) (Session *, Telnet_Special code);
} Backend; } Backend;
GLOBAL Backend *back;
typedef struct { typedef struct {
/* Basic options */ /* Basic options */
char host[512]; char host[512];
@ -172,9 +160,79 @@ typedef struct {
short wordness[256]; short wordness[256];
} Config; } Config;
GLOBAL Config cfg;
typedef struct { typedef struct {
/* Display buffers and pointers within them */
unsigned long *text; /* buffer of text on terminal screen */
unsigned long *scrtop; /* top of working screen */
unsigned long *disptop; /* top of displayed screen */
unsigned long *sbtop; /* top of scrollback */
unsigned long *cpos; /* cursor position (convenience) */
unsigned long *disptext; /* buffer of text on real screen */
unsigned long *wanttext; /* buffer of text we want on screen */
unsigned long *alttext; /* buffer of text on alt. screen */
unsigned char *selspace; /* buffer for building selections in */
/* Current state */
unsigned long curr_attr;
int curs_x, curs_y; /* cursor */
int cset; /* 0 or 1: which char set is in GL */
unsigned long cset_attr[2]; /* G0 and G1 char sets */
/* Saved state */
unsigned long save_attr;
int save_x, save_y; /* saved cursor position */
int save_cset, save_csattr; /* saved with cursor position */
int marg_t, marg_b; /* scroll margins */
/* Flags */
int dec_om; /* DEC origin mode flag */
int wrap, wrapnext; /* wrap flags */
int insert; /* insert-mode flag */
int rvideo; /* global reverse video flag */
/*
* Saved settings on the alternate screen.
*/
int alt_x, alt_y, alt_om, alt_wrap, alt_wnext, alt_ins, alt_cset;
int alt_t, alt_b;
int alt_which;
/* Escape sequence handler state */
#define ARGS_MAX 32 /* max # of esc sequence arguments */
int esc_args[ARGS_MAX];
int esc_nargs;
int esc_query;
#define OSC_STR_MAX 2048
int osc_strlen;
char osc_string[OSC_STR_MAX+1];
int osc_w;
unsigned char *tabs;
int nl_count;
enum {
TOPLEVEL, IGNORE_NEXT,
SEEN_ESC, SEEN_CSI, SET_GL, SET_GR,
SEEN_OSC, SEEN_OSC_P, SEEN_OSC_W, OSC_STRING, OSC_MAYBE_ST,
SEEN_ESCHASH
} termstate;
enum {
NO_SELECTION, ABOUT_TO, DRAGGING, SELECTED
} selstate;
enum {
SM_CHAR, SM_WORD, SM_LINE
} selmode;
unsigned long *selstart, *selend, *selanchor;
short wordness[256];
} Term_State;
typedef struct Session {
/* Config that created this session */
Config cfg;
/* Terminal emulator internal state */
Term_State ts;
/* Display state */ /* Display state */
int rows, cols, savelines; int rows, cols, savelines;
int font_width, font_height; int font_width, font_height;
@ -188,32 +246,40 @@ typedef struct {
int app_cursor_keys, app_keypad_keys; int app_cursor_keys, app_keypad_keys;
/* Backend */ /* Backend */
Backend *back; Backend *back;
/* Config that created this session */ /* Conveniences */
Config cfg; unsigned long attr_mask; /* Mask of attributes to display */
#ifdef macintosh
short fontnum;
int font_ascent;
int font_leading;
WindowPtr window;
PaletteHandle palette;
ControlHandle scrollbar;
WCTabHandle wctab;
#endif
} Session; } Session;
/* /*
* Exports from window.c. * Exports from display system
*/ */
void request_resize (int, int); extern void request_resize(Session *, int, int);
void do_text (Context, int, int, char *, int, unsigned long); extern void do_text(Session *, int, int, char *, int, unsigned long);
void set_title (char *); extern void set_title(Session *, char *);
void set_icon (char *); extern void set_icon(Session *, char *);
void set_sbar (int, int, int); extern void set_sbar(Session *, int, int, int);
Context get_ctx(); extern void pre_paint(Session *);
void free_ctx (Context); extern void post_paint(Session *);
void palette_set (int, int, int, int); extern void palette_set(Session *, int, int, int, int);
void palette_reset (void); extern void palette_reset(Session *);
void write_clip (void *, int); void write_clip (void *, int);
void get_clip (void **, int *); void get_clip (void **, int *);
void optimised_move (int, int, int); extern void do_scroll(Session *, int, int, int);
void do_scroll(int, int, int);
void fatalbox (const char *, ...); void fatalbox (const char *, ...);
#ifdef macintosh #ifdef macintosh
#pragma noreturn (fatalbox) #pragma noreturn (fatalbox)
#endif #endif
void beep (void); extern void beep (Session *s);
#define OPTIMISE_IS_SCROLL 1 #define OPTIMISE_IS_SCROLL 1
/* /*
@ -241,20 +307,20 @@ void verify_ssh_host_key(char *host, struct RSAKey *key);
* Exports from terminal.c. * Exports from terminal.c.
*/ */
void term_init (void); extern void term_init(Session *);
void term_size (int, int, int); extern void term_size(Session *, int, int, int);
void term_out (void); extern void term_out(Session *);
void term_paint (Context, int, int, int, int); extern void term_paint(Session *, int, int, int, int);
void term_scroll (int, int); extern void term_scroll(Session *, int, int);
void term_pwron (void); extern void term_pwron(Session *);
void term_clrsb (void); extern void term_clrsb(Session *);
void term_mouse (Mouse_Button, Mouse_Action, int, int); extern void term_mouse(Session *, Mouse_Button, Mouse_Action, int, int);
void term_copy(void); extern void term_copy(Session *);
void term_paste(void); extern void term_paste(Session *);
int term_hasselection(void); extern int term_hasselection(Session *);
void term_deselect (void); extern void term_deselect (Session *);
void term_update (void); extern void term_update (Session *);
void term_invalidate(void); extern void term_invalidate(Session *);
/* /*
* Exports from telnet.c. * Exports from telnet.c.

437
terminal.c
View File

File diff suppressed because it is too large Load Diff

44
testback.c
View File

@ -1,4 +1,4 @@
/* $Id: testback.c,v 1.1.2.4 1999/03/28 15:25:45 ben Exp $ */ /* $Id: testback.c,v 1.1.2.5 1999/03/29 19:50:24 ben Exp $ */
/* /*
* Copyright (c) 1999 Simon Tatham * Copyright (c) 1999 Simon Tatham
* Copyright (c) 1999 Ben Harris * Copyright (c) 1999 Ben Harris
@ -33,13 +33,13 @@
#include "putty.h" #include "putty.h"
static char *null_init(char *, int, char **); static char *null_init(Session *, char *, int, char **);
static int null_msg(void); static int null_msg(Session *);
static void null_send(char *, int); static void null_send(Session *, char *, int);
static void loop_send(char *, int); static void loop_send(Session *, char *, int);
static void hexdump_send(char *, int); static void hexdump_send(Session *, char *, int);
static void null_size(void); static void null_size(Session *);
static void null_special(Telnet_Special); static void null_special(Session *, Telnet_Special);
Backend null_backend = { Backend null_backend = {
null_init, null_msg, null_send, null_size, null_special null_init, null_msg, null_send, null_size, null_special
@ -53,49 +53,49 @@ Backend hexdump_backend = {
null_init, null_msg, hexdump_send, null_size, null_special null_init, null_msg, hexdump_send, null_size, null_special
}; };
static char *null_init(char *host, int port, char **realhost) { static char *null_init(Session *s, char *host, int port, char **realhost) {
return NULL; return NULL;
} }
static int null_msg(void) { static int null_msg(Session *s) {
return 1; return 1;
} }
static void null_send(char *buf, int len) { static void null_send(Session *s, char *buf, int len) {
} }
static void loop_send (char *buf, int len) { static void loop_send (Session *s, char *buf, int len) {
while (len--) { while (len--) {
int new_head = (inbuf_head + 1) & INBUF_MASK; int new_head = (s->inbuf_head + 1) & INBUF_MASK;
int c = (unsigned char) *buf; int c = (unsigned char) *buf;
if (new_head != inbuf_reap) { if (new_head != s->inbuf_reap) {
inbuf[inbuf_head] = *buf++; s->inbuf[s->inbuf_head] = *buf++;
inbuf_head = new_head; s->inbuf_head = new_head;
} }
} }
term_out(); term_out(s);
term_update(); term_update(s);
} }
static void hexdump_send(char *buf, int len) { static void hexdump_send(Session *s, char *buf, int len) {
static char mybuf[10]; static char mybuf[10];
int mylen; int mylen;
while (len--) { while (len--) {
mylen = sprintf(mybuf, "%02x\015\012", (unsigned char)*buf++); mylen = sprintf(mybuf, "%02x\015\012", (unsigned char)*buf++);
loop_send(mybuf, mylen); loop_send(s, mybuf, mylen);
} }
} }
static void null_size(void) { static void null_size(Session *s) {
} }
static void null_special(Telnet_Special code) { static void null_special(Session *s, Telnet_Special code) {
} }