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.57 by root, Mon Jun 21 22:24:07 2004 UTC vs.
Revision 1.153 by root, Wed Jan 25 02:42:06 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines