comparison src/objects-gtk.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 a5954632b187
children 79c6ff3eef26
comparison
equal deleted inserted replaced
866:613552a02607 867:804517e16990
70 70
71 return (0); 71 return (0);
72 } 72 }
73 73
74 int 74 int
75 gtk_parse_nearest_color (struct device *d, GdkColor *color, Intbyte *name, 75 gtk_parse_nearest_color (struct device *d, GdkColor *color, Ibyte *name,
76 Bytecount len, Error_Behavior errb) 76 Bytecount len, Error_Behavior errb)
77 { 77 {
78 GdkColormap *cmap; 78 GdkColormap *cmap;
79 GdkVisual *visual; 79 GdkVisual *visual;
80 int result; 80 int result;
377 377
378 #ifdef MULE 378 #ifdef MULE
379 379
380 static int 380 static int
381 gtk_font_spec_matches_charset (struct device *d, Lisp_Object charset, 381 gtk_font_spec_matches_charset (struct device *d, Lisp_Object charset,
382 const Intbyte *nonreloc, Lisp_Object reloc, 382 const Ibyte *nonreloc, Lisp_Object reloc,
383 Bytecount offset, Bytecount length) 383 Bytecount offset, Bytecount length)
384 { 384 {
385 if (UNBOUNDP (charset)) 385 if (UNBOUNDP (charset))
386 return 1; 386 return 1;
387 /* Hack! Short font names don't have the registry in them, 387 /* Hack! Short font names don't have the registry in them,
389 case of ASCII. For other charsets, you gotta give the 389 case of ASCII. For other charsets, you gotta give the
390 long form; sorry buster. 390 long form; sorry buster.
391 */ 391 */
392 if (EQ (charset, Vcharset_ascii)) 392 if (EQ (charset, Vcharset_ascii))
393 { 393 {
394 const Intbyte *the_nonreloc = nonreloc; 394 const Ibyte *the_nonreloc = nonreloc;
395 int i; 395 int i;
396 Bytecount the_length = length; 396 Bytecount the_length = length;
397 397
398 if (!the_nonreloc) 398 if (!the_nonreloc)
399 the_nonreloc = XSTRING_DATA (reloc); 399 the_nonreloc = XSTRING_DATA (reloc);
401 the_nonreloc += offset; 401 the_nonreloc += offset;
402 if (!memchr (the_nonreloc, '*', the_length)) 402 if (!memchr (the_nonreloc, '*', the_length))
403 { 403 {
404 for (i = 0;; i++) 404 for (i = 0;; i++)
405 { 405 {
406 const Intbyte *new_nonreloc = (const Intbyte *) 406 const Ibyte *new_nonreloc = (const Ibyte *)
407 memchr (the_nonreloc, '-', the_length); 407 memchr (the_nonreloc, '-', the_length);
408 if (!new_nonreloc) 408 if (!new_nonreloc)
409 break; 409 break;
410 new_nonreloc++; 410 new_nonreloc++;
411 the_length -= new_nonreloc - the_nonreloc; 411 the_length -= new_nonreloc - the_nonreloc;
497 names = XListFonts (GDK_DISPLAY (), 497 names = XListFonts (GDK_DISPLAY (),
498 patternext, MAX_FONT_COUNT, &count); 498 patternext, MAX_FONT_COUNT, &count);
499 /* #### This code seems awfully bogus -- mrb */ 499 /* #### This code seems awfully bogus -- mrb */
500 for (i = 0; i < count; i ++) 500 for (i = 0; i < count; i ++)
501 { 501 {
502 const Intbyte *intname; 502 const Ibyte *intname;
503 Bytecount intlen; 503 Bytecount intlen;
504 504
505 TO_INTERNAL_FORMAT (C_STRING, names[i], ALLOCA, (intname, intlen), 505 TO_INTERNAL_FORMAT (C_STRING, names[i], ALLOCA, (intname, intlen),
506 Qctext); 506 Qctext);
507 if (gtk_font_spec_matches_charset (XDEVICE (device), charset, 507 if (gtk_font_spec_matches_charset (XDEVICE (device), charset,