Mercurial > emacs
comparison lisp/server.el @ 101349:191a3121c949
* frame.el (make-frame-on-tty): Remove function, inline contents
in the only user ...
* server.el (server-create-tty-frame): ... here.
* frames.texi (Multiple Displays): Remove documentation for
removed function make-frame-on-tty.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Thu, 22 Jan 2009 06:58:10 +0000 |
| parents | b837d61f9eba |
| children | 03050eba53aa |
comparison
equal
deleted
inserted
replaced
| 101348:b809ab4a474e | 101349:191a3121c949 |
|---|---|
| 618 (server-send-string | 618 (server-send-string |
| 619 proc (format "-print %s\n" | 619 proc (format "-print %s\n" |
| 620 (server-quote-arg text))))))))) | 620 (server-quote-arg text))))))))) |
| 621 | 621 |
| 622 (defun server-create-tty-frame (tty type proc) | 622 (defun server-create-tty-frame (tty type proc) |
| 623 (unless tty | |
| 624 (error "Invalid terminal device")) | |
| 625 (unless type | |
| 626 (error "Invalid terminal type")) | |
| 623 (add-to-list 'frame-inherited-parameters 'client) | 627 (add-to-list 'frame-inherited-parameters 'client) |
| 624 (let ((frame | 628 (let ((frame |
| 625 (server-with-environment (process-get proc 'env) | 629 (server-with-environment (process-get proc 'env) |
| 626 '("LANG" "LC_CTYPE" "LC_ALL" | 630 '("LANG" "LC_CTYPE" "LC_ALL" |
| 627 ;; For tgetent(3); list according to ncurses(3). | 631 ;; For tgetent(3); list according to ncurses(3). |
| 629 "NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING" | 633 "NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING" |
| 630 "NCURSES_NO_SETBUF" "TERM" "TERMCAP" "TERMINFO" | 634 "NCURSES_NO_SETBUF" "TERM" "TERMCAP" "TERMINFO" |
| 631 "TERMINFO_DIRS" "TERMPATH" | 635 "TERMINFO_DIRS" "TERMPATH" |
| 632 ;; rxvt wants these | 636 ;; rxvt wants these |
| 633 "COLORFGBG" "COLORTERM") | 637 "COLORFGBG" "COLORTERM") |
| 634 (make-frame-on-tty tty type | 638 (make-frame `((window-system . nil) |
| 635 ;; Ignore nowait here; we always need to | 639 (tty . ,tty) |
| 636 ;; clean up opened ttys when the client dies. | 640 (tty-type . ,type) |
| 637 `((client . ,proc) | 641 ;; Ignore nowait here; we always need to |
| 638 ;; This is a leftover from an earlier | 642 ;; clean up opened ttys when the client dies. |
| 639 ;; attempt at making it possible for process | 643 (client . ,proc) |
| 640 ;; run in the server process to use the | 644 ;; This is a leftover from an earlier |
| 641 ;; environment of the client process. | 645 ;; attempt at making it possible for process |
| 642 ;; It has no effect now and to make it work | 646 ;; run in the server process to use the |
| 643 ;; we'd need to decide how to make | 647 ;; environment of the client process. |
| 644 ;; process-environment interact with client | 648 ;; It has no effect now and to make it work |
| 645 ;; envvars, and then to change the | 649 ;; we'd need to decide how to make |
| 646 ;; C functions `child_setup' and | 650 ;; process-environment interact with client |
| 647 ;; `getenv_internal' accordingly. | 651 ;; envvars, and then to change the |
| 648 (environment . ,(process-get proc 'env))))))) | 652 ;; C functions `child_setup' and |
| 653 ;; `getenv_internal' accordingly. | |
| 654 (environment . ,(process-get proc 'env))))))) | |
| 649 | 655 |
| 650 ;; ttys don't use the `display' parameter, but callproc.c does to set | 656 ;; ttys don't use the `display' parameter, but callproc.c does to set |
| 651 ;; the DISPLAY environment on subprocesses. | 657 ;; the DISPLAY environment on subprocesses. |
| 652 (set-frame-parameter frame 'display | 658 (set-frame-parameter frame 'display |
| 653 (getenv-internal "DISPLAY" (process-get proc 'env))) | 659 (getenv-internal "DISPLAY" (process-get proc 'env))) |