-/* $Id: macterm.c,v 1.32 2003/01/04 00:13:18 ben Exp $ */
+/* $Id: macterm.c,v 1.60 2003/01/28 00:35:54 ben Exp $ */
/*
* Copyright (c) 1999 Simon Tatham
* Copyright (c) 1999, 2002 Ben Harris
#include <MacTypes.h>
#include <Controls.h>
#include <ControlDefinitions.h>
+#include <FixMath.h>
#include <Fonts.h>
#include <Gestalt.h>
#include <LowMem.h>
#include <Scrap.h>
#include <Script.h>
#include <Sound.h>
-#include <StandardFile.h>
#include <TextCommon.h>
-#include <Threads.h>
#include <ToolUtils.h>
#include <UnicodeConverter.h>
#include "putty.h"
#include "charset.h"
#include "mac.h"
-#include "storage.h"
#include "terminal.h"
#define NCOLOURS (lenof(((Config *)0)->colours))
static pascal void mac_growtermdraghook(void);
static pascal void mac_scrolltracker(ControlHandle, short);
static pascal void do_text_for_device(short, short, GDHandle, long);
-static int mac_keytrans(Session *, EventRecord *, unsigned char *);
static void text_click(Session *, EventRecord *);
void pre_paint(Session *s);
#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;
-
- from_backend(s->term, 0, &ch, 1);
-}
-
-static void inbuf_putstr(Session *s, const char *c) {
-
- from_backend(s->term, 0, (char *)c, strlen(c));
-}
-
-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);
-}
-
-void mac_opensession(void) {
- Session *s;
- StandardFileReply sfr;
- static const OSType sftypes[] = { 'Sess', 0, 0, 0 };
- void *sesshandle;
-
- s = smalloc(sizeof(*s));
- memset(s, 0, sizeof(*s));
-
- StandardGetFile(NULL, 1, sftypes, &sfr);
- if (!sfr.sfGood) goto fail;
-
- sesshandle = open_settings_r_fsp(&sfr.sfFile);
- if (sesshandle == NULL) goto fail;
- load_open_settings(sesshandle, TRUE, &s->cfg);
- close_settings_r(sesshandle);
- s->back = &loop_backend;
- mac_startsession(s);
- return;
-
- fail:
- sfree(s);
- return;
-}
-
void mac_startsession(Session *s)
{
- UInt32 starttime;
- char msg[128];
+ char *errmsg;
+ int i;
+
+ init_ucs(s);
+
+ /*
+ * 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");
/* XXX: Own storage management? */
if (HAVE_COLOR_QD())
s->window = GetNewWindow(wTerminal, NULL, (WindowPtr)-1);
SetWRefCon(s->window, (long)s);
s->scrollbar = GetNewControl(cVScroll, s->window);
- s->term = term_init(&s->cfg, s);
+ s->term = term_init(&s->cfg, &s->ucsdata, 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);
+ set_title(s, s->realhost);
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 = &sesslist;
+ if (s->next != NULL)
+ s->next->prev = &s->next;
+ sesslist = s;
+}
+
+/*
+ * Try to work out a horizontal scaling factor for the current font
+ * that will give a chracter width of wantwidth. Return it in numer
+ * and denom (suitable for passing to StdText()).
+ */
+static void mac_workoutfontscale(Session *s, int wantwidth,
+ Point *numerp, Point *denomp)
+{
+ Point numer, denom, tmpnumer, tmpdenom;
+ int gotwidth, i;
+ const char text = 'W';
+ FontInfo fi;
+
+ numer.v = denom.v = 1; /* always */
+ numer.h = denom.h = 1;
+ for (i = 0; i < 3; i++) {
+ tmpnumer = numer;
+ tmpdenom = denom;
+ if (s->window->grafProcs != NULL)
+ gotwidth = InvokeQDTxMeasUPP(1, &text, &tmpnumer, &tmpdenom, &fi,
+ s->window->grafProcs->txMeasProc);
+ else
+ gotwidth = StdTxMeas(1, &text, &tmpnumer, &tmpdenom, &fi);
+ /* The result of StdTxMeas must be scaled by the factors it returns. */
+ gotwidth = FixRound(FixMul(gotwidth << 16,
+ FixRatio(tmpnumer.h, tmpdenom.h)));
+ if (gotwidth == wantwidth)
+ break;
+ numer.h *= wantwidth;
+ denom.h *= gotwidth;
+ }
+ *numerp = numer;
+ *denomp = denom;
}
static UnicodeToTextFallbackUPP uni_to_font_fallback_upp;
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);
s->font_ascent = fi.ascent;
s->font_leading = fi.leading;
s->font_height = s->font_ascent + fi.descent + s->font_leading;
+ mac_workoutfontscale(s, s->font_width,
+ &s->font_stdnumer, &s->font_stddenom);
+ mac_workoutfontscale(s, s->font_width * 2,
+ &s->font_widenumer, &s->font_widedenom);
+ TextSize(s->cfg.fontheight * 2);
+ mac_workoutfontscale(s, s->font_width * 2,
+ &s->font_bignumer, &s->font_bigdenom);
+ TextSize(s->cfg.fontheight);
if (!s->cfg.bold_colour) {
TextFace(bold);
s->font_boldadjust = s->font_width - CharWidth('W');
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.
long offset;
s = (Session *)GetWRefCon(window);
+ menu = GetMenuHandle(mFile);
+ DisableItem(menu, iSave); /* XXX enable if modified */
+ EnableItem(menu, iSaveAs);
+ EnableItem(menu, iDuplicate);
menu = GetMenuHandle(mEdit);
EnableItem(menu, 0);
DisableItem(menu, iUndo);
lastact == MA_3CLK ? MA_CLICK : MA_NOTHING);
else
lastact = MA_CLICK;
- /* Fake right button with shift key */
- term_mouse(s->term, event->modifiers & shiftKey ? MBT_RIGHT : MBT_LEFT,
+ term_mouse(s->term, MBT_LEFT,
+ event->modifiers & shiftKey ? MBT_EXTEND : MBT_SELECT,
lastact, col, row, event->modifiers & shiftKey,
event->modifiers & controlKey, event->modifiers & optionKey);
lastsess = s;
GetMouse(&localwhere);
col = PTOCC(localwhere.h);
row = PTOCR(localwhere.v);
- term_mouse(s->term,
- event->modifiers & shiftKey ? MBT_RIGHT : MBT_LEFT,
+ term_mouse(s->term, MBT_LEFT,
+ event->modifiers & shiftKey ? MBT_EXTEND : MBT_SELECT,
MA_DRAG, col, row, event->modifiers & shiftKey,
event->modifiers & controlKey,
event->modifiers & optionKey);
else if (row < 0)
term_scroll(s->term, 0, row);
}
- term_mouse(s->term, event->modifiers & shiftKey ? MBT_RIGHT : MBT_LEFT,
+ term_mouse(s->term, MBT_LEFT,
+ event->modifiers & shiftKey ? MBT_EXTEND : MBT_SELECT,
MA_RELEASE, col, row, event->modifiers & shiftKey,
event->modifiers & controlKey, event->modifiers & optionKey);
lastwhen = TickCount();
}
-Mouse_Button translate_button(void *frontend, Mouse_Button button)
+void write_clip(void *cookie, wchar_t *data, int len, int must_deselect)
{
+ Session *s = cookie;
+ char *mactextbuf;
+ ByteCount iread, olen;
+ wchar_t *unitextptr;
+ StScrpRec *stsc;
+ size_t stsz;
+ OSErr err;
+ int i;
- switch (button) {
- case MBT_LEFT:
- return MBT_SELECT;
- case MBT_RIGHT:
- return MBT_EXTEND;
- default:
- return 0;
- }
-}
-
-void write_clip(void *cookie, wchar_t *data, int len, int must_deselect) {
-
/*
* See "Programming with the Text Encoding Conversion Manager"
* Appendix E for Unicode scrap conventions.
*
- * XXX Need to support TEXT/styl scrap as well.
- * See STScrpRec in TextEdit (Inside Macintosh: Text) for styl details.
* XXX Maybe PICT scrap too.
*/
if (ZeroScrap() != noErr)
return;
PutScrap(len * sizeof(*data), 'utxt', data);
+
+ /* Replace LINE SEPARATORs with CR for TEXT output. */
+ for (i = 0; i < len; i++)
+ if (data[i] == 0x2028)
+ data[i] = 0x000d;
+
+ mactextbuf = smalloc(len); /* XXX DBCS */
+ if (s->uni_to_font != NULL) {
+ err = ConvertFromUnicodeToText(s->uni_to_font, len * sizeof(UniChar),
+ (UniChar *)data,
+ kUnicodeUseFallbacksMask,
+ 0, NULL, NULL, NULL,
+ len, &iread, &olen, mactextbuf);
+ if (err != noErr && err != kTECUsedFallbacksStatus)
+ return;
+ } else if (s->font_charset != CS_NONE) {
+ unitextptr = data;
+ olen = charset_from_unicode(&unitextptr, &len, mactextbuf, 1024,
+ s->font_charset, NULL, ".", 1);
+ } else
+ return;
+ PutScrap(olen, 'TEXT', mactextbuf);
+ sfree(mactextbuf);
+
+ stsz = offsetof(StScrpRec, scrpStyleTab) + sizeof(ScrpSTElement);
+ stsc = smalloc(stsz);
+ stsc->scrpNStyles = 1;
+ stsc->scrpStyleTab[0].scrpStartChar = 0;
+ stsc->scrpStyleTab[0].scrpHeight = s->font_height;
+ stsc->scrpStyleTab[0].scrpAscent = s->font_ascent;
+ stsc->scrpStyleTab[0].scrpFont = s->fontnum;
+ stsc->scrpStyleTab[0].scrpFace = 0;
+ stsc->scrpStyleTab[0].scrpSize = s->cfg.fontheight;
+ stsc->scrpStyleTab[0].scrpColor.red = 0;
+ stsc->scrpStyleTab[0].scrpColor.green = 0;
+ stsc->scrpStyleTab[0].scrpColor.blue = 0;
+ PutScrap(stsz, 'styl', stsc);
+ sfree(stsc);
}
void get_clip(void *frontend, wchar_t **p, int *lenp) {
Session *s = frontend;
static Handle h = NULL;
+ static wchar_t *data = NULL;
+ Handle texth;
long offset;
+ int textlen;
+ TextEncoding enc;
+ TextToUnicodeInfo scrap_to_uni;
+ ByteCount iread, olen;
+ int charset;
+ char *tptr;
+ OSErr err;
if (p == NULL) {
/* release memory */
if (h != NULL)
DisposeHandle(h);
h = NULL;
- } else
- /* XXX Support TEXT-format scrap as well. */
+ if (data != NULL)
+ sfree(data);
+ data = NULL;
+ } else {
if (GetScrap(NULL, 'utxt', &offset) > 0) {
- h = NewHandle(0);
+ if (h == NULL)
+ h = NewHandle(0);
*lenp = GetScrap(h, 'utxt', &offset) / sizeof(**p);
HLock(h);
*p = (wchar_t *)*h;
- if (*p == NULL || *lenp <= 0)
- fatalbox("Empty scrap");
+ } else if (GetScrap(NULL, 'TEXT', &offset) > 0) {
+ texth = NewHandle(0);
+ textlen = GetScrap(texth, 'TEXT', &offset);
+ HLock(texth);
+ data = smalloc(textlen * 2);
+ /* XXX should use 'styl' scrap if it's there. */
+ if (mac_gestalts.encvvers != 0 &&
+ UpgradeScriptInfoToTextEncoding(smSystemScript,
+ kTextLanguageDontCare,
+ kTextRegionDontCare, NULL,
+ &enc) == noErr &&
+ CreateTextToUnicodeInfoByEncoding(enc, &scrap_to_uni) ==
+ noErr) {
+ err = ConvertFromTextToUnicode(scrap_to_uni, textlen,
+ *texth, 0, 0, NULL, NULL, NULL,
+ textlen * 2,
+ &iread, &olen, data);
+ DisposeTextToUnicodeInfo(&scrap_to_uni);
+ if (err == noErr) {
+ *p = data;
+ *lenp = olen / sizeof(**p);
+ } else {
+ *p = NULL;
+ *lenp = 0;
+ }
+ } else {
+ charset =
+ charset_from_macenc(GetScriptManagerVariable(smSysScript),
+ GetScriptManagerVariable(smRegionCode),
+ mac_gestalts.sysvers, NULL);
+ if (charset != CS_NONE) {
+ tptr = *texth;
+ *lenp = charset_to_unicode(&tptr, &textlen, data,
+ textlen * 2, charset, NULL,
+ NULL, 0);
+ }
+ *p = data;
+ }
+ DisposeHandle(texth);
} else {
*p = NULL;
*lenp = 0;
}
+ }
}
static pascal void mac_scrolltracker(ControlHandle control, short part) {
}
}
-#define K_BS 0x3300
-#define K_F1 0x7a00
-#define K_F2 0x7800
-#define K_F3 0x6300
-#define K_F4 0x7600
-#define K_F5 0x6000
-#define K_F6 0x6100
-#define K_F7 0x6200
-#define K_F8 0x6400
-#define K_F9 0x6500
-#define K_F10 0x6d00
-#define K_F11 0x6700
-#define K_F12 0x6f00
-#define K_F13 0x6900
-#define K_F14 0x6b00
-#define K_F15 0x7100
-#define K_INSERT 0x7200
-#define K_HOME 0x7300
-#define K_PRIOR 0x7400
-#define K_DELETE 0x7500
-#define K_END 0x7700
-#define K_NEXT 0x7900
-#define K_LEFT 0x7b00
-#define K_RIGHT 0x7c00
-#define K_DOWN 0x7d00
-#define K_UP 0x7e00
-#define KP_0 0x5200
-#define KP_1 0x5300
-#define KP_2 0x5400
-#define KP_3 0x5500
-#define KP_4 0x5600
-#define KP_5 0x5700
-#define KP_6 0x5800
-#define KP_7 0x5900
-#define KP_8 0x5b00
-#define KP_9 0x5c00
-#define KP_CLEAR 0x4700
-#define KP_EQUAL 0x5100
-#define KP_SLASH 0x4b00
-#define KP_STAR 0x4300
-#define KP_PLUS 0x4500
-#define KP_MINUS 0x4e00
-#define KP_DOT 0x4100
-#define KP_ENTER 0x4c00
-
void mac_keyterm(WindowPtr window, EventRecord *event) {
- unsigned char buf[20];
- int len;
- Session *s;
+ Session *s = (Session *)GetWRefCon(window);
+ Key_Sym keysym = PK_NULL;
+ unsigned int mods = 0, flags = PKF_NUMLOCK;
+ wchar_t utxt[1];
- s = (Session *)GetWRefCon(window);
- len = mac_keytrans(s, event, buf);
- ldisc_send(s->ldisc, (char *)buf, len, 1);
ObscureCursor();
- term_seen_key_event(s->term);
- term_out(s->term);
- term_update(s->term);
-}
-static int mac_keytrans(Session *s, EventRecord *event,
- unsigned char *output) {
- unsigned char *p = output;
- int code;
+#if 0
+ fprintf(stderr, "Got key event %08x\n", event->message);
+#endif
/* No meta key yet -- that'll be rather fun. */
/* Keys that we handle locally */
if (event->modifiers & shiftKey) {
- switch (event->message & keyCodeMask) {
- case K_PRIOR: /* shift-pageup */
+ switch ((event->message & keyCodeMask) >> 8) {
+ case 0x74: /* shift-pageup */
term_scroll(s->term, 0, -(s->term->rows - 1));
- return 0;
- case K_NEXT: /* shift-pagedown */
+ return;
+ case 0x79: /* shift-pagedown */
term_scroll(s->term, 0, +(s->term->rows - 1));
- return 0;
- }
- }
-
- /*
- * Control-2 should return ^@ (0x00), Control-6 should return
- * ^^ (0x1E), and Control-Minus should return ^_ (0x1F). Since
- * the DOS keyboard handling did it, and we have nothing better
- * to do with the key combo in question, we'll also map
- * Control-Backquote to ^\ (0x1C).
- */
-
- if (event->modifiers & controlKey) {
- switch (event->message & charCodeMask) {
- case ' ': case '2':
- *p++ = 0x00;
- return p - output;
- case '`':
- *p++ = 0x1c;
- return p - output;
- case '6':
- *p++ = 0x1e;
- return p - output;
- case '/':
- *p++ = 0x1f;
- return p - output;
+ return;
}
}
- /*
- * First, all the keys that do tilde codes. (ESC '[' nn '~',
- * for integer decimal nn.)
- *
- * We also deal with the weird ones here. Linux VCs replace F1
- * to F5 by ESC [ [ A to ESC [ [ E. rxvt doesn't do _that_, but
- * does replace Home and End (1~ and 4~) by ESC [ H and ESC O w
- * respectively.
- */
- code = 0;
- switch (event->message & keyCodeMask) {
- case K_F1: code = (event->modifiers & shiftKey ? 23 : 11); break;
- case K_F2: code = (event->modifiers & shiftKey ? 24 : 12); break;
- case K_F3: code = (event->modifiers & shiftKey ? 25 : 13); break;
- case K_F4: code = (event->modifiers & shiftKey ? 26 : 14); break;
- case K_F5: code = (event->modifiers & shiftKey ? 28 : 15); break;
- case K_F6: code = (event->modifiers & shiftKey ? 29 : 17); break;
- case K_F7: code = (event->modifiers & shiftKey ? 31 : 18); break;
- case K_F8: code = (event->modifiers & shiftKey ? 32 : 19); break;
- case K_F9: code = (event->modifiers & shiftKey ? 33 : 20); break;
- case K_F10: code = (event->modifiers & shiftKey ? 34 : 21); break;
- case K_F11: code = 23; break;
- case K_F12: code = 24; break;
- case K_HOME: code = 1; break;
- case K_INSERT: code = 2; break;
- case K_DELETE: code = 3; break;
- case K_END: code = 4; break;
- case K_PRIOR: code = 5; break;
- case K_NEXT: code = 6; break;
- }
- if (s->cfg.funky_type == 1 && code >= 11 && code <= 15) {
- p += sprintf((char *)p, "\x1B[[%c", code + 'A' - 11);
- return p - output;
- }
- if (s->cfg.rxvt_homeend && (code == 1 || code == 4)) {
- p += sprintf((char *)p, code == 1 ? "\x1B[H" : "\x1BOw");
- return p - output;
- }
- if (code) {
- p += sprintf((char *)p, "\x1B[%d~", code);
- return p - output;
- }
-
- if (s->term->app_keypad_keys) {
- switch (event->message & keyCodeMask) {
- case KP_ENTER: p += sprintf((char *)p, "\x1BOM"); return p - output;
- case KP_CLEAR: p += sprintf((char *)p, "\x1BOP"); return p - output;
- case KP_EQUAL: p += sprintf((char *)p, "\x1BOQ"); return p - output;
- case KP_SLASH: p += sprintf((char *)p, "\x1BOR"); return p - output;
- case KP_STAR: p += sprintf((char *)p, "\x1BOS"); return p - output;
- case KP_PLUS: p += sprintf((char *)p, "\x1BOl"); return p - output;
- case KP_MINUS: p += sprintf((char *)p, "\x1BOm"); return p - output;
- case KP_DOT: p += sprintf((char *)p, "\x1BOn"); return p - output;
- case KP_0: p += sprintf((char *)p, "\x1BOp"); return p - output;
- case KP_1: p += sprintf((char *)p, "\x1BOq"); return p - output;
- case KP_2: p += sprintf((char *)p, "\x1BOr"); return p - output;
- case KP_3: p += sprintf((char *)p, "\x1BOs"); return p - output;
- case KP_4: p += sprintf((char *)p, "\x1BOt"); return p - output;
- case KP_5: p += sprintf((char *)p, "\x1BOu"); return p - output;
- case KP_6: p += sprintf((char *)p, "\x1BOv"); return p - output;
- case KP_7: p += sprintf((char *)p, "\x1BOw"); return p - output;
- case KP_8: p += sprintf((char *)p, "\x1BOx"); return p - output;
- case KP_9: p += sprintf((char *)p, "\x1BOy"); return p - output;
- }
+ if (event->modifiers & shiftKey)
+ mods |= PKM_SHIFT;
+ if (event->modifiers & controlKey)
+ mods |= PKM_CONTROL;
+ if (event->what == autoKey)
+ flags |= PKF_REPEAT;
+
+ /* Mac key events consist of a virtual key code and a character code. */
+
+ switch ((event->message & keyCodeMask) >> 8) {
+ case 0x24: keysym = PK_RETURN; break;
+ case 0x30: keysym = PK_TAB; break;
+ case 0x33: keysym = PK_BACKSPACE; break;
+ case 0x35: keysym = PK_ESCAPE; break;
+
+ case 0x7A: keysym = PK_F1; break;
+ case 0x78: keysym = PK_F2; break;
+ case 0x63: keysym = PK_F3; break;
+ case 0x76: keysym = PK_F4; break;
+ case 0x60: keysym = PK_F5; break;
+ case 0x61: keysym = PK_F6; break;
+ case 0x62: keysym = PK_F7; break;
+ case 0x64: keysym = PK_F8; break;
+ case 0x65: keysym = PK_F9; break;
+ case 0x6D: keysym = PK_F10; break;
+ case 0x67: keysym = PK_F11; break;
+ case 0x6F: keysym = PK_F12; break;
+ case 0x69: keysym = PK_F13; break;
+ case 0x6B: keysym = PK_F14; break;
+ case 0x71: keysym = PK_F15; break;
+
+ case 0x72: keysym = PK_INSERT; break;
+ case 0x73: keysym = PK_HOME; break;
+ case 0x74: keysym = PK_PAGEUP; break;
+ case 0x75: keysym = PK_DELETE; break;
+ case 0x77: keysym = PK_END; break;
+ case 0x79: keysym = PK_PAGEDOWN; break;
+
+ case 0x47: keysym = PK_PF1; break;
+ case 0x51: keysym = PK_PF2; break;
+ case 0x4B: keysym = PK_PF3; break;
+ case 0x43: keysym = PK_PF4; break;
+ case 0x4E: keysym = PK_KPMINUS; break;
+ case 0x45: keysym = PK_KPCOMMA; break;
+ case 0x41: keysym = PK_KPDECIMAL; break;
+ case 0x4C: keysym = PK_KPENTER; break;
+ case 0x52: keysym = PK_KP0; break;
+ case 0x53: keysym = PK_KP1; break;
+ case 0x54: keysym = PK_KP2; break;
+ case 0x55: keysym = PK_KP3; break;
+ case 0x56: keysym = PK_KP4; break;
+ case 0x57: keysym = PK_KP5; break;
+ case 0x58: keysym = PK_KP6; break;
+ case 0x59: keysym = PK_KP7; break;
+ case 0x5B: keysym = PK_KP8; break;
+ case 0x5C: keysym = PK_KP9; break;
+
+ case 0x7B: keysym = PK_LEFT; break;
+ case 0x7C: keysym = PK_RIGHT; break;
+ case 0x7D: keysym = PK_DOWN; break;
+ case 0x7E: keysym = PK_UP; break;
}
- switch (event->message & keyCodeMask) {
- case K_UP:
- p += sprintf((char *)p,
- s->term->app_cursor_keys ? "\x1BOA" : "\x1B[A");
- return p - output;
- case K_DOWN:
- p += sprintf((char *)p,
- s->term->app_cursor_keys ? "\x1BOB" : "\x1B[B");
- return p - output;
- case K_RIGHT:
- p += sprintf((char *)p,
- s->term->app_cursor_keys ? "\x1BOC" : "\x1B[C");
- return p - output;
- case K_LEFT:
- p += sprintf((char *)p,
- s->term->app_cursor_keys ? "\x1BOD" : "\x1B[D");
- return p - output;
- case KP_ENTER:
- *p++ = 0x0d;
- return p - output;
- case K_BS:
- *p++ = (s->cfg.bksp_is_delete ? 0x7f : 0x08);
- return p - output;
- default:
- *p++ = event->message & charCodeMask;
- return p - output;
- }
+ /* XXX Map from key script to Unicode. */
+ utxt[0] = event->message & charCodeMask;
+ term_key(s->term, keysym, utxt, 1, mods, flags);
}
void request_paste(void *frontend)
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);
}
+void mac_closeterm(WindowPtr window)
+{
+ Session *s = (Session *)GetWRefCon(window);
+
+ /* XXX warn on close */
+ HideWindow(s->window);
+ *s->prev = s->next;
+ s->next->prev = s->prev;
+ ldisc_free(s->ldisc);
+ s->back->free(s->backhandle);
+ log_free(s->logctx);
+ if (s->uni_to_font != NULL)
+ DisposeUnicodeToTextInfo(&s->uni_to_font);
+ term_free(s->term);
+ DisposeWindow(s->window);
+ DisposePalette(s->palette);
+ sfree(s);
+}
+
void mac_activateterm(WindowPtr window, Boolean active) {
Session *s;
Session *s = ctx;
int style = 0;
struct do_text_args a;
- RgnHandle textrgn;
+ RgnHandle textrgn, saveclip;
char mactextbuf[1024];
UniChar unitextbuf[1024];
wchar_t *unitextptr;
- int i;
+ int i, fontwidth;
ByteCount iread, olen;
OSStatus err;
assert(len <= 1024);
SetPort(s->window);
-
+
+ fontwidth = s->font_width;
+ if ((lattr & LATTR_MODE) != LATTR_NORM)
+ fontwidth *= 2;
+
/* First check this text is relevant */
a.textrect.top = y * s->font_height;
a.textrect.bottom = (y + 1) * s->font_height;
- a.textrect.left = x * s->font_width;
- a.textrect.right = (x + len) * s->font_width;
+ a.textrect.left = x * fontwidth;
+ a.textrect.right = (x + len) * fontwidth;
+ if (a.textrect.right > s->term->cols * s->font_width)
+ a.textrect.right = s->term->cols * s->font_width;
if (!RectInRgn(&a.textrect, s->window->visRgn))
return;
a.len = olen;
a.attr = attr;
a.lattr = lattr;
- a.numer.h = a.numer.v = a.denom.h = a.denom.v = 1;
+ switch (lattr & LATTR_MODE) {
+ case LATTR_NORM:
+ TextSize(s->cfg.fontheight);
+ a.numer = s->font_stdnumer;
+ a.denom = s->font_stddenom;
+ break;
+ case LATTR_WIDE:
+ TextSize(s->cfg.fontheight);
+ a.numer = s->font_widenumer;
+ a.denom = s->font_widedenom;
+ break;
+ case LATTR_TOP:
+ case LATTR_BOT:
+ TextSize(s->cfg.fontheight * 2);
+ a.numer = s->font_bignumer;
+ a.denom = s->font_bigdenom;
+ break;
+ }
SetPort(s->window);
TextFont(s->fontnum);
if (s->cfg.fontisbold || (attr & ATTR_BOLD) && !s->cfg.bold_colour)
if (attr & ATTR_UNDER)
style |= underline;
TextFace(style);
- TextSize(s->cfg.fontheight);
TextMode(srcOr);
if (HAVE_COLOR_QD())
if (style & bold) {
SpaceExtra(0);
CharExtra(0);
}
+ saveclip = NewRgn();
+ GetClip(saveclip);
+ ClipRect(&a.textrect);
textrgn = NewRgn();
RectRgn(textrgn, &a.textrect);
if (HAVE_COLOR_QD())
DeviceLoop(textrgn, &do_text_for_device_upp, (long)&a, 0);
else
do_text_for_device(1, 0, NULL, (long)&a);
+ SetClip(saveclip);
+ DisposeRgn(saveclip);
DisposeRgn(textrgn);
/* Tell the window manager about it in case this isn't an update */
ValidRect(&a.textrect);
if (HAVE_COLOR_QD()) {
if (depth > 2) {
- fgcolour = ((a->attr & ATTR_FGMASK) >> ATTR_FGSHIFT) * 2;
- bgcolour = ((a->attr & ATTR_BGMASK) >> ATTR_BGSHIFT) * 2;
+ fgcolour = ((a->attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
+ fgcolour = (fgcolour & 0xF) * 2 + (fgcolour & 0x10 ? 1 : 0);
+ bgcolour = ((a->attr & ATTR_BGMASK) >> ATTR_BGSHIFT);
+ bgcolour = (bgcolour & 0xF) * 2 + (bgcolour & 0x10 ? 1 : 0);
} else {
/*
* NB: bold reverse in 2bpp breaks with the usual PuTTY model and
bgcolour = tmp;
}
if (bright && depth > 2)
- fgcolour++;
+ fgcolour |= 1;
if ((a->attr & TATTR_ACTCURS) && depth > 1) {
fgcolour = CURSOR_FG;
bgcolour = CURSOR_BG;
}
EraseRect(&a->textrect);
- MoveTo(a->textrect.left, a->textrect.top + a->s->font_ascent);
+ switch (a->lattr & LATTR_MODE) {
+ case LATTR_NORM:
+ case LATTR_WIDE:
+ MoveTo(a->textrect.left, a->textrect.top + a->s->font_ascent);
+ break;
+ case LATTR_TOP:
+ MoveTo(a->textrect.left, a->textrect.top + a->s->font_ascent * 2);
+ break;
+ case LATTR_BOT:
+ MoveTo(a->textrect.left,
+ a->textrect.top - a->s->font_height + a->s->font_ascent * 2);
+ break;
+ }
/* FIXME: Sort out bold width adjustments on Original QuickDraw. */
if (a->s->window->grafProcs != NULL)
InvokeQDTextUPP(a->len, a->text, a->numer, a->denom,
Session *s = frontend;
Str255 mactitle;
- mactitle[0] = sprintf((char *)&mactitle[1], "%s", title);
+ c2pstrcpy(mactitle, title);
SetWTitle(s->window, mactitle);
}
void request_resize(void *frontend, int w, int h) {
Session *s = frontend;
- s->term->cols = w;
- s->term->rows = h;
+ term_size(s->term, h, w, s->cfg.savelines);
mac_initfont(s);
}
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. */