Mercurial > hg > xemacs-beta

comparison src/toolbar-common.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 a5954632b187
children 79c6ff3eef26
comparison
equal deleted inserted replaced
866:613552a02607 867:804517e16990
272 struct face_cachel *cachel = 272 struct face_cachel *cachel =
273 WINDOW_FACE_CACHEL (w, DEFAULT_INDEX); 273 WINDOW_FACE_CACHEL (w, DEFAULT_INDEX);
274 struct display_line dl; 274 struct display_line dl;
275 Lisp_Object string = IMAGE_INSTANCE_TEXT_STRING (p); 275 Lisp_Object string = IMAGE_INSTANCE_TEXT_STRING (p);
276 unsigned char charsets[NUM_LEADING_BYTES]; 276 unsigned char charsets[NUM_LEADING_BYTES];
277 Emchar_dynarr *buf; 277 Ichar_dynarr *buf;
278 struct font_metric_info fm; 278 struct font_metric_info fm;
279 279
280 /* This could be true if we were called via the Expose event 280 /* This could be true if we were called via the Expose event
281 handler. Mark the button as dirty and return 281 handler. Mark the button as dirty and return
282 immediately. */ 282 immediately. */
284 { 284 {
285 tb->dirty = 1; 285 tb->dirty = 1;
286 MARK_TOOLBAR_CHANGED; 286 MARK_TOOLBAR_CHANGED;
287 return; 287 return;
288 } 288 }
289 buf = Dynarr_new (Emchar); 289 buf = Dynarr_new (Ichar);
290 convert_intbyte_string_into_emchar_dynarr 290 convert_ibyte_string_into_ichar_dynarr
291 (XSTRING_DATA (string), XSTRING_LENGTH (string), buf); 291 (XSTRING_DATA (string), XSTRING_LENGTH (string), buf);
292 find_charsets_in_emchar_string (charsets, Dynarr_atp (buf, 0), 292 find_charsets_in_ichar_string (charsets, Dynarr_atp (buf, 0),
293 Dynarr_length (buf)); 293 Dynarr_length (buf));
294 ensure_face_cachel_complete (cachel, window, charsets); 294 ensure_face_cachel_complete (cachel, window, charsets);
295 face_cachel_charset_font_metric_info (cachel, charsets, &fm); 295 face_cachel_charset_font_metric_info (cachel, charsets, &fm);
296 296
297 dl.ascent = fm.ascent; 297 dl.ascent = fm.ascent;