Mercurial > emacs
view lisp/ledit.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
;;; ledit.el --- Emacs side of ledit interface ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: languages ;; 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: ;; This is a major mode for editing Liszt. See etc/LEDIT for details. ;;; Code: ;;; To do: ;;; o lisp -> emacs side of things (grind-definition and find-definition) (defvar ledit-mode-map nil) (defconst ledit-zap-file (expand-file-name (concat (user-login-name) ".l1") temporary-file-directory) "File name for data sent to Lisp by Ledit.") (defconst ledit-read-file (expand-file-name (concat (user-login-name) ".l2") temporary-file-directory) "File name for data sent to Ledit by Lisp.") (defconst ledit-compile-file (expand-file-name (concat (user-login-name) ".l4") temporary-file-directory) "File name for data sent to Lisp compiler by Ledit.") (defconst ledit-buffer "*LEDIT*" "Name of buffer in which Ledit accumulates data to send to Lisp.") ;;;###autoload (defconst ledit-save-files t "\ *Non-nil means Ledit should save files before transferring to Lisp.") ;;;###autoload (defconst ledit-go-to-lisp-string "%?lisp" "\ *Shell commands to execute to resume Lisp job.") ;;;###autoload (defconst ledit-go-to-liszt-string "%?liszt" "\ *Shell commands to execute to resume Lisp compiler job.") (defun ledit-save-defun () "Save the current defun in the ledit buffer." (interactive) (save-excursion (end-of-defun) (let ((end (point))) (beginning-of-defun) (append-to-buffer ledit-buffer (point) end)) (message "Current defun saved for Lisp"))) (defun ledit-save-region (beg end) "Save the current region in the ledit buffer" (interactive "r") (append-to-buffer ledit-buffer beg end) (message "Region saved for Lisp")) (defun ledit-zap-defun-to-lisp () "Carry the current defun to Lisp." (interactive) (ledit-save-defun) (ledit-go-to-lisp)) (defun ledit-zap-defun-to-liszt () "Carry the current defun to liszt." (interactive) (ledit-save-defun) (ledit-go-to-liszt)) (defun ledit-zap-region-to-lisp (beg end) "Carry the current region to Lisp." (interactive "r") (ledit-save-region beg end) (ledit-go-to-lisp)) (defun ledit-go-to-lisp () "Suspend Emacs and restart a waiting Lisp job." (interactive) (if ledit-save-files (save-some-buffers)) (if (get-buffer ledit-buffer) (with-current-buffer ledit-buffer (goto-char (point-min)) (write-region (point-min) (point-max) ledit-zap-file) (erase-buffer))) (suspend-emacs ledit-go-to-lisp-string) (load ledit-read-file t t)) (defun ledit-go-to-liszt () "Suspend Emacs and restart a waiting Liszt job." (interactive) (if ledit-save-files (save-some-buffers)) (if (get-buffer ledit-buffer) (with-current-buffer ledit-buffer (goto-char (point-min)) (insert "(declare (macros t))\n") (write-region (point-min) (point-max) ledit-compile-file) (erase-buffer))) (suspend-emacs ledit-go-to-liszt-string) (load ledit-read-file t t)) (defun ledit-setup () "Set up key bindings for the Lisp/Emacs interface." (unless ledit-mode-map (setq ledit-mode-map (make-sparse-keymap)) (set-keymap-parent ledit-mode-map lisp-mode-shared-map)) (define-key ledit-mode-map "\e\^d" 'ledit-save-defun) (define-key ledit-mode-map "\e\^r" 'ledit-save-region) (define-key ledit-mode-map "\^xz" 'ledit-go-to-lisp) (define-key ledit-mode-map "\e\^c" 'ledit-go-to-liszt)) (ledit-setup) ;;;###autoload (defun ledit-mode () "\\<ledit-mode-map>Major mode for editing text and stuffing it to a Lisp job. Like Lisp mode, plus these special commands: \\[ledit-save-defun] -- record defun at or after point for later transmission to Lisp job. \\[ledit-save-region] -- record region for later transmission to Lisp job. \\[ledit-go-to-lisp] -- transfer to Lisp job and transmit saved text. \\[ledit-go-to-liszt] -- transfer to Liszt (Lisp compiler) job and transmit saved text. \\{ledit-mode-map} To make Lisp mode automatically change to Ledit mode, do (setq lisp-mode-hook 'ledit-from-lisp-mode)" (interactive) (delay-mode-hooks (lisp-mode)) (ledit-from-lisp-mode)) ;;;###autoload (defun ledit-from-lisp-mode () (use-local-map ledit-mode-map) (setq mode-name "Ledit") (setq major-mode 'ledit-mode) (run-mode-hooks 'ledit-mode-hook)) (provide 'ledit) ;; arch-tag: f0f1ca13-8d31-478c-ae1b-b448c55a8faf ;;; ledit.el ends here