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.166 by root, Tue Jan 31 19:53:30 2006 UTC vs.
Revision 1.217 by root, Tue Oct 9 13:36:10 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 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> 15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 16 * - QNX support
14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 17 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
… …
38 41
39#include <limits> 42#include <limits>
40 43
41#include <csignal> 44#include <csignal>
42 45
46#ifdef DISPLAY_IS_IP
47/* On Solaris link with -lsocket and -lnsl */
48#include <sys/types.h>
49#include <sys/socket.h>
50
51/* these next two are probably only on Sun (not Solaris) */
52#ifdef HAVE_SYS_SOCKIO_H
53#include <sys/sockio.h>
54#endif
55#ifdef HAVE_SYS_BYTEORDER_H
56#include <sys/byteorder.h>
57#endif
58
59#include <netinet/in.h>
60#include <arpa/inet.h>
61#include <net/if.h>
62#include <net/if_arp.h>
63
64static char *
65rxvt_network_display (const char *display)
66{
67 char buffer[1024], *rval = NULL;
68 struct ifconf ifc;
69 struct ifreq *ifr;
70 int i, skfd;
71
72 if (display[0] != ':' && strncmp (display, "unix:", 5))
73 return (char *) display; /* nothing to do */
74
75 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
76 ifc.ifc_buf = buffer;
77
78 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
79 {
80 perror ("socket");
81 return NULL;
82 }
83
84 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
85 {
86 perror ("SIOCGIFCONF");
87 close (skfd);
88 return NULL;
89 }
90
91 for (i = 0, ifr = ifc.ifc_req;
92 i < (ifc.ifc_len / sizeof (struct ifreq));
93 i++, ifr++)
94 {
95 struct ifreq ifr2;
96
97 strcpy (ifr2.ifr_name, ifr->ifr_name);
98
99 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
100 {
101 unsigned long addr;
102 struct sockaddr_in *p_addr;
103
104 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
105 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
106
107 /*
108 * not "0.0.0.0" or "127.0.0.1" - so format the address
109 */
110 if (addr && addr != 0x7F000001)
111 {
112 char *colon = strchr (display, ':');
113
114 if (colon == NULL)
115 colon = ":0.0";
116
117 rval = rxvt_malloc (strlen (colon) + 16);
118 sprintf (rval, "%d.%d.%d.%d%s",
119 (int) ((addr >> 030) & 0xFF),
120 (int) ((addr >> 020) & 0xFF),
121 (int) ((addr >> 010) & 0xFF),
122 (int) (addr & 0xFF), colon);
123 break;
124 }
125 }
126 }
127
128 close (skfd);
129
130 return rval;
131}
132#endif
133
43const char *const def_colorName[] = 134const char *const def_colorName[] =
44 { 135 {
45 COLOR_FOREGROUND, 136 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 137 COLOR_BACKGROUND,
47 /* low-intensity colors */ 138 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 139 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 140 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 141 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 142 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 143 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 144 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 145 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 146# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 147 "rgb:e5/e5/e5", // 7: white (Grey90)
… …
166#endif 257#endif
167#ifdef KEEP_SCROLLCOLOR 258#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 259 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 260 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 261#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 262#if ENABLE_TRANSPARENCY
172 NULL, 263 NULL,
173#endif 264#endif
174#if OFF_FOCUS_FADING 265#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 266 "rgb:00/00/00",
176#endif 267#endif
… …
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 274 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 275#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 276 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 277#endif
187 278
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 279
192 MEvent.time = CurrentTime; 280 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 281 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 282 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 283 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 284 ncol = 80;
198 nrow = 24; 285 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 286 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 287 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 288 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 289 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 290 numpix_colors = TOTAL_COLORS;
204 291
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 292 refresh_type = SLOW_REFRESH;
207 293
208 oldcursor.row = oldcursor.col = -1; 294 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50;
212 bgPixmap.pixmap = None;
213#endif
214
215 last_bot = last_state = -1; 295 last_bot = last_state = -1;
296
297 set_option (Opt_scrollBar);
298 set_option (Opt_scrollTtyOutput);
299 set_option (Opt_jumpScroll);
300 set_option (Opt_skipScroll);
301 set_option (Opt_secondaryScreen);
302 set_option (Opt_secondaryScroll);
303 set_option (Opt_pastableTabs);
304 set_option (Opt_intensityStyles);
305 set_option (Opt_iso14755_52);
216 306
217 return true; 307 return true;
218} 308}
219 309
220void 310void
… …
229 if ((i = open ("/dev/null", O_RDONLY)) < 0) 319 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 { 320 {
231 /* TODO: BOO HISS */ 321 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO); 322 dup2 (STDERR_FILENO, STDIN_FILENO);
233 } 323 }
234 else if (i > STDIN_FILENO) 324 else if (i != STDIN_FILENO)
235 { 325 {
236 dup2 (i, STDIN_FILENO); 326 dup2 (i, STDIN_FILENO);
237 close (i); 327 close (i);
238 } 328 }
239 329
… …
254/*----------------------------------------------------------------------*/ 344/*----------------------------------------------------------------------*/
255const char ** 345const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 346rxvt_term::init_resources (int argc, const char *const *argv)
257{ 347{
258 int i, r_argc; 348 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 349 const char **cmd_argv, **r_argv;
261 350
262 /* 351 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 352 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 353 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 354 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 355 if (!strcmp (argv[r_argc], "-e"))
267 break; 356 break;
357
358 if (r_argc == argc)
359 cmd_argv = NULL;
360 else if (!argv[r_argc + 1])
361 rxvt_fatal ("-e requires an argument\n");
362 else
363 {
364 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
365
366 for (i = 0; i < argc - r_argc - 1; i++)
367 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
368
369 cmd_argv[i] = NULL;
370 }
268 371
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 372 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 373
271 for (i = 0; i < r_argc; i++) 374 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 375 r_argv[i] = (const char *)argv[i];
273 376
274 r_argv[i] = NULL; 377 r_argv[i] = NULL;
275 378
276 if (r_argc == argc)
277 cmd_argv = NULL;
278 else
279 {
280 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
281
282 for (i = 0; i < argc - r_argc - 1; i++)
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284
285 cmd_argv[i] = NULL;
286 }
287
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 379 rs[Rs_name] = rxvt_basename (argv[0]);
289 380
290 /* 381 /*
291 * Open display, get options/resources and create the window 382 * Open display, get options/resources and create the window
292 */ 383 */
293 384
… …
295 rs[Rs_display_name] = ":0"; 386 rs[Rs_display_name] = ":0";
296 387
297 get_options (r_argc, r_argv); 388 get_options (r_argc, r_argv);
298 389
299 if (!(display = displays.get (rs[Rs_display_name]))) 390 if (!(display = displays.get (rs[Rs_display_name])))
391 {
392 free (r_argv);
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 393 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
394 }
301 395
302 // using a local pointer decreases code size a lot 396 // using a local pointer decreases code size a lot
303 xa = display->xa; 397 xa = display->xa;
304 398
399 set (display);
400 extract_resources ();
401
305#if XFT 402#if XFT
306 if (rs[Rs_depth]) 403 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0)); 404 select_visual (strtol (rs[Rs_depth], 0, 0));
308 else
309#endif 405#endif
310 set (display);
311 406
312 extract_resources (); 407#ifdef HAVE_AFTERIMAGE
408 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
409#endif
410 free (r_argv);
313 411
314 for (int i = NUM_RESOURCES; i--; ) 412 for (int i = NUM_RESOURCES; i--; )
315 if (rs [i] == resval_undef) 413 if (rs [i] == resval_undef)
316 rs [i] = 0; 414 rs [i] = 0;
317
318 free (r_argv);
319 415
320#if ENABLE_PERL 416#if ENABLE_PERL
321 if (!rs[Rs_perl_ext_1]) 417 if (!rs[Rs_perl_ext_1])
322 rs[Rs_perl_ext_1] = "default"; 418 rs[Rs_perl_ext_1] = "default";
323 419
… …
334 * set any defaults not already set 430 * set any defaults not already set
335 */ 431 */
336 if (cmd_argv && cmd_argv[0]) 432 if (cmd_argv && cmd_argv[0])
337 { 433 {
338 if (!rs[Rs_title]) 434 if (!rs[Rs_title])
339 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 435 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
340 if (!rs[Rs_iconName]) 436 if (!rs[Rs_iconName])
341 rs[Rs_iconName] = rs[Rs_title]; 437 rs[Rs_iconName] = rs[Rs_title];
342 } 438 }
343 else 439 else
344 { 440 {
… …
382 rs[Rs_cutchars] = CUTCHARS; 478 rs[Rs_cutchars] = CUTCHARS;
383 479
384#ifndef NO_BACKSPACE_KEY 480#ifndef NO_BACKSPACE_KEY
385 if (!rs[Rs_backspace_key]) 481 if (!rs[Rs_backspace_key])
386# ifdef DEFAULT_BACKSPACE 482# ifdef DEFAULT_BACKSPACE
387 key_backspace = DEFAULT_BACKSPACE; 483 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
388# else 484# else
389 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 485 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
390# endif 486# endif
391 else
392 {
393 val = strdup (rs[Rs_backspace_key]);
394 rxvt_Str_trim (val);
395 rxvt_Str_escaped (val);
396 key_backspace = val;
397 }
398#endif 487#endif
399 488
400#ifndef NO_DELETE_KEY 489#ifndef NO_DELETE_KEY
401 if (!rs[Rs_delete_key]) 490 if (!rs[Rs_delete_key])
402# ifdef DEFAULT_DELETE 491# ifdef DEFAULT_DELETE
403 key_delete = DEFAULT_DELETE; 492 rs[Rs_delete_key] = DEFAULT_DELETE;
404# else 493# else
405 key_delete = "\033[3~"; 494 rs[Rs_delete_key] = "\033[3~";
406# endif
407 else
408 {
409 val = strdup (rs[Rs_delete_key]);
410 rxvt_Str_trim (val);
411 rxvt_Str_escaped (val);
412 key_delete = val;
413 }
414#endif 495# endif
415 if (rs[Rs_answerbackstring]) 496#endif
416 {
417 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
418 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
419 }
420 497
421#ifdef HAVE_SCROLLBARS 498#ifdef HAVE_SCROLLBARS
422 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 499 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
423#endif 500#endif
424 501
425#ifdef XTERM_REVERSE_VIDEO 502#ifdef XTERM_REVERSE_VIDEO
426 /* this is how xterm implements reverseVideo */ 503 /* this is how xterm implements reverseVideo */
427 if (OPTION (Opt_reverseVideo)) 504 if (option (Opt_reverseVideo))
428 { 505 {
429 if (!rs[Rs_color + Color_fg]) 506 if (!rs[Rs_color + Color_fg])
430 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 507 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431 508
432 if (!rs[Rs_color + Color_bg]) 509 if (!rs[Rs_color + Color_bg])
… …
438 if (!rs[Rs_color + i]) 515 if (!rs[Rs_color + i])
439 rs[Rs_color + i] = def_colorName[i]; 516 rs[Rs_color + i] = def_colorName[i];
440 517
441#ifndef XTERM_REVERSE_VIDEO 518#ifndef XTERM_REVERSE_VIDEO
442 /* this is how we implement reverseVideo */ 519 /* this is how we implement reverseVideo */
443 if (OPTION (Opt_reverseVideo)) 520 if (option (Opt_reverseVideo))
444 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 521 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
445#endif 522#endif
446 523
447 /* convenient aliases for setting fg/bg to colors */ 524 /* convenient aliases for setting fg/bg to colors */
448 color_aliases (Color_fg); 525 color_aliases (Color_fg);
… …
469/*----------------------------------------------------------------------*/ 546/*----------------------------------------------------------------------*/
470void 547void
471rxvt_term::init_env () 548rxvt_term::init_env ()
472{ 549{
473 int i; 550 int i;
474 unsigned int u;
475 char *val; 551 char *val;
476 552
477#ifdef DISPLAY_IS_IP 553#ifdef DISPLAY_IS_IP
478 /* Fixup display_name for export over pty to any interested terminal 554 /* Fixup display_name for export over pty to any interested terminal
479 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 555 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
488 val = rxvt_network_display (rs[Rs_display_name]); 564 val = rxvt_network_display (rs[Rs_display_name]);
489 rs[Rs_display_name] = (const char *)val; 565 rs[Rs_display_name] = (const char *)val;
490 566
491 if (val == NULL) 567 if (val == NULL)
492#endif /* DISPLAY_IS_IP */ 568#endif /* DISPLAY_IS_IP */
493 val = XDisplayString (xdisp); 569 val = XDisplayString (dpy);
494 570
495 if (rs[Rs_display_name] == NULL) 571 if (rs[Rs_display_name] == NULL)
496 rs[Rs_display_name] = val; /* use broken `:0' value */ 572 rs[Rs_display_name] = val; /* use broken `:0' value */
497 573
498 i = strlen (val); 574 i = strlen (val);
499 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 575 env_display = (char *)rxvt_malloc (i + 9);
500 576
501 sprintf (env_display, "DISPLAY=%s", val); 577 sprintf (env_display, "DISPLAY=%s", val);
502 578
503 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 579 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
504 580
… …
525 else 601 else
526 putenv ("COLORTERM=" COLORTERMENVFULL); 602 putenv ("COLORTERM=" COLORTERMENVFULL);
527 603
528 if (rs[Rs_term_name] != NULL) 604 if (rs[Rs_term_name] != NULL)
529 { 605 {
530 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 606 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
531 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 607 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
532 putenv (env_term); 608 putenv (env_term);
533 } 609 }
534 else 610 else
535 putenv ("TERM=" TERMENV); 611 putenv ("TERM=" TERMENV);
… …
622 * Initialize the command connection. 698 * Initialize the command connection.
623 * This should be called after the X server connection is established. 699 * This should be called after the X server connection is established.
624 */ 700 */
625 701
626#ifdef META8_OPTION 702#ifdef META8_OPTION
627 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 703 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
628#endif 704#endif
629 705
630 get_ourmods (); 706 get_ourmods ();
631 707
632 if (!OPTION (Opt_scrollTtyOutput)) 708 if (!option (Opt_scrollTtyOutput))
633 priv_modes |= PrivMode_TtyOutputInh; 709 priv_modes |= PrivMode_TtyOutputInh;
634 if (OPTION (Opt_scrollTtyKeypress)) 710 if (option (Opt_scrollTtyKeypress))
635 priv_modes |= PrivMode_Keypress; 711 priv_modes |= PrivMode_Keypress;
636 if (!OPTION (Opt_jumpScroll)) 712 if (!option (Opt_jumpScroll))
637 priv_modes |= PrivMode_smoothScroll; 713 priv_modes |= PrivMode_smoothScroll;
638 714
639#ifndef NO_BACKSPACE_KEY 715#ifndef NO_BACKSPACE_KEY
640 if (strcmp (key_backspace, "DEC") == 0) 716 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
641 priv_modes |= PrivMode_HaveBackSpace; 717 priv_modes |= PrivMode_HaveBackSpace;
642#endif 718#endif
643 719
644 /* add value for scrollBar */ 720 /* add value for scrollBar */
645 if (scrollBar.state) 721 if (scrollBar.state)
… …
671 rxvt_color xcol; 747 rxvt_color xcol;
672 748
673 if (!set_color (xcol, name)) 749 if (!set_color (xcol, name))
674 { 750 {
675#ifndef XTERM_REVERSE_VIDEO 751#ifndef XTERM_REVERSE_VIDEO
676 if (i < 2 && OPTION (Opt_reverseVideo)) 752 if (i < 2 && option (Opt_reverseVideo))
677 name = def_colorName [1 - i]; 753 name = def_colorName [1 - i];
678 else 754 else
679#endif 755#endif
680 name = def_colorName [i]; 756 name = def_colorName [i];
681 757
… …
694#ifndef NO_CURSORCOLOR 770#ifndef NO_CURSORCOLOR
695 case Color_cursor2: 771 case Color_cursor2:
696#endif 772#endif
697 case Color_pointer_fg: 773 case Color_pointer_fg:
698 name = rs[Rs_color + Color_fg]; 774 name = rs[Rs_color + Color_fg];
699 xcol = pix_colors[Color_fg]; 775 xcol.set (this, name);
700 break; 776 break;
701 default: 777 default:
702 name = rs[Rs_color + Color_bg]; 778 name = rs[Rs_color + Color_bg];
703 xcol = pix_colors[Color_bg]; 779 xcol.set (this, name);
704 break; 780 break;
705 } 781 }
706 } 782 }
707 } 783 }
708 784
709 pix_colors[i] = xcol; 785 pix_colors[i] = xcol;
710 rs[Rs_color + i] = name; 786 rs[Rs_color + i] = name;
711 } 787 }
712 788
713#ifdef OFF_FOCUS_FADING
714 if (rs[Rs_fade])
715 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
716 {
717 rgba c;
718 pix_colors[Color_fade].get (c);
719 pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
720 }
721#endif
722
723 if (depth <= 2) 789 if (depth <= 2)
724 { 790 {
725 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 791 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
726 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 792 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
727 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 793 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
728 } 794 }
729 795
730 /* 796 /*
731 * get scrollBar shadow colors 797 * get scrollBar shadow colors
732 * 798 *
733 * The calculations of topShadow/bottomShadow values are adapted 799 * The calculations of topShadow/bottomShadow values are adapted
734 * from the fvwm window manager. 800 * from the fvwm window manager.
735 */ 801 */
736#ifdef KEEP_SCROLLCOLOR 802#ifdef KEEP_SCROLLCOLOR
737
738 if (depth <= 2) 803 if (depth <= 2)
739 { 804 {
740 /* Monochrome */ 805 /* Monochrome */
741 pix_colors[Color_scroll] = pix_colors[Color_fg]; 806 alias_color (Color_scroll, Color_fg);
742 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 807 alias_color (Color_topShadow, Color_bg);
743 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 808 alias_color (Color_bottomShadow, Color_bg);
744 } 809 }
745 else 810 else
746 { 811 {
747 rxvt_color xcol[2]; 812 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
748 /* xcol[0] == white
749 * xcol[1] == top shadow
750 * xcol[2] == bot shadow */
751 813
752 xcol[1] = pix_colors[Color_scroll];
753 xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
754
755 rgba c0, c1; 814 rgba cscroll;
756 815 pix_colors [Color_scroll].get (cscroll);
757 xcol[0].get (c0);
758 xcol[1].get (c1);
759
760 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
761 816
762 /* topShadowColor */ 817 /* topShadowColor */
763 if (!xcol[1].set (this, 818 if (!pix_colors[Color_topShadow].set (this,
764 rgba ( 819 rgba (
765 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 820 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
766 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 821 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
767 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 822 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
768 c1.a) // pa1 vs. pa0: arbitrary 823 cscroll.a)
769 )); 824 ))
770 xcol[1] = pix_colors[Color_White]; 825 alias_color (Color_topShadow, Color_White);
771
772 pix_colors[Color_topShadow] = xcol[1];
773 } 826 }
774#endif /* KEEP_SCROLLCOLOR */ 827#endif /* KEEP_SCROLLCOLOR */
828
829#ifdef OFF_FOCUS_FADING
830 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
831 update_fade_color (i);
832#endif
775} 833}
776 834
777/*----------------------------------------------------------------------*/ 835/*----------------------------------------------------------------------*/
778/* color aliases, fg/bg bright-bold */ 836/* color aliases, fg/bg bright-bold */
779void 837void
… …
818 876
819 if (rsmod 877 if (rsmod
820 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 878 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
821 requestedmeta = rsmod[3] - '0'; 879 requestedmeta = rsmod[3] - '0';
822 880
823 map = XGetModifierMapping (xdisp); 881 map = XGetModifierMapping (dpy);
824 kc = map->modifiermap; 882 kc = map->modifiermap;
825 883
826 for (i = 1; i < 6; i++) 884 for (i = 1; i < 6; i++)
827 { 885 {
828 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 886 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
830 for (j = map->max_keypermod; j--; k++) 888 for (j = map->max_keypermod; j--; k++)
831 { 889 {
832 if (kc[k] == 0) 890 if (kc[k] == 0)
833 break; 891 break;
834 892
835 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 893 switch (XKeycodeToKeysym (dpy, kc[k], 0))
836 { 894 {
837 case XK_Num_Lock: 895 case XK_Num_Lock:
838 ModNumLockMask = modmasks[i - 1]; 896 ModNumLockMask = modmasks[i - 1];
839 continue; 897 continue;
840 898
… …
890rxvt_term::create_windows (int argc, const char *const *argv) 948rxvt_term::create_windows (int argc, const char *const *argv)
891{ 949{
892 XClassHint classHint; 950 XClassHint classHint;
893 XWMHints wmHint; 951 XWMHints wmHint;
894#if ENABLE_FRILLS 952#if ENABLE_FRILLS
895 MWMHints mwmhints; 953 MWMHints mwmhints = { };
896#endif 954#endif
897 XGCValues gcvalue; 955 XGCValues gcvalue;
898 XSetWindowAttributes attributes; 956 XSetWindowAttributes attributes;
899 Window top, parent; 957 Window top, parent;
900 958
901 dLocal (Display *, xdisp); 959 dLocal (Display *, dpy);
902 960
903 /* grab colors before netscape does */ 961 /* grab colors before netscape does */
904 Get_Colours (); 962 Get_Colours ();
905 963
906 if (!set_fonts ()) 964 if (!set_fonts ())
907 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 965 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
908 966
909 parent = display->root; 967 parent = display->root;
910 968
911 attributes.override_redirect = !!OPTION (Opt_override_redirect); 969 attributes.override_redirect = !!option (Opt_override_redirect);
912 970
913#if ENABLE_FRILLS 971#if ENABLE_FRILLS
914 if (OPTION (Opt_borderLess)) 972 if (option (Opt_borderLess))
915 { 973 {
916 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 974 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
917 { 975 {
918 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 976 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
919 attributes.override_redirect = true; 977 attributes.override_redirect = true;
920 mwmhints.flags = 0;
921 } 978 }
922 else 979 else
923 { 980 {
924 mwmhints.flags = MWM_HINTS_DECORATIONS; 981 mwmhints.flags = MWM_HINTS_DECORATIONS;
925 mwmhints.decorations = 0;
926 } 982 }
927 } 983 }
928 else
929 mwmhints.flags = 0;
930#endif 984#endif
931 985
932#if ENABLE_XEMBED 986#if ENABLE_XEMBED
933 if (rs[Rs_embed]) 987 if (rs[Rs_embed])
934 { 988 {
935 XWindowAttributes wattr; 989 XWindowAttributes wattr;
936 990
937 parent = strtol (rs[Rs_embed], 0, 0); 991 parent = strtol (rs[Rs_embed], 0, 0);
938 992
939 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 993 if (!XGetWindowAttributes (dpy, parent, &wattr))
940 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 994 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
941 995
942 window_calc (wattr.width, wattr.height); 996 window_calc (wattr.width, wattr.height);
943 } 997 }
944#endif 998#endif
… …
948 /* sub-window placement & size in rxvt_resize_subwindows () */ 1002 /* sub-window placement & size in rxvt_resize_subwindows () */
949 attributes.background_pixel = pix_colors_focused [Color_border]; 1003 attributes.background_pixel = pix_colors_focused [Color_border];
950 attributes.border_pixel = pix_colors_focused [Color_border]; 1004 attributes.border_pixel = pix_colors_focused [Color_border];
951 attributes.colormap = cmap; 1005 attributes.colormap = cmap;
952 1006
953 top = XCreateWindow (xdisp, parent, 1007 top = XCreateWindow (dpy, parent,
954 szHint.x, szHint.y, 1008 szHint.x, szHint.y,
955 szHint.width, szHint.height, 1009 szHint.width, szHint.height,
956 ext_bwidth, 1010 ext_bwidth,
957 depth, InputOutput, visual, 1011 depth, InputOutput, visual,
958 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1012 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
969 classHint.res_name = (char *)rs[Rs_name]; 1023 classHint.res_name = (char *)rs[Rs_name];
970 classHint.res_class = (char *)RESCLASS; 1024 classHint.res_class = (char *)RESCLASS;
971 1025
972 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1026 wmHint.flags = InputHint | StateHint | WindowGroupHint;
973 wmHint.input = True; 1027 wmHint.input = True;
974 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1028 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
975 wmHint.window_group = top; 1029 wmHint.window_group = top;
976 1030
977 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 1031 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
978 &szHint, &wmHint, &classHint); 1032 &szHint, &wmHint, &classHint);
979 1033
980#if ENABLE_FRILLS 1034#if ENABLE_FRILLS
981 if (mwmhints.flags) 1035 if (mwmhints.flags)
982 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1036 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
983 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1037 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
984#endif 1038#endif
985 1039
986 Atom protocols[] = { 1040 Atom protocols[] = {
987 xa[XA_WM_DELETE_WINDOW], 1041 xa[XA_WM_DELETE_WINDOW],
988#if ENABLE_EWMH 1042#if ENABLE_EWMH
989 xa[XA_NET_WM_PING], 1043 xa[XA_NET_WM_PING],
990#endif 1044#endif
991 }; 1045 };
992 1046
993 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1047 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
994 1048
995#if ENABLE_FRILLS 1049#if ENABLE_FRILLS
996 if (rs[Rs_transient_for]) 1050 if (rs[Rs_transient_for])
997 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1051 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
998#endif 1052#endif
999 1053
1000#if ENABLE_EWMH 1054#if ENABLE_EWMH
1001 long pid = getpid (); 1055 long pid = getpid ();
1002 1056
1003 XChangeProperty (xdisp, top, 1057 XChangeProperty (dpy, top,
1004 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1058 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1005 PropModeReplace, (unsigned char *)&pid, 1); 1059 PropModeReplace, (unsigned char *)&pid, 1);
1006 1060
1007 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1061 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1008#endif 1062#endif
1009 1063
1010 XSelectInput (xdisp, top, 1064 XSelectInput (dpy, top,
1011 KeyPressMask 1065 KeyPressMask
1012#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1066#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1013 | KeyReleaseMask 1067 | KeyReleaseMask
1014#endif 1068#endif
1015 | FocusChangeMask | VisibilityChangeMask 1069 | FocusChangeMask | VisibilityChangeMask
1016 | ExposureMask | StructureNotifyMask); 1070 | ExposureMask | StructureNotifyMask);
1017 1071
1018 termwin_ev.start (display, top); 1072 termwin_ev.start (display, top);
1019 1073
1020 /* vt cursor: Black-on-White is standard, but this is more popular */ 1074 /* vt cursor: Black-on-White is standard, but this is more popular */
1021 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1075 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1022 1076
1023#ifdef HAVE_SCROLLBARS 1077#ifdef HAVE_SCROLLBARS
1024 /* cursor scrollBar: Black-on-White */ 1078 /* cursor scrollBar: Black-on-White */
1025 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1079 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1026#endif 1080#endif
1027 1081
1028 /* the vt window */ 1082 /* the vt window */
1029 vt = XCreateSimpleWindow (xdisp, top, 1083 vt = XCreateSimpleWindow (dpy, top,
1030 window_vt_x, window_vt_y, 1084 window_vt_x, window_vt_y,
1031 width, height, 1085 width, height,
1032 0, 1086 0,
1033 pix_colors_focused[Color_fg], 1087 pix_colors_focused[Color_fg],
1034 pix_colors_focused[Color_bg]); 1088 pix_colors_focused[Color_bg]);
1035 1089
1036 attributes.bit_gravity = NorthWestGravity; 1090 attributes.bit_gravity = NorthWestGravity;
1037 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1091 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1038 1092
1039 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1093 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1040 1094
1041 if (OPTION (Opt_pointerBlank)) 1095 if (option (Opt_pointerBlank))
1042 vt_emask |= PointerMotionMask; 1096 vt_emask |= PointerMotionMask;
1043 else 1097 else
1044 vt_emask |= Button1MotionMask | Button3MotionMask; 1098 vt_emask |= Button1MotionMask | Button3MotionMask;
1045 1099
1046 vt_select_input (); 1100 vt_select_input ();
1047 1101
1048 vt_ev.start (display, vt); 1102 vt_ev.start (display, vt);
1049 1103
1050#ifdef XPM_BACKGROUND
1051 if (rs[Rs_backgroundPixmap] != NULL
1052 && !OPTION (Opt_transparent))
1053 {
1054 const char *p = rs[Rs_backgroundPixmap];
1055
1056 if ((p = strchr (p, ';')) != NULL)
1057 {
1058 p++;
1059 scale_pixmap (p);
1060 }
1061
1062 set_bgPixmap (rs[Rs_backgroundPixmap]);
1063 scr_touch (true);
1064 }
1065#endif
1066
1067 /* graphics context for the vt window */ 1104 /* graphics context for the vt window */
1068 gcvalue.foreground = pix_colors[Color_fg]; 1105 gcvalue.foreground = pix_colors[Color_fg];
1069 gcvalue.background = pix_colors[Color_bg]; 1106 gcvalue.background = pix_colors[Color_bg];
1070 gcvalue.graphics_exposures = 1; 1107 gcvalue.graphics_exposures = 0;
1071 1108
1072 gc = XCreateGC (xdisp, vt, 1109 gc = XCreateGC (dpy, vt,
1073 GCForeground | GCBackground | GCGraphicsExposures, 1110 GCForeground | GCBackground | GCGraphicsExposures,
1074 &gcvalue); 1111 &gcvalue);
1075 1112
1076 drawable = new rxvt_drawable (this, vt); 1113 drawable = new rxvt_drawable (this, vt);
1077 1114
1078#ifdef RXVT_SCROLLBAR 1115#ifdef RXVT_SCROLLBAR
1079 gcvalue.foreground = pix_colors[Color_topShadow]; 1116 gcvalue.foreground = pix_colors[Color_topShadow];
1080 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1117 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1081 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1118 gcvalue.foreground = pix_colors[Color_bottomShadow];
1082 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1119 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1083 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1120 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1084 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1121 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1085#endif 1122#endif
1086 1123
1087#ifdef OFF_FOCUS_FADING 1124#ifdef OFF_FOCUS_FADING
1088 // initially we are in unfocused state 1125 // initially we are in unfocused state
1089 if (rs[Rs_fade]) 1126 if (rs[Rs_fade])
… …
1098 * GET TTY CURRENT STATE * 1135 * GET TTY CURRENT STATE *
1099 * ------------------------------------------------------------------------- */ 1136 * ------------------------------------------------------------------------- */
1100void 1137void
1101rxvt_get_ttymode (ttymode_t *tio, int erase) 1138rxvt_get_ttymode (ttymode_t *tio, int erase)
1102{ 1139{
1103#ifdef HAVE_TERMIOS_H
1104 /* 1140 /*
1105 * standard System V termios interface 1141 * standard System V termios interface
1106 */ 1142 */
1107 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1143 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1108 { 1144 {
… …
1175 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1211 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1176# if defined (ECHOCTL) && defined (ECHOKE) 1212# if defined (ECHOCTL) && defined (ECHOKE)
1177 | ECHOCTL | ECHOKE 1213 | ECHOCTL | ECHOKE
1178# endif 1214# endif
1179 | ECHOE | ECHOK); 1215 | ECHOE | ECHOK);
1180# else /* HAVE_TERMIOS_H */
1181
1182 /*
1183 * sgtty interface
1184 */
1185
1186 /* get parameters -- gtty */
1187 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1188 {
1189 tio->sg.sg_erase = CERASE; /* ^H */
1190 tio->sg.sg_kill = CKILL; /* ^U */
1191 }
1192
1193 if (erase != -1)
1194 tio->sg.sg_erase = (char)erase;
1195
1196 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1197
1198 /* get special characters */
1199 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1200 {
1201 tio->tc.t_intrc = CINTR; /* ^C */
1202 tio->tc.t_quitc = CQUIT; /* ^\ */
1203 tio->tc.t_startc = CSTART; /* ^Q */
1204 tio->tc.t_stopc = CSTOP; /* ^S */
1205 tio->tc.t_eofc = CEOF; /* ^D */
1206 tio->tc.t_brkc = -1;
1207 }
1208
1209 /* get local special chars */
1210 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1211 {
1212 tio->lc.t_suspc = CSUSP; /* ^Z */
1213 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1214 tio->lc.t_rprntc = CRPRNT; /* ^R */
1215 tio->lc.t_flushc = CFLUSH; /* ^O */
1216 tio->lc.t_werasc = CWERASE; /* ^W */
1217 tio->lc.t_lnextc = CLNEXT; /* ^V */
1218 }
1219 /* get line discipline */
1220 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1221# ifdef NTTYDISC
1222 tio->line = NTTYDISC;
1223# endif /* NTTYDISC */
1224
1225 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1226#endif /* HAVE_TERMIOS_H */
1227 1216
1228 /* 1217 /*
1229 * Debugging 1218 * Debugging
1230 */ 1219 */
1231#ifdef DEBUG_TTYMODE 1220#ifdef DEBUG_TTYMODE
… …
1332 else 1321 else
1333#endif 1322#endif
1334 if (!pty->get ()) 1323 if (!pty->get ())
1335 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1324 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1336 1325
1326 int er;
1327
1328#ifndef NO_BACKSPACE_KEY
1329 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1330 er = rs[Rs_backspace_key][0];
1331 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1332 er = '\177'; /* the initial state anyway */
1333 else
1334#endif
1335 er = -1;
1336
1337 rxvt_get_ttymode (&tio, er);
1338 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1337 pty->set_utf8_mode (enc_utf8); 1339 pty->set_utf8_mode (enc_utf8);
1338 1340
1339 /* set initial window size */ 1341 /* set initial window size */
1340 tt_winch (); 1342 tt_winch ();
1341
1342 int er;
1343
1344#ifndef NO_BACKSPACE_KEY
1345 if (key_backspace[0] && !key_backspace[1])
1346 er = key_backspace[0];
1347 else if (strcmp (key_backspace, "DEC") == 0)
1348 er = '\177'; /* the initial state anyway */
1349 else
1350#endif
1351 er = -1;
1352
1353 rxvt_get_ttymode (&tio, er);
1354 1343
1355#if ENABLE_FRILLS 1344#if ENABLE_FRILLS
1356 if (rs[Rs_pty_fd]) 1345 if (rs[Rs_pty_fd])
1357 return; 1346 return;
1358#endif 1347#endif
… …
1389 } 1378 }
1390 1379
1391 _exit (EXIT_FAILURE); 1380 _exit (EXIT_FAILURE);
1392 1381
1393 default: 1382 default:
1394 if (!OPTION (Opt_utmpInhibit)) 1383 if (!option (Opt_utmpInhibit))
1395 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1384 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1396 1385
1397 pty->close_tty (); 1386 pty->close_tty ();
1398 1387
1399 child_ev.start (cmd_pid); 1388 child_ev.start (cmd_pid);
1400 1389
… …
1413int 1402int
1414rxvt_term::run_child (const char *const *argv) 1403rxvt_term::run_child (const char *const *argv)
1415{ 1404{
1416 char *login; 1405 char *login;
1417 1406
1418 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1419
1420 if (OPTION (Opt_console)) 1407 if (option (Opt_console))
1421 { /* be virtual console, fail silently */ 1408 { /* be virtual console, fail silently */
1422#ifdef TIOCCONS 1409#ifdef TIOCCONS
1423 unsigned int on = 1; 1410 unsigned int on = 1;
1424 1411
1425 ioctl (STDIN_FILENO, TIOCCONS, &on); 1412 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1453 sigset_t ss; 1440 sigset_t ss;
1454 sigemptyset (&ss); 1441 sigemptyset (&ss);
1455 sigprocmask (SIG_SETMASK, &ss, 0); 1442 sigprocmask (SIG_SETMASK, &ss, 0);
1456 1443
1457 /* command interpreter path */ 1444 /* command interpreter path */
1458 if (argv != NULL) 1445 if (argv)
1459 { 1446 {
1460# ifdef DEBUG_CMD 1447# ifdef DEBUG_CMD
1461 int i; 1448 int i;
1462 1449
1463 for (i = 0; argv[i]; i++) 1450 for (i = 0; argv[i]; i++)
… …
1472 const char *argv0, *shell; 1459 const char *argv0, *shell;
1473 1460
1474 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1461 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1475 shell = "/bin/sh"; 1462 shell = "/bin/sh";
1476 1463
1477 argv0 = (const char *)rxvt_r_basename (shell); 1464 argv0 = (const char *)rxvt_basename (shell);
1478 1465
1479 if (OPTION (Opt_loginShell)) 1466 if (option (Opt_loginShell))
1480 { 1467 {
1481 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1468 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1482 1469
1483 login[0] = '-'; 1470 login[0] = '-';
1484 strcpy (&login[1], argv0); 1471 strcpy (&login[1], argv0);
1485 argv0 = login; 1472 argv0 = login;
1486 } 1473 }
1487 1474
1488 execlp (shell, argv0, NULL); 1475 execlp (shell, argv0, (char *)0);
1489 /* no error message: STDERR is closed! */ 1476 /* no error message: STDERR is closed! */
1490 } 1477 }
1491 1478
1492 return -1; 1479 return -1;
1493} 1480}

Diff Legend

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