Mercurial > hg > xemacs-beta
diff src/frame-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 | 6728e641994e |
children | a07667553efc |
line wrap: on
line diff
--- a/src/frame-x.c Tue Jun 04 17:40:00 2002 +0000 +++ b/src/frame-x.c Wed Jun 05 09:58:45 2002 +0000 @@ -494,7 +494,7 @@ static Lisp_Object color_to_string (Widget w, unsigned long pixel) { - Intbyte buf[255]; + Ibyte buf[255]; XColor color; color.pixel = pixel; @@ -653,7 +653,7 @@ individual properties. */ static void -x_set_frame_text_value (struct frame *f, Intbyte *value, +x_set_frame_text_value (struct frame *f, Ibyte *value, String Xt_resource_name, String Xt_resource_encoding_name) { @@ -662,7 +662,7 @@ String old_XtValue = NULL; #ifdef MULE - Intbyte *ptr; + Ibyte *ptr; /* Optimize for common ASCII case */ for (ptr = value; *ptr; ptr++) if (!byte_ascii_p (*ptr)) @@ -687,13 +687,13 @@ } static void -x_set_title_from_intbyte (struct frame *f, Intbyte *name) +x_set_title_from_ibyte (struct frame *f, Ibyte *name) { x_set_frame_text_value (f, name, XtNtitle, XtNtitleEncoding); } static void -x_set_icon_name_from_intbyte (struct frame *f, Intbyte *name) +x_set_icon_name_from_ibyte (struct frame *f, Ibyte *name) { x_set_frame_text_value (f, name, XtNiconName, XtNiconNameEncoding); } @@ -1266,7 +1266,7 @@ filePath = transferInfo->dropData->data.files[ii]; hurl = dnd_url_hexify_string ((char *)filePath, "file:"); /* #### Mule-izing required */ - l_data = Fcons (make_string ((Intbyte* )hurl, + l_data = Fcons (make_string ((Ibyte* )hurl, strlen (hurl)), l_data); xfree (hurl); @@ -1288,11 +1288,11 @@ /* let us forget this name thing for now... */ /* filePath = transferInfo->dropData->data.buffers[ii].name; path = (filePath == NULL) ? Qnil - : make_string ((Intbyte *)filePath, strlen (filePath)); */ + : make_string ((Ibyte *)filePath, strlen (filePath)); */ /* what, if the data is no text, and how can I tell it? */ - l_data = Fcons ( list3 ( list1 ( make_string ((Intbyte *)"text/plain", 10) ), - make_string ((Intbyte *)"8bit", 4), - make_string ((Intbyte *)transferInfo->dropData->data.buffers[ii].bp, + l_data = Fcons ( list3 ( list1 ( make_string ((Ibyte *)"text/plain", 10) ), + make_string ((Ibyte *)"8bit", 4), + make_string ((Ibyte *)transferInfo->dropData->data.buffers[ii].bp, transferInfo->dropData->data.buffers[ii].size) ), l_data ); } @@ -2289,7 +2289,7 @@ */ (frame)) { - Intbyte str[255]; + Ibyte str[255]; struct frame *f = decode_x_frame (frame); qxesprintf (str, "%lu", XtWindow (FRAME_X_TEXT_WIDGET (f))); @@ -2821,8 +2821,8 @@ CONSOLE_HAS_METHOD (x, internal_frame_property_p); CONSOLE_HAS_METHOD (x, frame_properties); CONSOLE_HAS_METHOD (x, set_frame_properties); - CONSOLE_HAS_METHOD (x, set_title_from_intbyte); - CONSOLE_HAS_METHOD (x, set_icon_name_from_intbyte); + CONSOLE_HAS_METHOD (x, set_title_from_ibyte); + CONSOLE_HAS_METHOD (x, set_icon_name_from_ibyte); CONSOLE_HAS_METHOD (x, frame_visible_p); CONSOLE_HAS_METHOD (x, frame_totally_visible_p); CONSOLE_HAS_METHOD (x, frame_iconified_p);