Mercurial > emacs
annotate oldXMenu/InsSel.c @ 82988:f82e3a6f5ccb
A few more bugfixes and new features.
(Sigh.) I obviously need to remember to separate individual changes
to multiple commits.
src/emacsclient.c: Improved error handling.
(decode_options): Changed frame option (again) from -f to -t.
(print_help_and_exit): Ditto.
(copy_from_to): Check EINTR after write, not EAGAIN. Removed SIGIO hack.
(pty_conversation): Handle errors transmitted through the socket.
Handle pty errors by not reading from it anymore.
(main): Restore correct errno after socket_status failed. Send -tty
on -t, not -pty.
lisp/server.el (server-process-filter): Watch -tty, not -pty.
Use make-frame-on-tty instead of make-terminal-frame.
Don't set newframe to t if make-frame-on-tty failed.
Don't delete frames here. Print correct message when there are no
files to edit, but a new frame was requested.
(server-sentinel): Delete the frame after the process.
(server-handle-delete-frame): New function for delete-frame-functions.
(server-start): Add server-handle-delete-frame to delete-frame-functions.
(server-buffer-done): Don't delete frames here.
src/alloc.c (mark_ttys): Add prototype.
(Fgarbage_collect): Call mark_ttys.
src/emacs.c: (shut_down_emacs): Don't flush stdout before
reset_sys_modes().
src/process.c (add_keyboard_wait_descriptor_called_flag): Removed.
(add_keyboard_wait_descriptor): Removed stdin hack.
src/sysdep.c: Unconditionally include sysselect.h.
(old_fcntl_flags): Changed to an array.
(init_sigio, reset_sigio): Use it.
(narrow_foreground_group, widen_foreground_group): Use setpgid, not
setpgrp.
(old_fcntl_owner): Changed to an array.
(init_sys_modes, reset_sys_modes): Use it. Fix fsync() and reset_sigio() calls.
src/term.c (Qframe_tty_name, Qframe_tty_type): New variables.
(syms_of_term): Initialize them.
(Fframe_tty_name, Fframe_tty_type): New functions.
(term_init): Call add_keyboard_wait_descriptor().
(Fdelete_tty): New function.
(delete_tty): Call delete_keyboard_wait_descriptor().
(get_current_tty): Removed.
(mark_ttys): New function.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-28
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Wed, 31 Dec 2003 05:09:29 +0000 |
parents | f0eb34e60705 |
children | 8e5779acd195 |
rev | line source |
---|---|
25858 | 1 #include "copyright.h" |
2 | |
53224
f0eb34e60705
tag of miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-137
Karoly Lorentey <lorentey@elte.hu>
parents:
52401
diff
changeset
|
3 /* $Header: /cvsroot/emacs/emacs/oldXMenu/InsSel.c,v 1.3 2003/09/01 15:45:47 miles Exp $ */ |
25858 | 4 /* Copyright Massachusetts Institute of Technology 1985 */ |
5 | |
6 /* | |
7 * XMenu: MIT Project Athena, X Window system menu package | |
8 * | |
9 * XMenuInsertSelection - Inserts a selection into an XMenu object | |
10 * | |
11 * Author: Tony Della Fera, DEC | |
12 * 20-Nov-85 | |
13 * | |
14 */ | |
15 | |
16 #include <config.h> | |
17 #include "XMenuInt.h" | |
18 | |
19 int | |
20 XMenuInsertSelection(menu, p_num, s_num, data, label, active) | |
21 register XMenu *menu; /* Menu object to be modified. */ | |
22 register int p_num; /* Pane number to be modified. */ | |
23 register int s_num; /* Selection number of new selection. */ | |
24 char *data; /* Data value. */ | |
25 char *label; /* Selection label. */ | |
26 int active; /* Make selection active? */ | |
27 { | |
28 register XMPane *p_ptr; /* XMPane pointer. */ | |
29 register XMSelect *s_ptr; /* XMSelect pointer. */ | |
30 | |
31 XMSelect *select; /* Newly created selection. */ | |
32 | |
33 int label_length; /* Label length in characters. */ | |
34 int label_width; /* Label width in pixels. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
25858
diff
changeset
|
35 |
25858 | 36 /* |
37 * Check for NULL pointers! | |
38 */ | |
39 if (label == NULL) { | |
40 _XMErrorCode = XME_ARG_BOUNDS; | |
41 return(XM_FAILURE); | |
42 } | |
43 | |
44 /* | |
45 * Find the right pane. | |
46 */ | |
47 p_ptr = _XMGetPanePtr(menu, p_num); | |
48 if (p_ptr == NULL) return(XM_FAILURE); | |
49 | |
50 /* | |
51 * Find the selection number one less than the one specified since that | |
52 * is the selection after which the insertion will occur. | |
53 */ | |
54 s_ptr = _XMGetSelectionPtr(p_ptr, (s_num - 1)); | |
55 if (s_ptr == NULL) return(XM_FAILURE); | |
56 | |
57 /* | |
58 * Calloc the XMSelect structure. | |
59 */ | |
60 select = (XMSelect *)calloc(1, sizeof(XMSelect)); | |
61 if (select == NULL) { | |
62 _XMErrorCode = XME_CALLOC; | |
63 return(XM_FAILURE); | |
64 } | |
65 | |
66 /* | |
67 * Determine label size. | |
68 */ | |
69 label_length = strlen(label); | |
70 label_width = XTextWidth(menu->s_fnt_info, label, label_length); | |
71 | |
72 | |
73 /* | |
74 * Fill the XMSelect structure. | |
75 */ | |
76 if (!strcmp (label, "--") || !strcmp (label, "---")) | |
77 { | |
78 select->type = SEPARATOR; | |
79 select->active = 0; | |
80 } | |
81 else | |
82 { | |
83 select->type = SELECTION; | |
84 select->active = active; | |
85 } | |
86 | |
87 select->active = active; | |
88 select->serial = -1; | |
89 select->label = label; | |
90 select->label_width = label_width; | |
91 select->label_length = label_length; | |
92 select->data = data; | |
93 select->parent_p = p_ptr; | |
94 | |
95 /* | |
96 * Insert the selection after the selection with the selection | |
97 * number one less than the desired number for the new selection. | |
98 */ | |
99 emacs_insque(select, s_ptr); | |
100 | |
101 /* | |
102 * Update the selection count. | |
103 */ | |
104 p_ptr->s_count++; | |
105 | |
106 /* | |
107 * Schedule a recompute. | |
108 */ | |
109 menu->recompute = 1; | |
110 | |
111 /* | |
112 * Return the selection number just inserted. | |
113 */ | |
114 _XMErrorCode = XME_NO_ERROR; | |
115 return(s_num); | |
116 } | |
52401 | 117 |
118 /* arch-tag: 8398626f-81cb-4e13-8ebc-aac1b9237663 | |
119 (do not change this comment) */ |