nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-16 12:03:03 -05:00
Code Issues Projects Releases Wiki Activity

We now use DeviceLoop for redraws, which allows for depth-specific tweaks.

Browse Source 
The first of these is that in 1-bit modes we ignore colour attributes entirely,
which has nice effects on some of Fragments efforts if nothing else.
We still seem to be a lot slower than BetterTelnet, which is a bit worrying.

[originally from svn r65]
This commit is contained in:
Ben Harris 1999-03-01 23:43:29 +00:00
parent 409d80171a
commit d763b173be
1 changed files with 62 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
macterm.c
View File

@ -1,4 +1,4 @@
/* $Id: macterm.c,v 1.1.2.9 1999/03/01 22:26:50 ben Exp $ */ /* $Id: macterm.c,v 1.1.2.10 1999/03/01 23:43:29 ben Exp $ */
/* /*
* Copyright (c) 1999 Ben Harris * Copyright (c) 1999 Ben Harris
* All rights reserved. * All rights reserved.
@ -59,6 +59,7 @@ static void mac_initfont(struct mac_session *);
static void mac_initpalette(struct mac_session *); static void mac_initpalette(struct mac_session *);
static void mac_adjustsize(struct mac_session *); static void mac_adjustsize(struct mac_session *);
static pascal void mac_scrolltracker(ControlHandle, short); static pascal void mac_scrolltracker(ControlHandle, short);
static pascal void do_text_for_device(short, short, GDHandle, long);
/* /*
* Temporary hack till I get the terminal emulator supporting multiple * Temporary hack till I get the terminal emulator supporting multiple
@ -271,6 +272,14 @@ void mac_updateterm(WindowPtr window) {
EndUpdate(window); EndUpdate(window);
} }
struct do_text_args {
struct mac_session *s;
Rect textrect;
char *text;
int len;
unsigned long attr;
};
/* /*
* Call from the terminal emulator to draw a bit of text * Call from the terminal emulator to draw a bit of text
* *
@ -281,18 +290,24 @@ void do_text(struct mac_session *s, int x, int y, char *text, int len,
int style = 0; int style = 0;
int bgcolour, fgcolour; int bgcolour, fgcolour;
RGBColor rgbfore, rgbback; RGBColor rgbfore, rgbback;
Rect textrect; struct do_text_args a;
RgnHandle textrgn;
SetPort(s->window); SetPort(s->window);
/* First check this text is relevant */ /* First check this text is relevant */
textrect.top = y * font_height; a.textrect.top = y * font_height;
textrect.bottom = (y + 1) * font_height; a.textrect.bottom = (y + 1) * font_height;
textrect.left = x * font_width; a.textrect.left = x * font_width;
textrect.right = (x + len) * font_width; a.textrect.right = (x + len) * font_width;
if (!RectInRgn(&textrect, s->window->visRgn)) if (!RectInRgn(&a.textrect, s->window->visRgn))
return; return;
a.s = s;
a.text = text;
a.len = len;
a.attr = attr;
SetPort(s->window);
TextFont(s->fontnum); TextFont(s->fontnum);
if (cfg.fontisbold || (attr & ATTR_BOLD) && !cfg.bold_colour) if (cfg.fontisbold || (attr & ATTR_BOLD) && !cfg.bold_colour)
style |= bold; style |= bold;
@ -300,26 +315,46 @@ void do_text(struct mac_session *s, int x, int y, char *text, int len,
style |= underline; style |= underline;
TextFace(style); TextFace(style);
TextSize(cfg.fontheight); TextSize(cfg.fontheight);
if (attr & ATTR_REVERSE)
TextMode(notSrcCopy);
else
TextMode(srcCopy); TextMode(srcCopy);
if (attr & ATTR_REVERSE) { SetFractEnable(FALSE); /* We want characters on pixel boundaries */
bgcolour = ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT) * 2; textrgn = NewRgn();
fgcolour = ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT) * 2; RectRgn(textrgn, &a.textrect);
} else { DeviceLoop(textrgn, do_text_for_device, (long)&a, 0);
fgcolour = ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT) * 2; /* Tell the window manager about it in case this isn't an update */
bgcolour = ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT) * 2; DisposeRgn(textrgn);
ValidRect(&a.textrect);
} }
if ((attr & ATTR_BOLD) && cfg.bold_colour)
static pascal void do_text_for_device(short depth, short devflags,
GDHandle device, long cookie) {
struct do_text_args *a;
int bgcolour, fgcolour;
a = (struct do_text_args *)cookie;
switch (depth) {
case 1:
/* XXX This should be done with a _little_ more configurability */
ForeColor(whiteColor);
BackColor(blackColor);
break;
default:
fgcolour = ((a->attr & ATTR_FGMASK) >> ATTR_FGSHIFT) * 2;
bgcolour = ((a->attr & ATTR_BGMASK) >> ATTR_BGSHIFT) * 2;
if ((a->attr & ATTR_BOLD) && cfg.bold_colour)
if (a->attr & ATTR_REVERSE)
bgcolour++;
else
fgcolour++; fgcolour++;
/* RGBForeColor(&s->palette[fgcolour]); */ /* XXX Non-Color-QD version */
/* RGBBackColor(&s->palette[bgcolour]); */
PmForeColor(fgcolour); PmForeColor(fgcolour);
PmBackColor(bgcolour); PmBackColor(bgcolour);
SetFractEnable(FALSE); /* We want characters on pixel boundaries */ break;
MoveTo(textrect.left, textrect.top + s->font_ascent); }
DrawText(text, 0, len); MoveTo(a->textrect.left, a->textrect.top + a->s->font_ascent);
DrawText(a->text, 0, a->len);
/* Tell the window manager about it in case this isn't an update */
ValidRect(&textrect);
} }
/* /*
@ -351,7 +386,7 @@ void set_sbar(int total, int start, int page) {
SetControlMaximum(s->scrollbar, total - page); SetControlMaximum(s->scrollbar, total - page);
SetControlValue(s->scrollbar, start); SetControlValue(s->scrollbar, start);
#if 0 #if 0
/* XXX: This doesn't compile for me - bjh */ /* XXX: This doesn't link for me - bjh */
if (mac_gestalts.cntlattr & gestaltControlMgrPresent) if (mac_gestalts.cntlattr & gestaltControlMgrPresent)
SetControlViewSize(s->scrollbar, page); SetControlViewSize(s->scrollbar, page);
#endif #endif