emacs: src/xselect.c comparison

comparison src/xselect.c @ 25646:9154af188477

Use XCAR and XCDR instead of explicit member references.

author	Ken Raeburn <raeburn@raeburn.org>
date	Sun, 12 Sep 1999 07:05:34 +0000
parents	719325fbe6a1
children	3e56c05edfab

comparison

equal deleted inserted replaced

-:a14111a2a100
+:9154af188477
 Don't use Fdelq as that may QUIT.  */
 if (!NILP (prev_value))
 {
 	Lisp_Object rest;	/* we know it's not the CAR, so it's easy.  */
 	for (rest = Vselection_alist; !NILP (rest); rest = Fcdr (rest))
-	  if (EQ (prev_value, Fcar (XCONS (rest)->cdr)))
+	  if (EQ (prev_value, Fcar (XCDR (rest))))
 	    {
-	      XCONS (rest)->cdr = Fcdr (XCONS (rest)->cdr);
+	      XCDR (rest) = Fcdr (XCDR (rest));
 	      break;
 	    }
 }
 }
 }
 /* TIMESTAMP and MULTIPLE are special cases 'cause that's easiest.  */
 if (EQ (target_type, QTIMESTAMP))
 {
 handler_fn = Qnil;
-value = XCONS (XCONS (XCONS (local_value)->cdr)->cdr)->car;
+value = XCAR (XCDR (XCDR (local_value)));
 }
 #if 0
 else if (EQ (target_type, QDELETE))
 {
 handler_fn = Qnil;
 Fx_disown_selection_internal
 	(selection_symbol,
-	 XCONS (XCONS (XCONS (local_value)->cdr)->cdr)->car);
+	 XCAR (XCDR (XCDR (local_value))));
 value = QNULL;
 }
 #endif
 #if 0 /* #### MULTIPLE doesn't work yet */
 else if (CONSP (target_type)
-	   && XCONS (target_type)->car == QMULTIPLE)
+	   && XCAR (target_type) == QMULTIPLE)
 {
 Lisp_Object pairs;
 int size;
 int i;
-pairs = XCONS (target_type)->cdr;
+pairs = XCDR (target_type);
 size = XVECTOR (pairs)->size;
 /* If the target is MULTIPLE, then target_type looks like
 	  (MULTIPLE . [[SELECTION1 TARGET1] [SELECTION2 TARGET2] ... ])
 	 We modify the second element of each pair in the vector and
 	 return it as [[SELECTION1 <value1>] [SELECTION2 <value2>] ... ]
 CHECK_SYMBOL (target_type, 0);
 handler_fn = Fcdr (Fassq (target_type, Vselection_converter_alist));
 if (!NILP (handler_fn))
 	value = call3 (handler_fn,
 		       selection_symbol, target_type,
-		       XCONS (XCONS (local_value)->cdr)->car);
+		       XCAR (XCDR (local_value)));
 else
 	value = Qnil;
 unbind_to (count, Qnil);
 }
 /* Make sure this value is of a type that we could transmit
 to another X client.  */
 check = value;
 if (CONSP (value)
-&& SYMBOLP (XCONS (value)->car))
+&& SYMBOLP (XCAR (value)))
-type = XCONS (value)->car,
+type = XCAR (value),
-check = XCONS (value)->cdr;
+check = XCDR (value);
 if (STRINGP (check)
 || VECTORP (check)
 || SYMBOLP (check)
 || INTEGERP (check)
 || NILP (value))
 return value;
 /* Check for a value that cons_to_long could handle.  */
 else if (CONSP (check)
-	   && INTEGERP (XCONS (check)->car)
+	   && INTEGERP (XCAR (check))
-	   && (INTEGERP (XCONS (check)->cdr)
+	   && (INTEGERP (XCDR (check))
 	       ||
-	       (CONSP (XCONS (check)->cdr)
+	       (CONSP (XCDR (check))
-		&& INTEGERP (XCONS (XCONS (check)->cdr)->car)
+		&& INTEGERP (XCAR (XCDR (check)))
-		&& NILP (XCONS (XCONS (check)->cdr)->cdr))))
+		&& NILP (XCDR (XCDR (check))))))
 return value;
 else
 return
 Fsignal (Qerror,
 	       Fcons (build_string ("invalid data returned by selection-conversion function"),
 x_decline_selection_request (event);
 goto DONE;
 }
 local_selection_time = (Time)
-cons_to_long (XCONS (XCONS (XCONS (local_selection_data)->cdr)->cdr)->car);
+cons_to_long (XCAR (XCDR (XCDR (local_selection_data))));
 if (SELECTION_EVENT_TIME (event) != CurrentTime
 && local_selection_time > SELECTION_EVENT_TIME (event))
 {
 /* Someone asked for the selection, and we have one, but not the one
 /* Well, we already believe that we don't own it, so that's just fine.  */
 if (NILP (local_selection_data)) return;
 local_selection_time = (Time)
-cons_to_long (XCONS (XCONS (XCONS (local_selection_data)->cdr)->cdr)->car);
+cons_to_long (XCAR (XCDR (XCDR (local_selection_data))));
 /* This SelectionClear is for a selection that we no longer own, so we can
 disregard it.  (That is, we have reasserted the selection since this
 request was generated.)  */
 Vselection_alist = Fcdr (Vselection_alist);
 else
 {
 Lisp_Object rest;
 for (rest = Vselection_alist; !NILP (rest); rest = Fcdr (rest))
-	if (EQ (local_selection_data, Fcar (XCONS (rest)->cdr)))
+	if (EQ (local_selection_data, Fcar (XCDR (rest))))
 	  {
-	    XCONS (rest)->cdr = Fcdr (XCONS (rest)->cdr);
+	    XCDR (rest) = Fcdr (XCDR (rest));
 	    break;
 	  }
 }
 /* Let random lisp code notice that the selection has been stolen.  */
 Vselection_alist = Fcdr (Vselection_alist);
 }
 /* Delete elements after the beginning of Vselection_alist.  */
 for (rest = Vselection_alist; !NILP (rest); rest = Fcdr (rest))
-if (EQ (frame, Fcar (Fcdr (Fcdr (Fcdr (Fcar (XCONS (rest)->cdr)))))))
+if (EQ (frame, Fcar (Fcdr (Fcdr (Fcdr (Fcar (XCDR (rest))))))))
 {
 	/* Let random Lisp code notice that the selection has been stolen.  */
 	Lisp_Object hooks, selection_symbol;
 	hooks = Vx_lost_selection_hooks;
-	selection_symbol = Fcar (Fcar (XCONS (rest)->cdr));
+	selection_symbol = Fcar (Fcar (XCDR (rest)));
 	if (!EQ (hooks, Qunbound))
 	  {
 	    for (; CONSP (hooks); hooks = Fcdr (hooks))
 	      call1 (Fcar (hooks), selection_symbol);
 #if 0 /* See above */
 	    redisplay_preserve_echo_area ();
 #endif
 	  }
-	XCONS (rest)->cdr = Fcdr (XCONS (rest)->cdr);
+	XCDR (rest) = Fcdr (XCDR (rest));
 	break;
 }
 }
 /* Nonzero if any properties for DISPLAY and WINDOW
 static Lisp_Object
 wait_for_property_change_unwind (identifierval)
 Lisp_Object identifierval;
 {
 unexpect_property_change ((struct prop_location *)
-			    (XFASTINT (XCONS (identifierval)->car) << 16
+			    (XFASTINT (XCAR (identifierval)) << 16
-			     | XFASTINT (XCONS (identifierval)->cdr)));
+			     | XFASTINT (XCDR (identifierval))));
 return Qnil;
 }
 /* Actually wait for a property change.
 IDENTIFIER should be the value that expect_property_change returned.  */
 int secs, usecs;
 int count = specpdl_ptr - specpdl;
 Lisp_Object tem;
 tem = Fcons (Qnil, Qnil);
