Mercurial > hg > xemacs-beta

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 6728e641994e
children 79c6ff3eef26
comparison
equal deleted inserted replaced
866:613552a02607 867:804517e16990
811 811
812 for (i = FONT_INSTANCE_X_FONT (f)->n_properties - 1; i >= 0; i--) 812 for (i = FONT_INSTANCE_X_FONT (f)->n_properties - 1; i >= 0; i--)
813 { 813 {
814 Lisp_Object name, value; 814 Lisp_Object name, value;
815 Atom atom = props [i].name; 815 Atom atom = props [i].name;
816 Intbyte *name_str = 0; 816 Ibyte *name_str = 0;
817 Bytecount name_len; 817 Bytecount name_len;
818 Extbyte *namestrext = XGetAtomName (dpy, atom); 818 Extbyte *namestrext = XGetAtomName (dpy, atom);
819 819
820 if (namestrext) 820 if (namestrext)
821 TO_INTERNAL_FORMAT (C_STRING, namestrext, 821 TO_INTERNAL_FORMAT (C_STRING, namestrext,
881 881
882 #ifdef MULE 882 #ifdef MULE
883 883
884 static int 884 static int
885 x_font_spec_matches_charset (struct device *d, Lisp_Object charset, 885 x_font_spec_matches_charset (struct device *d, Lisp_Object charset,
886 const Intbyte *nonreloc, Lisp_Object reloc, 886 const Ibyte *nonreloc, Lisp_Object reloc,
887 Bytecount offset, Bytecount length) 887 Bytecount offset, Bytecount length)
888 { 888 {
889 if (UNBOUNDP (charset)) 889 if (UNBOUNDP (charset))
890 return 1; 890 return 1;
891 /* Hack! Short font names don't have the registry in them, 891 /* Hack! Short font names don't have the registry in them,
893 case of ASCII. For other charsets, you gotta give the 893 case of ASCII. For other charsets, you gotta give the
894 long form; sorry buster. 894 long form; sorry buster.
895 */ 895 */
896 if (EQ (charset, Vcharset_ascii)) 896 if (EQ (charset, Vcharset_ascii))
897 { 897 {
898 const Intbyte *the_nonreloc = nonreloc; 898 const Ibyte *the_nonreloc = nonreloc;
899 int i; 899 int i;
900 Bytecount the_length = length; 900 Bytecount the_length = length;
901 901
902 if (!the_nonreloc) 902 if (!the_nonreloc)
903 the_nonreloc = XSTRING_DATA (reloc); 903 the_nonreloc = XSTRING_DATA (reloc);
905 the_nonreloc += offset; 905 the_nonreloc += offset;
906 if (!memchr (the_nonreloc, '*', the_length)) 906 if (!memchr (the_nonreloc, '*', the_length))
907 { 907 {
908 for (i = 0;; i++) 908 for (i = 0;; i++)
909 { 909 {
910 const Intbyte *new_nonreloc = (const Intbyte *) 910 const Ibyte *new_nonreloc = (const Ibyte *)
911 memchr (the_nonreloc, '-', the_length); 911 memchr (the_nonreloc, '-', the_length);
912 if (!new_nonreloc) 912 if (!new_nonreloc)
913 break; 913 break;
914 new_nonreloc++; 914 new_nonreloc++;
915 the_length -= new_nonreloc - the_nonreloc; 915 the_length -= new_nonreloc - the_nonreloc;
946 names = XListFonts (DEVICE_X_DISPLAY (XDEVICE (device)), 946 names = XListFonts (DEVICE_X_DISPLAY (XDEVICE (device)),
947 patternext, MAX_FONT_COUNT, &count); 947 patternext, MAX_FONT_COUNT, &count);
948 /* #### This code seems awfully bogus -- mrb */ 948 /* #### This code seems awfully bogus -- mrb */
949 for (i = 0; i < count; i ++) 949 for (i = 0; i < count; i ++)
950 { 950 {
951 const Intbyte *intname; 951 const Ibyte *intname;
952 Bytecount intlen; 952 Bytecount intlen;
953 953
954 TO_INTERNAL_FORMAT (C_STRING, names[i], 954 TO_INTERNAL_FORMAT (C_STRING, names[i],
955 ALLOCA, (intname, intlen), 955 ALLOCA, (intname, intlen),
956 Qx_font_name_encoding); 956 Qx_font_name_encoding);