Commit graph

402 commits

Author SHA1 Message Date
Miles Bader
430d2ee291 Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-312
2008-01-09 01:21:15 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
2008-01-08 20:46:54 +00:00
Glenn Morris
8cabe764e9 Add 2008 to copyright years. 2008-01-08 04:37:27 +00:00
Miles Bader
d29ee6b1a1 Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-300
2007-12-16 05:08:49 +00:00
Miles Bader
47854a5568 Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-956
2007-12-16 04:31:49 +00:00
Jason Rumney
2e3566d8b7 (w32_read_socket): Use MULTIBYTE_CHAR_KEYSTROKE_EVENT for characters above 127. 2007-12-14 12:26:31 +00:00
Kenichi Handa
0c16681f76 (x_draw_composite_glyph_string_foreground): Adjusted
for the change of lispy gstring.
2007-12-01 02:40:49 +00:00
Jason Rumney
a60b033380 (w32_read_socket) [WM_UNICHAR]: Handle as MULTIBYTE_CHAR_KEYSTROKE_EVENT. 2007-11-17 03:00:47 +00:00
Miles Bader
f23d76bdef Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
2007-11-11 00:56:44 +00:00
Jason Rumney
4b219faa3b (w32_scroll_bar_handle_click): Use SCROLL_BAR_CLICK_EVENT.
(w32_read_socket): Generate MULTIMEDIA_KEY_EVENT from WM_APPCOMMAND.
2007-11-09 12:20:55 +00:00
Glenn Morris
56dad874f3 Johan Bockg� <bojohan at gnu.org>
(x_draw_stretch_glyph_string): Don't set s->stippled_p here, since it
has already been set by x_set_glyph_string_gc from
x_draw_glyph_string.

http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01571.html
2007-11-01 03:49:22 +00:00
Glenn Morris
b4a638b358 Johan Bockg� <bojohan at gnu.org>
(x_draw_stretch_glyph_string): Don't set s->stippled_p here, since it
has already been set by x_set_glyph_string_gc from
x_draw_glyph_string.

http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01571.html
2007-11-01 03:47:34 +00:00
Miles Bader
18cd1f1a08 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 902-908)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 131-137)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 261-262)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
2007-10-27 09:12:07 +00:00
Stefan Monnier
70b8d0a4a3 Make `window-system' into a keyboard-local variable (rather than
frame-local as done originally by multi-tty).

* startup.el (window-system): Remove.  Don't make it frame-local.

* keyboard.h (struct kboard): Add Vwindow_system.
* keyboard.c (init_kboard): Set a default for Vwindow_system.
(mark_kboards): Mark Vwindow_system.

* dispnew.c (syms_of_display) <window-system>: Declare terminal-local.
(init_display): Don't set the obsolete `window-system' frame-param.

* xterm.c (x_term_init):
* w32term.c (w32_create_terminal):
* term.c (init_tty): Set Vwindow_system.
* macterm.c (mac_create_terminal): Set a keyboard (missing piece of the
multi-tty merge maybe?), copied from w32term.c.  Set Vwindow_system.

* xfns.c (Fx_create_frame, x_create_tip_frame):
* w32fns.c (Fx_create_frame, x_create_tip_frame):
* macfns.c (Fx_create_frame):
Don't set the obsolete `window-system' frame-param.

* frame.h (Qwindow_system): Remove.
* frame.c (Qwindow_system): Remove.  In `syms_of_frame' as well.
(Fmake_terminal_frame): Don't set obsolete `window-system' frame-param.
2007-10-25 02:38:41 +00:00
Miles Bader
63655c8314 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 887-889)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 116-121)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-268
2007-10-15 05:03:21 +00:00
Miles Bader
b2529d56b5 Merge from emacs--rel--22
Patches applied:

 * emacs--rel--22  (patch 116-121)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-889
2007-10-15 02:07:53 +00:00
Juanma Barranquero
decb374a42 (w32_font_is_double_byte, my_create_scrollbar): Make static.
(syms_of_w32term) <w32-enable-unicode-output>: Fix typo in docstring.
2007-10-15 00:23:32 +00:00
Eli Zaretskii
1ea40aa2f3 Replace abs' with eabs'. 2007-10-13 12:48:57 +00:00
Miles Bader
c73bd236f7 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 866-879)

   - Merge multi-tty branch
   - Update from CVS
   - Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
