Mercurial > emacs

comparison src/xselect.c @ 112434:9de5a68b57e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
author Paul Eggert <eggert@cs.ucla.edu>
date Sat, 22 Jan 2011 18:56:06 -0800
parents 4d90cea362a3
children
comparison
equal deleted inserted replaced
112433:7b649f6eac4f 112434:9de5a68b57e1
233 if (EQ (sym, QEMACS_TMP)) return dpyinfo->Xatom_EMACS_TMP; 233 if (EQ (sym, QEMACS_TMP)) return dpyinfo->Xatom_EMACS_TMP;
234 if (EQ (sym, QTARGETS)) return dpyinfo->Xatom_TARGETS; 234 if (EQ (sym, QTARGETS)) return dpyinfo->Xatom_TARGETS;
235 if (EQ (sym, QNULL)) return dpyinfo->Xatom_NULL; 235 if (EQ (sym, QNULL)) return dpyinfo->Xatom_NULL;
236 if (!SYMBOLP (sym)) abort (); 236 if (!SYMBOLP (sym)) abort ();
237 237
238 TRACE1 (" XInternAtom %s", (char *) SDATA (SYMBOL_NAME (sym))); 238 TRACE1 (" XInternAtom %s", SSDATA (SYMBOL_NAME (sym)));
239 BLOCK_INPUT; 239 BLOCK_INPUT;
240 val = XInternAtom (display, (char *) SDATA (SYMBOL_NAME (sym)), False); 240 val = XInternAtom (display, SSDATA (SYMBOL_NAME (sym)), False);
241 UNBLOCK_INPUT; 241 UNBLOCK_INPUT;
242 return val; 242 return val;
243 } 243 }
244 244
245 245
2253 else if (CONSP (o)) 2253 else if (CONSP (o))
2254 val = (long) cons_to_long (o); 2254 val = (long) cons_to_long (o);
2255 else if (STRINGP (o)) 2255 else if (STRINGP (o))
2256 { 2256 {
2257 BLOCK_INPUT; 2257 BLOCK_INPUT;
2258 val = (long) XInternAtom (dpy, (char *) SDATA (o), False); 2258 val = (long) XInternAtom (dpy, SSDATA (o), False);
2259 UNBLOCK_INPUT; 2259 UNBLOCK_INPUT;
2260 } 2260 }
2261 else 2261 else
2262 error ("Wrong type, must be string, number or cons"); 2262 error ("Wrong type, must be string, number or cons");
2263 2263
2390 if (SYMBOLP (atom)) 2390 if (SYMBOLP (atom))
2391 x_atom = symbol_to_x_atom (dpyinfo, FRAME_X_DISPLAY (f), atom); 2391 x_atom = symbol_to_x_atom (dpyinfo, FRAME_X_DISPLAY (f), atom);
2392 else if (STRINGP (atom)) 2392 else if (STRINGP (atom))
2393 { 2393 {
2394 BLOCK_INPUT; 2394 BLOCK_INPUT;
2395 x_atom = XInternAtom (FRAME_X_DISPLAY (f), (char *) SDATA (atom), False); 2395 x_atom = XInternAtom (FRAME_X_DISPLAY (f), SSDATA (atom), False);
2396 UNBLOCK_INPUT; 2396 UNBLOCK_INPUT;
2397 } 2397 }
2398 else 2398 else
2399 error ("ATOM must be a symbol or a string"); 2399 error ("ATOM must be a symbol or a string");
2400 2400