1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-28 02:40:46 -08:00
Commit graph

29847 commits

Author SHA1 Message Date
Michael Albinus
01768686d4 Fix syntax error in previous commit. 2010-11-10 10:08:05 +01:00
YAMAMOTO Mitsuharu
3106121c99 Add const to array elements of font filter properties.
* font.c (font_filter_properties): Add const to array elements of properties args.
* font.h (font_filter_properties): Likewise.
* ftfont.c (ftfont_booleans, ftfont_non_booleans): Add const to array elements.
* w32font.c (w32font_booleans, w32font_non_booleans): Likewise.
2010-11-10 18:02:54 +09:00
Michael Albinus
da1fec2bc1 * dbusbind.c (QCdbus_type_unix_fd): New Lisp object.
(XD_BASIC_DBUS_TYPE, xd_symbol_to_dbus_type, xd_signature)
(xd_append_arg, xd_retrieve_arg): Support DBUS_TYPE_UNIX_FD.
(Fdbus_call_method): Add DBUS_TYPE_UNIX_FD type mapping to doc string.
(syms_of_dbusbind): Initialize QCdbus_type_unix_fd).
2010-11-10 09:48:18 +01:00
Glenn Morris
bd6bc2222d * src/emacs.c (syms_of_emacs) <system-type>: Doc fix. 2010-11-09 19:45:29 -08:00
Stefan Monnier
d607b96bc2 Merge from emacs-23 2010-11-09 15:07:10 -05:00
Eli Zaretskii
c00980655b xfns.c (x_real_positions): Fix declaration-after-statement problem. 2010-11-09 15:55:52 +02:00
Jan D
66b167670d * src/xfns.c (set_machine_and_pid_properties): Let X set WM_CLIENT_MACHINE. 2010-11-07 12:25:55 +01:00
Jan D
27f92be77d * src/xdisp.c (note_mode_line_or_margin_highlight): Initialize
Cursor to No_Cursor for HAVE_WINDOW_SYSTEM also.
2010-11-07 12:16:54 +01:00
Eli Zaretskii
7d7cd6cef8 xdisp.c: Add commentary about character compositions in bidirectional text. 2010-11-06 20:19:32 +02:00
Eli Zaretskii
6dc61cf1b6 src/ChangeLog: Fix log entry for 2010-11-06T09:33:22Z!jan.h.d@swipnet.se. 2010-11-06 15:49:29 +02:00
Eli Zaretskii
a971c0a724 Support R2L lines in tool-tip text.
xfns.c (Fx_show_tip): If any of the tool-tip text lines is R2L,
 adjust width of tool-tip frame to the width of text, excluding the
 stretch glyph at the beginning of R2L glyph rows.
 w32fns.c (Fx_show_tip): Likewise.
