comparison src/select-x.c @ 2367:ecf1ebac70d8

[xemacs-hg @ 2004-11-04 23:05:23 by ben] commit mega-patch configure.in: Turn off -Winline and -Wchar-subscripts. Use the right set of cflags when compiling modules. Rewrite ldap configuration to separate the inclusion of lber (needed in recent Cygwin) from the basic checks for the needed libraries. add a function for MAKE_JUNK_C; initially code was added to generate xemacs.def using this, but it will need to be rewritten. add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto an existing file. Sort list of auto-detected functions and eliminate unused checks for stpcpy, setlocale and getwd. Add autodetection of Cygwin scanf problems BETA: Rewrite section on configure to indicate what flags are important and what not. digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main(). make-msgfile.c: Document that this is old junk. Move proposal to text.c. make-msgfile.lex: Move proposal to text.c. make-mswin-unicode.pl: Convert error-generating code so that the entire message will be seen as a single unrecognized token. mule/mule-ccl.el: Update docs. lispref/mule.texi: Update CCL docs. ldap/eldap.c: Mule-ize. Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP. * XEmacs 21.5.18 "chestnut" is released. --------------------------------------------------------------- MULE-RELATED WORK: --------------------------------------------------------------- --------------------------- byte-char conversion --------------------------- buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken previous version. Track the char position of the gap. Add functions to do char-byte conversion downwards as well as upwards. Move comments about algorithm workings to internals manual. --------------------------- work on types --------------------------- alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all the basic semantics of `char' that I have so far identified, so that its semantics can always be identified for the purposes of proper Mule-safe code, and the raw use of `char' always avoided. (1) More type renaming, for consistency of naming. Char_ASCII -> Ascbyte UChar_ASCII -> UAscbyte Char_Binary -> CBinbyte UChar_Binary -> Binbyte SChar_Binary -> SBinbyte (2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and Bitbyte and use them. (3) New types Itext, Wexttext and Textcount for separating out the concepts of bytes and textual units (different under UTF-16 and UTF-32, which are potential internal encodings). (4) qxestr*_c -> qxestr*_ascii. lisp.h: New; goes with other qxe() functions. #### Maybe goes in a different section. lisp.h: Group generic int-type defs together with EMACS_INT defs. lisp.h: * lisp.h (WEXTTEXT_IS_WIDE) New defns. lisp.h: New type to replace places where int occurs as a boolean. It's signed because occasionally people may want to use -1 as an error value, and because unsigned ints are viral -- see comments in the internals manual against using them. dynarr.c: int -> Bytecount. --------------------------- Mule-izing --------------------------- device-x.c: Partially Mule-ize. dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*(). sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be Unicode (e.g. startup code under Windows). emacs.c: Mule-ize. Properly deal with argv in external encoding. Use wext_*() and Wexttext. Use Rawbyte. #if 0 some old junk on SCO that is unlikely to be correct. Rewrite allocation code in run-temacs. emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to initialize mswindows_9x_p even earlier, for use in startup code (XEUNICODE_P). process.c: Use _wenviron not environ under Windows, to get Unicode environment variables. event-Xt.c: Mule-ize drag-n-drop related stuff. dragdrop.c, dragdrop.h, frame-x.c: Mule-ize. text.h: Add some more stand-in defines for particular kinds of conversion; use in Mule-ization work in frame-x.c etc. --------------------------- Freshening --------------------------- intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate. --------------------------- Unicode-work --------------------------- intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc() and convert_unicode_to_multibyte_dynarr() and use. Add stuff for alloca() conversion of multibyte/unicode. alloc.c: Use dfc_external_data_len() in case of unicode coding system. alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up dump-time loading. Anyway, either we load them at dump time or run time, never both. unicode.c: Dump the blank tables as well. --------------------------------------------------------------- DOCUMENTATION, MOSTLY MULE-RELATED: --------------------------------------------------------------- EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed. text.h: Add more documentation describing why DFC routines were not written to return their value. Add some other DFC documentation. console-msw.c, console-msw.h: Add pointer to docs in win32.c. emacs.c: Add comments on sources of doc info. text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and internationalization, and proposals for work to be done, in text.c or Internals manual, stuff related to specific textual API's in text.h, and stuff related to internal implementation of Unicode conversion in unicode.c. Put lots of pointers to the comments to make them easier to find. s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of builds and environments under Windows and how they work. Collect this info in win32.c. Add pointers to these docs in the relevant s/* files. emacs.c: Document places with long comments. Remove comment about exiting, move to internals manual, put in pointer. event-stream.c: Move docs about event queues and focus to internals manual, put in pointer. events.h: Move docs about event stream callbacks to internals manual, put in pointer. profile.c, redisplay.c, signal.c: Move documentation to the Internals manual. process-nt.c: Add pointer to comment in win32-native.el. lisp.h: Add comments about some comment conventions. lisp.h: Add comment about the second argument. device-msw.c, redisplay-msw.c: @@#### comments are out-of-date. --------------------------------------------------------------- PDUMP WORK (MOTIVATED BY UNICODE CHANGES) --------------------------------------------------------------- alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP: Properly implement dump_add_root_block(), which never worked before, and is necessary for dumping Unicode tables. Pdump name changes for accuracy: XD_STRUCT_PTR -> XD_BLOCK_PTR. XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY. XD_C_STRING -> XD_ASCII_STRING. *_structure_* -> *_block_*. lrecord.h: some comments added about dump_add_root_block() vs dump_add_root_block_ptr(). extents.c: remove incorrect comment about pdump problems with gap array. --------------------------------------------------------------- ALLOCATION --------------------------------------------------------------- abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for more convenient allocation of these commonly requested items. Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes, xnew_ibytes, etc. also XREALLOC_ARRAY, xnew. alloc.c: Rewrite the allocation functions to factor out repeated code. Add assertions for freeing dumped data. lisp.h: Moved down and consolidated with other allocation stuff. lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in LIFO order. lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs. text.h, lisp.h: Fill out convenience routines for allocating various kinds of bytes and put them in lisp.h. Use them in place of xmalloc(), ALLOCA(). text.h: Fill out the convenience functions so the _MALLOC() kinds match the alloca() kinds. --------------------------------------------------------------- ERROR-CHECKING --------------------------------------------------------------- text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN() from similar Eistring checkers and change the Eistring checkers to use them instead. --------------------------------------------------------------- MACROS IN LISP.H --------------------------------------------------------------- lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can be used to generate any kind of gcpro sets -- regular, ngcpro, nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2. buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities. Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3 or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2 (new macro). Removed/redid comments on EXTERNAL_LIST_LOOP. --------------------------------------------------------------- SPACING FIXES --------------------------------------------------------------- callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes. --------------------------------------------------------------- FIX FOR GEOMETRY PROBLEM IN FIRST FRAME --------------------------------------------------------------- unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by release 1.5.12 of Cygwin]. toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows. will be overridden by my other ws. --------------------------------------------------------------- FIX FOR LEAKING PROCESS HANDLES: --------------------------------------------------------------- process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner <adrian@xemacs.org>. --------------------------------------------------------------- FIX FOR CYGWIN BUG (Unicode-related): --------------------------------------------------------------- unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by release 1.5.12 of Cygwin]. --------------------------------------------------------------- WARNING FIXES: --------------------------------------------------------------- console-stream.c: `reinit' is unused. compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got. regex.c: Gather includes together to avoid warning. --------------------------------------------------------------- CHANGES TO INITIALIZATION ROUTINES: --------------------------------------------------------------- buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity. Factor out some redundant init code. Move disallowed stuff that had crept into vars_of_glyphs() into complex_vars_of_glyphs(). Call init_eval_semi_early() from eval.c not in the middle of vars_of_() in emacs.c since there should be no order dependency in the latter calls. --------------------------------------------------------------- ARMAGEDDON: --------------------------------------------------------------- alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to inhibit_non_essential_conversion_operations. text.c: Assert on !inhibit_non_essential_conversion_operations. console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT in places where problems would arise. --------------------------------------------------------------- CHANGES TO THE BUILD PROCEDURE: --------------------------------------------------------------- config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file. Rearrange everything to follow this -- put all #undefs together and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA, BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE. m/gec63.h: Deleted; totally broken, not used at all, not in FSF. m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION, BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected. When in doubt, I followed recent FSF sources, which also have these things deleted.
author ben
date Thu, 04 Nov 2004 23:08:28 +0000
parents 04bc9d2f42c7
children 3d8143fc88e1
comparison
equal deleted inserted replaced
2366:2a392e0c390a 2367:ecf1ebac70d8
477 /* Convert our selection to the requested type, and put that data where the 477 /* Convert our selection to the requested type, and put that data where the
478 requestor wants it. Then tell them whether we've succeeded. 478 requestor wants it. Then tell them whether we've succeeded.
479 */ 479 */
480 static void 480 static void
481 x_reply_selection_request (XSelectionRequestEvent *event, int format, 481 x_reply_selection_request (XSelectionRequestEvent *event, int format,
482 UChar_Binary *data, Bytecount size, Atom type) 482 Rawbyte *data, Bytecount size, Atom type)
483 { 483 {
484 /* This function can GC */ 484 /* This function can GC */
485 XSelectionEvent reply; 485 XSelectionEvent reply;
486 Display *display = event->display; 486 Display *display = event->display;
487 struct device *d = get_device_from_display (display); 487 struct device *d = get_device_from_display (display);
529 #endif 529 #endif
530 prop_id = expect_property_change (display, window, reply.property, 530 prop_id = expect_property_change (display, window, reply.property,
531 PropertyDelete); 531 PropertyDelete);
532 532
533 XChangeProperty (display, window, reply.property, DEVICE_XATOM_INCR (d), 533 XChangeProperty (display, window, reply.property, DEVICE_XATOM_INCR (d),
534 32, PropModeReplace, (UChar_Binary *) 534 32, PropModeReplace, (Rawbyte *)
535 &bytes_remaining, 1); 535 &bytes_remaining, 1);
536 XSelectInput (display, window, PropertyChangeMask); 536 XSelectInput (display, window, PropertyChangeMask);
537 /* Tell 'em the INCR data is there... */ 537 /* Tell 'em the INCR data is there... */
538 XSendEvent (display, window, False, 0L, (XEvent *) &reply); 538 XSendEvent (display, window, False, 0L, (XEvent *) &reply);
539 XFlush (display); 539 XFlush (display);
640 count = specpdl_depth (); 640 count = specpdl_depth ();
641 record_unwind_protect (x_selection_request_lisp_error, 641 record_unwind_protect (x_selection_request_lisp_error,
642 make_opaque_ptr (event)); 642 make_opaque_ptr (event));
643 643
644 { 644 {
645 UChar_Binary *data; 645 Rawbyte *data;
646 Bytecount size; 646 Bytecount size;
647 int format; 647 int format;
648 Atom type; 648 Atom type;
649 lisp_data_to_selection_data (d, converted_selection, 649 lisp_data_to_selection_data (d, converted_selection,
650 &data, &type, &size, &format); 650 &data, &type, &size, &format);
651 651
652 x_reply_selection_request (event, format, data, size, type); 652 x_reply_selection_request (event, format, data, size, type);
653 successful_p = Qt; 653 successful_p = Qt;
654 /* Tell x_selection_request_lisp_error() it's cool. */ 654 /* Tell x_selection_request_lisp_error() it's cool. */
655 event->type = 0; 655 event->type = 0;
656 xfree (data, UChar_Binary *); 656 xfree (data, Rawbyte *);
657 } 657 }
658 658
659 unbind_to (count); 659 unbind_to (count);
660 660
661 DONE_LABEL: 661 DONE_LABEL:
967 } 967 }
968 968
969 969
970 static void 970 static void
971 x_get_window_property (Display *display, Window window, Atom property, 971 x_get_window_property (Display *display, Window window, Atom property,
972 UChar_Binary **data_ret, Bytecount *bytes_ret, 972 Rawbyte **data_ret, Bytecount *bytes_ret,
973 Atom *actual_type_ret, int *actual_format_ret, 973 Atom *actual_type_ret, int *actual_format_ret,
974 unsigned long *actual_size_ret, int delete_p) 974 unsigned long *actual_size_ret, int delete_p)
975 { 975 {
976 Bytecount total_size; 976 Bytecount total_size;
977 unsigned long bytes_remaining; 977 unsigned long bytes_remaining;
978 Bytecount offset = 0; 978 Bytecount offset = 0;
979 UChar_Binary *tmp_data = 0; 979 Rawbyte *tmp_data = 0;
980 int result; 980 int result;
981 Bytecount buffer_size = SELECTION_QUANTUM (display); 981 Bytecount buffer_size = SELECTION_QUANTUM (display);
982 if (buffer_size > MAX_SELECTION_QUANTUM) buffer_size = MAX_SELECTION_QUANTUM; 982 if (buffer_size > MAX_SELECTION_QUANTUM) buffer_size = MAX_SELECTION_QUANTUM;
983 983
984 /* First probe the thing to find out how big it is. */ 984 /* First probe the thing to find out how big it is. */
1002 *bytes_ret = 0; 1002 *bytes_ret = 0;
1003 return; 1003 return;
1004 } 1004 }
1005 1005
1006 total_size = bytes_remaining + 1; 1006 total_size = bytes_remaining + 1;
1007 *data_ret = (UChar_Binary *) xmalloc (total_size); 1007 *data_ret = xnew_rawbytes (total_size);
1008 1008
1009 /* Now read, until we've gotten it all. */ 1009 /* Now read, until we've gotten it all. */
1010 while (bytes_remaining) 1010 while (bytes_remaining)
1011 { 1011 {
1012 #if 0 1012 #if 0
1039 static void 1039 static void
1040 receive_incremental_selection (Display *display, Window window, Atom property, 1040 receive_incremental_selection (Display *display, Window window, Atom property,
1041 /* this one is for error messages only */ 1041 /* this one is for error messages only */
1042 Lisp_Object UNUSED (target_type), 1042 Lisp_Object UNUSED (target_type),
1043 Bytecount min_size_bytes, 1043 Bytecount min_size_bytes,
1044 UChar_Binary **data_ret, 1044 Rawbyte **data_ret,
1045 Bytecount *size_bytes_ret, 1045 Bytecount *size_bytes_ret,
1046 Atom *type_ret, int *format_ret, 1046 Atom *type_ret, int *format_ret,
1047 unsigned long *size_ret) 1047 unsigned long *size_ret)
1048 { 1048 {
1049 /* This function can GC */ 1049 /* This function can GC */
1050 Bytecount offset = 0; 1050 Bytecount offset = 0;
1051 int prop_id; 1051 int prop_id;
1052 *size_bytes_ret = min_size_bytes; 1052 *size_bytes_ret = min_size_bytes;
1053 *data_ret = (UChar_Binary *) xmalloc (*size_bytes_ret); 1053 *data_ret = xnew_rawbytes (*size_bytes_ret);
1054 #if 0 1054 #if 0
1055 stderr_out ("\nread INCR %d\n", min_size_bytes); 1055 stderr_out ("\nread INCR %d\n", min_size_bytes);
1056 #endif 1056 #endif
1057 /* At this point, we have read an INCR property, and deleted it (which 1057 /* At this point, we have read an INCR property, and deleted it (which
1058 is how we ack its receipt: the sending window will be selecting 1058 is how we ack its receipt: the sending window will be selecting
1064 */ 1064 */
1065 prop_id = expect_property_change (display, window, property, 1065 prop_id = expect_property_change (display, window, property,
1066 PropertyNewValue); 1066 PropertyNewValue);
1067 while (1) 1067 while (1)
1068 { 1068 {
1069 UChar_Binary *tmp_data; 1069 Rawbyte *tmp_data;
1070 Bytecount tmp_size_bytes; 1070 Bytecount tmp_size_bytes;
1071 wait_for_property_change (prop_id); 1071 wait_for_property_change (prop_id);
1072 /* expect it again immediately, because x_get_window_property may 1072 /* expect it again immediately, because x_get_window_property may
1073 .. no it won't, I don't get it. 1073 .. no it won't, I don't get it.
1074 .. Ok, I get it now, the Xt code that implements INCR is broken. 1074 .. Ok, I get it now, the Xt code that implements INCR is broken.
1084 #if 0 1084 #if 0
1085 stderr_out (" read INCR done\n"); 1085 stderr_out (" read INCR done\n");
1086 #endif 1086 #endif
1087 unexpect_property_change (prop_id); 1087 unexpect_property_change (prop_id);
1088 if (tmp_data) 1088 if (tmp_data)
1089 xfree (tmp_data, UChar_Binary *); 1089 xfree (tmp_data, Rawbyte *);
1090 break; 1090 break;
1091 } 1091 }
1092 #if 0 1092 #if 0
1093 stderr_out (" read INCR %d\n", tmp_size_bytes); 1093 stderr_out (" read INCR %d\n", tmp_size_bytes);
1094 #endif 1094 #endif
1097 #if 0 1097 #if 0
1098 stderr_out (" read INCR realloc %d -> %d\n", 1098 stderr_out (" read INCR realloc %d -> %d\n",
1099 *size_bytes_ret, offset + tmp_size_bytes); 1099 *size_bytes_ret, offset + tmp_size_bytes);
1100 #endif 1100 #endif
1101 *size_bytes_ret = offset + tmp_size_bytes; 1101 *size_bytes_ret = offset + tmp_size_bytes;
1102 *data_ret = (UChar_Binary *) xrealloc (*data_ret, *size_bytes_ret); 1102 *data_ret = (Rawbyte *) xrealloc (*data_ret, *size_bytes_ret);
1103 } 1103 }
1104 memcpy ((*data_ret) + offset, tmp_data, tmp_size_bytes); 1104 memcpy ((*data_ret) + offset, tmp_data, tmp_size_bytes);
1105 offset += tmp_size_bytes; 1105 offset += tmp_size_bytes;
1106 xfree (tmp_data, UChar_Binary *); 1106 xfree (tmp_data, Rawbyte *);
1107 } 1107 }
1108 } 1108 }
1109 1109
1110 1110
1111 static Lisp_Object 1111 static Lisp_Object
1118 { 1118 {
1119 /* This function can GC */ 1119 /* This function can GC */
1120 Atom actual_type; 1120 Atom actual_type;
1121 int actual_format; 1121 int actual_format;
1122 unsigned long actual_size; 1122 unsigned long actual_size;
1123 UChar_Binary *data = NULL; 1123 Rawbyte *data = NULL;
1124 Bytecount bytes = 0; 1124 Bytecount bytes = 0;
1125 Lisp_Object val; 1125 Lisp_Object val;
1126 struct device *d = get_device_from_display (display); 1126 struct device *d = get_device_from_display (display);
1127 1127
1128 x_get_window_property (display, window, property, &data, &bytes, 1128 x_get_window_property (display, window, property, &data, &bytes,
1150 /* Ok, that data wasn't *the* data, it was just the beginning. */ 1150 /* Ok, that data wasn't *the* data, it was just the beginning. */
1151 1151
1152 Bytecount min_size_bytes = 1152 Bytecount min_size_bytes =
1153 /* careful here. */ 1153 /* careful here. */
1154 (Bytecount) (* ((unsigned int *) data)); 1154 (Bytecount) (* ((unsigned int *) data));
1155 xfree (data, UChar_Binary *); 1155 xfree (data, Rawbyte *);
1156 receive_incremental_selection (display, window, property, target_type, 1156 receive_incremental_selection (display, window, property, target_type,
1157 min_size_bytes, &data, &bytes, 1157 min_size_bytes, &data, &bytes,
1158 &actual_type, &actual_format, 1158 &actual_type, &actual_format,
1159 &actual_size); 1159 &actual_size);
1160 } 1160 }
1162 /* It's been read. Now convert it to a lisp object in some semi-rational 1162 /* It's been read. Now convert it to a lisp object in some semi-rational
1163 manner. */ 1163 manner. */
1164 val = selection_data_to_lisp_data (d, data, bytes, 1164 val = selection_data_to_lisp_data (d, data, bytes,
1165 actual_type, actual_format); 1165 actual_type, actual_format);
1166 1166
1167 xfree (data, UChar_Binary *); 1167 xfree (data, Rawbyte *);
1168 return val; 1168 return val;
1169 } 1169 }
1170 1170
1171 1171
1172 /* Called from the event loop to handle SelectionNotify events. 1172 /* Called from the event loop to handle SelectionNotify events.
1266 { 1266 {
1267 struct device *d = decode_x_device (Qnil); 1267 struct device *d = decode_x_device (Qnil);
1268 Display *display = DEVICE_X_DISPLAY (d); 1268 Display *display = DEVICE_X_DISPLAY (d);
1269 Window window = RootWindow (display, 0); /* Cutbuffers are on frame 0 */ 1269 Window window = RootWindow (display, 0); /* Cutbuffers are on frame 0 */
1270 Atom cut_buffer_atom; 1270 Atom cut_buffer_atom;
1271 UChar_Binary *data; 1271 Rawbyte *data;
1272 Bytecount bytes; 1272 Bytecount bytes;
1273 Atom type; 1273 Atom type;
1274 int format; 1274 int format;
1275 unsigned long size; 1275 unsigned long size;
1276 Lisp_Object ret; 1276 Lisp_Object ret;
1294 ret = (bytes ? 1294 ret = (bytes ?
1295 make_ext_string ((Extbyte *) data, bytes, 1295 make_ext_string ((Extbyte *) data, bytes,
1296 memchr (data, 0x1b, bytes) ? 1296 memchr (data, 0x1b, bytes) ?
1297 Qctext : Qbinary) 1297 Qctext : Qbinary)
1298 : Qnil); 1298 : Qnil);
1299 xfree (data, UChar_Binary *); 1299 xfree (data, Rawbyte *);
1300 return ret; 1300 return ret;
1301 } 1301 }
1302 1302
1303 1303
1304 DEFUN ("x-store-cutbuffer-internal", Fx_store_cutbuffer_internal, 2, 2, 0, /* 1304 DEFUN ("x-store-cutbuffer-internal", Fx_store_cutbuffer_internal, 2, 2, 0, /*
1465 } 1465 }
1466 1466
1467 void 1467 void
1468 vars_of_select_x (void) 1468 vars_of_select_x (void)
1469 { 1469 {
1470 reinit_vars_of_select_x ();
1471
1472 #ifdef CUT_BUFFER_SUPPORT 1470 #ifdef CUT_BUFFER_SUPPORT
1473 cut_buffers_initialized = 0; 1471 cut_buffers_initialized = 0;
1474 Fprovide (intern ("cut-buffer")); 1472 Fprovide (intern ("cut-buffer"));
1475 #endif 1473 #endif
1476 1474