Mercurial > hg > xemacs-beta

comparison src/console-x.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 6728e641994e
children 79c6ff3eef26
comparison
equal deleted inserted replaced
866:613552a02607 867:804517e16990
46 /* Parse a DISPLAY specification like "host:10.0" or ":0" */ 46 /* Parse a DISPLAY specification like "host:10.0" or ":0" */
47 static void 47 static void
48 split_up_display_spec (Lisp_Object display, int *hostname_length, 48 split_up_display_spec (Lisp_Object display, int *hostname_length,
49 int *display_length, int *screen_length) 49 int *display_length, int *screen_length)
50 { 50 {
51 Intbyte *beg = XSTRING_DATA (display); 51 Ibyte *beg = XSTRING_DATA (display);
52 Intbyte *end = beg + XSTRING_LENGTH (display); 52 Ibyte *end = beg + XSTRING_LENGTH (display);
53 Intbyte *p = end; 53 Ibyte *p = end;
54 54
55 while (p > beg) 55 while (p > beg)
56 { 56 {
57 DEC_CHARPTR (p); 57 DEC_IBYTEPTR (p);
58 if (charptr_emchar (p) == ':') 58 if (itext_ichar (p) == ':')
59 { 59 {
60 *hostname_length = p - beg; 60 *hostname_length = p - beg;
61 61
62 while (p < end - 1) 62 while (p < end - 1)
63 { 63 {
64 INC_CHARPTR (p); 64 INC_IBYTEPTR (p);
65 if (charptr_emchar (p) == '.') 65 if (itext_ichar (p) == '.')
66 { 66 {
67 *display_length = p - beg - *hostname_length; 67 *display_length = p - beg - *hostname_length;
68 *screen_length = end - p; 68 *screen_length = end - p;
69 return; 69 return;
70 } 70 }
191 a console connection -- e.g. "foo:0.0" instead of "foo:0". This 191 a console connection -- e.g. "foo:0.0" instead of "foo:0". This
192 only happens in `find-console' and `get-console'. */ 192 only happens in `find-console' and `get-console'. */
193 connection = x_device_to_console_connection (connection, errb); 193 connection = x_device_to_console_connection (connection, errb);
194 194
195 /* Check for a couple of standard special cases */ 195 /* Check for a couple of standard special cases */
196 if (string_emchar (connection, 0) == ':') 196 if (string_ichar (connection, 0) == ':')
197 connection = concat2 (build_string ("localhost"), connection); 197 connection = concat2 (build_string ("localhost"), connection);
198 else 198 else
199 { 199 {
200 /* connection =~ s/^unix:/localhost:/; */ 200 /* connection =~ s/^unix:/localhost:/; */
201 const Intbyte *p = XSTRING_DATA (connection); 201 const Ibyte *p = XSTRING_DATA (connection);
202 const Intbyte *end = XSTRING_DATA (connection) + XSTRING_LENGTH (connection); 202 const Ibyte *end = XSTRING_DATA (connection) + XSTRING_LENGTH (connection);
203 int i; 203 int i;
204 204
205 for (i = 0; i < (int) sizeof ("unix:") - 1; i++) 205 for (i = 0; i < (int) sizeof ("unix:") - 1; i++)
206 { 206 {
207 if (p == end || charptr_emchar (p) != "unix:"[i]) 207 if (p == end || itext_ichar (p) != "unix:"[i])
208 goto ok; 208 goto ok;
209 INC_CHARPTR (p); 209 INC_IBYTEPTR (p);
210 } 210 }
211 211
212 connection = concat2 (build_string ("localhost:"), 212 connection = concat2 (build_string ("localhost:"),
213 make_string (p, end - p)); 213 make_string (p, end - p));
214 } 214 }