Mercurial > emacs
view lisp/eshell/em-prompt.el @ 109581:06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
* lisp/menu-bar.el (menu-bar-showhide-tool-bar-menu-customize-enable-left)
(menu-bar-showhide-tool-bar-menu-customize-disable)
(menu-bar-showhide-tool-bar-menu-customize-enable-right)
(menu-bar-showhide-tool-bar-menu-customize-enable-top)
(menu-bar-showhide-tool-bar-menu-customize-enable-bottom): New functions
(menu-bar-showhide-tool-bar-menu): If tool bar is moveable,
make a menu for Options => toolbar that can move it.
* src/frame.c (Qtool_bar_position): New variable.
(make_frame): Set tool_bar_position to Qtop.
(frame_parms): Add tool-bar-position.
(x_report_frame_params): Store tool_bar_position.
(x_set_fringe_width): Reset wm size hint after fringe changes.
* src/frame.h (struct frame): Add tool_bar_position.
(Qbottom): Declare.
* src/gtkutil.c (FRAME_TOTAL_PIXEL_WIDTH): New macro.
(xg_frame_set_char_size): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
(xg_height_or_width_changed): Use FRAME_TOTAL_PIXEL_WIDTH.
(xg_create_frame_widgets): Create a hobox for placing widgets
vertically. Use gtk_box_pack_start.
(xg_height_or_width_changed): Renamed from xg_height_changed.
(x_wm_set_size_hint): Add FRAME_TOOLBAR_WIDTH to base_width.
(xg_update_frame_menubar, free_frame_menubar): Change to
xg_height_or_width_changed.
(xg_tool_bar_detach_callback): Update left/right/top/bottom tool bar
size correctly. Remove hardcoded 4, instead use handlebox size -
toolbar size.
(xg_tool_bar_attach_callback): Update left/right/top/bottom tool bar
size correctly. Use handlebox size + toolbar size as additional
size.
(xg_pack_tool_bar): POS is a new parameter.
Set orientation of tool bar based on pos.
Only make handlebox_widget if NULL.
Check if tool bar goes to vbox or hbox depending on pos.
(xg_update_tool_bar_sizes): New function.
(update_frame_tool_bar): Remove old_req, new_req. Do not get tool bar
height, call xg_update_tool_bar_sizes instead.
(free_frame_tool_bar): Remove from hbox or vbox depending on
toolbar_in_hbox, Set all FRAME_TOOLBAR_*_(WIDTH|HEIGHT) to zero.
(xg_change_toolbar_position): New function.
* src/gtkutil.h (xg_change_toolbar_position): Declare.
* src/window.c (calc_absolute_offset): Check for FRAME_TOOLBAR_TOP_HEIGHT
and FRAME_TOOLBAR_LEFT_WIDTH.
* src/xfns.c (x_set_tool_bar_position): New function.
(xic_set_statusarea): Use FRAME_TOOLBAR_TOP_HEIGHT.
(x_frame_parm_handlers): Add x_set_tool_bar_position.
(syms_of_xfns): if USE_GTK, provide move-toolbar.
* src/xterm.c (x_set_window_size_1): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
* src/xterm.h (struct x_output): Add toolbar_top_height,
toolbar_bottom_height, toolbar_left_width, toolbar_right_width. Remove
toolbar_height.
if USE_GTK: Add hbox_widget and toolbar_in_hbox.
(FRAME_TOOLBAR_TOP_HEIGHT, FRAME_TOOLBAR_BOTTOM_HEIGHT)
(FRAME_TOOLBAR_LEFT_WIDTH, FRAME_TOOLBAR_RIGHT_WIDTH): New macros.
(FRAME_TOOLBAR_HEIGHT): Is now TOP_HEIGHT + BOTTOM_HEIGHT.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Thu, 29 Jul 2010 18:49:59 +0200 |
parents | 1d1d5d9bd884 |
children | f57f72bb4757 376148b31b5e |
line wrap: on
line source
;;; em-prompt.el --- command prompts ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, ;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; 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 3 of the License, 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. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; Most of the prompt navigation commands of `comint-mode' are ;; supported, such as C-c C-n, C-c C-p, etc. ;;; Code: (eval-when-compile (require 'eshell)) ;;;###autoload (eshell-defgroup eshell-prompt nil "This module provides command prompts, and navigation between them, as is common with most shells." :tag "Command prompts" :group 'eshell-module) ;;; User Variables: (defcustom eshell-prompt-load-hook '(eshell-prompt-initialize) "*A list of functions to call when loading `eshell-prompt'." :type 'hook :group 'eshell-prompt) (defcustom eshell-prompt-function (function (lambda () (concat (abbreviate-file-name (eshell/pwd)) (if (= (user-uid) 0) " # " " $ ")))) "A function that returns the Eshell prompt string. Make sure to update `eshell-prompt-regexp' so that it will match your prompt." :type 'function :group 'eshell-prompt) (defcustom eshell-prompt-regexp "^[^#$\n]* [#$] " "*A regexp which fully matches your eshell prompt. This setting is important, since it affects how eshell will interpret the lines that are passed to it. If this variable is changed, all Eshell buffers must be exited and re-entered for it to take effect." :type 'regexp :group 'eshell-prompt) (defcustom eshell-highlight-prompt t "*If non-nil, Eshell should highlight the prompt." :type 'boolean :group 'eshell-prompt) (defface eshell-prompt '((((class color) (background light)) (:foreground "Red" :bold t)) (((class color) (background dark)) (:foreground "Pink" :bold t)) (t (:bold t))) "*The face used to highlight prompt strings. For highlighting other kinds of strings -- similar to shell mode's behavior -- simply use an output filer which changes text properties." :group 'eshell-prompt) (define-obsolete-face-alias 'eshell-prompt-face 'eshell-prompt "22.1") (defcustom eshell-before-prompt-hook nil "*A list of functions to call before outputting the prompt." :type 'hook :options '(eshell-begin-on-new-line) :group 'eshell-prompt) (defcustom eshell-after-prompt-hook nil "*A list of functions to call after outputting the prompt. Note that if `eshell-scroll-show-maximum-output' is non-nil, then setting `eshell-show-maximum-output' here won't do much. It depends on whether the user wants the resizing to happen while output is arriving, or after." :type 'hook :options '(eshell-show-maximum-output) :group 'eshell-prompt) ;;; Functions: (defun eshell-prompt-initialize () "Initialize the prompting code." (unless eshell-non-interactive-p (add-hook 'eshell-post-command-hook 'eshell-emit-prompt nil t) (make-local-variable 'eshell-prompt-regexp) (if eshell-prompt-regexp (set (make-local-variable 'paragraph-start) eshell-prompt-regexp)) (set (make-local-variable 'eshell-skip-prompt-function) 'eshell-skip-prompt) (define-key eshell-command-map [(control ?n)] 'eshell-next-prompt) (define-key eshell-command-map [(control ?p)] 'eshell-previous-prompt))) (defun eshell-emit-prompt () "Emit a prompt if eshell is being used interactively." (run-hooks 'eshell-before-prompt-hook) (if (not eshell-prompt-function) (set-marker eshell-last-output-end (point)) (let ((prompt (funcall eshell-prompt-function))) (and eshell-highlight-prompt (add-text-properties 0 (length prompt) '(read-only t face eshell-prompt rear-nonsticky (face read-only)) prompt)) (eshell-interactive-print prompt))) (run-hooks 'eshell-after-prompt-hook)) (defun eshell-backward-matching-input (regexp arg) "Search backward through buffer for match for REGEXP. Matches are searched for on lines that match `eshell-prompt-regexp'. With prefix argument N, search for Nth previous match. If N is negative, find the next or Nth next match." (interactive (eshell-regexp-arg "Backward input matching (regexp): ")) (let* ((re (concat eshell-prompt-regexp ".*" regexp)) (pos (save-excursion (end-of-line (if (> arg 0) 0 1)) (if (re-search-backward re nil t arg) (point))))) (if (null pos) (progn (message "Not found") (ding)) (goto-char pos) (eshell-bol)))) (defun eshell-forward-matching-input (regexp arg) "Search forward through buffer for match for REGEXP. Matches are searched for on lines that match `eshell-prompt-regexp'. With prefix argument N, search for Nth following match. If N is negative, find the previous or Nth previous match." (interactive (eshell-regexp-arg "Forward input matching (regexp): ")) (eshell-backward-matching-input regexp (- arg))) (defun eshell-next-prompt (n) "Move to end of Nth next prompt in the buffer. See `eshell-prompt-regexp'." (interactive "p") (forward-paragraph n) (eshell-skip-prompt)) (defun eshell-previous-prompt (n) "Move to end of Nth previous prompt in the buffer. See `eshell-prompt-regexp'." (interactive "p") (eshell-next-prompt (- (1+ n)))) (defun eshell-skip-prompt () "Skip past the text matching regexp `eshell-prompt-regexp'. If this takes us past the end of the current line, don't skip at all." (let ((eol (line-end-position))) (if (and (looking-at eshell-prompt-regexp) (<= (match-end 0) eol)) (goto-char (match-end 0))))) (provide 'em-prompt) ;; Local Variables: ;; generated-autoload-file: "esh-groups.el" ;; End: ;; arch-tag: 01c1574b-ce70-4e89-bc38-e6619f61e208 ;;; em-prompt.el ends here