Mercurial > emacs
changeset 83630:28201311b297
* term.c (init_tty): Use terminal specific mouse_position_hook.
* macterm.c (mac_create_terminal): Indent and rearrange to be more
similar to the X11 version.
* config.in: Disable multi-keyboard support on a mac.
* loadup.el: Use a better feature test on a mac.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Mon, 04 Jun 2007 02:16:32 +0000 |
| parents | 4c726a40604c |
| children | 7d63b897231b |
| files | lisp/ChangeLog.multi-tty lisp/loadup.el src/ChangeLog.multi-tty src/config.in src/macterm.c src/term.c |
| diffstat | 6 files changed, 32 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog.multi-tty Wed May 30 14:44:47 2007 +0000 +++ b/lisp/ChangeLog.multi-tty Mon Jun 04 02:16:32 2007 +0000 @@ -1,3 +1,7 @@ +2007-06-03 Dan Nicolaescu <dann@ics.uci.edu> + + * loadup.el: Use a better feature test on a mac. + 2007-05-20 L$,1 q(Brentey K,Aa(Broly <lorentey@elte.hu> * server.el (server-process-filter): Don't change
--- a/lisp/loadup.el Wed May 30 14:44:47 2007 +0000 +++ b/lisp/loadup.el Mon Jun 04 02:16:32 2007 +0000 @@ -212,7 +212,7 @@ (if (eq system-type 'macos) (progn (load "ls-lisp"))) -(if (and (eq system-type 'darwin) (not (featurep 'x))) +(if (featurep 'mac-carbon) (progn (load "term/mac-win"))) (if (fboundp 'atan) ; preload some constants and
--- a/src/ChangeLog.multi-tty Wed May 30 14:44:47 2007 +0000 +++ b/src/ChangeLog.multi-tty Mon Jun 04 02:16:32 2007 +0000 @@ -1,3 +1,12 @@ +2007-06-03 Dan Nicolaescu <dann@ics.uci.edu> + + * term.c (init_tty): Use terminal specific mouse_position_hook. + + * macterm.c (mac_create_terminal): Indent and rearrange to be more + similar to the X11 version. + + * config.in: Disable multi-keyboard support on a mac. + 2007-05-26 Dan Nicolaescu <dann@ics.uci.edu> * sysdep.c: Comment out text after #endif.
--- a/src/config.in Wed May 30 14:44:47 2007 +0000 +++ b/src/config.in Mon Jun 04 02:16:32 2007 +0000 @@ -922,17 +922,19 @@ #define HAVE_MOUSE #endif +/* Multi-tty support relies on MULTI_KBOARD. It seems safe to turn it + on unconditionally. */ +#ifndef MULTI_KBOARD +#define MULTI_KBOARD +#endif + /* If we're using the Carbon API on Mac OS X, define a few more variables as well. */ #ifdef HAVE_CARBON #define HAVE_WINDOW_SYSTEM #define HAVE_MOUSE -#endif - -/* Multi-tty support relies on MULTI_KBOARD. It seems safe to turn it - on unconditionally. */ -#ifndef MULTI_KBOARD -#define MULTI_KBOARD +/* XXX The MULTI_KBOARD support does not work yet on this platform. */ +#undef MULTI_KBOARD #endif /* Define USER_FULL_NAME to return a string
--- a/src/macterm.c Wed May 30 14:44:47 2007 +0000 +++ b/src/macterm.c Mon Jun 04 02:16:32 2007 +0000 @@ -11870,7 +11870,6 @@ terminal->display_info.mac = dpyinfo; dpyinfo->terminal = terminal; - terminal->rif = &x_redisplay_interface; terminal->clear_frame_hook = x_clear_frame; terminal->ins_del_lines_hook = x_ins_del_lines; terminal->delete_glyphs_hook = x_delete_glyphs; @@ -11885,12 +11884,15 @@ terminal->mouse_position_hook = XTmouse_position; terminal->frame_rehighlight_hook = XTframe_rehighlight; terminal->frame_raise_lower_hook = XTframe_raise_lower; - - terminal->set_vertical_scroll_bar_hook = XTset_vertical_scroll_bar; - terminal->condemn_scroll_bars_hook = XTcondemn_scroll_bars; - terminal->redeem_scroll_bar_hook = XTredeem_scroll_bar; - terminal->judge_scroll_bars_hook = XTjudge_scroll_bars; - + /* terminal->fullscreen_hook = XTfullscreen_hook; */ + terminal->set_vertical_scroll_bar_hook = XTset_vertical_scroll_bar; + terminal->condemn_scroll_bars_hook = XTcondemn_scroll_bars; + terminal->redeem_scroll_bar_hook = XTredeem_scroll_bar; + terminal->judge_scroll_bars_hook = XTjudge_scroll_bars; + terminal->delete_frame_hook = x_destroy_window; + /* terminal->delete_terminal_hook = x_delete_terminal; */ + + terminal->rif = &x_redisplay_interface; #if 0 TTY_SCROLL_REGION_OK (CURTTY ()) = 1; /* we'll scroll partial frames */ TTY_CHAR_INS_DEL_OK (CURTTY ()) = 1;