Mercurial > hg > xemacs-beta

comparison src/glyphs.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 2b6fa2618f76
children 79c6ff3eef26
comparison
equal deleted inserted replaced
866:613552a02607 867:804517e16990
926 case IMAGE_MONO_PIXMAP: 926 case IMAGE_MONO_PIXMAP:
927 case IMAGE_COLOR_PIXMAP: 927 case IMAGE_COLOR_PIXMAP:
928 case IMAGE_POINTER: 928 case IMAGE_POINTER:
929 if (STRINGP (IMAGE_INSTANCE_PIXMAP_FILENAME (ii))) 929 if (STRINGP (IMAGE_INSTANCE_PIXMAP_FILENAME (ii)))
930 { 930 {
931 Intbyte *s; 931 Ibyte *s;
932 Lisp_Object filename = IMAGE_INSTANCE_PIXMAP_FILENAME (ii); 932 Lisp_Object filename = IMAGE_INSTANCE_PIXMAP_FILENAME (ii);
933 s = qxestrrchr (XSTRING_DATA (filename), '/'); 933 s = qxestrrchr (XSTRING_DATA (filename), '/');
934 if (s) 934 if (s)
935 print_internal (build_intstring (s + 1), printcharfun, 1); 935 print_internal (build_intstring (s + 1), printcharfun, 1);
936 else 936 else
2125 2125
2126 /************************************************************************/ 2126 /************************************************************************/
2127 /* error helpers */ 2127 /* error helpers */
2128 /************************************************************************/ 2128 /************************************************************************/
2129 DOESNT_RETURN 2129 DOESNT_RETURN
2130 signal_image_error (const CIntbyte *reason, Lisp_Object frob) 2130 signal_image_error (const CIbyte *reason, Lisp_Object frob)
2131 { 2131 {
2132 signal_error (Qimage_conversion_error, reason, frob); 2132 signal_error (Qimage_conversion_error, reason, frob);
2133 } 2133 }
2134 2134
2135 DOESNT_RETURN 2135 DOESNT_RETURN
2136 signal_image_error_2 (const CIntbyte *reason, Lisp_Object frob0, Lisp_Object frob1) 2136 signal_image_error_2 (const CIbyte *reason, Lisp_Object frob0, Lisp_Object frob1)
2137 { 2137 {
2138 signal_error_2 (Qimage_conversion_error, reason, frob0, frob1); 2138 signal_error_2 (Qimage_conversion_error, reason, frob0, frob1);
2139 } 2139 }
2140 2140
2141 DOESNT_RETURN 2141 DOESNT_RETURN
2142 signal_double_image_error (const CIntbyte *string1, const CIntbyte *string2, 2142 signal_double_image_error (const CIbyte *string1, const CIbyte *string2,
2143 Lisp_Object data) 2143 Lisp_Object data)
2144 { 2144 {
2145 signal_error_1 (Qimage_conversion_error, 2145 signal_error_1 (Qimage_conversion_error,
2146 list3 (build_msg_string (string1), 2146 list3 (build_msg_string (string1),
2147 build_msg_string (string2), 2147 build_msg_string (string2),
2148 data)); 2148 data));
2149 } 2149 }
2150 2150
2151 DOESNT_RETURN 2151 DOESNT_RETURN
2152 signal_double_image_error_2 (const CIntbyte *string1, const CIntbyte *string2, 2152 signal_double_image_error_2 (const CIbyte *string1, const CIbyte *string2,
2153 Lisp_Object data1, Lisp_Object data2) 2153 Lisp_Object data1, Lisp_Object data2)
2154 { 2154 {
2155 signal_error_1 (Qimage_conversion_error, 2155 signal_error_1 (Qimage_conversion_error,
2156 list4 (build_msg_string (string1), 2156 list4 (build_msg_string (string1),
2157 build_msg_string (string2), 2157 build_msg_string (string2),
2278 2278
2279 /* Compute height */ 2279 /* Compute height */
2280 if (height) 2280 if (height)
2281 { 2281 {
2282 /* Compute string metric info */ 2282 /* Compute string metric info */
2283 find_charsets_in_intbyte_string (charsets, 2283 find_charsets_in_ibyte_string (charsets,
2284 XSTRING_DATA (string), 2284 XSTRING_DATA (string),
2285 XSTRING_LENGTH (string)); 2285 XSTRING_LENGTH (string));
2286 2286
2287 /* Fallback to the default face if none was provided. */ 2287 /* Fallback to the default face if none was provided. */
2288 if (!NILP (face)) 2288 if (!NILP (face))
2328 struct face_cachel *cachel; 2328 struct face_cachel *cachel;
2329 int i; 2329 int i;
2330 Lisp_Object frame = DOMAIN_FRAME (domain); 2330 Lisp_Object frame = DOMAIN_FRAME (domain);
2331 2331
2332 /* Compute string font info */ 2332 /* Compute string font info */
2333 find_charsets_in_intbyte_string (charsets, 2333 find_charsets_in_ibyte_string (charsets,
2334 XSTRING_DATA (string), 2334 XSTRING_DATA (string),
2335 XSTRING_LENGTH (string)); 2335 XSTRING_LENGTH (string));
2336 2336
2337 reset_face_cachel (&frame_cachel); 2337 reset_face_cachel (&frame_cachel);
2338 update_face_cachel_data (&frame_cachel, frame, face); 2338 update_face_cachel_data (&frame_cachel, frame, face);
4847 tem = noseeum_cons (tem, Qnil); 4847 tem = noseeum_cons (tem, Qnil);
4848 *window_table = tem; 4848 *window_table = tem;
4849 } 4849 }
4850 4850
4851 Lisp_Object 4851 Lisp_Object
4852 display_table_entry (Emchar ch, Lisp_Object face_table, 4852 display_table_entry (Ichar ch, Lisp_Object face_table,
4853 Lisp_Object window_table) 4853 Lisp_Object window_table)
4854 { 4854 {
4855 Lisp_Object tail; 4855 Lisp_Object tail;
4856 4856
4857 /* Loop over FACE_TABLE, and then over WINDOW_TABLE. */ 4857 /* Loop over FACE_TABLE, and then over WINDOW_TABLE. */