ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.67 by root, Tue Aug 3 22:19:51 2004 UTC vs.
Revision 1.304 by sf-exg, Tue Dec 6 10:27:15 2011 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 14 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
15 * 16 *
16 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 20 * (at your option) any later version.
… …
31 * Initialisation routines. 32 * Initialisation routines.
32 */ 33 */
33 34
34#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
37#include "rxvtutil.h"
36#include "init.h" 38#include "init.h"
39#include "keyboard.h"
37 40
41#include <limits>
42
38#include <signal.h> 43#include <csignal>
39 44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
59
60#ifdef HAVE_STARTUP_NOTIFICATION
61# define SN_API_NOT_YET_FROZEN
62# include <libsn/sn-launchee.h>
63#endif
64
65#ifdef DISPLAY_IS_IP
66/* On Solaris link with -lsocket and -lnsl */
67#include <sys/types.h>
68#include <sys/socket.h>
69
70/* these next two are probably only on Sun (not Solaris) */
71#ifdef HAVE_SYS_SOCKIO_H
72#include <sys/sockio.h>
73#endif
74#ifdef HAVE_SYS_BYTEORDER_H
75#include <sys/byteorder.h>
76#endif
77
78#include <netinet/in.h>
79#include <arpa/inet.h>
80#include <net/if.h>
81#include <net/if_arp.h>
82
83static char *
84rxvt_network_display (const char *display)
85{
86 char buffer[1024], *rval = NULL;
87 struct ifconf ifc;
88 struct ifreq *ifr;
89 int i, skfd;
90
91 if (display[0] != ':' && strncmp (display, "unix:", 5))
92 return (char *) display; /* nothing to do */
93
94 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
95 ifc.ifc_buf = buffer;
96
97 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
98 {
99 perror ("socket");
100 return NULL;
101 }
102
103 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
104 {
105 perror ("SIOCGIFCONF");
106 close (skfd);
107 return NULL;
108 }
109
110 for (i = 0, ifr = ifc.ifc_req;
111 i < (ifc.ifc_len / sizeof (struct ifreq));
112 i++, ifr++)
113 {
114 struct ifreq ifr2;
115
116 strcpy (ifr2.ifr_name, ifr->ifr_name);
117
118 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
119 {
120 unsigned long addr;
121 struct sockaddr_in *p_addr;
122
123 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
124 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
125
126 /*
127 * not "0.0.0.0" or "127.0.0.1" - so format the address
128 */
129 if (addr && addr != 0x7F000001)
130 {
131 char *colon = strchr (display, ':');
132
133 if (colon == NULL)
134 colon = ":0.0";
135
136 rval = rxvt_malloc (strlen (colon) + 16);
137 sprintf (rval, "%d.%d.%d.%d%s",
138 (int) ((addr >> 030) & 0xFF),
139 (int) ((addr >> 020) & 0xFF),
140 (int) ((addr >> 010) & 0xFF),
141 (int) (addr & 0xFF), colon);
142 break;
143 }
144 }
145 }
146
147 close (skfd);
148
149 return rval;
150}
151#endif
152
40const char *const def_colorName[] = 153static const char *const def_colorName[] =
41 { 154 {
42 COLOR_FOREGROUND, 155 COLOR_FOREGROUND,
43 COLOR_BACKGROUND, 156 COLOR_BACKGROUND,
44 /* low-intensity colors */ 157 /* low-intensity colors */
45 "Black", /* 0: black (#000000) */ 158 "rgb:00/00/00", // 0: black (Black)
46#ifndef NO_BRIGHTCOLOR 159 "rgb:cd/00/00", // 1: red (Red3)
47 "Red3", /* 1: red (#CD0000) */ 160 "rgb:00/cd/00", // 2: green (Green3)
48 "Green3", /* 2: green (#00CD00) */ 161 "rgb:cd/cd/00", // 3: yellow (Yellow3)
49 "Yellow3", /* 3: yellow (#CDCD00) */ 162 "rgb:00/00/cd", // 4: blue (Blue3)
50 "Blue3", /* 4: blue (#0000CD) */ 163 "rgb:cd/00/cd", // 5: magenta (Magenta3)
51 "Magenta3", /* 5: magenta (#CD00CD) */ 164 "rgb:00/cd/cd", // 6: cyan (Cyan3)
52 "Cyan3", /* 6: cyan (#00CDCD) */
53# ifdef XTERM_COLORS 165# ifdef XTERM_COLORS
54 "Grey90", /* 7: white (#E5E5E5) */ 166 "rgb:e5/e5/e5", // 7: white (Grey90)
55# else 167# else
56 "AntiqueWhite", /* 7: white (#FAEBD7) */ 168 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
57# endif 169# endif
58 /* high-intensity colors */ 170 /* high-intensity colors */
59# ifdef XTERM_COLORS 171# ifdef XTERM_COLORS
60 "Grey30", /* 8: bright black (#4D4D4D) */ 172 "rgb:4d/4d/4d", // 8: bright black (Grey30)
61# else 173# else
62 "Grey25", /* 8: bright black (#404040) */ 174 "rgb:40/40/40", // 8: bright black (Grey25)
63# endif 175# endif
64#endif /* NO_BRIGHTCOLOR */ 176 "rgb:ff/00/00", // 1/9: bright red (Reed)
65 "Red", /* 1/9: bright red (#FF0000) */ 177 "rgb:00/ff/00", // 2/10: bright green (Green)
66 "Green", /* 2/10: bright green (#00FF00) */ 178 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
67 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 179 "rgb:00/00/ff", // 4/12: bright blue (Blue)
68 "Blue", /* 4/12: bright blue (#0000FF) */ 180 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
69 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 181 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
70 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 182 "rgb:ff/ff/ff", // 7/15: bright white (White)
71 "White", /* 7/15: bright white (#FFFFFF) */ 183
72#ifdef TTY_256COLOR 184#if !USE_256_COLORS
73 "rgb:00/00/00", /* default 16-255 color table */ 185 // 88 xterm colours
74 "rgb:00/00/2a", 186 "rgb:00/00/00",
75 "rgb:00/00/55", 187 "rgb:00/00/8b",
76 "rgb:00/00/7f",
77 "rgb:00/00/aa",
78 "rgb:00/00/d4", 188 "rgb:00/00/cd",
189 "rgb:00/00/ff",
79 "rgb:00/2a/00", 190 "rgb:00/8b/00",
80 "rgb:00/2a/2a", 191 "rgb:00/8b/8b",
81 "rgb:00/2a/55",
82 "rgb:00/2a/7f",
83 "rgb:00/2a/aa",
84 "rgb:00/2a/d4", 192 "rgb:00/8b/cd",
85 "rgb:00/55/00",
86 "rgb:00/55/2a",
87 "rgb:00/55/55",
88 "rgb:00/55/7f", 193 "rgb:00/8b/ff",
89 "rgb:00/55/aa",
90 "rgb:00/55/d4",
91 "rgb:00/7f/00",
92 "rgb:00/7f/2a",
93 "rgb:00/7f/55",
94 "rgb:00/7f/7f",
95 "rgb:00/7f/aa",
96 "rgb:00/7f/d4",
97 "rgb:00/aa/00",
98 "rgb:00/aa/2a",
99 "rgb:00/aa/55",
100 "rgb:00/aa/7f",
101 "rgb:00/aa/aa",
102 "rgb:00/aa/d4",
103 "rgb:00/d4/00", 194 "rgb:00/cd/00",
104 "rgb:00/d4/2a", 195 "rgb:00/cd/8b",
105 "rgb:00/d4/55",
106 "rgb:00/d4/7f",
107 "rgb:00/d4/aa",
108 "rgb:00/d4/d4", 196 "rgb:00/cd/cd",
197 "rgb:00/cd/ff",
198 "rgb:00/ff/00",
199 "rgb:00/ff/8b",
200 "rgb:00/ff/cd",
201 "rgb:00/ff/ff",
109 "rgb:2a/00/00", 202 "rgb:8b/00/00",
110 "rgb:2a/00/2a", 203 "rgb:8b/00/8b",
111 "rgb:2a/00/55",
112 "rgb:2a/00/7f",
113 "rgb:2a/00/aa",
114 "rgb:2a/00/d4", 204 "rgb:8b/00/cd",
115 "rgb:2a/2a/00",
116 "rgb:2a/2a/2a",
117 "rgb:2a/2a/55",
118 "rgb:2a/2a/7f",
119 "rgb:2a/2a/aa",
120 "rgb:2a/2a/d4",
121 "rgb:2a/55/00",
122 "rgb:2a/55/2a",
123 "rgb:2a/55/55",
124 "rgb:2a/55/7f",
125 "rgb:2a/55/aa",
126 "rgb:2a/55/d4",
127 "rgb:2a/7f/00",
128 "rgb:2a/7f/2a",
129 "rgb:2a/7f/55",
130 "rgb:2a/7f/7f",
131 "rgb:2a/7f/aa",
132 "rgb:2a/7f/d4",
133 "rgb:2a/aa/00",
134 "rgb:2a/aa/2a",
135 "rgb:2a/aa/55",
136 "rgb:2a/aa/7f",
137 "rgb:2a/aa/aa",
138 "rgb:2a/aa/d4",
139 "rgb:2a/d4/00",
140 "rgb:2a/d4/2a",
141 "rgb:2a/d4/55",
142 "rgb:2a/d4/7f",
143 "rgb:2a/d4/aa",
144 "rgb:2a/d4/d4",
145 "rgb:55/00/00",
146 "rgb:55/00/2a",
147 "rgb:55/00/55",
148 "rgb:55/00/7f", 205 "rgb:8b/00/ff",
149 "rgb:55/00/aa",
150 "rgb:55/00/d4",
151 "rgb:55/2a/00", 206 "rgb:8b/8b/00",
152 "rgb:55/2a/2a", 207 "rgb:8b/8b/8b",
153 "rgb:55/2a/55", 208 "rgb:8b/8b/cd",
154 "rgb:55/2a/7f", 209 "rgb:8b/8b/ff",
155 "rgb:55/2a/aa",
156 "rgb:55/2a/d4",
157 "rgb:55/55/00",
158 "rgb:55/55/2a",
159 "rgb:55/55/55",
160 "rgb:55/55/7f",
161 "rgb:55/55/aa",
162 "rgb:55/55/d4",
163 "rgb:55/7f/00",
164 "rgb:55/7f/2a",
165 "rgb:55/7f/55",
166 "rgb:55/7f/7f",
167 "rgb:55/7f/aa",
168 "rgb:55/7f/d4",
169 "rgb:55/aa/00",
170 "rgb:55/aa/2a",
171 "rgb:55/aa/55",
172 "rgb:55/aa/7f",
173 "rgb:55/aa/aa",
174 "rgb:55/aa/d4",
175 "rgb:55/d4/00", 210 "rgb:8b/cd/00",
176 "rgb:55/d4/2a", 211 "rgb:8b/cd/8b",
177 "rgb:55/d4/55",
178 "rgb:55/d4/7f",
179 "rgb:55/d4/aa",
180 "rgb:55/d4/d4", 212 "rgb:8b/cd/cd",
181 "rgb:7f/00/00", 213 "rgb:8b/cd/ff",
182 "rgb:7f/00/2a",
183 "rgb:7f/00/55",
184 "rgb:7f/00/7f",
185 "rgb:7f/00/aa",
186 "rgb:7f/00/d4",
187 "rgb:7f/2a/00",
188 "rgb:7f/2a/2a",
189 "rgb:7f/2a/55",
190 "rgb:7f/2a/7f",
191 "rgb:7f/2a/aa",
192 "rgb:7f/2a/d4",
193 "rgb:7f/55/00",
194 "rgb:7f/55/2a",
195 "rgb:7f/55/55",
196 "rgb:7f/55/7f",
197 "rgb:7f/55/aa",
198 "rgb:7f/55/d4",
199 "rgb:7f/7f/00", 214 "rgb:8b/ff/00",
200 "rgb:7f/7f/2a", 215 "rgb:8b/ff/8b",
201 "rgb:7f/7f/55",
202 "rgb:7f/7f/7f",
203 "rgb:7f/7f/aa",
204 "rgb:7f/7f/d4",
205 "rgb:7f/aa/00",
206 "rgb:7f/aa/2a",
207 "rgb:7f/aa/55",
208 "rgb:7f/aa/7f",
209 "rgb:7f/aa/aa",
210 "rgb:7f/aa/d4",
211 "rgb:7f/d4/00",
212 "rgb:7f/d4/2a",
213 "rgb:7f/d4/55",
214 "rgb:7f/d4/7f",
215 "rgb:7f/d4/aa",
216 "rgb:7f/d4/d4",
217 "rgb:aa/00/00",
218 "rgb:aa/00/2a",
219 "rgb:aa/00/55",
220 "rgb:aa/00/7f",
221 "rgb:aa/00/aa",
222 "rgb:aa/00/d4",
223 "rgb:aa/2a/00",
224 "rgb:aa/2a/2a",
225 "rgb:aa/2a/55",
226 "rgb:aa/2a/7f",
227 "rgb:aa/2a/aa",
228 "rgb:aa/2a/d4",
229 "rgb:aa/55/00",
230 "rgb:aa/55/2a",
231 "rgb:aa/55/55",
232 "rgb:aa/55/7f",
233 "rgb:aa/55/aa",
234 "rgb:aa/55/d4",
235 "rgb:aa/7f/00",
236 "rgb:aa/7f/2a",
237 "rgb:aa/7f/55",
238 "rgb:aa/7f/7f",
239 "rgb:aa/7f/aa",
240 "rgb:aa/7f/d4", 216 "rgb:8b/ff/cd",
241 "rgb:aa/aa/00", 217 "rgb:8b/ff/ff",
242 "rgb:aa/aa/2a",
243 "rgb:aa/aa/55",
244 "rgb:aa/aa/7f",
245 "rgb:aa/aa/aa",
246 "rgb:aa/aa/d4",
247 "rgb:aa/d4/00",
248 "rgb:aa/d4/2a",
249 "rgb:aa/d4/55",
250 "rgb:aa/d4/7f",
251 "rgb:aa/d4/aa",
252 "rgb:aa/d4/d4",
253 "rgb:d4/00/00", 218 "rgb:cd/00/00",
254 "rgb:d4/00/2a", 219 "rgb:cd/00/8b",
255 "rgb:d4/00/55",
256 "rgb:d4/00/7f",
257 "rgb:d4/00/aa",
258 "rgb:d4/00/d4", 220 "rgb:cd/00/cd",
221 "rgb:cd/00/ff",
259 "rgb:d4/2a/00", 222 "rgb:cd/8b/00",
260 "rgb:d4/2a/2a", 223 "rgb:cd/8b/8b",
261 "rgb:d4/2a/55",
262 "rgb:d4/2a/7f",
263 "rgb:d4/2a/aa",
264 "rgb:d4/2a/d4", 224 "rgb:cd/8b/cd",
265 "rgb:d4/55/00",
266 "rgb:d4/55/2a",
267 "rgb:d4/55/55",
268 "rgb:d4/55/7f", 225 "rgb:cd/8b/ff",
269 "rgb:d4/55/aa",
270 "rgb:d4/55/d4",
271 "rgb:d4/7f/00",
272 "rgb:d4/7f/2a",
273 "rgb:d4/7f/55",
274 "rgb:d4/7f/7f",
275 "rgb:d4/7f/aa",
276 "rgb:d4/7f/d4",
277 "rgb:d4/aa/00",
278 "rgb:d4/aa/2a",
279 "rgb:d4/aa/55",
280 "rgb:d4/aa/7f",
281 "rgb:d4/aa/aa",
282 "rgb:d4/aa/d4",
283 "rgb:d4/d4/00", 226 "rgb:cd/cd/00",
284 "rgb:d4/d4/2a", 227 "rgb:cd/cd/8b",
285 "rgb:d4/d4/55",
286 "rgb:d4/d4/7f",
287 "rgb:d4/d4/aa",
288 "rgb:d4/d4/d4", 228 "rgb:cd/cd/cd",
229 "rgb:cd/cd/ff",
230 "rgb:cd/ff/00",
231 "rgb:cd/ff/8b",
232 "rgb:cd/ff/cd",
233 "rgb:cd/ff/ff",
234 "rgb:ff/00/00",
235 "rgb:ff/00/8b",
236 "rgb:ff/00/cd",
237 "rgb:ff/00/ff",
238 "rgb:ff/8b/00",
239 "rgb:ff/8b/8b",
240 "rgb:ff/8b/cd",
241 "rgb:ff/8b/ff",
242 "rgb:ff/cd/00",
243 "rgb:ff/cd/8b",
244 "rgb:ff/cd/cd",
245 "rgb:ff/cd/ff",
246 "rgb:ff/ff/00",
247 "rgb:ff/ff/8b",
248 "rgb:ff/ff/cd",
249 "rgb:ff/ff/ff",
250 "rgb:2e/2e/2e",
251 "rgb:5c/5c/5c",
252 "rgb:73/73/73",
253 "rgb:8b/8b/8b",
254 "rgb:a2/a2/a2",
255 "rgb:b9/b9/b9",
256 "rgb:d0/d0/d0",
257 "rgb:e7/e7/e7",
258#else
259 // 256 xterm colours
260 "rgb:00/00/00",
261 "rgb:00/00/5f",
262 "rgb:00/00/87",
263 "rgb:00/00/af",
264 "rgb:00/00/d7",
265 "rgb:00/00/ff",
266 "rgb:00/5f/00",
267 "rgb:00/5f/5f",
268 "rgb:00/5f/87",
269 "rgb:00/5f/af",
270 "rgb:00/5f/d7",
271 "rgb:00/5f/ff",
272 "rgb:00/87/00",
273 "rgb:00/87/5f",
274 "rgb:00/87/87",
275 "rgb:00/87/af",
276 "rgb:00/87/d7",
277 "rgb:00/87/ff",
278 "rgb:00/af/00",
279 "rgb:00/af/5f",
280 "rgb:00/af/87",
281 "rgb:00/af/af",
282 "rgb:00/af/d7",
283 "rgb:00/af/ff",
284 "rgb:00/d7/00",
285 "rgb:00/d7/5f",
286 "rgb:00/d7/87",
287 "rgb:00/d7/af",
288 "rgb:00/d7/d7",
289 "rgb:00/d7/ff",
290 "rgb:00/ff/00",
291 "rgb:00/ff/5f",
292 "rgb:00/ff/87",
293 "rgb:00/ff/af",
294 "rgb:00/ff/d7",
295 "rgb:00/ff/ff",
296 "rgb:5f/00/00",
297 "rgb:5f/00/5f",
298 "rgb:5f/00/87",
299 "rgb:5f/00/af",
300 "rgb:5f/00/d7",
301 "rgb:5f/00/ff",
302 "rgb:5f/5f/00",
303 "rgb:5f/5f/5f",
304 "rgb:5f/5f/87",
305 "rgb:5f/5f/af",
306 "rgb:5f/5f/d7",
307 "rgb:5f/5f/ff",
308 "rgb:5f/87/00",
309 "rgb:5f/87/5f",
310 "rgb:5f/87/87",
311 "rgb:5f/87/af",
312 "rgb:5f/87/d7",
313 "rgb:5f/87/ff",
314 "rgb:5f/af/00",
315 "rgb:5f/af/5f",
316 "rgb:5f/af/87",
317 "rgb:5f/af/af",
318 "rgb:5f/af/d7",
319 "rgb:5f/af/ff",
320 "rgb:5f/d7/00",
321 "rgb:5f/d7/5f",
322 "rgb:5f/d7/87",
323 "rgb:5f/d7/af",
324 "rgb:5f/d7/d7",
325 "rgb:5f/d7/ff",
326 "rgb:5f/ff/00",
327 "rgb:5f/ff/5f",
328 "rgb:5f/ff/87",
329 "rgb:5f/ff/af",
330 "rgb:5f/ff/d7",
331 "rgb:5f/ff/ff",
332 "rgb:87/00/00",
333 "rgb:87/00/5f",
334 "rgb:87/00/87",
335 "rgb:87/00/af",
336 "rgb:87/00/d7",
337 "rgb:87/00/ff",
338 "rgb:87/5f/00",
339 "rgb:87/5f/5f",
340 "rgb:87/5f/87",
341 "rgb:87/5f/af",
342 "rgb:87/5f/d7",
343 "rgb:87/5f/ff",
344 "rgb:87/87/00",
345 "rgb:87/87/5f",
346 "rgb:87/87/87",
347 "rgb:87/87/af",
348 "rgb:87/87/d7",
349 "rgb:87/87/ff",
350 "rgb:87/af/00",
351 "rgb:87/af/5f",
352 "rgb:87/af/87",
353 "rgb:87/af/af",
354 "rgb:87/af/d7",
355 "rgb:87/af/ff",
356 "rgb:87/d7/00",
357 "rgb:87/d7/5f",
358 "rgb:87/d7/87",
359 "rgb:87/d7/af",
360 "rgb:87/d7/d7",
361 "rgb:87/d7/ff",
362 "rgb:87/ff/00",
363 "rgb:87/ff/5f",
364 "rgb:87/ff/87",
365 "rgb:87/ff/af",
366 "rgb:87/ff/d7",
367 "rgb:87/ff/ff",
368 "rgb:af/00/00",
369 "rgb:af/00/5f",
370 "rgb:af/00/87",
371 "rgb:af/00/af",
372 "rgb:af/00/d7",
373 "rgb:af/00/ff",
374 "rgb:af/5f/00",
375 "rgb:af/5f/5f",
376 "rgb:af/5f/87",
377 "rgb:af/5f/af",
378 "rgb:af/5f/d7",
379 "rgb:af/5f/ff",
380 "rgb:af/87/00",
381 "rgb:af/87/5f",
382 "rgb:af/87/87",
383 "rgb:af/87/af",
384 "rgb:af/87/d7",
385 "rgb:af/87/ff",
386 "rgb:af/af/00",
387 "rgb:af/af/5f",
388 "rgb:af/af/87",
389 "rgb:af/af/af",
390 "rgb:af/af/d7",
391 "rgb:af/af/ff",
392 "rgb:af/d7/00",
393 "rgb:af/d7/5f",
394 "rgb:af/d7/87",
395 "rgb:af/d7/af",
396 "rgb:af/d7/d7",
397 "rgb:af/d7/ff",
398 "rgb:af/ff/00",
399 "rgb:af/ff/5f",
400 "rgb:af/ff/87",
401 "rgb:af/ff/af",
402 "rgb:af/ff/d7",
403 "rgb:af/ff/ff",
404 "rgb:d7/00/00",
405 "rgb:d7/00/5f",
406 "rgb:d7/00/87",
407 "rgb:d7/00/af",
408 "rgb:d7/00/d7",
409 "rgb:d7/00/ff",
410 "rgb:d7/5f/00",
411 "rgb:d7/5f/5f",
412 "rgb:d7/5f/87",
413 "rgb:d7/5f/af",
414 "rgb:d7/5f/d7",
415 "rgb:d7/5f/ff",
416 "rgb:d7/87/00",
417 "rgb:d7/87/5f",
418 "rgb:d7/87/87",
419 "rgb:d7/87/af",
420 "rgb:d7/87/d7",
421 "rgb:d7/87/ff",
422 "rgb:d7/af/00",
423 "rgb:d7/af/5f",
424 "rgb:d7/af/87",
425 "rgb:d7/af/af",
426 "rgb:d7/af/d7",
427 "rgb:d7/af/ff",
428 "rgb:d7/d7/00",
429 "rgb:d7/d7/5f",
430 "rgb:d7/d7/87",
431 "rgb:d7/d7/af",
432 "rgb:d7/d7/d7",
433 "rgb:d7/d7/ff",
434 "rgb:d7/ff/00",
435 "rgb:d7/ff/5f",
436 "rgb:d7/ff/87",
437 "rgb:d7/ff/af",
438 "rgb:d7/ff/d7",
439 "rgb:d7/ff/ff",
440 "rgb:ff/00/00",
441 "rgb:ff/00/5f",
442 "rgb:ff/00/87",
443 "rgb:ff/00/af",
444 "rgb:ff/00/d7",
445 "rgb:ff/00/ff",
446 "rgb:ff/5f/00",
447 "rgb:ff/5f/5f",
448 "rgb:ff/5f/87",
449 "rgb:ff/5f/af",
450 "rgb:ff/5f/d7",
451 "rgb:ff/5f/ff",
452 "rgb:ff/87/00",
453 "rgb:ff/87/5f",
454 "rgb:ff/87/87",
455 "rgb:ff/87/af",
456 "rgb:ff/87/d7",
457 "rgb:ff/87/ff",
458 "rgb:ff/af/00",
459 "rgb:ff/af/5f",
460 "rgb:ff/af/87",
461 "rgb:ff/af/af",
462 "rgb:ff/af/d7",
463 "rgb:ff/af/ff",
464 "rgb:ff/d7/00",
465 "rgb:ff/d7/5f",
466 "rgb:ff/d7/87",
467 "rgb:ff/d7/af",
468 "rgb:ff/d7/d7",
469 "rgb:ff/d7/ff",
470 "rgb:ff/ff/00",
471 "rgb:ff/ff/5f",
472 "rgb:ff/ff/87",
473 "rgb:ff/ff/af",
474 "rgb:ff/ff/d7",
475 "rgb:ff/ff/ff",
289 "rgb:08/08/08", 476 "rgb:08/08/08",
290 "rgb:12/12/12", 477 "rgb:12/12/12",
291 "rgb:1c/1c/1c", 478 "rgb:1c/1c/1c",
292 "rgb:26/26/26", 479 "rgb:26/26/26",
293 "rgb:30/30/30", 480 "rgb:30/30/30",
… …
309 "rgb:d0/d0/d0", 496 "rgb:d0/d0/d0",
310 "rgb:da/da/da", 497 "rgb:da/da/da",
311 "rgb:e4/e4/e4", 498 "rgb:e4/e4/e4",
312 "rgb:ee/ee/ee", 499 "rgb:ee/ee/ee",
313#endif 500#endif
501
314#ifndef NO_CURSORCOLOR 502#ifndef NO_CURSORCOLOR
315 COLOR_CURSOR_BACKGROUND, 503 COLOR_CURSOR_BACKGROUND,
316 COLOR_CURSOR_FOREGROUND, 504 COLOR_CURSOR_FOREGROUND,
317#endif /* ! NO_CURSORCOLOR */ 505#endif /* ! NO_CURSORCOLOR */
318 NULL, /* Color_pointer_fg */ 506 NULL, /* Color_pointer_fg */
319 NULL, /* Color_pointer_bg */ 507 NULL, /* Color_pointer_bg */
320 NULL, /* Color_border */ 508 NULL, /* Color_border */
321#ifndef NO_BOLD_UNDERLINE_REVERSE 509#ifndef NO_BOLD_UNDERLINE_REVERSE
322 NULL, /* Color_BD */ 510 NULL, /* Color_BD */
511 NULL, /* Color_IT */
323 NULL, /* Color_UL */ 512 NULL, /* Color_UL */
324 NULL, /* Color_RV */ 513 NULL, /* Color_RV */
325#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 514#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
515#if ENABLE_FRILLS
516 NULL, // Color_underline
517#endif
326#ifdef OPTION_HC 518#ifdef OPTION_HC
327 NULL, 519 NULL,
520 NULL,
328#endif 521#endif
329#ifdef KEEP_SCROLLCOLOR
330 COLOR_SCROLLBAR, 522 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR
331 COLOR_SCROLLTROUGH, 524 COLOR_SCROLLTROUGH,
332#endif /* KEEP_SCROLLCOLOR */ 525#endif
333#if TINTING 526#if ENABLE_TRANSPARENCY
334 NULL, 527 NULL,
335#endif 528#endif
529#if OFF_FOCUS_FADING
530 "rgb:00/00/00",
531#endif
336 }; 532 };
337 533
338const char *const xa_names[NUM_XA] = 534void
339 {
340 "TEXT",
341 "COMPOUND_TEXT",
342 "UTF8_STRING",
343 "MULTIPLE",
344 "TARGETS",
345 "TIMESTAMP",
346 "VT_SELECTION",
347 "INCR",
348 "WM_DELETE_WINDOW",
349#ifdef TRANSPARENT
350 "_XROOTPMAP_ID",
351#endif
352#ifdef OFFIX_DND
353 "DndProtocol",
354 "DndSelection",
355#endif
356 "CLIPBOARD"
357 };
358
359bool
360rxvt_term::init_vars () 535rxvt_term::init_vars ()
361{ 536{
362 PixColorsFocused = new rxvt_color [TOTAL_COLORS];
363#ifdef OFF_FOCUS_FADING
364 PixColorsUnFocused = new rxvt_color [TOTAL_COLORS];
365#endif
366 PixColors = PixColorsFocused; 537 pix_colors = pix_colors_focused;
367
368 if (PixColors == NULL)
369 return false;
370
371#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
372 TermWin.pixmap = None;
373#endif
374#ifdef UTMP_SUPPORT
375 next_utmp_action = SAVE;
376#endif
377#ifndef NO_SETOWNER_TTYDEV
378 next_tty_action = SAVE;
379#endif
380 538
381 MEvent.time = CurrentTime; 539 MEvent.time = CurrentTime;
382 MEvent.button = AnyButton; 540 MEvent.button = AnyButton;
383 Options = DEFAULT_OPTIONS;
384 want_refresh = 1; 541 want_refresh = 1;
385 cmd_pid = -1;
386 cmd_fd = tty_fd = -1;
387 PrivateModes = SavedModes = PrivMode_Default; 542 priv_modes = SavedModes = PrivMode_Default;
388 TermWin.focus = 0;
389 TermWin.ncol = 80; 543 ncol = 80;
390 TermWin.nrow = 24; 544 nrow = 24;
391 TermWin.int_bwidth = INTERNALBORDERWIDTH; 545 int_bwidth = INTERNALBORDERWIDTH;
392 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 546 ext_bwidth = EXTERNALBORDERWIDTH;
393 TermWin.lineSpace = LINESPACE; 547 lineSpace = LINESPACE;
548 letterSpace = LETTERSPACE;
394 TermWin.saveLines = SAVELINES; 549 saveLines = SAVELINES;
395 numPixColors = TOTAL_COLORS;
396 550
397#ifndef NO_BRIGHTCOLOR
398 colorfgbg = DEFAULT_RSTYLE;
399#endif
400
401 refresh_limit = 1;
402 refresh_type = SLOW_REFRESH; 551 refresh_type = SLOW_REFRESH;
403 prev_nrow = prev_ncol = 0;
404 552
405 oldcursor.row = oldcursor.col = -1; 553 oldcursor.row = oldcursor.col = -1;
406#ifdef XPM_BACKGROUND
407 /* bgPixmap.w = bgPixmap.h = 0; */
408 bgPixmap.x = bgPixmap.y = 50;
409 bgPixmap.pixmap = None;
410#endif
411 554
412 last_bot = last_state = -1; 555 set_option (Opt_scrollBar);
413 556 set_option (Opt_scrollTtyOutput);
414#ifdef MENUBAR 557 set_option (Opt_jumpScroll);
415 menu_readonly = 1; 558 set_option (Opt_skipScroll);
416# if ! (MENUBAR_MAX > 1) 559 set_option (Opt_secondaryScreen);
417 CurrentBar = & (BarList); 560 set_option (Opt_secondaryScroll);
418# endif /* (MENUBAR_MAX > 1) */ 561 set_option (Opt_pastableTabs);
419#endif 562 set_option (Opt_intensityStyles);
420 563 set_option (Opt_iso14755);
421 return true; 564 set_option (Opt_iso14755_52);
422} 565 set_option (Opt_buffered);
423
424void
425rxvt_term::init_secondary ()
426{
427 int i;
428#ifdef TTY_GID_SUPPORT
429 struct group *gr = getgrnam ("tty");
430
431 if (gr)
432 { /* change group ownership of tty to "tty" */
433 ttymode = S_IRUSR | S_IWUSR | S_IWGRP;
434 ttygid = gr->gr_gid;
435 }
436 else
437#endif /* TTY_GID_SUPPORT */
438
439 {
440 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
441 ttygid = getgid ();
442 }
443
444 /*
445 * Close all unused file descriptors
446 * We don't want them, we don't need them.
447 */
448 if ((i = open ("/dev/null", O_RDONLY)) < 0)
449 {
450 /* TODO: BOO HISS */
451 dup2 (STDERR_FILENO, STDIN_FILENO);
452 }
453 else if (i > STDIN_FILENO)
454 {
455 dup2 (i, STDIN_FILENO);
456 close (i);
457 }
458
459 dup2 (STDERR_FILENO, STDOUT_FILENO);
460
461#if 0 // schmorp sayz closing filies is murder
462 for (i = STDERR_FILENO + 1; i < num_fds; i++)
463 {
464#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
465 if (i == 4 || i == 7)
466 continue;
467#endif
468 close (i);
469 }
470#endif
471} 566}
472 567
473/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
474const char ** 569const char **
475rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
476{ 571{
477 int i, r_argc; 572 int i, r_argc;
478 char *val;
479 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
480 574
481 /* 575 /*
482 * Look for -exec option. Find => split and make cmd_argv[] of command args 576 * Look for -e option. Find => split and make cmd_argv[] of command args
483 */ 577 */
484 for (r_argc = 0; r_argc < argc; r_argc++) 578 for (r_argc = 0; r_argc < argc; r_argc++)
485 if (!STRCMP (argv[r_argc], "-e") || !STRCMP (argv[r_argc], "-exec")) 579 if (!strcmp (argv[r_argc], "-e"))
486 break; 580 break;
487
488 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
489
490 for (i = 0; i < r_argc; i++)
491 r_argv[i] = (const char *)argv[i];
492
493 r_argv[i] = NULL;
494 581
495 if (r_argc == argc) 582 if (r_argc == argc)
496 cmd_argv = NULL; 583 cmd_argv = NULL;
584 else if (!argv[r_argc + 1])
585 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
497 else 586 else
498 { 587 {
499 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); 588 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
500 589
501 for (i = 0; i < argc - r_argc - 1; i++) 590 for (i = 0; i < argc - r_argc - 1; i++)
502 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 591 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
503 592
504 cmd_argv[i] = NULL; 593 cmd_argv[i] = NULL;
505 } 594 }
506 595
507 rs[Rs_name] = rxvt_r_basename (argv[0]); 596 rs[Rs_name] = rxvt_basename (argv[0]);
508 597
509 /* 598 /*
510 * Open display, get options/resources and create the window 599 * Open display, get options/resources and create the window
511 */ 600 */
601
512 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 602 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
513 rs[Rs_display_name] = ":0"; 603 rs[Rs_display_name] = ":0";
514 604
515 get_options (r_argc, r_argv); 605 get_options (r_argc, argv);
516 free (r_argv);
517 606
518#ifdef LOCAL_X_IS_UNIX
519 if (rs[Rs_display_name][0] == ':')
520 {
521 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name]));
522 STRCPY (val, "unix");
523 STRCAT (val, rs[Rs_display_name]);
524 display = displays.get (val);
525 free (val);
526 }
527#endif
528
529 if (!display
530 && ! (display = displays.get (rs[Rs_display_name]))) 607 if (!(display = displays.get (rs[Rs_display_name])))
531 rxvt_fatal ("can't open display %s", rs[Rs_display_name]); 608 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
532 609
533 extract_resources (display->display, rs[Rs_name]); 610 // using a local pointer decreases code size a lot
611 xa = display->xa;
612
613 set (display);
614 extract_resources ();
615
616#if XFT
617 if (rs[Rs_depth])
618 select_visual (strtol (rs[Rs_depth], 0, 0));
619#endif
620
621 for (int i = NUM_RESOURCES; i--; )
622 if (rs [i] == resval_undef)
623 rs [i] = 0;
624
625#if ENABLE_PERL
626 if (!rs[Rs_perl_ext_1])
627 rs[Rs_perl_ext_1] = "default";
628
629 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
630 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
631 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
632 {
633 rxvt_perl.init (this);
634 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
635 }
636#endif
637
638 // must be called after initialising the perl interpreter as it
639 // may invoke the `on_register_command' hook
640 extract_keysym_resources ();
534 641
535 /* 642 /*
536 * set any defaults not already set 643 * set any defaults not already set
537 */ 644 */
538 if (cmd_argv && cmd_argv[0]) 645 if (cmd_argv && cmd_argv[0])
539 { 646 {
540 if (!rs[Rs_title]) 647 if (!rs[Rs_title])
541 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 648 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
649
542 if (!rs[Rs_iconName]) 650 if (!rs[Rs_iconName])
543 rs[Rs_iconName] = rs[Rs_title]; 651 rs[Rs_iconName] = rs[Rs_title];
544 } 652 }
545 else 653 else
546 { 654 {
547 if (!rs[Rs_title]) 655 if (!rs[Rs_title])
548 rs[Rs_title] = rs[Rs_name]; 656 rs[Rs_title] = rs[Rs_name];
657
549 if (!rs[Rs_iconName]) 658 if (!rs[Rs_iconName])
550 rs[Rs_iconName] = rs[Rs_name]; 659 rs[Rs_iconName] = rs[Rs_name];
551 } 660 }
552 661
553 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 662 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
554 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 663 saveLines = min (i, MAX_SAVELINES);
555 664
556#ifndef NO_FRILLS 665#if ENABLE_FRILLS
557 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 666 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
558 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 667 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
668
559 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 669 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
560 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 670 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
561#endif
562 671
563#ifndef NO_LINESPACE
564 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 672 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
565 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 673 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
674
675 if (rs[Rs_letterSpace])
676 letterSpace = atoi (rs[Rs_letterSpace]);
566#endif 677#endif
567 678
568#ifdef POINTER_BLANK 679#ifdef POINTER_BLANK
569 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 680 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
570 pointerBlankDelay = i; 681 pointerBlankDelay = i;
571 else 682 else
572 pointerBlankDelay = 2; 683 pointerBlankDelay = 2;
573#endif 684#endif
574 685
575 /* no point having a scrollbar without having any scrollback! */ 686 /* no point having a scrollbar without having any scrollback! */
576 if (!TermWin.saveLines) 687 if (!saveLines)
577 Options &= ~Opt_scrollBar; 688 set_option (Opt_scrollBar, 0);
578
579#ifdef PRINTPIPE
580 if (!rs[Rs_print_pipe])
581 rs[Rs_print_pipe] = PRINTPIPE;
582#endif
583 689
584 if (!rs[Rs_cutchars]) 690 if (!rs[Rs_cutchars])
585 rs[Rs_cutchars] = CUTCHARS; 691 rs[Rs_cutchars] = CUTCHARS;
586 692
587#ifndef NO_BACKSPACE_KEY 693#ifndef NO_BACKSPACE_KEY
588 if (!rs[Rs_backspace_key]) 694 if (!rs[Rs_backspace_key])
589# ifdef DEFAULT_BACKSPACE 695# ifdef DEFAULT_BACKSPACE
590 key_backspace = DEFAULT_BACKSPACE; 696 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
591# else 697# else
592 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 698 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
593# endif 699# endif
594 else
595 {
596 val = STRDUP (rs[Rs_backspace_key]);
597 rxvt_Str_trim (val);
598 rxvt_Str_escaped (val);
599 key_backspace = val;
600 }
601#endif 700#endif
602 701
603#ifndef NO_DELETE_KEY 702#ifndef NO_DELETE_KEY
604 if (!rs[Rs_delete_key]) 703 if (!rs[Rs_delete_key])
605# ifdef DEFAULT_DELETE 704# ifdef DEFAULT_DELETE
606 key_delete = DEFAULT_DELETE; 705 rs[Rs_delete_key] = DEFAULT_DELETE;
607# else 706# else
608 key_delete = "\033[3~"; 707 rs[Rs_delete_key] = "\033[3~";
609# endif 708# endif
610 else
611 {
612 val = STRDUP (rs[Rs_delete_key]);
613 rxvt_Str_trim (val);
614 rxvt_Str_escaped (val);
615 key_delete = val;
616 }
617#endif 709#endif
618 if (rs[Rs_answerbackstring])
619 {
620 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
621 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
622 }
623 710
624#ifdef HAVE_SCROLLBARS 711 scrollBar.setup (this);
625 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
626 rs[Rs_scrollBar_thickness]);
627#endif
628 712
629#ifdef XTERM_REVERSE_VIDEO 713#ifdef XTERM_REVERSE_VIDEO
630 /* this is how xterm implements reverseVideo */ 714 /* this is how xterm implements reverseVideo */
631 if (Options & Opt_reverseVideo) 715 if (option (Opt_reverseVideo))
632 { 716 {
633 if (!rs[Rs_color + Color_fg]) 717 if (!rs[Rs_color + Color_fg])
634 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 718 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
719
635 if (!rs[Rs_color + Color_bg]) 720 if (!rs[Rs_color + Color_bg])
636 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 721 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
637 } 722 }
638#endif 723#endif
639 724
… …
641 if (!rs[Rs_color + i]) 726 if (!rs[Rs_color + i])
642 rs[Rs_color + i] = def_colorName[i]; 727 rs[Rs_color + i] = def_colorName[i];
643 728
644#ifndef XTERM_REVERSE_VIDEO 729#ifndef XTERM_REVERSE_VIDEO
645 /* this is how we implement reverseVideo */ 730 /* this is how we implement reverseVideo */
646 if (Options & Opt_reverseVideo) 731 if (option (Opt_reverseVideo))
647 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 732 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
648#endif 733#endif
649 734
650 /* convenient aliases for setting fg/bg to colors */ 735 /* convenient aliases for setting fg/bg to colors */
651 color_aliases (Color_fg); 736 color_aliases (Color_fg);
652 color_aliases (Color_bg); 737 color_aliases (Color_bg);
653#ifndef NO_CURSORCOLOR 738#ifndef NO_CURSORCOLOR
654 color_aliases (Color_cursor); 739 color_aliases (Color_cursor);
655 color_aliases (Color_cursor2); 740 color_aliases (Color_cursor2);
656#endif /* NO_CURSORCOLOR */ 741#endif /* NO_CURSORCOLOR */
657 color_aliases (Color_pointer_fg); 742 color_aliases (Color_pointer_fg);
658 color_aliases (Color_pointer_bg); 743 color_aliases (Color_pointer_bg);
659 color_aliases (Color_border); 744 color_aliases (Color_border);
660#ifndef NO_BOLD_UNDERLINE_REVERSE 745#ifndef NO_BOLD_UNDERLINE_REVERSE
661 color_aliases (Color_BD); 746 color_aliases (Color_BD);
662 color_aliases (Color_UL); 747 color_aliases (Color_UL);
663 color_aliases (Color_RV); 748 color_aliases (Color_RV);
664#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 749#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
750
751 if (!rs[Rs_color + Color_border])
752 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
665 753
666 return cmd_argv; 754 return cmd_argv;
755}
756
757/*----------------------------------------------------------------------*/
758void
759rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
760{
761 this->envv = envv;
762
763 SET_R (this);
764 set_locale ("");
765 set_environ (envv); // a few things in X do not call setlocale :(
766
767 init_vars ();
768
769 const char **cmd_argv = init_resources (argc, argv);
770
771#ifdef KEYSYM_RESOURCE
772 keyboard->register_done ();
773#endif
774
775 if (const char *path = rs[Rs_chdir])
776 if (*path) // ignored if empty
777 {
778 if (*path != '/')
779 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
780
781 if (chdir (path))
782 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
783 }
784
785 if (option (Opt_scrollBar))
786 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
787
788 pty = ptytty::create ();
789
790#ifdef HAVE_AFTERIMAGE
791 set_application_name ((char *)rs[Rs_name]);
792 set_output_threshold (OUTPUT_LEVEL_WARNING);
793#endif
794
795 // must be called before create_windows, because the latter may call set_icon
796#ifdef HAVE_PIXBUF
797 g_type_init ();
798#endif
799
800 create_windows (argc, argv);
801
802 init_xlocale ();
803
804 scr_poweron (); // initialize screen
805
806#if 0
807 XSynchronize (dpy, True);
808#endif
809
810 if (option (Opt_scrollBar))
811 scrollBar.resize (); /* create and map scrollbar */
812#ifdef HAVE_BG_PIXMAP
813 {
814 bg_init ();
815
816#ifdef ENABLE_TRANSPARENCY
817 if (option (Opt_transparent))
818 {
819 bg_set_transparent ();
820
821 if (rs [Rs_blurradius])
822 bg_set_blur (rs [Rs_blurradius]);
823
824 if (ISSET_PIXCOLOR (Color_tint))
825 bg_set_tint (pix_colors_focused [Color_tint]);
826
827 if (rs [Rs_shade])
828 bg_set_shade (rs [Rs_shade]);
829
830 bg_set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root);
833 }
834#endif
835
836#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap])
838 {
839 if (bg_set_file (rs[Rs_backgroundPixmap]))
840 if (!bg_window_position_sensitive ())
841 update_background ();
842 }
843#endif
844 }
845#endif
846
847#if ENABLE_PERL
848 rootwin_ev.start (display, display->root);
849#endif
850
851 set_colorfgbg ();
852
853 init_command (cmd_argv);
854
855 free (cmd_argv);
856
857 if (pty->pty >= 0)
858 pty_ev.start (pty->pty, ev::READ);
859
860 HOOK_INVOKE ((this, HOOK_START, DT_END));
861
862#if ENABLE_XEMBED
863 if (rs[Rs_embed])
864 {
865 long info[2] = { 0, XEMBED_MAPPED };
866
867 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
868 32, PropModeReplace, (unsigned char *)&info, 2);
869 }
870#endif
871
872#if HAVE_STARTUP_NOTIFICATION
873 SnDisplay *snDisplay;
874 SnLauncheeContext *snContext;
875
876 snDisplay = sn_display_new (dpy, NULL, NULL);
877 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
878
879 /* Tell the window manager that this window is part of the startup context */
880 if (snContext)
881 sn_launchee_context_setup_window (snContext, parent);
882#endif
883
884 XMapWindow (dpy, vt);
885 XMapWindow (dpy, parent);
886
887#if HAVE_STARTUP_NOTIFICATION
888 if (snContext)
889 {
890 /* Mark the startup process as complete */
891 sn_launchee_context_complete (snContext);
892
893 sn_launchee_context_unref (snContext);
894 }
895
896 sn_display_unref (snDisplay);
897#endif
898
899 refresh_check ();
667} 900}
668 901
669/*----------------------------------------------------------------------*/ 902/*----------------------------------------------------------------------*/
670void 903void
671rxvt_term::init_env () 904rxvt_term::init_env ()
672{ 905{
673 int i;
674 unsigned int u;
675 char *val; 906 char *val;
676 907
677#ifdef DISPLAY_IS_IP 908#ifdef DISPLAY_IS_IP
678 /* Fixup display_name for export over pty to any interested terminal 909 /* Fixup display_name for export over pty to any interested terminal
679 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 910 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
687 */ 918 */
688 val = rxvt_network_display (rs[Rs_display_name]); 919 val = rxvt_network_display (rs[Rs_display_name]);
689 rs[Rs_display_name] = (const char *)val; 920 rs[Rs_display_name] = (const char *)val;
690 921
691 if (val == NULL) 922 if (val == NULL)
692#endif /* DISPLAY_IS_IP */ 923#endif /* DISPLAY_IS_IP */
693 val = XDisplayString (display->display); 924 val = XDisplayString (dpy);
694 925
695 if (rs[Rs_display_name] == NULL) 926 if (rs[Rs_display_name] == NULL)
696 rs[Rs_display_name] = val; /* use broken `:0' value */ 927 rs[Rs_display_name] = val; /* use broken `:0' value */
697 928
698 i = STRLEN (val);
699 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 929 env_display = (char *)rxvt_malloc (strlen (val) + 9);
700 930
701 sprintf (env_display, "DISPLAY=%s", val); 931 sprintf (env_display, "DISPLAY=%s", val);
702 932
703 /* avoiding the math library:
704 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
705 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
706 ;
707 MAX_IT (i, 1);
708 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
709
710 sprintf (env_windowid, "WINDOWID=%u", 933 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
711 (unsigned int)TermWin.parent[0]);
712 934
713 /* add entries to the environment: 935 /* add entries to the environment:
714 * @ DISPLAY: in case we started with -display 936 * @ DISPLAY: in case we started with -display
715 * @ WINDOWID: X window id number of the window 937 * @ WINDOWID: X window id number of the window
716 * @ COLORTERM: terminal sub-name and also indicates its color 938 * @ COLORTERM: terminal sub-name and also indicates its color
… …
718 * @ TERMINFO: path to terminfo directory 940 * @ TERMINFO: path to terminfo directory
719 * @ COLORFGBG: fg;bg color codes 941 * @ COLORFGBG: fg;bg color codes
720 */ 942 */
721 putenv (env_display); 943 putenv (env_display);
722 putenv (env_windowid); 944 putenv (env_windowid);
945
723 if (env_colorfgbg) 946 if (env_colorfgbg)
724 putenv (env_colorfgbg); 947 putenv (env_colorfgbg);
725 948
726#ifdef RXVT_TERMINFO 949#ifdef RXVT_TERMINFO
727 putenv ("TERMINFO=" RXVT_TERMINFO); 950 putenv ("TERMINFO=" RXVT_TERMINFO);
728#endif 951#endif
729 952
730 if (display->depth <= 2) 953 if (depth <= 2)
731 putenv ("COLORTERM=" COLORTERMENV "-mono"); 954 putenv ("COLORTERM=" COLORTERMENV "-mono");
732 else 955 else
733 putenv ("COLORTERM=" COLORTERMENVFULL); 956 putenv ("COLORTERM=" COLORTERMENVFULL);
734 957
735 if (rs[Rs_term_name] != NULL) 958 if (rs[Rs_term_name] != NULL)
736 { 959 {
737 env_term = (char *)rxvt_malloc ((STRLEN (rs[Rs_term_name]) + 6) * sizeof (char)); 960 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
738 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 961 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
739 putenv (env_term); 962 putenv (env_term);
740 } 963 }
741 else 964 else
742 putenv ("TERM=" TERMENV); 965 putenv ("TERM=" TERMENV);
… …
744#ifdef HAVE_UNSETENV 967#ifdef HAVE_UNSETENV
745 /* avoid passing old settings and confusing term size */ 968 /* avoid passing old settings and confusing term size */
746 unsetenv ("LINES"); 969 unsetenv ("LINES");
747 unsetenv ("COLUMNS"); 970 unsetenv ("COLUMNS");
748 unsetenv ("TERMCAP"); /* terminfo should be okay */ 971 unsetenv ("TERMCAP"); /* terminfo should be okay */
749#endif /* HAVE_UNSETENV */ 972#endif /* HAVE_UNSETENV */
750} 973}
751 974
752/*----------------------------------------------------------------------*/ 975/*----------------------------------------------------------------------*/
753/* 976/*
754 * This is more or less stolen straight from XFree86 xterm. 977 * This is more or less stolen straight from XFree86 xterm.
755 * This should support all European type languages. 978 * This should support all European type languages.
756 */ 979 */
757void 980void
758rxvt_term::set_locale (const char *locale) 981rxvt_term::set_locale (const char *locale)
759{ 982{
983 set_environ (envv);
984
760#if HAVE_XSETLOCALE || HAVE_SETLOCALE 985#if HAVE_XSETLOCALE || HAVE_SETLOCALE
761 free (this->locale); 986 free (this->locale);
762 this->locale = setlocale (LC_CTYPE, locale); 987 this->locale = setlocale (LC_CTYPE, locale);
763 988
764 if (!this->locale) 989 if (!this->locale)
765 { 990 {
991 if (*locale)
992 {
766 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 993 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
767 setlocale (LC_CTYPE, ""); 994 setlocale (LC_CTYPE, "C");
995 }
996 else
997 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
998
768 this->locale = ""; 999 this->locale = "C";
769 } 1000 }
770 1001
1002
771 this->locale = rxvt_strdup (this->locale); 1003 this->locale = strdup (this->locale);
772 SET_LOCALE (this->locale); 1004 SET_LOCALE (this->locale);
773 mbstate.reset (); 1005 mbstate.reset ();
774#endif 1006#endif
775#if 0 1007
776#if HAVE_NL_LANGINFO 1008#if HAVE_NL_LANGINFO
1009 char *codeset = strdup (nl_langinfo (CODESET));
1010 // /^UTF.?8/i
1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1012 && (codeset[1] == 'T' || codeset[1] == 't')
1013 && (codeset[2] == 'F' || codeset[2] == 'f')
1014 && (codeset[3] == '8' || codeset[4] == '8');
777 free (codeset); 1015 free (codeset);
778 codeset = strdup (nl_langinfo (CODESET));
779 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
780 || !STRCASECMP (codeset, "UTF8");
781#else 1016#else
782 enc_utf8 = 1; 1017 enc_utf8 = 0;
783#endif
784#endif 1018#endif
785} 1019}
786 1020
787void 1021void
788rxvt_term::init_xlocale () 1022rxvt_term::init_xlocale ()
789{ 1023{
1024 set_environ (envv);
1025
790#ifdef USE_XIM 1026#ifdef USE_XIM
791 if (!locale) 1027 if (!locale)
792 rxvt_warn ("setting locale failed, working without locale support.\n"); 1028 rxvt_warn ("setting locale failed, working without locale support.\n");
793 else 1029 else
794 { 1030 {
795 Atom wmlocale; 1031 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
796
797 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
798 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
799 XA_STRING, 8, PropModeReplace,
800 (unsigned char *)locale, STRLEN (locale));
801 1032
802 if (!XSupportsLocale ()) 1033 if (!XSupportsLocale ())
803 { 1034 {
804 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n"); 1035 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
805 return; 1036 return;
806 } 1037 }
807 1038
808 im_ev.start (display); 1039 im_ev.start (display);
809 1040
… …
819{ 1050{
820 /* 1051 /*
821 * Initialize the command connection. 1052 * Initialize the command connection.
822 * This should be called after the X server connection is established. 1053 * This should be called after the X server connection is established.
823 */ 1054 */
824 int i;
825
826 for (i = 0; i < NUM_XA; i++)
827 xa[i] = XInternAtom (display->display, xa_names[i], False);
828
829 /* Enable delete window protocol */
830 XSetWMProtocols (display->display, TermWin.parent[0],
831 & (xa[XA_WMDELETEWINDOW]), 1);
832
833#ifdef USING_W11LIB
834 /* enable W11 callbacks */
835 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
836#endif
837 1055
838#ifdef META8_OPTION 1056#ifdef META8_OPTION
839 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 1057 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
840#endif 1058#endif
841 1059
842 get_ourmods (); 1060 get_ourmods ();
843 1061
844 if (!(Options & Opt_scrollTtyOutput)) 1062 if (!option (Opt_scrollTtyOutput))
845 PrivateModes |= PrivMode_TtyOutputInh; 1063 priv_modes |= PrivMode_TtyOutputInh;
846 if (Options & Opt_scrollTtyKeypress) 1064 if (option (Opt_scrollTtyKeypress))
847 PrivateModes |= PrivMode_Keypress; 1065 priv_modes |= PrivMode_Keypress;
848 if (!(Options & Opt_jumpScroll)) 1066 if (!option (Opt_jumpScroll))
849 PrivateModes |= PrivMode_smoothScroll; 1067 priv_modes |= PrivMode_smoothScroll;
850 1068
851#ifndef NO_BACKSPACE_KEY 1069#ifndef NO_BACKSPACE_KEY
852 if (STRCMP (key_backspace, "DEC") == 0) 1070 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
853 PrivateModes |= PrivMode_HaveBackSpace; 1071 priv_modes |= PrivMode_HaveBackSpace;
854#endif 1072#endif
855 1073
856 /* add value for scrollBar */ 1074 /* add value for scrollBar */
857 if (scrollbar_visible ()) 1075 if (scrollBar.state)
858 { 1076 {
859 PrivateModes |= PrivMode_scrollBar; 1077 priv_modes |= PrivMode_scrollBar;
860 SavedModes |= PrivMode_scrollBar; 1078 SavedModes |= PrivMode_scrollBar;
861 } 1079 }
862 if (menubar_visible ())
863 {
864 PrivateModes |= PrivMode_menuBar;
865 SavedModes |= PrivMode_menuBar;
866 }
867 1080
868#ifdef CURSOR_BLINK 1081 run_command (argv);
869 if (Options & Opt_cursorBlink)
870 (void)gettimeofday (&lastcursorchange, NULL);
871#endif
872
873 if ((cmd_fd = run_command (argv)) < 0)
874 rxvt_fatal ("failure while running command, aborting");
875} 1082}
876 1083
877/*----------------------------------------------------------------------*/ 1084/*----------------------------------------------------------------------*/
878void 1085void
879rxvt_term::Get_Colours () 1086rxvt_term::get_colours ()
880{ 1087{
881 int i; 1088 int i;
882 1089
883#ifdef OFF_FOCUS_FADING 1090#ifdef OFF_FOCUS_FADING
884 PixColors = PixColorsFocused; 1091 pix_colors = pix_colors_focused;
885#endif 1092#endif
886 1093
887 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 1094 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
888 { 1095 {
1096 const char *name = rs[Rs_color + i];
1097
1098 if (!name)
1099 continue;
1100
889 rxvt_color xcol; 1101 rxvt_color xcol;
890 1102
891 if (!rs[Rs_color + i]) 1103 if (!set_color (xcol, name))
892 continue;
893
894 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
895 { 1104 {
896#ifndef XTERM_REVERSE_VIDEO 1105#ifndef XTERM_REVERSE_VIDEO
897 if (i < 2 && (Options & Opt_reverseVideo)) 1106 if (i < 2 && option (Opt_reverseVideo))
898 rs[Rs_color + i] = def_colorName[!i]; 1107 name = def_colorName [1 - i];
899 else 1108 else
900#endif 1109#endif
901 rs[Rs_color + i] = def_colorName[i]; 1110 name = def_colorName [i];
902 1111
903 if (!rs[Rs_color + i]) 1112 if (!name)
904 continue; 1113 continue;
905 1114
906 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 1115 if (!set_color (xcol, name))
907 { 1116 {
908 switch (i) 1117 switch (i)
909 { 1118 {
910 case Color_fg: 1119 case Color_fg:
911 case Color_bg: 1120 case Color_bg:
912 /* fatal: need bg/fg color */
913 rxvt_fatal ("unable to get foreground/background colour, aborting"); 1121 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
914 /* NOTREACHED */ 1122 name = "";
915 break; 1123 break;
916#ifndef NO_CURSORCOLOR 1124#ifndef NO_CURSORCOLOR
917 case Color_cursor2: 1125 case Color_cursor2:
918 xcol = PixColors[Color_fg]; 1126#endif
919 break;
920#endif /* ! NO_CURSORCOLOR */
921 case Color_pointer_fg: 1127 case Color_pointer_fg:
922 xcol = PixColors[Color_fg]; 1128 name = rs[Rs_color + Color_fg];
1129 xcol.set (this, name);
923 break; 1130 break;
924 default: 1131 default:
925 xcol = PixColors[Color_bg]; /* None */ 1132 name = rs[Rs_color + Color_bg];
1133 xcol.set (this, name);
926 break; 1134 break;
927 } 1135 }
928 } 1136 }
929 } 1137 }
930 1138
931 PixColors[i] = xcol; 1139 pix_colors[i] = xcol;
932#ifdef OFF_FOCUS_FADING 1140 rs[Rs_color + i] = name;
933 if (rs[Rs_fade])
934 PixColorsUnFocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
935#endif
936 SET_PIXCOLOR (i);
937 }
938
939 if (display->depth <= 2)
940 { 1141 }
1142
1143 if (depth <= 2)
1144 {
941 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg]; 1145 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
942 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg]; 1146 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
943 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg]; 1147 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
944 } 1148 }
945 1149
946 /* 1150 /*
947 * get scrollBar/menuBar shadow colors 1151 * get scrollBar shadow colors
948 * 1152 *
949 * The calculations of topShadow/bottomShadow values are adapted 1153 * The calculations of topShadow/bottomShadow values are adapted
950 * from the fvwm window manager. 1154 * from the fvwm window manager.
951 */ 1155 */
952#ifdef KEEP_SCROLLCOLOR 1156#ifdef RXVT_SCROLLBAR
953
954 if (display->depth <= 2) 1157 if (depth <= 2)
1158 {
955 { /* Monochrome */ 1159 /* Monochrome */
956 PixColors[Color_scroll] = PixColors[Color_fg]; 1160 alias_color (Color_scroll, Color_fg);
957 PixColors[Color_topShadow] = PixColors[Color_bg]; 1161 alias_color (Color_topShadow, Color_bg);
958 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 1162 alias_color (Color_bottomShadow, Color_bg);
959 } 1163 }
960 else 1164 else
961 { 1165 {
962 rxvt_color xcol[2]; 1166 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
963 /* xcol[0] == white
964 * xcol[1] == top shadow
965 * xcol[2] == bot shadow */
966 1167
967 xcol[1] = PixColors[Color_scroll]; 1168 rgba cscroll;
968 xcol[0].set (display, 65535, 65535, 65535); 1169 pix_colors [Color_scroll].get (cscroll);
969
970 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
971
972 xcol[0].get (display, pr0, pg0, pb0);
973 xcol[1].get (display, pr1, pg1, pb1);
974
975 PixColors[Color_bottomShadow] = xcol[1].fade (display, 50);
976 1170
977 /* topShadowColor */ 1171 /* topShadowColor */
978 if (!xcol[1].set (display, 1172 if (!pix_colors[Color_topShadow].set (this,
979 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1173 rgba (
980 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1174 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
981 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1175 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
982 xcol[1] = PixColors[Color_White]; 1176 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
983 1177 cscroll.a)
984 PixColors[Color_topShadow] = xcol[1]; 1178 ))
1179 alias_color (Color_topShadow, Color_White);
985 } 1180 }
986#endif /* KEEP_SCROLLCOLOR */ 1181#endif
1182
1183#ifdef OFF_FOCUS_FADING
1184 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
1185 update_fade_color (i);
1186#endif
987} 1187}
988 1188
989/*----------------------------------------------------------------------*/ 1189/*----------------------------------------------------------------------*/
990/* color aliases, fg/bg bright-bold */ 1190/* color aliases, fg/bg bright-bold */
991void 1191void
… …
994 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1194 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
995 { 1195 {
996 int i = atoi (rs[Rs_color + idx]); 1196 int i = atoi (rs[Rs_color + idx]);
997 1197
998 if (i >= 8 && i <= 15) 1198 if (i >= 8 && i <= 15)
999 { /* bright colors */ 1199 /* bright colors */
1000 i -= 8;
1001#ifndef NO_BRIGHTCOLOR
1002 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1200 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
1003 return; 1201 else if (i >= 0 && i <= 7)
1004#endif 1202 /* normal colors */
1005
1006 }
1007
1008 if (i >= 0 && i <= 7) /* normal colors */
1009 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1203 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1010 } 1204 }
1011} 1205}
1012 1206
1013/*----------------------------------------------------------------------*/ 1207/*----------------------------------------------------------------------*/
… …
1016 * Use resource ``modifier'' to override the Meta modifier 1210 * Use resource ``modifier'' to override the Meta modifier
1017 */ 1211 */
1018void 1212void
1019rxvt_term::get_ourmods () 1213rxvt_term::get_ourmods ()
1020{ 1214{
1021 int i, j, k; 1215 int i, j, k;
1022 int requestedmeta, realmeta, realalt; 1216 int requestedmeta, realmeta, realalt;
1023 const char *cm, *rsmod; 1217 const char *cm, *rsmod;
1024 XModifierKeymap *map; 1218 XModifierKeymap *map;
1025 KeyCode *kc; 1219 KeyCode *kc;
1026 const unsigned int modmasks[] = 1220 const unsigned int modmasks[] =
1027 { 1221 {
1028 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 1222 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1029 }; 1223 };
1030 1224
1031 requestedmeta = realmeta = realalt = 0; 1225 requestedmeta = realmeta = realalt = 0;
1032 rsmod = rs[Rs_modifier]; 1226 rsmod = rs[Rs_modifier];
1227
1033 if (rsmod 1228 if (rsmod
1034 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0) 1229 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
1035 requestedmeta = rsmod[3] - '0'; 1230 requestedmeta = rsmod[3] - '0';
1036 1231
1037 map = XGetModifierMapping (display->display); 1232 map = XGetModifierMapping (dpy);
1038 kc = map->modifiermap; 1233 kc = map->modifiermap;
1234
1039 for (i = 1; i < 6; i++) 1235 for (i = 1; i < 6; i++)
1040 { 1236 {
1041 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1237 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1238
1042 for (j = map->max_keypermod; j--; k++) 1239 for (j = map->max_keypermod; j--; k++)
1043 { 1240 {
1044 if (kc[k] == 0) 1241 if (kc[k] == 0)
1045 break; 1242 break;
1243
1046 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 1244 switch (XKeycodeToKeysym (dpy, kc[k], 0))
1047 { 1245 {
1048 case XK_Num_Lock: 1246 case XK_Num_Lock:
1049 ModNumLockMask = modmasks[i - 1]; 1247 ModNumLockMask = modmasks[i - 1];
1050 /* FALLTHROUGH */ 1248 continue;
1051 default: 1249
1052 continue; /* for (;;) */ 1250 case XK_ISO_Level3_Shift:
1251 ModLevel3Mask = modmasks[i - 1];
1252 continue;
1253
1053 case XK_Meta_L: 1254 case XK_Meta_L:
1054 case XK_Meta_R: 1255 case XK_Meta_R:
1055 cm = "meta"; 1256 cm = "meta";
1056 realmeta = i; 1257 realmeta = i;
1057 break; 1258 break;
1259
1058 case XK_Alt_L: 1260 case XK_Alt_L:
1059 case XK_Alt_R: 1261 case XK_Alt_R:
1060 cm = "alt"; 1262 cm = "alt";
1061 realalt = i; 1263 realalt = i;
1062 break; 1264 break;
1265
1063 case XK_Super_L: 1266 case XK_Super_L:
1064 case XK_Super_R: 1267 case XK_Super_R:
1065 cm = "super"; 1268 cm = "super";
1066 break; 1269 break;
1270
1067 case XK_Hyper_L: 1271 case XK_Hyper_L:
1068 case XK_Hyper_R: 1272 case XK_Hyper_R:
1069 cm = "hyper"; 1273 cm = "hyper";
1070 break; 1274 break;
1275
1276 default:
1277 continue;
1071 } 1278 }
1072 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0) 1279
1280 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
1073 requestedmeta = i; 1281 requestedmeta = i;
1074 } 1282 }
1075 } 1283 }
1284
1076 XFreeModifiermap (map); 1285 XFreeModifiermap (map);
1286
1077 i = (requestedmeta ? requestedmeta 1287 i = requestedmeta ? requestedmeta
1078 : (realmeta ? realmeta 1288 : realmeta ? realmeta
1079 : (realalt ? realalt : 0))); 1289 : realalt ? realalt
1290 : 0;
1291
1080 if (i) 1292 if (i)
1081 ModMetaMask = modmasks[i - 1]; 1293 ModMetaMask = modmasks[i - 1];
1082} 1294}
1083 1295
1296void
1297rxvt_term::set_icon (const char *file)
1298{
1299#ifdef HAVE_AFTERIMAGE
1300 init_asv ();
1301
1302 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1303 if (!im)
1304 {
1305 rxvt_warn ("Loading image icon failed, continuing without.\n");
1306 return;
1307 }
1308
1309 unsigned int w = im->width;
1310 unsigned int h = im->height;
1311
1312 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1313 {
1314 rxvt_warn ("Icon image too big, continuing without.\n");
1315 destroy_asimage (&im);
1316 return;
1317 }
1318
1319 ASImage *result = scale_asimage (asv, im,
1320 w, h, ASA_ARGB32,
1321 100, ASIMAGE_QUALITY_DEFAULT);
1322 destroy_asimage (&im);
1323
1324 if (!result)
1325 {
1326 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1327 return;
1328 }
1329
1330 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1331 if (buffer)
1332 {
1333 ARGB32 *asbuf = result->alt.argb32;
1334 buffer [0] = w;
1335 buffer [1] = h;
1336
1337 for (unsigned int i = 0; i < w * h; ++i)
1338 buffer [i + 2] = asbuf [i];
1339
1340 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1341 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1342 free (buffer);
1343 }
1344 else
1345 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1346
1347 destroy_asimage (&result);
1348#endif
1349
1350#ifdef HAVE_PIXBUF
1351 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1352 if (!pixbuf)
1353 {
1354 rxvt_warn ("Loading image icon failed, continuing without.\n");
1355 return;
1356 }
1357
1358 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1359 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1360
1361 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1362 {
1363 rxvt_warn ("Icon image too big, continuing without.\n");
1364 g_object_unref (pixbuf);
1365 return;
1366 }
1367
1368 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1369 {
1370 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1371 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1372 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1373
1374 buffer [0] = w;
1375 buffer [1] = h;
1376 for (int i = 0; i < h; i++)
1377 {
1378 for (int j = 0; j < w; j++)
1379 {
1380 unsigned char *pixel = row + j * channels;
1381 long value;
1382
1383 if (channels == 4)
1384 value = pixel[3];
1385 else
1386 value = (unsigned char)0x00ff;
1387
1388 value = (value << 8) + pixel[0];
1389 value = (value << 8) + pixel[1];
1390 value = (value << 8) + pixel[2];
1391 buffer[(i * w + j) + 2] = value;
1392 }
1393
1394 row += rowstride;
1395 }
1396
1397 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1398 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1399 free (buffer);
1400 }
1401 else
1402 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1403
1404 g_object_unref (pixbuf);
1405#endif
1406}
1407
1084/*----------------------------------------------------------------------*/ 1408/*----------------------------------------------------------------------*/
1085/* rxvt_Create_Windows () - Open and map the window */ 1409/* Open and map the window */
1086void 1410void
1087rxvt_term::create_windows (int argc, const char *const *argv) 1411rxvt_term::create_windows (int argc, const char *const *argv)
1088{ 1412{
1089 XClassHint classHint; 1413 XClassHint classHint;
1090 XWMHints wmHint; 1414 XWMHints wmHint;
1091#ifndef NO_FRILLS 1415#if ENABLE_FRILLS
1092 Atom prop = None;
1093 MWMHints mwmhints; 1416 MWMHints mwmhints = { };
1094#endif 1417#endif
1095 XGCValues gcvalue; 1418 XGCValues gcvalue;
1096 long vt_emask;
1097 XSetWindowAttributes attributes; 1419 XSetWindowAttributes attributes;
1098 XWindowAttributes gattr; 1420 Window top, parent;
1099 1421
1100 if (Options & Opt_transparent) 1422 dLocal (Display *, dpy);
1101 {
1102 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1103 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1104 }
1105 1423
1106#ifndef NO_FRILLS 1424 /* grab colors before netscape does */
1425 get_colours ();
1426
1427 if (!set_fonts ())
1428 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1429
1430 parent = display->root;
1431
1432 attributes.override_redirect = !!option (Opt_override_redirect);
1433
1434#if ENABLE_FRILLS
1107 if (Options & Opt_borderLess) 1435 if (option (Opt_borderLess))
1108 { 1436 {
1109 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 1437 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
1110 if (prop == None)
1111 { 1438 {
1112 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1439 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
1113#ifdef PREFER_24BIT
1114 attributes.override_redirect = TRUE; 1440 attributes.override_redirect = true;
1115#endif
1116 mwmhints.flags = 0;
1117 } 1441 }
1118 else 1442 else
1119 { 1443 {
1120 mwmhints.flags = MWM_HINTS_DECORATIONS; 1444 mwmhints.flags = MWM_HINTS_DECORATIONS;
1121 mwmhints.decorations = 0;
1122 } 1445 }
1123 } 1446 }
1124 else 1447#endif
1125 { 1448
1126 mwmhints.flags = 0; 1449#if ENABLE_XEMBED
1450 if (rs[Rs_embed])
1127 } 1451 {
1128#endif 1452 XWindowAttributes wattr;
1129 1453
1130 /* grab colors before netscape does */ 1454 parent = strtol (rs[Rs_embed], 0, 0);
1131 Get_Colours ();
1132 1455
1133 if (!change_font (rs[Rs_font])) 1456 if (!XGetWindowAttributes (dpy, parent, &wattr))
1457 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
1458
1459 window_calc (wattr.width, wattr.height);
1134 { 1460 }
1135 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n"); 1461#endif
1136 destroy ();
1137 return;
1138 }
1139 1462
1140 window_calc (0, 0); 1463 window_calc (0, 0);
1464
1465 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1466 attributes.background_pixel = pix_colors_focused [Color_border];
1467 attributes.border_pixel = pix_colors_focused [Color_border];
1468 attributes.colormap = cmap;
1469
1470 top = XCreateWindow (dpy, parent,
1471 szHint.x, szHint.y,
1472 szHint.width, szHint.height,
1473 ext_bwidth,
1474 depth, InputOutput, visual,
1475 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1476 &attributes);
1477
1478 this->parent = top;
1479
1141 old_width = szHint.width; 1480 old_width = szHint.width;
1142 old_height = szHint.height; 1481 old_height = szHint.height;
1143 1482
1144 /* sub-window placement & size in rxvt_resize_subwindows () */ 1483 set_title (rs [Rs_title]);
1484 set_icon_name (rs [Rs_iconName]);
1145 1485
1146#ifdef PREFER_24BIT
1147 attributes.background_pixel = PixColors[Color_bg];
1148 attributes.border_pixel = PixColors[Color_border];
1149 attributes.colormap = display->cmap;
1150 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1151 szHint.x, szHint.y,
1152 szHint.width, szHint.height,
1153 TermWin.ext_bwidth,
1154 display->depth, InputOutput,
1155 display->visual,
1156 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1157#else
1158 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1159 szHint.x, szHint.y,
1160 szHint.width, szHint.height,
1161 TermWin.ext_bwidth,
1162 PixColors[Color_border],
1163 PixColors[Color_bg]);
1164#endif
1165
1166 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1167 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1168
1169 classHint.res_name = (char *)rs[Rs_name]; 1486 classHint.res_name = (char *)rs[Rs_name];
1170 classHint.res_class = (char *)RESCLASS; 1487 classHint.res_class = (char *)RESCLASS;
1171 1488
1172 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1489 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1173 wmHint.input = True; 1490 wmHint.input = True;
1174 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState; 1491 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1175 wmHint.window_group = TermWin.parent[0]; 1492 wmHint.window_group = top;
1176 1493
1177 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1494 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1178 (char **)argv, argc, &szHint, &wmHint, &classHint); 1495 &szHint, &wmHint, &classHint);
1496#if ENABLE_EWMH
1497 /*
1498 * set up icon hint
1499 * rs [Rs_iconfile] is path to icon
1500 */
1179 1501
1180#ifndef NO_FRILLS 1502 if (rs [Rs_iconfile])
1503 {
1504 set_icon (rs [Rs_iconfile]);
1505 }
1506#endif
1507
1508#if ENABLE_FRILLS
1509 if (mwmhints.flags)
1510 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1511 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1512#endif
1513
1514 Atom protocols[] = {
1515 xa[XA_WM_DELETE_WINDOW],
1516#if ENABLE_EWMH
1517 xa[XA_NET_WM_PING],
1518#endif
1519 };
1520
1521 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1522
1523#if ENABLE_FRILLS
1524 if (rs[Rs_transient_for])
1525 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1526#endif
1527
1528#if ENABLE_EWMH
1181 long pid = getpid (); 1529 long pid = getpid ();
1182 XChangeProperty (display->display, TermWin.parent[0], 1530
1531 XChangeProperty (dpy, top,
1183 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1532 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1184 PropModeReplace, (unsigned char *)&pid, 1); 1533 PropModeReplace, (unsigned char *)&pid, 1);
1185#endif
1186 1534
1187 XSelectInput (display->display, TermWin.parent[0], 1535 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1536#endif
1537
1538 XSelectInput (dpy, top,
1188 KeyPressMask 1539 KeyPressMask
1189#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1540#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1190 | KeyReleaseMask 1541 | KeyReleaseMask
1191#endif 1542#endif
1192 | FocusChangeMask | VisibilityChangeMask 1543 | FocusChangeMask | VisibilityChangeMask
1193 | ExposureMask
1194 | StructureNotifyMask); 1544 | ExposureMask | StructureNotifyMask);
1545
1195 termwin_ev.start (display, TermWin.parent[0]); 1546 termwin_ev.start (display, top);
1196
1197#ifndef NO_FRILLS
1198 if (mwmhints.flags)
1199 {
1200 prop = XInternAtom(display->display, "_MOTIF_WM_HINTS", False);
1201 XChangeProperty(display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1202 }
1203#endif
1204 1547
1205 /* vt cursor: Black-on-White is standard, but this is more popular */ 1548 /* vt cursor: Black-on-White is standard, but this is more popular */
1206 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1549 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1207
1208#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1209 /* cursor (menuBar/scrollBar): Black-on-White */
1210 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1211#endif
1212
1213#ifdef POINTER_BLANK
1214 {
1215 XColor blackcolour;
1216 blackcolour.red = 0;
1217 blackcolour.green = 0;
1218 blackcolour.blue = 0;
1219 Font f = XLoadFont (display->display, "fixed");
1220 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1221 &blackcolour, &blackcolour);
1222 XUnloadFont (display->display, f);
1223 }
1224#endif
1225 1550
1226 /* the vt window */ 1551 /* the vt window */
1227 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1552 vt = XCreateSimpleWindow (dpy, top,
1228 window_vt_x,
1229 window_vt_y, 1553 window_vt_x, window_vt_y,
1230 TermWin_TotalWidth (), 1554 width, height,
1231 TermWin_TotalHeight (),
1232 0, 1555 0,
1233 PixColors[Color_fg], 1556 pix_colors_focused[Color_fg],
1234 PixColors[Color_bg]); 1557 pix_colors_focused[Color_bg]);
1235#ifdef DEBUG_X
1236 XStoreName (display->display, TermWin.vt, "vt window");
1237#endif
1238 1558
1239 attributes.bit_gravity = NorthWestGravity; 1559 attributes.bit_gravity = NorthWestGravity;
1240 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1560 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1241 1561
1242 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1562 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1243 1563
1244 pointer_unblank ();
1245
1246#ifdef POINTER_BLANK
1247 if (Options & Opt_pointerBlank) 1564 if (option (Opt_pointerBlank))
1248 vt_emask |= PointerMotionMask; 1565 vt_emask |= PointerMotionMask;
1249 else 1566 else
1250#endif
1251 vt_emask |= Button1MotionMask | Button3MotionMask; 1567 vt_emask |= Button1MotionMask | Button3MotionMask;
1252 1568
1253 XSelectInput (display->display, TermWin.vt, vt_emask); 1569 vt_select_input ();
1570
1254 vt_ev.start (display, TermWin.vt); 1571 vt_ev.start (display, vt);
1255
1256#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1257 if (menuBar_height ())
1258 {
1259 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1260 window_vt_x, 0,
1261 TermWin_TotalWidth (),
1262 menuBar_TotalHeight (),
1263 0,
1264 PixColors[Color_fg],
1265 PixColors[Color_scroll]);
1266
1267#ifdef DEBUG_X
1268 XStoreName (display->display, menuBar.win, "menubar");
1269#endif
1270
1271 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1272
1273 XDefineCursor (display->display, menuBar.win,
1274 XCreateFontCursor (display->display, XC_left_ptr));
1275
1276 XSelectInput (display->display, menuBar.win,
1277 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1278 | Button1MotionMask));
1279 menubar_ev.start (display, menuBar.win);
1280 }
1281#endif
1282
1283#ifdef XPM_BACKGROUND
1284 if (rs[Rs_backgroundPixmap] != NULL
1285 && ! (Options & Opt_transparent))
1286 {
1287 const char *p = rs[Rs_backgroundPixmap];
1288
1289 if ((p = STRCHR (p, ';')) != NULL)
1290 {
1291 p++;
1292 scale_pixmap (p);
1293 }
1294 set_bgPixmap (rs[Rs_backgroundPixmap]);
1295 scr_touch (True);
1296 }
1297#endif
1298 1572
1299 /* graphics context for the vt window */ 1573 /* graphics context for the vt window */
1300 gcvalue.foreground = PixColors[Color_fg]; 1574 gcvalue.foreground = pix_colors[Color_fg];
1301 gcvalue.background = PixColors[Color_bg]; 1575 gcvalue.background = pix_colors[Color_bg];
1302 gcvalue.graphics_exposures = 1; 1576 gcvalue.graphics_exposures = 0;
1303 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1577
1578 gc = XCreateGC (dpy, vt,
1304 GCForeground | GCBackground | GCGraphicsExposures, 1579 GCForeground | GCBackground | GCGraphicsExposures,
1305 &gcvalue); 1580 &gcvalue);
1306 1581
1307 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1582 drawable = new rxvt_drawable (this, vt);
1308
1309#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1310 gcvalue.foreground = PixColors[Color_topShadow];
1311 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1312 gcvalue.foreground = PixColors[Color_bottomShadow];
1313 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1314 gcvalue.foreground = PixColors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1315 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1316#endif
1317 1583
1318#ifdef OFF_FOCUS_FADING 1584#ifdef OFF_FOCUS_FADING
1319 // initially we are in unfocused state 1585 // initially we are in unfocused state
1320 if (rs[Rs_fade]) 1586 if (rs[Rs_fade])
1321 PixColors = PixColorsUnFocused; 1587 pix_colors = pix_colors_unfocused;
1322#endif 1588#endif
1589
1590 pointer_unblank ();
1591 scr_recolour ();
1323} 1592}
1324 1593
1325/*----------------------------------------------------------------------*/ 1594/*----------------------------------------------------------------------*/
1326/* 1595/*
1327 * Run the command in a subprocess and return a file descriptor for the 1596 * Run the command in a subprocess and return a file descriptor for the
1328 * master end of the pseudo-teletype pair with the command talking to 1597 * master end of the pseudo-teletype pair with the command talking to
1329 * the slave. 1598 * the slave.
1330 */ 1599 */
1331int 1600void
1332rxvt_term::run_command (const char *const *argv) 1601rxvt_term::run_command (const char *const *argv)
1333{ 1602{
1334 int cfd, er; 1603#if ENABLE_FRILLS
1335 1604 if (rs[Rs_pty_fd])
1336 /* get master (pty) */
1337 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1338 rxvt_fatal ("can't open pseudo-tty");
1339
1340 fcntl (cfd, F_SETFL, O_NONBLOCK);
1341
1342 /* get slave (tty) */
1343 if (tty_fd < 0)
1344 { 1605 {
1345#ifndef NO_SETOWNER_TTYDEV 1606 pty->pty = atoi (rs[Rs_pty_fd]);
1346 privileged_ttydev (SAVE);
1347#endif
1348 1607
1349 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1608 if (pty->pty >= 0)
1350 { 1609 {
1351 close (cfd); 1610 if (getfd_hook)
1352 rxvt_fatal ("can't open slave tty %s", ttydev); 1611 pty->pty = (*getfd_hook) (pty->pty);
1612
1613 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1614 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1353 } 1615 }
1354 } 1616 }
1617 else
1618#endif
1619 if (!pty->get ())
1620 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1621
1622 struct termios tio = def_tio;
1623
1355#ifndef NO_BACKSPACE_KEY 1624#ifndef NO_BACKSPACE_KEY
1356 if (key_backspace[0] && !key_backspace[1]) 1625 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1357 er = key_backspace[0]; 1626 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1358 else if (STRCMP (key_backspace, "DEC") == 0) 1627 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1359 er = '\177'; /* the initial state anyway */ 1628 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1360 else
1361#endif 1629#endif
1362 1630
1363 er = -1; 1631 /* init terminal attributes */
1632 cfsetospeed (&tio, BAUDRATE);
1633 cfsetispeed (&tio, BAUDRATE);
1634 tcsetattr (pty->tty, TCSANOW, &tio);
1635 pty->set_utf8_mode (enc_utf8);
1364 1636
1365 rxvt_get_ttymode (& (tio), er); 1637 /* set initial window size */
1638 tt_winch ();
1366 1639
1367#ifndef __QNX__ 1640#if ENABLE_FRILLS
1641 if (rs[Rs_pty_fd])
1642 return;
1643#endif
1644
1368 /* spin off the command interpreter */ 1645 /* spin off the command interpreter */
1369 switch (cmd_pid = fork ()) 1646 switch (cmd_pid = fork ())
1370 { 1647 {
1371 case -1: 1648 case -1:
1649 {
1650 cmd_pid = 0;
1372 rxvt_fatal ("can't fork"); 1651 rxvt_fatal ("can't fork, aborting.\n");
1652 }
1373 case 0: 1653 case 0:
1374 close (cfd); /* only keep tty_fd and STDERR open */
1375
1376 init_env (); 1654 init_env ();
1377 1655
1378 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1656 if (!pty->make_controlling_tty ())
1379 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1657 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1380 else 1658 else
1381 { 1659 {
1382 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1660 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1383 dup2 (tty_fd, STDIN_FILENO); 1661 dup2 (pty->tty, STDIN_FILENO);
1384 dup2 (tty_fd, STDOUT_FILENO); 1662 dup2 (pty->tty, STDOUT_FILENO);
1385 dup2 (tty_fd, STDERR_FILENO); 1663 dup2 (pty->tty, STDERR_FILENO);
1386 1664
1387 if (tty_fd > 2) 1665 // close all our file handles that we do no longer need
1388 close (tty_fd); 1666 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1667 {
1668 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1669 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1670 }
1389 1671
1390 run_child (argv); 1672 run_child (argv);
1391 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1673 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1392 } 1674 }
1393 1675
1394 _exit (EXIT_FAILURE); 1676 _exit (EXIT_FAILURE);
1395 1677
1396 default: 1678 default:
1397 { 1679 if (!option (Opt_utmpInhibit))
1398#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1680 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1399 int fdstdin;
1400 1681
1401 fdstdin = dup (STDIN_FILENO); 1682 pty->close_tty ();
1402 dup2 (tty_fd, STDIN_FILENO);
1403#endif
1404 1683
1405#ifdef UTMP_SUPPORT 1684 child_ev.start (cmd_pid);
1406 privileged_utmp (SAVE);
1407#endif
1408 1685
1409#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1686 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1410
1411 dup2 (fdstdin, STDIN_FILENO);
1412 close (fdstdin);
1413#endif
1414 }
1415
1416 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1417 break; 1687 break;
1418 } 1688 }
1419#else /* __QNX__ uses qnxspawn () */
1420 fchmod (tty_fd, 0622);
1421 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1422 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1423
1424 if (run_child (argv) == -1)
1425 exit (EXIT_FAILURE);
1426#endif
1427
1428 return cfd;
1429} 1689}
1430 1690
1431/* ------------------------------------------------------------------------- * 1691/* ------------------------------------------------------------------------- *
1432 * CHILD PROCESS OPERATIONS * 1692 * CHILD PROCESS OPERATIONS *
1433 * ------------------------------------------------------------------------- */ 1693 * ------------------------------------------------------------------------- */
… …
1438int 1698int
1439rxvt_term::run_child (const char *const *argv) 1699rxvt_term::run_child (const char *const *argv)
1440{ 1700{
1441 char *login; 1701 char *login;
1442 1702
1443 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1444
1445 if (Options & Opt_console) 1703 if (option (Opt_console))
1704 {
1446 { /* be virtual console, fail silently */ 1705 /* be virtual console, fail silently */
1447#ifdef TIOCCONS 1706#ifdef TIOCCONS
1448 unsigned int on = 1; 1707 unsigned int on = 1;
1449 1708
1450 ioctl (STDIN_FILENO, TIOCCONS, &on); 1709 ioctl (STDIN_FILENO, TIOCCONS, &on);
1451#elif defined (SRIOCSREDIR) 1710#elif defined (SRIOCSREDIR)
1452 int fd; 1711 int fd;
1453 1712
1454 fd = open (CONSOLE, O_WRONLY, 0); 1713 fd = open (CONSOLE, O_WRONLY, 0);
1455 if (fd >= 0) 1714 if (fd >= 0)
1456 {
1457 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1715 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1458 close (fd); 1716 close (fd);
1459 } 1717#endif /* SRIOCSREDIR */
1460#endif /* SRIOCSREDIR */
1461
1462 } 1718 }
1463 1719
1464 /* reset signals and spin off the command interpreter */ 1720 /* reset signals and spin off the command interpreter */
1465 signal (SIGINT, SIG_DFL); 1721 signal (SIGINT, SIG_DFL);
1466 signal (SIGQUIT, SIG_DFL); 1722 signal (SIGQUIT, SIG_DFL);
1467 signal (SIGCHLD, SIG_DFL); 1723 signal (SIGCHLD, SIG_DFL);
1724 signal (SIGHUP, SIG_DFL);
1725 signal (SIGPIPE, SIG_DFL);
1468 /* 1726 /*
1469 * mimick login's behavior by disabling the job control signals 1727 * mimic login's behavior by disabling the job control signals
1470 * a shell that wants them can turn them back on 1728 * a shell that wants them can turn them back on
1471 */ 1729 */
1472#ifdef SIGTSTP 1730#ifdef SIGTSTP
1473 signal (SIGTSTP, SIG_IGN); 1731 signal (SIGTSTP, SIG_IGN);
1474 signal (SIGTTIN, SIG_IGN); 1732 signal (SIGTTIN, SIG_IGN);
1475 signal (SIGTTOU, SIG_IGN); 1733 signal (SIGTTOU, SIG_IGN);
1476#endif /* SIGTSTP */ 1734#endif /* SIGTSTP */
1477 1735
1478 /* set window size */
1479 struct winsize ws;
1480
1481 ws.ws_col = TermWin.ncol;
1482 ws.ws_row = TermWin.nrow;
1483 ws.ws_xpixel = ws.ws_ypixel = 0;
1484 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws);
1485
1486 // unblock signals (signals are blocked by iom.C
1487 sigset_t ss;
1488 sigemptyset (&ss);
1489 sigprocmask (SIG_SETMASK, &ss, 0);
1490
1491#ifndef __QNX__
1492 /* command interpreter path */ 1736 /* command interpreter path */
1493 if (argv != NULL) 1737 if (argv)
1494 { 1738 {
1495# ifdef DEBUG_CMD 1739# ifdef DEBUG_CMD
1496 int i; 1740 int i;
1497 1741
1498 for (i = 0; argv[i]; i++) 1742 for (i = 0; argv[i]; i++)
… …
1502 execvp (argv[0], (char *const *)argv); 1746 execvp (argv[0], (char *const *)argv);
1503 /* no error message: STDERR is closed! */ 1747 /* no error message: STDERR is closed! */
1504 } 1748 }
1505 else 1749 else
1506 { 1750 {
1507 const char *argv0, *shell; 1751 const char *argv0, *shell;
1508 1752
1509 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1753 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1510 shell = "/bin/sh"; 1754 shell = "/bin/sh";
1511 1755
1512 argv0 = (const char *)rxvt_r_basename (shell); 1756 argv0 = rxvt_basename (shell);
1757
1513 if (Options & Opt_loginShell) 1758 if (option (Opt_loginShell))
1514 { 1759 {
1515 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char)); 1760 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1516 1761
1517 login[0] = '-'; 1762 login[0] = '-';
1518 STRCPY (&login[1], argv0); 1763 strcpy (&login[1], argv0);
1519 argv0 = login; 1764 argv0 = login;
1520 } 1765 }
1766
1521 execlp (shell, argv0, NULL); 1767 execlp (shell, argv0, (char *)0);
1522 /* no error message: STDERR is closed! */ 1768 /* no error message: STDERR is closed! */
1523 } 1769 }
1524 1770
1525#else /* __QNX__ uses qnxspawn () */
1526
1527 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1528 char *command = NULL, fullcommand[_MAX_PATH];
1529 char **arg_v, *arg_a[2] = { NULL, NULL };
1530
1531 if (argv != NULL)
1532 {
1533 if (access (argv[0], X_OK) == -1)
1534 {
1535 if (STRCHR (argv[0], '/') == NULL)
1536 {
1537 searchenv (argv[0], "PATH", fullcommand);
1538 if (fullcommand[0] != '\0')
1539 command = fullcommand;
1540 }
1541 if (access (command, X_OK) == -1)
1542 return -1;
1543 }
1544 else
1545 command = argv[0];
1546 arg_v = argv;
1547 }
1548 else
1549 {
1550 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1551 command = "/bin/sh";
1552
1553 arg_a[0] = my_basename (command);
1554 if (Options & Opt_loginShell)
1555 {
1556 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1557
1558 login[0] = '-';
1559 STRCPY (&login[1], arg_a[0]);
1560 arg_a[0] = login;
1561 }
1562 arg_v = arg_a;
1563 }
1564 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1565 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1566 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1567 command, arg_v, environ, iov_a, 0);
1568 if (login)
1569 free (login);
1570
1571 close (tty_fd);
1572 return cmd_fd;
1573
1574#endif
1575 return -1; 1771 return -1;
1576} 1772}
1577 1773
1578/* ------------------------------------------------------------------------- *
1579 * GET TTY CURRENT STATE *
1580 * ------------------------------------------------------------------------- */
1581/* rxvt_get_ttymode () */
1582/* EXTPROTO */
1583void
1584rxvt_get_ttymode (ttymode_t *tio, int erase)
1585{
1586#ifdef HAVE_TERMIOS_H
1587 /*
1588 * standard System V termios interface
1589 */
1590 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1591 {
1592 /* return error - use system defaults */
1593 tio->c_cc[VINTR] = CINTR;
1594 tio->c_cc[VQUIT] = CQUIT;
1595 tio->c_cc[VERASE] = CERASE;
1596 tio->c_cc[VKILL] = CKILL;
1597 tio->c_cc[VSTART] = CSTART;
1598 tio->c_cc[VSTOP] = CSTOP;
1599 tio->c_cc[VSUSP] = CSUSP;
1600# ifdef VDSUSP
1601
1602 tio->c_cc[VDSUSP] = CDSUSP;
1603# endif
1604# ifdef VREPRINT
1605
1606 tio->c_cc[VREPRINT] = CRPRNT;
1607# endif
1608# ifdef VDISCRD
1609
1610 tio->c_cc[VDISCRD] = CFLUSH;
1611# endif
1612# ifdef VWERSE
1613
1614 tio->c_cc[VWERSE] = CWERASE;
1615# endif
1616# ifdef VLNEXT
1617
1618 tio->c_cc[VLNEXT] = CLNEXT;
1619# endif
1620
1621 }
1622 tio->c_cc[VEOF] = CEOF;
1623 tio->c_cc[VEOL] = VDISABLE;
1624# ifdef VEOL2
1625
1626 tio->c_cc[VEOL2] = VDISABLE;
1627# endif
1628# ifdef VSWTC
1629
1630 tio->c_cc[VSWTC] = VDISABLE;
1631# endif
1632# ifdef VSWTCH
1633
1634 tio->c_cc[VSWTCH] = VDISABLE;
1635# endif
1636# if VMIN != VEOF
1637
1638 tio->c_cc[VMIN] = 1;
1639# endif
1640# if VTIME != VEOL
1641
1642 tio->c_cc[VTIME] = 0;
1643# endif
1644
1645 if (erase != -1)
1646 tio->c_cc[VERASE] = (char)erase;
1647
1648 /* input modes */
1649 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1650# ifdef IMAXBEL
1651 | IMAXBEL
1652# endif
1653 | IXON);
1654
1655 /* output modes */
1656 tio->c_oflag = (OPOST | ONLCR);
1657
1658 /* control modes */
1659 tio->c_cflag = (CS8 | CREAD);
1660
1661 /* line discipline modes */
1662 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1663# if defined (ECHOCTL) && defined (ECHOKE)
1664 | ECHOCTL | ECHOKE
1665# endif
1666 | ECHOE | ECHOK);
1667# else /* HAVE_TERMIOS_H */
1668
1669 /*
1670 * sgtty interface
1671 */
1672
1673 /* get parameters -- gtty */
1674 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1675 {
1676 tio->sg.sg_erase = CERASE; /* ^H */
1677 tio->sg.sg_kill = CKILL; /* ^U */
1678 }
1679 if (erase != -1)
1680 tio->sg.sg_erase = (char)erase;
1681
1682 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1683
1684 /* get special characters */
1685 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1686 {
1687 tio->tc.t_intrc = CINTR; /* ^C */
1688 tio->tc.t_quitc = CQUIT; /* ^\ */
1689 tio->tc.t_startc = CSTART; /* ^Q */
1690 tio->tc.t_stopc = CSTOP; /* ^S */
1691 tio->tc.t_eofc = CEOF; /* ^D */
1692 tio->tc.t_brkc = -1;
1693 }
1694 /* get local special chars */
1695 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1696 {
1697 tio->lc.t_suspc = CSUSP; /* ^Z */
1698 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1699 tio->lc.t_rprntc = CRPRNT; /* ^R */
1700 tio->lc.t_flushc = CFLUSH; /* ^O */
1701 tio->lc.t_werasc = CWERASE; /* ^W */
1702 tio->lc.t_lnextc = CLNEXT; /* ^V */
1703 }
1704 /* get line discipline */
1705 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1706# ifdef NTTYDISC
1707
1708 tio->line = NTTYDISC;
1709# endif /* NTTYDISC */
1710
1711 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1712#endif /* HAVE_TERMIOS_H */
1713
1714 /*
1715 * Debugging
1716 */
1717#ifdef DEBUG_TTYMODE
1718#ifdef HAVE_TERMIOS_H
1719 /* c_iflag bits */
1720 fprintf (stderr, "Input flags\n");
1721
1722 /* cpp token stringize doesn't work on all machines <sigh> */
1723# define FOO(flag,name) \
1724 if ((tio->c_iflag) & flag) \
1725 fprintf (stderr, "%s ", name)
1726
1727 /* c_iflag bits */
1728 FOO (IGNBRK, "IGNBRK");
1729 FOO (BRKINT, "BRKINT");
1730 FOO (IGNPAR, "IGNPAR");
1731 FOO (PARMRK, "PARMRK");
1732 FOO (INPCK, "INPCK");
1733 FOO (ISTRIP, "ISTRIP");
1734 FOO (INLCR, "INLCR");
1735 FOO (IGNCR, "IGNCR");
1736 FOO (ICRNL, "ICRNL");
1737 FOO (IXON, "IXON");
1738 FOO (IXOFF, "IXOFF");
1739# ifdef IUCLC
1740
1741 FOO (IUCLC, "IUCLC");
1742# endif
1743# ifdef IXANY
1744
1745 FOO (IXANY, "IXANY");
1746# endif
1747# ifdef IMAXBEL
1748
1749 FOO (IMAXBEL, "IMAXBEL");
1750# endif
1751
1752 fprintf (stderr, "\n");
1753
1754# undef FOO
1755# define FOO(entry, name) \
1756 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1757
1758 FOO (VINTR, "VINTR");
1759 FOO (VQUIT, "VQUIT");
1760 FOO (VERASE, "VERASE");
1761 FOO (VKILL, "VKILL");
1762 FOO (VEOF, "VEOF");
1763 FOO (VEOL, "VEOL");
1764# ifdef VEOL2
1765
1766 FOO (VEOL2, "VEOL2");
1767# endif
1768# ifdef VSWTC
1769
1770 FOO (VSWTC, "VSWTC");
1771# endif
1772# ifdef VSWTCH
1773
1774 FOO (VSWTCH, "VSWTCH");
1775# endif
1776
1777 FOO (VSTART, "VSTART");
1778 FOO (VSTOP, "VSTOP");
1779 FOO (VSUSP, "VSUSP");
1780# ifdef VDSUSP
1781
1782 FOO (VDSUSP, "VDSUSP");
1783# endif
1784# ifdef VREPRINT
1785
1786 FOO (VREPRINT, "VREPRINT");
1787# endif
1788# ifdef VDISCRD
1789
1790 FOO (VDISCRD, "VDISCRD");
1791# endif
1792# ifdef VWERSE
1793
1794 FOO (VWERSE, "VWERSE");
1795# endif
1796# ifdef VLNEXT
1797
1798 FOO (VLNEXT, "VLNEXT");
1799# endif
1800
1801 fprintf (stderr, "\n");
1802# undef FOO
1803# endif /* HAVE_TERMIOS_H */
1804#endif /* DEBUG_TTYMODE */
1805}
1806
1807/*----------------------- end-of-file (C source) -----------------------*/ 1774/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines