summaryrefslogtreecommitdiff
path: root/src/nsterm.h
Commit message (Collapse)AuthorAgeFilesLines
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
|
* * nsterm.h (x_free_frame_resources): Declare.Jan Djärv2011-12-101-0/+1
|
* Don't crash on bad user input.Jan Djärv2011-12-101-0/+1
| | | | | | | | | | | * nsfns.m (ns_get_defaults_value): New function. (Fns_get_resource, x_get_string_resource): Call ns_get_defaults_value. * nsterm.h (ns_get_defaults_value): Declare. * nsterm.m (ns_default): Call ns_get_defaults_value. Fixes: debbugs:10103
* Fix typos.Juanma Barranquero2011-11-201-1/+1
|
* Fix typos.Juanma Barranquero2011-11-161-1/+1
|
* Whitespace changes.Juanma Barranquero2011-09-091-1/+1
|
* Merge from trunk.Paul Eggert2011-08-141-0/+3
|\
| * Fix that executing applescript may hang emacs uninterruptedly.Jan Djärv2011-08-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nsfns.m (as_script, as_result, as_status): New static variables. (ns_run_ascript): New function. (Fns_do_applescript): Set variables as_*. Make an NSApplicationDefined event with data2 set to NSAPP_DATA2_RUNASSCRIPT, post it and then start the event loop. Get status from as_status. * nsterm.h (ns_run_ascript): Declare. (NSAPP_DATA2_RUNASSCRIPT): Define. * nsterm.m (sendEvent): If event is NSApplicationDefined and data2 is NSAPP_DATA2_RUNASSCRIPT, call ns_run_ascript and then exit the event loop (Bug#7276).
* | Merge from trunk.Paul Eggert2011-07-281-1/+7
|\ \ | |/
| * Fix for raise display property on NS (Bug#8913).Alp Aker2011-07-281-1/+0
| | | | | | | | | | | | | | | | * src/nsfont.m (nsfont_open): Remove assignment to voffset and unnecessary vars hshink, expand, hd, full_height, min_height. (nsfont_draw): Use s->ybase as baseline for glyph drawing. * src/nsterm.h (nsfont_info): Remove voffset field.
| * Implement strike-through and overline on NextStep (Bug#8863).Alp Aker2011-07-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * src/nsfont.m (nsfont_open): Use underline position provided by font, instead of hard-coded value of 2. (nsfont_draw): Call ns_draw_text_decoration instead. * src/nsterm.h: Add declaration for ns_draw_text_decoration. * src/nsterm.m (ns_draw_text_decoration): New function for drawing underline, overline, and strike-through. (ns_dumpglyphs_image, ns_dumpglyphs_stretch): Add call to ns_draw_text_decoration. Change treatment of cursor drawing to accomodate underlining, etc.
* | * nsterm.h (struct ns_color_table.size, struct ns_color_table.avail):Paul Eggert2011-07-281-2/+2
|/ | | | | | Now ptrdiff_t, not int. * nsterm.m (ns_index_color): Use ptrdiff_t, not int, for table indexes. (ns_draw_fringe_bitmap): Rewrite to avoid overflow.
* Fix warnings in ns*m files: Replace deprecated methods, declare new interfaces. Jan Djärv2011-07-081-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | * emacs.c: Declare unexec_init_emacs_zone. * nsfns.m (check_ns_display_info): Cast to long and use %ld in error to avoid warning. * nsimage.m (allocInitFromFile): Don't use deprecated method bestRepresentationForDevice on OSX >= 10.6. * nsmenu.m (fillWithWidgetValue): Don't use depercated method sizeToFit on OSX >= 10.2. * nsselect.m (ns_string_from_pasteboard): Don't use deprecated methods cString and lossyCString on OSX >= 10.4 * nsterm.h (MAC_OS_X_VERSION_10_3, MAC_OS_X_VERSION_10_4) (MAC_OS_X_VERSION_10_5): Define if not defined. (EmacsView, EmacsTooltip): Implements NSWindowDelegate on OSX >= 10.6. (EmacsMenu): Implements NSMenuDelegate on OSX >= 10.6. (EmacsToolbar): Implements NSToolbarDelegate on OSX >= 10.6. * nsterm.m (keyDown): Call to wantsToDelayTextChangeNotifications and variable firstTime not needed on OSX >= 10.6. (setPosition): setFloatValue:knobProportion: is deprecated on OSX >= 10.5. Use setKnobProportion, setDoubleValue.
* Fix services menu empty on OSX 1.6+.Jan Djärv2011-07-081-0/+8
| | | | | | | | | | | | | | | | | | | | | | | * nsfns.m (Fx_open_connection): Remove NSStringPboardType from ns_return_types. (Fns_list_services): Just return Qnil on 10.6, code not working there. * nsmenu.m (ns_update_menubar): Remove useless setDelegate call on svcsMenu. * nsselect.m (ns_get_local_selection): Change to extern (Bug#8842). * nsterm.h (MAC_OS_X_VERSION_10_6): Define here instead of nsterm.m. (ns_get_local_selection): Declare. * nsterm.m (QUTF8_STRING): Declare. (initFrameFromEmacs): Call registerServicesMenuSendTypes. (validRequestorForSendType): Return type is (id). Change indexOfObjectIdenticalTo to indexOfObject. Check if we have local selection before returning self (Bug#8842). (writeSelectionToPasteboard): Put local selection into paste board if we have a local selection (Bug#8842). (syms_of_nsterm): DEFSYM QUTF8_STRING.
* * dispextern.h (struct face.stipple):Paul Eggert2011-06-211-3/+2
| | | | | | | | | | | | | | | | | | * image.c (x_bitmap_height, x_bitmap_width, x_bitmap_pixmap) (x_bitmap_mask, x_allocate_bitmap_record) (x_create_bitmap_from_data, x_create_bitmap_from_file) (x_destroy_bitmap, x_destroy_all_bitmaps, x_create_bitmap_mask) (x_create_bitmap_from_xpm_data): * nsterm.h (struct ns_display_info.bitmaps_size, .bitmaps_last): * w32term.h (struct w32_display_info.icon_bitmap_id, .bitmaps_size) (.bitmaps_last): * xfaces.c (load_pixmap): * xterm.c (x_bitmap_icon, x_wm_set_icon_pixmap): * xterm.h (struct x_display_info.icon_bitmap_id, .bitmaps_size) (.bitmaps_last, struct x_output.icon_bitmap): Use ptrdiff_t, not int, for bitmap indexes. (x_allocate_bitmap_record): Check for size overflow. * dispextern.h, lisp.h: Adjust to API changes elsewhere.
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-241-1/+1
|
* Make Nextstep port handle multiple screens for resize and move.Jan Djärv2011-01-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | * nsterm.h (ns_output): Add dont_constrain and zooming. (EmacsView): Add ns_userRect. * nsterm.m (keyDown): If ns_right_alternate_modifier is Qleft, check if ns_alternate_modifier is none. * nsterm.m (x_set_offset, windowDidMove): When calculating y, use first screen, not the window screen. (x_set_window_size): Remove constraints. Calculate origin.y only if zooming is 0 and without referring to a screen. (windowWillResize): Don't modify frameSize. (windowDidBecomeKey, mouseDown): Set dont_constrain to 1. (initFrameFromEmacs): Initialize ns_userRect. (windowShouldZoom): Set zooming to one. Remove all other code. (windowWillUseStandardFrame): Move static ns_userRect to EmacsView. Zero it after restore. (constrainFrameRect): New method for EmacsWindow. (mouseDragged): Always post NSWindowDidResizeNotification after call to windowWillResize.
* Nuke arch-tags.Glenn Morris2011-01-151-2/+0
|
* Merge from emacs-23Stefan Monnier2011-01-141-1/+1
|\
| * Add 2011 to FSF/AIST copyright years.Glenn Morris2011-01-021-1/+1
| |
| * Handle negative top/left in frame parameters (Bug#7510).Jan Djärv2010-12-021-1/+1
| | | | | | | | | | | | | | | | | | * src/nsterm.h (FRAME_NS_TOOLBAR_HEIGHT): Rename to FRAME_TOOLBAR_HEIGHT. * src/nsterm.m (x_set_window_size, windowWillResize, initFrameFromEmacs): Use FRAME_TOOLBAR_HEIGHT. (x_set_offset): Handle XNegative and YNegative in f->size_hint_flags.
* | Start redesigning portable mouse highlight. Not compiled.Eli Zaretskii2010-10-311-15/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xdisp.c (get_tool_bar_item, handle_tool_bar_click) (note_tool_bar_highlight, draw_glyphs, erase_phys_cursor) (show_mouse_face, clear_mouse_face, coords_in_mouse_face_p) (note_mode_line_or_margin_highlight, note_mouse_highlight) (x_clear_window_mouse_face, cancel_mouse_face, expose_frame): Replace Display_Info with Mouse_HLInfo everywhere where mouse_face_* members were accessed for mouse highlight purposes. frame.h (MOUSE_HL_INFO): New macro. lisp.h (Mouse_HLInfo): New data type. xterm.h (struct x_display_info): w32term.h (struct w32_display_info): nsterm.h (struct ns_display_info): termchar.h (struct tty_display_info): Use it instead of mouse_face_* members. dispextern.h (DPYINFO_DEFINED): Remove definition. (FRAME_X_DISPLAY_INFO): Remove definition. (show_mouse_face, clear_mouse_face): Update type of 1st argument.
* | Use const char* for -Wwrite_strings.Jan D2010-08-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | * keyboard.h (_widget_value): name, value and key are const char*. * nsfont.m (ns_descriptor_to_entity): Use const char*. * nsmenu.m (parseKeyEquiv, addSubmenuWithTitle) (addDisplayItemWithImage, update_frame_tool_bar): Use const char*. * nsterm.h (parseKeyEquiv, addSubmenuWithTitle) (addDisplayItemWithImage): Use const char*.
* | Can't include menu.h in window.c for X targets.Jan D2010-08-061-0/+1
| | | | | | | | | | | | * nsterm.h (x_set_menu_bar_lines): Declare. * window.c: Don't include menu.h, it depends on lots of other .h-files.
* | Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.Jan D2010-08-061-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * configure.in: Check for util.h. * src/bidi.c (bidi_dump_cached_states): Fix fprintf warning. * src/emacs.c: Include src/nsterm.h if HAVE_NS. * src/image.c (xpm_scan, xpm_make_color_table_v) (xpm_put_color_table_v, xpm_get_color_table_v) (xpm_make_color_table_h, xpm_put_color_table_h) (xpm_get_color_table_h, xpm_str_to_color_key, xpm_load_image) (xpm_load): Convert to ANSI C prototypes. * src/lisp.h (fmod_float): Declare. * src/menu.h (x_set_menu_bar_line): Declare. (free_menubar_widget_value_tree et.al): Add HAVE_NS for these functions. * src/window.c: Include menu.h. * src/nsfns.m (have_menus_p, ns_display_info_for_name) (x_set_cursor_type, ns_appkit_version_str) (ns_appkit_version_int, ns_do_applescript) (x_set_scroll_bar_default_width, x_sync, compute_tip_xy) (syms_of_nsfns): Convert to ANSI C prototypes. * src/nsfont.m (ns_fallback_entity, syms_of_nsfont): Convert to ANSI C prototypes. * src/nsimage.m (ns_load_image): Move NSTRACE after declarations. * src/nsmenu.m (popup_activated, name_is_separator) (syms_of_nsmenu): Convert to ANSI C prototypes. (runMenuAt): Prototypes and move declarations before code. * src/nsterm.h : Include sysselect.h. (x_sync, x_get_focus_frame, x_set_mouse_position) (x_set_mouse_pixel_position, x_make_frame_visible) (x_make_frame_invisible, x_iconify_frame, x_char_width, x_char_height) (x_pixel_width, x_pixel_height, x_set_frame_alpha, x_set_tool_bar_lines) (x_activate_menubar, free_frame_menubar, ns_init_paths, ns_select) (syms_of_nsterm, syms_of_nsfns, syms_of_nsmenu, syms_of_nsselect): Declare * src/process.c: Check HAVE_UTIL_H. Include src/nsterm.h if HAVE_NS. * src/nsterm.m (ns_init_paths, ns_alloc_autorelease_pool) (ns_ring_bell, ns_defined_color, hide_hourglass) (x_display_pixel_height, x_display_pixel_width, syms_of_nsterm): Convert to ANSI C prototypes. (x_set_window_size, ns_draw_fringe_bitmap, judge): Move declarations before code. * src/sysdep.c: Check HAVE_TERM_H * src/term.c: Check HAVE_SYS_IOCTL_H. * src/unexmacosx.c (print_region_list, print_regions) (build_region_list, find_emacs_zone_regions) (unexec_regions_merge, read_load_commands, dump_it) (unexec_init_emacs_zone): Convert to ANSI C prototypes. * src/xfaces.c (x_create_gc, x_free_gc): Convert to ANSI C prototypes.
* | Remove P_ and __P macros.Jan D2010-07-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lwlib/lwlib-Xaw.h: Remove P_ and __P macros. * lwlib/lwlib-Xlw.h: * lwlib/lwlib-Xm.h: * lwlib/lwlib-int.h: * lwlib/lwlib-utils.h: * lwlib/lwlib.h: Likewise. * src/buffer.h: Remove P_ and __P macros. * src/category.h: * src/ccl.h: * src/character.h: * src/charset.h: * src/cm.h: * src/coding.h: * src/composite.h: * src/dispextern.h: * src/disptab.h: * src/font.h: * src/fontset.h: * src/frame.h: * src/gtkutil.h: * src/indent.h: * src/intervals.h: * src/keyboard.h: * src/keymap.h: * src/lisp.h: * src/macros.h: * src/md5.h: * src/menu.h: * src/msdos.h: * src/nsterm.h: * src/puresize.h: * src/region-cache.h: * src/syntax.h: * src/syssignal.h: * src/systime.h: * src/termhooks.h: * src/w32term.h: * src/widget.h: * src/window.h: * src/xgselect.h: * src/xsettings.h: * src/xterm.h: Likewise.
* | Rename FRAME_NS_TOOLBAR_HEIGHT to FRAME_TOOLBAR_HEIGHT to aid common code.Jan D2010-07-011-1/+1
|/ | | | | | | | | | * nsmenu.m (update_frame_tool_bar, free_frame_tool_bar): Update FRAME_TOOLBAR_HEIGHT. * nsterm.h (FRAME_NS_TOOLBAR_HEIGHT): Rename to FRAME_TOOLBAR_HEIGH * nsterm.m (x_set_window_size, initFrameFromEmacs): Renamed FRAME_NS_TOOLBAR_HEIGHT to FRAME_TOOLBAR_HEIGHT.
* Clean up unneeded ns_set_icon_type calls.Chong Yidong2010-03-291-0/+2
| | | | | | | | | | | | | | | | | | | Patch from Adrian Robert, see http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg01391.html * xdisp.c (x_consider_frame_title, update_window_cursor): Remove HAVE_NS conditionals. (prepare_menu_bars)[HAVE_NS]: Call ns_set_doc_edited. * nsfns.m (x_implicitly_set_name): If frame-title-format is t, use filename for the title. (ns_set_doc_edited): Do nothing if the selected window is a minibuffer window. * nsterm.h: Add prototypes for ns_set_name_as_filename and ns_set_doc_edited. * nsterm.m: Remove unneeded prototype.
* Add 2010 to copyright years.Glenn Morris2010-01-131-1/+1
|
* (NS_HAVE_NSINTEGER): Back out and augment with CGFloat, still needed under ↵Adrian Robert2009-10-161-4/+16
| | | | Tiger.
* (EmacsView, EmacsMenu, EmacsToolbar, EmacsTooltip): Add formal protocol ↵Adrian Robert2009-10-121-9/+4
| | | | mention to inheritance. [NS_HAVE_NSINTEGER]: Drop conditional and contents.
* (ns_app_name): New extern variable.Adrian Robert2009-09-271-0/+1
|
* (ns_no_defaults): Remove.Adrian Robert2009-09-181-1/+0
|
* nsterm.h (dump_glyphstring): Rename to ns_dump_glyphstring.Adrian Robert2009-06-081-1/+1
|
* Unify shutdown handling under NS, via ns-power-off key event (where ↵David Reitter2009-03-141-47/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | appropriate) and save-buffers-kill-emacs. remove NS-specific preferences window that used to show NS-specific preferences. Integrate preferences in Lisp accessible customization system where possible. Remove ns-expand-space, because it can be set only during fontloading (i.e. not at runtime), and because of redundancy with line-spacing frame parameter. Remove loading of most and saving of all NS resources (from org.gnu.Emacs.plist). nsterm.m (ns_shutdown_properly, -terminate): remove global state variable as it was never reset (ns_term_init): remove initialization of Lisp-settable defaults and ns_expand_space (-setPanelFromDefaultValues): remove ns_expand_space. (-showPreferencesWindow): send new KEY_NS_SHOW_PREFS key. nsfont.m (nsfont_open): remove ns_expand_space, assume -0.5 i.e. no additional spacing, similar to Carbon port. nsterm.h: define KEY_NS_SHOW_PREFS key. nsfns.m (ns-popup-prefs-panel): remove. term/ns-win.el (ns-expand-space): remove. (ns-show-prefs event): run `customize'. (ns-power-off): run `save-buffers-kill-emacs', but ask user whether to save files (as is standard) (clipboard-yank, clipboard-kill-ring-save, clipboard-kill-region) (menu-bar-enable-clipboard): do not undefine these. (ns-save-preferences,ns-save-options,ns-show-preferences-help): remove.
* * nsterm.h (EmacsPrefsController.cursorBlinkSlider): Only defineAdrian Robert2009-01-291-4/+8
| | | | | under GNUstep. (ns_query_color): New declaration.
* Changes to remove Feval calls from GUI under NS.Adrian Robert2009-01-251-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | * nsterm.h: Move KEY_NS_... definitions here from nsterm.m. Add NS_TOGGLE_TOOLBAR, NS_PUT_WORKING_TEXT, NS_UNPUT_WORKING_TEXT. Remove NS_INSERT_WORKING_TEXT, NS_DELETE_WORKING_TEXT. * nsterm.m: Move KEY_NS_... definitions to nsterm.h. (EmacsView-toggleToolbar:): Use KEY_NS_TOGGLE_TOOLBAR. (EmacsView-setMarkedText:,-deleteWorkingText:): Use NS_TEXT_EVENT instead of NON_ASCII_KEYSTROKE_EVENT. (EmacsApp-terminate:): Use KEY_NS_POWER_OFF instead of Feval. (EmacsApp-applicationShouldTerminate:): Query user. (EmacsPreferencesController-runHelp:): Use KEY_NS_INFO_PREFS instead of Feval. * termhooks.h (NS_TEXT_EVENT): New event type under HAVE_NS. * keyboard.c (kbd_buffer_get_event): Check for it. (keys_of_keyboard): Define lispy keys for ns-put/unput-working-text. * nsmenu.m (ns_popup_dialog): Resync window setting with X and W32 versions. (EmacsDialog-runDialogAt:): Use NSModalPanelRunLoopMode.
* * emacs.c (ns_no_defaults): New declaration. (main): Use it. * nsterm.h ↵Adrian Robert2009-01-231-0/+1
| | | | (ns_no_defaults): New declaration. * nsfns.m (x_get_string_resource): Don't read when ns_no_defaults. * nsterm.m (ns_no_defaults): New variable. (ns_initialize): Don't read defaults when ns_no_defaults.
* Remove '23' comments that indicated code added during update from emacs-20 ↵Adrian Robert2009-01-221-19/+11
| | | | -> emacs-23.
* * nsterm.h (EmacsApp-setAppleMenu:): Conditionalize more correctly on Tiger. ↵Adrian Robert2009-01-221-1/+1
| | | | * nsfns.m (ns_do_applescript): Conditionalize typeUTF16ExternalRepresentation on Tiger.
* * nsterm.h (EmacsPrefsController): Add -setPanelFromDefaultValues. * ↵Adrian Robert2009-01-211-0/+1
| | | | nsterm.m (EmacsPrefsController-setPanelFromDefaultValues) New function. (EmacsPrefsController-resetToDefaults:): Use it.
* Add 2009 to copyright years.Glenn Morris2009-01-081-1/+1
|
* * nsterm.h (ns_cursor_types, ↵Adrian Robert2008-10-021-21/+3
| | | | ns_output.desired_cursor_color)(ns_output.current_cursor, ns_output.desired_cursor) (ns_output.last_inactive, FRAME_CURSOR, FRAME_NEW_CURSOR) (FRAME_NEW_CURSOR_COLOR,): Remove. * nsfns.m (ns_set_cursor_color): Use FRAME_CURSOR_COLOR. (ns_lisp_to_cursor_type, ns_cursor_type_to_lisp): Use core emacs enumeration (HOLLOW_BOX_CURSOR, etc.). * nsterm.m (ns_frame_rehighlight): Remove commented code. (draw_window_cursor): Simplify code. (EmacsView-windowDidBecomeKey:,-windowDidResignKey:): Don't change cursor type. In latter, call rehighlight instead of doing updates manually. (EmacsPrefsController-setPanelFromValues,-setValuesFromPanel): Use core emacs cursor types. * xdisp.c (draw_glyphs): Don't call notice_overwritten_cursor() under NS.
* (ns_display_info): Remove `height' and `width' members.Chong Yidong2008-09-181-2/+4
|
* * nsfns.m (ns-read-file-name): Add casts to avoid warning. ↵Adrian Robert2008-08-211-1/+5
| | | | (ns-convert-utf8-nfd-to-nfc): Warn if cannot execute correctly. * nsfont.m (nsfont_draw): Compare indexed colors to 0, not nil. * nsterm.h (EmacsView-unlockFocusNeedsFlush:): Add declaration. (EmacsApp-cursor_blink_handler): Remove declaration. * nsterm.m (ns_draw_glyph_string): Update first conditional body to match 01 Feb 2008 changes in xterm.c. (ns_read_socket): Add cast to avoid warning. (EmacsApp-application:openFiles:): Don't call replyToOpenOrPrint: on GNUstep.
* * config.in: Regenerate. * Makefile.in: Move nsXXX.m dependencies into big ↵Adrian Robert2008-08-061-2/+2
| | | | alphabetical list. (mostlyclean): Don't delete *.d under NS. * nsterm.h (NS_HAVE_INTEGER): Change to NS_HAVE_NSINTEGER.
* Dock menu customization, based on a patch by Ken Raeburn, plus some other fixes.Adrian Robert2008-08-051-1/+1
|
* Test directly for NS_HAVE_INTEGER before defining it.Chong Yidong2008-08-041-2/+2
|
* (find_and_call_menu_selection): Fix prototype.Chong Yidong2008-08-041-1/+1
|
* add defines for NSInteger, NSUInteger on non-LeopardAdrian Robert2008-08-011-0/+5
|
View Lorry Controller Status