1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-20 11:33:09 -08:00
Commit graph

79 commits

Author SHA1 Message Date
Steven Tamm
c3f4c690b6 macterm.c (x_raise_frame): Add BLOCK_INPUT around SelectWindow
(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
2004-10-10 16:56:21 +00:00
Kim F. Storm
f94a2622a0 (x_update_window_end): Fix flicker on vertical line between
windows.  Update vertical line after drawing window fringes, but
only if actually drawing any bitmaps--or there is no fringe.
2004-10-07 21:59:39 +00:00
Steven Tamm
bf06c82f4b macfns.c (mac_get_window_bounds): Add extern.
(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.
2004-10-06 15:38:53 +00:00
Steven Tamm
404e4b841e (x_update_end): Move SetPortWindowPort to inside
BLOCK_INPUT.
(x_set_offset): Use FRAME_MAC_WINDOW.
2004-09-02 17:00:55 +00:00
Steven Tamm
e082ac9deb Fixes for Ctrl-G support on carbon, replacing old timeout based polling
with alarm based polling.
mac.c (sys_select): Redo sys_select to use alarm-based
polling instead of 1 sec timeouts (like solaris).
macterm.c (x_make_frame_visible): Comment in polling on
frame creation.
keyboard.c: Undef SIGIO on Carbon
atimer.c (alarm_signal_handler): Call alarm handlers after
scheduling.
eval.c (Feval): Remove quit_char test
process.c (wait_reading_process_input): Remove clearing
stdin for select call on process input
2004-07-19 04:42:43 +00:00
Jan Djärv
2bac9bb1c6 * macterm.c (mac_initialize_display_info): Use CGGetActiveDisplayList
instead of CGMainDisplayID (only in OSX 10.2 and later).
2004-07-05 07:01:02 +00:00
Steven Tamm
59feca74b2 macterm.c (do_window_activate, do_window_deactivate): Remove.
(XTread_socket): Fix activation/focus problems by only handling
emacs windows and passing mouse events to the event chain regardless.
2004-06-29 06:39:03 +00:00
Steven Tamm
c61278bbde macterm.c (mac_get_emulated_btn)
(mac_event_to_emacs_modifiers): Fix emulated mouse button
support to correctly mask out modifiers.
2004-06-29 06:23:08 +00:00
Steven Tamm
e439b9255d macterm.c (XTread_socket): Correctly set the frame position
after the window is moved.
2004-06-28 16:20:41 +00:00
Jan Djärv
f303762dc1 * macfns.c (Fx_display_color_cells): Do not limit return value to 256.
* macterm.c (mac_initialize_display_info): Initialize n_planes correctly
on Mac OSX.
2004-06-17 13:04:25 +00:00
Steven Tamm
50bf76732b Support Tooltips with the Carbon emacs port.
Some code cleanup using helper macros.
2004-05-30 00:18:41 +00:00
Steven Tamm
a433994a5a Various fixes to support USE_LSB_TAG with carbon emacs. Mostly fixing
prototypes and confusions between pointers and lisp objects
2004-05-14 03:07:12 +00:00
Steven Tamm
fe97e8dfe1 macterm.c (x_flush, XTframe_up_to_date): use FRAME_MAC_P
instead of FRAME_X_P
2004-05-12 01:40:05 +00:00
Steven Tamm
2a316a84d5 macterm.c (mac_check_for_quit_char): Adding BLOCK_INPUT
around call to ReceiveEvent to avoid certain crashes.
(mac_draw_line_to_pixmap, XCreatePixmapFromBitmapData)
(mac_fill_rectangle_to_pixmap, mac_draw_rectangle_to_pixmap)
(mac_copy_area_to_pixmap, mac_copy_area_with_mask_to_pixmap):
Save/restore the current graphics port and device handle when
drawing into an offscreen graphics world.
image.c [MAC_OS] (XPutPixel, XGetPixel, image_load_qt_1)
(gif_load): Likewise.
2004-05-07 17:46:50 +00:00
Kim F. Storm
5970dbf71e (x_draw_hollow_cursor): Fix height of box for narrow lines. 2004-04-24 23:42:26 +00:00
Kim F. Storm
ffe8b3f4e8 (x_draw_relief_rect): Add top_p and bot_p args.
(x_draw_glyph_string_box): Fix call to x_draw_relief_rect.
(x_draw_image_foreground, x_draw_image_relief)
(x_draw_image_foreground_1, x_draw_image_glyph_string):
Draw sliced images.
2004-04-20 22:17:34 +00:00
Kim F. Storm
6321121d3f (XTread_socket): Fix mouse click on tool bar. 2004-03-11 22:43:32 +00:00
Kim F. Storm
ff158530cb (XTread_socket): Remove bufp_r and numcharsp args. Add hold_quit arg.
Rework to use just one, local, inev input_event. Store inev
directly in fifo using kbd_buffer_store_event_hold.
2004-02-27 23:47:13 +00:00
Steven Tamm
e35644615b Inserting Yamomotosan's changes for MacOSX image support, better support
of Asian fonts, and some long awaited header cleanup and centralization.
2004-02-26 17:46:48 +00:00
Steven Tamm
dd4497dc17 (Vmac_emulate_three_button_mouse): New variable for
controlling emulation of a three button mouse with option and
command keys.
(Qreverse, mac_get_enumlated_btn): Handle the emulation
(mac_event_to_emacs_modifiers, XTread_socket): Ditto
2004-02-15 17:16:18 +00:00
Kim F. Storm
dcd0c64591 (mac_draw_bitmap): Handle 16 bits wide bitmaps directly.
(x_draw_fringe_bitmap): Use enhanced mac_draw_bitmap, so we no longer
need to call mac_create_bitmap_from_bitmap_data and mac_free_bitmap.
2004-02-13 23:28:32 +00:00
Kim F. Storm
41840482b0 (mac_draw_bitmap): Add overlay_p arg.
(x_draw_fringe_bitmap):  Handle overlayed fringe bitmaps;
thanks to YAMAMOTO Mitsuharu for advice on how to do this.
Use cursor color for displaying cursor in fringe.
2004-02-09 09:18:17 +00:00
Kim F. Storm
288670f579 (x_draw_fringe_bitmap): Copy unadapted code from
xterm.c to handle overlayed fringe bitmaps and to use cursor color
for displaying cursor in fringe.
(x_redisplay_interface): Add null handlers for
define_fringe_bitmap and destroy_fringe_bitmap functions.
2004-02-08 23:20:10 +00:00
Steven Tamm
21a3e65787 Move setting of scroll bars from make_mac_frame to
make_mac_terminal_frame to prevent clobbering of
scroll-bar-mode.
2004-01-27 07:32:41 +00:00
Stefan Monnier
6839cd1500 (main) [USE_LSB_TAG]: Don't range check the ram. 2004-01-21 04:02:39 +00:00
Kim F. Storm
797dc7b8e2 (x_update_window_end): Call draw_window_fringes.
(x_after_update_window_line): Just set redraw_fringe_bitmaps_p
in row instead of actually drawing fringe bitmaps.
(x_draw_fringe_bitmap): Handle bottom aligned bitmaps.
(mac_draw_window_cursor): Draw cursor in fringe.
2004-01-16 18:46:29 +00:00
Stefan Monnier
eccab14434 (do_check_ram_size): Don't hardcode the lisp address space size. 2004-01-14 14:24:38 +00:00
Andreas Schwab
181e6a61ec (emacs_options, x_initialized, same_x_server): Remove
unused (and duplicated) definitions.
2004-01-02 22:17:42 +00:00
Kim F. Storm
db4f9403e1 (Qface, Qmouse_face): Remove unused externs. 2003-12-27 23:19:43 +00:00
Andrew Choi
64d4923e06 macterm.c (XTread_socket): Handle menubar selection and grow window
only for mouseDown events.
2003-11-01 19:58:03 +00:00
Andrew Choi
a4887377a2 * macterm.c (XTread_socket): Call DragWindow only for mouseDown events. 2003-10-13 00:07:10 +00:00
Kenichi Handa
be2fdba9df (x_load_font): Clear all members of FONTP before start filling them. 2003-10-03 11:36:59 +00:00
Miles Bader
ab5796a9f9 Add arch taglines 2003-09-01 15:45:59 +00:00
Stefan Monnier
c61ab2a006 (mac_check_for_quit_char): Don't pass uninitialized
data to kbd_buffer_store_event.
2003-06-15 20:59:24 +00:00
Jason Rumney
1beaad814a (XTread_socket): Map mouse wheel events to Emacs
WHEEL_EVENT events.
2003-06-04 22:03:44 +00:00
Kim F. Storm
f1a83aabaa Make (several) trivial substitutions for renamed and
new macros in dispextern.h, frame.h and window.h.
(x_draw_glyph_string_box): Adapt to per-window fringes and
scroll-bars.
(glyph_rect): Use window coordinates returned from
window_from_coordinates rather than frame_to_window_pixel_xy.
(XTset_vertical_scroll_bar): Adapt to per-window fringes and
scroll-bars.
(x_clip_to_row): Remove superfluous whole_line_p arg and code
(fringes are now inside margins, i.e. always in the clipping area).
All callers changed.
(x_new_font): Set FRAME_COLUMN_WIDTH and FRAME_LINE_HEIGHT
directly, then call compute_fringe_widths.  Don't call
frame_update_line_height.
2003-05-24 22:00:34 +00:00
Stefan Monnier
f1321dc307 (Fselect_window): Add optional arg `norecord'. 2003-05-17 21:17:45 +00:00
Andrew Choi
0b325c12a2 * macterm.c (x_list_fonts): Return all fonts that match if maxnames = -1. 2003-04-25 04:32:25 +00:00
Andrew Choi
d243e605a0 * macterm.c (mac_check_for_quit_char): Don't check more often than
once a second.
2003-04-14 17:12:17 +00:00
Kim F. Storm
88cd462dc6 Remove unnecessary extern declarations.
(x_redisplay_interface): Add mac_frame_parm_handlers member.
2003-03-31 20:34:48 +00:00
Andreas Schwab
efcf423469 (x_redisplay_interface): Add missing entry for
draw_vertical_window_border.
2003-03-30 15:35:32 +00:00
Kim F. Storm
e080d3ebbf * xdisp.c (pixel_to_glyph_coords, glyph_to_pixel_coords):
Add generic versions here.  Remove system specific versions
defined elsewhere.
2003-03-21 22:56:52 +00:00
Kim F. Storm
e5a3b7d969 (struct redisplay_interface): Add active_p argument to
draw_window_cursor member.  All uses changed.
2003-03-21 21:47:46 +00:00
Kim F. Storm
f9e65eb300 * macterm.c: Remove consolidated defines and code.
(BETWEEN): Remove unused macro.
(mac_draw_vertical_window_border, mac_shift_glyphs_for_insert)
(mac_define_frame_cursor, mac_clear_frame_area)
(mac_draw_window_cursor): New Mac-specific functions for RIF.
(x_redisplay_interface): Add new members.
2003-03-21 13:50:10 +00:00
Kim F. Storm
750fc6732f The following changes consolidate some of the gui-independent
parts of the processing and drawing of "glyph strings" from
xterm.c, w32term.c, and macterm.c into xdisp.c.

* macterm.c: Remove consolidated defines and code.
(mac_per_char_metric): New function for RIF.
(mac_encode_char): Adapted to new RIF requirements.
(mac_compute_glyph_string_overhangs): Adapt for RIF.
(x_redisplay_interface): Add new members.
2003-03-16 20:48:56 +00:00
Kim F. Storm
5958f26590 Remove generic fringe code.
(x_draw_fringe_bitmap): Only perform actual fringe drawing.
(x_redisplay_interface): Add x_draw_fringe_bitmap member.
2003-03-12 12:10:36 +00:00
Juanma Barranquero
177c0ea743 Trailing whitespace deleted. 2003-02-04 14:56:31 +00:00
Andrew Choi
058c18c71f 2003-01-28 Benjamin Riefenstahl <Benjamin.Riefenstahl@epost.de>
* macterm.c (keycode_to_xkeysym_table): Add <tab>, <backspace>,
        <escape>.
        (keycode_to_xkeysym_table): Reformat and add more comments.
        (XTread_socket): Drop special case for backspace.

        * term/mac-win.el: Add entries in function-key-map for
        [tab], [backspace], [escape].
2003-01-28 18:46:07 +00:00
Steven Tamm
539e69a9fd * macterm.c (XTread_socket): Checks for valid, visible window
before sending a scroll-wheel event.
2003-01-20 16:53:38 +00:00
Steven Tamm
8c609cffa6 * macterm.c (syms_of_macterm): Provide the feature "mac-carbon" to
distinguish Carbon GUI builds from X11 builds on darwin.
2003-01-02 22:36:23 +00:00