Mercurial > emacs
view lisp/calc/calc-trail.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 | 1e3c6cb46d2a |
children | 417b1e4d63cd |
line wrap: on
line source
;;; calc-trail.el --- functions for manipulating the Calc "trail" ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> ;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com> ;; 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: ;;; Code: ;; This file is autoloaded from calc-ext.el. (require 'calc-ext) (require 'calc-macs) ;;; Trail commands. (defun calc-trail-in () (interactive) (let ((win (get-buffer-window (calc-trail-display t)))) (and win (select-window win)))) (defun calc-trail-out () (interactive) (calc-select-buffer) (let ((win (get-buffer-window (current-buffer)))) (if win (progn (select-window win) (calc-align-stack-window)) (calc)))) (defun calc-trail-next (n) (interactive "p") (calc-with-trail-buffer (forward-line n) (calc-trail-here))) (defun calc-trail-previous (n) (interactive "p") (calc-with-trail-buffer (forward-line (- n)) (calc-trail-here))) (defun calc-trail-first (n) (interactive "p") (calc-with-trail-buffer (goto-char (point-min)) (forward-line n) (calc-trail-here))) (defun calc-trail-last (n) (interactive "p") (calc-with-trail-buffer (goto-char (point-max)) (forward-line (- n)) (calc-trail-here))) (defun calc-trail-scroll-left (n) (interactive "P") (let ((curwin (selected-window))) (calc-with-trail-buffer (unwind-protect (progn (select-window (get-buffer-window (current-buffer))) (calc-scroll-left n)) (select-window curwin))))) (defun calc-trail-scroll-right (n) (interactive "P") (let ((curwin (selected-window))) (calc-with-trail-buffer (unwind-protect (progn (select-window (get-buffer-window (current-buffer))) (calc-scroll-right n)) (select-window curwin))))) (defun calc-trail-forward (n) (interactive "p") (calc-with-trail-buffer (forward-line (* n (1- (window-height)))) (calc-trail-here))) (defun calc-trail-backward (n) (interactive "p") (calc-with-trail-buffer (forward-line (- (* n (1- (window-height))))) (calc-trail-here))) (defun calc-trail-isearch-forward () (interactive) (calc-with-trail-buffer (let ((win (get-buffer-window (current-buffer))) pos) (save-window-excursion (select-window win) (isearch-forward) (setq pos (point))) (goto-char pos) (set-window-point win pos) (calc-trail-here)))) (defun calc-trail-isearch-backward () (interactive) (calc-with-trail-buffer (let ((win (get-buffer-window (current-buffer))) pos) (save-window-excursion (select-window win) (isearch-backward) (setq pos (point))) (goto-char pos) (set-window-point win pos) (calc-trail-here)))) (defun calc-trail-yank (arg) (interactive "P") (calc-wrapper (or arg (calc-set-command-flag 'hold-trail)) (calc-enter-result 0 "yank" (calc-with-trail-buffer (if arg (forward-line (- (prefix-numeric-value arg)))) (if (or (looking-at "Emacs Calc") (looking-at "----") (looking-at " ? ? ?[^ \n]* *$") (looking-at "..?.?$")) (error "Can't yank that line")) (if (looking-at ".*, \\.\\.\\., ") (error "Can't yank (vector was abbreviated)")) (forward-char 4) (search-forward " ") (let* ((next (save-excursion (forward-line 1) (point))) (str (buffer-substring (point) (1- next))) (val (with-current-buffer save-buf (math-read-plain-expr str)))) (if (eq (car-safe val) 'error) (error "Can't yank that line: %s" (nth 2 val)) val)))))) (defun calc-trail-marker (str) (interactive "sText to insert in trail: ") (calc-with-trail-buffer (forward-line 1) (let ((buffer-read-only nil)) (insert "---- " str "\n")) (forward-line -1) (calc-trail-here))) (defun calc-trail-kill (n) (interactive "p") (calc-with-trail-buffer (let ((buffer-read-only nil)) (save-restriction (narrow-to-region ; don't delete "Emacs Trail" header (save-excursion (goto-char (point-min)) (forward-line 1) (point)) (point-max)) (kill-line n))) (calc-trail-here))) (provide 'calc-trail) ;; arch-tag: 59b76655-d882-4aab-a3ee-b83870e530d0 ;;; calc-trail.el ends here