2010-11-06 15:45:37 +02:00
Andreas Schwab
4abfb7532c configure.in: Fix indentation 2010-11-06 11:31:56 +01:00
Jan Djärv
80417b95f4 * src/nsfont.m: Include termchar for new mouse-highlight. 2010-11-06 10:33:22 +01:00
Eli Zaretskii
c1fc2d3a9c Unify mouse-highlight code for all GUI and TTY sessions.
term.c: Remove static mouse_face_* variables.  All users
 changed.
 (term_show_mouse_face, term_clear_mouse_face)
 (fast_find_position, term_mouse_highlight): Functions deleted.
 (tty_draw_row_with_mouse_face): New function.
 (term_mouse_movement): Call note_mouse_highlight instead of
 term_mouse_highlight.
 nsterm.m (ns_update_window_begin, ns_update_window_end)
 (ns_update_end, x_destroy_window, ns_frame_up_to_date)
 (ns_dumpglyphs_box_or_relief, ns_maybe_dumpglyphs_background)
 (ns_dumpglyphs_image, ns_dumpglyphs_stretch)
 (ns_initialize_display_info, keyDown, mouseMoved, mouseExited):
 Replace Display_Info with Mouse_HLInfo everywhere where
 mouse_face_* members were accessed for mouse highlight purposes.
 xterm.c (x_update_window_begin, x_update_window_end)
 (x_update_end, XTframe_up_to_date, x_set_mouse_face_gc)
 (handle_one_xevent, x_free_frame_resources, x_term_init): Replace
 Display_Info with Mouse_HLInfo everywhere where mouse_face_*
 members were accessed for mouse highlight purposes.
 w32term.c (x_update_window_begin, x_update_window_end)
 (x_update_end, w32_read_socket, x_free_frame_resources)
 (w32_initialize_display_info): Replace Display_Info with
 Mouse_HLInfo everywhere where mouse_face_* members were accessed
 for mouse highlight purposes.
 xdisp.c (show_mouse_face, note_mode_line_or_margin_highlight)
 (note_mouse_highlight) [HAVE_WINDOW_SYSTEM]: Don't run GUI code
 unless the frame is on a window-system.
 (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.
 (coords_in_mouse_face_p): Move prototype out of the
 HAVE_WINDOW_SYSTEM conditional.
 (x_y_to_hpos_vpos, frame_to_window_pixel_xy): Move out of the
 HAVE_WINDOW_SYSTEM block.
 (try_window_id) [HAVE_GPM || MSDOS]: Call
 x_clear_window_mouse_face.
 (draw_row_with_mouse_face): Implementation for HAVE_WINDOW_SYSTEM
 systems.  Call tty_draw_row_with_mouse_face for TTY systems.
 (show_mouse_face): Call draw_row_with_mouse_face, instead of
 calling draw_glyphs directly.
 (show_mouse_face, clear_mouse_face, coords_in_mouse_face_p)
 (cursor_in_mouse_face_p, rows_from_pos_range)
 (mouse_face_from_buffer_pos, mouse_face_from_string_pos)
 (note_mode_line_or_margin_highlight, note_mouse_highlight)
 (x_clear_window_mouse_face, cancel_mouse_face): Move out of the
 HAVE_WINDOW_SYSTEM block.  Ifdef away window-system specific
 fragments.
 (note_mouse_highlight): Call popup_activated for MSDOS as well.
 Clear mouse highlight if pointer is over glyphs whose OBJECT is an
 integer.
 (mouse_face_from_buffer_pos): Add parentheses around && within ||.
 (x_consider_frame_title, tool_bar_lines_needed): Move
 prototypes to HAVE_WINDOW_SYSTEM-only part.
 (get_window_cursor_type): Move inside a HAVE_WINDOW_SYSTEM-only
 part.  Remove "#ifdef HAVE_WINDOW_SYSTEM" from body of function.
 (null_glyph_slice): Move declaration into HAVE_WINDOW_SYSTEM-only
 part.
 dispnew.c (mirror_make_current): Set Y coordinate of the
 mode-line and header-line rows.
 (init_display): Setup initial frame's output_data for text
 terminal frames.
 xmenu.c (popup_activated): Don't define on MSDOS, which now has
 its own definition on msdos.c.
 msdos.c (show_mouse_face, clear_mouse_face)
 (fast_find_position, IT_note_mode_line_highlight)
 (IT_note_mouse_highlight): Functions deleted.
 (IT_frame_up_to_date, dos_rawgetc): Call note_mouse_highlight
 instead of IT_note_mouse_highlight.
 (draw_row_with_mouse_face, popup_activated): New functions.
 (dos_set_window_size, draw_row_with_mouse_face, IT_update_begin)
 (IT_update_end, IT_frame_up_to_date, internal_terminal_init)
 (dos_rawgetc): Replace Display_Info with Mouse_HLInfo everywhere
 where mouse_face_* members were accessed for mouse highlight
 purposes.
 msdos.h (initialize_msdos_display): Add prototype.
 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 (show_mouse_face, clear_mouse_face): Update type of
 1st argument.
 (frame_to_window_pixel_xy, note_mouse_highlight)
 (x_clear_window_mouse_face, cancel_mouse_face, clear_mouse_face)
 (show_mouse_face, cursor_in_mouse_face_p): Move prototypes out of
 HAVE_WINDOW_SYSTEM conditional.
 (draw_row_with_mouse_face): Declare prototype.
 (tty_draw_row_with_mouse_face): Declare prototype.
2010-11-06 10:28:31 +02:00
Eli Zaretskii
0a56722656 Cleanup -Wall warnings.
xdisp.c (get_window_cursor_type): Move inside a HAVE_WINDOW_SYSTEM-only
 part.  Remove "#ifdef HAVE_WINDOW_SYSTEM" from body of function.
 (null_glyph_slice): Move declaration into HAVE_WINDOW_SYSTEM-only part.
2010-11-05 23:47:58 +02:00
Chong Yidong
be3faa809a Fix the fix for Bug#6426 (Bug#7210), avoiding frame garbaging loop.
* image.c (free_image): Don't garbage the frame here, since this
function can be called while redisplaying (Bug#7210).
(uncache_image): Garbage the frame here (Bug#6426).
2010-11-05 14:28:19 -04:00
Eli Zaretskii
8e5ba371f2 Fix unified mouse highlight after compiling on Unix.
xdisp.c (x_consider_frame_title, tool_bar_lines_needed): Move
 prototypes to HAVE_WINDOW_SYSTEM-only part.
 frame.h (MOUSE_HL_INFO): Fix definition to work both for
 TTY-only and GUI builds.
2010-11-05 20:07:42 +02:00
Eli Zaretskii
6e8d7c4713 term.c (append_glyphless_glyph, produce_glyphless_glyph): Remove unused variables. 2010-11-05 19:52:06 +02:00
Eli Zaretskii
7ac5dac913 Fix mouse redesigned mouse highlight on MSDOS.
dispnew.c (init_display): Setup initial frame's output_data for
 text terminal frames.
 frame.h (MOUSE_HL_INFO): Fix TTY definition.
 msdos.h (initialize_msdos_display): Add prototype.
2010-11-05 14:11:22 +02:00
Adrian Robert
f31ba3f06f * nsterm.m (EmacsView-mouseExited:): Correct error in conditional logic pointed out by Eli Zaretskii. 2010-11-05 12:35:36 +02:00
Eli Zaretskii
28118eb6e5 Cleanup fallout from redesigning mouse highlight.
dispextern.h (tty_draw_row_with_mouse_face): Add prototype.
 xdisp.c (draw_row_with_mouse_face): Don't #ifdef away on MSDOS.
 Call tty_draw_row_with_mouse_face on MSDOS as well.
 msdos.c (tty_draw_row_with_mouse_face): Renamed from
 draw_row_with_mouse_face.  Make the argument list identical to the
 GPM implementation.
 msdos.h (Display_Info): Restore typedef.
2010-11-05 12:03:17 +02:00
Glenn Morris
0c3a9a9fb4 ChangeLog fix. 2010-11-04 17:01:59 -07:00
Lars Magne Ingebrigtsen
448e17d69a Refer to set-coding-system-priority instead of the obsolete
set-coding-priority in the doc string.
2010-11-04 23:37:06 +01:00
Chong Yidong
055c91d432 Backport fix for Bug#5723 from trunk. 2010-11-04 15:56:50 -04:00
Chong Yidong
184765cc7a Backport 2010-03-27T00:45:32Z!cyd@stupidchicken.com from trunk 2010-11-04 15:54:28 -04:00
YAMAMOTO Mitsuharu
bd80a88673 Backport 2010-03-25T08:56:15Z!mituharu@math.s.chiba-u.ac.jp from trunk 2010-11-04 15:54:14 -04:00
Helmut Eller
c2e124a95b Backport 2010-03-25T08:48:52Z!mituharu@math.s.chiba-u.ac.jp from trunk 2010-11-04 15:53:28 -04:00
Kenichi Handa
68ae6cda9e Backport 2010-05-27T04:24:30Z!handa@etlken from trunk 2010-11-04 15:46:30 -04:00
YAMAMOTO Mitsuharu
db5cada28d Backport fix for Bug#2423 from trunk.
* dispextern.h (TRY_WINDOW_CHECK_MARGINS)
(TRY_WINDOW_IGNORE_FONTS_CHANGE): New defines.

* xdisp.c (try_window): Change arg from CHECK_MARGINS to FLAGS.
Don't abort with fonts change if TRY_WINDOW_IGNORE_FONTS_CHANGE is
set in FLAGS.  Callers with non-zero CHECK_MARGINS changed to use
TRY_WINDOW_CHECK_MARGINS.

* xfns.c (Fx_show_tip): Undo last change.  Call try_window with
TRY_WINDOW_IGNORE_FONTS_CHANGE (Bug#2423).
2010-11-04 15:39:47 -04:00
Chong Yidong
2511e8e04f Backport 2010-04-10T10:52:30Z!mituharu@math.s.chiba-u.ac.jp from trunk 2010-11-04 15:35:32 -04:00
Chong Yidong
fa884f18e1 Backport 2010-04-10T10:39:16Z!mituharu@math.s.chiba-u.ac.jp from trunk 2010-11-04 15:34:50 -04:00
Chong Yidong
c698128618 Backport from trunk. 2010-11-04 15:34:11 -04:00
Glenn Morris
0a61b059c6 ChangeLog fix.
Ref: http://lists.gnu.org/archive/html/emacs-devel/2010-11/msg00133.html
2010-11-04 11:22:12 -07:00
Adrian Robert
3fdebbf9ac * nsfont.m (nsfont_draw) * nsimage.m (EmacsImage-setXBMColor:) * nsterm.m (EmacsView-performDragOperation:): Correct empty return statements. Based on a patch by Ismail Donmez <ismail@namtrac.org>. 2010-11-04 20:10:50 +02:00
Jan Djärv
31887d45e8 * xfns.c (x_real_positions): Only use _NET_FRAME_EXTENTS if our
parent is the root window.  Check this after traversing window tree.
2010-11-04 13:37:17 +01:00
Jan Djärv
69ee5b0fd6 Remove debug code. 2010-11-04 13:17:46 +01:00
Jan Djärv
d75c999218 Get window position by reading _NET_FRAME_EXTENTS (Bug#5721).
* src/xfns.c (x_real_positions): Try to get _NET_FRAME_EXTENTS first
before traversing window tree (Bug#5721).

* src/xterm.c (x_term_init): Initialize Xatom_net_frame_extents.

* src/xterm.h (struct x_display_info): Xatom_net_frame_extents is new.
2010-11-04 09:41:25 +01:00
Julien Danjou
17c0c952f8 Support for gif transparency.
* image.c (gif_load): Add support for transparency and specified
:background.
2010-11-03 16:08:48 -04:00
Glenn Morris
754996bcf8 Fix for Bug#5655, backported from trunk.
* configure.in (CRT_DIR): New output variable.
(--with-crt-dir): New option.  (Bug#5655)
(HAVE_LIB64_DIR): Remove.

* src/Makefile.in (CRT_DIR): New variable, set by configure.
* src/m/amdx86-64.h, m/ibms390x.h (START_FILES, LIB_STANDARD):
Use $CRT_DIR rather than HAVE_LIB64_DIR.  (Bug#5655)
2010-11-03 14:55:19 -04:00
Glenn Morris
537b04b96a Don't be so lax with spelling.
* lisp/net/dbus.el (dbus-name-owner-changed-handler): Doc fix.

* doc/misc/ediff.texi (Quick Help Commands, Miscellaneous): Spelling fix.
2010-11-02 20:49:04 -07:00
Glenn Morris
cf503f7c08 Mere anarchy is loosed upon the world.
* doc/misc/gnus.texi (Agent Variables): Spelling fix.
2010-11-02 20:40:54 -07:00
Eli Zaretskii
cf482c5079 Reflect mouse-highlight redesign in term.c
term.c: Remove static mouse_face_* variables.  All users changed.
 (term_show_mouse_face, term_clear_mouse_face)
 (fast_find_position, term_mouse_highlight): Functions deleted.
 (tty_draw_row_with_mouse_face): New function.
 (term_mouse_movement): Call note_mouse_highlight instead of
 term_mouse_highlight.
2010-11-02 21:35:12 +02:00
Eli Zaretskii
34574c0221 REALLY finish coding portable mouse highlight.
msdos.c (dos_set_window_size, draw_row_with_mouse_face)
 (IT_update_begin, IT_update_end, IT_frame_up_to_date)
 (internal_terminal_init, dos_rawgetc): Replace Display_Info with
 Mouse_HLInfo everywhere where mouse_face_* members were accessed
 for mouse highlight purposes.
2010-11-01 22:19:17 +02:00
Eli Zaretskii
bbf534ce52 Finish coding mouse highlight redesigned for portability.
Not compiled yet.

 nsterm.m (ns_update_window_begin, ns_update_window_end)
 (ns_update_end, x_destroy_window, ns_frame_up_to_date)
 (ns_dumpglyphs_box_or_relief, ns_maybe_dumpglyphs_background)
 (ns_dumpglyphs_image, ns_dumpglyphs_stretch)
 (ns_initialize_display_info, keyDown, mouseMoved, mouseExited):
 Replace Display_Info with Mouse_HLInfo everywhere where
 mouse_face_* members were accessed for mouse highlight purposes.
 xterm.c (x_update_window_begin, x_update_window_end)
 (x_update_end, XTframe_up_to_date, x_set_mouse_face_gc)
 (handle_one_xevent, x_free_frame_resources, x_term_init): Replace
 Display_Info with Mouse_HLInfo everywhere where mouse_face_*
 members were accessed for mouse highlight purposes.
 w32term.c (x_update_window_begin, x_update_window_end)
 (x_update_end, w32_read_socket, x_free_frame_resources)
 (w32_initialize_display_info): Replace Display_Info with
 Mouse_HLInfo everywhere where mouse_face_* members were accessed
 for mouse highlight purposes.
 xdisp.c (show_mouse_face, note_mode_line_or_margin_highlight)
 (note_mouse_highlight) [HAVE_WINDOW_SYSTEM]: Don't run GUI code
 unless the frame is on a window-system.
2010-11-01 22:09:03 +02:00
Chong Yidong
91fd0b7281 Fix error in last merge from branch.
Remove 2010-10-25 commit by Michael Albinus to dbusbind.c, which is
not intended for trunk.
2010-11-01 11:18:42 -04:00
Juanma Barranquero
a8039db123 Fix dates in ChangeLog entries. 2010-11-01 15:59:31 +01:00
Jan Djärv
3649d303b0 Backport fix for Bug#6571 from trunk. NOTE: May cause merge conflicts.
* src/keyboard.c (input_available_signal): Declare.
(kbd_buffer_nr_stored): New function.
(kbd_buffer_store_event_hold): If kbd_buffer_nr_stored returns
more than KBD_BUFFER_SIZE/2, stop reding input (Bug#6571).
(kbd_buffer_get_event): If input is suspended and kbd_buffer_nr_stored
returns less than KBD_BUFFER_SIZE/4, resume reding input (Bug#6571).
(tty_read_avail_input): If input is on hold, return.
Don't read more that free slots in kbd_buffer (Bug#6571).

* src/process.c (kbd_is_on_hold): New variable.
(hold_keyboard_input, unhold_keyboard_input, kbd_on_hold_p):
New functions.
(wait_reading_process_output): If kbd_on_hold_p returns non-zero,
select on empty input mask.
(init_process): Initialize kbd_is_on_hold to 0.

* src/process.h (hold_keyboard_input, unhold_keyboard_input)
(kbd_on_hold_p): Declare.
2010-11-01 12:30:33 +01:00
Kenichi Handa
f6f3366160 merge trunk 2010-11-01 16:53:08 +09:00
Kenichi Handa
65b6b59a80 w32term.c (x_draw_glyphless_glyph_string_foreground): Fix the arg with_background for font->driver->draw. 2010-11-01 16:35:04 +09:00
Kenichi Handa
b18fad6db4 Handle glyphless characters on tty. 2010-11-01 13:09:26 +09:00