#include "objects-tty.h"
#ifdef MULE
#include "device.h"
-#include "mule-charset.h"
+#include "character.h"
#endif
/* An alist mapping from color names to a cons of (FG-STRING, BG-STRING). */
#endif /* 0 */
static int
-tty_initialize_color_instance (struct Lisp_Color_Instance *c, Lisp_Object name,
+tty_initialize_color_instance (Lisp_Color_Instance *c, Lisp_Object name,
Lisp_Object device, Error_behavior errb)
{
Lisp_Object result;
}
static void
-tty_mark_color_instance (struct Lisp_Color_Instance *c)
+tty_mark_color_instance (Lisp_Color_Instance *c)
{
mark_object (COLOR_INSTANCE_TTY_SYMBOL (c));
}
static void
-tty_print_color_instance (struct Lisp_Color_Instance *c,
+tty_print_color_instance (Lisp_Color_Instance *c,
Lisp_Object printcharfun,
int escapeflag)
{
}
static void
-tty_finalize_color_instance (struct Lisp_Color_Instance *c)
+tty_finalize_color_instance (Lisp_Color_Instance *c)
{
if (c->data)
xfree (c->data);
}
static int
-tty_color_instance_equal (struct Lisp_Color_Instance *c1,
- struct Lisp_Color_Instance *c2,
+tty_color_instance_equal (Lisp_Color_Instance *c1,
+ Lisp_Color_Instance *c2,
int depth)
{
return (EQ (COLOR_INSTANCE_TTY_SYMBOL (c1),
}
static unsigned long
-tty_color_instance_hash (struct Lisp_Color_Instance *c, int depth)
+tty_color_instance_hash (Lisp_Color_Instance *c, int depth)
{
return LISP_HASH (COLOR_INSTANCE_TTY_SYMBOL (c));
}
\f
static int
-tty_initialize_font_instance (struct Lisp_Font_Instance *f, Lisp_Object name,
+tty_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name,
Lisp_Object device, Error_behavior errb)
{
Bufbyte *str = XSTRING_DATA (name);
Lisp_Object charset = Qnil;
- if (strncmp ((CONST char *) str, "normal", 6))
+ if (strncmp ((const char *) str, "normal", 6))
return 0;
str += 6;
if (*str)
if (*str != '/')
return 0;
str++;
- charset = Ffind_charset (intern ((CONST char *) str));
+ charset = Ffind_charset (intern ((const char *) str));
if (NILP (charset))
return 0;
#else
FONT_INSTANCE_TTY_CHARSET (f) = charset;
#ifdef MULE
if (CHARSETP (charset))
- f->width = XCHARSET_COLUMNS (charset);
+ f->width = CHARSET_COLUMNS (XCHARSET (charset));
else
#endif
f->width = 1;
}
static void
-tty_mark_font_instance (struct Lisp_Font_Instance *f)
+tty_mark_font_instance (Lisp_Font_Instance *f)
{
mark_object (FONT_INSTANCE_TTY_CHARSET (f));
}
static void
-tty_print_font_instance (struct Lisp_Font_Instance *f,
+tty_print_font_instance (Lisp_Font_Instance *f,
Lisp_Object printcharfun,
int escapeflag)
{
}
static void
-tty_finalize_font_instance (struct Lisp_Font_Instance *f)
+tty_finalize_font_instance (Lisp_Font_Instance *f)
{
if (f->data)
xfree (f->data);
static int
tty_font_spec_matches_charset (struct device *d, Lisp_Object charset,
- CONST Bufbyte *nonreloc, Lisp_Object reloc,
+ const Bufbyte *nonreloc, Lisp_Object reloc,
Bytecount offset, Bytecount length)
{
- CONST Bufbyte *the_nonreloc = nonreloc;
+ const Bufbyte *the_nonreloc = nonreloc;
if (!the_nonreloc)
the_nonreloc = XSTRING_DATA (reloc);
if (UNBOUNDP (charset))
return !memchr (the_nonreloc, '/', length);
- the_nonreloc = (CONST Bufbyte *) memchr (the_nonreloc, '/', length);
+ the_nonreloc = (const Bufbyte *) memchr (the_nonreloc, '/', length);
if (!the_nonreloc)
return 0;
the_nonreloc++;
{
- struct Lisp_String *s = symbol_name (XSYMBOL (XCHARSET_NAME (charset)));
- return !strcmp ((CONST char *) the_nonreloc,
- (CONST char *) string_data (s));
+ Lisp_String *s = symbol_name (XSYMBOL (XCHARSET_NAME (charset)));
+ return !strcmp ((const char *) the_nonreloc,
+ (const char *) string_data (s));
}
}
{
Bufbyte *fontname = XSTRING_DATA (font);
- if (strchr ((CONST char *) fontname, '/'))
+ if (strchr ((const char *) fontname, '/'))
{
if (tty_font_spec_matches_charset (XDEVICE (device), charset, 0,
font, 0, -1))