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

Diff Legend

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