diff options
| author | Lukas Fürmetz <fuermetz@mailbox.org> | 2017-11-21 21:50:35 +0100 |
|---|---|---|
| committer | Lukas Fürmetz <fuermetz@mailbox.org> | 2017-11-21 21:50:35 +0100 |
| commit | ea4eb94e97178afcb7a8991c1516eb3c43b671a2 (patch) | |
| tree | 68aa8cfa93a5b76c59f1b286827bb2044f5c6bfe /vterm.el | |
| parent | a69803d8c0238081595942e0c9aa1e89c8146665 (diff) | |
Mark private functions with a double dash
Diffstat (limited to 'vterm.el')
| -rw-r--r-- | vterm.el | 43 |
1 files changed, 21 insertions, 22 deletions
@@ -12,11 +12,11 @@ (require 'cl-lib) (require 'color) -(defvar vterm-term nil +(defvar vterm--term nil "Pointer to struct Term.") -(make-variable-buffer-local 'vterm-term) +(make-variable-buffer-local 'vterm--term) -(defvar vterm-buffers nil +(defvar vterm--buffers nil "List of active vterm-buffers.") (defvar vterm-keymap-exceptions '("C-x" "C-u" "C-g" "C-h" "M-x" "M-o") @@ -25,7 +25,6 @@ If you use a keybinding with a prefix-key that prefix-key cannot be send to the terminal.") - (defface vterm '((t :inherit default)) "Default face to use in Term mode." @@ -74,15 +73,15 @@ be send to the terminal.") (define-derived-mode vterm-mode fundamental-mode "VTerm" "Mayor mode for vterm buffer." (buffer-disable-undo) - (setq vterm-term (vterm-new (window-body-height) (window-body-width)) + (setq vterm--term (vterm-new (window-body-height) (window-body-width)) buffer-read-only t) (setq-local scroll-conservatively 101) (setq-local scroll-margin 0) - (add-hook 'kill-buffer-hook #'vterm-kill-buffer-hook t t) - (add-hook 'window-size-change-functions #'vterm-window-size-change t t)) + (add-hook 'kill-buffer-hook #'vterm--kill-buffer-hook t t) + (add-hook 'window-size-change-functions #'vterm--window-size-change t t)) ;; Keybindings -(define-key vterm-mode-map [t] #'vterm-self-insert) +(define-key vterm-mode-map [t] #'vterm--self-insert) (define-key vterm-mode-map [mouse-1] nil) (define-key vterm-mode-map [mouse-2] nil) (define-key vterm-mode-map [mouse-3] nil) @@ -93,11 +92,11 @@ be send to the terminal.") collect char)) (let ((key (concat prefix (char-to-string char)))) (unless (cl-member key vterm-keymap-exceptions) - (define-key vterm-mode-map (kbd key) #'vterm-self-insert))))) + (define-key vterm-mode-map (kbd key) #'vterm--self-insert))))) (dolist (exception vterm-keymap-exceptions) (define-key vterm-mode-map (kbd exception) nil)) -(defun vterm-self-insert () +(defun vterm--self-insert () "Sends invoking key to libvterm." (interactive) (let* ((modifiers (event-modifiers last-input-event)) @@ -111,45 +110,45 @@ be send to the terminal.") (when (equal modifiers '(shift)) (setq key (upcase key))) (with-selected-window window - (vterm-update vterm-term key shift meta ctrl))))) + (vterm-update vterm--term key shift meta ctrl))))) (defun vterm-create () "Create a new vterm." (interactive) (let ((buffer (generate-new-buffer "vterm"))) - (add-to-list 'vterm-buffers buffer) + (add-to-list 'vterm--buffers buffer) (pop-to-buffer buffer) (vterm-mode))) -(defun vterm-event () +(defun vterm--event () "Update the vterm BUFFER." (interactive) (let ((inhibit-redisplay t) (inhibit-read-only t)) (mapc (lambda (buffer) (with-current-buffer buffer - (unless (vterm-update vterm-term) + (unless (vterm-update vterm--term) (kill-buffer-and-window) (message "Shell exited!")))) - vterm-buffers))) + vterm--buffers))) -(define-key special-event-map [sigusr1] #'vterm-event) +(define-key special-event-map [sigusr1] #'vterm--event) -(defun vterm-kill-buffer-hook () +(defun vterm--kill-buffer-hook () "Kill the corresponding process of vterm." (when (eq major-mode 'vterm-mode) - (setq vterm-buffers (remove (current-buffer) vterm-buffers)) - (vterm-kill vterm-term))) + (setq vterm--buffers (remove (current-buffer) vterm--buffers)) + (vterm-kill vterm--term))) -(defun vterm-window-size-change (frame) +(defun vterm--window-size-change (frame) "Notify the vterm over size-change in FRAME." (dolist (window (window-list frame 1)) (let ((buffer (window-buffer window))) (with-current-buffer buffer (when (eq major-mode 'vterm-mode) - (vterm-set-size vterm-term (window-body-height) (window-body-width))))))) + (vterm-set-size vterm--term (window-body-height) (window-body-width))))))) -(defun vterm-face-color-hex (face attr) +(defun vterm--face-color-hex (face attr) "Return the color of the FACE's ATTR as a hex string." (apply #'color-rgb-to-hex (color-name-to-rgb (face-attribute face attr nil 'default)))) |
