~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Yes we do mean assignment. Bah.
[sgt/putty]
/
mac
/
macterm.c
diff --git
a/mac/macterm.c
b/mac/macterm.c
index
1ff64ac
..
f308808
100644
(file)
--- a/
mac/macterm.c
+++ b/
mac/macterm.c
@@
-1,4
+1,4
@@
-/* $Id
: macterm.c,v 1.77 2004/10/13 11:50:16 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
@@
-314,7
+314,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);
}
}
@@
-1043,7
+1042,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);
@@
-1158,6
+1157,11
@@
void do_text(Context ctx, int x, int y, wchar_t *text, int len,
assert(len <= 1024);
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;