Mercurial > emacs
view lisp/epg-config.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 | 904ccd8f2acb |
children | 280c8ae2476d |
line wrap: on
line source
;;; epg-config.el --- configuration of the EasyPG Library ;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org> ;; Keywords: PGP, GnuPG ;; 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/>. ;;; Code: (defconst epg-package-name "epg" "Name of this package.") (defconst epg-version-number "1.0.0" "Version number of this package.") (defconst epg-bug-report-address "ueno@unixuser.org" "Report bugs to this address.") (defgroup epg () "The EasyPG library." :version "23.1" :group 'data) (defcustom epg-gpg-program "gpg" "The `gpg' executable." :group 'epg :type 'string) (defcustom epg-gpgsm-program "gpgsm" "The `gpgsm' executable." :group 'epg :type 'string) (defcustom epg-gpg-home-directory nil "The directory which contains the configuration files of `epg-gpg-program'." :group 'epg :type '(choice (const :tag "Default" nil) directory)) (defcustom epg-passphrase-coding-system nil "Coding system to use with messages from `epg-gpg-program'." :group 'epg :type 'symbol) (defcustom epg-debug nil "If non-nil, debug output goes to the \" *epg-debug*\" buffer. Note that the buffer name starts with a space." :group 'epg :type 'boolean) (defconst epg-gpg-minimum-version "1.4.3") ;;;###autoload (defun epg-configuration () "Return a list of internal configuration parameters of `epg-gpg-program'." (let (config groups type args) (with-temp-buffer (apply #'call-process epg-gpg-program nil (list t nil) nil (append (if epg-gpg-home-directory (list "--homedir" epg-gpg-home-directory)) '("--with-colons" "--list-config"))) (goto-char (point-min)) (while (re-search-forward "^cfg:\\([^:]+\\):\\(.*\\)" nil t) (setq type (intern (match-string 1)) args (match-string 2)) (cond ((eq type 'group) (if (string-match "\\`\\([^:]+\\):" args) (setq groups (cons (cons (downcase (match-string 1 args)) (delete "" (split-string (substring args (match-end 0)) ";"))) groups)) (if epg-debug (message "Invalid group configuration: %S" args)))) ((memq type '(pubkey cipher digest compress)) (if (string-match "\\`\\([0-9]+\\)\\(;[0-9]+\\)*" args) (setq config (cons (cons type (mapcar #'string-to-number (delete "" (split-string args ";")))) config)) (if epg-debug (message "Invalid %S algorithm configuration: %S" type args)))) (t (setq config (cons (cons type args) config)))))) (if groups (cons (cons 'groups groups) config) config))) (defun epg-config--parse-version (string) (let ((index 0) version) (while (eq index (string-match "\\([0-9]+\\)\\.?" string index)) (setq version (cons (string-to-number (match-string 1 string)) version) index (match-end 0))) (nreverse version))) (defun epg-config--compare-version (v1 v2) (while (and v1 v2 (= (car v1) (car v2))) (setq v1 (cdr v1) v2 (cdr v2))) (- (or (car v1) 0) (or (car v2) 0))) ;;;###autoload (defun epg-check-configuration (config &optional minimum-version) "Verify that a sufficient version of GnuPG is installed." (let ((entry (assq 'version config)) version) (unless (and entry (stringp (cdr entry))) (error "Undetermined version: %S" entry)) (setq version (epg-config--parse-version (cdr entry)) minimum-version (epg-config--parse-version (or minimum-version epg-gpg-minimum-version))) (unless (>= (epg-config--compare-version version minimum-version) 0) (error "Unsupported version: %s" (cdr entry))))) ;;;###autoload (defun epg-expand-group (config group) "Look at CONFIG and try to expand GROUP." (let ((entry (assq 'groups config))) (if (and entry (setq entry (assoc (downcase group) (cdr entry)))) (cdr entry)))) (provide 'epg-config) ;; arch-tag: 9aca7cb8-5f63-4bcb-84ee-46fd2db0763f ;;; epg-config.el ends here