comparison src/ExternalClient-Xlib.c @ 5923:61d7d7bcbe76 cygwin

merged heads after pull -u
author Henry Thompson <ht@markup.co.uk>
date Thu, 05 Feb 2015 17:19:05 +0000
parents 5d5aeb79edb4
children
comparison
equal deleted inserted replaced
5921:68639fb08af8 5923:61d7d7bcbe76
132 event->xcrossing.detail != NotifyInferior) 132 event->xcrossing.detail != NotifyInferior)
133 focus_status = window_has_focus_p(display, win, 0); 133 focus_status = window_has_focus_p(display, win, 0);
134 else 134 else
135 return; 135 return;
136 XFindContext(display, win, focus_context, &current_focus); 136 XFindContext(display, win, focus_context, &current_focus);
137 if (focus_status != (int) current_focus) 137 if ((XPointer) (long) focus_status != current_focus)
138 { 138 {
139 XSaveContext(display, win, focus_context, (XPointer) focus_status); 139 XSaveContext(display, win, focus_context,
140 (XPointer) (long) focus_status);
140 extw_send_notify_3(display, win, focus_status ? 141 extw_send_notify_3(display, win, focus_status ?
141 extw_notify_focus_in : extw_notify_focus_out, 142 extw_notify_focus_in : extw_notify_focus_out,
142 0, 0, 0); 143 0, 0, 0);
143 } 144 }
144 } 145 }