Mercurial > hg > xemacs-beta
comparison src/device-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 | 2b6fa2618f76 |
children | 79c6ff3eef26 |
comparison
equal
deleted
inserted
replaced
866:613552a02607 | 867:804517e16990 |
---|---|
218 for (s = buf1; *s; s++) if (*s == '.') *s = '_'; | 218 for (s = buf1; *s; s++) if (*s == '.') *s = '_'; |
219 strcat (buf1, "._no_._such_._resource_.geometry"); | 219 strcat (buf1, "._no_._such_._resource_.geometry"); |
220 strcat (buf2, "._no_._such_._resource_.Geometry"); | 220 strcat (buf2, "._no_._such_._resource_.Geometry"); |
221 if (XrmGetResource (XtDatabase (dpy), buf1, buf2, &type, &value) == True) | 221 if (XrmGetResource (XtDatabase (dpy), buf1, buf2, &type, &value) == True) |
222 { | 222 { |
223 Intbyte *app_name_int, *app_class_int, *value_addr_int; | 223 Ibyte *app_name_int, *app_class_int, *value_addr_int; |
224 Lisp_Object codesys = coding_system_of_xrm_database (XtDatabase (dpy)); | 224 Lisp_Object codesys = coding_system_of_xrm_database (XtDatabase (dpy)); |
225 EXTERNAL_TO_C_STRING (app_name, app_name_int, codesys); | 225 EXTERNAL_TO_C_STRING (app_name, app_name_int, codesys); |
226 EXTERNAL_TO_C_STRING (app_class, app_class_int, codesys); | 226 EXTERNAL_TO_C_STRING (app_class, app_class_int, codesys); |
227 EXTERNAL_TO_C_STRING (value.addr, value_addr_int, codesys); | 227 EXTERNAL_TO_C_STRING (value.addr, value_addr_int, codesys); |
228 | 228 |
1120 | 1120 |
1121 int | 1121 int |
1122 signal_if_x_error (Display *dpy, int resumable_p) | 1122 signal_if_x_error (Display *dpy, int resumable_p) |
1123 { | 1123 { |
1124 Extbyte buf[1024]; | 1124 Extbyte buf[1024]; |
1125 Intbyte num[100]; | 1125 Ibyte num[100]; |
1126 Lisp_Object data; | 1126 Lisp_Object data; |
1127 if (! x_error_occurred_p (dpy)) | 1127 if (! x_error_occurred_p (dpy)) |
1128 return 0; | 1128 return 0; |
1129 data = Qnil; | 1129 data = Qnil; |
1130 qxesprintf (num, "0x%X", (unsigned int) last_error.resourceid); | 1130 qxesprintf (num, "0x%X", (unsigned int) last_error.resourceid); |
1162 | 1162 |
1163 if (NILP (find_nonminibuffer_frame_not_on_device (dev))) | 1163 if (NILP (find_nonminibuffer_frame_not_on_device (dev))) |
1164 { | 1164 { |
1165 int depth = begin_dont_check_for_quit (); | 1165 int depth = begin_dont_check_for_quit (); |
1166 /* We're going down. */ | 1166 /* We're going down. */ |
1167 Intbyte *errmess; | 1167 Ibyte *errmess; |
1168 GET_STRERROR (errmess, errno); | 1168 GET_STRERROR (errmess, errno); |
1169 stderr_out ("\n%s: Fatal I/O Error %d (%s) on display " | 1169 stderr_out ("\n%s: Fatal I/O Error %d (%s) on display " |
1170 "connection \"%s\"\n", | 1170 "connection \"%s\"\n", |
1171 (STRINGP (Vinvocation_name) ? | 1171 (STRINGP (Vinvocation_name) ? |
1172 (char *) XSTRING_DATA (Vinvocation_name) : "xemacs"), | 1172 (char *) XSTRING_DATA (Vinvocation_name) : "xemacs"), |
1178 /* assert (!_Xdebug); */ | 1178 /* assert (!_Xdebug); */ |
1179 unbind_to (depth); | 1179 unbind_to (depth); |
1180 } | 1180 } |
1181 else | 1181 else |
1182 { | 1182 { |
1183 Intbyte *errmess; | 1183 Ibyte *errmess; |
1184 GET_STRERROR (errmess, errno); | 1184 GET_STRERROR (errmess, errno); |
1185 warn_when_safe | 1185 warn_when_safe |
1186 (Qx, Qcritical, | 1186 (Qx, Qcritical, |
1187 "I/O Error %d (%s) on display connection\n" | 1187 "I/O Error %d (%s) on display connection\n" |
1188 " \"%s\" after after %lu requests (%lu known processed)\n" | 1188 " \"%s\" after after %lu requests (%lu known processed)\n" |
1594 x_get_resource_prefix (locale, device, &display, | 1594 x_get_resource_prefix (locale, device, &display, |
1595 name_Extbyte_dynarr, class_Extbyte_dynarr); | 1595 name_Extbyte_dynarr, class_Extbyte_dynarr); |
1596 if (!display) | 1596 if (!display) |
1597 return Qnil; | 1597 return Qnil; |
1598 | 1598 |
1599 return Fcons (make_string ((Intbyte *) Dynarr_atp (name_Extbyte_dynarr, 0), | 1599 return Fcons (make_string ((Ibyte *) Dynarr_atp (name_Extbyte_dynarr, 0), |
1600 Dynarr_length (name_Extbyte_dynarr)), | 1600 Dynarr_length (name_Extbyte_dynarr)), |
1601 make_string ((Intbyte *) Dynarr_atp (class_Extbyte_dynarr, 0), | 1601 make_string ((Ibyte *) Dynarr_atp (class_Extbyte_dynarr, 0), |
1602 Dynarr_length (class_Extbyte_dynarr))); | 1602 Dynarr_length (class_Extbyte_dynarr))); |
1603 } | 1603 } |
1604 | 1604 |
1605 DEFUN ("x-put-resource", Fx_put_resource, 1, 2, 0, /* | 1605 DEFUN ("x-put-resource", Fx_put_resource, 1, 2, 0, /* |
1606 Add a resource to the resource database for DEVICE. | 1606 Add a resource to the resource database for DEVICE. |