~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make Change Settings do something.
[sgt/putty]
/
mac
/
macterm.c
diff --git
a/mac/macterm.c
b/mac/macterm.c
index
88eb266
..
44fb5af
100644
(file)
--- a/
mac/macterm.c
+++ b/
mac/macterm.c
@@
-1,4
+1,4
@@
-/* $Id
: macterm.c,v 1.75 2003/05/04 14:18:18 simon Exp
$ */
+/* $Id$ */
/*
* Copyright (c) 1999 Simon Tatham
* Copyright (c) 1999, 2002 Ben Harris
/*
* Copyright (c) 1999 Simon Tatham
* Copyright (c) 1999, 2002 Ben Harris
@@
-63,14
+63,12
@@
#include "mac.h"
#include "terminal.h"
#include "mac.h"
#include "terminal.h"
-#define NCOLOURS (lenof(((Config *)0)->colours))
-
-#define DEFAULT_FG 16
-#define DEFAULT_FG_BOLD 17
-#define DEFAULT_BG 18
-#define DEFAULT_BG_BOLD 19
-#define CURSOR_FG 20
-#define CURSOR_BG 21
+#define DEFAULT_FG 256
+#define DEFAULT_FG_BOLD 257
+#define DEFAULT_BG 258
+#define DEFAULT_BG_BOLD 259
+#define CURSOR_FG 260
+#define CURSOR_BG 261
#define PTOCC(x) ((x) < 0 ? -(-(x - s->font_width - 1) / s->font_width) : \
(x) / s->font_width)
#define PTOCC(x) ((x) < 0 ? -(-(x - s->font_width - 1) / s->font_width) : \
(x) / s->font_width)
@@
-158,7
+156,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,
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);
if (errmsg != NULL)
fatalbox("%s", errmsg);
s->back->provide_logctx(s->backhandle, s->logctx);
@@
-313,7
+312,6
@@
void mac_pollterm(void)
Session *s;
for (s = sesslist; s != NULL; s = s->next) {
Session *s;
for (s = sesslist; s != NULL; s = s->next) {
- term_out(s->term);
term_update(s->term);
}
}
term_update(s->term);
}
}
@@
-350,7
+348,7
@@
static void mac_initpalette(Session *s)
#define PM_NORMAL ( pmTolerant | pmInhibitC2 | \
pmInhibitG2 | pmInhibitG4 | pmInhibitG8 )
#define PM_TOLERANCE 0x2000
#define PM_NORMAL ( pmTolerant | pmInhibitC2 | \
pmInhibitG2 | pmInhibitG4 | pmInhibitG8 )
#define PM_TOLERANCE 0x2000
- s->palette = NewPalette(22, NULL, PM_NORMAL, PM_TOLERANCE);
+ s->palette = NewPalette(2
6
2, NULL, PM_NORMAL, PM_TOLERANCE);
if (s->palette == NULL)
fatalbox("Unable to create palette");
/* In 2bpp, these are the colours we want most. */
if (s->palette == NULL)
fatalbox("Unable to create palette");
/* In 2bpp, these are the colours we want most. */
@@
-468,6
+466,7
@@
static void mac_adjusttermmenus(WindowPtr window)
menu = GetMenuHandle(mFile);
DisableItem(menu, iSave); /* XXX enable if modified */
EnableItem(menu, iSaveAs);
menu = GetMenuHandle(mFile);
DisableItem(menu, iSave); /* XXX enable if modified */
EnableItem(menu, iSaveAs);
+ EnableItem(menu, iChange);
EnableItem(menu, iDuplicate);
menu = GetMenuHandle(mEdit);
EnableItem(menu, 0);
EnableItem(menu, iDuplicate);
menu = GetMenuHandle(mEdit);
EnableItem(menu, 0);
@@
-1042,7
+1041,7
@@
static void mac_activateterm(WindowPtr window, EventRecord *event)
Boolean active = (event->modifiers & activeFlag) != 0;
s = mac_windowsession(window);
Boolean active = (event->modifiers & activeFlag) != 0;
s = mac_windowsession(window);
-
s->term->has_focus = active
;
+
term_set_focus(s->term, active)
;
term_update(s->term);
if (active)
ShowControl(s->scrollbar);
term_update(s->term);
if (active)
ShowControl(s->scrollbar);
@@
-1138,7
+1137,7
@@
struct do_text_args {
*
* x and y are text row and column (zero-based)
*/
*
* 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;
unsigned long attr, int lattr)
{
Session *s = ctx;
@@
-1149,15
+1148,19
@@
void do_text(Context ctx, int x, int y, char *text, int len,
RgnHandle visrgn;
#endif
char mactextbuf[1024];
RgnHandle visrgn;
#endif
char mactextbuf[1024];
- UniChar unitextbuf[1024];
wchar_t *unitextptr;
wchar_t *unitextptr;
- int
i,
fontwidth;
+ int fontwidth;
ByteCount iread, olen;
OSStatus err;
static DeviceLoopDrawingUPP do_text_for_device_upp = NULL;
assert(len <= 1024);
ByteCount iread, olen;
OSStatus err;
static DeviceLoopDrawingUPP do_text_for_device_upp = NULL;
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;
SetPort((GrafPtr)GetWindowPort(s->window));
fontwidth = s->font_width;
@@
-1184,20
+1187,16
@@
void do_text(Context ctx, int x, int y, char *text, int len,
return;
#endif
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),
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. */
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
olen = charset_from_unicode(&unitextptr, &len, mactextbuf, 1024,
s->font_charset, NULL, ".", 1);
} else
@@
-1286,9
+1285,7
@@
static pascal void do_text_for_device(short depth, short devflags,
if (HAVE_COLOR_QD()) {
if (depth > 2) {
fgcolour = ((a->attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
if (HAVE_COLOR_QD()) {
if (depth > 2) {
fgcolour = ((a->attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
- fgcolour = (fgcolour & 0xF) * 2 + (fgcolour & 0x10 ? 1 : 0);
bgcolour = ((a->attr & ATTR_BGMASK) >> ATTR_BGSHIFT);
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
} else {
/*
* NB: bold reverse in 2bpp breaks with the usual PuTTY model and
@@
-1303,7
+1300,8
@@
static pascal void do_text_for_device(short depth, short devflags,
bgcolour = tmp;
}
if (bright && depth > 2)
bgcolour = tmp;
}
if (bright && depth > 2)
- fgcolour |= 1;
+ if (fgcolour < 16) fgcolour |=8;
+ else if (fgcolour >= 256) fgcolour |=1;
if ((a->attr & TATTR_ACTCURS) && depth > 1) {
fgcolour = CURSOR_FG;
bgcolour = CURSOR_BG;
if ((a->attr & TATTR_ACTCURS) && depth > 1) {
fgcolour = CURSOR_FG;
bgcolour = CURSOR_BG;
@@
-1355,7
+1353,7
@@
static pascal void do_text_for_device(short depth, short devflags,
}
}
}
}
-void do_cursor(Context ctx, int x, int y,
char
*text, int len,
+void do_cursor(Context ctx, int x, int y,
wchar_t
*text, int len,
unsigned long attr, int lattr)
{
unsigned long attr, int lattr)
{
@@
-1693,19
+1691,13
@@
static void real_palette_set(Session *s, int n, int r, int g, int b)
void palette_set(void *frontend, int n, int r, int g, int b)
{
Session *s = frontend;
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,
- 1, 3, 5, 7, 9, 11, 13, 15,
- 16, 17, 18, 20, 21
- };
if (!HAVE_COLOR_QD())
return;
if (!HAVE_COLOR_QD())
return;
- real_palette_set(s, first[n], r, g, b);
- if (first[n] == 18)
- real_palette_set(s, first[n]+1, r, g, b);
- if (first[n] == DEFAULT_BG)
- mac_adjustwinbg(s);
+ real_palette_set(s, n, r, g, b);
+ if (n == DEFAULT_BG)
+ mac_adjustwinbg(s);
+
ActivatePalette(s->window);
}
ActivatePalette(s->window);
}
@@
-1717,23
+1709,38
@@
void palette_reset(void *frontend)
Session *s = frontend;
/* This maps colour indices in cfg to those used in our palette. */
static const int ww[] = {
Session *s = frontend;
/* This maps colour indices in cfg to those used in our palette. */
static const int ww[] = {
-
6, 7, 8, 9, 10, 11, 12, 13
,
-
14, 15, 16, 17, 18, 19, 20, 2
1,
-
0, 1, 2, 3, 4,
5
+
256, 257, 258, 259, 260, 261
,
+
0, 8, 1, 9, 2, 10, 3, 1
1,
+
4, 12, 5, 13, 6, 14, 7, 1
5
};
};
+
int i;
if (!HAVE_COLOR_QD())
return;
int i;
if (!HAVE_COLOR_QD())
return;
- assert(lenof(ww) == NCOLOURS);
-
- for (i = 0; i < NCOLOURS; i++) {
- real_palette_set(s, i,
- s->cfg.colours[ww[i]][0],
- s->cfg.colours[ww[i]][1],
- s->cfg.colours[ww[i]][2]);
+ for (i = 0; i < 22; i++) {
+ int w = ww[i];
+ real_palette_set(s,w,
+ s->cfg.colours[i][0],
+ s->cfg.colours[i][1],
+ s->cfg.colours[i][2]);
+ }
+ for (i = 0; i < 240; i++) {
+ if (i < 216) {
+ int r = i / 36, g = (i / 6) % 6, b = i % 6;
+ real_palette_set(s,i+16,
+ r * 0x33,
+ g * 0x33,
+ b * 0x33);
+ } else {
+ int shade = i - 216;
+ shade = (shade + 1) * 0xFF / (240 - 216 + 1);
+ real_palette_set(s,i+16,shade,shade,shade);
+ }
}
}
+
+
mac_adjustwinbg(s);
ActivatePalette(s->window);
/* Palette Manager will generate update events as required. */
mac_adjustwinbg(s);
ActivatePalette(s->window);
/* Palette Manager will generate update events as required. */