-XSETFASTINT (XCONS (tem)->car, (EMACS_UINT)location >> 16);
+XSETFASTINT (XCAR (tem), (EMACS_UINT)location >> 16);
-XSETFASTINT (XCONS (tem)->cdr, (EMACS_UINT)location & 0xffff);
+XSETFASTINT (XCDR (tem), (EMACS_UINT)location & 0xffff);
 /* Make sure to do unexpect_property_change if we quit or err.  */
 record_unwind_protect (wait_for_property_change_unwind, tem);
-XCONS (property_change_reply)->car = Qnil;
+XCAR (property_change_reply) = Qnil;
 property_change_reply_object = location;
 /* If the event we are waiting for arrives beyond here, it will set
 property_change_reply, because property_change_reply_object says so.  */
 if (! location->arrived)
 {
 secs = x_selection_timeout / 1000;
 usecs = (x_selection_timeout % 1000) * 1000;
 wait_reading_process_input (secs, usecs, property_change_reply, 0);
-if (NILP (XCONS (property_change_reply)->car))
+if (NILP (XCAR (property_change_reply)))
 	error ("Timed out waiting for property-notify event");
 }
 unbind_to (count, Qnil);
 }
 	  rest->arrived = 1;
 	  /* If this is the one wait_for_property_change is waiting for,
 	     tell it to wake up.  */
 	  if (rest == property_change_reply_object)
