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.193 by root, Tue Jul 24 14:40:41 2007 UTC vs.
Revision 1.301 by mikachu, Sun Nov 13 16:03:31 2011 UTC

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

Diff Legend

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