1. 18 Sep, 2005 1 commit
  2. 07 Aug, 2005 1 commit
  3. 23 Jul, 2005 1 commit
    • YAMAMOTO Mitsuharu's avatar
      Don't include stdlib.h or string.h. Include atimer.h. · b8ab86c3
      YAMAMOTO Mitsuharu authored
      (gray_width, gray_height): Remove defines.
      (gray_bits, gray_bitmap_width, gray_bitmap_height)
      (gray_bitmap_bits): Remove variables.
      (lispy_function_keys): Remove extern.
      (free_frame_menubar): Add extern.
      (x_window_to_frame): Remove function.
      (unwind_create_tip_frame): Add declaration.
      (x_set_name_internal): New function.
      (x_set_name, x_set_title): Use it.
      (Fx_create_frame, Fx_display_grayscale_p, Fx_display_pixel_width)
      (Fx_display_pixel_height, Fx_display_planes)
      (Fx_display_color_cells, Fx_server_max_request_size)
      (Fx_server_vendor, Fx_server_version, Fx_display_screens)
      (Fx_display_mm_height, Fx_display_mm_width)
      (Fx_display_backing_store, Fx_display_visual_class)
      (Fx_display_save_under, Fx_synchronize, Fx_show_tip): Doc fixes.
      b8ab86c3
  4. 18 Jul, 2005 1 commit
  5. 04 Jul, 2005 1 commit
  6. 25 Jun, 2005 1 commit
  7. 23 Jun, 2005 1 commit
  8. 10 Jun, 2005 1 commit
  9. 13 May, 2005 1 commit
  10. 29 Apr, 2005 1 commit
  11. 16 Apr, 2005 1 commit
  12. 14 Apr, 2005 1 commit
  13. 06 Apr, 2005 1 commit
  14. 16 Mar, 2005 2 commits
    • YAMAMOTO Mitsuharu's avatar
      (mac_get_rdb_resource): Remove function. · 214080a5
      YAMAMOTO Mitsuharu authored
      (x_get_string_resource): Use xrm_get_resource.
      214080a5
    • YAMAMOTO Mitsuharu's avatar
      (Qhyper, Qsuper, Qmeta, Qalt, Qctrl, Qcontrol, Qshift): Remove unused · 901a6b03
      YAMAMOTO Mitsuharu authored
      variables.
      (syms_of_macfns): Don't initialize them.  Likewise for
      Qface_set_after_frame_default.  Defvar and initialize
      Vx_window_horizontal_drag_shape.
      (x_set_mouse_color): Change mouse pointer shape.
      (mac_window) [!MAC_OSX]: Create root control.
      (mac_window): Remove initializations of mouse pointer shapes.
      (hourglass_started): New function (from xfns.c).
      (start_hourglass, cancel_hourglass): Put function body in #ifdef
      MAC_OSX.
      (show_hourglass) [TARGET_API_MAC_CARBON]: Create progress
      indicator for each non-tooltip frame if needed, and show it.
      (hide_hourglass) [TARGET_API_MAC_CARBON]: Hide progress indicators.
      901a6b03
  15. 04 Mar, 2005 1 commit
    • YAMAMOTO Mitsuharu's avatar
      (install_window_handler): Move extern to macterm.h. · 1a8726ba
      YAMAMOTO Mitsuharu authored
      (Fx_file_dialog): Check STRINGP (default_filename) to see it is valid.
      Don't check !NILP (dir) because it is already checked with
      CHECK_STRING.
      (Fx_file_dialog) [!MAC_OSX]: Use FSSpec instead of FSRef for
      specifying the default location and obtaining the selected filename.
      1a8726ba
  16. 03 Feb, 2005 2 commits
  17. 16 Jan, 2005 2 commits
  18. 06 Jan, 2005 1 commit
    • Steven Tamm's avatar
      * macfns.c: Include sys/param.h. · e0e76ab9
      Steven Tamm authored
      	[TARGET_API_MAC_CARBON] (mac_nav_event_callback): New declaration
      	and function.
      	[TARGET_API_MAC_CARBON] (Fx_file_dialog): Use MAXPATHLEN for size
      	of filename string.  Set event callback function when creating
      	dialog boxes.  Add code conversions for filenames.  Don't dispose
      	apple event descriptor record if failed to create it.
      * macterm.c: Include sys/param.h.
      	[USE_CARBON_EVENTS] (mac_handle_window_event): Add handler for
      	kEventWindowUpdate.
      	(install_window_handler) [USE_CARBON_EVENTS]: Register it.
      	(do_ae_open_documents) [TARGET_API_MAC_CARBON]: Get FSRef instead
      	of FSSpec from apple event descriptor record.
      	(do_ae_open_documents) [TARGET_API_MAC_CARBON]: Use MAXPATHLEN for
      	size of filename string.
      	[TARGET_API_MAC_CARBON] (mac_do_receive_drag): Likewise.
      	[TARGET_API_MAC_CARBON] (mac_do_receive_drag): Return error when a
      	file dialog is in action.
      	[TARGET_API_MAC_CARBON] (mac_do_track_drag): Likewise.  Reject
      	only when there are no filename items.  Set background color
      	before (un)highlighting the window below the dragged items.
      	(XTread_socket) [!USE_CARBON_EVENTS]: Don't call do_window_update.
      e0e76ab9
  19. 29 Dec, 2004 1 commit
    • Steven Tamm's avatar
      * term/mac-win.el: Require x-dnd. · 30c92fab
      Steven Tamm authored
      	(mac-drag-n-drop): Sync with W32 version.  Use x-dnd.el functions.
      * macfns.c (install_window_handler): Modify extern to return OSErr
      	value.
      	(mac_window): Handle return value of install_window_handler.
      * macterm.c (reflect_byte): Remove function.
      	(mac_create_bitmap_from_bitmap_data): Don't call it.  Lookup table
      	instead.
      	(mac_do_font_lists): Simplify calculation of the longest
      	nonspecial string.
      	[TARGET_API_MAC_CARBON] (init_mac_drag_n_drop): Remove function
      	and declaration.
      	(mac_initialize) [TARGET_API_MAC_CARBON]: Don't call it.
      	[TARGET_API_MAC_CARBON] (mac_do_track_drag): New function and
      	declaration.
      	(install_window_handler): Return OSErr value.
      	(install_window_handler) [TARGET_API_MAC_CARBON]: Register
      	handlers for tracking/receiving drag-and-drop items.
      	(do_ae_open_documents): Generate unibyte strings for filenames.
      	[TARGET_API_MAC_CARBON] (mac_do_receive_drag): Likewise.  Reject
      	only non-filename items.  Set event modifiers.  Set return value.
      30c92fab
  20. 27 Dec, 2004 1 commit
    • Steven Tamm's avatar
      * dispextern.h: Change HAVE_CARBON to MAC_OS. · b15325b2
      Steven Tamm authored
      	(struct glyph_string): Likewise.
      * emacs.c (main) [MAC_OS8]: Call mac_term_init instead of
      	mac_initialize.
      * fileio.c (Fnext_read_file_uses_dialog_p, Fread_file_name):
      	Change TARGET_API_MAC_CARBON to HAVE_CARBON.
      * fns.c (vector): Change MAC_OSX to MAC_OS.
      * frame.c (x_set_frame_parameters, x_report_frame_params)
      	(x_set_fullscreen): Remove #ifndef HAVE_CARBON.
      	(x_set_border_width, Vdefault_frame_scroll_bars): Change
      	HAVE_CARBON to MAC_OS.
      * image.c [MAC_OS]: Include sys/stat.h.
      	[MAC_OS && !MAC_OSX]: Include sys/param.h, ImageCompression.h, and
      	QuickTimeComponents.h.
      * mac.c [!MAC_OSX] (mac_wait_next_event): Add extern.
      	[!MAC_OSX] (select): Use mac_wait_next_event.
      	[!MAC_OSX] (run_mac_command): Change EXEC_SUFFIXES to
      	Vexec_suffixes.
      	[!MAC_OSX] (select, run_mac_command): Change `#ifdef
      	TARGET_API_MAC_CARBON' to `#if TARGET_API_MAC_CARBON'.
      	(mac_clear_font_name_table): Add extern.
      	(Fmac_clear_font_name_table): New defun.
      	(syms_of_mac): Defsubr it.
      	[MAC_OSX] (SELECT_POLLING_PERIOD_USEC): New define.
      	[MAC_OSX] (select_and_poll_event): New function.
      	[MAC_OSX] (sys_select): Use it.
      	[MAC_OSX && SELECT_USE_CFSOCKET] (socket_callback): New function.
      	[MAC_OSX && SELECT_USE_CFSOCKET]
      	(SELECT_TIMEOUT_THRESHOLD_RUNLOOP, EVENT_CLASS_SOCK): New defines.
      	[MAC_OSX] (sys_select) [SELECT_USE_CFSOCKET]: Use CFSocket and
      	RunLoop for simultaneously monitoring two kinds of inputs, window
      	events and process outputs, without periodically polling.
      * macfns.c (mac_initialized): Remove extern.
      	(stricmp): Put in #if 0.  All callers changed to use xstricmp in
      	xfaces.c.
      	(strnicmp): Decrement `n' at the end of each loop, not the
      	beginning.
      	(check_mac): Use the term "Mac native windows" instead of "Mac
      	OS".
      	(check_x_display_info, x_display_info_for_name): Sync with xfns.c.
      	(mac_get_rdb_resource): New function (from w32reg.c).
      	(x_get_string_resource): Use it.
      	(install_window_handler): Add extern.
      	(mac_window): New function.
      	(Fx_create_frame): Use it instead of make_mac_frame.  Set
      	parameter for Qfullscreen.  Call x_wm_set_size_hint.
      	(Fx_open_connection, Fx_close_connection): New defuns.
      	(syms_of_macfns): Defsubr them.
      	(x_create_tip_frame) [TARGET_API_MAC_CARBON]: Add
      	kWindowNoUpdatesAttribute to the window attribute.
      	(x_create_tip_frame) [!TARGET_API_MAC_CARBON]: Use NewCWindow.
      	(x_create_tip_frame): Don't call ShowWindow.
      	(Fx_show_tip): Call ShowWindow.
      	(Fx_file_dialog): Change `#ifdef TARGET_API_MAC_CARBON' to `#if
      	TARGET_API_MAC_CARBON'.
      	(mac_frame_parm_handlers): Set handlers for Qfullscreen.
      	(syms_of_macfns) [MAC_OSX]: Initialize mac_in_use to 0.
      * macgui.h [!MAC_OSX]: Don't include Controls.h.  Include
      	Windows.h.
      	(Window): Typedef to WindowPtr and move outside `#if
      	TARGET_API_MAC_CARBON'.
      	(XSizeHints): New struct.
      * macterm.c (x_update_begin, x_update_end)
      	[TARGET_API_MAC_CARBON]: Disable screen updates during update of a
      	frame.
      	(x_draw_glyph_string_background, x_draw_glyph_string_foreground)
      	[MAC_OS8]: Use XDrawImageString/XDrawImageString16.
      	(construct_mouse_click): Put in #if 0.
      	(x_check_fullscreen, x_check_fullscreen_move): Remove decls.
      	(x_scroll_bar_create, x_scroll_bar_handle_click): Change `#ifdef
      	TARGET_API_MAC_CARBON' to `#if TARGET_API_MAC_CARBON'.
      	(activate_scroll_bars, deactivate_scroll_bars)
      	[!TARGET_API_MAC_CARBON]: Use ActivateControl/DeactivateControl.
      	(x_make_frame_visible) [TARGET_API_MAC_CARBON]: Reposition window
      	if the position is neither user-specified nor program-specified.
      	(x_free_frame_resources): Free size_hints.
      	(x_wm_set_size_hint): Allocate size_hints if needed.  Set
      	size_hints.
      	(mac_clear_font_name_table): New function.
      	(mac_do_list_fonts): Initialize font_name_table if needed.
      	(x_list_fonts): Don't initialize font_name_table.  Add BLOCK_INPUT
      	around mac_do_list_fonts.
      	(mac_unload_font): New function.
      	(x_load_font): Add BLOCK_INPUT around XLoadQueryFont.
      	(init_mac_drag_n_drop, mac_do_receive_drag): Enclose declarations
      	and definitions with #if TARGET_API_MAC_CARBON.
      	[USE_CARBON_EVENTS] (mac_handle_window_event): Add decl.
      	(install_window_handler): Add decl.
      	(do_window_update): Add BeginUpdate/EndUpdate for the tooltip
      	window.  Use UpdateControls.  Get the rectangle that should be
      	updated and restrict the target of expose_frame to it.
      	(do_grow_window): Set minimum height/width according to
      	size_hints.
      	(do_grow_window) [TARGET_API_MAC_CARBON]: Use ResizeWindow.
      	(do_zoom_window): Don't use x_set_window_size.
      	[USE_CARBON_EVENTS] (mac_handle_window_event): New function.
      	(install_window_handler): New function.
      	[!USE_CARBON_EVENTS] (mouse_region): New variable.
      	[!USE_CARBON_EVENTS] (mac_wait_next_event): New function.
      	(XTread_socket) [USE_CARBON_EVENTS]: Move call to
      	GetEventDispatcherTarget inside BLOCK_INPUT.
      	(XTread_socket) [!USE_CARBON_EVENTS]: Use mac_wait_next_event.
      	Update mouse_region when mouse is moved.
      	(make_mac_frame): Remove.
      	(make_mac_terminal_frame): Put in #ifdef MAC_OS8.  Initialize
      	mouse pointer shapes.  Change values of f->left_pos and
      	f->top_pos.  Don't use make_mac_frame.  Use NewCWindow.  Don't
      	call ShowWindow.
      	(mac_initialize_display_info) [MAC_OSX]: Create mac_id_name from
      	Vinvocation_name and Vsystem_name.
      	(mac_make_rdb): New function (from w32term.c).
      	(mac_term_init): Use it.  Add BLOCK_INPUT.  Error if display has
      	already been opened.  Don't pass argument to
      	mac_initialize_display_info.  Don't set dpyinfo->height/width.
      	Add entries to x_display_list and x_display_name_list.
      	(x_delete_display): New function.
      	(mac_initialize): Don't call mac_initialize_display_info.
      	(syms_of_macterm) [!MAC_OSX]: Don't call Fprovide.
      * macterm.h (check_mac): Add extern.
      	(struct mac_output): New member size_hints.
      	(FRAME_SIZE_HINTS): New macro.
      	(mac_unload_font): Add extern.
      * xdisp.c (expose_window, expose_frame): Remove kludges for Mac.
      * xfaces.c (clear_font_table) [MAC_OS]: call mac_unload_font.
      b15325b2
  21. 03 Dec, 2004 1 commit
    • Steven Tamm's avatar
      * macterm.h (cfstring_create_with_utf8_cstring): Added prototype. · d8f96db8
      Steven Tamm authored
      * image.c (image_load_quartz2d): Use
      cfstring_create_with_utf8_cstring
      * macmenu.c (add_menu_item): Use
      cfstring_create_with_utf8_cstring
      * macfns.c (x_set_name, x_set_title): Use
      cfstring_create_with_utf8_cstring
      (Fx_file_dialog): Use cfstring_create_with_utf8_cstring and use
      constant CFRefs instead of creating them each time for labels.
      * mac.c (cfstring_create_with_utf8_cstring): Added to prevent
      crashes with invalid characters.
      d8f96db8
  22. 30 Nov, 2004 1 commit
    • Steven Tamm's avatar
      * keyboard.c: Don't undef SIGIO · fc7a70cc
      Steven Tamm authored
      * s/darwin.h (NO_SOCK_SIGIO): Define NO_SOCK_SIGIO on carbon
      * Makefile.in (mac.o): Depend on blockinput.h and atimer.h.
             (macfns.o): Don't depend on ccl.h.
      * macfns.c (mac_frame_parm_handlers): Set handlers for
      Qleft_fringe and Qright_fringe.
      * macterm.c (mac_fill_rectangle_to_pixmap)
      (mac_draw_rectangle_to_pixmap, mac_copy_area_to_pixmap)
      (mac_copy_area_with_mask_to_pixmap, x_draw_image_foreground_1):
      Put in #if 0.
      (mac_scroll_area) [TARGET_API_MAC_CARBON]: Use ScrollWindowRect.
      (x_flush) [TARGET_API_MAC_CARBON]: Don't traverse frames.
      (XFlush) [TARGET_API_MAC_CARBON]: Define to an empty replacement.
      (x_draw_glyph_string_background, x_draw_glyph_string_foreground)
      [!MAC_OS8]: Added ifdef'd out code for os8.  Don't use
      XDrawImageString.  Always draw background and foreground separately.
      (x_draw_image_foreground): Use clipping instead of computing the
      intersection rectangle.
      (x_draw_image_glyph_string): Don't draw an image with mask to a
      pixmap.
      (x_redisplay_interface): Set flush_display_optional member to 0.
      (XTread_socket): Correctly reset the TEConverter
      object.
      fc7a70cc
  23. 02 Nov, 2004 1 commit
    • Jan Djärv's avatar
      * fileio.c (Fread_file_name): Pass Qt as fifth parameter to · f9d64bb3
      Jan Djärv authored
      Fx_file_dialog if only directories should be read.
      
      * lisp.h: Fx_file_dialog takes 5 parameters.
      
      * xfns.c (Fx_file_dialog): Both Motif and GTK version:  Add
      parameter only_dir_p.
      In Motif version, don't put DEFAULT_FILENAME in filter part of the
      dialog, just text field part.  Do not add DEFAULT_FILENAME
      to list of files if it isn't there.
      In GTK version, pass only_dir_p parameter to xg_get_file_name.
      
      * macfns.c (Fx_file_dialog): Add parameter only_dir_p.  Check
      only_dir_p instead of comparing prompt to "Dired".  When using
      a save dialog, add option kNavDontConfirmReplacement, change title
      to "Enter name", change text for save button to "Ok".
      
      * w32fns.c (Fx_file_dialog): Add parameter only_dir_p.  Check
      only_dir_p instead of comparing prompt to "Dired".
      
      * gtkutil.c (xg_get_file_with_chooser)
      (xg_get_file_with_selection): New functions, only defined ifdef
      HAVE_GTK_FILE_CHOOSER_DIALOG_NEW and HAVE_GTK_FILE_SELECTION_NEW
      respectively.
      (xg_get_file_name): Add parameter only_dir_p.
      Call xg_get_file_with_chooser or xg_get_file_with_selection
      depending on HAVE_GTK_FILE* and the value of use_old_gtk_file_dialog.
      (xg_initialize): New DEFVAR_BOOL use_old_gtk_file_dialog.
      
      * gtkutil.h (xg_get_file_name): Add parameter only_dir_p.
      f9d64bb3
  24. 10 Oct, 2004 1 commit
    • Steven Tamm's avatar
      macterm.c (x_raise_frame): Add BLOCK_INPUT around SelectWindow · c3f4c690
      Steven Tamm authored
        (x_lower_frame): Add BLOCK_INPUT around SendBehind
        (make_mac_frame): Add BLOCK_INPUT around the making of a
        terminal frame
        (mac_initialize): Add BLOCK_INPUT around carbon initialization
      macgui.h (mktime): Use emacs_mktime
      macfns.c (Fx_file_dialog): Add BLOCK_INPUT around more code.
        Make a cancel file-open dialog be like C-g.
      mac.c (mktime): Use emacs_mktime
        (Fdo_applescript): Add BLOCK_INPUT around do_applescript
        (Fmac_paste_function): Add better error handling for carbon
        cut/paste
      c3f4c690
  25. 06 Oct, 2004 1 commit
    • Steven Tamm's avatar
      macfns.c (mac_get_window_bounds): Add extern. · bf06c82f
      Steven Tamm authored
      (x_real_positions): Use mac_get_window_bounds.
      
      macmenu.c (update_submenu_strings): Apply 2004-09-07 change for
      xmenu.c (YAILOM).
      
      macterm.c [!MAC_OSX]: Include Windows.h.
      (front_emacs_window): Rename from mac_front_window.  All uses
      changed.  Return the frontmost non-tooltip emacs window.
      (mac_get_window_bounds): New function.
      (x_calc_absolute_position): Use the difference of width and height
      between the inner and outer window.
      (x_set_offset): Specify window position by the coordinae of the
      outer window.  Adjust the position if the title bar is completely
      outside the screen.
      (app_is_suspended, app_sleep_time): Remove unused variables.
      (do_app_resume, do_app_suspend): Remove their contents because
      window-activate/deactivate events will do the job.
      (do_zoom_window): Remove unused variables.  Make compliant to the
      standard way of zooming.  Set f->left_pos and f->top_pos.
      (XTread_socket): Don't use argument `expected'.  Don't use
      FrontWindow to determine the clicked window.  Exclude unprocessed
      mouseUp cases in the early stage.  Add parentheses to fix operator
      precedence.
      (XTread_socket) [TARGET_API_MAC_CARBON]: Don't specify drag area.
      bf06c82f
  26. 02 Sep, 2004 1 commit
  27. 26 Aug, 2004 1 commit
  28. 17 Jun, 2004 1 commit
  29. 06 Jun, 2004 1 commit
  30. 05 Jun, 2004 1 commit
  31. 30 May, 2004 1 commit
  32. 14 May, 2004 1 commit
  33. 12 May, 2004 1 commit
  34. 11 Mar, 2004 3 commits
    • Kim F. Storm's avatar
      (x_list_fonts, x_get_font_info, x_load_font) · 671be789
      Kim F. Storm authored
      (x_query_font, x_find_ccl_program, x_set_window_size)
      (x_make_frame_visible, mac_initialize, XCreatePixmap)
      (XCreatePixmapFromBitmapData, XFreePixmap, XSetForeground)
      (mac_draw_line_to_pixmap): Move prototypes to macterm.h.
      671be789
    • Steven Tamm's avatar
      * image.c [MAC_OSX]: Include sys/stat.h · 5243c06a
      Steven Tamm authored
      	* macfns.c (syms_of_macfns): Remove definitions of things now
      	defined in image.c
      5243c06a
    • Kim F. Storm's avatar
      Image consolidation: · 8dd5ac07
      Kim F. Storm authored
      (Vx_bitmap_file_path, Vimage_cache_eviction_delay)
      (x_bitmap_height, x_bitmap_width, x_bitmap_pixmap)
      (x_reference_bitmap, x_create_bitmap_from_data)
      (x_create_bitmap_from_file, x_destroy_bitmap)
      (x_destroy_all_bitmaps, x_create_bitmap_mask)
      (XGetImage, XPutPixel, XGetPixel, XDestroyImage)
      (QCascent, QCmargin, QCrelief, QCconversion, QCcolor_symbols)
      (QCheuristic_mask, QCindex, QCmatrix, QCcolor_adjustment, QCmask)
      (Qlaplace, Qemboss, Qedge_detection, Qheuristic, Qcenter)
      (define_image_type, lookup_image_type, valid_image_p)
      (image_error, enum image_value_type, struct image_keyword)
      (parse_image_spec, image_spec_value, Fimage_size, Fimage_mask_p)
      (make_image, free_image, prepare_image_for_display, image_ascent)
      (four_corners_best, image_background, image_background_transparent)
      (x_clear_image_1,  x_clear_image, x_alloc_image_color)
      (make_image_cache, free_image_cache, clear_image_cache)
      (Fclear_image_cache, postprocess_image, lookup_image, cache_image)
      (forall_images_in_image_cache, x_create_x_image_and_pixmap)
      (x_destroy_x_image, x_put_x_image, x_find_image_file, slurp_file)
      (find_image_fsspec, image_load_qt_1, image_load_quicktime)
      (init_image_func_pointer, image_load_quartz2d)
      (struct ct_color, init_color_table, free_color_table)
      (lookup_rgb_color, lookup_pixel_color, colors_in_color_table)
      (cross_disabled_images, x_to_xcolors, x_from_xcolors)
      (x_detect_edges, x_emboss, x_laplace, x_edge_detection)
      (x_disable_image, x_build_heuristic_mask)
      (XBM support, XPM support, PBM support, PNG support, JPEG support)
      (TIFF support, GIF support, Ghostscript support): Merge with image
      code from xfns.c and macfns.c into image.c.
      (syms_of_xfns): Move image related symbols to image.c.
      (init_external_image_libraries, init_xfns): Remove; initialization
      moved to init_image in image.c.
      8dd5ac07
  35. 26 Feb, 2004 1 commit