comparison src/glyphs-x.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 42375619fa45
children 79c6ff3eef26
comparison
equal deleted inserted replaced
866:613552a02607 867:804517e16990
581 /* We only check the bitmapFilePath resource on the original X device. */ 581 /* We only check the bitmapFilePath resource on the original X device. */
582 display = DEVICE_X_DISPLAY (XDEVICE (Vdefault_x_device)); 582 display = DEVICE_X_DISPLAY (XDEVICE (Vdefault_x_device));
583 583
584 #ifdef USE_XBMLANGPATH 584 #ifdef USE_XBMLANGPATH
585 { 585 {
586 Intbyte *path = egetenv ("XBMLANGPATH"); 586 Ibyte *path = egetenv ("XBMLANGPATH");
587 Extbyte *pathext; 587 Extbyte *pathext;
588 SubstitutionRec subs[1]; 588 SubstitutionRec subs[1];
589 subs[0].match = 'B'; 589 subs[0].match = 'B';
590 LISP_STRING_TO_EXTERNAL (name, subs[0].substitution, Qfile_name); 590 LISP_STRING_TO_EXTERNAL (name, subs[0].substitution, Qfile_name);
591 C_STRING_TO_EXTERNAL (path, pathext, Qfile_name); 591 C_STRING_TO_EXTERNAL (path, pathext, Qfile_name);
608 XrmValue value; 608 XrmValue value;
609 if (XrmGetResource (XtDatabase (display), 609 if (XrmGetResource (XtDatabase (display),
610 "bitmapFilePath", "BitmapFilePath", &type, &value) 610 "bitmapFilePath", "BitmapFilePath", &type, &value)
611 && !strcmp (type, "String")) 611 && !strcmp (type, "String"))
612 { 612 {
613 Intbyte *path; 613 Ibyte *path;
614 614
615 EXTERNAL_TO_C_STRING (value.addr, path, Qfile_name); 615 EXTERNAL_TO_C_STRING (value.addr, path, Qfile_name);
616 Vx_bitmap_file_path = split_env_path (0, path); 616 Vx_bitmap_file_path = split_env_path (0, path);
617 } 617 }
618 Vx_bitmap_file_path = nconc2 (Vx_bitmap_file_path, 618 Vx_bitmap_file_path = nconc2 (Vx_bitmap_file_path,
1560 int dest_mask, Lisp_Object domain) 1560 int dest_mask, Lisp_Object domain)
1561 { 1561 {
1562 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data); 1562 Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
1563 int i, stattis; 1563 int i, stattis;
1564 UChar_Binary *p, *bits, *bp; 1564 UChar_Binary *p, *bits, *bp;
1565 const CIntbyte * volatile emsg = 0; 1565 const CIbyte * volatile emsg = 0;
1566 const UChar_Binary * volatile dstring; 1566 const UChar_Binary * volatile dstring;
1567 1567
1568 assert (!NILP (data)); 1568 assert (!NILP (data));
1569 1569
1570 TO_EXTERNAL_FORMAT (LISP_STRING, data, 1570 TO_EXTERNAL_FORMAT (LISP_STRING, data,
1800 XLoadFont_got_error = 1; 1800 XLoadFont_got_error = 1;
1801 return 0; 1801 return 0;
1802 } 1802 }
1803 1803
1804 static Font 1804 static Font
1805 safe_XLoadFont (Display *dpy, Intbyte *name) 1805 safe_XLoadFont (Display *dpy, Ibyte *name)
1806 { 1806 {
1807 Font font; 1807 Font font;
1808 int (*old_handler) (Display *, XErrorEvent *); 1808 int (*old_handler) (Display *, XErrorEvent *);
1809 Extbyte *nameext; 1809 Extbyte *nameext;
1810 1810
1835 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance); 1835 Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
1836 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii); 1836 Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
1837 Display *dpy; 1837 Display *dpy;
1838 XColor fg, bg; 1838 XColor fg, bg;
1839 Font source, mask; 1839 Font source, mask;
1840 Intbyte source_name[PATH_MAX], mask_name[PATH_MAX], dummy; 1840 Ibyte source_name[PATH_MAX], mask_name[PATH_MAX], dummy;
1841 int source_char, mask_char; 1841 int source_char, mask_char;
1842 int count; 1842 int count;
1843 Lisp_Object foreground, background; 1843 Lisp_Object foreground, background;
1844 1844
1845 if (!DEVICE_X_P (XDEVICE (device))) 1845 if (!DEVICE_X_P (XDEVICE (device)))