Mercurial > emacs
view lisp/progmodes/cc-compat.el @ 83008:040dd41ed7d0
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
lisp/frame.el (display-color-cells): Pass display parameter to tty-display-color-cells.
lisp/term/xterm.el (xterm-register-default-colors): Pass the selected-frame to display-color-cells.
src/dispextern.h (set_terminal_modes, reset_terminal_modes): Removed declarations.
(get_named_tty_display): New prototype.
(tty_clear_end_of_line, term_init): Updated to new prototype.
(initial_term_init): Renamed to init_initial_display.
src/dispnew.c (Fredraw_frame): ifdef-out DOS-specific code. Add display parameter to set_terminal_modes call.
(update_frame): Don't flush the tty of there is no tty.
(init_display): Set up a termcap display on the controlling tty and
change the initial frame to use that. Delete the initial display.
src/frame.c (Fframep): Return t for the initial frame.
(make_initial_frame): New function for creating the initial frame during bootstrap. Use init_initial_display, not initial_term_init.
(make_terminal_frame): Removed special cases for creating the initial frame.
src/frame.h (enum output_method): New entry: output_initial for the bootstrap display.
(FRAME_INITIAL_P): New macro.
(make_initial_frame): New prototype.
src/keyboard.c (interrupt_signal): Exit Emacs on SIGINT from the (frameless) controlling tty, if possible. Explain this in a comment.
(init_keyboard): Added comment about exiting on SIGINT.
(Fset_input_mode): A termcap frame is never the initial frame anymore.
src/sysdep.c (init_sys_modes): Update tty_set_terminal_modes call to the new prototype.
(reset_sys_modes): Comment out tty_clear_end_of_line call; it doesn't work anymore. Update tty_reset_terminal_modes call.
src/termchar.h (struct tty_display_info): Added pointer to the display structure, for reset_sys_modes.
src/termhooks.h (struct display): Added display parameter to set_terminal_modes_hook and reset_terminal_modes_hook.
src/term.c (initial_display): New variable.
(tty_ring_bell, tty_update_end, tty_set_terminal_window, 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): New functions.
(ring_bell, 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): Removed special casing of termcap displays.
(get_tty_display): New function.
(Ftty_display_color_p, Ftty_display_color_cells): Use it.
(get_named_tty_display): Removed static.
(tty_set_terminal_modes, tty_reset_terminal_modes): Changed to use a display parameter
instead of tty_display_info for hook compatibility.
(set_terminal_modes, reset_terminal_modes): Removed.
(initial_term_init): Renamed to init_initial_display. Set up an
output_initial device, not a termcap display.
(delete_initial_display): New function.
(maybe_fatal): New function, for private use of term_init.
(term_init): New parameter for choosing between fatal and simple errors.
Removed incomprehensible special casing for the second initialization of the
controlling tty. Use maybe_fatal for error handling.
Initialize termcap display hooks in the new device.
Initialize the display pointer in the tty_display_info structure.
(delete_tty): Replace order of reset_sys_modes and delete_display.
src/window.c (init_window_once): Call make_initial_frame instead of make_terminal_frame.
src/xfaces.c (realize_default_face, realize_face): Don't abort on the bootstrap display device.
src/xterm.c (XTset_terminal_modes, XTreset_terminal_modes): Added display parameter.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-48
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Fri, 09 Jan 2004 18:57:53 +0000 |
parents | 695cf19ef79e |
children | 18a818a2ee7c 375f2633d815 |
line wrap: on
line source
;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion ;; Copyright (C) 1985,1987,1992-2003 Free Software Foundation, Inc. ;; Authors: 1998- Martin Stjernholm ;; 1994-1999 Barry A. Warsaw ;; Maintainer: bug-cc-mode@gnu.org ;; Created: August 1994, split from cc-mode.el ;; Version: See cc-mode.el ;; Keywords: c languages oop ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to ;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; ;; Boring old c-mode.el (BOCM) is confusion and brain melt. cc-mode.el ;; is clarity of thought and purity of chi. If you are still unwilling ;; to accept enlightenment, this might help, or it may prolong your ;; agony. ;; ;; To use, add the following to your c-mode-hook: ;; ;; (require 'cc-compat) ;; (c-set-style "BOCM") ;; ;; This file is completely unsupported! Although it has been patched ;; superficially to keep pace with the rest of CC Mode, it hasn't been ;; tested for a long time. ;;; Code: (eval-when-compile (let ((load-path (if (and (boundp 'byte-compile-dest-file) (stringp byte-compile-dest-file)) (cons (file-name-directory byte-compile-dest-file) load-path) load-path))) (load "cc-bytecomp" nil t))) (cc-require 'cc-defs) (cc-require 'cc-vars) (cc-require 'cc-styles) (cc-require 'cc-engine) ;; In case c-mode.el isn't loaded (defvar c-indent-level 2 "*Indentation of C statements with respect to containing block.") (defvar c-brace-imaginary-offset 0 "*Imagined indentation of a C open brace that actually follows a statement.") (defvar c-brace-offset 0 "*Extra indentation for braces, compared with other text in same context.") (defvar c-argdecl-indent 5 "*Indentation level of declarations of C function arguments.") (defvar c-label-offset -2 "*Offset of C label lines and case statements relative to usual indentation.") (defvar c-continued-statement-offset 2 "*Extra indent for lines not starting new statements.") (defvar c-continued-brace-offset 0 "*Extra indent for substatements that start with open-braces. This is in addition to c-continued-statement-offset.") ;; these offsets are taken by brute force testing c-mode.el, since ;; there's no logic to what it does. (let* ((offsets '(c-offsets-alist . ((defun-block-intro . cc-block-intro-offset) (statement-block-intro . cc-block-intro-offset) (defun-open . 0) (class-open . 0) (inline-open . c-brace-offset) (block-open . c-brace-offset) (block-close . cc-block-close-offset) (brace-list-open . c-brace-offset) (substatement-open . cc-substatement-open-offset) (substatement . c-continued-statement-offset) (knr-argdecl-intro . c-argdecl-indent) (case-label . c-label-offset) (access-label . c-label-offset) (label . c-label-offset) )))) (c-add-style "BOCM" offsets)) (defun cc-block-intro-offset (langelem) ;; taken directly from calculate-c-indent confusion (save-excursion (c-backward-syntactic-ws) (if (eq (char-before) ?{) (forward-char -1) (goto-char (cdr langelem))) (let* ((curcol (save-excursion (goto-char (cdr langelem)) (current-column))) (bocm-lossage ;; If no previous statement, indent it relative to line ;; brace is on. For open brace in column zero, don't let ;; statement start there too. If c-indent-level is zero, ;; use c-brace-offset + c-continued-statement-offset ;; instead. For open-braces not the first thing in a line, ;; add in c-brace-imaginary-offset. (+ (if (and (bolp) (zerop c-indent-level)) (+ c-brace-offset c-continued-statement-offset) c-indent-level) ;; Move back over whitespace before the openbrace. If ;; openbrace is not first nonwhite thing on the line, ;; add the c-brace-imaginary-offset. (progn (skip-chars-backward " \t") (if (bolp) 0 c-brace-imaginary-offset)) ;; If the openbrace is preceded by a parenthesized exp, ;; move to the beginning of that; possibly a different ;; line (progn (if (eq (char-before) ?\)) (c-forward-sexp -1)) ;; Get initial indentation of the line we are on. (current-indentation))))) (- bocm-lossage curcol)))) (defun cc-block-close-offset (langelem) (save-excursion (let* ((here (point)) bracep (curcol (progn (goto-char (cdr langelem)) (current-column))) (bocm-lossage (progn (goto-char (cdr langelem)) (if (eq (char-after) ?{) (setq bracep t) (goto-char here) (beginning-of-line) (backward-up-list 1) (forward-char 1) (c-forward-syntactic-ws)) (current-column)))) (- bocm-lossage curcol (if bracep 0 c-indent-level))))) (defun cc-substatement-open-offset (langelem) (+ c-continued-statement-offset c-continued-brace-offset)) (cc-provide 'cc-compat) ;;; arch-tag: 564dab2f-e6ad-499c-a4a3-fedec3ecc192 ;;; cc-compat.el ends here