nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00
Code Issues Projects Releases Wiki Activity

Rename CharWidth() to char_width(). The former name clashes with an API

Browse Source 
function in Mac OS.

[originally from svn r2205]
This commit is contained in:
Ben Harris 2002-11-09 21:46:21 +00:00
parent a1125a8052
commit a12a78bcb9
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
putty.h
View File

@ -403,7 +403,7 @@ struct RSAKey; /* be a little careful of scope */
void request_resize(void *frontend, int, int); void request_resize(void *frontend, int, int);
void do_text(Context, int, int, char *, int, unsigned long, int); void do_text(Context, int, int, char *, int, unsigned long, int);
void do_cursor(Context, int, int, char *, int, unsigned long, int); void do_cursor(Context, int, int, char *, int, unsigned long, int);
int CharWidth(Context ctx, int uc); int char_width(Context ctx, int uc);
void set_title(void *frontend, char *); void set_title(void *frontend, char *);
void set_icon(void *frontend, char *); void set_icon(void *frontend, char *);
void set_sbar(void *frontend, int, int, int); void set_sbar(void *frontend, int, int, int);

2
terminal.c
View File

@ -2983,7 +2983,7 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
*/ */
if ((tchar | tattr) != (term->disptext[idx]& ~ATTR_NARROW)) { if ((tchar | tattr) != (term->disptext[idx]& ~ATTR_NARROW)) {
if ((tattr & ATTR_WIDE) == 0 && if ((tattr & ATTR_WIDE) == 0 &&
CharWidth(ctx, (tchar | tattr) & 0xFFFF) == 2) char_width(ctx, (tchar | tattr) & 0xFFFF) == 2)
tattr |= ATTR_NARROW; tattr |= ATTR_NARROW;
} else if (term->disptext[idx]&ATTR_NARROW) } else if (term->disptext[idx]&ATTR_NARROW)
tattr |= ATTR_NARROW; tattr |= ATTR_NARROW;

2
unix/pterm.c
View File

@ -1352,7 +1352,7 @@ void beep(void *frontend, int mode)
gdk_beep(); gdk_beep();
} }
int CharWidth(Context ctx, int uc) int char_width(Context ctx, int uc)
{ {
/* /*
* Under X, any fixed-width font really _is_ fixed-width. * Under X, any fixed-width font really _is_ fixed-width.

2
window.c
View File

@ -2997,7 +2997,7 @@ void do_cursor(Context ctx, int x, int y, char *text, int len,
/* This function gets the actual width of a character in the normal font. /* This function gets the actual width of a character in the normal font.
*/ */
int CharWidth(Context ctx, int uc) { int char_width(Context ctx, int uc) {
HDC hdc = ctx; HDC hdc = ctx;
int ibuf = 0; int ibuf = 0;