Commit graph

29926 commits

Author SHA1 Message Date
Jan Djärv
146490c35d Draw cursor and images correctly for Nextstep (bug#7412).
* src/nsterm.m (ns_dumpglyphs_image): If drawing cursor, fill background
with cursor color and draw a rectangle around the image.
2010-12-03 11:54:44 +01:00
Andreas Schwab
babc8f0d4a * frame.c (x_set_font): Remove unused variable. 2010-12-03 11:07:40 +01:00
Jan Djärv
dd723bbd42 * nsmenu.m (update_frame_tool_bar): Remove NSLog on invalid image. 2010-12-02 10:33:57 +01:00
Jan Djärv
9583e9a03c Draw text under filled box cursor in inverted color (Bug#7479).
* src/nsterm.m (ns_draw_glyph_string): Switch fore- and background if
drawing text under filled box cursor.
2010-12-02 09:24:16 +01:00
Chong Yidong
088c8c092b Fix error in last merge.
src/gtkutil.c (menubar_map_cb): Use xg_height_or_width_changed.
2010-11-30 12:01:18 -05:00
Chong Yidong
07976ae3b8 Merge changes from emacs-23 branch 2010-11-27 15:04:57 -05:00
Eli Zaretskii
228482b229 Force left-to-right paragraph direction in echo area and prog-mode buffers.
src/xdisp.c (set_message_1): Force paragraph direction in echo area
 be left-to-right.
 lisp/simple.el (prog-mode): Set bidi-paragraph-direction to left-to-right.
2010-11-26 21:10:26 +02:00
Eli Zaretskii
8547874a7c Fix and document components of mouse event position.
src/keyboard.c (make_lispy_position): Put a meaningful value in yret
 when the click is on the header or mode line.
 doc/lispref/commands.texi (Click Events): Document the values of X, Y and
 COL, ROW in the event's position, when the click is on the header or
 mode line, on the fringes, or in the margins.
2010-11-26 20:15:09 +02:00
Eli Zaretskii
123652403c Fixing bug #7474 also fixes #7481. 2010-11-25 22:28:14 +02:00
Eli Zaretskii
1e2dddbe93 Fix bug #7474 with cursor positioning in overlay strings.
xdisp.c (set_cursor_from_row): Don't forget to consider the
 `cursor' property of the first character in overlay strings.
2010-11-25 20:38:09 +02:00
Kenichi Handa
e957f9ae90 merge emacs-23 2010-11-25 12:56:41 +09:00
Kenichi Handa
b84ae58433 Fix decoding of emacs-mule coding system. 2010-11-25 12:55:14 +09:00
Jan Djärv
c80c6166fb nsterm.m (keyDown): Compare Left key masks exactly (Bug#7458). 2010-11-24 15:52:14 +01:00
Jan Djärv
50795d1ff3 Bug 7458: Make key press like Left + right ctrl work when right is not control.
Ditto Alt and Command.

* src/nsterm.m (NSLeftControlKeyMask, NSLeftCommandKeyMask)
(NSLeftAlternateKeyMask): New defines.
(keyDown): Parse left and right keys separatly.
2010-11-24 08:50:08 +01:00
Eli Zaretskii
f8ab8c1f81 Avoid GCC warning with inline functions.
intervals.c (temp_set_point_both): Define before calling, to
 avoid GCC warnings.
2010-11-23 22:27:22 +02:00
Dan Nicolaescu
b29116efce * src/nsmenu.m: Use #include <config.h> instead of "config.h". 2010-11-23 11:36:48 -08:00
Dan Nicolaescu
b932f8b17e Move extern declarations from term.c to lisp.h.
* src/term.c (Qglyphless_char,last_glyphless_glyph_frame)
(last_glyphless_glyph_face_id. last_glyphless_glyph_merged_face_id):
Move declarations ...
* src/lisp.h (Qglyphless_char,last_glyphless_glyph_frame)
(last_glyphless_glyph_face_id. last_glyphless_glyph_merged_face_id):
... here.
2010-11-23 10:56:28 -08:00
Dan Nicolaescu
42c8bc9b87 Mark debugger related variables and functions as EXTERNALLY_VISIBLE
so that they do not get optimized away.

* configure.in (EXTERNALLY_VISIBLE): New definition.

* src/emacs.c (gdb_use_union, gdb_valbits,gdb_gctypebits)
(gdb_data_seg_bits, gdb_array_mark_flag, PVEC_FLAG)
(gdb_pvec_type):
* src/print.c (print_output_debug_flag):
* src/lisp.h (debug_print): Mark as EXTERNALLY_VISIBLE.
(safe_debug_print): New declaration.
2010-11-23 10:47:23 -08:00
Dan Nicolaescu
2e8a479790 Include <sys/ioctl.h> unconditionally.
* configure.in <AC_CHECK_HEADERS>: Remove sys/ioctl.h.
* src/xterm.c:
* src/systty.h:
* src/sound.c: Include <sys/ioctl.h> unconditionally.
2010-11-23 10:09:55 -08:00
Eli Zaretskii
a6d3e72e37 w32.c: Fix a typo in a comment. 2010-11-22 20:15:07 +02:00
Eli Zaretskii
b8e5cf1da0 Back-port 2010-09-17T21:34:45Z!eliz@gnu.org from the trunk, to resolve bug #7452.
w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions
 of w32api >= 3.15.
2010-11-22 20:09:29 +02:00
YAMAMOTO Mitsuharu
b609f5916d * alloc.c (mark_maybe_object): Return early if given a Lisp integer (Bug#6301). 2010-11-21 19:43:53 -05:00
YAMAMOTO Mitsuharu
96ad0af741 Fix image cache marking bug (Bug#6301).
* src/alloc.c (mark_terminals): Ensure that the image cache is marked
even if the terminal object was marked earlier (Bug#6301).
2010-11-21 19:39:42 -05:00
Chong Yidong
35f1de62f2 * editfns.c (Fbyte_to_string): Signal an error if arg is not a byte. 2010-11-21 13:16:19 -05:00
Ken Brown
731e263a73 * src/sheap.c (STATIC_HEAP_SIZE): Revert previous change. 2010-11-21 10:46:23 -05:00
Jan Djärv
b7d1e14447 Add separate key mappings for left/right control/command on Nextstep (Bug#7458).
* lisp/cus-start.el (all): Add ns-right-control-modifier and
ns-right-command-modifier.

* lisp/term/ns-win.el (ns-right-control-modifier)
(ns-right-command-modifier): Defvar them.

* src/nsterm.m (ns_right_command_modifier, ns_right_control_modifier):
Define (Bug#7458).
(NSRightCommandKeyMask, NSRightControlKeyMask): Define (Bug#7458).
(EV_MODIFIERS): Check for NSRightCommandKeyMask and
NSRightControlKeyMask also (Bug#7458).
(keyDown): Ditto (Bug#7458).
(syms_of_nsterm): Defvar ns-right-command-modifier and
ns-right-control-modifier (Bug#7458).
2010-11-21 14:09:34 +01:00
Dan Nicolaescu
bee3419fea Remove emacs-priority.
* src/sysdep.c (sys_subshell): Remove SET_EMACS_PRIORITY.
* src/emacs.c (emacs_priority, syms_of_emacs): Remove emacs_priority.
2010-11-20 21:39:01 -08:00
Dan Nicolaescu
b798205966 Remove INLINE uses in header files.
* src/intervals.h (temp_set_point, temp_set_point_both):
* src/buffer.h (offset_intervals, copy_intervals): Remove INLINE.
2010-11-20 21:20:50 -08:00
Dan Nicolaescu
33726611e7 * configure.in (INLINE): Do not depend on OPTIMIZE, unused. 2010-11-20 21:17:19 -08:00
Ken Brown
01664ed1f0 * src/sheap.c (STATIC_HEAP_SIZE): Increase to 13MB. 2010-11-20 10:23:49 -05:00
Eli Zaretskii
7c2d713b9b Use \uNNNN, \UNNNNNN, or \xNNNNNN for hex-code display on a TTY.
term.c (produce_glyphless_glyph): Use \uNNNN, \UNNNNNN, or
 \xNNNNNN for hex-code display of glyphless characters.
2010-11-20 17:04:50 +02:00
Jan Djärv
d2bd51898e Add keyword :vert-only for tool bar items with labels not shown horizontally.
* lisp/info.el (info-tool-bar-map): Add some :vert-only keywords.

* lisp/tool-bar.el (tool-bar-setup): Add some :vert-only keywords.

* src/dispextern.h (tool_bar_item_idx): Add TOOL_BAR_ITEM_VERT_ONLY.

* src/gtkutil.c (xg_make_tool_item): Take vert_only as argument.
Set important to ! vert_only.
(xg_show_toolbar_item): Don't show label horizontally if
tool item isn't important.
(update_frame_tool_bar): Get TOOL_BAR_ITEM_VERT_ONLY and pass it to
xg_make_tool_item, or update important on existing tool item.

* src/keyboard.c (QCvert_only): New variable.
(parse_tool_bar_item): Check for QCvert_only.
(syms_of_keyboard): Initialize QCvert_only.
2010-11-20 15:51:25 +01:00
Jan Djärv
8d7f026f62 Fix bug 7425.
NOTE: When merging to trunk: xg_height_changed is xg_height_or_width_changed
      in trunk.

* src/gtkutil.c (menubar_map_cb): New function.
(xg_update_frame_menubar): Connect signal map to menubar_map_cb.
Use 23 as menubar height if 0. (Bug#7425).
2010-11-20 14:50:55 +01:00
Eli Zaretskii
6ce950f336 msdos.c (dos_rawgetc): Use gen_help_event, instead of doing the same in-line. 2010-11-20 13:45:14 +02:00
Eli Zaretskii
d9a95e6767 msdos.c (dos_rawgetc): Use gen_help_event, instead of doing the same in-line. 2010-11-20 13:24:28 +02:00
Andreas Schwab
b65575536f * src/xfaces.c (lookup_face): Make static.
* src/dispnew.c (copy_row_except_pointers): Likewise.
* src/syntax.c (dec_bytepos): Likewise.
(inc_bytepos): Remove.
* src/dispextern.h (lookup_face): Remove declaration.
2010-11-20 11:07:00 +01:00
Eli Zaretskii
f48fe1f074 Fix bug #6687 with cursor positioning after before-string from overlays.
xdisp.c (set_cursor_from_row): Display cursor after all the
 glyphs that come from an overlay.  Don't overstep the last glyph
 when skipping glyphs from an overlay.
2010-11-19 18:34:22 +02:00
Dan Nicolaescu
84dfc8a7fa * src/alloc.c (refill_memory_reserve): Move declaration ...
* src/lisp.h (refill_memory_reserve): ... here.
2010-11-18 13:45:03 -08:00
Dan Nicolaescu
94fa383385 * src/strftime.c (_strftime_copytm): Add declaration. 2010-11-18 13:39:15 -08:00
Dan Nicolaescu
dde990a0f9 * src/callproc.c (syms_of_callproc): Use intern_c_string. 2010-11-18 08:59:12 -08:00
Dan Nicolaescu
50c7742814 Move declarations from .c files to .h files.
* src/process.c (timers_run):
* src/minibuf.c (quit_char):
* src/lread.c (read_emacs_mule_char):
* src/keyboard.c (minibuf_level, message_enable_multibyte)
(pending_malloc_warning):
* src/insdel.c (Vselect_active_regions, Vsaved_region_selection)
(Qonly): Remove declarations.
* src/lisp.h (pending_malloc_warning, Vsaved_region_selection)
(Vselect_active_regions):
* src/keyboard.h (timers_run):  Add declarations.
2010-11-18 08:57:00 -08:00
Dan Nicolaescu
654ef137a3 Convert definitions to standard C.
* src/strftime.c (my_strftime_gmtime_r, my_strftime_localtime_r)
(tm_diff): Convert definitions to standard C.
(extra_args_spec_iso): Remove, unused.
2010-11-18 08:49:30 -08:00
Stefan Monnier
4a47c27573 Merge from emacs-23 2010-11-17 22:54:14 -05:00
Eli Zaretskii
146d267b8b Fix bug #7417 with cursor positioning on empty lines.
xdisp.c (set_cursor_from_row): Fix cursor positioning in empty
 lines on text-mode terminals.
2010-11-17 21:15:24 +02:00
Stefan Monnier
fad0d56519 * src/xterm.c (get_current_wm_state): Rename from get_current_vm_state.
(do_ewmh_fullscreen, x_handle_net_wm_state): Update callers.
2010-11-17 10:12:02 -05:00
Stefan Monnier
25f38310f9 Remove "tiny change"s for Eric Hanchrow 2010-11-17 10:07:48 -05:00
Kenichi Handa
6b4bb7039f coding.c (Fset_terminal_coding_system_internal): Fix previous change (set charset-ID list instead of charset-symbol list). 2010-11-17 14:51:09 +09:00
Chong Yidong
9173a8fbd7 Cleanup of window coordinate positioning code.
Now, text area click input events measure Y from the top of the text
area, excluding the header line if any.

* src/dispnew.c (buffer_posn_from_coords): Assume that X counts from
the start of the text area.

* src/keyboard.c (make_lispy_position): For text area clicks, record Y
pixel position relative to the text area, excluding header line.
Also change X and Y to Lisp_Objects, not pointers; don't return
coordinate values via pointers.  Pass ON_TEXT_AREA coordinate to
buffer_posn_from_coords counting from the start of the text area.
(Fposn_at_x_y, make_lispy_event): Callers changed.

* src/w32term.c (w32_read_socket):
* src/msdos.c (dos_rawgetc):
* src/xterm.c (handle_one_xevent): Likewise.

* src/window.c (coordinates_in_window): Change X and Y to ints rather
than pointers; don't return coordinates via pointers.
(struct check_window_data): Change X and Y from pointers to ints.
(window_from_coordinates): Remove args WX and WY; don't return
coordinates via pointers.
(Fcoordinates_in_window_p, window_from_coordinates):
(check_window_containing, Fwindow_at): Callers changed.
(window_relative_x_coord): New function.

* src/window.h (window_from_coordinates, window_relative_x_coord):
Update prototypes.

* src/xdisp.c (remember_mouse_glyph): Change window_from_coordinates
call.  Use window_relative_x_coord.
(note_mouse_highlight): Change window_from_coordinates call.
2010-11-16 21:37:45 -05:00
Chong Yidong
1985927ce8 Revert changes in 2010-11-16T19:59:24Z!cyd@stupidchicken.com 2010-11-16 16:47:43 -05:00
Chong Yidong
7aff9c22e3 * src/keyboard.c (make_lispy_position): Fix pixel calculation error in last commit. 2010-11-16 16:38:37 -05:00