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.213 by root, Fri Sep 14 10:15:41 2007 UTC vs.
Revision 1.345 by sf-exg, Tue Oct 13 08:10:43 2015 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 <schmorp@schmorp.de>
16 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
15 * 17 *
16 * This program is free software; you can redistribute it and/or modify 18 * 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 19 * 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 20 * the Free Software Foundation; either version 3 of the License, or
19 * (at your option) any later version. 21 * (at your option) any later version.
20 * 22 *
21 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
22 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
23 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
33 35
34#include "../config.h" /* NECESSARY */ 36#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 37#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 38#include "rxvtutil.h"
37#include "init.h" 39#include "init.h"
40#include "keyboard.h"
38 41
39#include <limits> 42#include <limits>
40 43
41#include <csignal> 44#include <signal.h>
42 45
46#include <fcntl.h>
47
48#ifdef HAVE_XMU
49# include <X11/Xmu/CurUtil.h>
50#endif
51
52#ifdef HAVE_XSETLOCALE
53# define X_LOCALE
54# include <X11/Xlocale.h>
55#else
56# include <locale.h>
57#endif
58
59#ifdef HAVE_NL_LANGINFO
60# include <langinfo.h>
61#endif
62
63#ifdef HAVE_STARTUP_NOTIFICATION
64# define SN_API_NOT_YET_FROZEN
65# include <libsn/sn-launchee.h>
66#endif
67
68#ifdef DISPLAY_IS_IP
69/* On Solaris link with -lsocket and -lnsl */
70#include <sys/types.h>
71#include <sys/socket.h>
72
73/* these next two are probably only on Sun (not Solaris) */
74#ifdef HAVE_SYS_SOCKIO_H
75#include <sys/sockio.h>
76#endif
77#ifdef HAVE_SYS_BYTEORDER_H
78#include <sys/byteorder.h>
79#endif
80
81#include <netinet/in.h>
82#include <arpa/inet.h>
83#include <net/if.h>
84#include <net/if_arp.h>
85
86static char * ecb_cold
87rxvt_network_display (const char *display)
88{
89 char buffer[1024], *rval = NULL;
90 struct ifconf ifc;
91 struct ifreq *ifr;
92 int i, skfd;
93
94 if (display[0] != ':' && strncmp (display, "unix:", 5))
95 return (char *) display; /* nothing to do */
96
97 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
98 ifc.ifc_buf = buffer;
99
100 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
101 {
102 perror ("socket");
103 return NULL;
104 }
105
106 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
107 {
108 perror ("SIOCGIFCONF");
109 close (skfd);
110 return NULL;
111 }
112
113 for (i = 0, ifr = ifc.ifc_req;
114 i < (ifc.ifc_len / sizeof (struct ifreq));
115 i++, ifr++)
116 {
117 struct ifreq ifr2;
118
119 strcpy (ifr2.ifr_name, ifr->ifr_name);
120
121 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
122 {
123 unsigned long addr;
124 struct sockaddr_in *p_addr;
125
126 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
127 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
128
129 /*
130 * not "0.0.0.0" or "127.0.0.1" - so format the address
131 */
132 if (addr && addr != 0x7F000001)
133 {
134 char *colon = strchr (display, ':');
135
136 if (colon == NULL)
137 colon = ":0.0";
138
139 rval = rxvt_malloc (strlen (colon) + 16);
140 sprintf (rval, "%d.%d.%d.%d%s",
141 (int) ((addr >> 030) & 0xFF),
142 (int) ((addr >> 020) & 0xFF),
143 (int) ((addr >> 010) & 0xFF),
144 (int) (addr & 0xFF), colon);
145 break;
146 }
147 }
148 }
149
150 close (skfd);
151
152 return rval;
153}
154#endif
155
43const char *const def_colorName[] = 156static const char *const def_colorName[] =
44 { 157 {
45 COLOR_FOREGROUND, 158 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 159 COLOR_BACKGROUND,
47 /* low-intensity colors */ 160 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 161 "rgb:00/00/00", // 0: black (Black)
… …
50 "rgb:00/cd/00", // 2: green (Green3) 163 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: yellow (Yellow3) 164 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 165 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 166 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 167 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 168# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 169 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 170# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 171 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 172# endif
60 /* high-intensity colors */ 173 /* high-intensity colors */
61# ifdef XTERM_COLORS 174# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 175 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
69 "rgb:00/00/ff", // 4/12: bright blue (Blue) 182 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 183 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 184 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "rgb:ff/ff/ff", // 7/15: bright white (White) 185 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 186
187#if !USE_256_COLORS
74 // 88 xterm colours 188 // 88 xterm colours
75 "rgb:00/00/00", 189 "rgb:00/00/00",
76 "rgb:00/00/8b", 190 "rgb:00/00/8b",
77 "rgb:00/00/cd", 191 "rgb:00/00/cd",
78 "rgb:00/00/ff", 192 "rgb:00/00/ff",
… …
142 "rgb:8b/8b/8b", 256 "rgb:8b/8b/8b",
143 "rgb:a2/a2/a2", 257 "rgb:a2/a2/a2",
144 "rgb:b9/b9/b9", 258 "rgb:b9/b9/b9",
145 "rgb:d0/d0/d0", 259 "rgb:d0/d0/d0",
146 "rgb:e7/e7/e7", 260 "rgb:e7/e7/e7",
261#else
262 // 256 xterm colours
263 "rgb:00/00/00",
264 "rgb:00/00/5f",
265 "rgb:00/00/87",
266 "rgb:00/00/af",
267 "rgb:00/00/d7",
268 "rgb:00/00/ff",
269 "rgb:00/5f/00",
270 "rgb:00/5f/5f",
271 "rgb:00/5f/87",
272 "rgb:00/5f/af",
273 "rgb:00/5f/d7",
274 "rgb:00/5f/ff",
275 "rgb:00/87/00",
276 "rgb:00/87/5f",
277 "rgb:00/87/87",
278 "rgb:00/87/af",
279 "rgb:00/87/d7",
280 "rgb:00/87/ff",
281 "rgb:00/af/00",
282 "rgb:00/af/5f",
283 "rgb:00/af/87",
284 "rgb:00/af/af",
285 "rgb:00/af/d7",
286 "rgb:00/af/ff",
287 "rgb:00/d7/00",
288 "rgb:00/d7/5f",
289 "rgb:00/d7/87",
290 "rgb:00/d7/af",
291 "rgb:00/d7/d7",
292 "rgb:00/d7/ff",
293 "rgb:00/ff/00",
294 "rgb:00/ff/5f",
295 "rgb:00/ff/87",
296 "rgb:00/ff/af",
297 "rgb:00/ff/d7",
298 "rgb:00/ff/ff",
299 "rgb:5f/00/00",
300 "rgb:5f/00/5f",
301 "rgb:5f/00/87",
302 "rgb:5f/00/af",
303 "rgb:5f/00/d7",
304 "rgb:5f/00/ff",
305 "rgb:5f/5f/00",
306 "rgb:5f/5f/5f",
307 "rgb:5f/5f/87",
308 "rgb:5f/5f/af",
309 "rgb:5f/5f/d7",
310 "rgb:5f/5f/ff",
311 "rgb:5f/87/00",
312 "rgb:5f/87/5f",
313 "rgb:5f/87/87",
314 "rgb:5f/87/af",
315 "rgb:5f/87/d7",
316 "rgb:5f/87/ff",
317 "rgb:5f/af/00",
318 "rgb:5f/af/5f",
319 "rgb:5f/af/87",
320 "rgb:5f/af/af",
321 "rgb:5f/af/d7",
322 "rgb:5f/af/ff",
323 "rgb:5f/d7/00",
324 "rgb:5f/d7/5f",
325 "rgb:5f/d7/87",
326 "rgb:5f/d7/af",
327 "rgb:5f/d7/d7",
328 "rgb:5f/d7/ff",
329 "rgb:5f/ff/00",
330 "rgb:5f/ff/5f",
331 "rgb:5f/ff/87",
332 "rgb:5f/ff/af",
333 "rgb:5f/ff/d7",
334 "rgb:5f/ff/ff",
335 "rgb:87/00/00",
336 "rgb:87/00/5f",
337 "rgb:87/00/87",
338 "rgb:87/00/af",
339 "rgb:87/00/d7",
340 "rgb:87/00/ff",
341 "rgb:87/5f/00",
342 "rgb:87/5f/5f",
343 "rgb:87/5f/87",
344 "rgb:87/5f/af",
345 "rgb:87/5f/d7",
346 "rgb:87/5f/ff",
347 "rgb:87/87/00",
348 "rgb:87/87/5f",
349 "rgb:87/87/87",
350 "rgb:87/87/af",
351 "rgb:87/87/d7",
352 "rgb:87/87/ff",
353 "rgb:87/af/00",
354 "rgb:87/af/5f",
355 "rgb:87/af/87",
356 "rgb:87/af/af",
357 "rgb:87/af/d7",
358 "rgb:87/af/ff",
359 "rgb:87/d7/00",
360 "rgb:87/d7/5f",
361 "rgb:87/d7/87",
362 "rgb:87/d7/af",
363 "rgb:87/d7/d7",
364 "rgb:87/d7/ff",
365 "rgb:87/ff/00",
366 "rgb:87/ff/5f",
367 "rgb:87/ff/87",
368 "rgb:87/ff/af",
369 "rgb:87/ff/d7",
370 "rgb:87/ff/ff",
371 "rgb:af/00/00",
372 "rgb:af/00/5f",
373 "rgb:af/00/87",
374 "rgb:af/00/af",
375 "rgb:af/00/d7",
376 "rgb:af/00/ff",
377 "rgb:af/5f/00",
378 "rgb:af/5f/5f",
379 "rgb:af/5f/87",
380 "rgb:af/5f/af",
381 "rgb:af/5f/d7",
382 "rgb:af/5f/ff",
383 "rgb:af/87/00",
384 "rgb:af/87/5f",
385 "rgb:af/87/87",
386 "rgb:af/87/af",
387 "rgb:af/87/d7",
388 "rgb:af/87/ff",
389 "rgb:af/af/00",
390 "rgb:af/af/5f",
391 "rgb:af/af/87",
392 "rgb:af/af/af",
393 "rgb:af/af/d7",
394 "rgb:af/af/ff",
395 "rgb:af/d7/00",
396 "rgb:af/d7/5f",
397 "rgb:af/d7/87",
398 "rgb:af/d7/af",
399 "rgb:af/d7/d7",
400 "rgb:af/d7/ff",
401 "rgb:af/ff/00",
402 "rgb:af/ff/5f",
403 "rgb:af/ff/87",
404 "rgb:af/ff/af",
405 "rgb:af/ff/d7",
406 "rgb:af/ff/ff",
407 "rgb:d7/00/00",
408 "rgb:d7/00/5f",
409 "rgb:d7/00/87",
410 "rgb:d7/00/af",
411 "rgb:d7/00/d7",
412 "rgb:d7/00/ff",
413 "rgb:d7/5f/00",
414 "rgb:d7/5f/5f",
415 "rgb:d7/5f/87",
416 "rgb:d7/5f/af",
417 "rgb:d7/5f/d7",
418 "rgb:d7/5f/ff",
419 "rgb:d7/87/00",
420 "rgb:d7/87/5f",
421 "rgb:d7/87/87",
422 "rgb:d7/87/af",
423 "rgb:d7/87/d7",
424 "rgb:d7/87/ff",
425 "rgb:d7/af/00",
426 "rgb:d7/af/5f",
427 "rgb:d7/af/87",
428 "rgb:d7/af/af",
429 "rgb:d7/af/d7",
430 "rgb:d7/af/ff",
431 "rgb:d7/d7/00",
432 "rgb:d7/d7/5f",
433 "rgb:d7/d7/87",
434 "rgb:d7/d7/af",
435 "rgb:d7/d7/d7",
436 "rgb:d7/d7/ff",
437 "rgb:d7/ff/00",
438 "rgb:d7/ff/5f",
439 "rgb:d7/ff/87",
440 "rgb:d7/ff/af",
441 "rgb:d7/ff/d7",
442 "rgb:d7/ff/ff",
443 "rgb:ff/00/00",
444 "rgb:ff/00/5f",
445 "rgb:ff/00/87",
446 "rgb:ff/00/af",
447 "rgb:ff/00/d7",
448 "rgb:ff/00/ff",
449 "rgb:ff/5f/00",
450 "rgb:ff/5f/5f",
451 "rgb:ff/5f/87",
452 "rgb:ff/5f/af",
453 "rgb:ff/5f/d7",
454 "rgb:ff/5f/ff",
455 "rgb:ff/87/00",
456 "rgb:ff/87/5f",
457 "rgb:ff/87/87",
458 "rgb:ff/87/af",
459 "rgb:ff/87/d7",
460 "rgb:ff/87/ff",
461 "rgb:ff/af/00",
462 "rgb:ff/af/5f",
463 "rgb:ff/af/87",
464 "rgb:ff/af/af",
465 "rgb:ff/af/d7",
466 "rgb:ff/af/ff",
467 "rgb:ff/d7/00",
468 "rgb:ff/d7/5f",
469 "rgb:ff/d7/87",
470 "rgb:ff/d7/af",
471 "rgb:ff/d7/d7",
472 "rgb:ff/d7/ff",
473 "rgb:ff/ff/00",
474 "rgb:ff/ff/5f",
475 "rgb:ff/ff/87",
476 "rgb:ff/ff/af",
477 "rgb:ff/ff/d7",
478 "rgb:ff/ff/ff",
479 "rgb:08/08/08",
480 "rgb:12/12/12",
481 "rgb:1c/1c/1c",
482 "rgb:26/26/26",
483 "rgb:30/30/30",
484 "rgb:3a/3a/3a",
485 "rgb:44/44/44",
486 "rgb:4e/4e/4e",
487 "rgb:58/58/58",
488 "rgb:62/62/62",
489 "rgb:6c/6c/6c",
490 "rgb:76/76/76",
491 "rgb:80/80/80",
492 "rgb:8a/8a/8a",
493 "rgb:94/94/94",
494 "rgb:9e/9e/9e",
495 "rgb:a8/a8/a8",
496 "rgb:b2/b2/b2",
497 "rgb:bc/bc/bc",
498 "rgb:c6/c6/c6",
499 "rgb:d0/d0/d0",
500 "rgb:da/da/da",
501 "rgb:e4/e4/e4",
502 "rgb:ee/ee/ee",
503#endif
147 504
148#ifndef NO_CURSORCOLOR 505#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 506 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 507 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 508#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 509 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 510 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 511 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 512#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 513 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 514 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 515 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 516 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 517#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 518#if ENABLE_FRILLS
162 NULL, // Color_underline 519 NULL, // Color_underline
163#endif 520#endif
164#ifdef OPTION_HC 521#ifdef OPTION_HC
165 NULL, 522 NULL,
523 NULL,
166#endif 524#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 525 COLOR_SCROLLBAR,
526#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 527 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 528#endif
171#if ENABLE_TRANSPARENCY 529#if BG_IMAGE_FROM_ROOT
172 NULL, 530 NULL,
173#endif 531#endif
174#if OFF_FOCUS_FADING 532#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 533 "rgb:00/00/00",
176#endif 534#endif
177 }; 535 };
178 536
179bool 537void
180rxvt_term::init_vars () 538rxvt_term::init_vars ()
181{ 539{
182 pix_colors = // 540 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 541
189 MEvent.time = CurrentTime; 542 MEvent.time = CurrentTime;
190 MEvent.button = AnyButton; 543 MEvent.button = AnyButton;
191 want_refresh = 1; 544 want_refresh = 1;
192 priv_modes = SavedModes = PrivMode_Default; 545 priv_modes = SavedModes = PrivMode_Default;
193 ncol = 80; 546 ncol = 80;
194 nrow = 24; 547 nrow = 24;
195 int_bwidth = INTERNALBORDERWIDTH; 548 int_bwidth = INTERNALBORDERWIDTH;
196 ext_bwidth = EXTERNALBORDERWIDTH; 549 ext_bwidth = EXTERNALBORDERWIDTH;
197 lineSpace = LINESPACE; 550 lineSpace = LINESPACE;
551 letterSpace = LETTERSPACE;
198 saveLines = SAVELINES; 552 saveLines = SAVELINES;
199 numpix_colors = TOTAL_COLORS;
200 553
201 refresh_type = SLOW_REFRESH; 554 refresh_type = SLOW_REFRESH;
202 555
203 oldcursor.row = oldcursor.col = -1; 556 oldcursor.row = oldcursor.col = -1;
204 last_bot = last_state = -1;
205 557
206 set_option (Opt_scrollBar); 558 set_option (Opt_scrollBar);
207 set_option (Opt_scrollTtyOutput); 559 set_option (Opt_scrollTtyOutput);
208 set_option (Opt_jumpScroll); 560 set_option (Opt_jumpScroll);
209 set_option (Opt_skipScroll); 561 set_option (Opt_skipScroll);
210 set_option (Opt_secondaryScreen); 562 set_option (Opt_secondaryScreen);
211 set_option (Opt_secondaryScroll); 563 set_option (Opt_secondaryScroll);
212 set_option (Opt_pastableTabs); 564 set_option (Opt_pastableTabs);
213 set_option (Opt_intensityStyles); 565 set_option (Opt_intensityStyles);
566 set_option (Opt_iso14755);
214 set_option (Opt_iso14755_52); 567 set_option (Opt_iso14755_52);
215 568 set_option (Opt_buffered);
216 return true;
217}
218
219void
220rxvt_term::init_secondary ()
221{
222 int i;
223
224 /*
225 * Close all unused file descriptors
226 * We don't want them, we don't need them.
227 */
228 if ((i = open ("/dev/null", O_RDONLY)) < 0)
229 {
230 /* TODO: BOO HISS */
231 dup2 (STDERR_FILENO, STDIN_FILENO);
232 }
233 else if (i > STDIN_FILENO)
234 {
235 dup2 (i, STDIN_FILENO);
236 close (i);
237 }
238
239 dup2 (STDERR_FILENO, STDOUT_FILENO);
240
241#if 0 // schmorp sayz closing filies is murder
242 for (i = STDERR_FILENO + 1; i < num_fds; i++)
243 {
244#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
245 if (i == 4 || i == 7)
246 continue;
247#endif
248 close (i);
249 }
250#endif
251} 569}
252 570
253/*----------------------------------------------------------------------*/ 571/*----------------------------------------------------------------------*/
254const char ** 572const char **
255rxvt_term::init_resources (int argc, const char *const *argv) 573rxvt_term::init_resources (int argc, const char *const *argv)
256{ 574{
257 int i, r_argc; 575 int i;
258 const char **cmd_argv, **r_argv; 576 const char **cmd_argv;
259
260 /*
261 * Look for -e option. Find => split and make cmd_argv[] of command args
262 */
263 for (r_argc = 0; r_argc < argc; r_argc++)
264 if (!strcmp (argv[r_argc], "-e"))
265 break;
266
267 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
268
269 for (i = 0; i < r_argc; i++)
270 r_argv[i] = (const char *)argv[i];
271
272 r_argv[i] = NULL;
273
274 if (r_argc == argc)
275 cmd_argv = NULL;
276 else
277 {
278 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
279
280 for (i = 0; i < argc - r_argc - 1; i++)
281 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
282
283 cmd_argv[i] = NULL;
284 }
285 577
286 rs[Rs_name] = rxvt_basename (argv[0]); 578 rs[Rs_name] = rxvt_basename (argv[0]);
287 579
288 /* 580 /*
289 * Open display, get options/resources and create the window 581 * Open display, get options/resources and create the window
290 */ 582 */
291 583
292 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 584 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
293 rs[Rs_display_name] = ":0"; 585 rs[Rs_display_name] = ":0";
294 586
295 get_options (r_argc, r_argv); 587 cmd_argv = get_options (argc, argv);
296 588
297 if (!(display = displays.get (rs[Rs_display_name]))) 589 if (!(display = displays.get (rs[Rs_display_name])))
298 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 590 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
299 591
300 // using a local pointer decreases code size a lot 592 // using a local pointer decreases code size a lot
301 xa = display->xa; 593 xa = display->xa;
302 594
303 set (display); 595 set (display);
304 extract_resources (); 596 extract_resources ();
305 597
306#if XFT 598#if ENABLE_FRILLS
307 if (rs[Rs_depth]) 599 if (rs[Rs_visual])
308 select_visual (strtol (rs[Rs_depth], 0, 0)); 600 select_visual (strtol (rs[Rs_visual], 0, 0));
601 else if (rs[Rs_depth])
602 select_depth (strtol (rs[Rs_depth], 0, 0));
309#endif 603#endif
310
311#ifdef HAVE_AFTERIMAGE
312 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
313#endif
314 free (r_argv);
315 604
316 for (int i = NUM_RESOURCES; i--; ) 605 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 606 if (rs [i] == resval_undef)
318 rs [i] = 0; 607 rs [i] = 0;
319 608
… …
327 { 616 {
328 rxvt_perl.init (this); 617 rxvt_perl.init (this);
329 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 618 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
330 } 619 }
331#endif 620#endif
621
622 // must be called after initialising the perl interpreter as it
623 // may invoke the `on_register_command' hook
624 extract_keysym_resources ();
332 625
333 /* 626 /*
334 * set any defaults not already set 627 * set any defaults not already set
335 */ 628 */
336 if (cmd_argv && cmd_argv[0]) 629 if (cmd_argv && cmd_argv[0])
337 { 630 {
338 if (!rs[Rs_title]) 631 if (!rs[Rs_title])
339 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 632 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
633
340 if (!rs[Rs_iconName]) 634 if (!rs[Rs_iconName])
341 rs[Rs_iconName] = rs[Rs_title]; 635 rs[Rs_iconName] = rs[Rs_title];
342 } 636 }
343 else 637 else
344 { 638 {
345 if (!rs[Rs_title]) 639 if (!rs[Rs_title])
346 rs[Rs_title] = rs[Rs_name]; 640 rs[Rs_title] = rs[Rs_name];
641
347 if (!rs[Rs_iconName]) 642 if (!rs[Rs_iconName])
348 rs[Rs_iconName] = rs[Rs_name]; 643 rs[Rs_iconName] = rs[Rs_name];
349 } 644 }
350 645
351 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 646 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
358 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 653 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
359 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 654 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
360 655
361 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 656 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
362 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 657 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
658
659 if (rs[Rs_letterSpace])
660 letterSpace = atoi (rs[Rs_letterSpace]);
363#endif 661#endif
364 662
365#ifdef POINTER_BLANK 663#ifdef POINTER_BLANK
366 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 664 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
367 pointerBlankDelay = i; 665 pointerBlankDelay = i;
368 else 666 else
369 pointerBlankDelay = 2; 667 pointerBlankDelay = 2;
370#endif 668#endif
371 669
670 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
671 multiClickTime = i;
672 else
673 multiClickTime = 500;
674
675 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
676
372 /* no point having a scrollbar without having any scrollback! */ 677 /* no point having a scrollbar without having any scrollback! */
373 if (!saveLines) 678 if (!saveLines)
374 set_option (Opt_scrollBar, 0); 679 set_option (Opt_scrollBar, 0);
375
376#ifdef PRINTPIPE
377 if (!rs[Rs_print_pipe])
378 rs[Rs_print_pipe] = PRINTPIPE;
379#endif
380 680
381 if (!rs[Rs_cutchars]) 681 if (!rs[Rs_cutchars])
382 rs[Rs_cutchars] = CUTCHARS; 682 rs[Rs_cutchars] = CUTCHARS;
383 683
384#ifndef NO_BACKSPACE_KEY 684#ifndef NO_BACKSPACE_KEY
… …
397# else 697# else
398 rs[Rs_delete_key] = "\033[3~"; 698 rs[Rs_delete_key] = "\033[3~";
399# endif 699# endif
400#endif 700#endif
401 701
402#ifdef HAVE_SCROLLBARS 702 scrollBar.setup (this);
403 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
404#endif
405 703
406#ifdef XTERM_REVERSE_VIDEO 704#ifdef XTERM_REVERSE_VIDEO
407 /* this is how xterm implements reverseVideo */ 705 /* this is how xterm implements reverseVideo */
408 if (option (Opt_reverseVideo)) 706 if (option (Opt_reverseVideo))
409 { 707 {
… …
429 color_aliases (Color_fg); 727 color_aliases (Color_fg);
430 color_aliases (Color_bg); 728 color_aliases (Color_bg);
431#ifndef NO_CURSORCOLOR 729#ifndef NO_CURSORCOLOR
432 color_aliases (Color_cursor); 730 color_aliases (Color_cursor);
433 color_aliases (Color_cursor2); 731 color_aliases (Color_cursor2);
434#endif /* NO_CURSORCOLOR */ 732#endif /* NO_CURSORCOLOR */
435 color_aliases (Color_pointer_fg); 733 color_aliases (Color_pointer_fg);
436 color_aliases (Color_pointer_bg); 734 color_aliases (Color_pointer_bg);
437 color_aliases (Color_border); 735 color_aliases (Color_border);
438#ifndef NO_BOLD_UNDERLINE_REVERSE 736#ifndef NO_BOLD_UNDERLINE_REVERSE
439 color_aliases (Color_BD); 737 color_aliases (Color_BD);
440 color_aliases (Color_UL); 738 color_aliases (Color_UL);
441 color_aliases (Color_RV); 739 color_aliases (Color_RV);
442#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 740#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
443 741
444 if (!rs[Rs_color + Color_border]) 742 if (!rs[Rs_color + Color_border])
445 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 743 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
446 744
447 return cmd_argv; 745 return cmd_argv;
746}
747
748/*----------------------------------------------------------------------*/
749void
750rxvt_term::init (stringvec *argv, stringvec *envv)
751{
752 argv->push_back (0);
753 envv->push_back (0);
754
755 this->argv = argv;
756 this->envv = envv;
757
758 env = new char *[this->envv->size ()];
759 for (int i = 0; i < this->envv->size (); i++)
760 env[i] = this->envv->at (i);
761
762 init2 (argv->size () - 1, argv->begin ());
763}
764
765void
766rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
767{
768#if ENABLE_PERL
769 // perl might want to access the stringvecs later, so we need to copy them
770 stringvec *args = new stringvec;
771 for (int i = 0; i < argc; i++)
772 args->push_back (strdup (argv [i]));
773
774 stringvec *envs = new stringvec;
775 for (const char *const *var = envv; *var; var++)
776 envs->push_back (strdup (*var));
777
778 init (args, envs);
779#else
780 init2 (argc, argv);
781#endif
782}
783
784void
785rxvt_term::init2 (int argc, const char *const *argv)
786{
787 SET_R (this);
788 set_locale ("");
789 set_environ (env); // a few things in X do not call setlocale :(
790
791 init_vars ();
792
793 const char **cmd_argv = init_resources (argc, argv);
794
795#ifdef KEYSYM_RESOURCE
796 keyboard->register_done ();
797#endif
798
799 if (const char *path = rs[Rs_chdir])
800 if (*path) // ignored if empty
801 {
802 if (*path != '/')
803 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
804
805 if (chdir (path))
806 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
807 }
808
809 if (option (Opt_scrollBar))
810 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
811
812 pty = ptytty::create ();
813
814 create_windows (argc, argv);
815
816 init_xlocale ();
817
818 scr_poweron (); // initialize screen
819
820#if 0
821 XSynchronize (dpy, True);
822#endif
823
824 if (option (Opt_scrollBar))
825 scrollBar.resize (); /* create and map scrollbar */
826
827#ifdef HAVE_BG_PIXMAP
828 bg_init ();
829#endif
830
831#if ENABLE_PERL
832 rootwin_ev.start (display, display->root);
833#endif
834
835 init_done = 1;
836
837 init_command (cmd_argv);
838
839 if (pty->pty >= 0)
840 pty_ev.start (pty->pty, ev::READ);
841
842 HOOK_INVOKE ((this, HOOK_START, DT_END));
843
844#if ENABLE_XEMBED
845 if (rs[Rs_embed])
846 {
847 long info[2] = { 0, XEMBED_MAPPED };
848
849 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
850 32, PropModeReplace, (unsigned char *)&info, 2);
851 }
852#endif
853
854#if HAVE_STARTUP_NOTIFICATION
855 SnDisplay *snDisplay;
856 SnLauncheeContext *snContext;
857
858 snDisplay = sn_display_new (dpy, NULL, NULL);
859 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
860
861 /* Tell the window manager that this window is part of the startup context */
862 if (snContext)
863 sn_launchee_context_setup_window (snContext, parent);
864#endif
865
866 XMapWindow (dpy, vt);
867 XMapWindow (dpy, parent);
868
869#if HAVE_STARTUP_NOTIFICATION
870 if (snContext)
871 {
872 /* Mark the startup process as complete */
873 sn_launchee_context_complete (snContext);
874
875 sn_launchee_context_unref (snContext);
876 }
877
878 sn_display_unref (snDisplay);
879#endif
880
881 refresh_check ();
448} 882}
449 883
450/*----------------------------------------------------------------------*/ 884/*----------------------------------------------------------------------*/
451void 885void
452rxvt_term::init_env () 886rxvt_term::init_env ()
453{ 887{
454 int i;
455 char *val; 888 char *val;
889 char *env_display;
890 char *env_windowid;
891 char *env_colorfgbg;
892 char *env_term;
456 893
457#ifdef DISPLAY_IS_IP 894#ifdef DISPLAY_IS_IP
458 /* Fixup display_name for export over pty to any interested terminal 895 /* Fixup display_name for export over pty to any interested terminal
459 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 896 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
460 * (for the first non-loopback interface) that we get from 897 * (for the first non-loopback interface) that we get from
… …
467 */ 904 */
468 val = rxvt_network_display (rs[Rs_display_name]); 905 val = rxvt_network_display (rs[Rs_display_name]);
469 rs[Rs_display_name] = (const char *)val; 906 rs[Rs_display_name] = (const char *)val;
470 907
471 if (val == NULL) 908 if (val == NULL)
472#endif /* DISPLAY_IS_IP */ 909#endif /* DISPLAY_IS_IP */
473 val = XDisplayString (dpy); 910 val = XDisplayString (dpy);
474 911
475 if (rs[Rs_display_name] == NULL) 912 if (rs[Rs_display_name] == NULL)
476 rs[Rs_display_name] = val; /* use broken `:0' value */ 913 rs[Rs_display_name] = val; /* use broken `:0' value */
477 914
478 i = strlen (val);
479 env_display = (char *)rxvt_malloc (i + 9); 915 env_display = (char *)rxvt_malloc (strlen (val) + 9);
480 916
481 sprintf (env_display, "DISPLAY=%s", val); 917 sprintf (env_display, "DISPLAY=%s", val);
482 918
919 env_windowid = (char *)rxvt_malloc (21);
483 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 920 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
484 921
485 /* add entries to the environment: 922 /* add entries to the environment:
486 * @ DISPLAY: in case we started with -display 923 * @ DISPLAY: in case we started with -display
487 * @ WINDOWID: X window id number of the window 924 * @ WINDOWID: X window id number of the window
488 * @ COLORTERM: terminal sub-name and also indicates its color 925 * @ COLORTERM: terminal sub-name and also indicates its color
… …
491 * @ COLORFGBG: fg;bg color codes 928 * @ COLORFGBG: fg;bg color codes
492 */ 929 */
493 putenv (env_display); 930 putenv (env_display);
494 putenv (env_windowid); 931 putenv (env_windowid);
495 932
496 if (env_colorfgbg) 933 env_colorfgbg = get_colorfgbg ();
497 putenv (env_colorfgbg); 934 putenv (env_colorfgbg);
498 935
499#ifdef RXVT_TERMINFO 936#ifdef RXVT_TERMINFO
500 putenv ("TERMINFO=" RXVT_TERMINFO); 937 putenv ("TERMINFO=" RXVT_TERMINFO);
501#endif 938#endif
502 939
… …
517#ifdef HAVE_UNSETENV 954#ifdef HAVE_UNSETENV
518 /* avoid passing old settings and confusing term size */ 955 /* avoid passing old settings and confusing term size */
519 unsetenv ("LINES"); 956 unsetenv ("LINES");
520 unsetenv ("COLUMNS"); 957 unsetenv ("COLUMNS");
521 unsetenv ("TERMCAP"); /* terminfo should be okay */ 958 unsetenv ("TERMCAP"); /* terminfo should be okay */
522#endif /* HAVE_UNSETENV */ 959#endif /* HAVE_UNSETENV */
523} 960}
524 961
525/*----------------------------------------------------------------------*/ 962/*----------------------------------------------------------------------*/
526/*
527 * This is more or less stolen straight from XFree86 xterm.
528 * This should support all European type languages.
529 */
530void 963void
531rxvt_term::set_locale (const char *locale) 964rxvt_term::set_locale (const char *locale)
532{ 965{
533 set_environ (envv); 966 set_environ (env);
534 967
535#if HAVE_XSETLOCALE || HAVE_SETLOCALE
536 free (this->locale); 968 free (this->locale);
537 this->locale = setlocale (LC_CTYPE, locale); 969 this->locale = setlocale (LC_CTYPE, locale);
538 970
539 if (!this->locale) 971 if (!this->locale)
540 { 972 {
… …
548 980
549 this->locale = "C"; 981 this->locale = "C";
550 } 982 }
551 983
552 984
553 this->locale = rxvt_strdup (this->locale); 985 this->locale = strdup (this->locale);
554 SET_LOCALE (this->locale); 986 SET_LOCALE (this->locale);
555 mbstate.reset (); 987 mbstate.reset ();
556#endif
557 988
558#if HAVE_NL_LANGINFO 989#if HAVE_NL_LANGINFO
559 char *codeset = strdup (nl_langinfo (CODESET)); 990 char *codeset = nl_langinfo (CODESET);
560 // /^UTF.?8/i 991 // /^UTF.?8/i
561 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 992 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
562 && (codeset[1] == 'T' || codeset[1] == 't') 993 && (codeset[1] == 'T' || codeset[1] == 't')
563 && (codeset[2] == 'F' || codeset[2] == 'f') 994 && (codeset[2] == 'F' || codeset[2] == 'f')
564 && (codeset[3] == '8' || codeset[4] == '8'); 995 && (codeset[3] == '8' || codeset[4] == '8');
565 free (codeset);
566#else 996#else
567 enc_utf8 = 0; 997 enc_utf8 = 0;
568#endif 998#endif
569} 999}
570 1000
571void 1001void
572rxvt_term::init_xlocale () 1002rxvt_term::init_xlocale ()
573{ 1003{
574 set_environ (envv); 1004 set_environ (env);
575 1005
576#ifdef USE_XIM 1006#if USE_XIM
577 if (!locale) 1007 if (!locale)
578 rxvt_warn ("setting locale failed, working without locale support.\n"); 1008 rxvt_warn ("setting locale failed, continuing without locale support.\n");
579 else 1009 else
580 { 1010 {
581 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1011 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
582 1012
583 if (!XSupportsLocale ()) 1013 if (!XSupportsLocale ())
584 { 1014 {
585 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1015 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
586 return; 1016 return;
587 } 1017 }
588 1018
589 im_ev.start (display); 1019 im_ev.start (display);
590 1020
… …
631 run_command (argv); 1061 run_command (argv);
632} 1062}
633 1063
634/*----------------------------------------------------------------------*/ 1064/*----------------------------------------------------------------------*/
635void 1065void
636rxvt_term::Get_Colours () 1066rxvt_term::get_colors ()
637{ 1067{
638 int i; 1068 int i;
639 1069
640#ifdef OFF_FOCUS_FADING 1070#ifdef OFF_FOCUS_FADING
641 pix_colors = pix_colors_focused; 1071 pix_colors = pix_colors_focused;
642#endif 1072#endif
643 1073
644 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1074 for (i = 0; i < NRS_COLORS; i++)
645 {
646 const char *name = rs[Rs_color + i]; 1075 if (const char *name = rs[Rs_color + i])
647
648 if (!name)
649 continue;
650
651 rxvt_color xcol;
652
653 if (!set_color (xcol, name)) 1076 set_color (pix_colors [i], name);
654 {
655#ifndef XTERM_REVERSE_VIDEO
656 if (i < 2 && option (Opt_reverseVideo))
657 name = def_colorName [1 - i];
658 else
659#endif
660 name = def_colorName [i];
661
662 if (!name)
663 continue;
664
665 if (!set_color (xcol, name))
666 {
667 switch (i)
668 {
669 case Color_fg:
670 case Color_bg:
671 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
672 name = "";
673 break;
674#ifndef NO_CURSORCOLOR
675 case Color_cursor2:
676#endif
677 case Color_pointer_fg:
678 name = rs[Rs_color + Color_fg];
679 xcol.set (this, name);
680 break;
681 default:
682 name = rs[Rs_color + Color_bg];
683 xcol.set (this, name);
684 break;
685 }
686 }
687 }
688
689 pix_colors[i] = xcol;
690 rs[Rs_color + i] = name;
691 }
692
693 if (depth <= 2)
694 {
695 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
696 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
697 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
698 }
699 1077
700 /* 1078 /*
701 * get scrollBar shadow colors 1079 * get scrollBar shadow colors
702 * 1080 *
703 * The calculations of topShadow/bottomShadow values are adapted 1081 * The calculations of topShadow/bottomShadow values are adapted
704 * from the fvwm window manager. 1082 * from the fvwm window manager.
705 */ 1083 */
706#ifdef KEEP_SCROLLCOLOR 1084#ifdef RXVT_SCROLLBAR
707 if (depth <= 2)
708 {
709 /* Monochrome */
710 alias_color (Color_scroll, Color_fg);
711 alias_color (Color_topShadow, Color_bg);
712 alias_color (Color_bottomShadow, Color_bg);
713 }
714 else
715 {
716 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1085 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
717 1086
718 rgba cscroll; 1087 rgba cscroll;
719 pix_colors [Color_scroll].get (cscroll); 1088 pix_colors [Color_scroll].get (cscroll);
720 1089
721 /* topShadowColor */ 1090 /* topShadowColor */
722 if (!pix_colors[Color_topShadow].set (this, 1091 if (!pix_colors[Color_topShadow].set (this,
723 rgba ( 1092 rgba (
724 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1093 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
725 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1094 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
726 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1095 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
727 cscroll.a) 1096 cscroll.a)
728 )) 1097 ))
729 alias_color (Color_topShadow, Color_White); 1098 alias_color (Color_topShadow, Color_White);
730 } 1099#endif
731#endif /* KEEP_SCROLLCOLOR */
732 1100
733#ifdef OFF_FOCUS_FADING 1101#ifdef OFF_FOCUS_FADING
734 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1102 for (i = 0; i < NRS_COLORS; i++)
735 update_fade_color (i); 1103 update_fade_color (i, true);
736#endif 1104#endif
737} 1105}
738 1106
739/*----------------------------------------------------------------------*/ 1107/*----------------------------------------------------------------------*/
740/* color aliases, fg/bg bright-bold */ 1108/* color aliases, fg/bg bright-bold */
741void 1109void
742rxvt_term::color_aliases (int idx) 1110rxvt_term::color_aliases (int idx)
743{ 1111{
744 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1112 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
745 { 1113 {
746 int i = atoi (rs[Rs_color + idx]); 1114 int i = atoi (rs[Rs_color + idx]);
747 1115
748 if (i >= 8 && i <= 15) 1116 if (i >= 8 && i <= 15)
749 { /* bright colors */ 1117 /* bright colors */
750 i -= 8;
751 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1118 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
752 return; 1119 else if (i >= 0 && i <= 7)
753 } 1120 /* normal colors */
754
755 if (i >= 0 && i <= 7) /* normal colors */
756 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1121 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
757 } 1122 }
758} 1123}
759 1124
760/*----------------------------------------------------------------------*/ 1125/*----------------------------------------------------------------------*/
… …
792 for (j = map->max_keypermod; j--; k++) 1157 for (j = map->max_keypermod; j--; k++)
793 { 1158 {
794 if (kc[k] == 0) 1159 if (kc[k] == 0)
795 break; 1160 break;
796 1161
797 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1162 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
798 { 1163 {
799 case XK_Num_Lock: 1164 case XK_Num_Lock:
800 ModNumLockMask = modmasks[i - 1]; 1165 ModNumLockMask = modmasks[i - 1];
801 continue; 1166 continue;
802 1167
… …
844 1209
845 if (i) 1210 if (i)
846 ModMetaMask = modmasks[i - 1]; 1211 ModMetaMask = modmasks[i - 1];
847} 1212}
848 1213
1214void
1215rxvt_term::set_icon (const char *file)
1216{
1217#if HAVE_PIXBUF && ENABLE_EWMH
1218 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1219 if (!pixbuf)
1220 {
1221 rxvt_warn ("Loading image icon failed, continuing without.\n");
1222 return;
1223 }
1224
1225 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1226 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1227
1228 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1229 {
1230 rxvt_warn ("Icon image too big, continuing without.\n");
1231 g_object_unref (pixbuf);
1232 return;
1233 }
1234
1235 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1236 {
1237 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1238 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1239 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1240
1241 buffer [0] = w;
1242 buffer [1] = h;
1243 for (int i = 0; i < h; i++)
1244 {
1245 for (int j = 0; j < w; j++)
1246 {
1247 unsigned char *pixel = row + j * channels;
1248 long value;
1249
1250 if (channels == 4)
1251 value = pixel[3];
1252 else
1253 value = (unsigned char)0x00ff;
1254
1255 value = (value << 8) + pixel[0];
1256 value = (value << 8) + pixel[1];
1257 value = (value << 8) + pixel[2];
1258 buffer[(i * w + j) + 2] = value;
1259 }
1260
1261 row += rowstride;
1262 }
1263
1264 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1265 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1266 free (buffer);
1267 }
1268 else
1269 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1270
1271 g_object_unref (pixbuf);
1272#endif
1273}
1274
849/*----------------------------------------------------------------------*/ 1275/*----------------------------------------------------------------------*/
850/* rxvt_Create_Windows () - Open and map the window */ 1276/* Open and map the window */
851void 1277void
852rxvt_term::create_windows (int argc, const char *const *argv) 1278rxvt_term::create_windows (int argc, const char *const *argv)
853{ 1279{
854 XClassHint classHint; 1280 XClassHint classHint;
855 XWMHints wmHint; 1281 XWMHints wmHint;
… …
861 Window top, parent; 1287 Window top, parent;
862 1288
863 dLocal (Display *, dpy); 1289 dLocal (Display *, dpy);
864 1290
865 /* grab colors before netscape does */ 1291 /* grab colors before netscape does */
866 Get_Colours (); 1292 get_colors ();
867 1293
868 if (!set_fonts ()) 1294 if (!set_fonts ())
869 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1295 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
870 1296
871 parent = display->root; 1297 parent = display->root;
… …
901 } 1327 }
902#endif 1328#endif
903 1329
904 window_calc (0, 0); 1330 window_calc (0, 0);
905 1331
906 /* sub-window placement & size in rxvt_resize_subwindows () */ 1332 /* sub-window placement & size in rxvt_term::resize_all_windows () */
907 attributes.background_pixel = pix_colors_focused [Color_border]; 1333 attributes.background_pixel = pix_colors_focused [Color_border];
908 attributes.border_pixel = pix_colors_focused [Color_border]; 1334 attributes.border_pixel = pix_colors_focused [Color_border];
909 attributes.colormap = cmap; 1335 attributes.colormap = cmap;
910 1336
911 top = XCreateWindow (dpy, parent, 1337 top = XCreateWindow (dpy, parent,
… …
914 ext_bwidth, 1340 ext_bwidth,
915 depth, InputOutput, visual, 1341 depth, InputOutput, visual,
916 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1342 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
917 &attributes); 1343 &attributes);
918 1344
919 this->parent[0] = top; 1345 this->parent = top;
920 1346
921 old_width = szHint.width; 1347 set_title (rs [Rs_title]);
922 old_height = szHint.height; 1348 set_icon_name (rs [Rs_iconName]);
923
924 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
925 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
926 1349
927 classHint.res_name = (char *)rs[Rs_name]; 1350 classHint.res_name = (char *)rs[Rs_name];
928 classHint.res_class = (char *)RESCLASS; 1351 classHint.res_class = (char *)RESCLASS;
929 1352
930 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1353 wmHint.flags = InputHint | StateHint | WindowGroupHint;
931 wmHint.input = True; 1354 wmHint.input = True;
932 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1355 wmHint.initial_state = option (Opt_iconic) ? IconicState
1356 : option (Opt_dockapp) ? WithdrawnState
1357 : NormalState;
933 wmHint.window_group = top; 1358 wmHint.window_group = top;
934 1359
935 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1360 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
936 &szHint, &wmHint, &classHint); 1361 &szHint, &wmHint, &classHint);
1362#if ENABLE_EWMH
1363 /*
1364 * set up icon hint
1365 * rs [Rs_iconfile] is path to icon
1366 */
1367
1368 if (rs [Rs_iconfile])
1369 set_icon (rs [Rs_iconfile]);
1370#endif
937 1371
938#if ENABLE_FRILLS 1372#if ENABLE_FRILLS
939 if (mwmhints.flags) 1373 if (mwmhints.flags)
940 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1374 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
941 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1375 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
946#if ENABLE_EWMH 1380#if ENABLE_EWMH
947 xa[XA_NET_WM_PING], 1381 xa[XA_NET_WM_PING],
948#endif 1382#endif
949 }; 1383 };
950 1384
951 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1385 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
952 1386
953#if ENABLE_FRILLS 1387#if ENABLE_FRILLS
954 if (rs[Rs_transient_for]) 1388 if (rs[Rs_transient_for])
955 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1389 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
956#endif 1390#endif
… …
974 | ExposureMask | StructureNotifyMask); 1408 | ExposureMask | StructureNotifyMask);
975 1409
976 termwin_ev.start (display, top); 1410 termwin_ev.start (display, top);
977 1411
978 /* vt cursor: Black-on-White is standard, but this is more popular */ 1412 /* vt cursor: Black-on-White is standard, but this is more popular */
1413 unsigned int shape = XC_xterm;
1414
1415#ifdef HAVE_XMU
1416 if (rs[Rs_pointerShape])
1417 {
1418 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1419 if (stmp >= 0)
1420 shape = stmp;
1421 }
1422#endif
1423
979 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1424 TermWin_cursor = XCreateFontCursor (dpy, shape);
980
981#ifdef HAVE_SCROLLBARS
982 /* cursor scrollBar: Black-on-White */
983 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
984#endif
985 1425
986 /* the vt window */ 1426 /* the vt window */
987 vt = XCreateSimpleWindow (dpy, top, 1427 vt = XCreateSimpleWindow (dpy, top,
988 window_vt_x, window_vt_y, 1428 window_vt_x, window_vt_y,
989 width, height, 1429 vt_width, vt_height,
990 0, 1430 0,
991 pix_colors_focused[Color_fg], 1431 pix_colors_focused[Color_fg],
992 pix_colors_focused[Color_bg]); 1432 pix_colors_focused[Color_bg]);
993 1433
994 attributes.bit_gravity = NorthWestGravity; 1434 attributes.bit_gravity = NorthWestGravity;
… …
1014 GCForeground | GCBackground | GCGraphicsExposures, 1454 GCForeground | GCBackground | GCGraphicsExposures,
1015 &gcvalue); 1455 &gcvalue);
1016 1456
1017 drawable = new rxvt_drawable (this, vt); 1457 drawable = new rxvt_drawable (this, vt);
1018 1458
1019#ifdef RXVT_SCROLLBAR
1020 gcvalue.foreground = pix_colors[Color_topShadow];
1021 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1022 gcvalue.foreground = pix_colors[Color_bottomShadow];
1023 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1024 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1025 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1026#endif
1027
1028#ifdef OFF_FOCUS_FADING 1459#ifdef OFF_FOCUS_FADING
1029 // initially we are in unfocused state 1460 // initially we are in unfocused state
1030 if (rs[Rs_fade]) 1461 if (rs[Rs_fade])
1031 pix_colors = pix_colors_unfocused; 1462 pix_colors = pix_colors_unfocused;
1032#endif 1463#endif
1033 1464
1034 pointer_unblank (); 1465 pointer_unblank ();
1035 scr_recolour (); 1466 scr_recolor ();
1036}
1037
1038/* ------------------------------------------------------------------------- *
1039 * GET TTY CURRENT STATE *
1040 * ------------------------------------------------------------------------- */
1041void
1042rxvt_get_ttymode (ttymode_t *tio, int erase)
1043{
1044 /*
1045 * standard System V termios interface
1046 */
1047 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1048 {
1049 // return error - use system defaults,
1050 // where possible, and zero elsewhere
1051 memset (tio, 0, sizeof (ttymode_t));
1052
1053 tio->c_cc[VINTR] = CINTR;
1054 tio->c_cc[VQUIT] = CQUIT;
1055 tio->c_cc[VERASE] = CERASE;
1056#ifdef VERASE2
1057 tio->c_cc[VERASE2] = CERASE2;
1058#endif
1059 tio->c_cc[VKILL] = CKILL;
1060 tio->c_cc[VSTART] = CSTART;
1061 tio->c_cc[VSTOP] = CSTOP;
1062 tio->c_cc[VSUSP] = CSUSP;
1063# ifdef VDSUSP
1064 tio->c_cc[VDSUSP] = CDSUSP;
1065# endif
1066# ifdef VREPRINT
1067 tio->c_cc[VREPRINT] = CRPRNT;
1068# endif
1069# ifdef VDISCRD
1070 tio->c_cc[VDISCRD] = CFLUSH;
1071# endif
1072# ifdef VWERSE
1073 tio->c_cc[VWERSE] = CWERASE;
1074# endif
1075# ifdef VLNEXT
1076 tio->c_cc[VLNEXT] = CLNEXT;
1077# endif
1078 }
1079
1080 tio->c_cc[VEOF] = CEOF;
1081 tio->c_cc[VEOL] = VDISABLE;
1082# ifdef VEOL2
1083 tio->c_cc[VEOL2] = VDISABLE;
1084# endif
1085# ifdef VSWTC
1086 tio->c_cc[VSWTC] = VDISABLE;
1087# endif
1088# ifdef VSWTCH
1089 tio->c_cc[VSWTCH] = VDISABLE;
1090# endif
1091# if VMIN != VEOF
1092 tio->c_cc[VMIN] = 1;
1093# endif
1094# if VTIME != VEOL
1095 tio->c_cc[VTIME] = 0;
1096# endif
1097
1098 if (erase != -1)
1099 tio->c_cc[VERASE] = (char)erase;
1100
1101 /* input modes */
1102 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1103# ifdef IMAXBEL
1104 | IMAXBEL
1105# endif
1106 | IXON);
1107
1108 /* output modes */
1109 tio->c_oflag = (OPOST | ONLCR);
1110
1111 /* control modes */
1112 tio->c_cflag = (CS8 | CREAD);
1113
1114 /* line discipline modes */
1115 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1116# if defined (ECHOCTL) && defined (ECHOKE)
1117 | ECHOCTL | ECHOKE
1118# endif
1119 | ECHOE | ECHOK);
1120
1121 /*
1122 * Debugging
1123 */
1124#ifdef DEBUG_TTYMODE
1125#ifdef HAVE_TERMIOS_H
1126 /* c_iflag bits */
1127 fprintf (stderr, "Input flags\n");
1128
1129 /* cpp token stringize doesn't work on all machines <sigh> */
1130# define FOO(flag,name) \
1131 if ((tio->c_iflag) & flag) \
1132 fprintf (stderr, "%s ", name)
1133
1134 /* c_iflag bits */
1135 FOO (IGNBRK, "IGNBRK");
1136 FOO (BRKINT, "BRKINT");
1137 FOO (IGNPAR, "IGNPAR");
1138 FOO (PARMRK, "PARMRK");
1139 FOO (INPCK, "INPCK");
1140 FOO (ISTRIP, "ISTRIP");
1141 FOO (INLCR, "INLCR");
1142 FOO (IGNCR, "IGNCR");
1143 FOO (ICRNL, "ICRNL");
1144 FOO (IXON, "IXON");
1145 FOO (IXOFF, "IXOFF");
1146# ifdef IUCLC
1147 FOO (IUCLC, "IUCLC");
1148# endif
1149# ifdef IXANY
1150 FOO (IXANY, "IXANY");
1151# endif
1152# ifdef IMAXBEL
1153 FOO (IMAXBEL, "IMAXBEL");
1154# endif
1155
1156 fprintf (stderr, "\n");
1157
1158# undef FOO
1159# define FOO(entry, name) \
1160 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1161
1162 FOO (VINTR, "VINTR");
1163 FOO (VQUIT, "VQUIT");
1164 FOO (VERASE, "VERASE");
1165 FOO (VKILL, "VKILL");
1166 FOO (VEOF, "VEOF");
1167 FOO (VEOL, "VEOL");
1168# ifdef VEOL2
1169 FOO (VEOL2, "VEOL2");
1170# endif
1171# ifdef VSWTC
1172 FOO (VSWTC, "VSWTC");
1173# endif
1174# ifdef VSWTCH
1175 FOO (VSWTCH, "VSWTCH");
1176# endif
1177 FOO (VSTART, "VSTART");
1178 FOO (VSTOP, "VSTOP");
1179 FOO (VSUSP, "VSUSP");
1180# ifdef VDSUSP
1181 FOO (VDSUSP, "VDSUSP");
1182# endif
1183# ifdef VREPRINT
1184 FOO (VREPRINT, "VREPRINT");
1185# endif
1186# ifdef VDISCRD
1187 FOO (VDISCRD, "VDISCRD");
1188# endif
1189# ifdef VWERSE
1190 FOO (VWERSE, "VWERSE");
1191# endif
1192# ifdef VLNEXT
1193 FOO (VLNEXT, "VLNEXT");
1194# endif
1195
1196 fprintf (stderr, "\n");
1197# undef FOO
1198# endif /* HAVE_TERMIOS_H */
1199#endif /* DEBUG_TTYMODE */
1200} 1467}
1201 1468
1202/*----------------------------------------------------------------------*/ 1469/*----------------------------------------------------------------------*/
1203/* 1470/*
1204 * Run the command in a subprocess and return a file descriptor for the 1471 * Run the command in a subprocess and return a file descriptor for the
… …
1216 if (pty->pty >= 0) 1483 if (pty->pty >= 0)
1217 { 1484 {
1218 if (getfd_hook) 1485 if (getfd_hook)
1219 pty->pty = (*getfd_hook) (pty->pty); 1486 pty->pty = (*getfd_hook) (pty->pty);
1220 1487
1221 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1488 if (pty->pty < 0)
1222 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1489 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1223 } 1490 }
1224 } 1491 }
1225 else 1492 else
1226#endif 1493#endif
1227 if (!pty->get ()) 1494 if (!pty->get ())
1228 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1495 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1229 1496
1230 int er; 1497 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1498
1499 struct termios tio = def_tio;
1231 1500
1232#ifndef NO_BACKSPACE_KEY 1501#ifndef NO_BACKSPACE_KEY
1233 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1502 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1234 er = rs[Rs_backspace_key][0]; 1503 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1235 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1504 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1236 er = '\177'; /* the initial state anyway */ 1505 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1237 else
1238#endif 1506#endif
1239 er = -1;
1240 1507
1241 rxvt_get_ttymode (&tio, er); 1508 /* init terminal attributes */
1242 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1509 cfsetospeed (&tio, BAUDRATE);
1510 cfsetispeed (&tio, BAUDRATE);
1511 tcsetattr (pty->tty, TCSANOW, &tio);
1243 pty->set_utf8_mode (enc_utf8); 1512 pty->set_utf8_mode (enc_utf8);
1244 1513
1245 /* set initial window size */ 1514 /* set initial window size */
1246 tt_winch (); 1515 tt_winch ();
1247 1516
… …
1283 1552
1284 _exit (EXIT_FAILURE); 1553 _exit (EXIT_FAILURE);
1285 1554
1286 default: 1555 default:
1287 if (!option (Opt_utmpInhibit)) 1556 if (!option (Opt_utmpInhibit))
1557 {
1558#ifdef LOG_ONLY_ON_LOGIN
1559 bool login_shell = option (Opt_loginShell);
1560#else
1561 bool login_shell = true;
1562#endif
1288 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1563 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1564 }
1289 1565
1290 pty->close_tty (); 1566 pty->close_tty ();
1291 1567
1292 child_ev.start (cmd_pid); 1568 child_ev.start (cmd_pid);
1293 1569
… …
1307rxvt_term::run_child (const char *const *argv) 1583rxvt_term::run_child (const char *const *argv)
1308{ 1584{
1309 char *login; 1585 char *login;
1310 1586
1311 if (option (Opt_console)) 1587 if (option (Opt_console))
1588 {
1312 { /* be virtual console, fail silently */ 1589 /* be virtual console, fail silently */
1313#ifdef TIOCCONS 1590#ifdef TIOCCONS
1314 unsigned int on = 1; 1591 unsigned int on = 1;
1315 1592
1316 ioctl (STDIN_FILENO, TIOCCONS, &on); 1593 ioctl (STDIN_FILENO, TIOCCONS, &on);
1317#elif defined (SRIOCSREDIR) 1594#elif defined (SRIOCSREDIR)
1318 int fd; 1595 int fd;
1319 1596
1320 fd = open (CONSOLE, O_WRONLY, 0); 1597 fd = open (CONSOLE, O_WRONLY, 0);
1321 if (fd >= 0) 1598 if (fd >= 0)
1322 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1599 {
1600 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1323 close (fd); 1601 close (fd);
1324#endif /* SRIOCSREDIR */ 1602 }
1603#endif /* SRIOCSREDIR */
1325 } 1604 }
1326 1605
1327 /* reset signals and spin off the command interpreter */ 1606 /* reset signals and spin off the command interpreter */
1328 signal (SIGINT, SIG_DFL); 1607 signal (SIGINT, SIG_DFL);
1329 signal (SIGQUIT, SIG_DFL); 1608 signal (SIGQUIT, SIG_DFL);
1330 signal (SIGCHLD, SIG_DFL); 1609 signal (SIGCHLD, SIG_DFL);
1331 signal (SIGHUP, SIG_DFL); 1610 signal (SIGHUP, SIG_DFL);
1332 signal (SIGPIPE, SIG_DFL); 1611 signal (SIGPIPE, SIG_DFL);
1333 /* 1612 /*
1334 * mimick login's behavior by disabling the job control signals 1613 * mimic login's behavior by disabling the job control signals
1335 * a shell that wants them can turn them back on 1614 * a shell that wants them can turn them back on
1336 */ 1615 */
1337#ifdef SIGTSTP 1616#ifdef SIGTSTP
1338 signal (SIGTSTP, SIG_IGN); 1617 signal (SIGTSTP, SIG_IGN);
1339 signal (SIGTTIN, SIG_IGN); 1618 signal (SIGTTIN, SIG_IGN);
1340 signal (SIGTTOU, SIG_IGN); 1619 signal (SIGTTOU, SIG_IGN);
1341#endif /* SIGTSTP */ 1620#endif /* SIGTSTP */
1342
1343 // unblock signals (signals are blocked by iom.C
1344 sigset_t ss;
1345 sigemptyset (&ss);
1346 sigprocmask (SIG_SETMASK, &ss, 0);
1347 1621
1348 /* command interpreter path */ 1622 /* command interpreter path */
1349 if (argv) 1623 if (argv)
1350 { 1624 {
1351# ifdef DEBUG_CMD 1625# ifdef DEBUG_CMD
… …
1363 const char *argv0, *shell; 1637 const char *argv0, *shell;
1364 1638
1365 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1639 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1366 shell = "/bin/sh"; 1640 shell = "/bin/sh";
1367 1641
1368 argv0 = (const char *)rxvt_basename (shell); 1642 argv0 = rxvt_basename (shell);
1369 1643
1370 if (option (Opt_loginShell)) 1644 if (option (Opt_loginShell))
1371 { 1645 {
1372 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1646 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1373 1647

Diff Legend

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