}
void
-spice_screen_draw_char(SpiceScreen *spice_screen, int x, int y, gunichar ch, TextAttributes attrib)
+spice_screen_draw_char(SpiceScreen *spice_screen, int x, int y, gunichar2 ch, TextAttributes attrib)
{
int fg, bg;
/* Convert UCS2 to UTF8 sequence, trailing zero */
/*
static int
-ucs2_to_utf8 (unicode c, char *out)
+ucs2_to_utf8 (gunichar2 c, char *out)
{
if (c < 0x80) {
out[0] = c; // 0*******
*/
static void
-draw_char_at (spiceTerm *vt, int x, int y, unicode ch, TextAttributes attrib)
+draw_char_at (spiceTerm *vt, int x, int y, gunichar2 ch, TextAttributes attrib)
{
if (x < 0 || y < 0 || x >= vt->width || y >= vt->height) {
return;
ESpalette, ESidquery, ESosc1, ESosc2};
static void
-spiceterm_putchar (spiceTerm *vt, unicode ch)
+spiceterm_putchar (spiceTerm *vt, gunichar2 ch)
{
int x, y, i, c;
static int
spiceterm_puts (spiceTerm *vt, const char *buf, int len)
{
- unicode tc;
+ gunichar2 tc;
spiceterm_show_cursor (vt, 0);
// seems str is Latin-1 encoded
if (vt->selection) free (vt->selection);
- vt->selection = (unicode *)malloc (len*sizeof (unicode));
+ vt->selection = (gunichar2 *)malloc (len*sizeof (gunichar2));
int i;
for (i = 0; i < len; i++) {
vt->selection[i] = str[i] & 0xff;
int len = sel_end_pos - sel_start_pos + 1;
if (vt->selection) free (vt->selection);
- vt->selection = (unicode *)malloc (len*sizeof (unicode));
+ vt->selection = (gunichar2 *)malloc (len*sizeof (gunichar2));
vt->selection_len = len;
char *sel_latin1 = (char *)malloc (len + 1);
#define IBUFSIZE 1024
#define MAX_ESC_PARAMS 16
-typedef unsigned short unicode; // fixme
+//typedef unsigned short unicode; // fixme
typedef struct TextAttributes {
unsigned int fgcol:4;
} TextAttributes;
typedef struct TextCell {
- unicode ch;
+ gunichar2 ch;
TextAttributes attrib;
} TextCell;
void spice_screen_add_display_interface(SpiceScreen *spice_screen);
void spice_screen_add_agent_interface(SpiceServer *server);
-void spice_screen_draw_char(SpiceScreen *spice_screen, int x, int y, gunichar ch, TextAttributes attrib);
+void spice_screen_draw_char(SpiceScreen *spice_screen, int x, int y, gunichar2 ch, TextAttributes attrib);
void spice_screen_scroll(SpiceScreen *spice_screen, int x1, int y1, int x2, int y2, int src_x, int src_y);
void spice_screen_clear(SpiceScreen *spice_screen, int x1, int y1, int x2, int y2);
char ibuf[IBUFSIZE];
int ibuf_count;
- unicode *selection;
+ gunichar2 *selection;
int selection_len;
unsigned int mark_active:1;