Mercurial > emacs
view lisp/calc/calc-undo.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 | 376148b31b5e |
line wrap: on
line source
;;; calc-undo.el --- undo functions for Calc ;; 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) ;;; Undo. (defun calc-undo (n) (interactive "p") (when calc-executing-macro (error "Use C-x e, not X, to run a keyboard macro that uses Undo")) (if (<= n 0) (if (< n 0) (calc-redo (- n)) (calc-last-args 1)) (calc-wrapper (when (null (nthcdr (1- n) calc-undo-list)) (error "No further undo information available")) (setq calc-undo-list (prog1 (nthcdr n calc-undo-list) (let ((saved-stack-top calc-stack-top)) (let ((calc-stack-top 0)) (calc-handle-undos calc-undo-list n)) (setq calc-stack-top saved-stack-top)))) (message "Undo!")))) (defun calc-handle-undos (cl n) (when (> n 0) (let ((old-redo calc-redo-list)) (setq calc-undo-list nil) (calc-handle-undo (car cl)) (setq calc-redo-list (append calc-undo-list old-redo))) (calc-handle-undos (cdr cl) (1- n)))) (defun calc-handle-undo (list) (when list (let ((action (car list))) (cond ((eq (car action) 'push) (calc-pop-stack 1 (nth 1 action) t)) ((eq (car action) 'pop) (calc-push-list (nth 2 action) (nth 1 action))) ((eq (car action) 'set) (calc-record-undo (list 'set (nth 1 action) (symbol-value (nth 1 action)))) (set (nth 1 action) (nth 2 action))) ((eq (car action) 'store) (let ((v (intern (nth 1 action)))) (calc-record-undo (list 'store (nth 1 action) (and (boundp v) (symbol-value v)))) (if (y-or-n-p (format "Un-store variable %s? " (calc-var-name (nth 1 action)))) (progn (if (nth 2 action) (set v (nth 2 action)) (makunbound v)) (calc-refresh-evaltos v))))) ((eq (car action) 'eval) (calc-record-undo (append (list 'eval (nth 2 action) (nth 1 action)) (cdr (cdr (cdr action))))) (apply (nth 1 action) (cdr (cdr (cdr action)))))) (calc-handle-undo (cdr list))))) (defun calc-redo (n) (interactive "p") (when calc-executing-macro (error "Use C-x e, not X, to run a keyboard macro that uses Redo")) (if (<= n 0) (calc-undo (- n)) (calc-wrapper (when (null (nthcdr (1- n) calc-redo-list)) (error "Unable to redo")) (setq calc-redo-list (prog1 (nthcdr n calc-redo-list) (let ((saved-stack-top calc-stack-top)) (let ((calc-stack-top 0)) (calc-handle-redos calc-redo-list n)) (setq calc-stack-top saved-stack-top)))) (message "Redo!")))) (defun calc-handle-redos (cl n) (when (> n 0) (let ((old-undo calc-undo-list)) (setq calc-undo-list nil) (calc-handle-undo (car cl)) (setq calc-undo-list (append calc-undo-list old-undo))) (calc-handle-redos (cdr cl) (1- n)))) (defun calc-last-args (n) (interactive "p") (when calc-executing-macro (error "Use C-x e, not X, to run a keyboard macro that uses last-args")) (calc-wrapper (let ((urec (calc-find-last-x calc-undo-list n))) (if urec (calc-handle-last-x urec) (error "Not enough undo information available"))))) (defun calc-handle-last-x (list) (when list (let ((action (car list))) (if (eq (car action) 'pop) (calc-pop-push-record-list 0 "larg" (delq 'top-of-stack (nth 2 action)))) (calc-handle-last-x (cdr list))))) (defun calc-find-last-x (ul n) (when ul (if (calc-undo-does-pushes (car ul)) (if (<= n 1) (car ul) (calc-find-last-x (cdr ul) (1- n))) (calc-find-last-x (cdr ul) n)))) (defun calc-undo-does-pushes (list) (and list (or (eq (car (car list)) 'pop) (calc-undo-does-pushes (cdr list))))) (provide 'calc-undo) ;; arch-tag: eeb485d2-fb3d-454a-9d79-450af1f50d6c ;;; calc-undo.el ends here