emacs: Reorganize package/generation UI code.
Move the code for packages/generations interface from "guix-info.el",
"guix-list.el", "guix-base.el" and "guix.el" to "guix-ui-package.el" and
"guix-ui-generation.el".
* emacs/guix-base.el (guix-package-entry->name-specification)
(guix-package-entries->name-specifications)
(guix-package-id-and-output-by-output-id)
(guix-package-installed-outputs, guix-process-package-actions)
(guix-package-list-type, guix-package-info-type)
(guix-continue-package-operation-p, guix-get-package-strings)
(guix-insert-package-strings): Move to "guix-ui-package.el".
(guix-generation-packages-buffer-name-function, guix-output-name-width)
(guix-generation-packages-update-buffer, guix-generation-packages)
(guix-generation-packages-buffer-name-default)
(guix-generation-packages-buffer-name-long)
(guix-generation-packages-buffer-name, guix-generation-packages-buffer)
(guix-generation-insert-packages, guix-generation-insert-package)
(guix-profile-generation-manifest-file, guix-delete-generations)
(guix-profile-generation-packages-buffer, guix-switch-to-generation):
Move to "guix-ui-generation.el".
* emacs/guix-info.el (guix-package-location, guix-package-name)
(guix-package-source, guix-package-info-source)
(guix-package-info-heading, guix-package-info-license)
(guix-package-info-name, guix-package-info-name-button)
(guix-package-info-version, guix-package-info-location)
(guix-package-info-synopsis, guix-package-info-description)
(guix-package-info-obsolete, guix-package-info-installed-outputs)
(guix-package-info-uninstalled-outputs)
(guix-package-info-insert-heading)
(guix-package-info-define-insert-inputs)
(guix-package-info-obsolete-string)
(guix-package-info-insert-obsolete-text)
(guix-package-info-insert-non-unique-text)
(guix-package-info-insert-outputs, guix-package-info-insert-output)
(guix-package-info-insert-action-button)
(guix-package-info-auto-find-source)
(guix-package-info-auto-download-source)
(guix-package-info-download-buffer, guix-package-info-show-source)
(guix-package-info-download-source, guix-package-info-insert-source)
(guix-package-info-redisplay-after-download)
(guix-output-info-insert-version, guix-output-info-insert-output):
Move to "guix-ui-package.el".
(guix-generation-info-number, guix-generation-info-current)
(guix-generation-not-current, guix-generation-info-insert-number)
(guix-generation-info-insert-current): Move to "guix-ui-generation.el".
* emacs/guix-list.el (guix-package-list-generation-marking-enabled)
(guix-package-list-installed, guix-package-list-obsolete)
(guix-package-list-get-name, guix-package-list-get-installed-outputs)
(guix-package-list-marking-check, guix-package-list-mark-outputs)
(guix-package-list-mark-install, guix-package-list-mark-delete)
(guix-package-list-mark-upgrade, guix-package-list-mark-upgrades)
(guix-list-mark-package-upgrades, guix-list-execute-package-actions)
(guix-package-list-execute, guix-package-list-make-action)
(guix-package-list-edit, guix-output-list-mark-install)
(guix-output-list-mark-delete, guix-output-list-mark-upgrade)
(guix-output-list-mark-upgrades, guix-output-list-make-action)
(guix-output-list-describe, guix-output-list-edit): Move to
"guix-ui-package.el".
(guix-generation-list-get-current, guix-generation-list-switch)
(guix-generation-list-generations-to-compare)
(guix-generation-list-compare, guix-generation-list-show-packages)
(guix-generation-list-show-added-packages)
(guix-generation-list-show-removed-packages)
(guix-generation-list-diff, guix-generation-list-diff-manifests)
(guix-generation-list-ediff, guix-generation-list-ediff-manifests)
(guix-generation-list-diff-packages)
(guix-generation-list-ediff-packages)
(guix-generation-list-mark-delete, guix-generation-list-execute): Move
to "guix-ui-generation.el".
* emacs/guix.el: Remove.
(guix, guix-faces, guix-edit): Move to "guix-base.el".
(guix-list-single-package, guix-search-params, guix-search-history)
(guix-get-show-packages, guix-search-by-name, guix-search-by-regexp)
(guix-installed-packages, guix-obsolete-packages)
(guix-all-available-packages, guix-newest-available-packages): Move
to "guix-ui-package.el".
(guix-get-show-generations, guix-generations, guix-last-generations)
(guix-generations-by-time): Move to "guix-ui-generation.el".
* emacs.am (ELFILES): Remove "guix.el". Add "guix-ui-package.el" and
"guix-ui-generation.el".
* doc/emacs.texi (Emacs Appearance): Adjust accordingly.
2015-12-09 06:44:34 -05:00
|
|
|
|
;;; guix-info.el --- 'Info' buffer interface for displaying data -*- lexical-binding: t -*-
|
2014-08-27 08:44:17 -04:00
|
|
|
|
|
2015-07-13 16:08:11 -04:00
|
|
|
|
;; Copyright © 2014, 2015 Alex Kost <alezost@gmail.com>
|
|
|
|
|
;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
|
2014-08-27 08:44:17 -04:00
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Guix.
|
|
|
|
|
|
|
|
|
|
;; GNU Guix 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 Guix 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 this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
emacs: Reorganize package/generation UI code.
Move the code for packages/generations interface from "guix-info.el",
"guix-list.el", "guix-base.el" and "guix.el" to "guix-ui-package.el" and
"guix-ui-generation.el".
* emacs/guix-base.el (guix-package-entry->name-specification)
(guix-package-entries->name-specifications)
(guix-package-id-and-output-by-output-id)
(guix-package-installed-outputs, guix-process-package-actions)
(guix-package-list-type, guix-package-info-type)
(guix-continue-package-operation-p, guix-get-package-strings)
(guix-insert-package-strings): Move to "guix-ui-package.el".
(guix-generation-packages-buffer-name-function, guix-output-name-width)
(guix-generation-packages-update-buffer, guix-generation-packages)
(guix-generation-packages-buffer-name-default)
(guix-generation-packages-buffer-name-long)
(guix-generation-packages-buffer-name, guix-generation-packages-buffer)
(guix-generation-insert-packages, guix-generation-insert-package)
(guix-profile-generation-manifest-file, guix-delete-generations)
(guix-profile-generation-packages-buffer, guix-switch-to-generation):
Move to "guix-ui-generation.el".
* emacs/guix-info.el (guix-package-location, guix-package-name)
(guix-package-source, guix-package-info-source)
(guix-package-info-heading, guix-package-info-license)
(guix-package-info-name, guix-package-info-name-button)
(guix-package-info-version, guix-package-info-location)
(guix-package-info-synopsis, guix-package-info-description)
(guix-package-info-obsolete, guix-package-info-installed-outputs)
(guix-package-info-uninstalled-outputs)
(guix-package-info-insert-heading)
(guix-package-info-define-insert-inputs)
(guix-package-info-obsolete-string)
(guix-package-info-insert-obsolete-text)
(guix-package-info-insert-non-unique-text)
(guix-package-info-insert-outputs, guix-package-info-insert-output)
(guix-package-info-insert-action-button)
(guix-package-info-auto-find-source)
(guix-package-info-auto-download-source)
(guix-package-info-download-buffer, guix-package-info-show-source)
(guix-package-info-download-source, guix-package-info-insert-source)
(guix-package-info-redisplay-after-download)
(guix-output-info-insert-version, guix-output-info-insert-output):
Move to "guix-ui-package.el".
(guix-generation-info-number, guix-generation-info-current)
(guix-generation-not-current, guix-generation-info-insert-number)
(guix-generation-info-insert-current): Move to "guix-ui-generation.el".
* emacs/guix-list.el (guix-package-list-generation-marking-enabled)
(guix-package-list-installed, guix-package-list-obsolete)
(guix-package-list-get-name, guix-package-list-get-installed-outputs)
(guix-package-list-marking-check, guix-package-list-mark-outputs)
(guix-package-list-mark-install, guix-package-list-mark-delete)
(guix-package-list-mark-upgrade, guix-package-list-mark-upgrades)
(guix-list-mark-package-upgrades, guix-list-execute-package-actions)
(guix-package-list-execute, guix-package-list-make-action)
(guix-package-list-edit, guix-output-list-mark-install)
(guix-output-list-mark-delete, guix-output-list-mark-upgrade)
(guix-output-list-mark-upgrades, guix-output-list-make-action)
(guix-output-list-describe, guix-output-list-edit): Move to
"guix-ui-package.el".
(guix-generation-list-get-current, guix-generation-list-switch)
(guix-generation-list-generations-to-compare)
(guix-generation-list-compare, guix-generation-list-show-packages)
(guix-generation-list-show-added-packages)
(guix-generation-list-show-removed-packages)
(guix-generation-list-diff, guix-generation-list-diff-manifests)
(guix-generation-list-ediff, guix-generation-list-ediff-manifests)
(guix-generation-list-diff-packages)
(guix-generation-list-ediff-packages)
(guix-generation-list-mark-delete, guix-generation-list-execute): Move
to "guix-ui-generation.el".
* emacs/guix.el: Remove.
(guix, guix-faces, guix-edit): Move to "guix-base.el".
(guix-list-single-package, guix-search-params, guix-search-history)
(guix-get-show-packages, guix-search-by-name, guix-search-by-regexp)
(guix-installed-packages, guix-obsolete-packages)
(guix-all-available-packages, guix-newest-available-packages): Move
to "guix-ui-package.el".
(guix-get-show-generations, guix-generations, guix-last-generations)
(guix-generations-by-time): Move to "guix-ui-generation.el".
* emacs.am (ELFILES): Remove "guix.el". Add "guix-ui-package.el" and
"guix-ui-generation.el".
* doc/emacs.texi (Emacs Appearance): Adjust accordingly.
2015-12-09 06:44:34 -05:00
|
|
|
|
;; This file provides 'info' (help-like) buffer interface for displaying
|
|
|
|
|
;; an arbitrary data.
|
2014-08-27 08:44:17 -04:00
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
emacs: Reorganize package/generation UI code.
Move the code for packages/generations interface from "guix-info.el",
"guix-list.el", "guix-base.el" and "guix.el" to "guix-ui-package.el" and
"guix-ui-generation.el".
* emacs/guix-base.el (guix-package-entry->name-specification)
(guix-package-entries->name-specifications)
(guix-package-id-and-output-by-output-id)
(guix-package-installed-outputs, guix-process-package-actions)
(guix-package-list-type, guix-package-info-type)
(guix-continue-package-operation-p, guix-get-package-strings)
(guix-insert-package-strings): Move to "guix-ui-package.el".
(guix-generation-packages-buffer-name-function, guix-output-name-width)
(guix-generation-packages-update-buffer, guix-generation-packages)
(guix-generation-packages-buffer-name-default)
(guix-generation-packages-buffer-name-long)
(guix-generation-packages-buffer-name, guix-generation-packages-buffer)
(guix-generation-insert-packages, guix-generation-insert-package)
(guix-profile-generation-manifest-file, guix-delete-generations)
(guix-profile-generation-packages-buffer, guix-switch-to-generation):
Move to "guix-ui-generation.el".
* emacs/guix-info.el (guix-package-location, guix-package-name)
(guix-package-source, guix-package-info-source)
(guix-package-info-heading, guix-package-info-license)
(guix-package-info-name, guix-package-info-name-button)
(guix-package-info-version, guix-package-info-location)
(guix-package-info-synopsis, guix-package-info-description)
(guix-package-info-obsolete, guix-package-info-installed-outputs)
(guix-package-info-uninstalled-outputs)
(guix-package-info-insert-heading)
(guix-package-info-define-insert-inputs)
(guix-package-info-obsolete-string)
(guix-package-info-insert-obsolete-text)
(guix-package-info-insert-non-unique-text)
(guix-package-info-insert-outputs, guix-package-info-insert-output)
(guix-package-info-insert-action-button)
(guix-package-info-auto-find-source)
(guix-package-info-auto-download-source)
(guix-package-info-download-buffer, guix-package-info-show-source)
(guix-package-info-download-source, guix-package-info-insert-source)
(guix-package-info-redisplay-after-download)
(guix-output-info-insert-version, guix-output-info-insert-output):
Move to "guix-ui-package.el".
(guix-generation-info-number, guix-generation-info-current)
(guix-generation-not-current, guix-generation-info-insert-number)
(guix-generation-info-insert-current): Move to "guix-ui-generation.el".
* emacs/guix-list.el (guix-package-list-generation-marking-enabled)
(guix-package-list-installed, guix-package-list-obsolete)
(guix-package-list-get-name, guix-package-list-get-installed-outputs)
(guix-package-list-marking-check, guix-package-list-mark-outputs)
(guix-package-list-mark-install, guix-package-list-mark-delete)
(guix-package-list-mark-upgrade, guix-package-list-mark-upgrades)
(guix-list-mark-package-upgrades, guix-list-execute-package-actions)
(guix-package-list-execute, guix-package-list-make-action)
(guix-package-list-edit, guix-output-list-mark-install)
(guix-output-list-mark-delete, guix-output-list-mark-upgrade)
(guix-output-list-mark-upgrades, guix-output-list-make-action)
(guix-output-list-describe, guix-output-list-edit): Move to
"guix-ui-package.el".
(guix-generation-list-get-current, guix-generation-list-switch)
(guix-generation-list-generations-to-compare)
(guix-generation-list-compare, guix-generation-list-show-packages)
(guix-generation-list-show-added-packages)
(guix-generation-list-show-removed-packages)
(guix-generation-list-diff, guix-generation-list-diff-manifests)
(guix-generation-list-ediff, guix-generation-list-ediff-manifests)
(guix-generation-list-diff-packages)
(guix-generation-list-ediff-packages)
(guix-generation-list-mark-delete, guix-generation-list-execute): Move
to "guix-ui-generation.el".
* emacs/guix.el: Remove.
(guix, guix-faces, guix-edit): Move to "guix-base.el".
(guix-list-single-package, guix-search-params, guix-search-history)
(guix-get-show-packages, guix-search-by-name, guix-search-by-regexp)
(guix-installed-packages, guix-obsolete-packages)
(guix-all-available-packages, guix-newest-available-packages): Move
to "guix-ui-package.el".
(guix-get-show-generations, guix-generations, guix-last-generations)
(guix-generations-by-time): Move to "guix-ui-generation.el".
* emacs.am (ELFILES): Remove "guix.el". Add "guix-ui-package.el" and
"guix-ui-generation.el".
* doc/emacs.texi (Emacs Appearance): Adjust accordingly.
2015-12-09 06:44:34 -05:00
|
|
|
|
(require 'guix-buffer)
|
2015-10-22 03:08:42 -04:00
|
|
|
|
(require 'guix-entry)
|
2014-08-27 08:44:17 -04:00
|
|
|
|
(require 'guix-utils)
|
|
|
|
|
|
2015-12-18 03:19:12 -05:00
|
|
|
|
(guix-define-buffer-type info)
|
2015-09-14 16:32:53 -04:00
|
|
|
|
|
2015-12-08 03:22:14 -05:00
|
|
|
|
(defface guix-info-heading
|
|
|
|
|
'((((type tty pc) (class color)) :weight bold)
|
|
|
|
|
(t :height 1.6 :weight bold :inherit variable-pitch))
|
|
|
|
|
"Face for headings."
|
|
|
|
|
:group 'guix-info-faces)
|
|
|
|
|
|
2014-08-27 08:44:17 -04:00
|
|
|
|
(defface guix-info-param-title
|
|
|
|
|
'((t :inherit font-lock-type-face))
|
|
|
|
|
"Face used for titles of parameters."
|
2015-09-14 16:32:53 -04:00
|
|
|
|
:group 'guix-info-faces)
|
2014-08-27 08:44:17 -04:00
|
|
|
|
|
2016-01-21 02:59:50 -05:00
|
|
|
|
(defface guix-info-file-name
|
2014-08-27 08:44:17 -04:00
|
|
|
|
'((t :inherit link))
|
2016-01-21 02:59:50 -05:00
|
|
|
|
"Face used for file names."
|
2015-09-14 16:32:53 -04:00
|
|
|
|
:group 'guix-info-faces)
|
2014-08-27 08:44:17 -04:00
|
|
|
|
|
|
|
|
|
(defface guix-info-url
|
|
|
|
|
'((t :inherit link))
|
|
|
|
|
"Face used for URLs."
|
2015-09-14 16:32:53 -04:00
|
|
|
|
:group 'guix-info-faces)
|
2014-08-27 08:44:17 -04:00
|
|
|
|
|
|
|
|
|
(defface guix-info-time
|
|
|
|
|
'((t :inherit font-lock-constant-face))
|
|
|
|
|
"Face used for timestamps."
|
2015-09-14 16:32:53 -04:00
|
|
|
|
:group 'guix-info-faces)
|
2014-08-27 08:44:17 -04:00
|
|
|
|
|
|
|
|
|
(defface guix-info-action-button
|
|
|
|
|
'((((type x w32 ns) (class color))
|
|
|
|
|
:box (:line-width 2 :style released-button)
|
|
|
|
|
:background "lightgrey" :foreground "black")
|
|
|
|
|
(t :inherit button))
|
|
|
|
|
"Face used for action buttons."
|
2015-09-14 16:32:53 -04:00
|
|
|
|
:group 'guix-info-faces)
|
2014-08-27 08:44:17 -04:00
|
|
|
|
|
|
|
|
|
(defface guix-info-action-button-mouse
|
|
|
|
|
'((((type x w32 ns) (class color))
|
|
|
|
|
:box (:line-width 2 :style released-button)
|
|
|
|
|
:background "grey90" :foreground "black")
|
|
|
|
|
(t :inherit highlight))
|
|
|
|
|
"Mouse face used for action buttons."
|
2015-09-14 16:32:53 -04:00
|
|
|
|
:group 'guix-info-faces)
|
2014-08-27 08:44:17 -04:00
|
|
|
|
|
2015-11-19 16:13:19 -05:00
|
|
|
|
(defcustom guix-info-ignore-empty-values nil
|
2014-08-27 08:44:17 -04:00
|
|
|
|
"If non-nil, do not display parameters with nil values."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'guix-info)
|
|
|
|
|
|
2015-11-19 16:13:19 -05:00
|
|
|
|
(defcustom guix-info-fill t
|
|
|
|
|
"If non-nil, fill string parameters to fit the window.
|
|
|
|
|
If nil, insert text parameters (like synopsis or description) in
|
|
|
|
|
a raw form."
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'guix-info)
|
|
|
|
|
|
2014-08-27 08:44:17 -04:00
|
|
|
|
(defvar guix-info-param-title-format "%-18s: "
|
|
|
|
|
"String used to format a title of a parameter.
|
|
|
|
|
It should be a '%s'-sequence. After inserting a title formatted
|
|
|
|
|
with this string, a value of the parameter is inserted.
|
2015-11-19 16:13:19 -05:00
|
|
|
|
This string is used by `guix-info-insert-title-format'.")
|
2014-08-27 08:44:17 -04:00
|
|
|
|
|
2015-11-19 16:13:19 -05:00
|
|
|
|
(defvar guix-info-multiline-prefix
|
|
|
|
|
(make-string (length (format guix-info-param-title-format " "))
|
|
|
|
|
?\s)
|
2014-08-27 08:44:17 -04:00
|
|
|
|
"String used to format multi-line parameter values.
|
|
|
|
|
If a value occupies more than one line, this string is inserted
|
|
|
|
|
in the beginning of each line after the first one.
|
2015-11-19 16:13:19 -05:00
|
|
|
|
This string is used by `guix-info-insert-value-format'.")
|
2014-08-27 08:44:17 -04:00
|
|
|
|
|
|
|
|
|
(defvar guix-info-indent 2
|
|
|
|
|
"Number of spaces used to indent various parts of inserted text.")
|
|
|
|
|
|
|
|
|
|
(defvar guix-info-delimiter "\n\f\n"
|
|
|
|
|
"String used to separate entries.")
|
|
|
|
|
|
2015-11-20 13:25:10 -05:00
|
|
|
|
|
|
|
|
|
;;; Wrappers for 'info' variables
|
2014-08-27 08:44:17 -04:00
|
|
|
|
|
2015-11-20 13:25:10 -05:00
|
|
|
|
(defvar guix-info-data nil
|
|
|
|
|
"Alist with 'info' data.
|
|
|
|
|
This alist is filled by `guix-info-define-interface' macro.")
|
2014-08-27 08:44:17 -04:00
|
|
|
|
|
2015-11-20 13:25:10 -05:00
|
|
|
|
(defun guix-info-value (entry-type symbol)
|
|
|
|
|
"Return SYMBOL's value for ENTRY-TYPE from `guix-info-data'."
|
|
|
|
|
(symbol-value (guix-assq-value guix-info-data entry-type symbol)))
|
2014-08-27 08:44:17 -04:00
|
|
|
|
|
2015-11-19 16:13:19 -05:00
|
|
|
|
(defun guix-info-param-title (entry-type param)
|
|
|
|
|
"Return a title of an ENTRY-TYPE parameter PARAM."
|
2015-11-21 03:35:43 -05:00
|
|
|
|
(guix-buffer-param-title 'info entry-type param))
|
2015-11-19 16:13:19 -05:00
|
|
|
|
|
|
|
|
|
(defun guix-info-format (entry-type)
|
|
|
|
|
"Return 'info' format for ENTRY-TYPE."
|
2015-11-20 13:25:10 -05:00
|
|
|
|
(guix-info-value entry-type 'format))
|
2014-08-27 08:44:17 -04:00
|
|
|
|
|
2015-11-18 03:36:27 -05:00
|
|
|
|
(defun guix-info-displayed-params (entry-type)
|
2015-11-19 16:13:19 -05:00
|
|
|
|
"Return a list of ENTRY-TYPE parameters that should be displayed."
|
|
|
|
|
(delq nil
|
|
|
|
|
(mapcar (lambda (spec)
|
|
|
|
|
(pcase spec
|
|
|
|
|
(`(,param . ,_) param)))
|
|
|
|
|
(guix-info-format entry-type))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Inserting entries
|
|
|
|
|
|
|
|
|
|
(defvar guix-info-title-aliases
|
|
|
|
|
'((format . guix-info-insert-title-format)
|
|
|
|
|
(simple . guix-info-insert-title-simple))
|
|
|
|
|
"Alist of aliases and functions to insert titles.")
|
|
|
|
|
|
|
|
|
|
(defvar guix-info-value-aliases
|
|
|
|
|
'((format . guix-info-insert-value-format)
|
|
|
|
|
(indent . guix-info-insert-value-indent)
|
|
|
|
|
(simple . guix-info-insert-value-simple)
|
|
|
|
|
(time . guix-info-insert-time))
|
|
|
|
|
"Alist of aliases and functions to insert values.")
|
|
|
|
|
|
|
|
|
|
(defun guix-info-title-function (fun-or-alias)
|
|
|
|
|
"Convert FUN-OR-ALIAS into a function to insert a title."
|
|
|
|
|
(or (guix-assq-value guix-info-title-aliases fun-or-alias)
|
|
|
|
|
fun-or-alias))
|
|
|
|
|
|
|
|
|
|
(defun guix-info-value-function (fun-or-alias)
|
|
|
|
|
"Convert FUN-OR-ALIAS into a function to insert a value."
|
|
|
|
|
(or (guix-assq-value guix-info-value-aliases fun-or-alias)
|
|
|
|
|
fun-or-alias))
|
|
|
|
|
|
|
|
|
|
(defun guix-info-title-method->function (method)
|
|
|
|
|
"Convert title METHOD into a function to insert a title."
|
|
|
|
|
(pcase method
|
|
|
|
|
((pred null) #'ignore)
|
|
|
|
|
((pred symbolp) (guix-info-title-function method))
|
|
|
|
|
(`(,fun-or-alias . ,rest-args)
|
|
|
|
|
(lambda (title)
|
|
|
|
|
(apply (guix-info-title-function fun-or-alias)
|
|
|
|
|
title rest-args)))
|
|
|
|
|
(_ (error "Unknown title method '%S'" method))))
|
|
|
|
|
|
|
|
|
|
(defun guix-info-value-method->function (method)
|
|
|
|
|
"Convert value METHOD into a function to insert a value."
|
|
|
|
|
(pcase method
|
|
|
|
|
((pred null) #'ignore)
|
|
|
|
|
((pred functionp) method)
|
|
|
|
|
(`(,fun-or-alias . ,rest-args)
|
|
|
|
|
(lambda (value _)
|
|
|
|
|
(apply (guix-info-value-function fun-or-alias)
|
|
|
|
|
value rest-args)))
|
|
|
|
|
(_ (error "Unknown value method '%S'" method))))
|
|
|
|
|
|
|
|
|
|
(defun guix-info-fill-column ()
|
|
|
|
|
"Return fill column for the current window."
|
|
|
|
|
(min (window-width) fill-column))
|
2014-08-27 08:44:17 -04:00
|
|
|
|
|
|
|
|
|
(defun guix-info-get-indent (&optional level)
|
|
|
|
|
"Return `guix-info-indent' \"multiplied\" by LEVEL spaces.
|
|
|
|
|
LEVEL is 1 by default."
|
|
|
|
|
(make-string (* guix-info-indent (or level 1)) ?\s))
|
|
|
|
|
|
|
|
|
|
(defun guix-info-insert-indent (&optional level)
|
|
|
|
|
"Insert `guix-info-indent' spaces LEVEL times (1 by default)."
|
|
|
|
|
(insert (guix-info-get-indent level)))
|
|
|
|
|
|
|
|
|
|
(defun guix-info-insert-entries (entries entry-type)
|
emacs: Generalize buffer interface.
Extract the code for defining buffer interface from "guix-base.el",
generalize it and move to "guix-buffer.el".
* emacs.am (ELFILES): Add "emacs/guix-buffer.el".
* emacs/guix-base.el (guix-profile, guix-entries, guix-buffer-type)
(guix-entry-type, guix-search-type, guix-search-vals, guix-set-vars)
(guix-get-symbol, guix-show-entries, guix-get-show-entries)
(guix-set-buffer, guix-history-call, guix-make-history-item)
(guix-get-params-for-receiving): Remove.
(guix-switch-to-buffer): Rename to 'guix-buffer-display' and move to
"guix-buffer.el".
(guix-get-entries): Rename to 'guix-ui-get-entries' and move to
"guix-ui.el".
(guix-buffer-data, guix-buffer-value, guix-buffer-param-title)
(guix-buffer-name, guix-buffer-history-size)
(guix-buffer-revert-confirm?, guix-buffer-map, guix-buffer-revert)
(guix-buffer-after-redisplay-hook, guix-buffer-redisplay)
(guix-buffer-redisplay-goto-button): Move to...
* emacs/guix-buffer.el: ... here. New file.
(guix-buffer-item): New variable.
(guix-buffer-with-item, guix-buffer-with-current-item)
(guix-buffer-define-current-item-accessor)
(guix-buffer-define-current-item-accessors)
(guix-buffer-define-current-args-accessor)
(guix-buffer-define-current-args-accessors): New macros.
(guix-buffer-get-entries, guix-buffer-mode-enable)
(guix-buffer-mode-initialize, guix-buffer-insert-entries)
(guix-buffer-show-entries-default, guix-buffer-show-entries)
(guix-buffer-message, guix-buffer-history-item, guix-buffer-set)
(guix-buffer-display-entries-current)
(guix-buffer-get-display-entries-current)
(guix-buffer-display-entries, guix-buffer-get-display-entries): New
procedures.
* emacs/guix-info.el: Adjust for the procedures renaming.
(guix-info-define-interface): Add ':show-entries-function' keyword.
* emacs/guix-list.el: Likewise.
* emacs/guix-ui.el (guix-ui-define-interface): Generate
'guix-ENTRY-TYPE-BUFFER-TYPE-get-entries' procedure based on
'guix-ui-get-entries'.
* emacs/guix.el (guix-get-show-packages, guix-get-show-generations):
Adjust for the procedures renaming.
2015-12-02 07:24:07 -05:00
|
|
|
|
"Display ENTRY-TYPE ENTRIES in the current info buffer."
|
2014-08-27 08:44:17 -04:00
|
|
|
|
(guix-mapinsert (lambda (entry)
|
|
|
|
|
(guix-info-insert-entry entry entry-type))
|
|
|
|
|
entries
|
|
|
|
|
guix-info-delimiter))
|
|
|
|
|
|
2015-11-19 16:13:19 -05:00
|
|
|
|
(defun guix-info-insert-entry (entry entry-type &optional indent-level)
|
2014-08-27 08:44:17 -04:00
|
|
|
|
"Insert ENTRY of ENTRY-TYPE into the current info buffer.
|
2015-11-19 16:13:19 -05:00
|
|
|
|
If INDENT-LEVEL is non-nil, indent displayed data by this number
|
|
|
|
|
of `guix-info-indent' spaces."
|
2015-11-17 14:10:46 -05:00
|
|
|
|
(guix-with-indent (* (or indent-level 0)
|
|
|
|
|
guix-info-indent)
|
2015-11-19 16:13:19 -05:00
|
|
|
|
(dolist (spec (guix-info-format entry-type))
|
|
|
|
|
(guix-info-insert-entry-unit spec entry entry-type))))
|
2014-08-27 08:44:17 -04:00
|
|
|
|
|
2015-11-19 16:13:19 -05:00
|
|
|
|
(defun guix-info-insert-entry-unit (format-spec entry entry-type)
|
2014-08-27 08:44:17 -04:00
|
|
|
|
"Insert title and value of a PARAM at point.
|
|
|
|
|
ENTRY is alist with parameters and their values.
|
|
|
|
|
ENTRY-TYPE is a type of ENTRY."
|
2015-11-19 16:13:19 -05:00
|
|
|
|
(pcase format-spec
|
|
|
|
|
((pred functionp)
|
|
|
|
|
(funcall format-spec entry)
|
|
|
|
|
(insert "\n"))
|
|
|
|
|
(`(,param ,title-method ,value-method)
|
|
|
|
|
(let ((value (guix-entry-value entry param)))
|
|
|
|
|
(unless (and guix-info-ignore-empty-values (null value))
|
|
|
|
|
(let ((title (guix-info-param-title entry-type param))
|
|
|
|
|
(insert-title (guix-info-title-method->function title-method))
|
|
|
|
|
(insert-value (guix-info-value-method->function value-method)))
|
|
|
|
|
(funcall insert-title title)
|
|
|
|
|
(funcall insert-value value entry)
|
|
|
|
|
(insert "\n")))))
|
|
|
|
|
(_ (error "Unknown format specification '%S'" format-spec))))
|
|
|
|
|
|
|
|
|
|
(defun guix-info-insert-title-simple (title &optional face)
|
|
|
|
|
"Insert \"TITLE: \" string at point.
|
|
|
|
|
If FACE is nil, use `guix-info-param-title'."
|
2014-08-27 08:44:17 -04:00
|
|
|
|
(guix-format-insert title
|
|
|
|
|
(or face 'guix-info-param-title)
|
2015-11-19 16:13:19 -05:00
|
|
|
|
"%s: "))
|
2014-08-27 08:44:17 -04:00
|
|
|
|
|
2015-11-19 16:13:19 -05:00
|
|
|
|
(defun guix-info-insert-title-format (title &optional face)
|
|
|
|
|
"Insert TITLE using `guix-info-param-title-format' at point.
|
|
|
|
|
If FACE is nil, use `guix-info-param-title'."
|
|
|
|
|
(guix-format-insert title
|
|
|
|
|
(or face 'guix-info-param-title)
|
|
|
|
|
guix-info-param-title-format))
|
|
|
|
|
|
|
|
|
|
(defun guix-info-insert-value-simple (value &optional button-or-face indent)
|
|
|
|
|
"Format and insert parameter VALUE at point.
|
|
|
|
|
|
|
|
|
|
VALUE may be split into several short lines to fit the current
|
|
|
|
|
window, depending on `guix-info-fill', and each line is indented
|
|
|
|
|
with INDENT number of spaces.
|
|
|
|
|
|
|
|
|
|
If BUTTON-OR-FACE is a button type symbol, transform VALUE into
|
|
|
|
|
this (these) button(s) and insert each one on a new line. If it
|
|
|
|
|
is a face symbol, propertize inserted line(s) with this face."
|
|
|
|
|
(or indent (setq indent 0))
|
|
|
|
|
(guix-with-indent indent
|
|
|
|
|
(let* ((button? (guix-button-type? button-or-face))
|
|
|
|
|
(face (unless button? button-or-face))
|
|
|
|
|
(fill-col (unless (or button?
|
|
|
|
|
(and (stringp value)
|
|
|
|
|
(not guix-info-fill)))
|
|
|
|
|
(- (guix-info-fill-column) indent)))
|
|
|
|
|
(value (if (and value button?)
|
|
|
|
|
(guix-buttonize value button-or-face "\n")
|
|
|
|
|
value)))
|
|
|
|
|
(guix-split-insert value face fill-col "\n"))))
|
|
|
|
|
|
|
|
|
|
(defun guix-info-insert-value-indent (value &optional button-or-face)
|
|
|
|
|
"Format and insert parameter VALUE at point.
|
|
|
|
|
|
|
|
|
|
This function is intended to be called after inserting a title
|
|
|
|
|
with `guix-info-insert-title-simple'.
|
|
|
|
|
|
|
|
|
|
VALUE may be split into several short lines to fit the current
|
|
|
|
|
window, depending on `guix-info-fill', and each line is indented
|
|
|
|
|
with `guix-info-indent'.
|
|
|
|
|
|
|
|
|
|
For the meaning of BUTTON-OR-FACE, see `guix-info-insert-value-simple'."
|
|
|
|
|
(when value (insert "\n"))
|
|
|
|
|
(guix-info-insert-value-simple value button-or-face guix-info-indent))
|
|
|
|
|
|
|
|
|
|
(defun guix-info-insert-value-format (value &optional button-or-face
|
|
|
|
|
&rest button-properties)
|
|
|
|
|
"Format and insert parameter VALUE at point.
|
|
|
|
|
|
|
|
|
|
This function is intended to be called after inserting a title
|
|
|
|
|
with `guix-info-insert-title-format'.
|
|
|
|
|
|
|
|
|
|
VALUE may be split into several short lines to fit the current
|
|
|
|
|
window, depending on `guix-info-fill' and
|
|
|
|
|
`guix-info-multiline-prefix'. If VALUE is a list, its elements
|
|
|
|
|
will be separated with `guix-list-separator'.
|
|
|
|
|
|
|
|
|
|
If BUTTON-OR-FACE is a button type symbol, transform VALUE into
|
|
|
|
|
this (these) button(s). If it is a face symbol, propertize
|
|
|
|
|
inserted line(s) with this face.
|
|
|
|
|
|
|
|
|
|
BUTTON-PROPERTIES are passed to `guix-buttonize' (only if
|
|
|
|
|
BUTTON-OR-FACE is a button type)."
|
|
|
|
|
(let* ((button? (guix-button-type? button-or-face))
|
|
|
|
|
(face (unless button? button-or-face))
|
|
|
|
|
(fill-col (when (or button?
|
|
|
|
|
guix-info-fill
|
|
|
|
|
(not (stringp value)))
|
|
|
|
|
(- (guix-info-fill-column)
|
|
|
|
|
(length guix-info-multiline-prefix))))
|
|
|
|
|
(value (if (and value button?)
|
|
|
|
|
(apply #'guix-buttonize
|
|
|
|
|
value button-or-face guix-list-separator
|
|
|
|
|
button-properties)
|
|
|
|
|
value)))
|
|
|
|
|
(guix-split-insert value face fill-col
|
|
|
|
|
(concat "\n" guix-info-multiline-prefix))))
|
|
|
|
|
|
|
|
|
|
(defun guix-info-insert-time (seconds &optional face)
|
emacs: Support font-locking.
Avoid breaking highlighting after adding new font-lock keywords.
* emacs/guix-base.el (guix-insert-package-strings): Use 'propertize' instead
of 'guix-get-string'.
* emacs/guix-info.el (guix, guix-action, guix-file, guix-url,
guix-package-location, guix-package-name): New button types.
(guix-info-insert-action-button, guix-info-insert-file-path,
guix-info-insert-url, guix-package-info-insert-location,
guix-package-info-insert-full-names,
guix-package-info-insert-non-unique-text): Adjust for 'guix-insert-button'
and button types.
(guix-package-info-name-button): New face.
(guix-package-info-define-insert-inputs): Use it. Add new button types.
(guix-package-info-insert-full-name): Remove.
* emacs/guix-utils.el (guix-get-string): Replace 'face' with 'font-lock-face'.
(guix-insert-button): Adjust for using button types.
2014-09-27 16:59:08 -04:00
|
|
|
|
"Insert formatted time string using SECONDS at point."
|
2015-11-19 16:13:19 -05:00
|
|
|
|
(guix-format-insert (guix-get-time-string seconds)
|
|
|
|
|
(or face 'guix-info-time)))
|
emacs: Support font-locking.
Avoid breaking highlighting after adding new font-lock keywords.
* emacs/guix-base.el (guix-insert-package-strings): Use 'propertize' instead
of 'guix-get-string'.
* emacs/guix-info.el (guix, guix-action, guix-file, guix-url,
guix-package-location, guix-package-name): New button types.
(guix-info-insert-action-button, guix-info-insert-file-path,
guix-info-insert-url, guix-package-info-insert-location,
guix-package-info-insert-full-names,
guix-package-info-insert-non-unique-text): Adjust for 'guix-insert-button'
and button types.
(guix-package-info-name-button): New face.
(guix-package-info-define-insert-inputs): Use it. Add new button types.
(guix-package-info-insert-full-name): Remove.
* emacs/guix-utils.el (guix-get-string): Replace 'face' with 'font-lock-face'.
(guix-insert-button): Adjust for using button types.
2014-09-27 16:59:08 -04:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Buttons
|
|
|
|
|
|
2014-11-08 12:13:32 -05:00
|
|
|
|
(defvar guix-info-button-map
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
(set-keymap-parent map button-map)
|
|
|
|
|
(define-key map (kbd "c") 'guix-info-button-copy-label)
|
|
|
|
|
map)
|
|
|
|
|
"Keymap for buttons in info buffers.")
|
|
|
|
|
|
emacs: Support font-locking.
Avoid breaking highlighting after adding new font-lock keywords.
* emacs/guix-base.el (guix-insert-package-strings): Use 'propertize' instead
of 'guix-get-string'.
* emacs/guix-info.el (guix, guix-action, guix-file, guix-url,
guix-package-location, guix-package-name): New button types.
(guix-info-insert-action-button, guix-info-insert-file-path,
guix-info-insert-url, guix-package-info-insert-location,
guix-package-info-insert-full-names,
guix-package-info-insert-non-unique-text): Adjust for 'guix-insert-button'
and button types.
(guix-package-info-name-button): New face.
(guix-package-info-define-insert-inputs): Use it. Add new button types.
(guix-package-info-insert-full-name): Remove.
* emacs/guix-utils.el (guix-get-string): Replace 'face' with 'font-lock-face'.
(guix-insert-button): Adjust for using button types.
2014-09-27 16:59:08 -04:00
|
|
|
|
(define-button-type 'guix
|
2014-11-08 12:13:32 -05:00
|
|
|
|
'keymap guix-info-button-map
|
emacs: Support font-locking.
Avoid breaking highlighting after adding new font-lock keywords.
* emacs/guix-base.el (guix-insert-package-strings): Use 'propertize' instead
of 'guix-get-string'.
* emacs/guix-info.el (guix, guix-action, guix-file, guix-url,
guix-package-location, guix-package-name): New button types.
(guix-info-insert-action-button, guix-info-insert-file-path,
guix-info-insert-url, guix-package-info-insert-location,
guix-package-info-insert-full-names,
guix-package-info-insert-non-unique-text): Adjust for 'guix-insert-button'
and button types.
(guix-package-info-name-button): New face.
(guix-package-info-define-insert-inputs): Use it. Add new button types.
(guix-package-info-insert-full-name): Remove.
* emacs/guix-utils.el (guix-get-string): Replace 'face' with 'font-lock-face'.
(guix-insert-button): Adjust for using button types.
2014-09-27 16:59:08 -04:00
|
|
|
|
'follow-link t)
|
|
|
|
|
|
|
|
|
|
(define-button-type 'guix-action
|
|
|
|
|
:supertype 'guix
|
|
|
|
|
'face 'guix-info-action-button
|
|
|
|
|
'mouse-face 'guix-info-action-button-mouse)
|
|
|
|
|
|
|
|
|
|
(define-button-type 'guix-file
|
|
|
|
|
:supertype 'guix
|
2016-01-21 02:59:50 -05:00
|
|
|
|
'face 'guix-info-file-name
|
emacs: Support font-locking.
Avoid breaking highlighting after adding new font-lock keywords.
* emacs/guix-base.el (guix-insert-package-strings): Use 'propertize' instead
of 'guix-get-string'.
* emacs/guix-info.el (guix, guix-action, guix-file, guix-url,
guix-package-location, guix-package-name): New button types.
(guix-info-insert-action-button, guix-info-insert-file-path,
guix-info-insert-url, guix-package-info-insert-location,
guix-package-info-insert-full-names,
guix-package-info-insert-non-unique-text): Adjust for 'guix-insert-button'
and button types.
(guix-package-info-name-button): New face.
(guix-package-info-define-insert-inputs): Use it. Add new button types.
(guix-package-info-insert-full-name): Remove.
* emacs/guix-utils.el (guix-get-string): Replace 'face' with 'font-lock-face'.
(guix-insert-button): Adjust for using button types.
2014-09-27 16:59:08 -04:00
|
|
|
|
'help-echo "Find file"
|
|
|
|
|
'action (lambda (btn)
|
2014-11-10 07:29:04 -05:00
|
|
|
|
(guix-find-file (button-label btn))))
|
emacs: Support font-locking.
Avoid breaking highlighting after adding new font-lock keywords.
* emacs/guix-base.el (guix-insert-package-strings): Use 'propertize' instead
of 'guix-get-string'.
* emacs/guix-info.el (guix, guix-action, guix-file, guix-url,
guix-package-location, guix-package-name): New button types.
(guix-info-insert-action-button, guix-info-insert-file-path,
guix-info-insert-url, guix-package-info-insert-location,
guix-package-info-insert-full-names,
guix-package-info-insert-non-unique-text): Adjust for 'guix-insert-button'
and button types.
(guix-package-info-name-button): New face.
(guix-package-info-define-insert-inputs): Use it. Add new button types.
(guix-package-info-insert-full-name): Remove.
* emacs/guix-utils.el (guix-get-string): Replace 'face' with 'font-lock-face'.
(guix-insert-button): Adjust for using button types.
2014-09-27 16:59:08 -04:00
|
|
|
|
|
|
|
|
|
(define-button-type 'guix-url
|
|
|
|
|
:supertype 'guix
|
|
|
|
|
'face 'guix-info-url
|
|
|
|
|
'help-echo "Browse URL"
|
|
|
|
|
'action (lambda (btn)
|
|
|
|
|
(browse-url (button-label btn))))
|
|
|
|
|
|
2014-11-08 12:13:32 -05:00
|
|
|
|
(defun guix-info-button-copy-label (&optional pos)
|
|
|
|
|
"Copy a label of the button at POS into kill ring.
|
|
|
|
|
If POS is nil, use the current point position."
|
|
|
|
|
(interactive)
|
|
|
|
|
(let ((button (button-at (or pos (point)))))
|
|
|
|
|
(when button
|
2015-12-05 15:51:43 -05:00
|
|
|
|
(guix-copy-as-kill (button-label button)))))
|
2014-11-08 12:13:32 -05:00
|
|
|
|
|
2014-08-27 08:44:17 -04:00
|
|
|
|
(defun guix-info-insert-action-button (label action &optional message
|
|
|
|
|
&rest properties)
|
|
|
|
|
"Make action button with LABEL and insert it at point.
|
emacs: Support font-locking.
Avoid breaking highlighting after adding new font-lock keywords.
* emacs/guix-base.el (guix-insert-package-strings): Use 'propertize' instead
of 'guix-get-string'.
* emacs/guix-info.el (guix, guix-action, guix-file, guix-url,
guix-package-location, guix-package-name): New button types.
(guix-info-insert-action-button, guix-info-insert-file-path,
guix-info-insert-url, guix-package-info-insert-location,
guix-package-info-insert-full-names,
guix-package-info-insert-non-unique-text): Adjust for 'guix-insert-button'
and button types.
(guix-package-info-name-button): New face.
(guix-package-info-define-insert-inputs): Use it. Add new button types.
(guix-package-info-insert-full-name): Remove.
* emacs/guix-utils.el (guix-get-string): Replace 'face' with 'font-lock-face'.
(guix-insert-button): Adjust for using button types.
2014-09-27 16:59:08 -04:00
|
|
|
|
ACTION is a function called when the button is pressed. It
|
|
|
|
|
should accept button as the argument.
|
|
|
|
|
MESSAGE is a button message.
|
|
|
|
|
See `insert-text-button' for the meaning of PROPERTIES."
|
2014-08-27 08:44:17 -04:00
|
|
|
|
(apply #'guix-insert-button
|
emacs: Support font-locking.
Avoid breaking highlighting after adding new font-lock keywords.
* emacs/guix-base.el (guix-insert-package-strings): Use 'propertize' instead
of 'guix-get-string'.
* emacs/guix-info.el (guix, guix-action, guix-file, guix-url,
guix-package-location, guix-package-name): New button types.
(guix-info-insert-action-button, guix-info-insert-file-path,
guix-info-insert-url, guix-package-info-insert-location,
guix-package-info-insert-full-names,
guix-package-info-insert-non-unique-text): Adjust for 'guix-insert-button'
and button types.
(guix-package-info-name-button): New face.
(guix-package-info-define-insert-inputs): Use it. Add new button types.
(guix-package-info-insert-full-name): Remove.
* emacs/guix-utils.el (guix-get-string): Replace 'face' with 'font-lock-face'.
(guix-insert-button): Adjust for using button types.
2014-09-27 16:59:08 -04:00
|
|
|
|
label 'guix-action
|
|
|
|
|
'action action
|
|
|
|
|
'help-echo message
|
2014-08-27 08:44:17 -04:00
|
|
|
|
properties))
|
|
|
|
|
|
|
|
|
|
|
2015-11-20 04:38:31 -05:00
|
|
|
|
;;; Major mode and interface definer
|
|
|
|
|
|
2014-08-27 08:44:17 -04:00
|
|
|
|
(defvar guix-info-mode-map
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
(set-keymap-parent
|
2015-11-21 04:25:19 -05:00
|
|
|
|
map (make-composed-keymap (list guix-buffer-map button-buffer-map)
|
2014-08-27 08:44:17 -04:00
|
|
|
|
special-mode-map))
|
|
|
|
|
map)
|
2015-11-21 04:25:19 -05:00
|
|
|
|
"Keymap for `guix-info-mode' buffers.")
|
2014-08-27 08:44:17 -04:00
|
|
|
|
|
|
|
|
|
(define-derived-mode guix-info-mode special-mode "Guix-Info"
|
emacs: Generalize buffer interface.
Extract the code for defining buffer interface from "guix-base.el",
generalize it and move to "guix-buffer.el".
* emacs.am (ELFILES): Add "emacs/guix-buffer.el".
* emacs/guix-base.el (guix-profile, guix-entries, guix-buffer-type)
(guix-entry-type, guix-search-type, guix-search-vals, guix-set-vars)
(guix-get-symbol, guix-show-entries, guix-get-show-entries)
(guix-set-buffer, guix-history-call, guix-make-history-item)
(guix-get-params-for-receiving): Remove.
(guix-switch-to-buffer): Rename to 'guix-buffer-display' and move to
"guix-buffer.el".
(guix-get-entries): Rename to 'guix-ui-get-entries' and move to
"guix-ui.el".
(guix-buffer-data, guix-buffer-value, guix-buffer-param-title)
(guix-buffer-name, guix-buffer-history-size)
(guix-buffer-revert-confirm?, guix-buffer-map, guix-buffer-revert)
(guix-buffer-after-redisplay-hook, guix-buffer-redisplay)
(guix-buffer-redisplay-goto-button): Move to...
* emacs/guix-buffer.el: ... here. New file.
(guix-buffer-item): New variable.
(guix-buffer-with-item, guix-buffer-with-current-item)
(guix-buffer-define-current-item-accessor)
(guix-buffer-define-current-item-accessors)
(guix-buffer-define-current-args-accessor)
(guix-buffer-define-current-args-accessors): New macros.
(guix-buffer-get-entries, guix-buffer-mode-enable)
(guix-buffer-mode-initialize, guix-buffer-insert-entries)
(guix-buffer-show-entries-default, guix-buffer-show-entries)
(guix-buffer-message, guix-buffer-history-item, guix-buffer-set)
(guix-buffer-display-entries-current)
(guix-buffer-get-display-entries-current)
(guix-buffer-display-entries, guix-buffer-get-display-entries): New
procedures.
* emacs/guix-info.el: Adjust for the procedures renaming.
(guix-info-define-interface): Add ':show-entries-function' keyword.
* emacs/guix-list.el: Likewise.
* emacs/guix-ui.el (guix-ui-define-interface): Generate
'guix-ENTRY-TYPE-BUFFER-TYPE-get-entries' procedure based on
'guix-ui-get-entries'.
* emacs/guix.el (guix-get-show-packages, guix-get-show-generations):
Adjust for the procedures renaming.
2015-12-02 07:24:07 -05:00
|
|
|
|
"Parent mode for displaying data in 'info' form."
|
|
|
|
|
(setq-local revert-buffer-function 'guix-buffer-revert))
|
2014-08-27 08:44:17 -04:00
|
|
|
|
|
2015-11-27 08:01:20 -05:00
|
|
|
|
(defun guix-info-mode-initialize ()
|
|
|
|
|
"Set up the current 'info' buffer."
|
|
|
|
|
;; Without this, syntactic fontification is performed, and it may
|
|
|
|
|
;; break our highlighting. For example, description of "emacs-typo"
|
|
|
|
|
;; package contains a single " (double-quote) character, so the
|
|
|
|
|
;; default syntactic fontification highlights the rest text after it
|
|
|
|
|
;; as a string. See (info "(elisp) Font Lock Basics") for details.
|
|
|
|
|
(setq font-lock-defaults '(nil t)))
|
|
|
|
|
|
2015-11-20 04:38:31 -05:00
|
|
|
|
(defmacro guix-info-define-interface (entry-type &rest args)
|
|
|
|
|
"Define 'info' interface for displaying ENTRY-TYPE entries.
|
|
|
|
|
Remaining arguments (ARGS) should have a form [KEYWORD VALUE] ...
|
|
|
|
|
|
2015-11-20 13:25:10 -05:00
|
|
|
|
Required keywords:
|
|
|
|
|
|
|
|
|
|
- `:format' - default value of the generated
|
|
|
|
|
`guix-ENTRY-TYPE-info-format' variable.
|
|
|
|
|
|
2015-11-20 04:38:31 -05:00
|
|
|
|
The rest keyword arguments are passed to
|
|
|
|
|
`guix-buffer-define-interface' macro."
|
|
|
|
|
(declare (indent 1))
|
2015-11-20 13:25:10 -05:00
|
|
|
|
(let* ((entry-type-str (symbol-name entry-type))
|
|
|
|
|
(prefix (concat "guix-" entry-type-str "-info"))
|
|
|
|
|
(group (intern prefix))
|
|
|
|
|
(format-var (intern (concat prefix "-format"))))
|
|
|
|
|
(guix-keyword-args-let args
|
emacs: Generalize buffer interface.
Extract the code for defining buffer interface from "guix-base.el",
generalize it and move to "guix-buffer.el".
* emacs.am (ELFILES): Add "emacs/guix-buffer.el".
* emacs/guix-base.el (guix-profile, guix-entries, guix-buffer-type)
(guix-entry-type, guix-search-type, guix-search-vals, guix-set-vars)
(guix-get-symbol, guix-show-entries, guix-get-show-entries)
(guix-set-buffer, guix-history-call, guix-make-history-item)
(guix-get-params-for-receiving): Remove.
(guix-switch-to-buffer): Rename to 'guix-buffer-display' and move to
"guix-buffer.el".
(guix-get-entries): Rename to 'guix-ui-get-entries' and move to
"guix-ui.el".
(guix-buffer-data, guix-buffer-value, guix-buffer-param-title)
(guix-buffer-name, guix-buffer-history-size)
(guix-buffer-revert-confirm?, guix-buffer-map, guix-buffer-revert)
(guix-buffer-after-redisplay-hook, guix-buffer-redisplay)
(guix-buffer-redisplay-goto-button): Move to...
* emacs/guix-buffer.el: ... here. New file.
(guix-buffer-item): New variable.
(guix-buffer-with-item, guix-buffer-with-current-item)
(guix-buffer-define-current-item-accessor)
(guix-buffer-define-current-item-accessors)
(guix-buffer-define-current-args-accessor)
(guix-buffer-define-current-args-accessors): New macros.
(guix-buffer-get-entries, guix-buffer-mode-enable)
(guix-buffer-mode-initialize, guix-buffer-insert-entries)
(guix-buffer-show-entries-default, guix-buffer-show-entries)
(guix-buffer-message, guix-buffer-history-item, guix-buffer-set)
(guix-buffer-display-entries-current)
(guix-buffer-get-display-entries-current)
(guix-buffer-display-entries, guix-buffer-get-display-entries): New
procedures.
* emacs/guix-info.el: Adjust for the procedures renaming.
(guix-info-define-interface): Add ':show-entries-function' keyword.
* emacs/guix-list.el: Likewise.
* emacs/guix-ui.el (guix-ui-define-interface): Generate
'guix-ENTRY-TYPE-BUFFER-TYPE-get-entries' procedure based on
'guix-ui-get-entries'.
* emacs/guix.el (guix-get-show-packages, guix-get-show-generations):
Adjust for the procedures renaming.
2015-12-02 07:24:07 -05:00
|
|
|
|
((show-entries-val :show-entries-function)
|
|
|
|
|
(format-val :format))
|
2015-11-20 13:25:10 -05:00
|
|
|
|
`(progn
|
|
|
|
|
(defcustom ,format-var ,format-val
|
|
|
|
|
,(format "\
|
|
|
|
|
List of methods for inserting '%s' entry.
|
|
|
|
|
Each METHOD should be either a function or should have the
|
|
|
|
|
following form:
|
|
|
|
|
|
|
|
|
|
(PARAM INSERT-TITLE INSERT-VALUE)
|
|
|
|
|
|
|
|
|
|
If METHOD is a function, it is called with an entry as argument.
|
|
|
|
|
|
|
|
|
|
PARAM is a name of '%s' entry parameter.
|
|
|
|
|
|
|
|
|
|
INSERT-TITLE may be either a symbol or a list. If it is a
|
|
|
|
|
symbol, it should be a function or an alias from
|
|
|
|
|
`guix-info-title-aliases', in which case it is called with title
|
|
|
|
|
as argument. If it is a list, it should have a
|
|
|
|
|
form (FUN-OR-ALIAS [ARGS ...]), in which case FUN-OR-ALIAS is
|
|
|
|
|
called with title and ARGS as arguments.
|
|
|
|
|
|
|
|
|
|
INSERT-VALUE may be either a symbol or a list. If it is a
|
|
|
|
|
symbol, it should be a function or an alias from
|
|
|
|
|
`guix-info-value-aliases', in which case it is called with value
|
|
|
|
|
and entry as arguments. If it is a list, it should have a
|
|
|
|
|
form (FUN-OR-ALIAS [ARGS ...]), in which case FUN-OR-ALIAS is
|
|
|
|
|
called with value and ARGS as arguments.
|
|
|
|
|
|
|
|
|
|
Parameters are inserted in the same order as defined by this list.
|
|
|
|
|
After calling each METHOD, a new line is inserted."
|
|
|
|
|
entry-type-str entry-type-str)
|
|
|
|
|
:type 'sexp
|
|
|
|
|
:group ',group)
|
|
|
|
|
|
|
|
|
|
(guix-alist-put!
|
|
|
|
|
'((format . ,format-var))
|
|
|
|
|
'guix-info-data ',entry-type)
|
|
|
|
|
|
emacs: Generalize buffer interface.
Extract the code for defining buffer interface from "guix-base.el",
generalize it and move to "guix-buffer.el".
* emacs.am (ELFILES): Add "emacs/guix-buffer.el".
* emacs/guix-base.el (guix-profile, guix-entries, guix-buffer-type)
(guix-entry-type, guix-search-type, guix-search-vals, guix-set-vars)
(guix-get-symbol, guix-show-entries, guix-get-show-entries)
(guix-set-buffer, guix-history-call, guix-make-history-item)
(guix-get-params-for-receiving): Remove.
(guix-switch-to-buffer): Rename to 'guix-buffer-display' and move to
"guix-buffer.el".
(guix-get-entries): Rename to 'guix-ui-get-entries' and move to
"guix-ui.el".
(guix-buffer-data, guix-buffer-value, guix-buffer-param-title)
(guix-buffer-name, guix-buffer-history-size)
(guix-buffer-revert-confirm?, guix-buffer-map, guix-buffer-revert)
(guix-buffer-after-redisplay-hook, guix-buffer-redisplay)
(guix-buffer-redisplay-goto-button): Move to...
* emacs/guix-buffer.el: ... here. New file.
(guix-buffer-item): New variable.
(guix-buffer-with-item, guix-buffer-with-current-item)
(guix-buffer-define-current-item-accessor)
(guix-buffer-define-current-item-accessors)
(guix-buffer-define-current-args-accessor)
(guix-buffer-define-current-args-accessors): New macros.
(guix-buffer-get-entries, guix-buffer-mode-enable)
(guix-buffer-mode-initialize, guix-buffer-insert-entries)
(guix-buffer-show-entries-default, guix-buffer-show-entries)
(guix-buffer-message, guix-buffer-history-item, guix-buffer-set)
(guix-buffer-display-entries-current)
(guix-buffer-get-display-entries-current)
(guix-buffer-display-entries, guix-buffer-get-display-entries): New
procedures.
* emacs/guix-info.el: Adjust for the procedures renaming.
(guix-info-define-interface): Add ':show-entries-function' keyword.
* emacs/guix-list.el: Likewise.
* emacs/guix-ui.el (guix-ui-define-interface): Generate
'guix-ENTRY-TYPE-BUFFER-TYPE-get-entries' procedure based on
'guix-ui-get-entries'.
* emacs/guix.el (guix-get-show-packages, guix-get-show-generations):
Adjust for the procedures renaming.
2015-12-02 07:24:07 -05:00
|
|
|
|
,(if show-entries-val
|
|
|
|
|
`(guix-buffer-define-interface info ,entry-type
|
|
|
|
|
:show-entries-function ,show-entries-val
|
|
|
|
|
,@%foreign-args)
|
|
|
|
|
|
|
|
|
|
(let ((insert-fun (intern (concat prefix "-insert-entries"))))
|
|
|
|
|
`(progn
|
|
|
|
|
(defun ,insert-fun (entries)
|
|
|
|
|
,(format "\
|
|
|
|
|
Print '%s' ENTRIES in the current 'info' buffer."
|
|
|
|
|
entry-type-str)
|
|
|
|
|
(guix-info-insert-entries entries ',entry-type))
|
|
|
|
|
|
|
|
|
|
(guix-buffer-define-interface info ,entry-type
|
|
|
|
|
:insert-entries-function ',insert-fun
|
|
|
|
|
:mode-init-function 'guix-info-mode-initialize
|
|
|
|
|
,@%foreign-args))))))))
|
2015-11-20 04:38:31 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defvar guix-info-font-lock-keywords
|
|
|
|
|
(eval-when-compile
|
|
|
|
|
`((,(rx "(" (group "guix-info-define-interface")
|
|
|
|
|
symbol-end)
|
|
|
|
|
. 1))))
|
|
|
|
|
|
|
|
|
|
(font-lock-add-keywords 'emacs-lisp-mode guix-info-font-lock-keywords)
|
|
|
|
|
|
2014-08-27 08:44:17 -04:00
|
|
|
|
(provide 'guix-info)
|
|
|
|
|
|
|
|
|
|
;;; guix-info.el ends here
|