aboutsummaryrefslogtreecommitdiffstats
path: root/src/xselect.c
diff options
context:
space:
mode:
authorJuanma Barranquero2011-09-09 03:06:52 +0200
committerJuanma Barranquero2011-09-09 03:06:52 +0200
commit5e617bc2b62189768814fafd1a875e89a094d3ef (patch)
treed96d22e012035d044557abf4de0b8e30b03d61b7 /src/xselect.c
parent9b1c252e294bed3aef0d2f2fc5d1fa9f72df9ee8 (diff)
downloademacs-5e617bc2b62189768814fafd1a875e89a094d3ef.tar.gz
emacs-5e617bc2b62189768814fafd1a875e89a094d3ef.zip
Whitespace changes.
Diffstat (limited to 'src/xselect.c')
-rw-r--r--src/xselect.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/src/xselect.c b/src/xselect.c
index 77bda79007c..241622e81b3 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -592,7 +592,8 @@ static int x_reply_selection_request_cnt;
592#endif /* TRACE_SELECTION */ 592#endif /* TRACE_SELECTION */
593 593
594static void 594static void
595x_reply_selection_request (struct input_event *event, struct x_display_info *dpyinfo) 595x_reply_selection_request (struct input_event *event,
596 struct x_display_info *dpyinfo)
596{ 597{
597 XEvent reply_base; 598 XEvent reply_base;
598 XSelectionEvent *reply = &(reply_base.xselection); 599 XSelectionEvent *reply = &(reply_base.xselection);
@@ -1079,7 +1080,8 @@ waiting_for_other_props_on_window (Display *display, Window window)
1079 this awaited property change. */ 1080 this awaited property change. */
1080 1081
1081static struct prop_location * 1082static struct prop_location *
1082expect_property_change (Display *display, Window window, Atom property, int state) 1083expect_property_change (Display *display, Window window,
1084 Atom property, int state)
1083{ 1085{
1084 struct prop_location *pl = (struct prop_location *) xmalloc (sizeof *pl); 1086 struct prop_location *pl = (struct prop_location *) xmalloc (sizeof *pl);
1085 pl->identifier = ++prop_location_identifier; 1087 pl->identifier = ++prop_location_identifier;
@@ -2472,7 +2474,8 @@ FRAME is on. If FRAME is nil, the selected frame is used. */)
2472/* Convert an XClientMessageEvent to a Lisp event of type DRAG_N_DROP_EVENT. */ 2474/* Convert an XClientMessageEvent to a Lisp event of type DRAG_N_DROP_EVENT. */
2473 2475
2474int 2476int
2475x_handle_dnd_message (struct frame *f, XClientMessageEvent *event, struct x_display_info *dpyinfo, struct input_event *bufp) 2477x_handle_dnd_message (struct frame *f, XClientMessageEvent *event,
2478 struct x_display_info *dpyinfo, struct input_event *bufp)
2476{ 2479{
2477 Lisp_Object vec; 2480 Lisp_Object vec;
2478 Lisp_Object frame; 2481 Lisp_Object frame;
@@ -2550,22 +2553,24 @@ the Atom is sent. If a value is a cons, it is converted to a 32 bit number
2550with the high 16 bits from the car and the lower 16 bit from the cdr. 2553with the high 16 bits from the car and the lower 16 bit from the cdr.
2551If more values than fits into the event is given, the excessive values 2554If more values than fits into the event is given, the excessive values
2552are ignored. */) 2555are ignored. */)
2553 (Lisp_Object display, Lisp_Object dest, Lisp_Object from, Lisp_Object message_type, Lisp_Object format, Lisp_Object values) 2556 (Lisp_Object display, Lisp_Object dest, Lisp_Object from,
2557 Lisp_Object message_type, Lisp_Object format, Lisp_Object values)
2554{ 2558{
2555 struct x_display_info *dpyinfo = check_x_display_info (display); 2559 struct x_display_info *dpyinfo = check_x_display_info (display);
2556 2560
2557 CHECK_STRING (message_type); 2561 CHECK_STRING (message_type);
2558 x_send_client_event(display, dest, from, 2562 x_send_client_event (display, dest, from,
2559 XInternAtom (dpyinfo->display, 2563 XInternAtom (dpyinfo->display,
2560 SSDATA (message_type), 2564 SSDATA (message_type),
2561 False), 2565 False),
2562 format, values); 2566 format, values);
2563 2567
2564 return Qnil; 2568 return Qnil;
2565} 2569}
2566 2570
2567void 2571void
2568x_send_client_event (Lisp_Object display, Lisp_Object dest, Lisp_Object from, Atom message_type, Lisp_Object format, Lisp_Object values) 2572x_send_client_event (Lisp_Object display, Lisp_Object dest, Lisp_Object from,
2573 Atom message_type, Lisp_Object format, Lisp_Object values)
2569{ 2574{
2570 struct x_display_info *dpyinfo = check_x_display_info (display); 2575 struct x_display_info *dpyinfo = check_x_display_info (display);
2571 Window wdest; 2576 Window wdest;