2007-10-11 16:24:58 +00:00
Jason Rumney
f8d1a163bd (x_set_window_size): Disable code that attempts to tell
Lisp code about a size change before it actually happens.
2007-10-09 11:24:40 +00:00
Miles Bader
1af74d06e5 Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-875
2007-10-09 08:52:57 +00:00
Martin Rudalics
74a9b36f85 (w32_read_socket): When focus_follows_mouse is nil make
SELECT_WINDOW_EVENT only if we don't leave the selected frame.
2007-10-06 09:52:39 +00:00
Glenn Morris
7a58fb43f6 Johannes Weiner <hannes at saeurebad.de>
(abs): Don't define abs now it's in lisp.h.
2007-09-23 02:03:36 +00:00
Juanma Barranquero
e243eb1f50 (x_draw_glyph_string): Use strike_through_color, not underline_color,
to draw strike-through.
2007-09-21 11:21:38 +00:00
Juanma Barranquero
def7fa3452 (x_draw_glyph_string): Use strike_through_color, not underline_color,
to draw strike-through.
2007-09-21 10:57:21 +00:00
Stefan Monnier
adc5431652 (w32_delete_terminal): Use terminal->name as liveness status. 2007-09-20 21:19:13 +00:00
Jason Rumney
09b69f0142 (w32_term_init): Pass rif to w32_init_fringe. 2007-09-13 22:25:13 +00:00
Jason Rumney
3ca3504a9e (x_set_glyph_string_clipping): Use
get_glyph_string_clip_rects.
(x_set_glyph_string_clipping_exactly): Adjusted for the change of
struct glyph_string.
(x_draw_glyph_string): Likewise.
2007-09-13 13:36:39 +00:00
Jason Rumney
1526bc2373 Support for horizontal scroll wheels on some mice:
(construct_mouse_wheel): Make HORIZ_WHEEL_EVENT
from WM_MOUSEHWHEEL.
(w32_read_socket) <WM_MOUSEHWHEEL>: Treat as WM_MOUSEWHEEL.

