mirrors
/
xrdp
mirror of https://github.com/neutrinolabs/xrdp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace "charactor" with "character" everywhere

This commit is contained in:
Pavel Roskin 2016-01-30 17:33:04 -08:00
parent 5d9dae24c5
commit f8cb1588ef
12 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mc/mc.h
View File

@ -67,7 +67,7 @@ struct mod
int (*server_set_pen)(struct mod* v, int style, int (*server_set_pen)(struct mod* v, int style,
int width); int width);
int (*server_draw_line)(struct mod* v, int x1, int y1, int x2, int y2); 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 offset, int baseline,
int width, int height, char* data); int width, int height, char* data);
int (*server_draw_text)(struct mod* v, int font, int (*server_draw_text)(struct mod* v, int font,

2
neutrinordp/xrdp-neutrinordp.h
View File

@ -101,7 +101,7 @@ struct mod
int (*server_set_pen)(struct mod* v, int style, int (*server_set_pen)(struct mod* v, int style,
int width); int width);
int (*server_draw_line)(struct mod* v, int x1, int y1, int x2, int y2); 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 offset, int baseline,
int width, int height, char* data); int width, int height, char* data);
int (*server_draw_text)(struct mod* v, int font, int (*server_draw_text)(struct mod* v, int font,

2
rdp/rdp.h
View File

@ -292,7 +292,7 @@ struct mod
int (*server_set_pen)(struct mod* v, int style, int (*server_set_pen)(struct mod* v, int style,
int width); int width);
int (*server_draw_line)(struct mod* v, int x1, int y1, int x2, int y2); 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 offset, int baseline,
int width, int height, char* data); int width, int height, char* data);
int (*server_draw_text)(struct mod* v, int font, int (*server_draw_text)(struct mod* v, int font,

2
vnc/vnc.h
View File

@ -67,7 +67,7 @@ struct vnc
int (*server_set_pen)(struct vnc* v, int style, int (*server_set_pen)(struct vnc* v, int style,
int width); int width);
int (*server_draw_line)(struct vnc* v, int x1, int y1, int x2, int y2); 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 offset, int baseline,
int width, int height, char* data); int width, int height, char* data);
int (*server_draw_text)(struct vnc* v, int font, int (*server_draw_text)(struct vnc* v, int font,

4
xorg/X11R7.6/rdp/rdp.h
View File

@ -582,10 +582,10 @@ rdpup_check_alpha_dirty(PixmapPtr pDirtyPixmap, rdpPixmapRec* pDirtyPriv);
int int
rdpup_check_dirty_screen(rdpPixmapRec* pDirtyPriv); rdpup_check_dirty_screen(rdpPixmapRec* pDirtyPriv);
int 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); char* bmpdata, int bmpdata_bytes);
int 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); char* bmpdata, int bmpdata_bytes);
int int
rdpup_draw_text(int font, int flags, int mixmode, rdpup_draw_text(int font, int flags, int mixmode,

8
xorg/X11R7.6/rdp/rdpup.c
View File

@ -2823,7 +2823,7 @@ rdpup_check_alpha_dirty(PixmapPtr pDirtyPixmap, rdpPixmapRec* pDirtyPriv)
/******************************************************************************/ /******************************************************************************/
int 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) char* bmpdata, int bmpdata_bytes)
{ {
if (g_connected) 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 */ out_uint16_le(g_out_s, 18 + bmpdata_bytes); /* size */
g_count++; g_count++;
out_uint16_le(g_out_s, font); 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, x);
out_uint16_le(g_out_s, y); out_uint16_le(g_out_s, y);
out_uint16_le(g_out_s, cx); 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 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) char* bmpdata, int bmpdata_bytes)
{ {
if (g_connected) 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 */ out_uint16_le(g_out_s, 18 + bmpdata_bytes); /* size */
g_count++; g_count++;
out_uint16_le(g_out_s, font); 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, x);
out_uint16_le(g_out_s, y); out_uint16_le(g_out_s, y);
out_uint16_le(g_out_s, cx); out_uint16_le(g_out_s, cx);

4
xrdp/xrdp.h
View File

@ -444,7 +444,7 @@ server_set_pen(struct xrdp_mod* mod, int style, int width);
int DEFAULT_CC int DEFAULT_CC
server_draw_line(struct xrdp_mod* mod, int x1, int y1, int x2, int y2); server_draw_line(struct xrdp_mod* mod, int x1, int y1, int x2, int y2);
int DEFAULT_CC 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 offset, int baseline,
int width, int height, char* data); int width, int height, char* data);
int DEFAULT_CC int DEFAULT_CC
@ -509,6 +509,6 @@ server_monitored_desktop(struct xrdp_mod* mod,
struct rail_monitored_desktop_order* mdo, struct rail_monitored_desktop_order* mdo,
int flags); int flags);
int DEFAULT_CC 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 offset, int baseline,
int width, int height, char* data); int width, int height, char* data);

