projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for generating project files for use with Dev-C++, contributed
[u/mdw/putty]
/
unix
/
gtkwin.c
diff --git
a/unix/gtkwin.c
b/unix/gtkwin.c
index
9838250
..
f969b04
100644
(file)
--- a/
unix/gtkwin.c
+++ b/
unix/gtkwin.c
@@
-1885,6
+1885,7
@@
void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
GdkGC *gc = dctx->gc;
int ncombining, combining;
int nfg, nbg, t, fontid, shadow, rlen, widefactor;
GdkGC *gc = dctx->gc;
int ncombining, combining;
int nfg, nbg, t, fontid, shadow, rlen, widefactor;
+ int monochrome = gtk_widget_get_visual(inst->area)->depth == 1;
if (attr & TATTR_COMBINING) {
ncombining = len;
if (attr & TATTR_COMBINING) {
ncombining = len;
@@
-1892,9
+1893,9
@@
void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
} else
ncombining = 1;
} else
ncombining = 1;
- nfg = ((
attr & ATTR_FGMASK
) >> ATTR_FGSHIFT);
- nbg = ((
attr & ATTR_BGMASK
) >> ATTR_BGSHIFT);
- if (
attr & ATTR_REVERSE
) {
+ nfg = ((
monochrome ? ATTR_DEFFG : (attr & ATTR_FGMASK)
) >> ATTR_FGSHIFT);
+ nbg = ((
monochrome ? ATTR_DEFBG : (attr & ATTR_BGMASK)
) >> ATTR_BGSHIFT);
+ if (
!!(attr & ATTR_REVERSE) ^ (monochrome && (attr & TATTR_ACTCURS))
) {
t = nfg;
nfg = nbg;
nbg = t;
t = nfg;
nfg = nbg;
nbg = t;
@@
-1907,7
+1908,7
@@
void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
if (nbg < 16) nbg |= 8;
else if (nbg >= 256) nbg |= 1;
}
if (nbg < 16) nbg |= 8;
else if (nbg >= 256) nbg |= 1;
}
- if (
attr & TATTR_ACTCURS
) {
+ if (
(attr & TATTR_ACTCURS) && !monochrome
) {
nfg = 260;
nbg = 261;
}
nfg = 260;
nbg = 261;
}