Reimplement terminal parameters in C; clean up term.c, create terminal.c.

* lisp/termdev.el (terminal-parameter-alist, terminal-parameters, terminal-parameter-p)
  (terminal-parameter, set-terminal-parameter, terminal-handle-delete-frame): Remove.

* src/term.c (Vring_bell_function, device_list, initial_device)
  (next_device_id, ring_bell, update_begin, update_end)
  (set_terminal_window, cursor_to, raw_cursor_to)
  (clear_to_end, clear_frame, clear_end_of_line)
  (write_glyphs, insert_glyphs, delete_glyphs, ins_del_lines)
  (get_device, Fdisplay_name, create_device, delete_device)
  (Fdelete_display, Fdisplay_live_p, Fdisplay_list)
  Move to terminal.c.
  (syms_of_term): Move their initialization to terminal.c.

* src/terminal.c: New file.
  (device_list, next_device_id, initial_device, Vring_bell_function)
  (ring_bell, update_begin, update_end, set_terminal_window)
  (cursor_to, raw_cursor_to, clear_to_end, clear_frame)
  (clear_end_of_line, write_glyphs, insert_glyphs, delete_glyphs)
  (ins_del_lines, get_device, create_device, delete_device)
  (Fdelete_display, Fdisplay_live_p, Fdisplay_list, Fdisplay_name): Move here.
  (mark_devices, get_terminal_param, store_terminal_param)
  (Fterminal_parameters, Fterminal_parameter)
  (Fmodify_terminal_parameters, Fset_terminal_parameter)
  (init_initial_device, delete_initial_device)
  (syms_of_terminal): New functions.

* lisp/simple.el (normal-erase-is-backspace-setup-frame)
  (normal-erase-is-backspace-mode): Rephrase things
  without terminal-parameter-p.

* lisp/termdev.el (terminal-getenv, terminal-setenv)
  (with-terminal-environment): Ditto.

* mac/makefile.MPW (EmacsObjects): Add terminal.c.x.
  ({Src}terminal.c.x): Add dependencies.

* src/Makefile.in (obj): Add terminal.o.
  (terminal.o): Add dependencies.
  [HAVE_CARBON]: Make terminal.o depend on macgui.h.

* src/alloc.c (mark_devices): Declare.
  (Fgarbage_collect): Call `mark_devices'.

* src/dispextern.h  (set_scroll_region, turn_off_insert)
  (turn_off_highlight, background_highlight, clear_end_of_line_raw)
  (tty_clear_end_of_line, tty_setup_colors, delete_tty): Remove.
  (raw_cursor_to, clear_to_end, tty_turn_off_insert)
  (tty_turn_off_highlight): Add declaration.

* src/emacs.c (main): Call `syms_of_terminal'.

* src/frame.c (get_future_frame_param): New function.
  (Fmake_terminal_frame): Use it.

* src/keyboard.c (pop_kboard): Remove unused variable.
  (Fset_output_flow_control): Return nil.

* src/keymap.h (Fset_keymap_parent): Add EXFUN.

* src/lisp.h (syms_of_terminal): Declare it.

* src/sysdep.c (reset_sys_modes): Update for renames.

* src/term.c (set_scroll_region): Rename to `tty_set_scroll_region'.
  (turn_on_insert): Rename to `tty_turn_on_insert'.
  (turn_off_insert): Rename to `tty_turn_off_insert'.
  (turn_off_highlight): Rename to `tty_turn_off_highlight'.
  (turn_on_highlight): Rename to `tty_turn_on_highlight'.
  (toggle_highligh): Rename to `tty_toggle_highlight'.
  (background_highlight): Rename to `tty_background_highlight'.
  (highlight_if_desired): Rename to `tty_highlight_if_desired'.

  (tty_ring_bell, tty_update_end, tty_set_terminal_window)
  (tty_set_scroll_region, tty_background_highlight)
  (tty_cursor_to, tty_raw_cursor_to, tty_clear_to_end)
  (tty_clear_frame, tty_clear_end_of_line, tty_write_glyphs)
  (tty_insert_glyphs, tty_delete_glyphs, tty_ins_del_lines)
  (term_get_fkeys, tty_setup_colors, dissociate_if_controlling_tty)
  (delete_tty): Add static modifier.

  (tty_reset_terminal_modes, tty_set_terminal_window)
  (tty_set_scroll_region, tty_background_highlight)
  (tty_highlight_if_desired, tty_cursor_to)
  (tty_raw_cursor_to, tty_clear_to_end, tty_clear_frame)
  (tty_clear_end_of_line, tty_write_glyphs, tty_insert_glyphs)
  (tty_delete_glyphs, tty_ins_del_lines, turn_on_face): 
  Update for renames.

