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.198 by sasha, Fri Aug 3 05:33:04 2007 UTC vs.
Revision 1.254 by root, Tue Nov 4 11:03:29 2008 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 <pcg@goof.com>
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>
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 DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h>
63#include <sys/socket.h>
64
65/* these next two are probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h>
68#endif
69#ifdef HAVE_SYS_BYTEORDER_H
70#include <sys/byteorder.h>
71#endif
72
73#include <netinet/in.h>
74#include <arpa/inet.h>
75#include <net/if.h>
76#include <net/if_arp.h>
77
78static char *
79rxvt_network_display (const char *display)
80{
81 char buffer[1024], *rval = NULL;
82 struct ifconf ifc;
83 struct ifreq *ifr;
84 int i, skfd;
85
86 if (display[0] != ':' && strncmp (display, "unix:", 5))
87 return (char *) display; /* nothing to do */
88
89 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
90 ifc.ifc_buf = buffer;
91
92 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
93 {
94 perror ("socket");
95 return NULL;
96 }
97
98 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
99 {
100 perror ("SIOCGIFCONF");
101 close (skfd);
102 return NULL;
103 }
104
105 for (i = 0, ifr = ifc.ifc_req;
106 i < (ifc.ifc_len / sizeof (struct ifreq));
107 i++, ifr++)
108 {
109 struct ifreq ifr2;
110
111 strcpy (ifr2.ifr_name, ifr->ifr_name);
112
113 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
114 {
115 unsigned long addr;
116 struct sockaddr_in *p_addr;
117
118 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
119 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
120
121 /*
122 * not "0.0.0.0" or "127.0.0.1" - so format the address
123 */
124 if (addr && addr != 0x7F000001)
125 {
126 char *colon = strchr (display, ':');
127
128 if (colon == NULL)
129 colon = ":0.0";
130
131 rval = rxvt_malloc (strlen (colon) + 16);
132 sprintf (rval, "%d.%d.%d.%d%s",
133 (int) ((addr >> 030) & 0xFF),
134 (int) ((addr >> 020) & 0xFF),
135 (int) ((addr >> 010) & 0xFF),
136 (int) (addr & 0xFF), colon);
137 break;
138 }
139 }
140 }
141
142 close (skfd);
143
144 return rval;
145}
146#endif
42 147
43const char *const def_colorName[] = 148const char *const def_colorName[] =
44 { 149 {
45 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
… …
50 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: yellow (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 162# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 164# endif
60 /* high-intensity colors */ 165 /* high-intensity colors */
61# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
146 "rgb:e7/e7/e7", 251 "rgb:e7/e7/e7",
147 252
148#ifndef NO_CURSORCOLOR 253#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 254 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 255 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 256#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 257 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 258 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 259 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 260#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 261 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 262 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 263 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 264 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 265#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 266#if ENABLE_FRILLS
162 NULL, // Color_underline 267 NULL, // Color_underline
163#endif 268#endif
164#ifdef OPTION_HC 269#ifdef OPTION_HC
165 NULL, 270 NULL,
166#endif 271#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 274 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 275#endif
171#if TINTING 276#if ENABLE_TRANSPARENCY
172 NULL, 277 NULL,
173#endif 278#endif
174#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 280 "rgb:00/00/00",
176#endif 281#endif
177 }; 282 };
178 283
179bool 284void
180rxvt_term::init_vars () 285rxvt_term::init_vars ()
181{ 286{
182 pix_colors = // 287 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 288
189 MEvent.time = CurrentTime; 289 MEvent.time = CurrentTime;
190 MEvent.button = AnyButton; 290 MEvent.button = AnyButton;
191 want_refresh = 1; 291 want_refresh = 1;
192 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
… …
194 nrow = 24; 294 nrow = 24;
195 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
196 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
197 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
198 saveLines = SAVELINES; 298 saveLines = SAVELINES;
199 numpix_colors = TOTAL_COLORS;
200 299
201 refresh_type = SLOW_REFRESH; 300 refresh_type = SLOW_REFRESH;
202 301
203 oldcursor.row = oldcursor.col = -1; 302 oldcursor.row = oldcursor.col = -1;
204#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
205#ifdef XPM_BACKGROUND
206 bgPixmap.original_asim = NULL;
207#endif
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 303
215 set_option (Opt_scrollBar); 304 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput); 305 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll); 306 set_option (Opt_jumpScroll);
218 set_option (Opt_skipScroll); 307 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen); 308 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll); 309 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs); 310 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles); 311 set_option (Opt_intensityStyles);
223 set_option (Opt_iso14755_52); 312 set_option (Opt_iso14755_52);
224 313 set_option (Opt_buffered);
225 return true;
226} 314}
227 315
228void 316static void
229rxvt_term::init_secondary () 317init_secondary ()
230{ 318{
231 int i; 319 int i;
232 320
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) 321 if ((i = open ("/dev/null", O_RDONLY)) < 0)
238 { 322 {
239 /* TODO: BOO HISS */
240 dup2 (STDERR_FILENO, STDIN_FILENO); 323 dup2 (STDERR_FILENO, STDIN_FILENO);
241 } 324 }
242 else if (i > STDIN_FILENO) 325 else if (i != STDIN_FILENO)
243 { 326 {
244 dup2 (i, STDIN_FILENO); 327 dup2 (i, STDIN_FILENO);
245 close (i); 328 close (i);
246 } 329 }
247 330
248 dup2 (STDERR_FILENO, STDOUT_FILENO); 331 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} 332}
261 333
262/*----------------------------------------------------------------------*/ 334/*----------------------------------------------------------------------*/
263const char ** 335const char **
264rxvt_term::init_resources (int argc, const char *const *argv) 336rxvt_term::init_resources (int argc, const char *const *argv)
265{ 337{
266 int i, r_argc; 338 int i, r_argc;
267 char *val;
268 const char **cmd_argv, **r_argv; 339 const char **cmd_argv, **r_argv;
269 340
270 /* 341 /*
271 * Look for -e option. Find => split and make cmd_argv[] of command args 342 * Look for -e option. Find => split and make cmd_argv[] of command args
272 */ 343 */
273 for (r_argc = 0; r_argc < argc; r_argc++) 344 for (r_argc = 0; r_argc < argc; r_argc++)
274 if (!strcmp (argv[r_argc], "-e")) 345 if (!strcmp (argv[r_argc], "-e"))
275 break; 346 break;
276 347
348 if (r_argc == argc)
349 cmd_argv = NULL;
350 else if (!argv[r_argc + 1])
351 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
352 else
353 {
354 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
355
356 for (i = 0; i < argc - r_argc - 1; i++)
357 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
358
359 cmd_argv[i] = NULL;
360 }
361
277 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 362 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
278 363
279 for (i = 0; i < r_argc; i++) 364 for (i = 0; i < r_argc; i++)
280 r_argv[i] = (const char *)argv[i]; 365 r_argv[i] = (const char *)argv[i];
281 366
282 r_argv[i] = NULL; 367 r_argv[i] = NULL;
283 368
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]); 369 rs[Rs_name] = rxvt_basename (argv[0]);
297 370
298 /* 371 /*
299 * Open display, get options/resources and create the window 372 * Open display, get options/resources and create the window
300 */ 373 */
301 374
… …
303 rs[Rs_display_name] = ":0"; 376 rs[Rs_display_name] = ":0";
304 377
305 get_options (r_argc, r_argv); 378 get_options (r_argc, r_argv);
306 379
307 if (!(display = displays.get (rs[Rs_display_name]))) 380 if (!(display = displays.get (rs[Rs_display_name])))
381 {
382 free (r_argv);
308 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 383 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
384 }
309 385
310 // using a local pointer decreases code size a lot 386 // using a local pointer decreases code size a lot
311 xa = display->xa; 387 xa = display->xa;
312 388
313 set (display); 389 set (display);
… …
317 if (rs[Rs_depth]) 393 if (rs[Rs_depth])
318 select_visual (strtol (rs[Rs_depth], 0, 0)); 394 select_visual (strtol (rs[Rs_depth], 0, 0));
319#endif 395#endif
320 396
321#ifdef HAVE_AFTERIMAGE 397#ifdef HAVE_AFTERIMAGE
398 set_application_name ((char*)rs[Rs_name]);
399 set_output_threshold (OUTPUT_LEVEL_WARNING);
322 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 400 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
323#endif 401#endif
324 free (r_argv); 402 free (r_argv);
325 403
326 for (int i = NUM_RESOURCES; i--; ) 404 for (int i = NUM_RESOURCES; i--; )
… …
344 * set any defaults not already set 422 * set any defaults not already set
345 */ 423 */
346 if (cmd_argv && cmd_argv[0]) 424 if (cmd_argv && cmd_argv[0])
347 { 425 {
348 if (!rs[Rs_title]) 426 if (!rs[Rs_title])
349 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 427 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
350 if (!rs[Rs_iconName]) 428 if (!rs[Rs_iconName])
351 rs[Rs_iconName] = rs[Rs_title]; 429 rs[Rs_iconName] = rs[Rs_title];
352 } 430 }
353 else 431 else
354 { 432 {
… …
381 459
382 /* no point having a scrollbar without having any scrollback! */ 460 /* no point having a scrollbar without having any scrollback! */
383 if (!saveLines) 461 if (!saveLines)
384 set_option (Opt_scrollBar, 0); 462 set_option (Opt_scrollBar, 0);
385 463
386#ifdef PRINTPIPE
387 if (!rs[Rs_print_pipe])
388 rs[Rs_print_pipe] = PRINTPIPE;
389#endif
390
391 if (!rs[Rs_cutchars]) 464 if (!rs[Rs_cutchars])
392 rs[Rs_cutchars] = CUTCHARS; 465 rs[Rs_cutchars] = CUTCHARS;
393 466
394#ifndef NO_BACKSPACE_KEY 467#ifndef NO_BACKSPACE_KEY
395 if (!rs[Rs_backspace_key]) 468 if (!rs[Rs_backspace_key])
396# ifdef DEFAULT_BACKSPACE 469# ifdef DEFAULT_BACKSPACE
397 key_backspace = DEFAULT_BACKSPACE; 470 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
398# else 471# else
399 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 472 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
400# endif 473# endif
401 else
402 {
403 val = strdup (rs[Rs_backspace_key]);
404 rxvt_Str_trim (val);
405 rxvt_Str_escaped (val);
406 key_backspace = val;
407 }
408#endif 474#endif
409 475
410#ifndef NO_DELETE_KEY 476#ifndef NO_DELETE_KEY
411 if (!rs[Rs_delete_key]) 477 if (!rs[Rs_delete_key])
412# ifdef DEFAULT_DELETE 478# ifdef DEFAULT_DELETE
413 key_delete = DEFAULT_DELETE; 479 rs[Rs_delete_key] = DEFAULT_DELETE;
414# else 480# else
415 key_delete = "\033[3~"; 481 rs[Rs_delete_key] = "\033[3~";
416# endif
417 else
418 {
419 val = strdup (rs[Rs_delete_key]);
420 rxvt_Str_trim (val);
421 rxvt_Str_escaped (val);
422 key_delete = val;
423 }
424#endif 482# endif
425 if (rs[Rs_answerbackstring])
426 {
427 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
428 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
429 }
430
431#ifdef HAVE_SCROLLBARS
432 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
433#endif 483#endif
484
485 scrollBar.setup (this);
434 486
435#ifdef XTERM_REVERSE_VIDEO 487#ifdef XTERM_REVERSE_VIDEO
436 /* this is how xterm implements reverseVideo */ 488 /* this is how xterm implements reverseVideo */
437 if (option (Opt_reverseVideo)) 489 if (option (Opt_reverseVideo))
438 { 490 {
… …
458 color_aliases (Color_fg); 510 color_aliases (Color_fg);
459 color_aliases (Color_bg); 511 color_aliases (Color_bg);
460#ifndef NO_CURSORCOLOR 512#ifndef NO_CURSORCOLOR
461 color_aliases (Color_cursor); 513 color_aliases (Color_cursor);
462 color_aliases (Color_cursor2); 514 color_aliases (Color_cursor2);
463#endif /* NO_CURSORCOLOR */ 515#endif /* NO_CURSORCOLOR */
464 color_aliases (Color_pointer_fg); 516 color_aliases (Color_pointer_fg);
465 color_aliases (Color_pointer_bg); 517 color_aliases (Color_pointer_bg);
466 color_aliases (Color_border); 518 color_aliases (Color_border);
467#ifndef NO_BOLD_UNDERLINE_REVERSE 519#ifndef NO_BOLD_UNDERLINE_REVERSE
468 color_aliases (Color_BD); 520 color_aliases (Color_BD);
469 color_aliases (Color_UL); 521 color_aliases (Color_UL);
470 color_aliases (Color_RV); 522 color_aliases (Color_RV);
471#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 523#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
472 524
473 if (!rs[Rs_color + Color_border]) 525 if (!rs[Rs_color + Color_border])
474 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 526 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
475 527
476 return cmd_argv; 528 return cmd_argv;
529}
530
531/*----------------------------------------------------------------------*/
532void
533rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
534{
535 this->envv = envv;
536
537 SET_R (this);
538 set_locale ("");
539 set_environ (envv); // a few things in X do not call setlocale :(
540
541 init_vars ();
542
543 init_secondary ();
544
545 const char **cmd_argv = init_resources (argc, argv);
546
547#ifdef KEYSYM_RESOURCE
548 keyboard->register_done ();
549#endif
550
551 if (const char *path = rs[Rs_chdir])
552 if (*path) // ignored if empty
553 {
554 if (*path != '/')
555 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
556
557 if (chdir (path))
558 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
559 }
560
561 if (option (Opt_scrollBar))
562 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
563
564 pty = ptytty::create ();
565
566 create_windows (argc, argv);
567
568 init_xlocale ();
569
570 scr_reset (); // initialize screen
571
572#if 0
573 XSynchronize (dpy, True);
574#endif
575
576 if (option (Opt_scrollBar))
577 scrollBar.resize (); /* create and map scrollbar */
578#ifdef HAVE_BG_PIXMAP
579 {
580 bgPixmap.set_target (this);
581 bgPixmap.invalidate ();
582
583#ifdef ENABLE_TRANSPARENCY
584 if (option (Opt_transparent))
585 {
586 bgPixmap.set_transparent ();
587
588#ifdef HAVE_AFTERIMAGE
589 if (rs [Rs_blurradius])
590 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
591#endif
592 if (ISSET_PIXCOLOR (Color_tint))
593 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
594
595 if (rs [Rs_shade])
596 bgPixmap.set_shade (rs [Rs_shade]);
597
598 bgPixmap.set_root_pixmap ();
599 XSelectInput (dpy, display->root, PropertyChangeMask);
600 rootwin_ev.start (display, display->root);
601 }
602#endif
603
604#ifdef BG_IMAGE_FROM_FILE
605 if (rs[Rs_backgroundPixmap])
606 {
607 const char *p = rs[Rs_backgroundPixmap];
608
609 if ((p = strchr (p, ';')) != 0)
610 {
611 p++;
612 bgPixmap.set_geometry (p);
613 }
614 else
615 bgPixmap.set_defaultGeometry ();
616
617 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
618 if (!bgPixmap.window_position_sensitive ())
619 update_background ();
620 }
621#endif
622 }
623#endif
624
625#if ENABLE_PERL
626 rootwin_ev.start (display, display->root);
627#endif
628
629 set_colorfgbg ();
630
631 init_command (cmd_argv);
632
633 free (cmd_argv);
634
635 if (pty->pty >= 0)
636 pty_ev.start (pty->pty, ev::READ);
637
638 HOOK_INVOKE ((this, HOOK_START, DT_END));
639
640#if ENABLE_XEMBED
641 if (rs[Rs_embed])
642 {
643 long info[2] = { 0, XEMBED_MAPPED };
644
645 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
646 32, PropModeReplace, (unsigned char *)&info, 2);
647 }
648#endif
649
650 XMapWindow (dpy, vt);
651 XMapWindow (dpy, parent[0]);
652
653 refresh_check ();
477} 654}
478 655
479/*----------------------------------------------------------------------*/ 656/*----------------------------------------------------------------------*/
480void 657void
481rxvt_term::init_env () 658rxvt_term::init_env ()
482{ 659{
483 int i; 660 int i;
484 unsigned int u;
485 char *val; 661 char *val;
486 662
487#ifdef DISPLAY_IS_IP 663#ifdef DISPLAY_IS_IP
488 /* Fixup display_name for export over pty to any interested terminal 664 /* Fixup display_name for export over pty to any interested terminal
489 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 665 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
497 */ 673 */
498 val = rxvt_network_display (rs[Rs_display_name]); 674 val = rxvt_network_display (rs[Rs_display_name]);
499 rs[Rs_display_name] = (const char *)val; 675 rs[Rs_display_name] = (const char *)val;
500 676
501 if (val == NULL) 677 if (val == NULL)
502#endif /* DISPLAY_IS_IP */ 678#endif /* DISPLAY_IS_IP */
503 val = XDisplayString (dpy); 679 val = XDisplayString (dpy);
504 680
505 if (rs[Rs_display_name] == NULL) 681 if (rs[Rs_display_name] == NULL)
506 rs[Rs_display_name] = val; /* use broken `:0' value */ 682 rs[Rs_display_name] = val; /* use broken `:0' value */
507 683
508 i = strlen (val); 684 i = strlen (val);
509 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 685 env_display = (char *)rxvt_malloc (i + 9);
510 686
511 sprintf (env_display, "DISPLAY=%s", val); 687 sprintf (env_display, "DISPLAY=%s", val);
512 688
513 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 689 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
514 690
… …
535 else 711 else
536 putenv ("COLORTERM=" COLORTERMENVFULL); 712 putenv ("COLORTERM=" COLORTERMENVFULL);
537 713
538 if (rs[Rs_term_name] != NULL) 714 if (rs[Rs_term_name] != NULL)
539 { 715 {
540 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 716 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
541 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 717 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
542 putenv (env_term); 718 putenv (env_term);
543 } 719 }
544 else 720 else
545 putenv ("TERM=" TERMENV); 721 putenv ("TERM=" TERMENV);
… …
547#ifdef HAVE_UNSETENV 723#ifdef HAVE_UNSETENV
548 /* avoid passing old settings and confusing term size */ 724 /* avoid passing old settings and confusing term size */
549 unsetenv ("LINES"); 725 unsetenv ("LINES");
550 unsetenv ("COLUMNS"); 726 unsetenv ("COLUMNS");
551 unsetenv ("TERMCAP"); /* terminfo should be okay */ 727 unsetenv ("TERMCAP"); /* terminfo should be okay */
552#endif /* HAVE_UNSETENV */ 728#endif /* HAVE_UNSETENV */
553} 729}
554 730
555/*----------------------------------------------------------------------*/ 731/*----------------------------------------------------------------------*/
556/* 732/*
557 * This is more or less stolen straight from XFree86 xterm. 733 * This is more or less stolen straight from XFree86 xterm.
… …
578 754
579 this->locale = "C"; 755 this->locale = "C";
580 } 756 }
581 757
582 758
583 this->locale = rxvt_strdup (this->locale); 759 this->locale = strdup (this->locale);
584 SET_LOCALE (this->locale); 760 SET_LOCALE (this->locale);
585 mbstate.reset (); 761 mbstate.reset ();
586#endif 762#endif
587 763
588#if HAVE_NL_LANGINFO 764#if HAVE_NL_LANGINFO
… …
645 priv_modes |= PrivMode_Keypress; 821 priv_modes |= PrivMode_Keypress;
646 if (!option (Opt_jumpScroll)) 822 if (!option (Opt_jumpScroll))
647 priv_modes |= PrivMode_smoothScroll; 823 priv_modes |= PrivMode_smoothScroll;
648 824
649#ifndef NO_BACKSPACE_KEY 825#ifndef NO_BACKSPACE_KEY
650 if (strcmp (key_backspace, "DEC") == 0) 826 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
651 priv_modes |= PrivMode_HaveBackSpace; 827 priv_modes |= PrivMode_HaveBackSpace;
652#endif 828#endif
653 829
654 /* add value for scrollBar */ 830 /* add value for scrollBar */
655 if (scrollBar.state) 831 if (scrollBar.state)
… …
661 run_command (argv); 837 run_command (argv);
662} 838}
663 839
664/*----------------------------------------------------------------------*/ 840/*----------------------------------------------------------------------*/
665void 841void
666rxvt_term::Get_Colours () 842rxvt_term::get_colours ()
667{ 843{
668 int i; 844 int i;
669 845
670#ifdef OFF_FOCUS_FADING 846#ifdef OFF_FOCUS_FADING
671 pix_colors = pix_colors_focused; 847 pix_colors = pix_colors_focused;
672#endif 848#endif
673 849
674 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 850 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
675 { 851 {
676 const char *name = rs[Rs_color + i]; 852 const char *name = rs[Rs_color + i];
677 853
678 if (!name) 854 if (!name)
… …
731 * get scrollBar shadow colors 907 * get scrollBar shadow colors
732 * 908 *
733 * The calculations of topShadow/bottomShadow values are adapted 909 * The calculations of topShadow/bottomShadow values are adapted
734 * from the fvwm window manager. 910 * from the fvwm window manager.
735 */ 911 */
736#ifdef KEEP_SCROLLCOLOR 912#ifdef RXVT_SCROLLBAR
737 if (depth <= 2) 913 if (depth <= 2)
738 { 914 {
739 /* Monochrome */ 915 /* Monochrome */
740 alias_color (Color_scroll, Color_fg); 916 alias_color (Color_scroll, Color_fg);
741 alias_color (Color_topShadow, Color_bg); 917 alias_color (Color_topShadow, Color_bg);
… …
756 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 932 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
757 cscroll.a) 933 cscroll.a)
758 )) 934 ))
759 alias_color (Color_topShadow, Color_White); 935 alias_color (Color_topShadow, Color_White);
760 } 936 }
761#endif /* KEEP_SCROLLCOLOR */ 937#endif
762 938
763#ifdef OFF_FOCUS_FADING 939#ifdef OFF_FOCUS_FADING
764 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 940 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
765 update_fade_color (i); 941 update_fade_color (i);
766#endif 942#endif
… …
774 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 950 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
775 { 951 {
776 int i = atoi (rs[Rs_color + idx]); 952 int i = atoi (rs[Rs_color + idx]);
777 953
778 if (i >= 8 && i <= 15) 954 if (i >= 8 && i <= 15)
779 { /* bright colors */ 955 /* bright colors */
780 i -= 8;
781 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 956 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
782 return; 957 else if (i >= 0 && i <= 7)
783 } 958 /* normal colors */
784
785 if (i >= 0 && i <= 7) /* normal colors */
786 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 959 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
787 } 960 }
788} 961}
789 962
790/*----------------------------------------------------------------------*/ 963/*----------------------------------------------------------------------*/
… …
891 Window top, parent; 1064 Window top, parent;
892 1065
893 dLocal (Display *, dpy); 1066 dLocal (Display *, dpy);
894 1067
895 /* grab colors before netscape does */ 1068 /* grab colors before netscape does */
896 Get_Colours (); 1069 get_colours ();
897 1070
898 if (!set_fonts ()) 1071 if (!set_fonts ())
899 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1072 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
900 1073
901 parent = display->root; 1074 parent = display->root;
… …
905#if ENABLE_FRILLS 1078#if ENABLE_FRILLS
906 if (option (Opt_borderLess)) 1079 if (option (Opt_borderLess))
907 { 1080 {
908 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1081 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
909 { 1082 {
910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1083 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
911 attributes.override_redirect = true; 1084 attributes.override_redirect = true;
912 mwmhints.flags = 0;
913 } 1085 }
914 else 1086 else
915 { 1087 {
916 mwmhints.flags = MWM_HINTS_DECORATIONS; 1088 mwmhints.flags = MWM_HINTS_DECORATIONS;
917 mwmhints.decorations = 0;
918 } 1089 }
919 } 1090 }
920 else
921 mwmhints.flags = 0;
922#endif 1091#endif
923 1092
924#if ENABLE_XEMBED 1093#if ENABLE_XEMBED
925 if (rs[Rs_embed]) 1094 if (rs[Rs_embed])
926 { 1095 {
… …
966 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1135 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
967 wmHint.window_group = top; 1136 wmHint.window_group = top;
968 1137
969 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1138 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
970 &szHint, &wmHint, &classHint); 1139 &szHint, &wmHint, &classHint);
1140#if ENABLE_EWMH
1141# ifdef HAVE_AFTERIMAGE
1142 /*
1143 * set up icon hint
1144 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1145 */
1146 if (rs [Rs_iconfile] && asv)
1147 {
1148 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1149 if (im)
1150 {
1151 int w = im->width;
1152 int h = im->height;
1153 long* buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1154 ASImage *result = scale_asimage (asv, im,
1155 w, h, ASA_ARGB32,
1156 100, ASIMAGE_QUALITY_DEFAULT);
1157 destroy_asimage (&im);
1158
1159 if (buffer && result)
1160 {
1161 ARGB32 *asbuf = result->alt.argb32;
1162 buffer [0] = w;
1163 buffer [1] = h;
1164
1165 for (unsigned int i = 0; i < w * h; ++i)
1166 buffer [i + 2] = asbuf [i];
1167
1168 destroy_asimage (&result);
1169 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1170 PropModeReplace, (const unsigned char*) buffer, 2 + w * h);
1171 free (buffer);
1172 }
1173 else
1174 {
1175 if (!buffer)
1176 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1177
1178 if (!result)
1179 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1180 }
1181 }
1182 else
1183 rxvt_warn ("Loading image icon failed, continuing without.\n");
1184 }
1185# endif
1186#endif
971 1187
972#if ENABLE_FRILLS 1188#if ENABLE_FRILLS
973 if (mwmhints.flags) 1189 if (mwmhints.flags)
974 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1190 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
975 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1191 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1009 1225
1010 termwin_ev.start (display, top); 1226 termwin_ev.start (display, top);
1011 1227
1012 /* vt cursor: Black-on-White is standard, but this is more popular */ 1228 /* vt cursor: Black-on-White is standard, but this is more popular */
1013 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1229 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1014
1015#ifdef HAVE_SCROLLBARS
1016 /* cursor scrollBar: Black-on-White */
1017 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1018#endif
1019 1230
1020 /* the vt window */ 1231 /* the vt window */
1021 vt = XCreateSimpleWindow (dpy, top, 1232 vt = XCreateSimpleWindow (dpy, top,
1022 window_vt_x, window_vt_y, 1233 window_vt_x, window_vt_y,
1023 width, height, 1234 width, height,
… …
1037 1248
1038 vt_select_input (); 1249 vt_select_input ();
1039 1250
1040 vt_ev.start (display, vt); 1251 vt_ev.start (display, vt);
1041 1252
1042#ifdef XPM_BACKGROUND
1043 if (rs[Rs_backgroundPixmap] != NULL)
1044 {
1045 const char *p = rs[Rs_backgroundPixmap];
1046
1047 if ((p = strchr (p, ';')) != NULL)
1048 {
1049 p++;
1050 scale_pixmap (p);
1051 }
1052
1053 set_bgPixmap (rs[Rs_backgroundPixmap]);
1054 scr_touch (true);
1055 }
1056#endif
1057
1058 /* graphics context for the vt window */ 1253 /* graphics context for the vt window */
1059 gcvalue.foreground = pix_colors[Color_fg]; 1254 gcvalue.foreground = pix_colors[Color_fg];
1060 gcvalue.background = pix_colors[Color_bg]; 1255 gcvalue.background = pix_colors[Color_bg];
1061 gcvalue.graphics_exposures = 0; 1256 gcvalue.graphics_exposures = 0;
1062 1257
… …
1064 GCForeground | GCBackground | GCGraphicsExposures, 1259 GCForeground | GCBackground | GCGraphicsExposures,
1065 &gcvalue); 1260 &gcvalue);
1066 1261
1067 drawable = new rxvt_drawable (this, vt); 1262 drawable = new rxvt_drawable (this, vt);
1068 1263
1069#ifdef RXVT_SCROLLBAR
1070 gcvalue.foreground = pix_colors[Color_topShadow];
1071 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072 gcvalue.foreground = pix_colors[Color_bottomShadow];
1073 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1075 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1076#endif
1077
1078#ifdef OFF_FOCUS_FADING 1264#ifdef OFF_FOCUS_FADING
1079 // initially we are in unfocused state 1265 // initially we are in unfocused state
1080 if (rs[Rs_fade]) 1266 if (rs[Rs_fade])
1081 pix_colors = pix_colors_unfocused; 1267 pix_colors = pix_colors_unfocused;
1082#endif 1268#endif
… …
1087 1273
1088/* ------------------------------------------------------------------------- * 1274/* ------------------------------------------------------------------------- *
1089 * GET TTY CURRENT STATE * 1275 * GET TTY CURRENT STATE *
1090 * ------------------------------------------------------------------------- */ 1276 * ------------------------------------------------------------------------- */
1091void 1277void
1092rxvt_get_ttymode (ttymode_t *tio, int erase) 1278rxvt_get_ttymode (struct termios *tio, int erase)
1093{ 1279{
1094 /* 1280 /*
1095 * standard System V termios interface 1281 * standard System V termios interface
1096 */ 1282 */
1097 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1283 if (tcgetattr (STDIN_FILENO, tio) < 0)
1098 { 1284 {
1099 // return error - use system defaults, 1285 // return error - use system defaults,
1100 // where possible, and zero elsewhere 1286 // where possible, and zero elsewhere
1101 memset (tio, 0, sizeof (ttymode_t)); 1287 memset (tio, 0, sizeof (struct termios));
1102 1288
1103 tio->c_cc[VINTR] = CINTR; 1289 tio->c_cc[VINTR] = CINTR;
1104 tio->c_cc[VQUIT] = CQUIT; 1290 tio->c_cc[VQUIT] = CQUIT;
1105 tio->c_cc[VERASE] = CERASE; 1291 tio->c_cc[VERASE] = CERASE;
1106#ifdef VERASE2 1292#ifdef VERASE2
… …
1170 1356
1171 /* 1357 /*
1172 * Debugging 1358 * Debugging
1173 */ 1359 */
1174#ifdef DEBUG_TTYMODE 1360#ifdef DEBUG_TTYMODE
1175#ifdef HAVE_TERMIOS_H
1176 /* c_iflag bits */ 1361 /* c_iflag bits */
1177 fprintf (stderr, "Input flags\n"); 1362 fprintf (stderr, "Input flags\n");
1178 1363
1179 /* cpp token stringize doesn't work on all machines <sigh> */ 1364 /* cpp token stringize doesn't work on all machines <sigh> */
1180# define FOO(flag,name) \ 1365# define FOO(flag,name) \
… …
1243 FOO (VLNEXT, "VLNEXT"); 1428 FOO (VLNEXT, "VLNEXT");
1244# endif 1429# endif
1245 1430
1246 fprintf (stderr, "\n"); 1431 fprintf (stderr, "\n");
1247# undef FOO 1432# undef FOO
1248# endif /* HAVE_TERMIOS_H */ 1433#endif /* DEBUG_TTYMODE */
1249#endif /* DEBUG_TTYMODE */
1250} 1434}
1251 1435
1252/*----------------------------------------------------------------------*/ 1436/*----------------------------------------------------------------------*/
1253/* 1437/*
1254 * Run the command in a subprocess and return a file descriptor for the 1438 * Run the command in a subprocess and return a file descriptor for the
… …
1278 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1462 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1279 1463
1280 int er; 1464 int er;
1281 1465
1282#ifndef NO_BACKSPACE_KEY 1466#ifndef NO_BACKSPACE_KEY
1283 if (key_backspace[0] && !key_backspace[1]) 1467 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1284 er = key_backspace[0]; 1468 er = rs[Rs_backspace_key][0];
1285 else if (strcmp (key_backspace, "DEC") == 0) 1469 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1286 er = '\177'; /* the initial state anyway */ 1470 er = '\177'; /* the initial state anyway */
1287 else 1471 else
1288#endif 1472#endif
1289 er = -1; 1473 er = -1;
1290 1474
1291 rxvt_get_ttymode (&tio, er); 1475 rxvt_get_ttymode (&tio, er);
1292 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1476 /* init terminal attributes */
1477 cfsetospeed (&tio, BAUDRATE);
1478 cfsetispeed (&tio, BAUDRATE);
1479 tcsetattr (pty->tty, TCSANOW, &tio);
1293 pty->set_utf8_mode (enc_utf8); 1480 pty->set_utf8_mode (enc_utf8);
1294 1481
1295 /* set initial window size */ 1482 /* set initial window size */
1296 tt_winch (); 1483 tt_winch ();
1297 1484
… …
1357rxvt_term::run_child (const char *const *argv) 1544rxvt_term::run_child (const char *const *argv)
1358{ 1545{
1359 char *login; 1546 char *login;
1360 1547
1361 if (option (Opt_console)) 1548 if (option (Opt_console))
1549 {
1362 { /* be virtual console, fail silently */ 1550 /* be virtual console, fail silently */
1363#ifdef TIOCCONS 1551#ifdef TIOCCONS
1364 unsigned int on = 1; 1552 unsigned int on = 1;
1365 1553
1366 ioctl (STDIN_FILENO, TIOCCONS, &on); 1554 ioctl (STDIN_FILENO, TIOCCONS, &on);
1367#elif defined (SRIOCSREDIR) 1555#elif defined (SRIOCSREDIR)
… …
1369 1557
1370 fd = open (CONSOLE, O_WRONLY, 0); 1558 fd = open (CONSOLE, O_WRONLY, 0);
1371 if (fd >= 0) 1559 if (fd >= 0)
1372 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1560 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1373 close (fd); 1561 close (fd);
1374#endif /* SRIOCSREDIR */ 1562#endif /* SRIOCSREDIR */
1375 } 1563 }
1376 1564
1377 /* reset signals and spin off the command interpreter */ 1565 /* reset signals and spin off the command interpreter */
1378 signal (SIGINT, SIG_DFL); 1566 signal (SIGINT, SIG_DFL);
1379 signal (SIGQUIT, SIG_DFL); 1567 signal (SIGQUIT, SIG_DFL);
… …
1386 */ 1574 */
1387#ifdef SIGTSTP 1575#ifdef SIGTSTP
1388 signal (SIGTSTP, SIG_IGN); 1576 signal (SIGTSTP, SIG_IGN);
1389 signal (SIGTTIN, SIG_IGN); 1577 signal (SIGTTIN, SIG_IGN);
1390 signal (SIGTTOU, SIG_IGN); 1578 signal (SIGTTOU, SIG_IGN);
1391#endif /* SIGTSTP */ 1579#endif /* SIGTSTP */
1392
1393 // unblock signals (signals are blocked by iom.C
1394 sigset_t ss;
1395 sigemptyset (&ss);
1396 sigprocmask (SIG_SETMASK, &ss, 0);
1397 1580
1398 /* command interpreter path */ 1581 /* command interpreter path */
1399 if (argv != NULL) 1582 if (argv)
1400 { 1583 {
1401# ifdef DEBUG_CMD 1584# ifdef DEBUG_CMD
1402 int i; 1585 int i;
1403 1586
1404 for (i = 0; argv[i]; i++) 1587 for (i = 0; argv[i]; i++)
… …
1413 const char *argv0, *shell; 1596 const char *argv0, *shell;
1414 1597
1415 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1598 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1416 shell = "/bin/sh"; 1599 shell = "/bin/sh";
1417 1600
1418 argv0 = (const char *)rxvt_r_basename (shell); 1601 argv0 = (const char *)rxvt_basename (shell);
1419 1602
1420 if (option (Opt_loginShell)) 1603 if (option (Opt_loginShell))
1421 { 1604 {
1422 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1605 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1423 1606
1424 login[0] = '-'; 1607 login[0] = '-';
1425 strcpy (&login[1], argv0); 1608 strcpy (&login[1], argv0);
1426 argv0 = login; 1609 argv0 = login;
1427 } 1610 }
1428 1611
1429 execlp (shell, argv0, NULL); 1612 execlp (shell, argv0, (char *)0);
1430 /* no error message: STDERR is closed! */ 1613 /* no error message: STDERR is closed! */
1431 } 1614 }
1432 1615
1433 return -1; 1616 return -1;
1434} 1617}

Diff Legend

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