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.173 by root, Wed Jul 5 20:31:48 2006 UTC vs.
Revision 1.290 by sf-exg, Mon Jan 3 10:32:08 2011 UTC

… …
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-2006 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.
… …
33 34
34#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 37#include "rxvtutil.h"
37#include "init.h" 38#include "init.h"
39#include "keyboard.h"
38 40
39#include <limits> 41#include <limits>
40 42
41#include <csignal> 43#include <csignal>
42 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
147
43const char *const def_colorName[] = 148static const char *const def_colorName[] =
44 { 149 {
45 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
47 /* low-intensity colors */ 152 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 153 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 154 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 162# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 164# endif
60 /* high-intensity colors */ 165 /* high-intensity colors */
61# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
69 "rgb:00/00/ff", // 4/12: bright blue (Blue) 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "rgb:ff/ff/ff", // 7/15: bright white (White) 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 178
179#if !USE_256_COLORS
74 // 88 xterm colours 180 // 88 xterm colours
75 "rgb:00/00/00", 181 "rgb:00/00/00",
76 "rgb:00/00/8b", 182 "rgb:00/00/8b",
77 "rgb:00/00/cd", 183 "rgb:00/00/cd",
78 "rgb:00/00/ff", 184 "rgb:00/00/ff",
… …
142 "rgb:8b/8b/8b", 248 "rgb:8b/8b/8b",
143 "rgb:a2/a2/a2", 249 "rgb:a2/a2/a2",
144 "rgb:b9/b9/b9", 250 "rgb:b9/b9/b9",
145 "rgb:d0/d0/d0", 251 "rgb:d0/d0/d0",
146 "rgb:e7/e7/e7", 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",
471 "rgb:08/08/08",
472 "rgb:12/12/12",
473 "rgb:1c/1c/1c",
474 "rgb:26/26/26",
475 "rgb:30/30/30",
476 "rgb:3a/3a/3a",
477 "rgb:44/44/44",
478 "rgb:4e/4e/4e",
479 "rgb:58/58/58",
480 "rgb:62/62/62",
481 "rgb:6c/6c/6c",
482 "rgb:76/76/76",
483 "rgb:80/80/80",
484 "rgb:8a/8a/8a",
485 "rgb:94/94/94",
486 "rgb:9e/9e/9e",
487 "rgb:a8/a8/a8",
488 "rgb:b2/b2/b2",
489 "rgb:bc/bc/bc",
490 "rgb:c6/c6/c6",
491 "rgb:d0/d0/d0",
492 "rgb:da/da/da",
493 "rgb:e4/e4/e4",
494 "rgb:ee/ee/ee",
495#endif
147 496
148#ifndef NO_CURSORCOLOR 497#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 498 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 499 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 500#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 501 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 502 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 503 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 504#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 505 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 506 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 507 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 508 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 509#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 510#if ENABLE_FRILLS
162 NULL, // Color_underline 511 NULL, // Color_underline
163#endif 512#endif
164#ifdef OPTION_HC 513#ifdef OPTION_HC
165 NULL, 514 NULL,
515 NULL,
166#endif 516#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 517 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 519 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 520#endif
171#if TINTING 521#if ENABLE_TRANSPARENCY
172 NULL, 522 NULL,
173#endif 523#endif
174#if OFF_FOCUS_FADING 524#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 525 "rgb:00/00/00",
176#endif 526#endif
177 }; 527 };
178 528
179bool 529void
180rxvt_term::init_vars () 530rxvt_term::init_vars ()
181{ 531{
182 pix_colors = // 532 pix_colors = pix_colors_focused;
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif
187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 533
192 MEvent.time = CurrentTime; 534 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 535 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 536 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 537 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 538 ncol = 80;
198 nrow = 24; 539 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
202 saveLines = SAVELINES; 544 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS;
204 545
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
207 547
208 oldcursor.row = oldcursor.col = -1; 548 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50;
212 bgPixmap.pixmap = None;
213#endif
214 549
215 last_bot = last_state = -1; 550 set_option (Opt_scrollBar);
216 551 set_option (Opt_scrollTtyOutput);
217 return true; 552 set_option (Opt_jumpScroll);
218} 553 set_option (Opt_skipScroll);
219 554 set_option (Opt_secondaryScreen);
220void 555 set_option (Opt_secondaryScroll);
221rxvt_term::init_secondary () 556 set_option (Opt_pastableTabs);
222{ 557 set_option (Opt_intensityStyles);
223 int i; 558 set_option (Opt_iso14755);
224 559 set_option (Opt_iso14755_52);
225 /* 560 set_option (Opt_buffered);
226 * Close all unused file descriptors
227 * We don't want them, we don't need them.
228 */
229 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 {
231 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO);
233 }
234 else if (i > STDIN_FILENO)
235 {
236 dup2 (i, STDIN_FILENO);
237 close (i);
238 }
239
240 dup2 (STDERR_FILENO, STDOUT_FILENO);
241
242#if 0 // schmorp sayz closing filies is murder
243 for (i = STDERR_FILENO + 1; i < num_fds; i++)
244 {
245#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
246 if (i == 4 || i == 7)
247 continue;
248#endif
249 close (i);
250 }
251#endif
252} 561}
253 562
254/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
255const char ** 564const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
257{ 566{
258 int i, r_argc; 567 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 568 const char **cmd_argv, **r_argv;
261 569
262 /* 570 /*
263 * Look for -e option. Find => split and make cmd_argv[] of command args 571 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 572 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 573 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e")) 574 if (!strcmp (argv[r_argc], "-e"))
267 break; 575 break;
268 576
577 if (r_argc == argc)
578 cmd_argv = NULL;
579 else if (!argv[r_argc + 1])
580 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
581 else
582 {
583 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
584
585 for (i = 0; i < argc - r_argc - 1; i++)
586 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
587
588 cmd_argv[i] = NULL;
589 }
590
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 591 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 592
271 for (i = 0; i < r_argc; i++) 593 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 594 r_argv[i] = (const char *)argv[i];
273 595
274 r_argv[i] = NULL; 596 r_argv[i] = NULL;
275 597
276 if (r_argc == argc)
277 cmd_argv = NULL;
278 else
279 {
280 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
281
282 for (i = 0; i < argc - r_argc - 1; i++)
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284
285 cmd_argv[i] = NULL;
286 }
287
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 598 rs[Rs_name] = rxvt_basename (argv[0]);
289 599
290 /* 600 /*
291 * Open display, get options/resources and create the window 601 * Open display, get options/resources and create the window
292 */ 602 */
293 603
… …
295 rs[Rs_display_name] = ":0"; 605 rs[Rs_display_name] = ":0";
296 606
297 get_options (r_argc, r_argv); 607 get_options (r_argc, r_argv);
298 608
299 if (!(display = displays.get (rs[Rs_display_name]))) 609 if (!(display = displays.get (rs[Rs_display_name])))
610 {
611 free (r_argv);
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 612 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
613 }
301 614
302 // using a local pointer decreases code size a lot 615 // using a local pointer decreases code size a lot
303 xa = display->xa; 616 xa = display->xa;
304 617
305 set (display); 618 set (display);
… …
313 free (r_argv); 626 free (r_argv);
314 627
315 for (int i = NUM_RESOURCES; i--; ) 628 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 629 if (rs [i] == resval_undef)
317 rs [i] = 0; 630 rs [i] = 0;
631
632#ifdef HAVE_AFTERIMAGE
633 set_application_name ((char *)rs[Rs_name]);
634 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif
636
637#ifdef HAVE_PIXBUF
638 g_type_init ();
639#endif
318 640
319#if ENABLE_PERL 641#if ENABLE_PERL
320 if (!rs[Rs_perl_ext_1]) 642 if (!rs[Rs_perl_ext_1])
321 rs[Rs_perl_ext_1] = "default"; 643 rs[Rs_perl_ext_1] = "default";
322 644
… …
333 * set any defaults not already set 655 * set any defaults not already set
334 */ 656 */
335 if (cmd_argv && cmd_argv[0]) 657 if (cmd_argv && cmd_argv[0])
336 { 658 {
337 if (!rs[Rs_title]) 659 if (!rs[Rs_title])
338 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 660 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
661
339 if (!rs[Rs_iconName]) 662 if (!rs[Rs_iconName])
340 rs[Rs_iconName] = rs[Rs_title]; 663 rs[Rs_iconName] = rs[Rs_title];
341 } 664 }
342 else 665 else
343 { 666 {
344 if (!rs[Rs_title]) 667 if (!rs[Rs_title])
345 rs[Rs_title] = rs[Rs_name]; 668 rs[Rs_title] = rs[Rs_name];
669
346 if (!rs[Rs_iconName]) 670 if (!rs[Rs_iconName])
347 rs[Rs_iconName] = rs[Rs_name]; 671 rs[Rs_iconName] = rs[Rs_name];
348 } 672 }
349 673
350 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 674 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
357 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 681 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
358 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 682 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
359 683
360 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 684 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
361 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 685 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
686
687 if (rs[Rs_letterSpace])
688 letterSpace = atoi (rs[Rs_letterSpace]);
362#endif 689#endif
363 690
364#ifdef POINTER_BLANK 691#ifdef POINTER_BLANK
365 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 692 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
366 pointerBlankDelay = i; 693 pointerBlankDelay = i;
… …
370 697
371 /* no point having a scrollbar without having any scrollback! */ 698 /* no point having a scrollbar without having any scrollback! */
372 if (!saveLines) 699 if (!saveLines)
373 set_option (Opt_scrollBar, 0); 700 set_option (Opt_scrollBar, 0);
374 701
375#ifdef PRINTPIPE
376 if (!rs[Rs_print_pipe])
377 rs[Rs_print_pipe] = PRINTPIPE;
378#endif
379
380 if (!rs[Rs_cutchars]) 702 if (!rs[Rs_cutchars])
381 rs[Rs_cutchars] = CUTCHARS; 703 rs[Rs_cutchars] = CUTCHARS;
382 704
383#ifndef NO_BACKSPACE_KEY 705#ifndef NO_BACKSPACE_KEY
384 if (!rs[Rs_backspace_key]) 706 if (!rs[Rs_backspace_key])
385# ifdef DEFAULT_BACKSPACE 707# ifdef DEFAULT_BACKSPACE
386 key_backspace = DEFAULT_BACKSPACE; 708 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
387# else 709# else
388 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 710 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
389# endif 711# endif
390 else
391 {
392 val = strdup (rs[Rs_backspace_key]);
393 rxvt_Str_trim (val);
394 rxvt_Str_escaped (val);
395 key_backspace = val;
396 }
397#endif 712#endif
398 713
399#ifndef NO_DELETE_KEY 714#ifndef NO_DELETE_KEY
400 if (!rs[Rs_delete_key]) 715 if (!rs[Rs_delete_key])
401# ifdef DEFAULT_DELETE 716# ifdef DEFAULT_DELETE
402 key_delete = DEFAULT_DELETE; 717 rs[Rs_delete_key] = DEFAULT_DELETE;
403# else 718# else
404 key_delete = "\033[3~"; 719 rs[Rs_delete_key] = "\033[3~";
405# endif 720# endif
406 else
407 {
408 val = strdup (rs[Rs_delete_key]);
409 rxvt_Str_trim (val);
410 rxvt_Str_escaped (val);
411 key_delete = val;
412 }
413#endif 721#endif
414 if (rs[Rs_answerbackstring])
415 {
416 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
417 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
418 }
419 722
420#ifdef HAVE_SCROLLBARS 723 scrollBar.setup (this);
421 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
422#endif
423 724
424#ifdef XTERM_REVERSE_VIDEO 725#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 726 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 727 if (option (Opt_reverseVideo))
427 { 728 {
428 if (!rs[Rs_color + Color_fg]) 729 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 730 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 731
431 if (!rs[Rs_color + Color_bg]) 732 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 738 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 739 rs[Rs_color + i] = def_colorName[i];
439 740
440#ifndef XTERM_REVERSE_VIDEO 741#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 742 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 743 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 744 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 745#endif
445 746
446 /* convenient aliases for setting fg/bg to colors */ 747 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 748 color_aliases (Color_fg);
448 color_aliases (Color_bg); 749 color_aliases (Color_bg);
449#ifndef NO_CURSORCOLOR 750#ifndef NO_CURSORCOLOR
450 color_aliases (Color_cursor); 751 color_aliases (Color_cursor);
451 color_aliases (Color_cursor2); 752 color_aliases (Color_cursor2);
452#endif /* NO_CURSORCOLOR */ 753#endif /* NO_CURSORCOLOR */
453 color_aliases (Color_pointer_fg); 754 color_aliases (Color_pointer_fg);
454 color_aliases (Color_pointer_bg); 755 color_aliases (Color_pointer_bg);
455 color_aliases (Color_border); 756 color_aliases (Color_border);
456#ifndef NO_BOLD_UNDERLINE_REVERSE 757#ifndef NO_BOLD_UNDERLINE_REVERSE
457 color_aliases (Color_BD); 758 color_aliases (Color_BD);
458 color_aliases (Color_UL); 759 color_aliases (Color_UL);
459 color_aliases (Color_RV); 760 color_aliases (Color_RV);
460#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 761#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
461 762
462 if (!rs[Rs_color + Color_border]) 763 if (!rs[Rs_color + Color_border])
463 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 764 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
464 765
465 return cmd_argv; 766 return cmd_argv;
767}
768
769/*----------------------------------------------------------------------*/
770void
771rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
772{
773 this->envv = envv;
774
775 SET_R (this);
776 set_locale ("");
777 set_environ (envv); // a few things in X do not call setlocale :(
778
779 init_vars ();
780
781 const char **cmd_argv = init_resources (argc, argv);
782
783#ifdef KEYSYM_RESOURCE
784 keyboard->register_done ();
785#endif
786
787 if (const char *path = rs[Rs_chdir])
788 if (*path) // ignored if empty
789 {
790 if (*path != '/')
791 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
792
793 if (chdir (path))
794 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
795 }
796
797 if (option (Opt_scrollBar))
798 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
799
800 pty = ptytty::create ();
801
802 create_windows (argc, argv);
803
804 init_xlocale ();
805
806 scr_poweron (); // initialize screen
807
808#if 0
809 XSynchronize (dpy, True);
810#endif
811
812 if (option (Opt_scrollBar))
813 scrollBar.resize (); /* create and map scrollbar */
814#ifdef HAVE_BG_PIXMAP
815 {
816 bgPixmap.set_target (this);
817 bgPixmap.invalidate ();
818
819#ifdef ENABLE_TRANSPARENCY
820 if (option (Opt_transparent))
821 {
822 bgPixmap.set_transparent ();
823
824 if (rs [Rs_blurradius])
825 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
826
827 if (ISSET_PIXCOLOR (Color_tint))
828 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
829
830 if (rs [Rs_shade])
831 bgPixmap.set_shade (rs [Rs_shade]);
832
833 bgPixmap.set_root_pixmap ();
834 XSelectInput (dpy, display->root, PropertyChangeMask);
835 rootwin_ev.start (display, display->root);
836 }
837#endif
838
839#ifdef BG_IMAGE_FROM_FILE
840 if (rs[Rs_backgroundPixmap])
841 {
842 const char *p = rs[Rs_backgroundPixmap];
843
844 if ((p = strchr (p, ';')) != 0)
845 {
846 p++;
847 bgPixmap.set_geometry (p);
848 }
849 else
850 bgPixmap.set_defaultGeometry ();
851
852 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
853 if (!bgPixmap.window_position_sensitive ())
854 update_background ();
855 }
856#endif
857 }
858#endif
859
860#if ENABLE_PERL
861 rootwin_ev.start (display, display->root);
862#endif
863
864 set_colorfgbg ();
865
866 init_command (cmd_argv);
867
868 free (cmd_argv);
869
870 if (pty->pty >= 0)
871 pty_ev.start (pty->pty, ev::READ);
872
873 HOOK_INVOKE ((this, HOOK_START, DT_END));
874
875#if ENABLE_XEMBED
876 if (rs[Rs_embed])
877 {
878 long info[2] = { 0, XEMBED_MAPPED };
879
880 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
881 32, PropModeReplace, (unsigned char *)&info, 2);
882 }
883#endif
884
885 XMapWindow (dpy, vt);
886 XMapWindow (dpy, parent[0]);
887
888 refresh_check ();
466} 889}
467 890
468/*----------------------------------------------------------------------*/ 891/*----------------------------------------------------------------------*/
469void 892void
470rxvt_term::init_env () 893rxvt_term::init_env ()
471{ 894{
472 int i;
473 unsigned int u;
474 char *val; 895 char *val;
475 896
476#ifdef DISPLAY_IS_IP 897#ifdef DISPLAY_IS_IP
477 /* Fixup display_name for export over pty to any interested terminal 898 /* Fixup display_name for export over pty to any interested terminal
478 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 899 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
486 */ 907 */
487 val = rxvt_network_display (rs[Rs_display_name]); 908 val = rxvt_network_display (rs[Rs_display_name]);
488 rs[Rs_display_name] = (const char *)val; 909 rs[Rs_display_name] = (const char *)val;
489 910
490 if (val == NULL) 911 if (val == NULL)
491#endif /* DISPLAY_IS_IP */ 912#endif /* DISPLAY_IS_IP */
492 val = XDisplayString (dpy); 913 val = XDisplayString (dpy);
493 914
494 if (rs[Rs_display_name] == NULL) 915 if (rs[Rs_display_name] == NULL)
495 rs[Rs_display_name] = val; /* use broken `:0' value */ 916 rs[Rs_display_name] = val; /* use broken `:0' value */
496 917
497 i = strlen (val);
498 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 918 env_display = (char *)rxvt_malloc (strlen (val) + 9);
499 919
500 sprintf (env_display, "DISPLAY=%s", val); 920 sprintf (env_display, "DISPLAY=%s", val);
501 921
502 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 922 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
503 923
… …
524 else 944 else
525 putenv ("COLORTERM=" COLORTERMENVFULL); 945 putenv ("COLORTERM=" COLORTERMENVFULL);
526 946
527 if (rs[Rs_term_name] != NULL) 947 if (rs[Rs_term_name] != NULL)
528 { 948 {
529 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 949 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
530 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 950 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
531 putenv (env_term); 951 putenv (env_term);
532 } 952 }
533 else 953 else
534 putenv ("TERM=" TERMENV); 954 putenv ("TERM=" TERMENV);
… …
536#ifdef HAVE_UNSETENV 956#ifdef HAVE_UNSETENV
537 /* avoid passing old settings and confusing term size */ 957 /* avoid passing old settings and confusing term size */
538 unsetenv ("LINES"); 958 unsetenv ("LINES");
539 unsetenv ("COLUMNS"); 959 unsetenv ("COLUMNS");
540 unsetenv ("TERMCAP"); /* terminfo should be okay */ 960 unsetenv ("TERMCAP"); /* terminfo should be okay */
541#endif /* HAVE_UNSETENV */ 961#endif /* HAVE_UNSETENV */
542} 962}
543 963
544/*----------------------------------------------------------------------*/ 964/*----------------------------------------------------------------------*/
545/* 965/*
546 * This is more or less stolen straight from XFree86 xterm. 966 * This is more or less stolen straight from XFree86 xterm.
… …
567 987
568 this->locale = "C"; 988 this->locale = "C";
569 } 989 }
570 990
571 991
572 this->locale = rxvt_strdup (this->locale); 992 this->locale = strdup (this->locale);
573 SET_LOCALE (this->locale); 993 SET_LOCALE (this->locale);
574 mbstate.reset (); 994 mbstate.reset ();
575#endif 995#endif
576 996
577#if HAVE_NL_LANGINFO 997#if HAVE_NL_LANGINFO
… …
621 * Initialize the command connection. 1041 * Initialize the command connection.
622 * This should be called after the X server connection is established. 1042 * This should be called after the X server connection is established.
623 */ 1043 */
624 1044
625#ifdef META8_OPTION 1045#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 1046 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 1047#endif
628 1048
629 get_ourmods (); 1049 get_ourmods ();
630 1050
631 if (!OPTION (Opt_scrollTtyOutput)) 1051 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 1052 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 1053 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 1054 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 1055 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 1056 priv_modes |= PrivMode_smoothScroll;
637 1057
638#ifndef NO_BACKSPACE_KEY 1058#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 1059 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 1060 priv_modes |= PrivMode_HaveBackSpace;
641#endif 1061#endif
642 1062
643 /* add value for scrollBar */ 1063 /* add value for scrollBar */
644 if (scrollBar.state) 1064 if (scrollBar.state)
… …
650 run_command (argv); 1070 run_command (argv);
651} 1071}
652 1072
653/*----------------------------------------------------------------------*/ 1073/*----------------------------------------------------------------------*/
654void 1074void
655rxvt_term::Get_Colours () 1075rxvt_term::get_colours ()
656{ 1076{
657 int i; 1077 int i;
658 1078
659#ifdef OFF_FOCUS_FADING 1079#ifdef OFF_FOCUS_FADING
660 pix_colors = pix_colors_focused; 1080 pix_colors = pix_colors_focused;
661#endif 1081#endif
662 1082
663 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1083 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
664 { 1084 {
665 const char *name = rs[Rs_color + i]; 1085 const char *name = rs[Rs_color + i];
666 1086
667 if (!name) 1087 if (!name)
… …
670 rxvt_color xcol; 1090 rxvt_color xcol;
671 1091
672 if (!set_color (xcol, name)) 1092 if (!set_color (xcol, name))
673 { 1093 {
674#ifndef XTERM_REVERSE_VIDEO 1094#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 1095 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 1096 name = def_colorName [1 - i];
677 else 1097 else
678#endif 1098#endif
679 name = def_colorName [i]; 1099 name = def_colorName [i];
680 1100
… …
720 * get scrollBar shadow colors 1140 * get scrollBar shadow colors
721 * 1141 *
722 * The calculations of topShadow/bottomShadow values are adapted 1142 * The calculations of topShadow/bottomShadow values are adapted
723 * from the fvwm window manager. 1143 * from the fvwm window manager.
724 */ 1144 */
725#ifdef KEEP_SCROLLCOLOR 1145#ifdef RXVT_SCROLLBAR
726 if (depth <= 2) 1146 if (depth <= 2)
727 { 1147 {
728 /* Monochrome */ 1148 /* Monochrome */
729 alias_color (Color_scroll, Color_fg); 1149 alias_color (Color_scroll, Color_fg);
730 alias_color (Color_topShadow, Color_bg); 1150 alias_color (Color_topShadow, Color_bg);
… …
745 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1165 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
746 cscroll.a) 1166 cscroll.a)
747 )) 1167 ))
748 alias_color (Color_topShadow, Color_White); 1168 alias_color (Color_topShadow, Color_White);
749 } 1169 }
750#endif /* KEEP_SCROLLCOLOR */ 1170#endif
751 1171
752#ifdef OFF_FOCUS_FADING 1172#ifdef OFF_FOCUS_FADING
753 if (rs[Rs_fade])
754 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1173 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
755 { 1174 update_fade_color (i);
756 rgba c;
757 pix_colors [Color_fade].get (c);
758 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
759 }
760#endif 1175#endif
761} 1176}
762 1177
763/*----------------------------------------------------------------------*/ 1178/*----------------------------------------------------------------------*/
764/* color aliases, fg/bg bright-bold */ 1179/* color aliases, fg/bg bright-bold */
… …
768 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1183 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
769 { 1184 {
770 int i = atoi (rs[Rs_color + idx]); 1185 int i = atoi (rs[Rs_color + idx]);
771 1186
772 if (i >= 8 && i <= 15) 1187 if (i >= 8 && i <= 15)
773 { /* bright colors */ 1188 /* bright colors */
774 i -= 8;
775 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1189 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
776 return; 1190 else if (i >= 0 && i <= 7)
777 } 1191 /* normal colors */
778
779 if (i >= 0 && i <= 7) /* normal colors */
780 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1192 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
781 } 1193 }
782} 1194}
783 1195
784/*----------------------------------------------------------------------*/ 1196/*----------------------------------------------------------------------*/
… …
868 1280
869 if (i) 1281 if (i)
870 ModMetaMask = modmasks[i - 1]; 1282 ModMetaMask = modmasks[i - 1];
871} 1283}
872 1284
1285void
1286rxvt_term::set_icon (const char *file)
1287{
1288#ifdef HAVE_AFTERIMAGE
1289 init_asv ();
1290
1291 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1292 if (!im)
1293 {
1294 rxvt_warn ("Loading image icon failed, continuing without.\n");
1295 return;
1296 }
1297
1298 unsigned int w = im->width;
1299 unsigned int h = im->height;
1300
1301 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1302 {
1303 rxvt_warn ("Icon image too big, continuing without.\n");
1304 destroy_asimage (&im);
1305 return;
1306 }
1307
1308 ASImage *result = scale_asimage (asv, im,
1309 w, h, ASA_ARGB32,
1310 100, ASIMAGE_QUALITY_DEFAULT);
1311 destroy_asimage (&im);
1312
1313 if (!result)
1314 {
1315 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1316 return;
1317 }
1318
1319 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1320 if (buffer)
1321 {
1322 ARGB32 *asbuf = result->alt.argb32;
1323 buffer [0] = w;
1324 buffer [1] = h;
1325
1326 for (unsigned int i = 0; i < w * h; ++i)
1327 buffer [i + 2] = asbuf [i];
1328
1329 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1330 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1331 free (buffer);
1332 }
1333 else
1334 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1335
1336 destroy_asimage (&result);
1337#endif
1338
1339#ifdef HAVE_PIXBUF
1340 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1341 if (!pixbuf)
1342 {
1343 rxvt_warn ("Loading image icon failed, continuing without.\n");
1344 return;
1345 }
1346
1347 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1348 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1349
1350 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1351 {
1352 rxvt_warn ("Icon image too big, continuing without.\n");
1353 g_object_unref (pixbuf);
1354 return;
1355 }
1356
1357 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1358 {
1359 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1360 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1361 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1362
1363 buffer [0] = w;
1364 buffer [1] = h;
1365 for (int i = 0; i < h; i++)
1366 {
1367 for (int j = 0; j < w; j++)
1368 {
1369 unsigned char *pixel = row + j * channels;
1370 long value;
1371
1372 if (channels == 4)
1373 value = pixel[3];
1374 else
1375 value = (unsigned char)0x00ff;
1376
1377 value = (value << 8) + pixel[0];
1378 value = (value << 8) + pixel[1];
1379 value = (value << 8) + pixel[2];
1380 buffer[(i * w + j) + 2] = value;
1381 }
1382
1383 row += rowstride;
1384 }
1385
1386 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1387 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1388 free (buffer);
1389 }
1390 else
1391 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1392
1393 g_object_unref (pixbuf);
1394#endif
1395}
1396
873/*----------------------------------------------------------------------*/ 1397/*----------------------------------------------------------------------*/
874/* rxvt_Create_Windows () - Open and map the window */ 1398/* rxvt_Create_Windows () - Open and map the window */
875void 1399void
876rxvt_term::create_windows (int argc, const char *const *argv) 1400rxvt_term::create_windows (int argc, const char *const *argv)
877{ 1401{
878 XClassHint classHint; 1402 XClassHint classHint;
879 XWMHints wmHint; 1403 XWMHints wmHint;
880#if ENABLE_FRILLS 1404#if ENABLE_FRILLS
881 MWMHints mwmhints; 1405 MWMHints mwmhints = { };
882#endif 1406#endif
883 XGCValues gcvalue; 1407 XGCValues gcvalue;
884 XSetWindowAttributes attributes; 1408 XSetWindowAttributes attributes;
885 Window top, parent; 1409 Window top, parent;
886 1410
887 dLocal (Display *, dpy); 1411 dLocal (Display *, dpy);
888 1412
889 /* grab colors before netscape does */ 1413 /* grab colors before netscape does */
890 Get_Colours (); 1414 get_colours ();
891 1415
892 if (!set_fonts ()) 1416 if (!set_fonts ())
893 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1417 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
894 1418
895 parent = display->root; 1419 parent = display->root;
896 1420
897 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1421 attributes.override_redirect = !!option (Opt_override_redirect);
898 1422
899#if ENABLE_FRILLS 1423#if ENABLE_FRILLS
900 if (OPTION (Opt_borderLess)) 1424 if (option (Opt_borderLess))
901 { 1425 {
902 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1426 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
903 { 1427 {
904 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1428 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
905 attributes.override_redirect = true; 1429 attributes.override_redirect = true;
906 mwmhints.flags = 0;
907 } 1430 }
908 else 1431 else
909 { 1432 {
910 mwmhints.flags = MWM_HINTS_DECORATIONS; 1433 mwmhints.flags = MWM_HINTS_DECORATIONS;
911 mwmhints.decorations = 0;
912 } 1434 }
913 } 1435 }
914 else
915 mwmhints.flags = 0;
916#endif 1436#endif
917 1437
918#if ENABLE_XEMBED 1438#if ENABLE_XEMBED
919 if (rs[Rs_embed]) 1439 if (rs[Rs_embed])
920 { 1440 {
… …
947 this->parent[0] = top; 1467 this->parent[0] = top;
948 1468
949 old_width = szHint.width; 1469 old_width = szHint.width;
950 old_height = szHint.height; 1470 old_height = szHint.height;
951 1471
952 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1472 set_title (rs [Rs_title]);
953 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1473 set_icon_name (rs [Rs_iconName]);
954 1474
955 classHint.res_name = (char *)rs[Rs_name]; 1475 classHint.res_name = (char *)rs[Rs_name];
956 classHint.res_class = (char *)RESCLASS; 1476 classHint.res_class = (char *)RESCLASS;
957 1477
958 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1478 wmHint.flags = InputHint | StateHint | WindowGroupHint;
959 wmHint.input = True; 1479 wmHint.input = True;
960 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1480 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
961 wmHint.window_group = top; 1481 wmHint.window_group = top;
962 1482
963 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1483 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
964 &szHint, &wmHint, &classHint); 1484 &szHint, &wmHint, &classHint);
1485#if ENABLE_EWMH
1486 /*
1487 * set up icon hint
1488 * rs [Rs_iconfile] is path to icon
1489 */
1490
1491 if (rs [Rs_iconfile])
1492 {
1493 set_icon (rs [Rs_iconfile]);
1494 }
1495#endif
965 1496
966#if ENABLE_FRILLS 1497#if ENABLE_FRILLS
967 if (mwmhints.flags) 1498 if (mwmhints.flags)
968 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1499 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
969 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1500 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
974#if ENABLE_EWMH 1505#if ENABLE_EWMH
975 xa[XA_NET_WM_PING], 1506 xa[XA_NET_WM_PING],
976#endif 1507#endif
977 }; 1508 };
978 1509
979 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1510 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols));
980 1511
981#if ENABLE_FRILLS 1512#if ENABLE_FRILLS
982 if (rs[Rs_transient_for]) 1513 if (rs[Rs_transient_for])
983 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1514 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
984#endif 1515#endif
… …
1003 1534
1004 termwin_ev.start (display, top); 1535 termwin_ev.start (display, top);
1005 1536
1006 /* vt cursor: Black-on-White is standard, but this is more popular */ 1537 /* vt cursor: Black-on-White is standard, but this is more popular */
1007 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1538 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1008
1009#ifdef HAVE_SCROLLBARS
1010 /* cursor scrollBar: Black-on-White */
1011 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1012#endif
1013 1539
1014 /* the vt window */ 1540 /* the vt window */
1015 vt = XCreateSimpleWindow (dpy, top, 1541 vt = XCreateSimpleWindow (dpy, top,
1016 window_vt_x, window_vt_y, 1542 window_vt_x, window_vt_y,
1017 width, height, 1543 width, height,
… …
1022 attributes.bit_gravity = NorthWestGravity; 1548 attributes.bit_gravity = NorthWestGravity;
1023 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1549 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1024 1550
1025 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1551 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1026 1552
1027 if (OPTION (Opt_pointerBlank)) 1553 if (option (Opt_pointerBlank))
1028 vt_emask |= PointerMotionMask; 1554 vt_emask |= PointerMotionMask;
1029 else 1555 else
1030 vt_emask |= Button1MotionMask | Button3MotionMask; 1556 vt_emask |= Button1MotionMask | Button3MotionMask;
1031 1557
1032 vt_select_input (); 1558 vt_select_input ();
1033 1559
1034 vt_ev.start (display, vt); 1560 vt_ev.start (display, vt);
1035
1036#ifdef XPM_BACKGROUND
1037 if (rs[Rs_backgroundPixmap] != NULL
1038 && !OPTION (Opt_transparent))
1039 {
1040 const char *p = rs[Rs_backgroundPixmap];
1041
1042 if ((p = strchr (p, ';')) != NULL)
1043 {
1044 p++;
1045 scale_pixmap (p);
1046 }
1047
1048 set_bgPixmap (rs[Rs_backgroundPixmap]);
1049 scr_touch (true);
1050 }
1051#endif
1052 1561
1053 /* graphics context for the vt window */ 1562 /* graphics context for the vt window */
1054 gcvalue.foreground = pix_colors[Color_fg]; 1563 gcvalue.foreground = pix_colors[Color_fg];
1055 gcvalue.background = pix_colors[Color_bg]; 1564 gcvalue.background = pix_colors[Color_bg];
1056 gcvalue.graphics_exposures = 0; 1565 gcvalue.graphics_exposures = 0;
… …
1059 GCForeground | GCBackground | GCGraphicsExposures, 1568 GCForeground | GCBackground | GCGraphicsExposures,
1060 &gcvalue); 1569 &gcvalue);
1061 1570
1062 drawable = new rxvt_drawable (this, vt); 1571 drawable = new rxvt_drawable (this, vt);
1063 1572
1064#ifdef RXVT_SCROLLBAR
1065 gcvalue.foreground = pix_colors[Color_topShadow];
1066 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1067 gcvalue.foreground = pix_colors[Color_bottomShadow];
1068 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1069 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1070 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1071#endif
1072
1073#ifdef OFF_FOCUS_FADING 1573#ifdef OFF_FOCUS_FADING
1074 // initially we are in unfocused state 1574 // initially we are in unfocused state
1075 if (rs[Rs_fade]) 1575 if (rs[Rs_fade])
1076 pix_colors = pix_colors_unfocused; 1576 pix_colors = pix_colors_unfocused;
1077#endif 1577#endif
1078 1578
1079 pointer_unblank (); 1579 pointer_unblank ();
1080 scr_recolour (); 1580 scr_recolour ();
1081}
1082
1083/* ------------------------------------------------------------------------- *
1084 * GET TTY CURRENT STATE *
1085 * ------------------------------------------------------------------------- */
1086void
1087rxvt_get_ttymode (ttymode_t *tio, int erase)
1088{
1089#ifdef HAVE_TERMIOS_H
1090 /*
1091 * standard System V termios interface
1092 */
1093 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1094 {
1095 // return error - use system defaults,
1096 // where possible, and zero elsewhere
1097 memset (tio, 0, sizeof (ttymode_t));
1098
1099 tio->c_cc[VINTR] = CINTR;
1100 tio->c_cc[VQUIT] = CQUIT;
1101 tio->c_cc[VERASE] = CERASE;
1102#ifdef VERASE2
1103 tio->c_cc[VERASE2] = CERASE2;
1104#endif
1105 tio->c_cc[VKILL] = CKILL;
1106 tio->c_cc[VSTART] = CSTART;
1107 tio->c_cc[VSTOP] = CSTOP;
1108 tio->c_cc[VSUSP] = CSUSP;
1109# ifdef VDSUSP
1110 tio->c_cc[VDSUSP] = CDSUSP;
1111# endif
1112# ifdef VREPRINT
1113 tio->c_cc[VREPRINT] = CRPRNT;
1114# endif
1115# ifdef VDISCRD
1116 tio->c_cc[VDISCRD] = CFLUSH;
1117# endif
1118# ifdef VWERSE
1119 tio->c_cc[VWERSE] = CWERASE;
1120# endif
1121# ifdef VLNEXT
1122 tio->c_cc[VLNEXT] = CLNEXT;
1123# endif
1124 }
1125
1126 tio->c_cc[VEOF] = CEOF;
1127 tio->c_cc[VEOL] = VDISABLE;
1128# ifdef VEOL2
1129 tio->c_cc[VEOL2] = VDISABLE;
1130# endif
1131# ifdef VSWTC
1132 tio->c_cc[VSWTC] = VDISABLE;
1133# endif
1134# ifdef VSWTCH
1135 tio->c_cc[VSWTCH] = VDISABLE;
1136# endif
1137# if VMIN != VEOF
1138 tio->c_cc[VMIN] = 1;
1139# endif
1140# if VTIME != VEOL
1141 tio->c_cc[VTIME] = 0;
1142# endif
1143
1144 if (erase != -1)
1145 tio->c_cc[VERASE] = (char)erase;
1146
1147 /* input modes */
1148 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1149# ifdef IMAXBEL
1150 | IMAXBEL
1151# endif
1152 | IXON);
1153
1154 /* output modes */
1155 tio->c_oflag = (OPOST | ONLCR);
1156
1157 /* control modes */
1158 tio->c_cflag = (CS8 | CREAD);
1159
1160 /* line discipline modes */
1161 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1162# if defined (ECHOCTL) && defined (ECHOKE)
1163 | ECHOCTL | ECHOKE
1164# endif
1165 | ECHOE | ECHOK);
1166# else /* HAVE_TERMIOS_H */
1167
1168 /*
1169 * sgtty interface
1170 */
1171
1172 /* get parameters -- gtty */
1173 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1174 {
1175 tio->sg.sg_erase = CERASE; /* ^H */
1176 tio->sg.sg_kill = CKILL; /* ^U */
1177 }
1178
1179 if (erase != -1)
1180 tio->sg.sg_erase = (char)erase;
1181
1182 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1183
1184 /* get special characters */
1185 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1186 {
1187 tio->tc.t_intrc = CINTR; /* ^C */
1188 tio->tc.t_quitc = CQUIT; /* ^\ */
1189 tio->tc.t_startc = CSTART; /* ^Q */
1190 tio->tc.t_stopc = CSTOP; /* ^S */
1191 tio->tc.t_eofc = CEOF; /* ^D */
1192 tio->tc.t_brkc = -1;
1193 }
1194
1195 /* get local special chars */
1196 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1197 {
1198 tio->lc.t_suspc = CSUSP; /* ^Z */
1199 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1200 tio->lc.t_rprntc = CRPRNT; /* ^R */
1201 tio->lc.t_flushc = CFLUSH; /* ^O */
1202 tio->lc.t_werasc = CWERASE; /* ^W */
1203 tio->lc.t_lnextc = CLNEXT; /* ^V */
1204 }
1205 /* get line discipline */
1206 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1207# ifdef NTTYDISC
1208 tio->line = NTTYDISC;
1209# endif /* NTTYDISC */
1210
1211 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1212#endif /* HAVE_TERMIOS_H */
1213
1214 /*
1215 * Debugging
1216 */
1217#ifdef DEBUG_TTYMODE
1218#ifdef HAVE_TERMIOS_H
1219 /* c_iflag bits */
1220 fprintf (stderr, "Input flags\n");
1221
1222 /* cpp token stringize doesn't work on all machines <sigh> */
1223# define FOO(flag,name) \
1224 if ((tio->c_iflag) & flag) \
1225 fprintf (stderr, "%s ", name)
1226
1227 /* c_iflag bits */
1228 FOO (IGNBRK, "IGNBRK");
1229 FOO (BRKINT, "BRKINT");
1230 FOO (IGNPAR, "IGNPAR");
1231 FOO (PARMRK, "PARMRK");
1232 FOO (INPCK, "INPCK");
1233 FOO (ISTRIP, "ISTRIP");
1234 FOO (INLCR, "INLCR");
1235 FOO (IGNCR, "IGNCR");
1236 FOO (ICRNL, "ICRNL");
1237 FOO (IXON, "IXON");
1238 FOO (IXOFF, "IXOFF");
1239# ifdef IUCLC
1240 FOO (IUCLC, "IUCLC");
1241# endif
1242# ifdef IXANY
1243 FOO (IXANY, "IXANY");
1244# endif
1245# ifdef IMAXBEL
1246 FOO (IMAXBEL, "IMAXBEL");
1247# endif
1248
1249 fprintf (stderr, "\n");
1250
1251# undef FOO
1252# define FOO(entry, name) \
1253 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1254
1255 FOO (VINTR, "VINTR");
1256 FOO (VQUIT, "VQUIT");
1257 FOO (VERASE, "VERASE");
1258 FOO (VKILL, "VKILL");
1259 FOO (VEOF, "VEOF");
1260 FOO (VEOL, "VEOL");
1261# ifdef VEOL2
1262 FOO (VEOL2, "VEOL2");
1263# endif
1264# ifdef VSWTC
1265 FOO (VSWTC, "VSWTC");
1266# endif
1267# ifdef VSWTCH
1268 FOO (VSWTCH, "VSWTCH");
1269# endif
1270 FOO (VSTART, "VSTART");
1271 FOO (VSTOP, "VSTOP");
1272 FOO (VSUSP, "VSUSP");
1273# ifdef VDSUSP
1274 FOO (VDSUSP, "VDSUSP");
1275# endif
1276# ifdef VREPRINT
1277 FOO (VREPRINT, "VREPRINT");
1278# endif
1279# ifdef VDISCRD
1280 FOO (VDISCRD, "VDISCRD");
1281# endif
1282# ifdef VWERSE
1283 FOO (VWERSE, "VWERSE");
1284# endif
1285# ifdef VLNEXT
1286 FOO (VLNEXT, "VLNEXT");
1287# endif
1288
1289 fprintf (stderr, "\n");
1290# undef FOO
1291# endif /* HAVE_TERMIOS_H */
1292#endif /* DEBUG_TTYMODE */
1293} 1581}
1294 1582
1295/*----------------------------------------------------------------------*/ 1583/*----------------------------------------------------------------------*/
1296/* 1584/*
1297 * Run the command in a subprocess and return a file descriptor for the 1585 * Run the command in a subprocess and return a file descriptor for the
… …
1318 else 1606 else
1319#endif 1607#endif
1320 if (!pty->get ()) 1608 if (!pty->get ())
1321 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1609 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1322 1610
1611 struct termios tio = def_tio;
1612
1613#ifndef NO_BACKSPACE_KEY
1614 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1615 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1616 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1617 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1618#endif
1619
1620 /* init terminal attributes */
1621 cfsetospeed (&tio, BAUDRATE);
1622 cfsetispeed (&tio, BAUDRATE);
1623 tcsetattr (pty->tty, TCSANOW, &tio);
1323 pty->set_utf8_mode (enc_utf8); 1624 pty->set_utf8_mode (enc_utf8);
1324 1625
1325 /* set initial window size */ 1626 /* set initial window size */
1326 tt_winch (); 1627 tt_winch ();
1327
1328 int er;
1329
1330#ifndef NO_BACKSPACE_KEY
1331 if (key_backspace[0] && !key_backspace[1])
1332 er = key_backspace[0];
1333 else if (strcmp (key_backspace, "DEC") == 0)
1334 er = '\177'; /* the initial state anyway */
1335 else
1336#endif
1337 er = -1;
1338
1339 rxvt_get_ttymode (&tio, er);
1340 1628
1341#if ENABLE_FRILLS 1629#if ENABLE_FRILLS
1342 if (rs[Rs_pty_fd]) 1630 if (rs[Rs_pty_fd])
1343 return; 1631 return;
1344#endif 1632#endif
… …
1375 } 1663 }
1376 1664
1377 _exit (EXIT_FAILURE); 1665 _exit (EXIT_FAILURE);
1378 1666
1379 default: 1667 default:
1380 if (!OPTION (Opt_utmpInhibit)) 1668 if (!option (Opt_utmpInhibit))
1381 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1669 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1382 1670
1383 pty->close_tty (); 1671 pty->close_tty ();
1384 1672
1385 child_ev.start (cmd_pid); 1673 child_ev.start (cmd_pid);
1386 1674
… …
1399int 1687int
1400rxvt_term::run_child (const char *const *argv) 1688rxvt_term::run_child (const char *const *argv)
1401{ 1689{
1402 char *login; 1690 char *login;
1403 1691
1404 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1405
1406 if (OPTION (Opt_console)) 1692 if (option (Opt_console))
1693 {
1407 { /* be virtual console, fail silently */ 1694 /* be virtual console, fail silently */
1408#ifdef TIOCCONS 1695#ifdef TIOCCONS
1409 unsigned int on = 1; 1696 unsigned int on = 1;
1410 1697
1411 ioctl (STDIN_FILENO, TIOCCONS, &on); 1698 ioctl (STDIN_FILENO, TIOCCONS, &on);
1412#elif defined (SRIOCSREDIR) 1699#elif defined (SRIOCSREDIR)
… …
1414 1701
1415 fd = open (CONSOLE, O_WRONLY, 0); 1702 fd = open (CONSOLE, O_WRONLY, 0);
1416 if (fd >= 0) 1703 if (fd >= 0)
1417 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1704 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1418 close (fd); 1705 close (fd);
1419#endif /* SRIOCSREDIR */ 1706#endif /* SRIOCSREDIR */
1420 } 1707 }
1421 1708
1422 /* reset signals and spin off the command interpreter */ 1709 /* reset signals and spin off the command interpreter */
1423 signal (SIGINT, SIG_DFL); 1710 signal (SIGINT, SIG_DFL);
1424 signal (SIGQUIT, SIG_DFL); 1711 signal (SIGQUIT, SIG_DFL);
1425 signal (SIGCHLD, SIG_DFL); 1712 signal (SIGCHLD, SIG_DFL);
1426 signal (SIGHUP, SIG_DFL); 1713 signal (SIGHUP, SIG_DFL);
1427 signal (SIGPIPE, SIG_DFL); 1714 signal (SIGPIPE, SIG_DFL);
1428 /* 1715 /*
1429 * mimick login's behavior by disabling the job control signals 1716 * mimic login's behavior by disabling the job control signals
1430 * a shell that wants them can turn them back on 1717 * a shell that wants them can turn them back on
1431 */ 1718 */
1432#ifdef SIGTSTP 1719#ifdef SIGTSTP
1433 signal (SIGTSTP, SIG_IGN); 1720 signal (SIGTSTP, SIG_IGN);
1434 signal (SIGTTIN, SIG_IGN); 1721 signal (SIGTTIN, SIG_IGN);
1435 signal (SIGTTOU, SIG_IGN); 1722 signal (SIGTTOU, SIG_IGN);
1436#endif /* SIGTSTP */ 1723#endif /* SIGTSTP */
1437
1438 // unblock signals (signals are blocked by iom.C
1439 sigset_t ss;
1440 sigemptyset (&ss);
1441 sigprocmask (SIG_SETMASK, &ss, 0);
1442 1724
1443 /* command interpreter path */ 1725 /* command interpreter path */
1444 if (argv != NULL) 1726 if (argv)
1445 { 1727 {
1446# ifdef DEBUG_CMD 1728# ifdef DEBUG_CMD
1447 int i; 1729 int i;
1448 1730
1449 for (i = 0; argv[i]; i++) 1731 for (i = 0; argv[i]; i++)
… …
1458 const char *argv0, *shell; 1740 const char *argv0, *shell;
1459 1741
1460 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1742 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1461 shell = "/bin/sh"; 1743 shell = "/bin/sh";
1462 1744
1463 argv0 = (const char *)rxvt_r_basename (shell); 1745 argv0 = rxvt_basename (shell);
1464 1746
1465 if (OPTION (Opt_loginShell)) 1747 if (option (Opt_loginShell))
1466 { 1748 {
1467 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1749 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1468 1750
1469 login[0] = '-'; 1751 login[0] = '-';
1470 strcpy (&login[1], argv0); 1752 strcpy (&login[1], argv0);
1471 argv0 = login; 1753 argv0 = login;
1472 } 1754 }
1473 1755
1474 execlp (shell, argv0, NULL); 1756 execlp (shell, argv0, (char *)0);
1475 /* no error message: STDERR is closed! */ 1757 /* no error message: STDERR is closed! */
1476 } 1758 }
1477 1759
1478 return -1; 1760 return -1;
1479} 1761}

Diff Legend

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