-	    XCONS (property_change_reply)->car = Qt;
+	    XCAR (property_change_reply) = Qt;
 	  if (prev)
 	    prev->next = rest->next;
 	  else
 	    property_change_wait_list = rest->next;
 {
 Lisp_Object vec;
 int i;
 int size;
 if (CONSP (obj))
-return Fcons (XCONS (obj)->car, copy_multiple_data (XCONS (obj)->cdr));
+return Fcons (XCAR (obj), copy_multiple_data (XCDR (obj)));
 CHECK_VECTOR (obj, 0);
 vec = Fmake_vector (size = XVECTOR (obj)->size, Qnil);
 for (i = 0; i < size; i++)
 {
 int secs, usecs;
 int count;
 Lisp_Object frame;
 if (CONSP (target_type))
-type_atom = symbol_to_x_atom (dpyinfo, display, XCONS (target_type)->car);
+type_atom = symbol_to_x_atom (dpyinfo, display, XCAR (target_type));
 else
 type_atom = symbol_to_x_atom (dpyinfo, display, target_type);
 BLOCK_INPUT;
 count = x_catch_errors (display);
 XFlush (display);
 /* Prepare to block until the reply has been read.  */
 reading_selection_window = requestor_window;
 reading_which_selection = selection_atom;
-XCONS (reading_selection_reply)->car = Qnil;
+XCAR (reading_selection_reply) = Qnil;
 frame = some_frame_on_display (dpyinfo);
 /* If the display no longer has frames, we can't expect
 to get many more selection requests from it, so don't
 BLOCK_INPUT;
 x_check_errors (display, "Cannot get selection: %s");
 x_uncatch_errors (display, count);
 UNBLOCK_INPUT;
-if (NILP (XCONS (reading_selection_reply)->car))
+if (NILP (XCAR (reading_selection_reply)))
 error ("Timed out waiting for reply from selection owner");
-if (EQ (XCONS (reading_selection_reply)->car, Qlambda))
+if (EQ (XCAR (reading_selection_reply), Qlambda))
 error ("No `%s' selection", XSYMBOL (selection_symbol)->name->data);
 /* Otherwise, the selection is waiting for us on the requested property.  */
 return
 x_get_window_property_as_lisp_data (display, requestor_window,
 Lisp_Object type = Qnil;
 struct x_display_info *dpyinfo = x_display_info_for_display (display);
 *nofree_ret = 0;
-if (CONSP (obj) && SYMBOLP (XCONS (obj)->car))
+if (CONSP (obj) && SYMBOLP (XCAR (obj)))
 {
-type = XCONS (obj)->car;
+type = XCAR (obj);
-obj = XCONS (obj)->cdr;
+obj = XCDR (obj);
-if (CONSP (obj) && NILP (XCONS (obj)->cdr))
+if (CONSP (obj) && NILP (XCDR (obj)))
-	obj = XCONS (obj)->car;
+	obj = XCAR (obj);
 }
 if (EQ (obj, QNULL) || (EQ (type, QNULL)))
 {				/* This is not the same as declining */
 *format_ret = 32;
 (*data_ret) [sizeof (short)] = 0;
 (*(short **) data_ret) [0] = (short) XINT (obj);
 if (NILP (type)) type = QINTEGER;
 }
 else if (INTEGERP (obj)
-	   || (CONSP (obj) && INTEGERP (XCONS (obj)->car)
+	   || (CONSP (obj) && INTEGERP (XCAR (obj))
-	       && (INTEGERP (XCONS (obj)->cdr)
+	       && (INTEGERP (XCDR (obj))
-		   || (CONSP (XCONS (obj)->cdr)
+		   || (CONSP (XCDR (obj))
-		       && INTEGERP (XCONS (XCONS (obj)->cdr)->car)))))
+		       && INTEGERP (XCAR (XCDR (obj)))))))
 {
 *format_ret = 32;
 *size_ret = 1;
 *data_ret = (unsigned char *) xmalloc (sizeof (long) + 1);
 (*data_ret) [sizeof (long)] = 0;
 static Lisp_Object
 clean_local_selection_data (obj)
 Lisp_Object obj;
 {
 if (CONSP (obj)
-&& INTEGERP (XCONS (obj)->car)
+&& INTEGERP (XCAR (obj))
-&& CONSP (XCONS (obj)->cdr)
+&& CONSP (XCDR (obj))
-&& INTEGERP (XCONS (XCONS (obj)->cdr)->car)
+&& INTEGERP (XCAR (XCDR (obj)))
-&& NILP (XCONS (XCONS (obj)->cdr)->cdr))
+&& NILP (XCDR (XCDR (obj))))
-obj = Fcons (XCONS (obj)->car, XCONS (obj)->cdr);
+obj = Fcons (XCAR (obj), XCDR (obj));
 if (CONSP (obj)
-&& INTEGERP (XCONS (obj)->car)
+&& INTEGERP (XCAR (obj))
-&& INTEGERP (XCONS (obj)->cdr))
+&& INTEGERP (XCDR (obj)))
 {
-if (XINT (XCONS (obj)->car) == 0)
+if (XINT (XCAR (obj)) == 0)
-	return XCONS (obj)->cdr;
+	return XCDR (obj);
-if (XINT (XCONS (obj)->car) == -1)
+if (XINT (XCAR (obj)) == -1)
-	return make_number (- XINT (XCONS (obj)->cdr));
+	return make_number (- XINT (XCDR (obj)));
 }
 if (VECTORP (obj))
 {
 int i;
 int size = XVECTOR (obj)->size;
 if (event->requestor != reading_selection_window)
 return;
 if (event->selection != reading_which_selection)
 return;
-XCONS (reading_selection_reply)->car
+XCAR (reading_selection_reply)
 = (event->property != 0 ? Qt : Qlambda);
 }
 DEFUN ("x-own-selection-internal", Fx_own_selection_internal,
 check_x ();
 CHECK_SYMBOL (selection_symbol, 0);
 #if 0 /* #### MULTIPLE doesn't work yet */
 if (CONSP (target_type)
-&& XCONS (target_type)->car == QMULTIPLE)
+&& XCAR (target_type) == QMULTIPLE)
 {
-CHECK_VECTOR (XCONS (target_type)->cdr, 0);
+CHECK_VECTOR (XCDR (target_type), 0);
 /* So we don't destructively modify this...  */
 target_type = copy_multiple_data (target_type);
 }
 else
 #endif
 val = x_get_foreign_selection (selection_symbol, target_type);
 goto DONE;
 }
 if (CONSP (val)
-&& SYMBOLP (XCONS (val)->car))
+&& SYMBOLP (XCAR (val)))
 {
-val = XCONS (val)->cdr;
+val = XCDR (val);
-if (CONSP (val) && NILP (XCONS (val)->cdr))
+if (CONSP (val) && NILP (XCDR (val)))
-	val = XCONS (val)->car;
+	val = XCAR (val);
 }
 val = clean_local_selection_data (val);
 DONE:
 UNGCPRO;
 return val;
 Lisp_Object buffer;
 {
 Lisp_Object tail;
 struct buffer *buf = XBUFFER (buffer);
-for (tail = Vselection_alist; CONSP (tail); tail = XCONS (tail)->cdr)
+for (tail = Vselection_alist; CONSP (tail); tail = XCDR (tail))
 {
 Lisp_Object elt, value;
-elt = XCONS (tail)->car;
+elt = XCAR (tail);
-value = XCONS (elt)->cdr;
+value = XCDR (elt);
-if (CONSP (value) && MARKERP (XCONS (value)->car)
+if (CONSP (value) && MARKERP (XCAR (value))
-	  && XMARKER (XCONS (value)->car)->buffer == buf)
+	  && XMARKER (XCAR (value))->buffer == buf)
-	Fx_disown_selection_internal (XCONS (elt)->car, Qnil);
+	Fx_disown_selection_internal (XCAR (elt), Qnil);
 }
 }
 DEFUN ("x-selection-owner-p", Fx_selection_owner_p, Sx_selection_owner_p,
 0, 1, 0,

Mercurial > emacs

comparison src/xselect.c @ 25646:9154af188477