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

Diff Legend

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