X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/2beb0fb004d36c0ce0a2db3f00ad145241391ae3..c3aef739857885cfc23b8aad3579032126c61e4d:/mac/macterm.c

diff --git a/mac/macterm.c b/mac/macterm.c
index af46d6d3..9bcef099 100644
--- a/mac/macterm.c
+++ b/mac/macterm.c
@@ -1,4 +1,4 @@
-/* $Id: macterm.c,v 1.34 2003/01/05 10:52:56 ben Exp $ */
+/* $Id: macterm.c,v 1.47 2003/01/14 18:43:26 ben Exp $ */
 /*
  * Copyright (c) 1999 Simon Tatham
  * Copyright (c) 1999, 2002 Ben Harris
@@ -109,35 +109,6 @@ static RoutineDescriptor do_text_for_device_upp =
 #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;
@@ -162,7 +133,7 @@ void mac_opensession(void) {
      */
     s->back = NULL;
     for (i = 0; backends[i].backend != NULL; i++)
-	if (backends[i].protocol == cfg.protocol) {
+	if (backends[i].protocol == s->cfg.protocol) {
 	    s->back = backends[i].backend;
 	    break;
 	}
@@ -179,8 +150,6 @@ void mac_opensession(void) {
 
 void mac_startsession(Session *s)
 {
-    UInt32 starttime;
-    char msg[128];
     char *errmsg;
 
     /* XXX: Own storage management? */
@@ -200,14 +169,15 @@ void mac_startsession(Session *s)
 	ActivatePalette(s->window);
     }
 
-    s->logctx = log_init(s);
+    s->logctx = log_init(s, &s->cfg);
     term_provide_logctx(s->term, s->logctx);
 
-    errmsg = s->back->init(s->term, &s->backhandle, s->cfg.host, s->cfg.port,
-		  &s->realhost, s->cfg.tcp_nodelay);
+    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)
-	inbuf_putstr(s, errmsg);
+	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);
 
@@ -218,11 +188,49 @@ void mac_startsession(Session *s)
     ldisc_send(s->ldisc, NULL, 0, 0);/* cause ldisc to notice changes */
 
     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;
+}
+
+/*
+ * 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;
+
+    fprintf(stderr, "want width = %d\n", wantwidth);
+    numer.v = denom.v = 1; /* always */
+    numer.h = denom.h = 1;
+    for (i = 0; i < 3; i++) {
+	fprintf(stderr, "Trying %d:%d\n", numer.h, denom.h);
+	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)));
+	fprintf(stderr, "width = %d\n", gotwidth);
+	if (gotwidth == wantwidth)
+	    break;
+	numer.h *= wantwidth;
+	denom.h *= gotwidth;
+    }
+    *numerp = numer;
+    *denomp = denom;
 }
 
 static UnicodeToTextFallbackUPP uni_to_font_fallback_upp;
@@ -234,7 +242,7 @@ static void mac_initfont(Session *s) {
     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);
@@ -244,6 +252,14 @@ static void mac_initfont(Session *s) {
     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');
@@ -300,6 +316,18 @@ static pascal OSStatus uni_to_font_fallback(UniChar *ucp,
     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.
@@ -869,6 +897,7 @@ static pascal void mac_growtermdraghook(void)
     GrafPtr portsave;
     Point mouse;
     char buf[20];
+    unsigned char pbuf[20];
     int newrows, newcols;
     
     GetMouse(&mouse);
@@ -880,13 +909,13 @@ static pascal void mac_growtermdraghook(void)
     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);
 }
 
@@ -975,23 +1004,29 @@ void do_text(Context ctx, int x, int y, char *text, int len,
     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;
 
@@ -1019,7 +1054,24 @@ void do_text(Context ctx, int x, int y, char *text, int len,
     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)
@@ -1027,7 +1079,6 @@ void do_text(Context ctx, int x, int y, char *text, int len,
     if (attr & ATTR_UNDER)
 	style |= underline;
     TextFace(style);
-    TextSize(s->cfg.fontheight);
     TextMode(srcOr);
     if (HAVE_COLOR_QD())
 	if (style & bold) {
@@ -1037,12 +1088,17 @@ void do_text(Context ctx, int x, int y, char *text, int len,
 	    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);
@@ -1098,7 +1154,19 @@ static pascal void do_text_for_device(short depth, short devflags,
     }
 
     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,
@@ -1252,7 +1320,7 @@ void set_title(void *frontend, char *title) {
     Session *s = frontend;
     Str255 mactitle;
 
-    mactitle[0] = sprintf((char *)&mactitle[1], "%s", title);
+    c2pstrcpy(mactitle, title);
     SetWTitle(s->window, mactitle);
 }
 
@@ -1273,8 +1341,7 @@ void set_raw_mouse_mode(void *frontend, int activate)
 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);
 }
 
@@ -1385,9 +1452,12 @@ void get_window_pixels(void *frontend, int *x, int *y)
 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;
 }
 
 /*