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

Diff Legend

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