comparison src/nsterm.m @ 100839:03cb6ea90f92

* nsfns.m (x_set_foreground_color, x_set_background_color) (x_set_cursor_color, x_set_icon_name, x_explicitly_set_name) (x_set_title, x_set_icon_type, x_set_cursor_type): Rename to use x_ prefix instead of ns_. Update references. (syms_of_nsfns): Add a FIXME comment. * nsterm.m (x_set_cursor_type): New prototype. (setValuesFromPanel): Use it instead of the old ns_ prefixed name.
author Dan Nicolaescu <dann@ics.uci.edu>
date Fri, 02 Jan 2009 18:58:49 +0000
parents dab9cf44bf3f
children e038c1a8307c
comparison
equal deleted inserted replaced
100838:5deb9f2f65ae 100839:03cb6ea90f92
295 kbd_buffer_store_event_hold (emacs_event, q_event_ptr); \ 295 kbd_buffer_store_event_hold (emacs_event, q_event_ptr); \
296 EVENT_INIT (*emacs_event); \ 296 EVENT_INIT (*emacs_event); \
297 ns_send_appdefined (-1); \ 297 ns_send_appdefined (-1); \
298 } 298 }
299 299
300 void x_set_cursor_type (struct frame *, Lisp_Object, Lisp_Object);
301
300 /* TODO: get rid of need for these forward declarations */ 302 /* TODO: get rid of need for these forward declarations */
301 static void ns_condemn_scroll_bars (struct frame *f), 303 static void ns_condemn_scroll_bars (struct frame *f);
302 ns_judge_scroll_bars (struct frame *f); 304 static void ns_judge_scroll_bars (struct frame *f);
303 305
304 /* unused variables needed for compatibility reasons */ 306 /* unused variables needed for compatibility reasons */
305 int x_use_underline_position_properties, x_underline_at_descent_line; 307 int x_use_underline_position_properties, x_underline_at_descent_line;
306 /* FIXME: figure out what to do with underline_minimum_offset. */ 308 /* FIXME: figure out what to do with underline_minimum_offset. */
307 309
6098 x_set_window_size (frame, 0, frame->text_cols, frame->text_lines); */ 6100 x_set_window_size (frame, 0, frame->text_cols, frame->text_lines); */
6099 prevExpandSpace = expandSpace; 6101 prevExpandSpace = expandSpace;
6100 } 6102 }
6101 6103
6102 store_frame_param (frame, Qcursor_type, cursor_type); 6104 store_frame_param (frame, Qcursor_type, cursor_type);
6103 ns_set_cursor_type(frame, cursor_type, Qnil); /* FIXME: do only if changed */ 6105 x_set_cursor_type (frame, cursor_type, Qnil); /* FIXME: do only if changed */
6104 6106
6105 ns_alternate_modifier = ns_mod_to_lisp (altTag); 6107 ns_alternate_modifier = ns_mod_to_lisp (altTag);
6106 ns_command_modifier = ns_mod_to_lisp (cmdTag); 6108 ns_command_modifier = ns_mod_to_lisp (cmdTag);
6107 #ifdef NS_IMPL_COCOA 6109 #ifdef NS_IMPL_COCOA
6108 ns_control_modifier = ns_mod_to_lisp (ctrlTag); 6110 ns_control_modifier = ns_mod_to_lisp (ctrlTag);