X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=macterm.c;h=84d88969235be27be2f9d5e902ffa12208629931;hb=05e93b3d2b8fc94b1905748a4768dd4e17a17e1d;hp=9e9a4d4d5a24d7a62257026cdf342848dcacfe1a;hpb=a5f734f8e4a7ebb7bd6398365ac14fcf57262c48;p=PuTTY.git diff --git a/macterm.c b/macterm.c index 9e9a4d4d..84d88969 100644 --- a/macterm.c +++ b/macterm.c @@ -1,5 +1,6 @@ -/* $Id: macterm.c,v 1.1.2.19 1999/03/13 18:23:24 ben Exp $ */ +/* $Id: macterm.c,v 1.1.2.33 1999/03/30 19:44:51 ben Exp $ */ /* + * Copyright (c) 1999 Simon Tatham * Copyright (c) 1999 Ben Harris * All rights reserved. * @@ -33,18 +34,22 @@ #include #include #include +#include #include +#include #include #include #include #include #include +#include #include #include #include #include #include +#include #include "macresid.h" #include "putty.h" @@ -54,48 +59,59 @@ #define DEFAULT_FG_BOLD 17 #define DEFAULT_BG 18 #define DEFAULT_BG_BOLD 19 -#define CURSOR_FG 22 -#define CURSOR_FG_BOLD 23 - -#define PTOCC(x) ((x) < 0 ? -(-(x - font_width - 1) / font_width) : \ - (x) / font_width) -#define PTOCR(y) ((y) < 0 ? -(-(y - font_height - 1) / font_height) : \ - (y) / font_height) - -struct mac_session { - short fontnum; - int font_ascent; - WindowPtr window; - PaletteHandle palette; - ControlHandle scrollbar; -}; - -static void mac_initfont(struct mac_session *); -static void mac_initpalette(struct mac_session *); -static void mac_adjustsize(struct mac_session *, int, int); +#define CURSOR_FG 20 +#define CURSOR_FG_BOLD 21 +#define CURSOR_BG 22 +#define CURSOR_BG_BOLD 23 + +#define PTOCC(x) ((x) < 0 ? -(-(x - s->font_width - 1) / s->font_width) : \ + (x) / s->font_width) +#define PTOCR(y) ((y) < 0 ? -(-(y - s->font_height - 1) / s->font_height) : \ + (y) / s->font_height) + +static void mac_initfont(Session *); +static void mac_initpalette(Session *); +static void mac_adjustwinbg(Session *); +static void mac_adjustsize(Session *, int, int); +static void mac_drawgrowicon(Session *s); static pascal void mac_scrolltracker(ControlHandle, short); static pascal void do_text_for_device(short, short, GDHandle, long); -static int mac_keytrans(struct mac_session *, EventRecord *, unsigned char *); -static void text_click(struct mac_session *, EventRecord *); +static pascal void mac_set_attr_mask(short, short, GDHandle, long); +static int mac_keytrans(Session *, EventRecord *, unsigned char *); +static void text_click(Session *, EventRecord *); + +#if TARGET_RT_MAC_CFM +static RoutineDescriptor mac_scrolltracker_upp = + BUILD_ROUTINE_DESCRIPTOR(uppControlActionProcInfo, + (ProcPtr)mac_scrolltracker); +static RoutineDescriptor do_text_for_device_upp = + BUILD_ROUTINE_DESCRIPTOR(uppDeviceLoopDrawingProcInfo, + (ProcPtr)do_text_for_device); +static RoutineDescriptor mac_set_attr_mask_upp = + BUILD_ROUTINE_DESCRIPTOR(uppDeviceLoopDrawingProcInfo, + (ProcPtr)mac_set_attr_mask); +#else /* not TARGET_RT_MAC_CFM */ +#define mac_scrolltracker_upp mac_scrolltracker +#define do_text_for_device_upp do_text_for_device +#define mac_set_attr_mask_upp mac_set_attr_mask +#endif /* not TARGET_RT_MAC_CFM */ /* * Temporary hack till I get the terminal emulator supporting multiple * sessions */ -static struct mac_session *onlysession; - -static void inbuf_putc(int c) { - inbuf[inbuf_head] = c; - inbuf_head = (inbuf_head+1) & INBUF_MASK; +static void inbuf_putc(Session *s, int c) { + s->inbuf[s->inbuf_head] = c; + s->inbuf_head = (s->inbuf_head+1) & INBUF_MASK; } -static void inbuf_putstr(const char *c) { +static void inbuf_putstr(Session *s, const char *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; int len, i; char *t; @@ -107,8 +123,8 @@ static void display_resource(unsigned long type, short id) { t = *h; len = GetResourceSizeOnDisk(h); for (i = 0; i < len; i++) { - inbuf_putc(t[i]); - term_out(); + inbuf_putc(s, t[i]); + term_out(s); } SetResAttrs(h, GetResAttrs(h) & ~resLocked); ReleaseResource(h); @@ -116,14 +132,15 @@ static void display_resource(unsigned long type, short id) { void mac_newsession(void) { - struct mac_session *s; - int i; + Session *s; + UInt32 starttime; + char msg[128]; /* This should obviously be initialised by other means */ - mac_loadconfig(&cfg); -/* back = &loop_backend; */ s = smalloc(sizeof(*s)); - onlysession = s; + memset(s, 0, sizeof(*s)); + mac_loadconfig(&s->cfg); + s->back = &hexdump_backend; /* XXX: Own storage management? */ if (mac_gestalts.qdvers == gestaltOriginalQD) @@ -132,32 +149,43 @@ void mac_newsession(void) { s->window = GetNewCWindow(wTerminal, NULL, (WindowPtr)-1); SetWRefCon(s->window, (long)s); s->scrollbar = GetNewControl(cVScroll, s->window); - term_init(); - term_size(cfg.height, cfg.width, cfg.savelines); + term_init(s); + term_size(s, s->cfg.height, s->cfg.width, s->cfg.savelines); mac_initfont(s); mac_initpalette(s); + s->attr_mask = ATTR_MASK; /* Set to FALSE to not get palette updates in the background. */ SetPalette(s->window, s->palette, TRUE); ActivatePalette(s->window); ShowWindow(s->window); - display_resource('pTST', 128); + starttime = TickCount(); + display_resource(s, 'pTST', 128); + sprintf(msg, "Elapsed ticks: %d\015\012", TickCount() - starttime); + inbuf_putstr(s, msg); + term_out(s); } -static void mac_initfont(struct mac_session *s) { +static void mac_initfont(Session *s) { Str255 macfont; FontInfo fi; 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); TextFont(s->fontnum); - TextFace(cfg.fontisbold ? bold : 0); - TextSize(cfg.fontheight); + TextFace(s->cfg.fontisbold ? bold : 0); + TextSize(s->cfg.fontheight); GetFontInfo(&fi); - font_width = fi.widMax; - font_height = fi.ascent + fi.descent + fi.leading; + s->font_width = CharWidth('W'); /* Well, it's what NCSA uses. */ s->font_ascent = fi.ascent; - mac_adjustsize(s, rows, cols); + s->font_leading = fi.leading; + s->font_height = s->font_ascent + fi.descent + s->font_leading; + if (!s->cfg.bold_colour) { + TextFace(bold); + s->font_boldadjust = s->font_width - CharWidth('W'); + } else + s->font_boldadjust = 0; + mac_adjustsize(s, s->rows, s->cols); } /* @@ -166,11 +194,11 @@ static void mac_initfont(struct mac_session *s) { * It's assumed the terminal emulator will be informed, and will set rows * 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; - winwidth = newcols * font_width + 15; - winheight = newrows * font_height; + winwidth = newcols * s->font_width + 15; + winheight = newrows * s->font_height; SizeWindow(s->window, winwidth, winheight, true); HideControl(s->scrollbar); MoveControl(s->scrollbar, winwidth - 15, -1); @@ -178,47 +206,90 @@ static void mac_adjustsize(struct mac_session *s, int newrows, int newcols) { ShowControl(s->scrollbar); } -static void mac_initpalette(struct mac_session *s) { - WinCTab ct; +static void mac_initpalette(Session *s) { if (mac_gestalts.qdvers == gestaltOriginalQD) return; - s->palette = NewPalette((*cfg.colours)->pmEntries, NULL, pmCourteous, 0); + s->palette = NewPalette((*s->cfg.colours)->pmEntries, + NULL, pmCourteous, 0); if (s->palette == NULL) 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); +} + +/* + * Set the background colour of the window correctly. Should be + * called whenever the default background changes. + */ +static void mac_adjustwinbg(Session *s) { + +#if TARGET_RT_CFM /* XXX doesn't link (at least for 68k) */ + if (mac_gestalts.windattr & gestaltWindowMgrPresent) + SetWindowContentColor(s->window, + &(*s->palette)->pmInfo[DEFAULT_BG].ciRGB); + else +#endif + { + if (s->wctab == NULL) + s->wctab = (WCTabHandle)NewHandle(sizeof(**s->wctab)); + if (s->wctab == NULL) + return; /* do without */ + (*s->wctab)->wCSeed = 0; + (*s->wctab)->wCReserved = 0; + (*s->wctab)->ctSize = 0; + (*s->wctab)->ctTable[0].value = wContentColor; + (*s->wctab)->ctTable[0].rgb = (*s->palette)->pmInfo[DEFAULT_BG].ciRGB; + SetWinColor(s->window, s->wctab); + } } /* - * I don't think this is (a) safe or (b) a good way to do this. + * Set the cursor shape correctly */ -static void mac_updatewinbg(struct mac_session *s) { - WinCTab ct; - WCTabPtr ctp = &ct; - WCTabHandle cth = &ctp; +void mac_adjusttermcursor(WindowPtr window, Point mouse, RgnHandle cursrgn) { + Session *s; + ControlHandle control; + short part; + int x, y; - ct.wCSeed = 0; - ct.wCReserved = 0; - ct.ctSize = 1; - ct.ctTable[0].value = wContentColor; - ct.ctTable[0].rgb = (*s->palette)->pmInfo[16].ciRGB; - SetWinColor(s->window, cth); + SetPort(window); + s = (Session *)GetWRefCon(window); + GlobalToLocal(&mouse); + part = FindControl(mouse, window, &control); + if (control == s->scrollbar) { + SetCursor(&qd.arrow); + RectRgn(cursrgn, &(*s->scrollbar)->contrlRect); + SectRgn(cursrgn, window->visRgn, cursrgn); + } else { + x = mouse.h / s->font_width; + y = mouse.v / s->font_height; + SetCursor(*GetCursor(iBeamCursor)); + /* Ask for shape changes if we leave this character cell. */ + SetRectRgn(cursrgn, x * s->font_width, y * s->font_height, + (x + 1) * s->font_width, (y + 1) * s->font_height); + SectRgn(cursrgn, window->visRgn, cursrgn); + } } /* * Enable/disable menu items based on the active terminal window. */ void mac_adjusttermmenus(WindowPtr window) { - struct mac_session *s; + Session *s; MenuHandle menu; long offset; - s = (struct mac_session *)GetWRefCon(window); + s = (Session *)GetWRefCon(window); menu = GetMenuHandle(mEdit); EnableItem(menu, 0); DisableItem(menu, iUndo); DisableItem(menu, iCut); - DisableItem(menu, iCopy); + if (term_hasselection(s)) + EnableItem(menu, iCopy); + else + DisableItem(menu, iCopy); if (GetScrap(NULL, 'TEXT', &offset) == noTypeErr) DisableItem(menu, iPaste); else @@ -227,13 +298,30 @@ void mac_adjusttermmenus(WindowPtr window) { EnableItem(menu, iSelectAll); } +void mac_menuterm(WindowPtr window, short menu, short item) { + Session *s; + + s = (Session *)GetWRefCon(window); + switch (menu) { + case mEdit: + switch (item) { + case iCopy: + term_copy(s); + break; + case iPaste: + term_paste(s); + break; + } + } +} + void mac_clickterm(WindowPtr window, EventRecord *event) { - struct mac_session *s; + Session *s; Point mouse; ControlHandle control; int part; - s = (struct mac_session *)GetWRefCon(window); + s = (Session *)GetWRefCon(window); SetPort(window); mouse = event->where; GlobalToLocal(&mouse); @@ -242,13 +330,13 @@ void mac_clickterm(WindowPtr window, EventRecord *event) { switch (part) { case kControlIndicatorPart: if (TrackControl(control, mouse, NULL) == kControlIndicatorPart) - term_scroll(+1, GetControlValue(control)); + term_scroll(s, +1, GetControlValue(control)); break; case kControlUpButtonPart: case kControlDownButtonPart: case kControlPageUpPart: case kControlPageDownPart: - TrackControl(control, mouse, mac_scrolltracker); + TrackControl(control, mouse, &mac_scrolltracker_upp); break; } } else { @@ -256,11 +344,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; int row, col; static UInt32 lastwhen = 0; - static struct mac_session *lastsess = NULL; + static Session *lastsess = NULL; static int lastrow = -1, lastcol = -1; static Mouse_Action lastact = MA_NOTHING; @@ -277,7 +365,7 @@ static void text_click(struct mac_session *s, EventRecord *event) { lastact == MA_3CLK ? MA_CLICK : MA_NOTHING); else 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); lastsess = s; lastrow = row; @@ -286,52 +374,68 @@ static void text_click(struct mac_session *s, EventRecord *event) { GetMouse(&localwhere); col = PTOCC(localwhere.h); 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); - if (row > rows - 1) - term_scroll(0, row - (rows - 1)); + if (row > s->rows - 1) + term_scroll(s, 0, row - (s->rows - 1)); else if (row < 0) - term_scroll(0, row); + term_scroll(s, 0, row); } - term_mouse(event->modifiers & shiftKey ? MB_EXTEND : MB_SELECT, MA_RELEASE, - col, row); + term_mouse(s, event->modifiers & shiftKey ? MB_EXTEND : MB_SELECT, + MA_RELEASE, col, row); lastwhen = TickCount(); } void write_clip(void *data, int len) { - SysBeep(30); if (ZeroScrap() != noErr) return; PutScrap(len, 'TEXT', data); } void get_clip(void **p, int *lenp) { + static Handle h = NULL; + long offset; - /* XXX: do something */ + if (p == NULL) { + /* release memory */ + if (h != NULL) + DisposeHandle(h); + h = NULL; + } else + if (GetScrap(NULL, 'TEXT', &offset) > 0) { + h = NewHandle(0); + *lenp = GetScrap(h, 'TEXT', &offset); + HLock(h); + *p = *h; + if (*p == NULL || *lenp <= 0) + fatalbox("Empty scrap"); + } else { + *p = NULL; + *lenp = 0; + } } 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) { case kControlUpButtonPart: - term_scroll(0, -1); + term_scroll(s, 0, -1); break; case kControlDownButtonPart: - term_scroll(0, +1); + term_scroll(s, 0, +1); break; case kControlPageUpPart: - term_scroll(0, -(rows - 1)); + term_scroll(s, 0, -(s->rows - 1)); break; case kControlPageDownPart: - term_scroll(0, +(rows - 1)); + term_scroll(s, 0, +(s->rows - 1)); break; } } -#define K_SPACE 0x3100 #define K_BS 0x3300 #define K_F1 0x7a00 #define K_F2 0x7800 @@ -345,6 +449,9 @@ static pascal void mac_scrolltracker(ControlHandle control, short part) { #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 @@ -377,34 +484,55 @@ static pascal void mac_scrolltracker(ControlHandle control, short part) { void mac_keyterm(WindowPtr window, EventRecord *event) { unsigned char buf[20]; int len; - struct mac_session *s; - int i; + Session *s; - s = (struct mac_session *)GetWRefCon(window); + s = (Session *)GetWRefCon(window); len = mac_keytrans(s, event, buf); - /* XXX: I can't get the loopback backend to link, so we'll do this: */ -/* back->send((char *)buf, len); */ - for (i = 0; i < len; i++) - inbuf_putc(buf[i]); - term_out(); - term_update(); + s->back->send(s, (char *)buf, len); } -static int mac_keytrans(struct mac_session *s, EventRecord *event, +static UInt32 mac_rekey(EventModifiers newmodifiers, UInt32 oldmessage) { + UInt32 transresult, state; + Ptr kchr; + + state = 0; + kchr = (Ptr)GetScriptManagerVariable(smKCHRCache); + transresult = KeyTranslate(kchr, + (oldmessage & keyCodeMask) >> 8 | + newmodifiers & 0xff00, + &state); + /* + * KeyTranslate returns two character codes. We only worry about + * one. Yes, this is slightly bogus, but it makes life less + * painful. + */ + return oldmessage & ~charCodeMask | transresult & 0xff; +} + + +static int mac_keytrans(Session *s, EventRecord *event, unsigned char *output) { unsigned char *p = output; int code; /* No meta key yet -- that'll be rather fun. */ + /* Check if the meta "key" was held down */ + + if ((event->modifiers & s->cfg.meta_modifiers) == s->cfg.meta_modifiers) { + *p++ = '\033'; + event->modifiers &= ~s->cfg.meta_modifiers; + event->message = mac_rekey(event->modifiers, event->message); + } + /* Keys that we handle locally */ if (event->modifiers & shiftKey) { switch (event->message & keyCodeMask) { case K_PRIOR: /* shift-pageup */ - term_scroll(0, -(rows - 1)); + term_scroll(s, 0, -(s->rows - 1)); return 0; case K_NEXT: /* shift-pagedown */ - term_scroll(0, +(rows - 1)); + term_scroll(s, 0, +(s->rows - 1)); return 0; } } @@ -464,11 +592,11 @@ static int mac_keytrans(struct mac_session *s, EventRecord *event, case K_PRIOR: code = 5; 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); 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"); return p - output; } @@ -477,7 +605,7 @@ static int mac_keytrans(struct mac_session *s, EventRecord *event, return p - output; } - if (app_keypad_keys) { + if (s->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; @@ -502,19 +630,22 @@ static int mac_keytrans(struct mac_session *s, EventRecord *event, switch (event->message & keyCodeMask) { 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; 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; 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; 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; + case KP_ENTER: + *p++ = 0x0d; return p - output; case K_BS: - *p++ = (cfg.bksp_is_delete ? 0x7f : 0x08); + *p++ = (s->cfg.bksp_is_delete ? 0x7f : 0x08); return p - output; default: *p++ = event->message & charCodeMask; @@ -526,60 +657,74 @@ void mac_growterm(WindowPtr window, EventRecord *event) { Rect limits; long grow_result; int newrows, newcols; - struct mac_session *s; + Session *s; - s = (struct mac_session *)GetWRefCon(window); - SetRect(&limits, font_width + 15, font_height, SHRT_MAX, SHRT_MAX); + s = (Session *)GetWRefCon(window); + SetRect(&limits, s->font_width + 15, s->font_height, SHRT_MAX, SHRT_MAX); grow_result = GrowWindow(window, event->where, &limits); if (grow_result != 0) { - newrows = HiWord(grow_result) / font_height; - newcols = (LoWord(grow_result) - 15) / font_width; + newrows = HiWord(grow_result) / s->font_height; + newcols = (LoWord(grow_result) - 15) / s->font_width; 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) { - struct mac_session *s; + Session *s; - s = (struct mac_session *)GetWRefCon(window); - has_focus = active; - term_update(); + s = (Session *)GetWRefCon(window); + s->has_focus = active; + term_update(s); if (active) ShowControl(s->scrollbar); - else + else { + PmBackColor(DEFAULT_BG); /* HideControl clears behind the control */ HideControl(s->scrollbar); + } + mac_drawgrowicon(s); } void mac_updateterm(WindowPtr window) { - struct mac_session *s; - Rect clip; + Session *s; - s = (struct mac_session *)GetWRefCon(window); + s = (Session *)GetWRefCon(window); + SetPort(window); BeginUpdate(window); + pre_paint(s); term_paint(s, (*window->visRgn)->rgnBBox.left, (*window->visRgn)->rgnBBox.top, (*window->visRgn)->rgnBBox.right, (*window->visRgn)->rgnBBox.bottom); /* Restore default colours in case the Window Manager uses them */ - PmForeColor(16); - PmBackColor(18); + PmForeColor(DEFAULT_FG); + PmBackColor(DEFAULT_BG); if (FrontWindow() != window) EraseRect(&(*s->scrollbar)->contrlRect); UpdateControls(window, window->visRgn); + mac_drawgrowicon(s); + post_paint(s); + EndUpdate(window); +} + +static void mac_drawgrowicon(Session *s) { + Rect clip; + + SetPort(s->window); /* Stop DrawGrowIcon giving us space for a horizontal scrollbar */ - SetRect(&clip, window->portRect.right - 15, SHRT_MIN, SHRT_MAX, SHRT_MAX); + SetRect(&clip, s->window->portRect.right - 15, SHRT_MIN, + SHRT_MAX, SHRT_MAX); ClipRect(&clip); - DrawGrowIcon(window); + DrawGrowIcon(s->window); clip.left = SHRT_MIN; ClipRect(&clip); - EndUpdate(window); -} +} struct do_text_args { - struct mac_session *s; + Session *s; Rect textrect; + Rect leadrect; char *text; int len; unsigned long attr; @@ -590,21 +735,19 @@ struct do_text_args { * * 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) { int style = 0; - int bgcolour, fgcolour; - RGBColor rgbfore, rgbback; struct do_text_args a; RgnHandle textrgn; SetPort(s->window); /* First check this text is relevant */ - a.textrect.top = y * font_height; - a.textrect.bottom = (y + 1) * font_height; - a.textrect.left = x * font_width; - a.textrect.right = (x + len) * font_width; + 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; if (!RectInRgn(&a.textrect, s->window->visRgn)) return; @@ -612,80 +755,143 @@ void do_text(struct mac_session *s, int x, int y, char *text, int len, a.text = text; a.len = len; a.attr = attr; + if (s->font_leading > 0) + SetRect(&a.leadrect, + a.textrect.left, a.textrect.bottom - s->font_leading, + a.textrect.right, a.textrect.bottom); + else + SetRect(&a.leadrect, 0, 0, 0, 0); SetPort(s->window); 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; if (attr & ATTR_UNDER) style |= underline; TextFace(style); - TextSize(cfg.fontheight); - if (attr & ATTR_REVERSE) - TextMode(notSrcCopy); - else - TextMode(srcCopy); + TextSize(s->cfg.fontheight); SetFractEnable(FALSE); /* We want characters on pixel boundaries */ + if (mac_gestalts.qdvers > gestaltOriginalQD) + if (style & bold) { + SpaceExtra(s->font_boldadjust << 16); + CharExtra(s->font_boldadjust << 16); + } else { + SpaceExtra(0); + CharExtra(0); + } textrgn = NewRgn(); RectRgn(textrgn, &a.textrect); - DeviceLoop(textrgn, do_text_for_device, (long)&a, 0); - /* Tell the window manager about it in case this isn't an update */ + if (mac_gestalts.qdvers == gestaltOriginalQD) + do_text_for_device(1, 0, NULL, (long)&a); + else + DeviceLoop(textrgn, &do_text_for_device_upp, (long)&a, 0); DisposeRgn(textrgn); + /* Tell the window manager about it in case this isn't an update */ ValidRect(&a.textrect); } static pascal void do_text_for_device(short depth, short devflags, GDHandle device, long cookie) { struct do_text_args *a; - int bgcolour, fgcolour; + int bgcolour, fgcolour, bright; a = (struct do_text_args *)cookie; + bright = (a->attr & ATTR_BOLD) && a->s->cfg.bold_colour; + + TextMode(a->attr & ATTR_REVERSE ? notSrcCopy : srcCopy); + switch (depth) { case 1: /* XXX This should be done with a _little_ more configurability */ ForeColor(whiteColor); BackColor(blackColor); + if (a->attr & ATTR_ACTCURS) + TextMode(a->attr & ATTR_REVERSE ? srcCopy : notSrcCopy); break; case 2: - if ((a->attr & ATTR_BOLD) && cfg.bold_colour) - PmForeColor(DEFAULT_FG_BOLD); - else - PmForeColor(DEFAULT_FG); - if (a->attr & ATTR_ACTCURS) - PmBackColor(CURSOR_FG); - else + if (a->attr & ATTR_ACTCURS) { + PmForeColor(bright ? CURSOR_FG_BOLD : CURSOR_FG); + PmBackColor(CURSOR_BG); + TextMode(srcCopy); + } else { + PmForeColor(bright ? DEFAULT_FG_BOLD : DEFAULT_FG); PmBackColor(DEFAULT_BG); + } break; default: - fgcolour = ((a->attr & ATTR_FGMASK) >> ATTR_FGSHIFT) * 2; - bgcolour = ((a->attr & ATTR_BGMASK) >> ATTR_BGSHIFT) * 2; - if ((a->attr & ATTR_BOLD) && cfg.bold_colour) - if (a->attr & ATTR_REVERSE) - bgcolour++; - else - fgcolour++; - if (a->attr & ATTR_ACTCURS) - bgcolour = CURSOR_FG; + if (a->attr & ATTR_ACTCURS) { + fgcolour = bright ? CURSOR_FG_BOLD : CURSOR_FG; + bgcolour = CURSOR_BG; + TextMode(srcCopy); + } else { + fgcolour = ((a->attr & ATTR_FGMASK) >> ATTR_FGSHIFT) * 2; + bgcolour = ((a->attr & ATTR_BGMASK) >> ATTR_BGSHIFT) * 2; + if (bright) + if (a->attr & ATTR_REVERSE) + bgcolour++; + else + fgcolour++; + } PmForeColor(fgcolour); PmBackColor(bgcolour); break; } + + if (a->attr & ATTR_REVERSE) + PaintRect(&a->leadrect); + else + EraseRect(&a->leadrect); MoveTo(a->textrect.left, a->textrect.top + a->s->font_ascent); DrawText(a->text, 0, a->len); + + if (a->attr & ATTR_PASCURS) { + PenNormal(); + switch (depth) { + case 1: + PenMode(patXor); + break; + default: + PmForeColor(CURSOR_BG); + break; + } + FrameRect(&a->textrect); + } } /* * Call from the terminal emulator to get its graphics context. + * Should probably be called start_redraw or something. */ -struct mac_session *get_ctx(void) { +void pre_paint(Session *s) { - return onlysession; + s->attr_mask = ATTR_INVALID; + DeviceLoop(s->window->visRgn, &mac_set_attr_mask_upp, (long)s, 0); +} + +static pascal void mac_set_attr_mask(short depth, short devflags, + GDHandle device, long cookie) { + + Session *s = (Session *)cookie; + + switch (depth) { + default: + s->attr_mask |= ATTR_FGMASK | ATTR_BGMASK; + /* FALLTHROUGH */ + case 2: + s->attr_mask |= ATTR_BOLD; + /* FALLTHROUGH */ + case 1: + s->attr_mask |= ATTR_UNDER | ATTR_REVERSE | ATTR_ACTCURS | + ATTR_PASCURS | ATTR_ASCII | ATTR_GBCHR | ATTR_LINEDRW | + (s->cfg.bold_colour ? 0 : ATTR_BOLD); + break; + } } /* * Presumably this does something in Windows */ -void free_ctx(struct mac_session *ctx) { +void post_paint(Session *s) { } @@ -696,14 +902,13 @@ void free_ctx(struct mac_session *ctx) { * start is the line number of the top of the display * page is the length of the displayed page */ -void set_sbar(int total, int start, int page) { - struct mac_session *s = onlysession; +void set_sbar(Session *s, int total, int start, int page) { /* We don't redraw until we've set everything up, to avoid glitches */ (*s->scrollbar)->contrlMin = 0; (*s->scrollbar)->contrlMax = total - page; SetControlValue(s->scrollbar, start); -#if 0 +#if TARGET_RT_CFM /* XXX: This doesn't link for me. */ if (mac_gestalts.cntlattr & gestaltControlMgrPresent) SetControlViewSize(s->scrollbar, page); @@ -713,7 +918,7 @@ void set_sbar(int total, int start, int page) { /* * Beep */ -void beep(void) { +void beep(Session *s) { SysBeep(30); /* @@ -725,16 +930,15 @@ void beep(void) { /* * Set icon string -- a no-op here (Windowshade?) */ -void set_icon(char *icon) { +void set_icon(Session *s, char *icon) { } /* * Set the window title */ -void set_title(char *title) { +void set_title(Session *s, char *title) { Str255 mactitle; - struct mac_session *s = onlysession; mactitle[0] = sprintf((char *)&mactitle[1], "%s", title); SetWTitle(s->window, mactitle); @@ -743,19 +947,18 @@ void set_title(char *title) { /* * 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; - rows = h; - mac_initfont(onlysession); + s->cols = w; + s->rows = h; + mac_initfont(s); } /* * 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; - struct mac_session *s = onlysession; static const int first[21] = { 0, 2, 4, 6, 8, 10, 12, 14, 1, 3, 5, 7, 9, 11, 13, 15, @@ -770,18 +973,21 @@ void palette_set(int n, int r, int g, int b) { SetEntryColor(s->palette, first[n], &col); if (first[n] >= 18) SetEntryColor(s->palette, first[n]+1, &col); + if (first[n] == DEFAULT_BG) + mac_adjustwinbg(s); ActivatePalette(s->window); } /* * Reset to the default palette */ -void palette_reset(void) { - struct mac_session *s = onlysession; +void palette_reset(Session *s) { if (mac_gestalts.qdvers == gestaltOriginalQD) 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); ActivatePalette(s->window); /* Palette Manager will generate update events as required. */ } @@ -790,17 +996,16 @@ void palette_reset(void) { * Scroll the screen. (`lines' is +ve for scrolling forward, -ve * for backward.) */ -void do_scroll(int topline, int botline, int lines) { - struct mac_session *s = onlysession; +void do_scroll(Session *s, int topline, int botline, int lines) { Rect r; RgnHandle update; SetPort(s->window); PmBackColor(DEFAULT_BG); update = NewRgn(); - SetRect(&r, 0, topline * font_height, - cols * font_width, (botline + 1) * font_height); - ScrollRect(&r, 0, - lines * font_height, update); + SetRect(&r, 0, topline * s->font_height, + s->cols * s->font_width, (botline + 1) * s->font_height); + ScrollRect(&r, 0, - lines * s->font_height, update); /* XXX: move update region? */ InvalRgn(update); DisposeRgn(update); @@ -812,3 +1017,4 @@ void do_scroll(int topline, int botline, int lines) { * c-file-style: "simon" * End: */ +