xemacs-beta: src/select-x.c comparison

comparison src/select-x.c @ 440:8de8e3f6228a r21-2-28

Import from CVS: tag r21-2-28

author	cvs
date	Mon, 13 Aug 2007 11:33:38 +0200
parents	3ecd8885ac67
children	abe6d1db359e

comparison

equal deleted inserted replaced

-:357dd071b03c
+:8de8e3f6228a
 if (EQ (sym, QCUT_BUFFER7))	return XA_CUT_BUFFER7;
 #endif /* CUT_BUFFER_SUPPORT */
 {
 CONST char *nameext;
-GET_C_STRING_CTEXT_DATA_ALLOCA (Fsymbol_name (sym), nameext);
+TO_EXTERNAL_FORMAT (LISP_STRING, Fsymbol_name (sym),
+			C_STRING_ALLOCA, nameext,
+			Qctext);
 return XInternAtom (display, nameext, only_if_exists ? True : False);
 }
 }
 if (atom == XA_CUT_BUFFER6)	return QCUT_BUFFER6;
 if (atom == XA_CUT_BUFFER7)	return QCUT_BUFFER7;
 #endif
 {
-Lisp_Object newsym;
+char *intstr;
-CONST Bufbyte *intstr;
 char *str = XGetAtomName (display, atom);
 if (! str) return Qnil;
-GET_C_CHARPTR_INT_CTEXT_DATA_ALLOCA (str, intstr);
+TO_INTERNAL_FORMAT (C_STRING, str,
-newsym = intern ((char *) intstr);
+			C_STRING_ALLOCA, intstr,
+			Qctext);
 XFree (str);
-return newsym;
+return intern (intstr);
 }
 }
 /* Do protocol to assert ourself as a selection owner.
 necessarily the case (e.g. under OSF on the Alphas, where
 Time is a 64-bit quantity and time_t is a 32-bit quantity).
 Opaque pointers are the clean way to go here.
 */
-selection_time = make_opaque (sizeof (thyme), (void *) &thyme);
+selection_time = make_opaque (&thyme, sizeof (thyme));
 #ifdef MOTIF_CLIPBOARDS
 hack_motif_clipboard_selection (selection_atom, selection_value,
 				  thyme, display, selecting_window);
 #endif
 	    chartypes = WORLD;
 	    break;
 	  }
 	if (chartypes == LATIN_1)
-	  GET_STRING_BINARY_DATA_ALLOCA (selection_value, data, bytes);
+	  TO_EXTERNAL_FORMAT (LISP_STRING, selection_value,
+			      ALLOCA, (data, bytes),
+			      Qbinary);
 	else if (chartypes == WORLD)
 	  {
-	    GET_STRING_CTEXT_DATA_ALLOCA (selection_value, data, bytes);
+	    TO_EXTERNAL_FORMAT (LISP_STRING, selection_value,
+				ALLOCA, (data, bytes),
+				Qctext);
 	    encoding = "COMPOUND_TEXT";
 	  }
 }
 #endif /* MULE */
 /* Convert any 8-bit data to a string, for compactness. */
 else if (format == 8)
 return make_ext_string (data, size,
 			    type == DEVICE_XATOM_TEXT (d) ||
 			    type == DEVICE_XATOM_COMPOUND_TEXT (d)
-			    ? FORMAT_CTEXT : FORMAT_BINARY);
+			    ? Qctext : Qbinary);
 /* Convert a single atom to a Lisp Symbol.
 Convert a set of atoms to a vector of symbols. */
 else if (type == XA_ATOM)
 {
 else if (STRINGP (obj))
 {
 CONST Extbyte *extval;
 Extcount extvallen;
-if (NILP (type))
+TO_EXTERNAL_FORMAT (LISP_STRING, obj,
-	GET_STRING_CTEXT_DATA_ALLOCA (obj, extval, extvallen);
+			  ALLOCA, (extval, extvallen),
-else
+			  (NILP (type) ? Qctext : Qbinary));
-	GET_STRING_BINARY_DATA_ALLOCA (obj, extval, extvallen);
 *format_ret = 8;
 *size_ret = extvallen;
 *data_ret = (unsigned char *) xmalloc (*size_ret);
 memcpy (*data_ret, extval, *size_ret);
 #ifdef MULE
 CONST Extbyte *extval;
 Extcount extvallen;
 *format_ret = 8;
 len = set_charptr_emchar (buf, XCHAR (obj));
-GET_CHARPTR_EXT_CTEXT_DATA_ALLOCA (buf, len, extval, extvallen);
+TO_EXTERNAL_FORMAT (DATA, (buf, len),
+			  ALLOCA, (extval, extvallen),
+			  Qctext);
 *size_ret = extvallen;
 *data_ret = (unsigned char *) xmalloc (*size_ret);
 memcpy (*data_ret, extval, *size_ret);
 #ifdef MULE
 if (NILP (type)) type = QCOMPOUND_TEXT;
 COMPOUND_TEXT that we stored there ourselves earlier,
 in x-store-cutbuffer-internal  */
 ret = (bytes ?
 	 make_ext_string (data, bytes,
 			  memchr (data, 0x1b, bytes) ?
-			  FORMAT_CTEXT : FORMAT_BINARY)
+			  Qctext : Qbinary)
 	 : Qnil);
 xfree (data);
 return ret;
 }
 chartypes = WORLD;
 break;
 }
 if (chartypes == LATIN_1)
-GET_STRING_BINARY_DATA_ALLOCA (string, data, bytes);
+TO_EXTERNAL_FORMAT (LISP_STRING, string,
+			ALLOCA, (data, bytes),
+			Qbinary);
 else if (chartypes == WORLD)
-GET_STRING_CTEXT_DATA_ALLOCA  (string, data, bytes);
+TO_EXTERNAL_FORMAT (LISP_STRING, string,
+			ALLOCA, (data, bytes),
+			Qctext);
 #endif /* MULE */
 bytes_remaining = bytes;
 while (bytes_remaining)
 /************************************************************************/
 /*                            initialization                            */
 /************************************************************************/
 void
-syms_of_xselect (void)
+syms_of_select_x (void)
 {
 #ifdef CUT_BUFFER_SUPPORT
 DEFSUBR (Fx_get_cutbuffer_internal);
 DEFSUBR (Fx_store_cutbuffer_internal);
 CONSOLE_HAS_METHOD (x, get_foreign_selection);
 CONSOLE_HAS_METHOD (x, selection_exists_p);
 }
 void
-reinit_vars_of_xselect (void)
+reinit_vars_of_select_x (void)
 {
 reading_selection_reply = 0;
 reading_which_selection = 0;
 selection_reply_timed_out = 0;
 for_whom_the_bell_tolls = 0;
 prop_location_tick = 0;
 }
 void
-vars_of_xselect (void)
+vars_of_select_x (void)
 {
-reinit_vars_of_xselect ();
+reinit_vars_of_select_x ();
 #ifdef CUT_BUFFER_SUPPORT
 cut_buffers_initialized = 0;
 Fprovide (intern ("cut-buffer"));
 #endif
 */ );
 x_selection_timeout = 0;
 }
 void
-Xatoms_of_xselect (struct device *d)
+Xatoms_of_select_x (struct device *d)
 {
 Display *D = DEVICE_X_DISPLAY (d);
 /* Non-predefined atoms that we might end up using a lot */
 DEVICE_XATOM_CLIPBOARD     (d) = XInternAtom (D, "CLIPBOARD",     False);

Mercurial > hg > xemacs-beta

comparison src/select-x.c @ 440:8de8e3f6228a r21-2-28