8
xrdp/xrdp_mm.c
View File

@ -2833,7 +2833,7 @@ server_draw_line(struct xrdp_mod *mod, int x1, int y1, int x2, int y2)
/*****************************************************************************/ /*****************************************************************************/
int DEFAULT_CC 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 offset, int baseline,
int width, int height, char *data) 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.data = data;
fi.bpp = 1; fi.bpp = 1;
return libxrdp_orders_send_font(((struct xrdp_wm *)mod->wm)->session, 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 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 offset, int baseline,
int width, int height, char* data) 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.data = data;
fi.bpp = 8; fi.bpp = 8;
return libxrdp_orders_send_font(((struct xrdp_wm*)mod->wm)->session, return libxrdp_orders_send_font(((struct xrdp_wm*)mod->wm)->session,
&fi, font, charactor); &fi, font, character);
} }

4
xrdp/xrdp_types.h
View File

@ -75,7 +75,7 @@ struct xrdp_mod
int (*server_set_pen)(struct xrdp_mod* v, int style, int (*server_set_pen)(struct xrdp_mod* v, int style,
int width); int width);
int (*server_draw_line)(struct xrdp_mod* v, int x1, int y1, int x2, int y2); 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 offset, int baseline,
int width, int height, char* data); int width, int height, char* data);
int (*server_draw_text)(struct xrdp_mod* v, int font, int (*server_draw_text)(struct xrdp_mod* v, int font,
@ -125,7 +125,7 @@ struct xrdp_mod
int flags); int flags);
int (*server_set_pointer_ex)(struct xrdp_mod* v, int x, int y, char* data, int (*server_set_pointer_ex)(struct xrdp_mod* v, int x, int y, char* data,
char* mask, int bpp); 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 offset, int baseline,
int width, int height, char* data); int width, int height, char* data);

12
xup/xup.c
View File

@ -797,7 +797,7 @@ process_server_add_char(struct mod *mod, struct stream *s)
{ {
int rv; int rv;
int font; int font;
int charactor; int character;
int x; int x;
int y; int y;
int cx; int cx;
@ -806,14 +806,14 @@ process_server_add_char(struct mod *mod, struct stream *s)
char *bmpdata; char *bmpdata;
in_uint16_le(s, font); in_uint16_le(s, font);
in_uint16_le(s, charactor); in_uint16_le(s, character);
in_sint16_le(s, x); in_sint16_le(s, x);
in_sint16_le(s, y); in_sint16_le(s, y);
in_uint16_le(s, cx); in_uint16_le(s, cx);
in_uint16_le(s, cy); in_uint16_le(s, cy);
in_uint16_le(s, len_bmpdata); in_uint16_le(s, len_bmpdata);
in_uint8p(s, bmpdata, 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; return rv;
} }
@ -825,7 +825,7 @@ process_server_add_char_alpha(struct mod *mod, struct stream *s)
{ {
int rv; int rv;
int font; int font;
int charactor; int character;
int x; int x;
int y; int y;
int cx; int cx;
@ -834,14 +834,14 @@ process_server_add_char_alpha(struct mod *mod, struct stream *s)
char *bmpdata; char *bmpdata;
in_uint16_le(s, font); in_uint16_le(s, font);
in_uint16_le(s, charactor); in_uint16_le(s, character);
in_sint16_le(s, x); in_sint16_le(s, x);
in_sint16_le(s, y); in_sint16_le(s, y);
in_uint16_le(s, cx); in_uint16_le(s, cx);
in_uint16_le(s, cy); in_uint16_le(s, cy);
in_uint16_le(s, len_bmpdata); in_uint16_le(s, len_bmpdata);
in_uint8p(s, bmpdata, 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); bmpdata);
return rv; return rv;
} }

4
xup/xup.h
View File

@ -71,7 +71,7 @@ struct mod
int (*server_set_pen)(struct mod* v, int style, int (*server_set_pen)(struct mod* v, int style,
int width); int width);
int (*server_draw_line)(struct mod* v, int x1, int y1, int x2, int y2); 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 offset, int baseline,
int width, int height, char* data); int width, int height, char* data);
int (*server_draw_text)(struct mod* v, int font, int (*server_draw_text)(struct mod* v, int font,
@ -121,7 +121,7 @@ struct mod
int flags); int flags);
int (*server_set_cursor_ex)(struct mod* v, int x, int y, char* data, int (*server_set_cursor_ex)(struct mod* v, int x, int y, char* data,
char* mask, int bpp); 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 offset, int baseline,
int width, int height, char* data); int width, int height, char* data);
int (*server_create_os_surface_bpp)(struct mod* v, int rdpindex, int (*server_create_os_surface_bpp)(struct mod* v, int rdpindex,