Replace "charactor" with "character" everywhere
This commit is contained in:
parent
5d9dae24c5
commit
f8cb1588ef
2
mc/mc.h
2
mc/mc.h
@ -67,7 +67,7 @@ struct mod
|
||||
int (*server_set_pen)(struct mod* v, int style,
|
||||
int width);
|
||||
int (*server_draw_line)(struct mod* v, int x1, int y1, int x2, int y2);
|
||||
int (*server_add_char)(struct mod* v, int font, int charactor,
|
||||
int (*server_add_char)(struct mod* v, int font, int character,
|
||||
int offset, int baseline,
|
||||
int width, int height, char* data);
|
||||
int (*server_draw_text)(struct mod* v, int font,
|
||||
|
@ -101,7 +101,7 @@ struct mod
|
||||
int (*server_set_pen)(struct mod* v, int style,
|
||||
int width);
|
||||
int (*server_draw_line)(struct mod* v, int x1, int y1, int x2, int y2);
|
||||
int (*server_add_char)(struct mod* v, int font, int charactor,
|
||||
int (*server_add_char)(struct mod* v, int font, int character,
|
||||
int offset, int baseline,
|
||||
int width, int height, char* data);
|
||||
int (*server_draw_text)(struct mod* v, int font,
|
||||
|
@ -292,7 +292,7 @@ struct mod
|
||||
int (*server_set_pen)(struct mod* v, int style,
|
||||
int width);
|
||||
int (*server_draw_line)(struct mod* v, int x1, int y1, int x2, int y2);
|
||||
int (*server_add_char)(struct mod* v, int font, int charactor,
|
||||
int (*server_add_char)(struct mod* v, int font, int character,
|
||||
int offset, int baseline,
|
||||
int width, int height, char* data);
|
||||
int (*server_draw_text)(struct mod* v, int font,
|
||||
|
@ -67,7 +67,7 @@ struct vnc
|
||||
int (*server_set_pen)(struct vnc* v, int style,
|
||||
int width);
|
||||
int (*server_draw_line)(struct vnc* v, int x1, int y1, int x2, int y2);
|
||||
int (*server_add_char)(struct vnc* v, int font, int charactor,
|
||||
int (*server_add_char)(struct vnc* v, int font, int character,
|
||||
int offset, int baseline,
|
||||
int width, int height, char* data);
|
||||
int (*server_draw_text)(struct vnc* v, int font,
|
||||
|
@ -582,10 +582,10 @@ rdpup_check_alpha_dirty(PixmapPtr pDirtyPixmap, rdpPixmapRec* pDirtyPriv);
|
||||
int
|
||||
rdpup_check_dirty_screen(rdpPixmapRec* pDirtyPriv);
|
||||
int
|
||||
rdpup_add_char(int font, int charactor, short x, short y, int cx, int cy,
|
||||
rdpup_add_char(int font, int character, short x, short y, int cx, int cy,
|
||||
char* bmpdata, int bmpdata_bytes);
|
||||
int
|
||||
rdpup_add_char_alpha(int font, int charactor, short x, short y, int cx, int cy,
|
||||
rdpup_add_char_alpha(int font, int character, short x, short y, int cx, int cy,
|
||||
char* bmpdata, int bmpdata_bytes);
|
||||
int
|
||||
rdpup_draw_text(int font, int flags, int mixmode,
|
||||
|
@ -2823,7 +2823,7 @@ rdpup_check_alpha_dirty(PixmapPtr pDirtyPixmap, rdpPixmapRec* pDirtyPriv)
|
||||
|
||||
/******************************************************************************/
|
||||
int
|
||||
rdpup_add_char(int font, int charactor, short x, short y, int cx, int cy,
|
||||
rdpup_add_char(int font, int character, short x, short y, int cx, int cy,
|
||||
char* bmpdata, int bmpdata_bytes)
|
||||
{
|
||||
if (g_connected)
|
||||
@ -2834,7 +2834,7 @@ rdpup_add_char(int font, int charactor, short x, short y, int cx, int cy,
|
||||
out_uint16_le(g_out_s, 18 + bmpdata_bytes); /* size */
|
||||
g_count++;
|
||||
out_uint16_le(g_out_s, font);
|
||||
out_uint16_le(g_out_s, charactor);
|
||||
out_uint16_le(g_out_s, character);
|
||||
out_uint16_le(g_out_s, x);
|
||||
out_uint16_le(g_out_s, y);
|
||||
out_uint16_le(g_out_s, cx);
|
||||
@ -2847,7 +2847,7 @@ rdpup_add_char(int font, int charactor, short x, short y, int cx, int cy,
|
||||
|
||||
/******************************************************************************/
|
||||
int
|
||||
rdpup_add_char_alpha(int font, int charactor, short x, short y, int cx, int cy,
|
||||
rdpup_add_char_alpha(int font, int character, short x, short y, int cx, int cy,
|
||||
char* bmpdata, int bmpdata_bytes)
|
||||
{
|
||||
if (g_connected)
|
||||
@ -2858,7 +2858,7 @@ rdpup_add_char_alpha(int font, int charactor, short x, short y, int cx, int cy,
|
||||
out_uint16_le(g_out_s, 18 + bmpdata_bytes); /* size */
|
||||
g_count++;
|
||||
out_uint16_le(g_out_s, font);
|
||||
out_uint16_le(g_out_s, charactor);
|
||||
out_uint16_le(g_out_s, character);
|
||||
out_uint16_le(g_out_s, x);
|
||||
out_uint16_le(g_out_s, y);
|
||||
out_uint16_le(g_out_s, cx);
|
||||
|
@ -444,7 +444,7 @@ server_set_pen(struct xrdp_mod* mod, int style, int width);
|
||||
int DEFAULT_CC
|
||||
server_draw_line(struct xrdp_mod* mod, int x1, int y1, int x2, int y2);
|
||||
int DEFAULT_CC
|
||||
server_add_char(struct xrdp_mod* mod, int font, int charactor,
|
||||
server_add_char(struct xrdp_mod* mod, int font, int character,
|
||||
int offset, int baseline,
|
||||
int width, int height, char* data);
|
||||
int DEFAULT_CC
|
||||
@ -509,6 +509,6 @@ server_monitored_desktop(struct xrdp_mod* mod,
|
||||
struct rail_monitored_desktop_order* mdo,
|
||||
int flags);
|
||||
int DEFAULT_CC
|
||||
server_add_char_alpha(struct xrdp_mod* mod, int font, int charactor,
|
||||
server_add_char_alpha(struct xrdp_mod* mod, int font, int character,
|
||||
int offset, int baseline,
|
||||
int width, int height, char* data);
|
||||
|
@ -2833,7 +2833,7 @@ server_draw_line(struct xrdp_mod *mod, int x1, int y1, int x2, int y2)
|
||||
|
||||
/*****************************************************************************/
|
||||
int DEFAULT_CC
|
||||
server_add_char(struct xrdp_mod *mod, int font, int charactor,
|
||||
server_add_char(struct xrdp_mod *mod, int font, int character,
|
||||
int offset, int baseline,
|
||||
int width, int height, char *data)
|
||||
{
|
||||
@ -2847,7 +2847,7 @@ server_add_char(struct xrdp_mod *mod, int font, int charactor,
|
||||
fi.data = data;
|
||||
fi.bpp = 1;
|
||||
return libxrdp_orders_send_font(((struct xrdp_wm *)mod->wm)->session,
|
||||
&fi, font, charactor);
|
||||
&fi, font, character);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
@ -3470,7 +3470,7 @@ server_monitored_desktop(struct xrdp_mod *mod,
|
||||
|
||||
/*****************************************************************************/
|
||||
int DEFAULT_CC
|
||||
server_add_char_alpha(struct xrdp_mod* mod, int font, int charactor,
|
||||
server_add_char_alpha(struct xrdp_mod* mod, int font, int character,
|
||||
int offset, int baseline,
|
||||
int width, int height, char* data)
|
||||
{
|
||||
@ -3484,5 +3484,5 @@ server_add_char_alpha(struct xrdp_mod* mod, int font, int charactor,
|
||||
fi.data = data;
|
||||
fi.bpp = 8;
|
||||
return libxrdp_orders_send_font(((struct xrdp_wm*)mod->wm)->session,
|
||||
&fi, font, charactor);
|
||||
&fi, font, character);
|
||||
}
|
||||
|
@ -75,7 +75,7 @@ struct xrdp_mod
|
||||
int (*server_set_pen)(struct xrdp_mod* v, int style,
|
||||
int width);
|
||||
int (*server_draw_line)(struct xrdp_mod* v, int x1, int y1, int x2, int y2);
|
||||
int (*server_add_char)(struct xrdp_mod* v, int font, int charactor,
|
||||
int (*server_add_char)(struct xrdp_mod* v, int font, int character,
|
||||
int offset, int baseline,
|
||||
int width, int height, char* data);
|
||||
int (*server_draw_text)(struct xrdp_mod* v, int font,
|
||||
@ -125,7 +125,7 @@ struct xrdp_mod
|
||||
int flags);
|
||||
int (*server_set_pointer_ex)(struct xrdp_mod* v, int x, int y, char* data,
|
||||
char* mask, int bpp);
|
||||
int (*server_add_char_alpha)(struct xrdp_mod* mod, int font, int charactor,
|
||||
int (*server_add_char_alpha)(struct xrdp_mod* mod, int font, int character,
|
||||
int offset, int baseline,
|
||||
int width, int height, char* data);
|
||||
|
||||
|
12
xup/xup.c
12
xup/xup.c
@ -797,7 +797,7 @@ process_server_add_char(struct mod *mod, struct stream *s)
|
||||
{
|
||||
int rv;
|
||||
int font;
|
||||
int charactor;
|
||||
int character;
|
||||
int x;
|
||||
int y;
|
||||
int cx;
|
||||
@ -806,14 +806,14 @@ process_server_add_char(struct mod *mod, struct stream *s)
|
||||
char *bmpdata;
|
||||
|
||||
in_uint16_le(s, font);
|
||||
in_uint16_le(s, charactor);
|
||||
in_uint16_le(s, character);
|
||||
in_sint16_le(s, x);
|
||||
in_sint16_le(s, y);
|
||||
in_uint16_le(s, cx);
|
||||
in_uint16_le(s, cy);
|
||||
in_uint16_le(s, len_bmpdata);
|
||||
in_uint8p(s, bmpdata, len_bmpdata);
|
||||
rv = mod->server_add_char(mod, font, charactor, x, y, cx, cy, bmpdata);
|
||||
rv = mod->server_add_char(mod, font, character, x, y, cx, cy, bmpdata);
|
||||
return rv;
|
||||
}
|
||||
|
||||
@ -825,7 +825,7 @@ process_server_add_char_alpha(struct mod *mod, struct stream *s)
|
||||
{
|
||||
int rv;
|
||||
int font;
|
||||
int charactor;
|
||||
int character;
|
||||
int x;
|
||||
int y;
|
||||
int cx;
|
||||
@ -834,14 +834,14 @@ process_server_add_char_alpha(struct mod *mod, struct stream *s)
|
||||
char *bmpdata;
|
||||
|
||||
in_uint16_le(s, font);
|
||||
in_uint16_le(s, charactor);
|
||||
in_uint16_le(s, character);
|
||||
in_sint16_le(s, x);
|
||||
in_sint16_le(s, y);
|
||||
in_uint16_le(s, cx);
|
||||
in_uint16_le(s, cy);
|
||||
in_uint16_le(s, len_bmpdata);
|
||||
in_uint8p(s, bmpdata, len_bmpdata);
|
||||
rv = mod->server_add_char_alpha(mod, font, charactor, x, y, cx, cy,
|
||||
rv = mod->server_add_char_alpha(mod, font, character, x, y, cx, cy,
|
||||
bmpdata);
|
||||
return rv;
|
||||
}
|
||||
|
@ -71,7 +71,7 @@ struct mod
|
||||
int (*server_set_pen)(struct mod* v, int style,
|
||||
int width);
|
||||
int (*server_draw_line)(struct mod* v, int x1, int y1, int x2, int y2);
|
||||
int (*server_add_char)(struct mod* v, int font, int charactor,
|
||||
int (*server_add_char)(struct mod* v, int font, int character,
|
||||
int offset, int baseline,
|
||||
int width, int height, char* data);
|
||||
int (*server_draw_text)(struct mod* v, int font,
|
||||
@ -121,7 +121,7 @@ struct mod
|
||||
int flags);
|
||||
int (*server_set_cursor_ex)(struct mod* v, int x, int y, char* data,
|
||||
char* mask, int bpp);
|
||||
int (*server_add_char_alpha)(struct mod* v, int font, int charactor,
|
||||
int (*server_add_char_alpha)(struct mod* v, int font, int character,
|
||||
int offset, int baseline,
|
||||
int width, int height, char* data);
|
||||
int (*server_create_os_surface_bpp)(struct mod* v, int rdpindex,
|
||||
|
Loading…
Reference in New Issue
Block a user