Mercurial > emacs
comparison src/xselect.c @ 90072:cb67264d6096
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-2
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-83
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-84
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-3
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-4
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-5
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-6
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-11
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-12
Remove "-face" suffix from lazy-highlight face name
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-13
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-16
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-17
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-18
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-21
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-22
<no summary provided>
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-23
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-39
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-40
Fix regressions from latest reftex update
* miles@gnu.org--gnu-2005/gnus--rel--5.10--base-0
tag of miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-1
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-2
Merge from miles@gnu.org--gnu-2004
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-3
Merge from emacs--cvs-trunk--0
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 16 Jan 2005 03:40:12 +0000 |
parents | eac554634bfa ecb6689e04bf |
children | 72cf6261961e |
comparison
equal
deleted
inserted
replaced
90071:f6b4d0ebf147 | 90072:cb67264d6096 |
---|---|
1381 if (CONSP (time_stamp)) | 1381 if (CONSP (time_stamp)) |
1382 requestor_time = (Time) cons_to_long (time_stamp); | 1382 requestor_time = (Time) cons_to_long (time_stamp); |
1383 else if (INTEGERP (time_stamp)) | 1383 else if (INTEGERP (time_stamp)) |
1384 requestor_time = (Time) XUINT (time_stamp); | 1384 requestor_time = (Time) XUINT (time_stamp); |
1385 else if (FLOATP (time_stamp)) | 1385 else if (FLOATP (time_stamp)) |
1386 requestor_time = (Time) XFLOAT (time_stamp); | 1386 requestor_time = (Time) XFLOAT_DATA (time_stamp); |
1387 else | 1387 else |
1388 error ("TIME_STAMP must be cons or number"); | 1388 error ("TIME_STAMP must be cons or number"); |
1389 } | 1389 } |
1390 | 1390 |
1391 BLOCK_INPUT; | 1391 BLOCK_INPUT; |
2466 a cons containing the two 16 bit parts of a 32 bit number. | 2466 a cons containing the two 16 bit parts of a 32 bit number. |
2467 | 2467 |
2468 DPY is the display use to look up X atoms. | 2468 DPY is the display use to look up X atoms. |
2469 DATA is a Lisp list of values to be converted. | 2469 DATA is a Lisp list of values to be converted. |
2470 RET is the C array that contains the converted values. It is assumed | 2470 RET is the C array that contains the converted values. It is assumed |
2471 it is big enough to hol all values. | 2471 it is big enough to hold all values. |
2472 FORMAT is 8, 16 or 32 and gives the size in bits for each C value to | 2472 FORMAT is 8, 16 or 32 and gives the size in bits for each C value to |
2473 be stored in RET. */ | 2473 be stored in RET. */ |
2474 | 2474 |
2475 void | 2475 void |
2476 x_fill_property_data (dpy, data, ret, format) | 2476 x_fill_property_data (dpy, data, ret, format) |
2490 Lisp_Object o = XCAR (iter); | 2490 Lisp_Object o = XCAR (iter); |
2491 | 2491 |
2492 if (INTEGERP (o)) | 2492 if (INTEGERP (o)) |
2493 val = (CARD32) XFASTINT (o); | 2493 val = (CARD32) XFASTINT (o); |
2494 else if (FLOATP (o)) | 2494 else if (FLOATP (o)) |
2495 val = (CARD32) XFLOAT (o); | 2495 val = (CARD32) XFLOAT_DATA (o); |
2496 else if (CONSP (o)) | 2496 else if (CONSP (o)) |
2497 val = (CARD32) cons_to_long (o); | 2497 val = (CARD32) cons_to_long (o); |
2498 else if (STRINGP (o)) | 2498 else if (STRINGP (o)) |
2499 { | 2499 { |
2500 BLOCK_INPUT; | 2500 BLOCK_INPUT; |
2595 Atom atom; | 2595 Atom atom; |
2596 | 2596 |
2597 if (INTEGERP (value)) | 2597 if (INTEGERP (value)) |
2598 atom = (Atom) XUINT (value); | 2598 atom = (Atom) XUINT (value); |
2599 else if (FLOATP (value)) | 2599 else if (FLOATP (value)) |
2600 atom = (Atom) XFLOAT (value); | 2600 atom = (Atom) XFLOAT_DATA (value); |
2601 else if (CONSP (value)) | 2601 else if (CONSP (value)) |
2602 atom = (Atom) cons_to_long (value); | 2602 atom = (Atom) cons_to_long (value); |
2603 else | 2603 else |
2604 error ("Wrong type, value must be number or cons"); | 2604 error ("Wrong type, value must be number or cons"); |
2605 | 2605 |
2727 error ("DEST as a string must be one of PointerWindow or InputFocus"); | 2727 error ("DEST as a string must be one of PointerWindow or InputFocus"); |
2728 } | 2728 } |
2729 else if (INTEGERP (dest)) | 2729 else if (INTEGERP (dest)) |
2730 wdest = (Window) XFASTINT (dest); | 2730 wdest = (Window) XFASTINT (dest); |
2731 else if (FLOATP (dest)) | 2731 else if (FLOATP (dest)) |
2732 wdest = (Window) XFLOAT (dest); | 2732 wdest = (Window) XFLOAT_DATA (dest); |
2733 else if (CONSP (dest)) | 2733 else if (CONSP (dest)) |
2734 { | 2734 { |
2735 if (! NUMBERP (XCAR (dest)) || ! NUMBERP (XCDR (dest))) | 2735 if (! NUMBERP (XCAR (dest)) || ! NUMBERP (XCDR (dest))) |
2736 error ("Both car and cdr for DEST must be numbers"); | 2736 error ("Both car and cdr for DEST must be numbers"); |
2737 else | 2737 else |