Mercurial > hg > xemacs-beta
comparison 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 |
comparison
equal
deleted
inserted
replaced
866:613552a02607 | 867:804517e16990 |
---|---|
285 | 285 |
286 if (code == 0) | 286 if (code == 0) |
287 return Qnil; | 287 return Qnil; |
288 | 288 |
289 #ifdef MULE | 289 #ifdef MULE |
290 return make_char (make_emchar (charset, code, 0)); | 290 return make_char (make_ichar (charset, code, 0)); |
291 #else | 291 #else |
292 return make_char (code + 0x80); | 292 return make_char (code + 0x80); |
293 #endif | 293 #endif |
294 } | 294 } |
295 | 295 |
1048 | 1048 |
1049 case XLookupChars: | 1049 case XLookupChars: |
1050 { | 1050 { |
1051 /* Generate multiple emacs events */ | 1051 /* Generate multiple emacs events */ |
1052 struct device *d = get_device_from_display (event->display); | 1052 struct device *d = get_device_from_display (event->display); |
1053 Emchar ch; | 1053 Ichar ch; |
1054 Lisp_Object instream, fb_instream; | 1054 Lisp_Object instream, fb_instream; |
1055 Lstream *istr; | 1055 Lstream *istr; |
1056 struct gcpro gcpro1, gcpro2; | 1056 struct gcpro gcpro1, gcpro2; |
1057 | 1057 |
1058 fb_instream = make_fixed_buffer_input_stream (bufptr, len); | 1058 fb_instream = make_fixed_buffer_input_stream (bufptr, len); |
1063 (XLSTREAM (fb_instream), Qundecided, CODING_DECODE, 0); | 1063 (XLSTREAM (fb_instream), Qundecided, CODING_DECODE, 0); |
1064 | 1064 |
1065 istr = XLSTREAM (instream); | 1065 istr = XLSTREAM (instream); |
1066 | 1066 |
1067 GCPRO2 (instream, fb_instream); | 1067 GCPRO2 (instream, fb_instream); |
1068 while ((ch = Lstream_get_emchar (istr)) != EOF) | 1068 while ((ch = Lstream_get_ichar (istr)) != EOF) |
1069 { | 1069 { |
1070 Lisp_Object emacs_event = Fmake_event (Qnil, Qnil); | 1070 Lisp_Object emacs_event = Fmake_event (Qnil, Qnil); |
1071 Lisp_Event *ev = XEVENT (emacs_event); | 1071 Lisp_Event *ev = XEVENT (emacs_event); |
1072 ev->channel = DEVICE_CONSOLE (d); | 1072 ev->channel = DEVICE_CONSOLE (d); |
1073 ev->event_type = key_press_event; | 1073 ev->event_type = key_press_event; |
1400 | 1400 |
1401 while (*data) | 1401 while (*data) |
1402 { | 1402 { |
1403 len = strlen ((char*)data); | 1403 len = strlen ((char*)data); |
1404 hurl = dnd_url_hexify_string ((char *)data, "file:"); | 1404 hurl = dnd_url_hexify_string ((char *)data, "file:"); |
1405 l_item = make_string ((Intbyte *)hurl, strlen (hurl)); | 1405 l_item = make_string ((Ibyte *)hurl, strlen (hurl)); |
1406 l_dndlist = Fcons (l_item, l_dndlist); | 1406 l_dndlist = Fcons (l_item, l_dndlist); |
1407 data += len + 1; | 1407 data += len + 1; |
1408 xfree (hurl); | 1408 xfree (hurl); |
1409 } | 1409 } |
1410 l_type = Qdragdrop_URL; | 1410 l_type = Qdragdrop_URL; |
1411 } | 1411 } |
1412 break; | 1412 break; |
1413 case DndText: | 1413 case DndText: |
1414 l_type = Qdragdrop_MIME; | 1414 l_type = Qdragdrop_MIME; |
1415 l_dndlist = list1 ( list3 ( list1 ( make_string ((Intbyte *)"text/plain", 10) ), | 1415 l_dndlist = list1 ( list3 ( list1 ( make_string ((Ibyte *)"text/plain", 10) ), |
1416 make_string ((Intbyte *)"8bit", 4), | 1416 make_string ((Ibyte *)"8bit", 4), |
1417 make_ext_string ((Extbyte *)data, | 1417 make_ext_string ((Extbyte *)data, |
1418 strlen((char *)data), | 1418 strlen((char *)data), |
1419 Qctext) ) ); | 1419 Qctext) ) ); |
1420 break; | 1420 break; |
1421 case DndMIME: | 1421 case DndMIME: |
1436 case DndLink: | 1436 case DndLink: |
1437 case DndExe: | 1437 case DndExe: |
1438 { | 1438 { |
1439 char *hurl = dnd_url_hexify_string ((char *) data, "file:"); | 1439 char *hurl = dnd_url_hexify_string ((char *) data, "file:"); |
1440 | 1440 |
1441 l_dndlist = list1 ( make_string ((Intbyte *)hurl, | 1441 l_dndlist = list1 ( make_string ((Ibyte *)hurl, |
1442 strlen (hurl)) ); | 1442 strlen (hurl)) ); |
1443 l_type = Qdragdrop_URL; | 1443 l_type = Qdragdrop_URL; |
1444 | 1444 |
1445 xfree (hurl); | 1445 xfree (hurl); |
1446 } | 1446 } |
1452 strlen ((char *)data), | 1452 strlen ((char *)data), |
1453 Qfile_name) ); | 1453 Qfile_name) ); |
1454 l_type = Qdragdrop_URL; | 1454 l_type = Qdragdrop_URL; |
1455 break; | 1455 break; |
1456 default: /* Unknown, RawData and any other type */ | 1456 default: /* Unknown, RawData and any other type */ |
1457 l_dndlist = list1 ( list3 ( list1 ( make_string ((Intbyte *)"application/octet-stream", 24) ), | 1457 l_dndlist = list1 ( list3 ( list1 ( make_string ((Ibyte *)"application/octet-stream", 24) ), |
1458 make_string ((Intbyte *)"8bit", 4), | 1458 make_string ((Ibyte *)"8bit", 4), |
1459 make_ext_string ((Extbyte *)data, | 1459 make_ext_string ((Extbyte *)data, |
1460 size, | 1460 size, |
1461 Qbinary) ) ); | 1461 Qbinary) ) ); |
1462 l_type = Qdragdrop_MIME; | 1462 l_type = Qdragdrop_MIME; |
1463 break; | 1463 break; |
2958 check_for_tty_quit_char (struct device *d) | 2958 check_for_tty_quit_char (struct device *d) |
2959 { | 2959 { |
2960 SELECT_TYPE temp_mask; | 2960 SELECT_TYPE temp_mask; |
2961 int infd = DEVICE_INFD (d); | 2961 int infd = DEVICE_INFD (d); |
2962 struct console *con = XCONSOLE (DEVICE_CONSOLE (d)); | 2962 struct console *con = XCONSOLE (DEVICE_CONSOLE (d)); |
2963 Emchar quit_char = CONSOLE_QUIT_CHAR (con); | 2963 Ichar quit_char = CONSOLE_QUIT_CHAR (con); |
2964 | 2964 |
2965 FD_ZERO (&temp_mask); | 2965 FD_ZERO (&temp_mask); |
2966 FD_SET (infd, &temp_mask); | 2966 FD_SET (infd, &temp_mask); |
2967 | 2967 |
2968 while (1) | 2968 while (1) |
2969 { | 2969 { |
2970 Lisp_Object event; | 2970 Lisp_Object event; |
2971 Emchar the_char; | 2971 Ichar the_char; |
2972 | 2972 |
2973 if (!poll_fds_for_input (temp_mask)) | 2973 if (!poll_fds_for_input (temp_mask)) |
2974 return; | 2974 return; |
2975 | 2975 |
2976 event = Fmake_event (Qnil, Qnil); | 2976 event = Fmake_event (Qnil, Qnil); |