MULTI_KBOARD support:
(w32_create_terminal) [MULTI_KBOARD]: Create a new
keyboard for the terminal.
2007-09-04 21:38:40 +00:00
Miles Bader
aaf34461ff Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 846-851)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 88-92)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 242-244)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-31
2007-08-13 13:51:08 +00:00
Miles Bader
b2e6b10fe2 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 846-851)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 88-92)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 242-244)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-246
2007-08-13 13:48:35 +00:00
Miles Bader
37cc095b6a Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-851
2007-08-13 13:41:28 +00:00
Glenn Morris
e0f24100c7 Replace `iff' in comments. 2007-08-08 07:49:21 +00:00
Miles Bader
e145a7fe95 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 832-838)

   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Fix void function definition error in cus-edit.el
   - Update from CVS
   - Restore lisp/emacs-lisp/cl-loaddefs.el
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 75-83)

   - Update from CVS
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Indicate that emacs--devo--0--patch-834 does not need to be applied
   - Merge from gnus--rel--5.10
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * gnus--rel--5.10  (patch 239-241)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-239
2007-08-03 05:20:51 +00:00
Miles Bader
9899d01a0c Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 824-838)

   - Update from CVS
   - Merge from emacs--rel--22
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Fix void function definition error in cus-edit.el
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * emacs--rel--22  (patch 70-83)

   - Update from CVS
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Indicate that emacs--devo--0--patch-834 does not need to be applied
   - Merge from gnus--rel--5.10
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * gnus--rel--5.10  (patch 239-241)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-28
2007-07-31 05:50:45 +00:00
Miles Bader
e468b87f91 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 824-831)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 70-74)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-238
2007-07-27 10:52:18 +00:00
YAMAMOTO Mitsuharu
06929222cd (w32_draw_fringe_bitmap): Extend fringe background to
scroll bar gap.
(x_scroll_bar_create): Set bar->fringe_extended_p.
(w32_set_vertical_scroll_bar): Put leftmost/rightmost scroll bars
on frame edge.  Check fringe background extension.  Don't clear
extended fringe background area.
2007-07-27 08:40:30 +00:00
Miles Bader
9aecacd08a Merge from emacs--rel--22
Patches applied:

 * emacs--rel--22  (patch 70-73)

   - Update from CVS

2007-07-25  Glenn Morris  <rgm@gnu.org>

   * Relicense all FSF files to GPLv3 or later.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
2007-07-26 05:28:10 +00:00
Glenn Morris
684d6f5bcc Switch license to GPLv3 or later. 2007-07-25 05:19:07 +00:00
Miles Bader
7eb1e4534e Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 803-813)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 51-58)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 233-236)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-25
2007-07-15 02:05:20 +00:00
Miles Bader
1011c48763 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 803-805)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-227
2007-07-09 08:00:55 +00:00
Stefan Monnier
8e50cc2df8 Replace uses of GC_* macros with the non-GC_ versions. 2007-06-29 03:37:33 +00:00
Juanma Barranquero
1bb8a291f6 (w32_delete_display): Remove leftover declaration.
(w32_define_cursor, w32_initialize): Make static.
2007-06-20 08:35:55 +00:00
Jason Rumney
5f33dbf74c (syms_of_w32term): Use DEFSYM macro. 2007-06-11 22:08:39 +00:00
Jason Rumney
96db405702 (w32_initialize): Don't call w32font_initialize. 2007-06-02 23:41:07 +00:00
Jason Rumney
11e260be5b (x_font_min_bounds): Use FONT_AVG_WIDTH.
(w32_cache_char_metrics): Use FONT_WIDTH.
2007-06-02 22:11:44 +00:00
Jason Rumney
b70be25344 (w32_native_per_char_metric): Swap width and rbearing
calculations for non-Truetype fonts.
(x_draw_glyph_string): Sync with xterm.c.
(x_draw_glyph_string_foreground) [USE_FONT_BACKEND]: Remove
redundant code.
(w32_initialize) [USE_FONT_BACKEND]: Call w32font_initialize.
2007-05-31 00:59:50 +00:00
Dan Nicolaescu
80ca7302d8 * s/darwin.h (SYSTEM_PURESIZE_EXTRA): Define here.
* termhooks.h (union display_info): Add mac_display_info.

* term.c (init_tty): Only use terminal->kboard when MULTI_KBOARD
is defined.

* macterm.h (struct mac_display_info): Add terminal.

* w32term.c (w32_initialize): Make static.

* macterm.c (XTset_terminal_modes): Add a terminal parameter.
(XTreset_terminal_modes): Likewise.
(x_clear_frame): Add a frame parameter.
(note_mouse_movement): Get rif from the frame.
(mac_term_init): Initialize the terminal.
(mac_initialize): Make static and move terminal initialization ...
(mac_create_terminal): ... in this new function.

* macmenu.c: Reorder includes.
(Fx_popup_menu): Use terminal specific mouse_position_hook.

* macfns.c (x_set_mouse_color): Get rif from the frame.
(x_set_tool_bar_lines): Don't use updating_frame.
(mac_window): Add 2 new parameters for consistency with other
systems.
(Fx_create_frame): Fix doc string. Rename the parameter.
(Fx_create_frame): Set the frame parameters following what is done
in X11 and w32.
(Fx_open_connection): Remove window-system check.
(start_hourglass): Likewise.
(x_create_tip_frame): Get the keyboard from the terminal.

* w32fns.c (Fx_create_frame): Use kboard from the terminal.

* term/mac-win.el: Provide mac-win.
(mac-initialized): New variable.
(mac-initialize-window-system): New function. Move global setup
here.
(handle-args-function-alist, frame-creation-function-alist):
(window-system-initialization-alist): Add mac entries.

* loadup.el: Load mac-win on a Mac.
2007-05-19 19:08:02 +00:00
Jason Rumney
543c3ccdbc (w32_term_init): Call add_keyboard_wait_descriptor. 2007-05-17 00:08:03 +00:00
Jason Rumney
4a418b1085 (w32_set_terminal_modes, w32_reset_terminal_modes):
Add terminal arg.
(x_clear_frame, x_delete_glyphs, w32_ring_bell, x_ins_del_lines):
Add frame arg.
(x_delete_terminal, w32_create_terminal): New functions.
(w32_term_init): Create a terminal.
(w32_initialize): Move terminal specific initialization to
w32_create_terminal.
2007-05-15 22:59:04 +00:00