From 6c1ec5a0505cce365e272bce948258b276b29142 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 10 Jan 2009 13:04:37 +0000 Subject: [PATCH] * gs.el: File removed. --- lisp/ChangeLog | 2 + lisp/frame.el | 17 ---- lisp/gs.el | 225 ------------------------------------------------- lisp/server.el | 36 ++++---- 4 files changed, 22 insertions(+), 258 deletions(-) delete mode 100644 lisp/gs.el diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7e07d87f753..ba9a2120352 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2009-01-10 Chong Yidong + * gs.el: File removed. + * faces.el (x-font-family-list): Remove entirely. 2009-01-10 Eli Zaretskii diff --git a/lisp/frame.el b/lisp/frame.el index c34e5d361f2..e886a517928 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -648,23 +648,6 @@ The optional argument PARAMETERS specifies additional frame parameters." (make-frame `((window-system . x) (display . ,display) . ,parameters))))) -(defun make-frame-on-tty (tty type &optional parameters) - "Make a frame on terminal device TTY. -TTY should be the file name of the tty device to use. TYPE -should be the terminal type string of TTY, for example \"xterm\" -or \"vt100\". The optional third argument PARAMETERS specifies -additional frame parameters." - ;; Use "F" rather than "f", in case the device does not exist, as - ;; far as the filesystem is concerned. - (interactive "FOpen frame on tty device: \nsTerminal type of %s: ") - (unless tty - (error "Invalid terminal device")) - (unless type - (error "Invalid terminal type")) - (if (eq window-system 'pc) - (make-frame `((window-system . pc) (tty . ,tty) (tty-type . ,type) . ,parameters)) - (make-frame `((window-system . nil) (tty . ,tty) (tty-type . ,type) . ,parameters)))) - (declare-function x-close-connection "xfns.c" (terminal)) (defun close-display-connection (display) diff --git a/lisp/gs.el b/lisp/gs.el deleted file mode 100644 index 69405d75e78..00000000000 --- a/lisp/gs.el +++ /dev/null @@ -1,225 +0,0 @@ -;;; gs.el --- interface to Ghostscript - -;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -;; 2008, 2009 Free Software Foundation, Inc. - -;; Maintainer: FSF -;; Keywords: internal - -;; 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 . - -;;; Commentary: - -;; This code is experimental. Don't use it. - -;;; Code: - -(defvar gs-program "gs" - "The name of the Ghostscript interpreter.") - - -(defvar gs-device "x11" - "The Ghostscript device to use to produce images.") - - -(defvar gs-options - '("-q" - ;"-dNOPAUSE" - "-dSAFER" - "-dBATCH" - "-sDEVICE=" - "") - "List of command line arguments to pass to Ghostscript. -Arguments may contain place-holders `' for the name of the -input file, and `' for the device to use.") -(put 'gs-options 'risky-local-variable t) - -(defun gs-options (device file) - "Return a list of command line options with place-holders replaced. -DEVICE is the value to substitute for the place-holder `', -FILE is the value to substitute for the place-holder `'." - (mapcar #'(lambda (option) - (setq option (replace-regexp-in-string "" device option) - option (replace-regexp-in-string "" file option))) - gs-options)) - -;; The GHOSTVIEW property (taken from gv 3.5.8). -;; -;; Type: -;; -;; STRING -;; -;; Parameters: -;; -;; BPIXMAP ORIENT LLX LLY URX URY XDPI YDPI [LEFT BOTTOM TOP RIGHT] -;; -;; Scanf format: "%d %d %d %d %d %d %f %f %d %d %d %d" -;; -;; Explanation of parameters: -;; -;; BPIXMAP: pixmap id of the backing pixmap for the window. If no -;; pixmap is to be used, this parameter should be zero. This -;; parameter must be zero when drawing on a pixmap. -;; -;; ORIENT: orientation of the page. The number represents clockwise -;; rotation of the paper in degrees. Permitted values are 0, 90, 180, -;; 270. -;; -;; LLX, LLY, URX, URY: Bounding box of the drawable. The bounding box -;; is specified in PostScript points in default user coordinates. -;; -;; XDPI, YDPI: Resolution of window. (This can be derived from the -;; other parameters, but not without roundoff error. These values are -;; included to avoid this error.) -;; -;; LEFT, BOTTOM, TOP, RIGHT: (optional) Margins around the window. -;; The margins extend the imageable area beyond the boundaries of the -;; window. This is primarily used for popup zoom windows. I have -;; encountered several instances of PostScript programs that position -;; themselves with respect to the imageable area. The margins are -;; specified in PostScript points. If omitted, the margins are -;; assumed to be 0. - -(declare-function x-display-mm-width "xfns.c" (&optional terminal)) -(declare-function x-display-pixel-width "xfns.c" (&optional terminal)) - -(defun gs-width-in-pt (frame pixel-width) - "Return, on FRAME, pixel width PIXEL-WIDTH tranlated to pt." - (let ((mm (* (float pixel-width) - (/ (float (x-display-mm-width frame)) - (float (x-display-pixel-width frame)))))) - (/ (* 25.4 mm) 72.0))) - -(declare-function x-display-mm-height "xfns.c" (&optional terminal)) -(declare-function x-display-pixel-height "xfns.c" (&optional terminal)) - -(defun gs-height-in-pt (frame pixel-height) - "Return, on FRAME, pixel height PIXEL-HEIGHT tranlated to pt." - (let ((mm (* (float pixel-height) - (/ (float (x-display-mm-height frame)) - (float (x-display-pixel-height frame)))))) - (/ (* 25.4 mm) 72.0))) - -(declare-function x-change-window-property "xfns.c" - (prop value &optional frame type format outer-p)) - -(defun gs-set-ghostview-window-prop (frame spec img-width img-height) - "Set the `GHOSTVIEW' window property of FRAME. -SPEC is a GS image specification. IMG-WIDTH is the width of the -requested image, and IMG-HEIGHT is the height of the requested -image in pixels." - (let* ((box (plist-get (cdr spec) :bounding-box)) - (llx (elt box 0)) - (lly (elt box 1)) - (urx (elt box 2)) - (ury (elt box 3)) - (rotation (or (plist-get (cdr spec) :rotate) 0)) - ;; The pixel width IMG-WIDTH of the pixmap gives the - ;; dots, URX - LLX give the inch. - (in-width (/ (- urx llx) 72.0)) - (in-height (/ (- ury lly) 72.0)) - (xdpi (/ img-width in-width)) - (ydpi (/ img-height in-height))) - (x-change-window-property "GHOSTVIEW" - (format "0 %d %d %d %d %d %g %g" - rotation llx lly urx ury xdpi ydpi) - frame))) - -(declare-function x-display-grayscale-p "xfns.c" (&optional terminal)) - -(defun gs-set-ghostview-colors-window-prop (frame pixel-colors) - "Set the `GHOSTVIEW_COLORS' environment variable depending on FRAME." - (let ((mode (cond ((x-display-color-p frame) "Color") - ((x-display-grayscale-p frame) "Grayscale") - (t "Monochrome")))) - (x-change-window-property "GHOSTVIEW_COLORS" - (format "%s %s" mode pixel-colors) - frame))) - -(declare-function x-window-property "xfns.c" - (prop &optional frame type source delete-p vector-ret-p)) - -;;;###autoload -(defun gs-load-image (frame spec img-width img-height window-and-pixmap-id - pixel-colors) - "Load a PS image for display on FRAME. -SPEC is an image specification, IMG-HEIGHT and IMG-WIDTH are width -and height of the image in pixels. WINDOW-AND-PIXMAP-ID is a string of -the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful." - (unwind-protect - (let ((file (plist-get (cdr spec) :file)) - gs - (timeout 40)) - ;; Wait while property gets freed from a previous ghostscript process - ;; sit-for returns nil as soon as input starts being - ;; available, so if we want to give GhostScript a reasonable - ;; chance of starting up, we better use sleep-for. We let - ;; sleep-for wait only half the time because if input is - ;; available, it is more likely that we don't care that much - ;; about garbled redisplay and are in a hurry. - (while (and - ;; Wait while the property is not yet available - (not (zerop (length (x-window-property "GHOSTVIEW" - frame)))) - ;; The following was an alternative condition: wait - ;; while there is still a process running. The idea - ;; was to avoid contention between processes. Turned - ;; out even more sluggish. - ;; (get-buffer-process "*GS*") - (not (zerop timeout))) - (unless (sit-for 0 100 t) - (sleep-for 0 50)) - (setq timeout (1- timeout))) - - ;; No use waiting longer. We might want to try killing off - ;; stuck processes, but there is no point in doing so: either - ;; they are stuck for good, in which case the user would - ;; probably be responsible for that, and killing them off will - ;; make debugging harder, or they are not. In that case, they - ;; will cause incomplete displays. But the same will happen - ;; if they are killed, anyway. The whole is rather - ;; disconcerting, and fast scrolling through a dozen images - ;; will make Emacs freeze for a while. The alternatives are a) - ;; proper implementation not waiting at all but creating - ;; appropriate queues, or b) permanently bad display due to - ;; bad cached images. So remember that this - ;; is just a hack and if people don't like the behavior, they - ;; will most likely like the easy alternatives even less. - ;; And at least the image cache will make the delay apparent - ;; just once. - (gs-set-ghostview-window-prop frame spec img-width img-height) - (gs-set-ghostview-colors-window-prop frame pixel-colors) - (setenv "GHOSTVIEW" window-and-pixmap-id) - (setq gs (apply 'start-process "gs" "*GS*" gs-program - (gs-options gs-device file))) - (set-process-query-on-exit-flag gs nil) - gs) - nil)) - - -;(defun gs-put-tiger () -; (let* ((ps-file "/usr/local/share/ghostscript/5.10/examples/tiger.ps") -; (spec `(image :type postscript -; :pt-width 200 :pt-height 200 -; :bounding-box (22 171 567 738) -; :file ,ps-file))) -; (put-text-property 1 2 'display spec))) -; - -(provide 'gs) - -;; arch-tag: 06ab51b8-4932-4cfe-9f60-b924a8edb3f0 -;;; gs.el ends here diff --git a/lisp/server.el b/lisp/server.el index 6dc84be0e76..69137c6a60e 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -615,6 +615,8 @@ Server mode runs a process that accepts commands from the (defun server-create-tty-frame (tty type proc) (add-to-list 'frame-inherited-parameters 'client) + (unless tty (error "Invalid terminal device")) + (unless type (error "Invalid terminal type")) (let ((frame (server-with-environment (process-get proc 'env) '("LANG" "LC_CTYPE" "LC_ALL" @@ -625,22 +627,24 @@ Server mode runs a process that accepts commands from the "TERMINFO_DIRS" "TERMPATH" ;; rxvt wants these "COLORFGBG" "COLORTERM") - (make-frame-on-tty tty type - ;; Ignore nowait here; we always need to - ;; clean up opened ttys when the client dies. - `((client . ,proc) - ;; This is a leftover from an earlier - ;; attempt at making it possible for process - ;; run in the server process to use the - ;; environment of the client process. - ;; It has no effect now and to make it work - ;; we'd need to decide how to make - ;; process-environment interact with client - ;; envvars, and then to change the - ;; C functions `child_setup' and - ;; `getenv_internal' accordingly. - (environment . ,(process-get proc 'env))))))) - + (let ((ws (if (eq window-system 'pc) 'pc nil)) + ;; Ignore nowait here; we always need to clean up + ;; opened ttys when the client dies. + (parameters `((client . ,proc) + ;; This is left over from an earlier + ;; attempt at causing a process run in + ;; the server process to use the + ;; environment of the client process. + ;; It has no effect now and to make it + ;; work we'd need to decide how to make + ;; process-environment interact with + ;; client envvars, and then to change + ;; the C functions `child_setup' and + ;; `getenv_internal' accordingly. + (environment . ,(process-get proc 'env))))) + (make-frame `((window-system . ,ws) + (tty . ,tty) + (tty-type . ,type) . ,parameters)))))) ;; ttys don't use the `display' parameter, but callproc.c does to set ;; the DISPLAY environment on subprocesses. (set-frame-parameter frame 'display -- 2.39.2