* 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.

diff --git a/lisp/ChangeLog.multi-tty b/lisp/ChangeLog.multi-tty
index 257281bca5788bad5ae472479baae0d49e5be80f..8e18674db8b86e5f2565dba14657c58bf98eb6a8 100644 (file)
--- a/lisp/ChangeLog.multi-tty
+++ b/lisp/ChangeLog.multi-tty
@@ -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\e$,1 q\e(Brentey K\e,Aa\e(Broly  <lorentey@elte.hu>
 
        * server.el (server-process-filter): Don't change

diff --git a/lisp/loadup.el b/lisp/loadup.el
index d93621583800e19516a1c9bdb288b2bb9d9eb19b..8cadd734cb8ba28293d384eba33d48e1aaabedca 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -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

diff --git a/src/ChangeLog.multi-tty b/src/ChangeLog.multi-tty
index dd349cf9b240261b1236d61454239c1886b5244c..fc23d818ba52683521f29313551e9e382d1ef59d 100644 (file)
--- a/src/ChangeLog.multi-tty
+++ b/src/ChangeLog.multi-tty
@@ -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.

diff --git a/src/config.in b/src/config.in
index 6d945d4bfdcaac09f3b6ac2824315c87fde423d7..f57e889cc444e7b0bec7495e3f2380482432b850 100644 (file)
--- a/src/config.in
+++ b/src/config.in
@@ -922,17 +922,19 @@ Boston, MA 02110-1301, USA.  */
 #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

diff --git a/src/macterm.c b/src/macterm.c
index 1faf72485ce0b3463c53a8287df76864033e659f..0b8fec3a089cd5c70aab7c72509e4851082375b0 100644 (file)
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -11870,7 +11870,6 @@ mac_create_terminal (struct mac_display_info *dpyinfo)
   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 @@ mac_create_terminal (struct mac_display_info *dpyinfo)
   terminal->mouse_position_hook = XTmouse_position;
   terminal->frame_rehighlight_hook = XTframe_rehighlight;
   terminal->frame_raise_lower_hook = XTframe_raise_lower;
+  /* 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->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->rif = &x_redisplay_interface;
 #if 0
   TTY_SCROLL_REGION_OK (CURTTY ()) = 1; /* we'll scroll partial frames */
   TTY_CHAR_INS_DEL_OK (CURTTY ()) = 1;

diff --git a/src/term.c b/src/term.c
index f6b9306dc6bb4f37e332253b9b434cb438b6148c..3a7490a2a30122b7aaf7d49ba4a4ec4d8ec9811f 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -3269,7 +3269,7 @@ init_tty (char *name, char *terminal_type, int must_succeed)
   encode_terminal_bufsize = 0;
 
 #ifdef HAVE_GPM
-  mouse_position_hook = term_mouse_position;
+  terminal->mouse_position_hook = term_mouse_position;
   Qmouse_face_window = Qnil;
 #endif