Make (many) trivial substitutions for renamed and new macros in dispextern.h, frame.h and window.h. (make_lispy_event): Use window positions returned from window_from_coordinates when constructing the lisp event for MOUSE_CLICK_EVENT and DRAG_N_DROP_EVENT, rather than calculating (incorrect) values locally. (make_lispy_movement): Use window positions returned from window_from_coordinates when constructing the lisp event, rather than calculating (incorrect) values locally.