* src/termhooks.h (param_alist): New member to struct device.

* src/xterm.h (x_delete_device): Declare.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-460

2 files changed, 13 insertions, 73 deletions

diff --git a/lisp/simple.el b/lisp/simple.el
index bfbdaf14d28..99487430c88 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5323,10 +5323,8 @@ call `normal-erase-is-backspace-mode' (which see) instead."
   "Set up `normal-erase-is-backspace-mode' on FRAME, if necessary."
   (unless frame (setq frame (selected-frame)))
   (with-selected-frame frame
-    (unless (terminal-parameter-p nil 'normal-erase-is-backspace)
-      (if (cond ((terminal-parameter-p nil 'normal-erase-is-backspace)
-                 (terminal-parameter nil 'normal-erase-is-backspace))
-                ((eq normal-erase-is-backspace 'maybe)
+    (unless (terminal-parameter nil 'normal-erase-is-backspace)
+      (if (cond ((eq normal-erase-is-backspace 'maybe)
                  (and (not noninteractive)
                       (or (memq system-type '(ms-dos windows-nt))
                           (eq window-system 'mac)
@@ -5376,9 +5374,10 @@ See also `normal-erase-is-backspace'."
   (interactive "P")
   (set-terminal-parameter
    nil 'normal-erase-is-backspace
-   (if arg
-       (> (prefix-numeric-value arg) 0)
-     (not (terminal-parameter nil 'normal-erase-is-backspace))))
+   (if (or (and arg (> (prefix-numeric-value arg) 0))
+           (not (eq 1 (terminal-parameter nil 'normal-erase-is-backspace))))
+       0
+     1))
 
   (cond ((or (memq window-system '(x w32 mac pc))
              (memq system-type '(ms-dos windows-nt)))
@@ -5390,7 +5389,7 @@ See also `normal-erase-is-backspace'."
                     [C-delete] [C-backspace])))
                 (old-state (lookup-key local-function-key-map [delete])))
 
-           (if (terminal-parameter nil 'normal-erase-is-backspace)
+           (if (eq 1 (terminal-parameter nil 'normal-erase-is-backspace))
                (progn
                  (define-key local-function-key-map [delete] [?\C-d])
                  (define-key local-function-key-map [kp-delete] [?\C-d])
@@ -5412,7 +5411,7 @@ See also `normal-erase-is-backspace'."
                    (define-key map key1 binding2)
                    (define-key map key2 binding1)))))))
          (t
-          (if (terminal-parameter nil 'normal-erase-is-backspace)
+          (if (eq 1 (terminal-parameter nil 'normal-erase-is-backspace))
               (progn
                 (keyboard-translate ?\C-h ?\C-?)
                 (keyboard-translate ?\C-? ?\C-d))
@@ -5422,7 +5421,8 @@ See also `normal-erase-is-backspace'."
   (run-hooks 'normal-erase-is-backspace-hook)
   (if (interactive-p)
       (message "Delete key deletes %s"
-               (if normal-erase-is-backspace "forward" "backward"))))
+               (if (terminal-parameter nil 'normal-erase-is-backspace)
+                   "forward" "backward"))))
 
 (defvar vis-mode-saved-buffer-invisibility-spec nil
   "Saved value of `buffer-invisibility-spec' when Visible mode is on.")
diff --git a/lisp/termdev.el b/lisp/termdev.el
index 667975b9b8b..f413067d542 100644
--- a/lisp/termdev.el
+++ b/lisp/termdev.el
@@ -48,66 +48,6 @@ device (HOST.SERVER.SCREEN) or a tty device file."
    (t
     (error "Invalid argument %s in `terminal-id'" terminal))))
 
-(defvar terminal-parameter-alist nil
-  "An alist of terminal parameter alists.")
-
-(defun terminal-parameters (&optional terminal)
-  "Return the paramater-alist of terminal TERMINAL.
-It is a list of elements of the form (PARM . VALUE), where PARM is a symbol.
-
-TERMINAL can be a terminal id, a frame, or nil (meaning the
-selected frame's terminal)."
-  (cdr (assq (terminal-id terminal) terminal-parameter-alist)))
-
-(defun terminal-parameter-p (terminal parameter)
-  "Return non-nil if PARAMETER is a terminal parameter on TERMINAL.
-
-The actual value returned in that case is a cell (PARAMETER . VALUE),
-where VALUE is the current value of PARAMETER.
-
-TERMINAL can be a terminal id, a frame, or nil (meaning the
-selected frame's terminal)."
-  (assq parameter (cdr (assq (terminal-id terminal) terminal-parameter-alist))))
-
-(defun terminal-parameter (terminal parameter)
-  "Return TERMINAL's value for parameter PARAMETER.
-
-TERMINAL can be a terminal id, a frame, or nil (meaning the
-selected frame's terminal)."
-  (cdr (terminal-parameter-p terminal parameter)))
-
-(defun set-terminal-parameter (terminal parameter value)
-  "Set TERMINAL's value for parameter PARAMETER to VALUE.
-Returns the previous value of PARAMETER.
-
-TERMINAL can be a terminal id, a frame, or nil (meaning the
-selected frame's terminal)."
-  (setq terminal (terminal-id terminal))
-  (let* ((alist (assq terminal terminal-parameter-alist))
-         (pair (assq parameter (cdr alist)))
-         (result (cdr pair)))
-    (cond
-     (pair (setcdr pair value))
-     (alist (setcdr alist (cons (cons parameter value) (cdr alist))))
-     (t (setq terminal-parameter-alist
-              (cons (cons terminal
-                          (cons (cons parameter value)
-                                nil))
-                    terminal-parameter-alist))))
-    result))
-
-(defun terminal-handle-delete-frame (frame)
-  "Clean up terminal parameters of FRAME, if it's the last frame on its terminal."
-  ;; XXX We assume that the display is closed immediately after the
-  ;; last frame is deleted on it.  It would be better to create a hook
-  ;; called `delete-display-functions', and use it instead.
-  (when (and (frame-live-p frame)
-             (= 1 (length (frames-on-display-list (frame-display frame)))))
-    (setq terminal-parameter-alist
-          (assq-delete-all (frame-display frame) terminal-parameter-alist))))
-
-(add-hook 'delete-frame-functions 'terminal-handle-delete-frame)
-
 (defun terminal-getenv (variable &optional terminal global-ok)
   "Get the value of VARIABLE in the client environment of TERMINAL.
 VARIABLE should be a string.  Value is nil if VARIABLE is undefined in
@@ -125,7 +65,7 @@ its value in the global environment instead.
 TERMINAL can be a terminal id, a frame, or nil (meaning the
 selected frame's terminal)."
   (setq terminal (terminal-id terminal))
-  (if (not (terminal-parameter-p terminal 'environment))
+  (if (null (terminal-parameter terminal 'environment))
       (getenv variable)
     (if (multibyte-string-p variable)
         (setq variable (encode-coding-string variable locale-coding-system)))
@@ -156,7 +96,7 @@ process itself.
 
 TERMINAL can be a terminal id, a frame, or nil (meaning the
 selected frame's terminal)."
-  (if (not (terminal-parameter-p terminal 'environment))
+  (if (null (terminal-parameter terminal 'environment))
       (setenv variable value)
     (with-terminal-environment terminal variable
       (setenv variable value))))
@@ -222,7 +162,7 @@ then the new variable values will be remembered for TERMINAL, and
        (if (stringp ,v)
            (setq ,v (list ,v)))
        (cond
-        ((not (terminal-parameter-p ,term 'environment))
+        ((null (terminal-parameter ,term 'environment))
          ;; Not a remote terminal; nothing to do.
          (progn ,@body))
         ((eq ,v t)