X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/1e5bde5446c67b3efb1e17a154684e9a55e89abe..6c9dce7cf12d5696c91e72483a489a62783d6ec6:/mac/macterm.c

diff --git a/mac/macterm.c b/mac/macterm.c
index b9b3f9ef..46c30f66 100644
--- a/mac/macterm.c
+++ b/mac/macterm.c
@@ -1,4 +1,4 @@
-/* $Id: macterm.c,v 1.73 2003/04/12 21:06:34 ben Exp $ */
+/* $Id: macterm.c,v 1.78 2004/10/14 16:42:43 simon Exp $ */
 /*
  * Copyright (c) 1999 Simon Tatham
  * Copyright (c) 1999, 2002 Ben Harris
@@ -105,7 +105,7 @@ void post_paint(Session *s);
 
 void mac_startsession(Session *s)
 {
-    char *errmsg;
+    const char *errmsg;
     int i;
     WinInfo *wi;
 
@@ -158,7 +158,8 @@ void mac_startsession(Session *s)
     term_provide_logctx(s->term, s->logctx);
 
     errmsg = s->back->init(s, &s->backhandle, &s->cfg, s->cfg.host,
-			   s->cfg.port, &s->realhost, s->cfg.tcp_nodelay);
+			   s->cfg.port, &s->realhost, s->cfg.tcp_nodelay,
+			   s->cfg.tcp_keepalives);
     if (errmsg != NULL)
 	fatalbox("%s", errmsg);
     s->back->provide_logctx(s->backhandle, s->logctx);
@@ -193,9 +194,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 */
@@ -1138,7 +1139,7 @@ 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,
+void do_text(Context ctx, int x, int y, wchar_t *text, int len,
 	     unsigned long attr, int lattr)
 {
     Session *s = ctx;
@@ -1149,7 +1150,6 @@ void do_text(Context ctx, int x, int y, char *text, int len,
     RgnHandle visrgn;
 #endif
     char mactextbuf[1024];
-    UniChar unitextbuf[1024];
     wchar_t *unitextptr;
     int i, fontwidth;
     ByteCount iread, olen;
@@ -1158,6 +1158,11 @@ void do_text(Context ctx, int x, int y, char *text, int len,
 
     assert(len <= 1024);
 
+    /* SGT, 2004-10-14: I don't know how to support combining characters
+     * on the Mac. Hopefully the first person to fail this assertion will
+     * know how to do it better than me... */
+    assert(!(attr & TATTR_COMBINING));
+
     SetPort((GrafPtr)GetWindowPort(s->window));
 
     fontwidth = s->font_width;
@@ -1184,20 +1189,16 @@ void do_text(Context ctx, int x, int y, char *text, int len,
 	return;
 #endif
 
-    /* Unpack Unicode from the mad format we get passed */
-    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,
+				       text, kUnicodeUseFallbacksMask,
 				       0, NULL, NULL, NULL,
 				       1024, &iread, &olen, mactextbuf);
 	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;
+	unitextptr = (wchar_t *)text;
 	olen = charset_from_unicode(&unitextptr, &len, mactextbuf, 1024,
 				    s->font_charset, NULL, ".", 1);
     } else