Mercurial > hg > xemacs-beta
diff src/event-Xt.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 |
line wrap: on
line diff
--- a/src/event-Xt.c Tue Jun 04 17:40:00 2002 +0000 +++ b/src/event-Xt.c Wed Jun 05 09:58:45 2002 +0000 @@ -287,7 +287,7 @@ return Qnil; #ifdef MULE - return make_char (make_emchar (charset, code, 0)); + return make_char (make_ichar (charset, code, 0)); #else return make_char (code + 0x80); #endif @@ -1050,7 +1050,7 @@ { /* Generate multiple emacs events */ struct device *d = get_device_from_display (event->display); - Emchar ch; + Ichar ch; Lisp_Object instream, fb_instream; Lstream *istr; struct gcpro gcpro1, gcpro2; @@ -1065,7 +1065,7 @@ istr = XLSTREAM (instream); GCPRO2 (instream, fb_instream); - while ((ch = Lstream_get_emchar (istr)) != EOF) + while ((ch = Lstream_get_ichar (istr)) != EOF) { Lisp_Object emacs_event = Fmake_event (Qnil, Qnil); Lisp_Event *ev = XEVENT (emacs_event); @@ -1402,7 +1402,7 @@ { len = strlen ((char*)data); hurl = dnd_url_hexify_string ((char *)data, "file:"); - l_item = make_string ((Intbyte *)hurl, strlen (hurl)); + l_item = make_string ((Ibyte *)hurl, strlen (hurl)); l_dndlist = Fcons (l_item, l_dndlist); data += len + 1; xfree (hurl); @@ -1412,8 +1412,8 @@ break; case DndText: l_type = Qdragdrop_MIME; - l_dndlist = list1 ( list3 ( list1 ( make_string ((Intbyte *)"text/plain", 10) ), - make_string ((Intbyte *)"8bit", 4), + l_dndlist = list1 ( list3 ( list1 ( make_string ((Ibyte *)"text/plain", 10) ), + make_string ((Ibyte *)"8bit", 4), make_ext_string ((Extbyte *)data, strlen((char *)data), Qctext) ) ); @@ -1438,7 +1438,7 @@ { char *hurl = dnd_url_hexify_string ((char *) data, "file:"); - l_dndlist = list1 ( make_string ((Intbyte *)hurl, + l_dndlist = list1 ( make_string ((Ibyte *)hurl, strlen (hurl)) ); l_type = Qdragdrop_URL; @@ -1454,8 +1454,8 @@ l_type = Qdragdrop_URL; break; default: /* Unknown, RawData and any other type */ - l_dndlist = list1 ( list3 ( list1 ( make_string ((Intbyte *)"application/octet-stream", 24) ), - make_string ((Intbyte *)"8bit", 4), + l_dndlist = list1 ( list3 ( list1 ( make_string ((Ibyte *)"application/octet-stream", 24) ), + make_string ((Ibyte *)"8bit", 4), make_ext_string ((Extbyte *)data, size, Qbinary) ) ); @@ -2960,7 +2960,7 @@ SELECT_TYPE temp_mask; int infd = DEVICE_INFD (d); struct console *con = XCONSOLE (DEVICE_CONSOLE (d)); - Emchar quit_char = CONSOLE_QUIT_CHAR (con); + Ichar quit_char = CONSOLE_QUIT_CHAR (con); FD_ZERO (&temp_mask); FD_SET (infd, &temp_mask); @@ -2968,7 +2968,7 @@ while (1) { Lisp_Object event; - Emchar the_char; + Ichar the_char; if (!poll_fds_for_input (temp_mask)) return;