comparison src/objects-tty.c @ 867:804517e16990

[xemacs-hg @ 2002-06-05 09:54:39 by ben] Textual renaming: text/char names abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, charset.h, chartab.c, chartab.h, cmds.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console-x.h, console.h, data.c, device-msw.c, device-x.c, dialog-msw.c, dired-msw.c, dired.c, doc.c, doprnt.c, editfns.c, eldap.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-unixoid.c, events.c, events.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, glyphs-eimage.c, glyphs-msw.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-x.c, gui-x.h, gui.c, gui.h, hpplay.c, indent.c, insdel.c, insdel.h, intl-win32.c, keymap.c, line-number.c, line-number.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, md5.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, ndir.h, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, procimpl.h, realpath.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, search.c, select-common.h, select-gtk.c, select-x.c, sound.h, symbols.c, syntax.c, syntax.h, sysdep.c, sysdep.h, sysdir.h, sysfile.h, sysproc.h, syspwd.h, systime.h, syswindows.h, termcap.c, tests.c, text.c, text.h, toolbar-common.c, tooltalk.c, ui-gtk.c, unexnt.c, unicode.c, win32.c: Text/char naming rationalization. [a] distinguish between "charptr" when it refers to operations on the pointer itself and when it refers to operations on text; and [b] use consistent naming for everything referring to internal format, i.e. Itext == text in internal format Ibyte == a byte in such text Ichar == a char as represented in internal character format thus e.g. set_charptr_emchar -> set_itext_ichar The pre and post tags on either side of this change are: pre-internal-format-textual-renaming post-internal-format-textual-renaming See the Internals Manual for details of exactly how this was done, how to handle the change in your workspace, etc.
author ben
date Wed, 05 Jun 2002 09:58:45 +0000
parents e38acbeb1cae
children 79c6ff3eef26
comparison
equal deleted inserted replaced
866:613552a02607 867:804517e16990
213 213
214 static int 214 static int
215 tty_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name, 215 tty_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name,
216 Lisp_Object device, Error_Behavior errb) 216 Lisp_Object device, Error_Behavior errb)
217 { 217 {
218 Intbyte *str = XSTRING_DATA (name); 218 Ibyte *str = XSTRING_DATA (name);
219 Lisp_Object charset = Qnil; 219 Lisp_Object charset = Qnil;
220 220
221 if (qxestrncmp_c (str, "normal", 6)) 221 if (qxestrncmp_c (str, "normal", 6))
222 return 0; 222 return 0;
223 str += 6; 223 str += 6;
280 280
281 #ifdef MULE 281 #ifdef MULE
282 282
283 static int 283 static int
284 tty_font_spec_matches_charset (struct device *d, Lisp_Object charset, 284 tty_font_spec_matches_charset (struct device *d, Lisp_Object charset,
285 const Intbyte *nonreloc, Lisp_Object reloc, 285 const Ibyte *nonreloc, Lisp_Object reloc,
286 Bytecount offset, Bytecount length) 286 Bytecount offset, Bytecount length)
287 { 287 {
288 const Intbyte *the_nonreloc = nonreloc; 288 const Ibyte *the_nonreloc = nonreloc;
289 289
290 if (!the_nonreloc) 290 if (!the_nonreloc)
291 the_nonreloc = XSTRING_DATA (reloc); 291 the_nonreloc = XSTRING_DATA (reloc);
292 fixup_internal_substring (nonreloc, reloc, offset, &length); 292 fixup_internal_substring (nonreloc, reloc, offset, &length);
293 the_nonreloc += offset; 293 the_nonreloc += offset;
294 294
295 if (UNBOUNDP (charset)) 295 if (UNBOUNDP (charset))
296 return !memchr (the_nonreloc, '/', length); 296 return !memchr (the_nonreloc, '/', length);
297 the_nonreloc = (const Intbyte *) memchr (the_nonreloc, '/', length); 297 the_nonreloc = (const Ibyte *) memchr (the_nonreloc, '/', length);
298 if (!the_nonreloc) 298 if (!the_nonreloc)
299 return 0; 299 return 0;
300 the_nonreloc++; 300 the_nonreloc++;
301 { 301 {
302 Lisp_Object s = symbol_name (XSYMBOL (XCHARSET_NAME (charset))); 302 Lisp_Object s = symbol_name (XSYMBOL (XCHARSET_NAME (charset)));
308 (the registry of) CHARSET. */ 308 (the registry of) CHARSET. */
309 static Lisp_Object 309 static Lisp_Object
310 tty_find_charset_font (Lisp_Object device, Lisp_Object font, 310 tty_find_charset_font (Lisp_Object device, Lisp_Object font,
311 Lisp_Object charset) 311 Lisp_Object charset)
312 { 312 {
313 Intbyte *fontname = XSTRING_DATA (font); 313 Ibyte *fontname = XSTRING_DATA (font);
314 314
315 if (strchr ((const char *) fontname, '/')) 315 if (strchr ((const char *) fontname, '/'))
316 { 316 {
317 if (tty_font_spec_matches_charset (XDEVICE (device), charset, 0, 317 if (tty_font_spec_matches_charset (XDEVICE (device), charset, 0,
318 font, 0, -1)) 318 font, 0, -1))