mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-30 17:03:09 +00:00
6a1f6ee1f8
* lisp/ox.el (org-export-table-dimensions): * lisp/ox-texinfo.el (org-texinfo-template): * lisp/ox-md.el (org-md-link): * lisp/ox-icalendar.el (org-icalendar-use-UTC-date-time-p): * lisp/ox-ascii.el (org-ascii-fixed-width): * lisp/org.el (org-context): * lisp/org-table.el (org-table-eval-formula) (org-table-export): * lisp/org-refile.el: * lisp/org-plot.el (org-plot/gnuplot-to-grid-data): * lisp/org-num.el (org-num): * lisp/org-mouse.el (org-mouse-popup-global-menu) (org-mouse-context-menu): * lisp/org-macro.el (org-macro): * lisp/org-lint.el (org-lint): * lisp/org-keys.el (org-keys): * lisp/org-duration.el: * lisp/org-clock.el (org-clock-get-last-clock-out-time) (org-clock-update-mode-line, org-find-open-clocks): * lisp/org-agenda.el (org-diary) (org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item) (org-agenda-highlight-todo, org-cmp-alpha) (org-agenda-filter-by-category): * lisp/ol.el (org-link-expand-abbrev, ol): * lisp/ol-docview.el (ol-docview): * lisp/ol-bibtex.el (org-execute-file-search-in-bibtex) (org-bibtex, org-bibtex-read): * lisp/ol-bbdb.el (org-bbdb-anniversary-description): * lisp/ob-tangle.el (org-babel-tangle-jump-to-org): * lisp/ob-table.el (org-babel-table-truncate-at-newline): * lisp/ob-stan.el: * lisp/ob-sqlite.el (org-babel-sqlite-table-or-scalar): * lisp/ob-sql.el: * lisp/ob-shen.el: * lisp/ob-shell.el (org-babel-prep-session:shell) (org-babel-prep-session:shell): * lisp/ob-sed.el (org-babel-execute:sed) (org-babel-execute:sed): * lisp/ob-screen.el: * lisp/ob-sass.el: * lisp/ob-ruby.el (org-babel-prep-session:ruby) (org-babel-prep-session:ruby): * lisp/ob-ref.el (org-babel-ref-resolve, ob-ref): * lisp/ob-python.el (org-babel-prep-session:python) (org-babel-prep-session:python): * lisp/ob-plantuml.el: * lisp/ob-picolisp.el: * lisp/ob-perl.el: * lisp/ob-org.el: * lisp/ob-octave.el (org-babel-prep-session:octave) (org-babel-prep-session:octave) (org-babel-octave-evaluate-session): * lisp/ob-ocaml.el: * lisp/ob-mscgen.el (org-babel-execute:mscgen) (org-babel-execute:mscgen): * lisp/ob-maxima.el: (ob-maxima): * lisp/ob-matlab.el: * lisp/ob-makefile.el: * lisp/ob-lua.el (org-babel-prep-session:lua) (org-babel-prep-session:lua): * lisp/ob-lisp.el: * lisp/ob-ledger.el: * lisp/ob-latex.el (org-babel-expand-body:latex) (org-babel-expand-body:latex, ob-latex): * lisp/ob-js.el: * lisp/ob-java.el: * lisp/ob-io.el (org-babel-prep-session:io) (org-babel-prep-session:io): * lisp/ob-hledger.el: * lisp/ob-haskell.el: * lisp/ob-groovy.el (org-babel-groovy-wrapper-method) (org-babel-groovy-evaluate): * lisp/ob-gnuplot.el: * lisp/ob-fortran.el (org-babel-expand-body:fortran) (org-babel-expand-body:fortran): * lisp/ob-forth.el (org-babel-forth-session-execute): * lisp/ob-exp.el (ob-exp): * lisp/ob-eval.el: * lisp/ob-emacs-lisp.el: * lisp/ob-ebnf.el: * lisp/ob-dot.el: * lisp/ob-ditaa.el: * lisp/ob-css.el: * lisp/ob-core.el (org-babel-put-rownames): * lisp/ob-coq.el: * lisp/ob-comint.el: * lisp/ob-calc.el: * lisp/ob-awk.el: * lisp/ob-asymptote.el: * lisp/ob-abc.el: * lisp/ob-R.el (org-babel-prep-session:R): Formatting fixes.
142 lines
5.4 KiB
EmacsLisp
142 lines
5.4 KiB
EmacsLisp
;;; ob-screen.el --- Babel Support for Interactive Terminal -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2009-2020 Free Software Foundation, Inc.
|
|
|
|
;; Author: Benjamin Andresen
|
|
;; Keywords: literate programming, interactive shell
|
|
;; Homepage: https://orgmode.org
|
|
|
|
;; 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 <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; Org-Babel support for interactive terminals. Mostly shell scripts.
|
|
;; Heavily inspired by 'eev' from Eduardo Ochs
|
|
;;
|
|
;; Adding :cmd and :terminal as header arguments
|
|
;; :terminal must support the -T (title) and -e (command) parameter
|
|
;;
|
|
;; You can test the default setup. (xterm + sh) with
|
|
;; M-x org-babel-screen-test RET
|
|
|
|
;;; Code:
|
|
(require 'ob)
|
|
|
|
(defvar org-babel-screen-location "screen"
|
|
"The command location for screen.
|
|
In case you want to use a different screen than one selected by your $PATH")
|
|
|
|
(defvar org-babel-default-header-args:screen
|
|
'((:results . "silent") (:session . "default") (:cmd . "sh") (:terminal . "xterm"))
|
|
"Default arguments to use when running screen source blocks.")
|
|
|
|
(defun org-babel-execute:screen (body params)
|
|
"Send a block of code via screen to a terminal using Babel.
|
|
\"default\" session is used when none is specified."
|
|
(message "Sending source code block to interactive terminal session...")
|
|
(save-window-excursion
|
|
(let* ((session (cdr (assq :session params)))
|
|
(socket (org-babel-screen-session-socketname session)))
|
|
(unless socket (org-babel-prep-session:screen session params))
|
|
(org-babel-screen-session-execute-string
|
|
session (org-babel-expand-body:generic body params)))))
|
|
|
|
(defun org-babel-prep-session:screen (_session params)
|
|
"Prepare SESSION according to the header arguments specified in PARAMS."
|
|
(let* ((session (cdr (assq :session params)))
|
|
(cmd (cdr (assq :cmd params)))
|
|
(terminal (cdr (assq :terminal params)))
|
|
(process-name (concat "org-babel: terminal (" session ")")))
|
|
(apply 'start-process process-name "*Messages*"
|
|
terminal `("-T" ,(concat "org-babel: " session) "-e" ,org-babel-screen-location
|
|
"-c" "/dev/null" "-mS" ,(concat "org-babel-session-" session)
|
|
,cmd))
|
|
;; XXX: Is there a better way than the following?
|
|
(while (not (org-babel-screen-session-socketname session))
|
|
;; wait until screen session is available before returning
|
|
)))
|
|
|
|
;; helper functions
|
|
|
|
(defun org-babel-screen-session-execute-string (session body)
|
|
"If SESSION exists, send BODY to it."
|
|
(let ((socket (org-babel-screen-session-socketname session)))
|
|
(when socket
|
|
(let ((tmpfile (org-babel-screen-session-write-temp-file session body)))
|
|
(apply 'start-process (concat "org-babel: screen (" session ")") "*Messages*"
|
|
org-babel-screen-location
|
|
`("-S" ,socket "-X" "eval" "msgwait 0"
|
|
,(concat "readreg z " tmpfile)
|
|
"paste z"))))))
|
|
|
|
(defun org-babel-screen-session-socketname (session)
|
|
"Check if SESSION exists by parsing output of \"screen -ls\"."
|
|
(let* ((screen-ls (shell-command-to-string "screen -ls"))
|
|
(sockets (delq
|
|
nil
|
|
(mapcar
|
|
(lambda (x)
|
|
(when (string-match (rx (or "(Attached)" "(Detached)")) x)
|
|
x))
|
|
(split-string screen-ls "\n"))))
|
|
(match-socket (car
|
|
(delq
|
|
nil
|
|
(mapcar
|
|
(lambda (x)
|
|
(when (string-match
|
|
(concat "org-babel-session-" session) x)
|
|
x))
|
|
sockets)))))
|
|
(when match-socket (car (split-string match-socket)))))
|
|
|
|
(defun org-babel-screen-session-write-temp-file (_session body)
|
|
"Save BODY in a temp file that is named after SESSION."
|
|
(let ((tmpfile (org-babel-temp-file "screen-")))
|
|
(with-temp-file tmpfile
|
|
(insert body)
|
|
|
|
;; org-babel has superfluous spaces
|
|
(goto-char (point-min))
|
|
(delete-matching-lines "^ +$"))
|
|
tmpfile))
|
|
|
|
(defun org-babel-screen-test ()
|
|
"Test if the default setup works.
|
|
The terminal should shortly flicker."
|
|
(interactive)
|
|
(let* ((random-string (format "%s" (random 99999)))
|
|
(tmpfile (org-babel-temp-file "ob-screen-test-"))
|
|
(body (concat "echo '" random-string "' > " tmpfile "\nexit\n"))
|
|
tmp-string)
|
|
(org-babel-execute:screen body org-babel-default-header-args:screen)
|
|
;; XXX: need to find a better way to do the following
|
|
(while (not (file-readable-p tmpfile))
|
|
;; do something, otherwise this will be optimized away
|
|
(message "org-babel-screen: File not readable yet."))
|
|
(setq tmp-string (with-temp-buffer
|
|
(insert-file-contents-literally tmpfile)
|
|
(buffer-substring (point-min) (point-max))))
|
|
(delete-file tmpfile)
|
|
(message (concat "org-babel-screen: Setup "
|
|
(if (string-match random-string tmp-string)
|
|
"WORKS."
|
|
"DOESN'T work.")))))
|
|
|
|
(provide 'ob-screen)
|
|
|
|
;;; ob-screen.el ends here
|