-/* $Id: macterm.c,v 1.25 2002/12/28 22:25:31 ben Exp $ */
+/* $Id: macterm.c,v 1.44 2003/01/12 16:11:27 ben Exp $ */
/*
* Copyright (c) 1999 Simon Tatham
* Copyright (c) 1999, 2002 Ben Harris
#include <Scrap.h>
#include <Script.h>
#include <Sound.h>
+#include <StandardFile.h>
#include <TextCommon.h>
#include <Threads.h>
#include <ToolUtils.h>
#include "macresid.h"
#include "putty.h"
+#include "charset.h"
#include "mac.h"
+#include "storage.h"
#include "terminal.h"
#define NCOLOURS (lenof(((Config *)0)->colours))
#define do_text_for_device_upp do_text_for_device
#endif /* not TARGET_RT_MAC_CFM */
-static void inbuf_putc(Session *s, int c) {
- char ch = c;
+void mac_opensession(void) {
+ Session *s;
+ StandardFileReply sfr;
+ static const OSType sftypes[] = { 'Sess', 0, 0, 0 };
+ void *sesshandle;
+ int i;
- from_backend(s->term, 0, &ch, 1);
-}
+ s = smalloc(sizeof(*s));
+ memset(s, 0, sizeof(*s));
-static void inbuf_putstr(Session *s, const char *c) {
+ StandardGetFile(NULL, 1, sftypes, &sfr);
+ if (!sfr.sfGood) goto fail;
- from_backend(s->term, 0, (char *)c, strlen(c));
-}
+ sesshandle = open_settings_r_fsp(&sfr.sfFile);
+ if (sesshandle == NULL) goto fail;
+ load_open_settings(sesshandle, TRUE, &s->cfg);
+ close_settings_r(sesshandle);
-static void display_resource(Session *s, unsigned long type, short id) {
- Handle h;
- int len;
- char *t;
-
- h = GetResource(type, id);
- if (h == NULL)
- fatalbox("Can't get test resource");
- len = GetResourceSizeOnDisk(h);
- DetachResource(h);
- HNoPurge(h);
- HLock(h);
- t = *h;
- from_backend(s->term, 0, t, len);
- term_out(s->term);
- DisposeHandle(h);
+ /*
+ * Select protocol. This is farmed out into a table in a
+ * separate file to enable an ssh-free variant.
+ */
+ s->back = NULL;
+ for (i = 0; backends[i].backend != NULL; i++)
+ if (backends[i].protocol == s->cfg.protocol) {
+ s->back = backends[i].backend;
+ break;
+ }
+ if (s->back == NULL) {
+ fatalbox("Unsupported protocol number found");
+ }
+ mac_startsession(s);
+ return;
+
+ fail:
+ sfree(s);
+ return;
}
-
-void mac_newsession(void) {
- Session *s;
- UInt32 starttime;
- char msg[128];
+void mac_startsession(Session *s)
+{
+ char *errmsg;
- /* This should obviously be initialised by other means */
- s = smalloc(sizeof(*s));
- memset(s, 0, sizeof(*s));
- do_defaults(NULL, &s->cfg);
- s->back = &loop_backend;
-
/* XXX: Own storage management? */
if (HAVE_COLOR_QD())
s->window = GetNewCWindow(wTerminal, NULL, (WindowPtr)-1);
s->scrollbar = GetNewControl(cVScroll, s->window);
s->term = term_init(&s->cfg, s);
- s->logctx = log_init(s);
+ mac_initfont(s);
+ mac_initpalette(s);
+ if (HAVE_COLOR_QD()) {
+ /* Set to FALSE to not get palette updates in the background. */
+ SetPalette(s->window, s->palette, TRUE);
+ ActivatePalette(s->window);
+ }
+
+ s->logctx = log_init(s, &s->cfg);
term_provide_logctx(s->term, s->logctx);
- s->back->init(s->term, &s->backhandle, "localhost", 23, &s->realhost, 0);
+ errmsg = s->back->init(s->term, &s->backhandle, &s->cfg, s->cfg.host,
+ s->cfg.port, &s->realhost, s->cfg.tcp_nodelay);
+ if (errmsg != NULL)
+ fatalbox("%s", errmsg);
s->back->provide_logctx(s->backhandle, s->logctx);
term_provide_resize_fn(s->term, s->back->size, s->backhandle);
s->ldisc = ldisc_create(&s->cfg, s->term, s->back, s->backhandle, s);
ldisc_send(s->ldisc, NULL, 0, 0);/* cause ldisc to notice changes */
- mac_initfont(s);
- mac_initpalette(s);
- if (HAVE_COLOR_QD()) {
- /* Set to FALSE to not get palette updates in the background. */
- SetPalette(s->window, s->palette, TRUE);
- ActivatePalette(s->window);
- }
ShowWindow(s->window);
- starttime = TickCount();
- display_resource(s, 'pTST', 128);
- sprintf(msg, "Elapsed ticks: %d\015\012", TickCount() - starttime);
- inbuf_putstr(s, msg);
- term_out(s->term);
+ s->next = sesslist;
+ s->prev = s->next->prev;
+ if (s->next != NULL)
+ s->next->prev = &s->next;
+ sesslist = s;
}
static UnicodeToTextFallbackUPP uni_to_font_fallback_upp;
Str255 macfont;
FontInfo fi;
TextEncoding enc;
+ OptionBits fbflags;
SetPort(s->window);
- macfont[0] = sprintf((char *)&macfont[1], "%s", s->cfg.font);
+ c2pstrcpy(macfont, s->cfg.font);
GetFNum(macfont, &s->fontnum);
TextFont(s->fontnum);
TextFace(s->cfg.fontisbold ? bold : 0);
if (s->uni_to_font != NULL)
DisposeUnicodeToTextInfo(&s->uni_to_font);
- if (mac_gestalts.encvvers == 0 ||
+ if (mac_gestalts.encvvers != 0 &&
UpgradeScriptInfoToTextEncoding(kTextScriptDontCare,
kTextLanguageDontCare,
kTextRegionDontCare, macfont,
- &enc) != noErr ||
- CreateUnicodeToTextInfoByEncoding(enc, &s->uni_to_font) != noErr) {
- s->uni_to_font = NULL;
- } else {
+ &enc) == noErr &&
+ CreateUnicodeToTextInfoByEncoding(enc, &s->uni_to_font) == noErr) {
if (uni_to_font_fallback_upp == NULL)
uni_to_font_fallback_upp =
NewUnicodeToTextFallbackProc(&uni_to_font_fallback);
+ fbflags = kUnicodeFallbackCustomOnly;
+ if (mac_gestalts.uncvattr & kTECAddFallbackInterruptMask)
+ fbflags |= kUnicodeFallbackInterruptSafeMask;
if (SetFallbackUnicodeToText(s->uni_to_font,
- uni_to_font_fallback_upp,
- kUnicodeFallbackCustomOnly | kUnicodeFallbackInterruptSafeMask,
- NULL) != noErr) {
+ uni_to_font_fallback_upp, fbflags, NULL) != noErr) {
DisposeUnicodeToTextInfo(&s->uni_to_font);
- s->uni_to_font = NULL;
+ goto no_encv;
}
+ } else {
+ no_encv:
+ s->uni_to_font = NULL;
+ s->font_charset =
+ charset_from_macenc(FontToScript(s->fontnum),
+ GetScriptManagerVariable(smRegionCode),
+ mac_gestalts.sysvers, s->cfg.font);
}
mac_adjustsize(s, s->term->rows, s->term->cols);
if (olen < 1)
return kTECOutputBufferFullStatus;
- *obuf = '?';
+ /*
+ * What I'd _like_ to do here is to somehow generate the
+ * missing-character glyph that every font is required to have.
+ * Unfortunately (and somewhat surprisingly), I can't find any way
+ * to actually ask for it explicitly. Bah.
+ */
+ *obuf = '.';
*iusedp = ilen;
*ousedp = 1;
return noErr;
}
+/*
+ * Called every time round the event loop.
+ */
+void mac_pollterm(void)
+{
+ Session *s;
+
+ for (s = sesslist; s != NULL; s = s->next) {
+ term_out(s->term);
+ term_update(s->term);
+ }
+}
/*
* To be called whenever the window size changes.
if (!HAVE_COLOR_QD())
return;
-#if TARGET_RT_CFM /* XXX doesn't link (at least for 68k) */
+#if !TARGET_CPU_68K
if (mac_gestalts.windattr & gestaltWindowMgrPresent)
SetWindowContentColor(s->window,
&(*s->palette)->pmInfo[DEFAULT_BG].ciRGB);
static struct {
Rect msgrect;
Point msgorigin;
- Point startmouse;
+ Point zeromouse;
Session *s;
char oldmsg[20];
} growterm_state;
draghooksave = LMGetDragHook();
growterm_state.oldmsg[0] = '\0';
- growterm_state.startmouse = event->where;
+ growterm_state.zeromouse = event->where;
+ growterm_state.zeromouse.h -= s->term->cols * s->font_width;
+ growterm_state.zeromouse.v -= s->term->rows * s->font_height;
growterm_state.s = s;
GetPort(&portsave);
SetPort(s->window);
GrafPtr portsave;
Point mouse;
char buf[20];
+ unsigned char pbuf[20];
int newrows, newcols;
GetMouse(&mouse);
- newrows = (mouse.v - growterm_state.startmouse.v) / s->font_height +
- s->term->rows;
+ newrows = (mouse.v - growterm_state.zeromouse.v) / s->font_height;
if (newrows < 1) newrows = 1;
- newcols = (mouse.h - growterm_state.startmouse.h) / s->font_width +
- s->term->cols;
+ newcols = (mouse.h - growterm_state.zeromouse.h) / s->font_width;
if (newcols < 1) newcols = 1;
sprintf(buf, "%dx%d", newcols, newrows);
if (strcmp(buf, growterm_state.oldmsg) == 0)
return;
strcpy(growterm_state.oldmsg, buf);
- c2pstr(buf);
+ c2pstrcpy(pbuf, buf);
GetPort(&portsave);
SetPort(growterm_state.s->window);
EraseRect(&growterm_state.msgrect);
MoveTo(growterm_state.msgorigin.h, growterm_state.msgorigin.v);
- DrawString((StringPtr)buf);
+ DrawString(pbuf);
SetPort(portsave);
}
RgnHandle textrgn;
char mactextbuf[1024];
UniChar unitextbuf[1024];
+ wchar_t *unitextptr;
int i;
+ ByteCount iread, olen;
+ OSStatus err;
assert(len <= 1024);
if (!RectInRgn(&a.textrect, s->window->visRgn))
return;
- if (s->uni_to_font != NULL) {
- ByteCount iread, olen;
- OSStatus err;
+ /* Unpack Unicode from the mad format we get passed */
+ for (i = 0; i < len; i++)
+ unitextbuf[i] = (unsigned char)text[i] | (attr & CSET_MASK);
- for (i = 0; i < len; i++)
- unitextbuf[i] = (unsigned char)text[i] | (attr & CSET_MASK);
+ if (s->uni_to_font != NULL) {
err = ConvertFromUnicodeToText(s->uni_to_font, len * sizeof(UniChar),
unitextbuf, kUnicodeUseFallbacksMask,
0, NULL, NULL, NULL,
1024, &iread, &olen, mactextbuf);
- if (err == noErr || err == kTECUsedFallbacksStatus)
- text = mactextbuf; len = olen;
- }
+ if (err != noErr && err != kTECUsedFallbacksStatus)
+ olen = 0;
+ } else if (s->font_charset != CS_NONE) {
+ /* XXX this is bogus if wchar_t and UniChar are different sizes. */
+ unitextptr = (wchar_t *)unitextbuf;
+ olen = charset_from_unicode(&unitextptr, &len, mactextbuf, 1024,
+ s->font_charset, NULL, ".", 1);
+ } else
+ olen = 0;
a.s = s;
- a.text = text;
- a.len = len;
+ a.text = mactextbuf;
+ a.len = olen;
a.attr = attr;
a.lattr = lattr;
a.numer.h = a.numer.v = a.denom.h = a.denom.v = 1;
(*s->scrollbar)->contrlMin = 0;
(*s->scrollbar)->contrlMax = total - page;
SetControlValue(s->scrollbar, start);
-#if TARGET_RT_CFM
- /* XXX: This doesn't link for me. */
+#if !TARGET_CPU_68K
if (mac_gestalts.cntlattr & gestaltControlMgrPresent)
SetControlViewSize(s->scrollbar, page);
#endif
Session *s = frontend;
Str255 mactitle;
- mactitle[0] = sprintf((char *)&mactitle[1], "%s", title);
+ c2pstrcpy(mactitle, title);
SetWTitle(s->window, mactitle);
}
char *get_window_title(void *frontend, int icon)
{
Session *s = frontend;
+ Str255 ptitle;
+ static char title[256];
- /* Erm, we don't save this at the moment */
- return "";
+ GetWTitle(s->window, ptitle);
+ p2cstrcpy(title, ptitle);
+ return title;
}
/*
void logevent(void *frontend, char *str) {
- /* XXX Do something */
+ fprintf(stderr, "%s\n", str);
}
/* Dummy routine, only required in plink. */
projects / u / mdw / putty / blobdiff