comparison src/events.c @ 219:262b8bb4a523 r20-4b8

Import from CVS: tag r20-4b8
author cvs
date Mon, 13 Aug 2007 10:09:35 +0200
parents d44af0c54775
children 2c611d1463a6
comparison
equal deleted inserted replaced
218:c9f226976f56 219:262b8bb4a523
621 CHECK_CONS (value); 621 CHECK_CONS (value);
622 /* To be changed to CHECK_SYMBOL. */ 622 /* To be changed to CHECK_SYMBOL. */
623 CHECK_NATNUM (XCAR (value)); 623 CHECK_NATNUM (XCAR (value));
624 CHECK_CONS (XCDR (value)); 624 CHECK_CONS (XCDR (value));
625 if (XINT (Flength (value)) != 2) 625 if (XINT (Flength (value)) != 2)
626 signal_simple_error ("`dnd-data' should be a two-element list", 626 signal_simple_error ("should be a two-element list", value);
627 Flength (value));
628 /* Check validity of DATA. */ 627 /* Check validity of DATA. */
629 EXTERNAL_LIST_LOOP (dnd_tail, XCAR (XCDR (value))) 628 EXTERNAL_LIST_LOOP (dnd_tail, XCAR (XCDR (value)))
630 { 629 {
631 /* Every element must be a string. */ 630 /* Every element must be a string. */
632 CHECK_STRING (XCAR (dnd_tail)); 631 CHECK_STRING (XCAR (dnd_tail));
1519 return make_int (XEVENT (event)->event.button.button); 1518 return make_int (XEVENT (event)->event.button.button);
1520 else if (XEVENT(event)->event_type == (dnd_drop_event)) 1519 else if (XEVENT(event)->event_type == (dnd_drop_event))
1521 /* we always have X if we have OffiX !! */ 1520 /* we always have X if we have OffiX !! */
1522 return make_int (XEVENT (event)->event.button.button); 1521 return make_int (XEVENT (event)->event.button.button);
1523 else 1522 else
1524 event = wrong_type_argument ((Qbutton_event_p),(event)); 1523 return wrong_type_argument ((Qbutton_event_p),(event));
1525 1524
1526 #endif 1525 #endif
1527 } 1526 }
1528 1527
1529 DEFUN ("event-modifier-bits", Fevent_modifier_bits, 1, 1, 0, /* 1528 DEFUN ("event-modifier-bits", Fevent_modifier_bits, 1, 1, 0, /*
1530 Return a number representing the modifier keys which were down 1529 Return a number representing the modifier keys which were down