X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/5a736db69fd46b5010ebc2c3d0d979425737695a..cbe2d68fd7c7c7bac692b3a2d200a5d2429ab201:/mac/macterm.c diff --git a/mac/macterm.c b/mac/macterm.c index 51ecb091..88eb2668 100644 --- a/mac/macterm.c +++ b/mac/macterm.c @@ -1,4 +1,4 @@ -/* $Id: macterm.c,v 1.66 2003/02/04 02:03:53 ben Exp $ */ +/* $Id: macterm.c,v 1.75 2003/05/04 14:18:18 simon Exp $ */ /* * Copyright (c) 1999 Simon Tatham * Copyright (c) 1999, 2002 Ben Harris @@ -90,14 +90,24 @@ 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 void text_click(Session *, EventRecord *); +static void mac_activateterm(WindowPtr, EventRecord *); +static void mac_adjusttermcursor(WindowPtr, Point, RgnHandle); +static void mac_adjusttermmenus(WindowPtr); +static void mac_updateterm(WindowPtr); +static void mac_clickterm(WindowPtr, EventRecord *); +static void mac_growterm(WindowPtr, EventRecord *); +static void mac_keyterm(WindowPtr, EventRecord *); +static void mac_menuterm(WindowPtr, short, short); +static void mac_closeterm(WindowPtr); void pre_paint(Session *s); void post_paint(Session *s); void mac_startsession(Session *s) { - char *errmsg; + const char *errmsg; int i; + WinInfo *wi; init_ucs(s); @@ -119,7 +129,20 @@ void mac_startsession(Session *s) s->window = GetNewCWindow(wTerminal, NULL, (WindowPtr)-1); else s->window = GetNewWindow(wTerminal, NULL, (WindowPtr)-1); - SetWRefCon(s->window, (long)s); + wi = snew(WinInfo); + memset(wi, 0, sizeof(*wi)); + wi->s = s; + wi->wtype = wTerminal; + wi->activate = &mac_activateterm; + wi->adjustcursor = &mac_adjusttermcursor; + wi->adjustmenus = &mac_adjusttermmenus; + wi->update = &mac_updateterm; + wi->click = &mac_clickterm; + wi->grow = &mac_growterm; + wi->key = &mac_keyterm; + wi->menu = &mac_menuterm; + wi->close = &mac_closeterm; + SetWRefCon(s->window, (long)wi); s->scrollbar = GetNewControl(cVScroll, s->window); s->term = term_init(&s->cfg, &s->ucsdata, s); @@ -131,10 +154,10 @@ void mac_startsession(Session *s) ActivatePalette(s->window); } - s->logctx = log_init(s, &s->cfg); + s->logctx = log_init(s->term, &s->cfg); term_provide_logctx(s->term, s->logctx); - errmsg = s->back->init(s->term, &s->backhandle, &s->cfg, s->cfg.host, + errmsg = s->back->init(s, &s->backhandle, &s->cfg, s->cfg.host, s->cfg.port, &s->realhost, s->cfg.tcp_nodelay); if (errmsg != NULL) fatalbox("%s", errmsg); @@ -170,9 +193,9 @@ static void mac_workoutfontscale(Session *s, int wantwidth, const char text = 'W'; FontInfo fi; #if TARGET_API_MAC_CARBON - CQDProcsPtr gp = GetPortGrafProcs(GetWindowPort(s->window));; + CQDProcsPtr gp = GetPortGrafProcs(GetWindowPort(s->window)); #else - QDProcsPtr gp = s->window->grafProcs;; + QDProcsPtr gp = s->window->grafProcs; #endif numer.v = denom.v = 1; /* always */ @@ -199,7 +222,8 @@ static void mac_workoutfontscale(Session *s, int wantwidth, static UnicodeToTextFallbackUPP uni_to_font_fallback_upp; -static void mac_initfont(Session *s) { +static void mac_initfont(Session *s) +{ FontInfo fi; TextEncoding enc; OptionBits fbflags; @@ -313,7 +337,8 @@ static void mac_adjustsize(Session *s, int newrows, int newcols) { mac_drawgrowicon(s); } -static void mac_initpalette(Session *s) { +static void mac_initpalette(Session *s) +{ if (!HAVE_COLOR_QD()) return; @@ -344,7 +369,8 @@ static void mac_initpalette(Session *s) { * Set the background colour of the window correctly. Should be * called whenever the default background changes. */ -static void mac_adjustwinbg(Session *s) { +static void mac_adjustwinbg(Session *s) +{ if (!HAVE_COLOR_QD()) return; @@ -373,7 +399,9 @@ static void mac_adjustwinbg(Session *s) { /* * Set the cursor shape correctly */ -void mac_adjusttermcursor(WindowPtr window, Point mouse, RgnHandle cursrgn) { +static void mac_adjusttermcursor(WindowPtr window, Point mouse, + RgnHandle cursrgn) +{ Session *s; ControlHandle control; short part; @@ -385,7 +413,7 @@ void mac_adjusttermcursor(WindowPtr window, Point mouse, RgnHandle cursrgn) { #endif SetPort((GrafPtr)GetWindowPort(window)); - s = (Session *)GetWRefCon(window); + s = mac_windowsession(window); GlobalToLocal(&mouse); part = FindControl(mouse, window, &control); if (control == s->scrollbar) { @@ -428,14 +456,15 @@ void mac_adjusttermcursor(WindowPtr window, Point mouse, RgnHandle cursrgn) { #define DisableItem DisableMenuItem #define EnableItem EnableMenuItem #endif -void mac_adjusttermmenus(WindowPtr window) { +static void mac_adjusttermmenus(WindowPtr window) +{ Session *s; MenuHandle menu; #if !TARGET_API_MAC_CARBON long offset; #endif - s = (Session *)GetWRefCon(window); + s = mac_windowsession(window); menu = GetMenuHandle(mFile); DisableItem(menu, iSave); /* XXX enable if modified */ EnableItem(menu, iSaveAs); @@ -451,19 +480,23 @@ void mac_adjusttermmenus(WindowPtr window) { #if TARGET_API_MAC_CARBON if (1) #else - if (GetScrap(NULL, 'TEXT', &offset) == noTypeErr) + if (GetScrap(NULL, kScrapFlavorTypeText, &offset) == noTypeErr) #endif DisableItem(menu, iPaste); else EnableItem(menu, iPaste); DisableItem(menu, iClear); EnableItem(menu, iSelectAll); + menu = GetMenuHandle(mWindow); + EnableItem(menu, 0); + EnableItem(menu, iShowEventLog); } -void mac_menuterm(WindowPtr window, short menu, short item) { +static void mac_menuterm(WindowPtr window, short menu, short item) +{ Session *s; - s = (Session *)GetWRefCon(window); + s = mac_windowsession(window); switch (menu) { case mEdit: switch (item) { @@ -474,17 +507,26 @@ void mac_menuterm(WindowPtr window, short menu, short item) { term_do_paste(s->term); break; } + break; + case mWindow: + switch(item) { + case iShowEventLog: + mac_showeventlog(s); + break; + } + break; } } -void mac_clickterm(WindowPtr window, EventRecord *event) { +static void mac_clickterm(WindowPtr window, EventRecord *event) +{ Session *s; Point mouse; ControlHandle control; int part; static ControlActionUPP mac_scrolltracker_upp = NULL; - s = (Session *)GetWRefCon(window); + s = mac_windowsession(window); SetPort((GrafPtr)GetWindowPort(window)); mouse = event->where; GlobalToLocal(&mouse); @@ -510,7 +552,8 @@ void mac_clickterm(WindowPtr window, EventRecord *event) { } } -static void text_click(Session *s, EventRecord *event) { +static void text_click(Session *s, EventRecord *event) +{ Point localwhere; int row, col; static UInt32 lastwhen = 0; @@ -579,14 +622,14 @@ void write_clip(void *cookie, wchar_t *data, int len, int must_deselect) */ if (ZeroScrap() != noErr) return; - PutScrap(len * sizeof(*data), 'utxt', data); + PutScrap(len * sizeof(*data), kScrapFlavorTypeUnicode, 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 */ + mactextbuf = snewn(len, char); /* XXX DBCS */ if (s->uni_to_font != NULL) { err = ConvertFromUnicodeToText(s->uni_to_font, len * sizeof(UniChar), (UniChar *)data, @@ -601,7 +644,7 @@ void write_clip(void *cookie, wchar_t *data, int len, int must_deselect) s->font_charset, NULL, ".", 1); } else return; - PutScrap(olen, 'TEXT', mactextbuf); + PutScrap(olen, kScrapFlavorTypeText, mactextbuf); sfree(mactextbuf); stsz = offsetof(StScrpRec, scrpStyleTab) + sizeof(ScrpSTElement); @@ -616,12 +659,13 @@ void write_clip(void *cookie, wchar_t *data, int len, int must_deselect) stsc->scrpStyleTab[0].scrpColor.red = 0; stsc->scrpStyleTab[0].scrpColor.green = 0; stsc->scrpStyleTab[0].scrpColor.blue = 0; - PutScrap(stsz, 'styl', stsc); + PutScrap(stsz, kScrapFlavorTypeTextStyle, stsc); sfree(stsc); #endif } -void get_clip(void *frontend, wchar_t **p, int *lenp) { +void get_clip(void *frontend, wchar_t **p, int *lenp) +{ #if TARGET_API_MAC_CARBON *lenp = 0; #else @@ -647,17 +691,18 @@ void get_clip(void *frontend, wchar_t **p, int *lenp) { sfree(data); data = NULL; } else { - if (GetScrap(NULL, 'utxt', &offset) > 0) { + if (GetScrap(NULL, kScrapFlavorTypeUnicode, &offset) > 0) { if (h == NULL) h = NewHandle(0); - *lenp = GetScrap(h, 'utxt', &offset) / sizeof(**p); + *lenp = + GetScrap(h, kScrapFlavorTypeUnicode, &offset) / sizeof(**p); HLock(h); *p = (wchar_t *)*h; - } else if (GetScrap(NULL, 'TEXT', &offset) > 0) { + } else if (GetScrap(NULL, kScrapFlavorTypeText, &offset) > 0) { texth = NewHandle(0); - textlen = GetScrap(texth, 'TEXT', &offset); + textlen = GetScrap(texth, kScrapFlavorTypeText, &offset); HLock(texth); - data = smalloc(textlen * 2); + data = snewn(textlen, wchar_t); /* XXX should use 'styl' scrap if it's there. */ if (mac_gestalts.encvvers != 0 && UpgradeScriptInfoToTextEncoding(smSystemScript, @@ -700,13 +745,14 @@ void get_clip(void *frontend, wchar_t **p, int *lenp) { #endif } -static pascal void mac_scrolltracker(ControlHandle control, short part) { +static pascal void mac_scrolltracker(ControlHandle control, short part) +{ Session *s; #if TARGET_API_MAC_CARBON - s = (Session *)GetWRefCon(GetControlOwner(control)); + s = mac_windowsession(GetControlOwner(control)); #else - s = (Session *)GetWRefCon((*control)->contrlOwner); + s = mac_windowsession((*control)->contrlOwner); #endif switch (part) { case kControlUpButtonPart: @@ -724,8 +770,9 @@ static pascal void mac_scrolltracker(ControlHandle control, short part) { } } -void mac_keyterm(WindowPtr window, EventRecord *event) { - Session *s = (Session *)GetWRefCon(window); +static void mac_keyterm(WindowPtr window, EventRecord *event) +{ + Session *s = mac_windowsession(window); Key_Sym keysym = PK_NULL; unsigned int mods = 0, flags = PKF_NUMLOCK; UniChar utxt[1]; @@ -884,7 +931,8 @@ static struct { char oldmsg[20]; } growterm_state; -void mac_growterm(WindowPtr window, EventRecord *event) { +static void mac_growterm(WindowPtr window, EventRecord *event) +{ Rect limits; long grow_result; int newrows, newcols; @@ -895,7 +943,7 @@ void mac_growterm(WindowPtr window, EventRecord *event) { FontInfo fi; #endif - s = (Session *)GetWRefCon(window); + s = mac_windowsession(window); #if !TARGET_API_MAC_CARBON draghooksave = LMGetDragHook(); @@ -969,7 +1017,7 @@ static pascal void mac_growtermdraghook(void) void mac_closeterm(WindowPtr window) { - Session *s = (Session *)GetWRefCon(window); + Session *s = mac_windowsession(window); /* XXX warn on close */ HideWindow(s->window); @@ -981,15 +1029,19 @@ void mac_closeterm(WindowPtr window) if (s->uni_to_font != NULL) DisposeUnicodeToTextInfo(&s->uni_to_font); term_free(s->term); + mac_freeeventlog(s); + sfree((WinInfo *)GetWRefCon(s->window)); DisposeWindow(s->window); DisposePalette(s->palette); sfree(s); } -void mac_activateterm(WindowPtr window, Boolean active) { +static void mac_activateterm(WindowPtr window, EventRecord *event) +{ Session *s; + Boolean active = (event->modifiers & activeFlag) != 0; - s = (Session *)GetWRefCon(window); + s = mac_windowsession(window); s->term->has_focus = active; term_update(s->term); if (active) @@ -1004,14 +1056,15 @@ void mac_activateterm(WindowPtr window, Boolean active) { mac_drawgrowicon(s); } -void mac_updateterm(WindowPtr window) { +static void mac_updateterm(WindowPtr window) +{ Session *s; Rect bbox; #if TARGET_API_MAC_CARBON RgnHandle visrgn; #endif - s = (Session *)GetWRefCon(window); + s = mac_windowsession(window); SetPort((GrafPtr)GetWindowPort(window)); BeginUpdate(window); pre_paint(s); @@ -1046,7 +1099,8 @@ void mac_updateterm(WindowPtr window) { EndUpdate(window); } -static void mac_drawgrowicon(Session *s) { +static void mac_drawgrowicon(Session *s) +{ Rect clip; RgnHandle savergn; @@ -1085,7 +1139,8 @@ struct do_text_args { * x and y are text row and column (zero-based) */ void do_text(Context ctx, int x, int y, char *text, int len, - unsigned long attr, int lattr) { + unsigned long attr, int lattr) +{ Session *s = ctx; int style; struct do_text_args a; @@ -1212,7 +1267,8 @@ void do_text(Context ctx, int x, int y, char *text, int len, } static pascal void do_text_for_device(short depth, short devflags, - GDHandle device, long cookie) { + GDHandle device, long cookie) +{ struct do_text_args *a = (struct do_text_args *)cookie; int bgcolour, fgcolour, bright, reverse, tmp; #if TARGET_API_MAC_CARBON @@ -1310,7 +1366,8 @@ void do_cursor(Context ctx, int x, int y, char *text, int len, * Call from the terminal emulator to get its graphics context. * Should probably be called start_redraw or something. */ -void pre_paint(Session *s) { +void pre_paint(Session *s) +{ GDHandle gdh; Rect myrect, tmprect; #if TARGET_API_MAC_CARBON @@ -1356,21 +1413,24 @@ void pre_paint(Session *s) { (s->cfg.bold_colour ? ATTR_BOLD : 0)); } -Context get_ctx(void *frontend) { +Context get_ctx(void *frontend) +{ Session *s = frontend; pre_paint(s); return s; } -void free_ctx(Context ctx) { +void free_ctx(Context ctx) +{ } /* * Presumably this does something in Windows */ -void post_paint(Session *s) { +void post_paint(Session *s) +{ } @@ -1381,7 +1441,8 @@ void post_paint(Session *s) { * start is the line number of the top of the display * page is the length of the displayed page */ -void set_sbar(void *frontend, int total, int start, int page) { +void set_sbar(void *frontend, int total, int start, int page) +{ Session *s = frontend; /* We don't redraw until we've set everything up, to avoid glitches */ @@ -1437,7 +1498,8 @@ void set_icon(void *frontend, char *icon) { /* * Set the window title */ -void set_title(void *frontend, char *title) { +void set_title(void *frontend, char *title) +{ Session *s = frontend; Str255 mactitle; @@ -1459,9 +1521,24 @@ void set_raw_mouse_mode(void *frontend, int activate) /* * Resize the window at the emulator's request */ -void request_resize(void *frontend, int w, int h) { +void request_resize(void *frontend, int w, int h) +{ Session *s = frontend; + RgnHandle grayrgn; + Rect graybox; + int wlim, hlim; + /* Arbitrarily clip to the size of the desktop. */ + grayrgn = GetGrayRgn(); +#if TARGET_API_MAC_CARBON + GetRegionBounds(grayrgn, &graybox); +#else + graybox = (*grayrgn)->rgnBBox; +#endif + wlim = (graybox.right - graybox.left) / s->font_width; + hlim = (graybox.bottom - graybox.top) / s->font_height; + if (w > wlim) w = wlim; + if (h > hlim) h = hlim; term_size(s->term, h, w, s->cfg.savelines); mac_initfont(s); } @@ -1613,7 +1690,8 @@ static void real_palette_set(Session *s, int n, int r, int g, int b) /* * Set the logical palette. Called by the terminal emulator. */ -void palette_set(void *frontend, int n, int r, int g, int b) { +void palette_set(void *frontend, int n, int r, int g, int b) +{ Session *s = frontend; static const int first[21] = { 0, 2, 4, 6, 8, 10, 12, 14, @@ -1634,7 +1712,8 @@ void palette_set(void *frontend, int n, int r, int g, int b) { /* * Reset to the default palette */ -void palette_reset(void *frontend) { +void palette_reset(void *frontend) +{ Session *s = frontend; /* This maps colour indices in cfg to those used in our palette. */ static const int ww[] = { @@ -1664,7 +1743,8 @@ void palette_reset(void *frontend) { * Scroll the screen. (`lines' is +ve for scrolling forward, -ve * for backward.) */ -void do_scroll(Context ctx, int topline, int botline, int lines) { +void do_scroll(Context ctx, int topline, int botline, int lines) +{ Session *s = ctx; Rect r; RgnHandle scrollrgn = NewRgn(); @@ -1723,11 +1803,6 @@ void do_scroll(Context ctx, int topline, int botline, int lines) { DisposeRgn(update); } -void logevent(void *frontend, char *str) { - - fprintf(stderr, "%s\n", str); -} - /* Dummy routine, only required in plink. */ void ldisc_update(void *frontend, int echo, int edit) { @@ -1772,6 +1847,13 @@ int askappend(void *frontend, Filename filename) return 2; } +int from_backend(void *frontend, int is_stderr, const char *data, int len) +{ + Session *s = frontend; + + return term_data(s->term, is_stderr, data, len); +} + /* * Emacs magic: * Local Variables: