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.184 by sasha, Fri Jun 8 20:04:12 2007 UTC vs.
Revision 1.305 by sf-exg, Tue Dec 6 11:29:52 2011 UTC

… …
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 14 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support
14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <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 TINTING 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#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 538
192 MEvent.time = CurrentTime; 539 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 540 MEvent.button = AnyButton;
194 want_refresh = 1; 541 want_refresh = 1;
195 priv_modes = SavedModes = PrivMode_Default; 542 priv_modes = SavedModes = PrivMode_Default;
196 ncol = 80; 543 ncol = 80;
197 nrow = 24; 544 nrow = 24;
198 int_bwidth = INTERNALBORDERWIDTH; 545 int_bwidth = INTERNALBORDERWIDTH;
199 ext_bwidth = EXTERNALBORDERWIDTH; 546 ext_bwidth = EXTERNALBORDERWIDTH;
200 lineSpace = LINESPACE; 547 lineSpace = LINESPACE;
548 letterSpace = LETTERSPACE;
201 saveLines = SAVELINES; 549 saveLines = SAVELINES;
202 numpix_colors = TOTAL_COLORS;
203 550
204 refresh_limit = 1;
205 refresh_type = SLOW_REFRESH; 551 refresh_type = SLOW_REFRESH;
206 552
207 oldcursor.row = oldcursor.col = -1; 553 oldcursor.row = oldcursor.col = -1;
208#ifdef XPM_BACKGROUND
209 /* bgPixmap.w = bgPixmap.h = 0; */
210 bgPixmap.x = bgPixmap.y = 0;
211 bgPixmap.pixmap = None;
212#endif
213
214 last_bot = last_state = -1;
215 554
216 set_option (Opt_scrollBar); 555 set_option (Opt_scrollBar);
217 set_option (Opt_scrollTtyOutput); 556 set_option (Opt_scrollTtyOutput);
218 set_option (Opt_jumpScroll); 557 set_option (Opt_jumpScroll);
558 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen); 559 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll); 560 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs); 561 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles); 562 set_option (Opt_intensityStyles);
223 563 set_option (Opt_iso14755);
224 return true; 564 set_option (Opt_iso14755_52);
225} 565 set_option (Opt_buffered);
226
227void
228rxvt_term::init_secondary ()
229{
230 int i;
231
232 /*
233 * Close all unused file descriptors
234 * We don't want them, we don't need them.
235 */
236 if ((i = open ("/dev/null", O_RDONLY)) < 0)
237 {
238 /* TODO: BOO HISS */
239 dup2 (STDERR_FILENO, STDIN_FILENO);
240 }
241 else if (i > STDIN_FILENO)
242 {
243 dup2 (i, STDIN_FILENO);
244 close (i);
245 }
246
247 dup2 (STDERR_FILENO, STDOUT_FILENO);
248
249#if 0 // schmorp sayz closing filies is murder
250 for (i = STDERR_FILENO + 1; i < num_fds; i++)
251 {
252#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
253 if (i == 4 || i == 7)
254 continue;
255#endif
256 close (i);
257 }
258#endif
259} 566}
260 567
261/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
262const char ** 569const char **
263rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
264{ 571{
265 int i, r_argc; 572 int i, r_argc;
266 char *val;
267 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
268 574
269 /* 575 /*
270 * Look for -e option. Find => split and make cmd_argv[] of command args 576 * Look for -e option. Find => split and make cmd_argv[] of command args
271 */ 577 */
272 for (r_argc = 0; r_argc < argc; r_argc++) 578 for (r_argc = 0; r_argc < argc; r_argc++)
273 if (!strcmp (argv[r_argc], "-e")) 579 if (!strcmp (argv[r_argc], "-e"))
274 break; 580 break;
275 581
276 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
277
278 for (i = 0; i < r_argc; i++)
279 r_argv[i] = (const char *)argv[i];
280
281 r_argv[i] = NULL;
282
283 if (r_argc == argc) 582 if (r_argc == argc)
284 cmd_argv = NULL; 583 cmd_argv = NULL;
584 else if (!argv[r_argc + 1])
585 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
285 else 586 else
286 { 587 {
287 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); 588 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
288 589
289 for (i = 0; i < argc - r_argc - 1; i++) 590 for (i = 0; i < argc - r_argc - 1; i++)
290 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 591 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
291 592
292 cmd_argv[i] = NULL; 593 cmd_argv[i] = NULL;
293 } 594 }
294 595
295 rs[Rs_name] = rxvt_r_basename (argv[0]); 596 rs[Rs_name] = rxvt_basename (argv[0]);
296 597
297 /* 598 /*
298 * Open display, get options/resources and create the window 599 * Open display, get options/resources and create the window
299 */ 600 */
300 601
301 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 602 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
302 rs[Rs_display_name] = ":0"; 603 rs[Rs_display_name] = ":0";
303 604
304 get_options (r_argc, r_argv); 605 get_options (r_argc, argv);
305 606
306 if (!(display = displays.get (rs[Rs_display_name]))) 607 if (!(display = displays.get (rs[Rs_display_name])))
307 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 608 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
308 609
309 // using a local pointer decreases code size a lot 610 // using a local pointer decreases code size a lot
… …
315#if XFT 616#if XFT
316 if (rs[Rs_depth]) 617 if (rs[Rs_depth])
317 select_visual (strtol (rs[Rs_depth], 0, 0)); 618 select_visual (strtol (rs[Rs_depth], 0, 0));
318#endif 619#endif
319 620
320 free (r_argv);
321
322 for (int i = NUM_RESOURCES; i--; ) 621 for (int i = NUM_RESOURCES; i--; )
323 if (rs [i] == resval_undef) 622 if (rs [i] == resval_undef)
324 rs [i] = 0; 623 rs [i] = 0;
325 624
326#if ENABLE_PERL 625#if ENABLE_PERL
… …
333 { 632 {
334 rxvt_perl.init (this); 633 rxvt_perl.init (this);
335 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 634 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
336 } 635 }
337#endif 636#endif
637
638 // must be called after initialising the perl interpreter as it
639 // may invoke the `on_register_command' hook
640 extract_keysym_resources ();
338 641
339 /* 642 /*
340 * set any defaults not already set 643 * set any defaults not already set
341 */ 644 */
342 if (cmd_argv && cmd_argv[0]) 645 if (cmd_argv && cmd_argv[0])
343 { 646 {
344 if (!rs[Rs_title]) 647 if (!rs[Rs_title])
345 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 648 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
649
346 if (!rs[Rs_iconName]) 650 if (!rs[Rs_iconName])
347 rs[Rs_iconName] = rs[Rs_title]; 651 rs[Rs_iconName] = rs[Rs_title];
348 } 652 }
349 else 653 else
350 { 654 {
351 if (!rs[Rs_title]) 655 if (!rs[Rs_title])
352 rs[Rs_title] = rs[Rs_name]; 656 rs[Rs_title] = rs[Rs_name];
657
353 if (!rs[Rs_iconName]) 658 if (!rs[Rs_iconName])
354 rs[Rs_iconName] = rs[Rs_name]; 659 rs[Rs_iconName] = rs[Rs_name];
355 } 660 }
356 661
357 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 662 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
364 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 669 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
365 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 670 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
366 671
367 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 672 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
368 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 673 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
674
675 if (rs[Rs_letterSpace])
676 letterSpace = atoi (rs[Rs_letterSpace]);
369#endif 677#endif
370 678
371#ifdef POINTER_BLANK 679#ifdef POINTER_BLANK
372 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 680 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
373 pointerBlankDelay = i; 681 pointerBlankDelay = i;
… …
377 685
378 /* no point having a scrollbar without having any scrollback! */ 686 /* no point having a scrollbar without having any scrollback! */
379 if (!saveLines) 687 if (!saveLines)
380 set_option (Opt_scrollBar, 0); 688 set_option (Opt_scrollBar, 0);
381 689
382#ifdef PRINTPIPE
383 if (!rs[Rs_print_pipe])
384 rs[Rs_print_pipe] = PRINTPIPE;
385#endif
386
387 if (!rs[Rs_cutchars]) 690 if (!rs[Rs_cutchars])
388 rs[Rs_cutchars] = CUTCHARS; 691 rs[Rs_cutchars] = CUTCHARS;
389 692
390#ifndef NO_BACKSPACE_KEY 693#ifndef NO_BACKSPACE_KEY
391 if (!rs[Rs_backspace_key]) 694 if (!rs[Rs_backspace_key])
392# ifdef DEFAULT_BACKSPACE 695# ifdef DEFAULT_BACKSPACE
393 key_backspace = DEFAULT_BACKSPACE; 696 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
394# else 697# else
395 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 698 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
396# endif 699# endif
397 else
398 {
399 val = strdup (rs[Rs_backspace_key]);
400 rxvt_Str_trim (val);
401 rxvt_Str_escaped (val);
402 key_backspace = val;
403 }
404#endif 700#endif
405 701
406#ifndef NO_DELETE_KEY 702#ifndef NO_DELETE_KEY
407 if (!rs[Rs_delete_key]) 703 if (!rs[Rs_delete_key])
408# ifdef DEFAULT_DELETE 704# ifdef DEFAULT_DELETE
409 key_delete = DEFAULT_DELETE; 705 rs[Rs_delete_key] = DEFAULT_DELETE;
410# else 706# else
411 key_delete = "\033[3~"; 707 rs[Rs_delete_key] = "\033[3~";
412# endif 708# endif
413 else
414 {
415 val = strdup (rs[Rs_delete_key]);
416 rxvt_Str_trim (val);
417 rxvt_Str_escaped (val);
418 key_delete = val;
419 }
420#endif 709#endif
421 if (rs[Rs_answerbackstring])
422 {
423 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
424 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
425 }
426 710
427#ifdef HAVE_SCROLLBARS 711 scrollBar.setup (this);
428 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
429#endif
430 712
431#ifdef XTERM_REVERSE_VIDEO 713#ifdef XTERM_REVERSE_VIDEO
432 /* this is how xterm implements reverseVideo */ 714 /* this is how xterm implements reverseVideo */
433 if (option (Opt_reverseVideo)) 715 if (option (Opt_reverseVideo))
434 { 716 {
… …
454 color_aliases (Color_fg); 736 color_aliases (Color_fg);
455 color_aliases (Color_bg); 737 color_aliases (Color_bg);
456#ifndef NO_CURSORCOLOR 738#ifndef NO_CURSORCOLOR
457 color_aliases (Color_cursor); 739 color_aliases (Color_cursor);
458 color_aliases (Color_cursor2); 740 color_aliases (Color_cursor2);
459#endif /* NO_CURSORCOLOR */ 741#endif /* NO_CURSORCOLOR */
460 color_aliases (Color_pointer_fg); 742 color_aliases (Color_pointer_fg);
461 color_aliases (Color_pointer_bg); 743 color_aliases (Color_pointer_bg);
462 color_aliases (Color_border); 744 color_aliases (Color_border);
463#ifndef NO_BOLD_UNDERLINE_REVERSE 745#ifndef NO_BOLD_UNDERLINE_REVERSE
464 color_aliases (Color_BD); 746 color_aliases (Color_BD);
465 color_aliases (Color_UL); 747 color_aliases (Color_UL);
466 color_aliases (Color_RV); 748 color_aliases (Color_RV);
467#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 749#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
468 750
469 if (!rs[Rs_color + Color_border]) 751 if (!rs[Rs_color + Color_border])
470 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 752 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
471 753
472 return cmd_argv; 754 return cmd_argv;
755}
756
757/*----------------------------------------------------------------------*/
758void
759rxvt_term::init (int argc, const char *const *argv)
760{
761 SET_R (this);
762 set_locale ("");
763 set_environ (envv); // a few things in X do not call setlocale :(
764
765 init_vars ();
766
767 const char **cmd_argv = init_resources (argc, argv);
768
769#ifdef KEYSYM_RESOURCE
770 keyboard->register_done ();
771#endif
772
773 if (const char *path = rs[Rs_chdir])
774 if (*path) // ignored if empty
775 {
776 if (*path != '/')
777 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
778
779 if (chdir (path))
780 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
781 }
782
783 if (option (Opt_scrollBar))
784 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
785
786 pty = ptytty::create ();
787
788#ifdef HAVE_AFTERIMAGE
789 set_application_name ((char *)rs[Rs_name]);
790 set_output_threshold (OUTPUT_LEVEL_WARNING);
791#endif
792
793 // must be called before create_windows, because the latter may call set_icon
794#ifdef HAVE_PIXBUF
795 g_type_init ();
796#endif
797
798 create_windows (argc, argv);
799
800 init_xlocale ();
801
802 scr_poweron (); // initialize screen
803
804#if 0
805 XSynchronize (dpy, True);
806#endif
807
808 if (option (Opt_scrollBar))
809 scrollBar.resize (); /* create and map scrollbar */
810#ifdef HAVE_BG_PIXMAP
811 {
812 bg_init ();
813
814#ifdef ENABLE_TRANSPARENCY
815 if (option (Opt_transparent))
816 {
817 bg_set_transparent ();
818
819 if (rs [Rs_blurradius])
820 bg_set_blur (rs [Rs_blurradius]);
821
822 if (ISSET_PIXCOLOR (Color_tint))
823 bg_set_tint (pix_colors_focused [Color_tint]);
824
825 if (rs [Rs_shade])
826 bg_set_shade (rs [Rs_shade]);
827
828 bg_set_root_pixmap ();
829 XSelectInput (dpy, display->root, PropertyChangeMask);
830 rootwin_ev.start (display, display->root);
831 }
832#endif
833
834#ifdef BG_IMAGE_FROM_FILE
835 if (rs[Rs_backgroundPixmap])
836 {
837 if (bg_set_file (rs[Rs_backgroundPixmap]))
838 if (!bg_window_position_sensitive ())
839 update_background ();
840 }
841#endif
842 }
843#endif
844
845#if ENABLE_PERL
846 rootwin_ev.start (display, display->root);
847#endif
848
849 set_colorfgbg ();
850
851 init_command (cmd_argv);
852
853 free (cmd_argv);
854
855 if (pty->pty >= 0)
856 pty_ev.start (pty->pty, ev::READ);
857
858 HOOK_INVOKE ((this, HOOK_START, DT_END));
859
860#if ENABLE_XEMBED
861 if (rs[Rs_embed])
862 {
863 long info[2] = { 0, XEMBED_MAPPED };
864
865 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
866 32, PropModeReplace, (unsigned char *)&info, 2);
867 }
868#endif
869
870#if HAVE_STARTUP_NOTIFICATION
871 SnDisplay *snDisplay;
872 SnLauncheeContext *snContext;
873
874 snDisplay = sn_display_new (dpy, NULL, NULL);
875 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
876
877 /* Tell the window manager that this window is part of the startup context */
878 if (snContext)
879 sn_launchee_context_setup_window (snContext, parent);
880#endif
881
882 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent);
884
885#if HAVE_STARTUP_NOTIFICATION
886 if (snContext)
887 {
888 /* Mark the startup process as complete */
889 sn_launchee_context_complete (snContext);
890
891 sn_launchee_context_unref (snContext);
892 }
893
894 sn_display_unref (snDisplay);
895#endif
896
897 refresh_check ();
473} 898}
474 899
475/*----------------------------------------------------------------------*/ 900/*----------------------------------------------------------------------*/
476void 901void
477rxvt_term::init_env () 902rxvt_term::init_env ()
478{ 903{
479 int i;
480 unsigned int u;
481 char *val; 904 char *val;
482 905
483#ifdef DISPLAY_IS_IP 906#ifdef DISPLAY_IS_IP
484 /* Fixup display_name for export over pty to any interested terminal 907 /* Fixup display_name for export over pty to any interested terminal
485 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 908 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
493 */ 916 */
494 val = rxvt_network_display (rs[Rs_display_name]); 917 val = rxvt_network_display (rs[Rs_display_name]);
495 rs[Rs_display_name] = (const char *)val; 918 rs[Rs_display_name] = (const char *)val;
496 919
497 if (val == NULL) 920 if (val == NULL)
498#endif /* DISPLAY_IS_IP */ 921#endif /* DISPLAY_IS_IP */
499 val = XDisplayString (dpy); 922 val = XDisplayString (dpy);
500 923
501 if (rs[Rs_display_name] == NULL) 924 if (rs[Rs_display_name] == NULL)
502 rs[Rs_display_name] = val; /* use broken `:0' value */ 925 rs[Rs_display_name] = val; /* use broken `:0' value */
503 926
504 i = strlen (val);
505 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 927 env_display = (char *)rxvt_malloc (strlen (val) + 9);
506 928
507 sprintf (env_display, "DISPLAY=%s", val); 929 sprintf (env_display, "DISPLAY=%s", val);
508 930
509 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 931 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
510 932
511 /* add entries to the environment: 933 /* add entries to the environment:
512 * @ DISPLAY: in case we started with -display 934 * @ DISPLAY: in case we started with -display
513 * @ WINDOWID: X window id number of the window 935 * @ WINDOWID: X window id number of the window
514 * @ COLORTERM: terminal sub-name and also indicates its color 936 * @ COLORTERM: terminal sub-name and also indicates its color
… …
531 else 953 else
532 putenv ("COLORTERM=" COLORTERMENVFULL); 954 putenv ("COLORTERM=" COLORTERMENVFULL);
533 955
534 if (rs[Rs_term_name] != NULL) 956 if (rs[Rs_term_name] != NULL)
535 { 957 {
536 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 958 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
537 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 959 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
538 putenv (env_term); 960 putenv (env_term);
539 } 961 }
540 else 962 else
541 putenv ("TERM=" TERMENV); 963 putenv ("TERM=" TERMENV);
… …
543#ifdef HAVE_UNSETENV 965#ifdef HAVE_UNSETENV
544 /* avoid passing old settings and confusing term size */ 966 /* avoid passing old settings and confusing term size */
545 unsetenv ("LINES"); 967 unsetenv ("LINES");
546 unsetenv ("COLUMNS"); 968 unsetenv ("COLUMNS");
547 unsetenv ("TERMCAP"); /* terminfo should be okay */ 969 unsetenv ("TERMCAP"); /* terminfo should be okay */
548#endif /* HAVE_UNSETENV */ 970#endif /* HAVE_UNSETENV */
549} 971}
550 972
551/*----------------------------------------------------------------------*/ 973/*----------------------------------------------------------------------*/
552/* 974/*
553 * This is more or less stolen straight from XFree86 xterm. 975 * This is more or less stolen straight from XFree86 xterm.
… …
574 996
575 this->locale = "C"; 997 this->locale = "C";
576 } 998 }
577 999
578 1000
579 this->locale = rxvt_strdup (this->locale); 1001 this->locale = strdup (this->locale);
580 SET_LOCALE (this->locale); 1002 SET_LOCALE (this->locale);
581 mbstate.reset (); 1003 mbstate.reset ();
582#endif 1004#endif
583 1005
584#if HAVE_NL_LANGINFO 1006#if HAVE_NL_LANGINFO
… …
641 priv_modes |= PrivMode_Keypress; 1063 priv_modes |= PrivMode_Keypress;
642 if (!option (Opt_jumpScroll)) 1064 if (!option (Opt_jumpScroll))
643 priv_modes |= PrivMode_smoothScroll; 1065 priv_modes |= PrivMode_smoothScroll;
644 1066
645#ifndef NO_BACKSPACE_KEY 1067#ifndef NO_BACKSPACE_KEY
646 if (strcmp (key_backspace, "DEC") == 0) 1068 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
647 priv_modes |= PrivMode_HaveBackSpace; 1069 priv_modes |= PrivMode_HaveBackSpace;
648#endif 1070#endif
649 1071
650 /* add value for scrollBar */ 1072 /* add value for scrollBar */
651 if (scrollBar.state) 1073 if (scrollBar.state)
… …
657 run_command (argv); 1079 run_command (argv);
658} 1080}
659 1081
660/*----------------------------------------------------------------------*/ 1082/*----------------------------------------------------------------------*/
661void 1083void
662rxvt_term::Get_Colours () 1084rxvt_term::get_colours ()
663{ 1085{
664 int i; 1086 int i;
665 1087
666#ifdef OFF_FOCUS_FADING 1088#ifdef OFF_FOCUS_FADING
667 pix_colors = pix_colors_focused; 1089 pix_colors = pix_colors_focused;
668#endif 1090#endif
669 1091
670 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1092 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
671 { 1093 {
672 const char *name = rs[Rs_color + i]; 1094 const char *name = rs[Rs_color + i];
673 1095
674 if (!name) 1096 if (!name)
… …
727 * get scrollBar shadow colors 1149 * get scrollBar shadow colors
728 * 1150 *
729 * The calculations of topShadow/bottomShadow values are adapted 1151 * The calculations of topShadow/bottomShadow values are adapted
730 * from the fvwm window manager. 1152 * from the fvwm window manager.
731 */ 1153 */
732#ifdef KEEP_SCROLLCOLOR 1154#ifdef RXVT_SCROLLBAR
733 if (depth <= 2) 1155 if (depth <= 2)
734 { 1156 {
735 /* Monochrome */ 1157 /* Monochrome */
736 alias_color (Color_scroll, Color_fg); 1158 alias_color (Color_scroll, Color_fg);
737 alias_color (Color_topShadow, Color_bg); 1159 alias_color (Color_topShadow, Color_bg);
… …
752 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1174 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
753 cscroll.a) 1175 cscroll.a)
754 )) 1176 ))
755 alias_color (Color_topShadow, Color_White); 1177 alias_color (Color_topShadow, Color_White);
756 } 1178 }
757#endif /* KEEP_SCROLLCOLOR */ 1179#endif
758 1180
759#ifdef OFF_FOCUS_FADING 1181#ifdef OFF_FOCUS_FADING
760 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1182 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
761 update_fade_color (i); 1183 update_fade_color (i);
762#endif 1184#endif
… …
770 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1192 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
771 { 1193 {
772 int i = atoi (rs[Rs_color + idx]); 1194 int i = atoi (rs[Rs_color + idx]);
773 1195
774 if (i >= 8 && i <= 15) 1196 if (i >= 8 && i <= 15)
775 { /* bright colors */ 1197 /* bright colors */
776 i -= 8;
777 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1198 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
778 return; 1199 else if (i >= 0 && i <= 7)
779 } 1200 /* normal colors */
780
781 if (i >= 0 && i <= 7) /* normal colors */
782 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1201 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
783 } 1202 }
784} 1203}
785 1204
786/*----------------------------------------------------------------------*/ 1205/*----------------------------------------------------------------------*/
… …
870 1289
871 if (i) 1290 if (i)
872 ModMetaMask = modmasks[i - 1]; 1291 ModMetaMask = modmasks[i - 1];
873} 1292}
874 1293
1294void
1295rxvt_term::set_icon (const char *file)
1296{
1297#ifdef HAVE_AFTERIMAGE
1298 init_asv ();
1299
1300 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1301 if (!im)
1302 {
1303 rxvt_warn ("Loading image icon failed, continuing without.\n");
1304 return;
1305 }
1306
1307 unsigned int w = im->width;
1308 unsigned int h = im->height;
1309
1310 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1311 {
1312 rxvt_warn ("Icon image too big, continuing without.\n");
1313 destroy_asimage (&im);
1314 return;
1315 }
1316
1317 ASImage *result = scale_asimage (asv, im,
1318 w, h, ASA_ARGB32,
1319 100, ASIMAGE_QUALITY_DEFAULT);
1320 destroy_asimage (&im);
1321
1322 if (!result)
1323 {
1324 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1325 return;
1326 }
1327
1328 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1329 if (buffer)
1330 {
1331 ARGB32 *asbuf = result->alt.argb32;
1332 buffer [0] = w;
1333 buffer [1] = h;
1334
1335 for (unsigned int i = 0; i < w * h; ++i)
1336 buffer [i + 2] = asbuf [i];
1337
1338 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1339 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1340 free (buffer);
1341 }
1342 else
1343 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1344
1345 destroy_asimage (&result);
1346#endif
1347
1348#ifdef HAVE_PIXBUF
1349 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1350 if (!pixbuf)
1351 {
1352 rxvt_warn ("Loading image icon failed, continuing without.\n");
1353 return;
1354 }
1355
1356 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1357 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1358
1359 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1360 {
1361 rxvt_warn ("Icon image too big, continuing without.\n");
1362 g_object_unref (pixbuf);
1363 return;
1364 }
1365
1366 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1367 {
1368 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1369 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1370 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1371
1372 buffer [0] = w;
1373 buffer [1] = h;
1374 for (int i = 0; i < h; i++)
1375 {
1376 for (int j = 0; j < w; j++)
1377 {
1378 unsigned char *pixel = row + j * channels;
1379 long value;
1380
1381 if (channels == 4)
1382 value = pixel[3];
1383 else
1384 value = (unsigned char)0x00ff;
1385
1386 value = (value << 8) + pixel[0];
1387 value = (value << 8) + pixel[1];
1388 value = (value << 8) + pixel[2];
1389 buffer[(i * w + j) + 2] = value;
1390 }
1391
1392 row += rowstride;
1393 }
1394
1395 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1396 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1397 free (buffer);
1398 }
1399 else
1400 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1401
1402 g_object_unref (pixbuf);
1403#endif
1404}
1405
875/*----------------------------------------------------------------------*/ 1406/*----------------------------------------------------------------------*/
876/* rxvt_Create_Windows () - Open and map the window */ 1407/* Open and map the window */
877void 1408void
878rxvt_term::create_windows (int argc, const char *const *argv) 1409rxvt_term::create_windows (int argc, const char *const *argv)
879{ 1410{
880 XClassHint classHint; 1411 XClassHint classHint;
881 XWMHints wmHint; 1412 XWMHints wmHint;
882#if ENABLE_FRILLS 1413#if ENABLE_FRILLS
883 MWMHints mwmhints; 1414 MWMHints mwmhints = { };
884#endif 1415#endif
885 XGCValues gcvalue; 1416 XGCValues gcvalue;
886 XSetWindowAttributes attributes; 1417 XSetWindowAttributes attributes;
887 Window top, parent; 1418 Window top, parent;
888 1419
889 dLocal (Display *, dpy); 1420 dLocal (Display *, dpy);
890 1421
891 /* grab colors before netscape does */ 1422 /* grab colors before netscape does */
892 Get_Colours (); 1423 get_colours ();
893 1424
894 if (!set_fonts ()) 1425 if (!set_fonts ())
895 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1426 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
896 1427
897 parent = display->root; 1428 parent = display->root;
… …
901#if ENABLE_FRILLS 1432#if ENABLE_FRILLS
902 if (option (Opt_borderLess)) 1433 if (option (Opt_borderLess))
903 { 1434 {
904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1435 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905 { 1436 {
906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1437 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
907 attributes.override_redirect = true; 1438 attributes.override_redirect = true;
908 mwmhints.flags = 0;
909 } 1439 }
910 else 1440 else
911 { 1441 {
912 mwmhints.flags = MWM_HINTS_DECORATIONS; 1442 mwmhints.flags = MWM_HINTS_DECORATIONS;
913 mwmhints.decorations = 0;
914 } 1443 }
915 } 1444 }
916 else
917 mwmhints.flags = 0;
918#endif 1445#endif
919 1446
920#if ENABLE_XEMBED 1447#if ENABLE_XEMBED
921 if (rs[Rs_embed]) 1448 if (rs[Rs_embed])
922 { 1449 {
… …
931 } 1458 }
932#endif 1459#endif
933 1460
934 window_calc (0, 0); 1461 window_calc (0, 0);
935 1462
936 /* sub-window placement & size in rxvt_resize_subwindows () */ 1463 /* sub-window placement & size in rxvt_term::resize_all_windows () */
937 attributes.background_pixel = pix_colors_focused [Color_border]; 1464 attributes.background_pixel = pix_colors_focused [Color_border];
938 attributes.border_pixel = pix_colors_focused [Color_border]; 1465 attributes.border_pixel = pix_colors_focused [Color_border];
939 attributes.colormap = cmap; 1466 attributes.colormap = cmap;
940 1467
941 top = XCreateWindow (dpy, parent, 1468 top = XCreateWindow (dpy, parent,
… …
944 ext_bwidth, 1471 ext_bwidth,
945 depth, InputOutput, visual, 1472 depth, InputOutput, visual,
946 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1473 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
947 &attributes); 1474 &attributes);
948 1475
949 this->parent[0] = top; 1476 this->parent = top;
950 1477
951 old_width = szHint.width; 1478 old_width = szHint.width;
952 old_height = szHint.height; 1479 old_height = szHint.height;
953 1480
954 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1481 set_title (rs [Rs_title]);
955 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1482 set_icon_name (rs [Rs_iconName]);
956 1483
957 classHint.res_name = (char *)rs[Rs_name]; 1484 classHint.res_name = (char *)rs[Rs_name];
958 classHint.res_class = (char *)RESCLASS; 1485 classHint.res_class = (char *)RESCLASS;
959 1486
960 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1487 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
962 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1489 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
963 wmHint.window_group = top; 1490 wmHint.window_group = top;
964 1491
965 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1492 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
966 &szHint, &wmHint, &classHint); 1493 &szHint, &wmHint, &classHint);
1494#if ENABLE_EWMH
1495 /*
1496 * set up icon hint
1497 * rs [Rs_iconfile] is path to icon
1498 */
1499
1500 if (rs [Rs_iconfile])
1501 {
1502 set_icon (rs [Rs_iconfile]);
1503 }
1504#endif
967 1505
968#if ENABLE_FRILLS 1506#if ENABLE_FRILLS
969 if (mwmhints.flags) 1507 if (mwmhints.flags)
970 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1508 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
971 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1509 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
976#if ENABLE_EWMH 1514#if ENABLE_EWMH
977 xa[XA_NET_WM_PING], 1515 xa[XA_NET_WM_PING],
978#endif 1516#endif
979 }; 1517 };
980 1518
981 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1519 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
982 1520
983#if ENABLE_FRILLS 1521#if ENABLE_FRILLS
984 if (rs[Rs_transient_for]) 1522 if (rs[Rs_transient_for])
985 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1523 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
986#endif 1524#endif
… …
1005 1543
1006 termwin_ev.start (display, top); 1544 termwin_ev.start (display, top);
1007 1545
1008 /* vt cursor: Black-on-White is standard, but this is more popular */ 1546 /* vt cursor: Black-on-White is standard, but this is more popular */
1009 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1547 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1010
1011#ifdef HAVE_SCROLLBARS
1012 /* cursor scrollBar: Black-on-White */
1013 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1014#endif
1015 1548
1016 /* the vt window */ 1549 /* the vt window */
1017 vt = XCreateSimpleWindow (dpy, top, 1550 vt = XCreateSimpleWindow (dpy, top,
1018 window_vt_x, window_vt_y, 1551 window_vt_x, window_vt_y,
1019 width, height, 1552 width, height,
… …
1033 1566
1034 vt_select_input (); 1567 vt_select_input ();
1035 1568
1036 vt_ev.start (display, vt); 1569 vt_ev.start (display, vt);
1037 1570
1038#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL
1040#ifndef HAVE_AFTERIMAGE
1041 && !OPTION (Opt_transparent)
1042#endif
1043 )
1044 {
1045 const char *p = rs[Rs_backgroundPixmap];
1046
1047 if ((p = strchr (p, ';')) != NULL)
1048 {
1049 p++;
1050 scale_pixmap (p);
1051 }
1052
1053 set_bgPixmap (rs[Rs_backgroundPixmap]);
1054 scr_touch (true);
1055 }
1056#endif
1057
1058 /* graphics context for the vt window */ 1571 /* graphics context for the vt window */
1059 gcvalue.foreground = pix_colors[Color_fg]; 1572 gcvalue.foreground = pix_colors[Color_fg];
1060 gcvalue.background = pix_colors[Color_bg]; 1573 gcvalue.background = pix_colors[Color_bg];
1061 gcvalue.graphics_exposures = 0; 1574 gcvalue.graphics_exposures = 0;
1062 1575
… …
1064 GCForeground | GCBackground | GCGraphicsExposures, 1577 GCForeground | GCBackground | GCGraphicsExposures,
1065 &gcvalue); 1578 &gcvalue);
1066 1579
1067 drawable = new rxvt_drawable (this, vt); 1580 drawable = new rxvt_drawable (this, vt);
1068 1581
1069#ifdef RXVT_SCROLLBAR
1070 gcvalue.foreground = pix_colors[Color_topShadow];
1071 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072 gcvalue.foreground = pix_colors[Color_bottomShadow];
1073 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1075 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1076#endif
1077
1078#ifdef OFF_FOCUS_FADING 1582#ifdef OFF_FOCUS_FADING
1079 // initially we are in unfocused state 1583 // initially we are in unfocused state
1080 if (rs[Rs_fade]) 1584 if (rs[Rs_fade])
1081 pix_colors = pix_colors_unfocused; 1585 pix_colors = pix_colors_unfocused;
1082#endif 1586#endif
1083 1587
1084 pointer_unblank (); 1588 pointer_unblank ();
1085 scr_recolour (); 1589 scr_recolour ();
1086}
1087
1088/* ------------------------------------------------------------------------- *
1089 * GET TTY CURRENT STATE *
1090 * ------------------------------------------------------------------------- */
1091void
1092rxvt_get_ttymode (ttymode_t *tio, int erase)
1093{
1094 /*
1095 * standard System V termios interface
1096 */
1097 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1098 {
1099 // return error - use system defaults,
1100 // where possible, and zero elsewhere
1101 memset (tio, 0, sizeof (ttymode_t));
1102
1103 tio->c_cc[VINTR] = CINTR;
1104 tio->c_cc[VQUIT] = CQUIT;
1105 tio->c_cc[VERASE] = CERASE;
1106#ifdef VERASE2
1107 tio->c_cc[VERASE2] = CERASE2;
1108#endif
1109 tio->c_cc[VKILL] = CKILL;
1110 tio->c_cc[VSTART] = CSTART;
1111 tio->c_cc[VSTOP] = CSTOP;
1112 tio->c_cc[VSUSP] = CSUSP;
1113# ifdef VDSUSP
1114 tio->c_cc[VDSUSP] = CDSUSP;
1115# endif
1116# ifdef VREPRINT
1117 tio->c_cc[VREPRINT] = CRPRNT;
1118# endif
1119# ifdef VDISCRD
1120 tio->c_cc[VDISCRD] = CFLUSH;
1121# endif
1122# ifdef VWERSE
1123 tio->c_cc[VWERSE] = CWERASE;
1124# endif
1125# ifdef VLNEXT
1126 tio->c_cc[VLNEXT] = CLNEXT;
1127# endif
1128 }
1129
1130 tio->c_cc[VEOF] = CEOF;
1131 tio->c_cc[VEOL] = VDISABLE;
1132# ifdef VEOL2
1133 tio->c_cc[VEOL2] = VDISABLE;
1134# endif
1135# ifdef VSWTC
1136 tio->c_cc[VSWTC] = VDISABLE;
1137# endif
1138# ifdef VSWTCH
1139 tio->c_cc[VSWTCH] = VDISABLE;
1140# endif
1141# if VMIN != VEOF
1142 tio->c_cc[VMIN] = 1;
1143# endif
1144# if VTIME != VEOL
1145 tio->c_cc[VTIME] = 0;
1146# endif
1147
1148 if (erase != -1)
1149 tio->c_cc[VERASE] = (char)erase;
1150
1151 /* input modes */
1152 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1153# ifdef IMAXBEL
1154 | IMAXBEL
1155# endif
1156 | IXON);
1157
1158 /* output modes */
1159 tio->c_oflag = (OPOST | ONLCR);
1160
1161 /* control modes */
1162 tio->c_cflag = (CS8 | CREAD);
1163
1164 /* line discipline modes */
1165 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1166# if defined (ECHOCTL) && defined (ECHOKE)
1167 | ECHOCTL | ECHOKE
1168# endif
1169 | ECHOE | ECHOK);
1170
1171 /*
1172 * Debugging
1173 */
1174#ifdef DEBUG_TTYMODE
1175#ifdef HAVE_TERMIOS_H
1176 /* c_iflag bits */
1177 fprintf (stderr, "Input flags\n");
1178
1179 /* cpp token stringize doesn't work on all machines <sigh> */
1180# define FOO(flag,name) \
1181 if ((tio->c_iflag) & flag) \
1182 fprintf (stderr, "%s ", name)
1183
1184 /* c_iflag bits */
1185 FOO (IGNBRK, "IGNBRK");
1186 FOO (BRKINT, "BRKINT");
1187 FOO (IGNPAR, "IGNPAR");
1188 FOO (PARMRK, "PARMRK");
1189 FOO (INPCK, "INPCK");
1190 FOO (ISTRIP, "ISTRIP");
1191 FOO (INLCR, "INLCR");
1192 FOO (IGNCR, "IGNCR");
1193 FOO (ICRNL, "ICRNL");
1194 FOO (IXON, "IXON");
1195 FOO (IXOFF, "IXOFF");
1196# ifdef IUCLC
1197 FOO (IUCLC, "IUCLC");
1198# endif
1199# ifdef IXANY
1200 FOO (IXANY, "IXANY");
1201# endif
1202# ifdef IMAXBEL
1203 FOO (IMAXBEL, "IMAXBEL");
1204# endif
1205
1206 fprintf (stderr, "\n");
1207
1208# undef FOO
1209# define FOO(entry, name) \
1210 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1211
1212 FOO (VINTR, "VINTR");
1213 FOO (VQUIT, "VQUIT");
1214 FOO (VERASE, "VERASE");
1215 FOO (VKILL, "VKILL");
1216 FOO (VEOF, "VEOF");
1217 FOO (VEOL, "VEOL");
1218# ifdef VEOL2
1219 FOO (VEOL2, "VEOL2");
1220# endif
1221# ifdef VSWTC
1222 FOO (VSWTC, "VSWTC");
1223# endif
1224# ifdef VSWTCH
1225 FOO (VSWTCH, "VSWTCH");
1226# endif
1227 FOO (VSTART, "VSTART");
1228 FOO (VSTOP, "VSTOP");
1229 FOO (VSUSP, "VSUSP");
1230# ifdef VDSUSP
1231 FOO (VDSUSP, "VDSUSP");
1232# endif
1233# ifdef VREPRINT
1234 FOO (VREPRINT, "VREPRINT");
1235# endif
1236# ifdef VDISCRD
1237 FOO (VDISCRD, "VDISCRD");
1238# endif
1239# ifdef VWERSE
1240 FOO (VWERSE, "VWERSE");
1241# endif
1242# ifdef VLNEXT
1243 FOO (VLNEXT, "VLNEXT");
1244# endif
1245
1246 fprintf (stderr, "\n");
1247# undef FOO
1248# endif /* HAVE_TERMIOS_H */
1249#endif /* DEBUG_TTYMODE */
1250} 1590}
1251 1591
1252/*----------------------------------------------------------------------*/ 1592/*----------------------------------------------------------------------*/
1253/* 1593/*
1254 * Run the command in a subprocess and return a file descriptor for the 1594 * Run the command in a subprocess and return a file descriptor for the
… …
1275 else 1615 else
1276#endif 1616#endif
1277 if (!pty->get ()) 1617 if (!pty->get ())
1278 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1618 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1279 1619
1280 int er; 1620 struct termios tio = def_tio;
1281 1621
1282#ifndef NO_BACKSPACE_KEY 1622#ifndef NO_BACKSPACE_KEY
1283 if (key_backspace[0] && !key_backspace[1]) 1623 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1284 er = key_backspace[0]; 1624 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1285 else if (strcmp (key_backspace, "DEC") == 0) 1625 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1286 er = '\177'; /* the initial state anyway */ 1626 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1287 else
1288#endif 1627#endif
1289 er = -1;
1290 1628
1291 rxvt_get_ttymode (&tio, er); 1629 /* init terminal attributes */
1292 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1630 cfsetospeed (&tio, BAUDRATE);
1631 cfsetispeed (&tio, BAUDRATE);
1632 tcsetattr (pty->tty, TCSANOW, &tio);
1293 pty->set_utf8_mode (enc_utf8); 1633 pty->set_utf8_mode (enc_utf8);
1294 1634
1295 /* set initial window size */ 1635 /* set initial window size */
1296 tt_winch (); 1636 tt_winch ();
1297 1637
… …
1357rxvt_term::run_child (const char *const *argv) 1697rxvt_term::run_child (const char *const *argv)
1358{ 1698{
1359 char *login; 1699 char *login;
1360 1700
1361 if (option (Opt_console)) 1701 if (option (Opt_console))
1702 {
1362 { /* be virtual console, fail silently */ 1703 /* be virtual console, fail silently */
1363#ifdef TIOCCONS 1704#ifdef TIOCCONS
1364 unsigned int on = 1; 1705 unsigned int on = 1;
1365 1706
1366 ioctl (STDIN_FILENO, TIOCCONS, &on); 1707 ioctl (STDIN_FILENO, TIOCCONS, &on);
1367#elif defined (SRIOCSREDIR) 1708#elif defined (SRIOCSREDIR)
… …
1369 1710
1370 fd = open (CONSOLE, O_WRONLY, 0); 1711 fd = open (CONSOLE, O_WRONLY, 0);
1371 if (fd >= 0) 1712 if (fd >= 0)
1372 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1713 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1373 close (fd); 1714 close (fd);
1374#endif /* SRIOCSREDIR */ 1715#endif /* SRIOCSREDIR */
1375 } 1716 }
1376 1717
1377 /* reset signals and spin off the command interpreter */ 1718 /* reset signals and spin off the command interpreter */
1378 signal (SIGINT, SIG_DFL); 1719 signal (SIGINT, SIG_DFL);
1379 signal (SIGQUIT, SIG_DFL); 1720 signal (SIGQUIT, SIG_DFL);
1380 signal (SIGCHLD, SIG_DFL); 1721 signal (SIGCHLD, SIG_DFL);
1381 signal (SIGHUP, SIG_DFL); 1722 signal (SIGHUP, SIG_DFL);
1382 signal (SIGPIPE, SIG_DFL); 1723 signal (SIGPIPE, SIG_DFL);
1383 /* 1724 /*
1384 * mimick login's behavior by disabling the job control signals 1725 * mimic login's behavior by disabling the job control signals
1385 * a shell that wants them can turn them back on 1726 * a shell that wants them can turn them back on
1386 */ 1727 */
1387#ifdef SIGTSTP 1728#ifdef SIGTSTP
1388 signal (SIGTSTP, SIG_IGN); 1729 signal (SIGTSTP, SIG_IGN);
1389 signal (SIGTTIN, SIG_IGN); 1730 signal (SIGTTIN, SIG_IGN);
1390 signal (SIGTTOU, SIG_IGN); 1731 signal (SIGTTOU, SIG_IGN);
1391#endif /* SIGTSTP */ 1732#endif /* SIGTSTP */
1392
1393 // unblock signals (signals are blocked by iom.C
1394 sigset_t ss;
1395 sigemptyset (&ss);
1396 sigprocmask (SIG_SETMASK, &ss, 0);
1397 1733
1398 /* command interpreter path */ 1734 /* command interpreter path */
1399 if (argv != NULL) 1735 if (argv)
1400 { 1736 {
1401# ifdef DEBUG_CMD 1737# ifdef DEBUG_CMD
1402 int i; 1738 int i;
1403 1739
1404 for (i = 0; argv[i]; i++) 1740 for (i = 0; argv[i]; i++)
… …
1413 const char *argv0, *shell; 1749 const char *argv0, *shell;
1414 1750
1415 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1751 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1416 shell = "/bin/sh"; 1752 shell = "/bin/sh";
1417 1753
1418 argv0 = (const char *)rxvt_r_basename (shell); 1754 argv0 = rxvt_basename (shell);
1419 1755
1420 if (option (Opt_loginShell)) 1756 if (option (Opt_loginShell))
1421 { 1757 {
1422 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1758 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1423 1759
1424 login[0] = '-'; 1760 login[0] = '-';
1425 strcpy (&login[1], argv0); 1761 strcpy (&login[1], argv0);
1426 argv0 = login; 1762 argv0 = login;
1427 } 1763 }
1428 1764
1429 execlp (shell, argv0, NULL); 1765 execlp (shell, argv0, (char *)0);
1430 /* no error message: STDERR is closed! */ 1766 /* no error message: STDERR is closed! */
1431 } 1767 }
1432 1768
1433 return -1; 1769 return -1;
1434} 1770}

Diff Legend

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