projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Work around a weird bug in gdk_draw_text_wc().
[u/mdw/putty]
/
mac
/
mac.c
diff --git
a/mac/mac.c
b/mac/mac.c
index
deb083a
..
c6a93dc
100644
(file)
--- a/
mac/mac.c
+++ b/
mac/mac.c
@@
-1,4
+1,4
@@
-/* $Id: mac.c,v 1.1
1 2002/12/30 19:01:44
ben Exp $ */
+/* $Id: mac.c,v 1.1
4 2003/01/02 00:33:40
ben Exp $ */
/*
* Copyright (c) 1999 Ben Harris
* All rights reserved.
/*
* Copyright (c) 1999 Ben Harris
* All rights reserved.
@@
-157,6
+157,7
@@
static void mac_startup(void) {
mac_gestalts.encvvers = 0;
else {
mac_gestalts.encvvers = (*ti)->tecVersion;
mac_gestalts.encvvers = 0;
else {
mac_gestalts.encvvers = (*ti)->tecVersion;
+ mac_gestalts.uncvattr = (*ti)->tecUnicodeConverterFeatures;
DisposeHandle((Handle)ti);
}
DisposeHandle((Handle)ti);
}
@@
-273,13
+274,16
@@
static void mac_contentclick(WindowPtr window, EventRecord *event) {
mac_clickterm(window, event);
break;
case wAbout:
mac_clickterm(window, event);
break;
case wAbout:
- if (DialogSelect(event, &
(DialogPtr)
window, &item))
+ if (DialogSelect(event, &window, &item))
switch (item) {
case wiAboutLicence:
mac_openlicence();
break;
}
break;
switch (item) {
case wiAboutLicence:
mac_openlicence();
break;
}
break;
+ case wSettings:
+ mac_clickdlg(window, event);
+ break;
}
}
}
}
@@
-300,6
+304,9
@@
static void mac_activatewindow(WindowPtr window, EventRecord *event) {
case wTerminal:
mac_activateterm(window, active);
break;
case wTerminal:
mac_activateterm(window, active);
break;
+ case wSettings:
+ mac_activatedlg(window, event);
+ break;
case wAbout:
mac_activateabout(window, event);
break;
case wAbout:
mac_activateabout(window, event);
break;
@@
-326,6
+333,7
@@
static void mac_updatewindow(WindowPtr window) {
mac_updateterm(window);
break;
case wAbout:
mac_updateterm(window);
break;
case wAbout:
+ case wSettings:
BeginUpdate(window);
UpdateDialog(window, window->visRgn);
EndUpdate(window);
BeginUpdate(window);
UpdateDialog(window, window->visRgn);
EndUpdate(window);
@@
-363,6
+371,7
@@
static void mac_updatelicence(WindowPtr window)
*/
static int mac_windowtype(WindowPtr window) {
int kind;
*/
static int mac_windowtype(WindowPtr window) {
int kind;
+ long refcon;
if (window == NULL)
return wNone;
if (window == NULL)
return wNone;
@@
-371,7
+380,11
@@
static int mac_windowtype(WindowPtr window) {
return wDA;
if (GetWVariant(window) == zoomDocProc)
return wTerminal;
return wDA;
if (GetWVariant(window) == zoomDocProc)
return wTerminal;
- return GetWRefCon(window);
+ refcon = GetWRefCon(window);
+ if (refcon < 1024)
+ return refcon;
+ else
+ return wSettings;
}
/*
}
/*