comparison src/xselect.c @ 45414:a163bd34b952

* xselect.c (symbol_to_x_atom, x_get_foreign_selection): Use SYMBOL_NAME and XSTRING instead of XSYMBOL and name field.
author Ken Raeburn <raeburn@raeburn.org>
date Mon, 20 May 2002 08:06:57 +0000
parents a053f09739db
children 09ecca30779f
comparison
equal deleted inserted replaced
45413:811ea3c0629c 45414:a163bd34b952
198 if (EQ (sym, QCUT_BUFFER6)) return XA_CUT_BUFFER6; 198 if (EQ (sym, QCUT_BUFFER6)) return XA_CUT_BUFFER6;
199 if (EQ (sym, QCUT_BUFFER7)) return XA_CUT_BUFFER7; 199 if (EQ (sym, QCUT_BUFFER7)) return XA_CUT_BUFFER7;
200 #endif 200 #endif
201 if (!SYMBOLP (sym)) abort (); 201 if (!SYMBOLP (sym)) abort ();
202 202
203 TRACE1 (" XInternAtom %s", (char *) XSYMBOL (sym)->name->data); 203 TRACE1 (" XInternAtom %s", (char *) XSTRING (SYMBOL_NAME (sym))->data);
204 BLOCK_INPUT; 204 BLOCK_INPUT;
205 val = XInternAtom (display, (char *) XSYMBOL (sym)->name->data, False); 205 val = XInternAtom (display, (char *) XSTRING (SYMBOL_NAME (sym))->data, False);
206 UNBLOCK_INPUT; 206 UNBLOCK_INPUT;
207 return val; 207 return val;
208 } 208 }
209 209
210 210
1270 UNBLOCK_INPUT; 1270 UNBLOCK_INPUT;
1271 1271
1272 if (NILP (XCAR (reading_selection_reply))) 1272 if (NILP (XCAR (reading_selection_reply)))
1273 error ("Timed out waiting for reply from selection owner"); 1273 error ("Timed out waiting for reply from selection owner");
1274 if (EQ (XCAR (reading_selection_reply), Qlambda)) 1274 if (EQ (XCAR (reading_selection_reply), Qlambda))
1275 error ("No `%s' selection", XSYMBOL (selection_symbol)->name->data); 1275 error ("No `%s' selection", XSTRING (SYMBOL_NAME (selection_symbol))->data);
1276 1276
1277 /* Otherwise, the selection is waiting for us on the requested property. */ 1277 /* Otherwise, the selection is waiting for us on the requested property. */
1278 return 1278 return
1279 x_get_window_property_as_lisp_data (display, requestor_window, 1279 x_get_window_property_as_lisp_data (display, requestor_window,
1280 target_property, target_type, 1280 target_property, target_type,