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.159 by root, Mon Jan 30 02:21:20 2006 UTC vs.
Revision 1.214 by ayin, Fri Sep 14 17:10:34 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
… …
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;
268 357
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 358 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 359
271 for (i = 0; i < r_argc; i++) 360 for (i = 0; i < r_argc; i++)
… …
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 372 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284 373
285 cmd_argv[i] = NULL; 374 cmd_argv[i] = NULL;
286 } 375 }
287 376
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 377 rs[Rs_name] = rxvt_basename (argv[0]);
289 378
290 /* 379 /*
291 * Open display, get options/resources and create the window 380 * Open display, get options/resources and create the window
292 */ 381 */
293 382
… …
297 get_options (r_argc, r_argv); 386 get_options (r_argc, r_argv);
298 387
299 if (!(display = displays.get (rs[Rs_display_name]))) 388 if (!(display = displays.get (rs[Rs_display_name])))
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 389 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 390
391 // using a local pointer decreases code size a lot
302 xa = display->xa; 392 xa = display->xa;
303 393
304#if ENABLE_FRILLS 394 set (display);
395 extract_resources ();
396
397#if XFT
305 if (rs[Rs_depth]) 398 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0)); 399 select_visual (strtol (rs[Rs_depth], 0, 0));
307 else
308#endif 400#endif
309 set (display);
310 401
311 extract_resources (); 402#ifdef HAVE_AFTERIMAGE
312 403 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
404#endif
313 free (r_argv); 405 free (r_argv);
406
407 for (int i = NUM_RESOURCES; i--; )
408 if (rs [i] == resval_undef)
409 rs [i] = 0;
314 410
315#if ENABLE_PERL 411#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1]) 412 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default"; 413 rs[Rs_perl_ext_1] = "default";
318 414
… …
329 * set any defaults not already set 425 * set any defaults not already set
330 */ 426 */
331 if (cmd_argv && cmd_argv[0]) 427 if (cmd_argv && cmd_argv[0])
332 { 428 {
333 if (!rs[Rs_title]) 429 if (!rs[Rs_title])
334 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 430 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
335 if (!rs[Rs_iconName]) 431 if (!rs[Rs_iconName])
336 rs[Rs_iconName] = rs[Rs_title]; 432 rs[Rs_iconName] = rs[Rs_title];
337 } 433 }
338 else 434 else
339 { 435 {
… …
377 rs[Rs_cutchars] = CUTCHARS; 473 rs[Rs_cutchars] = CUTCHARS;
378 474
379#ifndef NO_BACKSPACE_KEY 475#ifndef NO_BACKSPACE_KEY
380 if (!rs[Rs_backspace_key]) 476 if (!rs[Rs_backspace_key])
381# ifdef DEFAULT_BACKSPACE 477# ifdef DEFAULT_BACKSPACE
382 key_backspace = DEFAULT_BACKSPACE; 478 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
383# else 479# else
384 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 480 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
385# endif 481# endif
386 else
387 {
388 val = strdup (rs[Rs_backspace_key]);
389 rxvt_Str_trim (val);
390 rxvt_Str_escaped (val);
391 key_backspace = val;
392 }
393#endif 482#endif
394 483
395#ifndef NO_DELETE_KEY 484#ifndef NO_DELETE_KEY
396 if (!rs[Rs_delete_key]) 485 if (!rs[Rs_delete_key])
397# ifdef DEFAULT_DELETE 486# ifdef DEFAULT_DELETE
398 key_delete = DEFAULT_DELETE; 487 rs[Rs_delete_key] = DEFAULT_DELETE;
399# else 488# else
400 key_delete = "\033[3~"; 489 rs[Rs_delete_key] = "\033[3~";
401# endif
402 else
403 {
404 val = strdup (rs[Rs_delete_key]);
405 rxvt_Str_trim (val);
406 rxvt_Str_escaped (val);
407 key_delete = val;
408 }
409#endif 490# endif
410 if (rs[Rs_answerbackstring]) 491#endif
411 {
412 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
413 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
414 }
415 492
416#ifdef HAVE_SCROLLBARS 493#ifdef HAVE_SCROLLBARS
417 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 494 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
418#endif 495#endif
419 496
420#ifdef XTERM_REVERSE_VIDEO 497#ifdef XTERM_REVERSE_VIDEO
421 /* this is how xterm implements reverseVideo */ 498 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 499 if (option (Opt_reverseVideo))
423 { 500 {
424 if (!rs[Rs_color + Color_fg]) 501 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 502 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
503
426 if (!rs[Rs_color + Color_bg]) 504 if (!rs[Rs_color + Color_bg])
427 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 505 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428 } 506 }
429#endif 507#endif
430 508
… …
432 if (!rs[Rs_color + i]) 510 if (!rs[Rs_color + i])
433 rs[Rs_color + i] = def_colorName[i]; 511 rs[Rs_color + i] = def_colorName[i];
434 512
435#ifndef XTERM_REVERSE_VIDEO 513#ifndef XTERM_REVERSE_VIDEO
436 /* this is how we implement reverseVideo */ 514 /* this is how we implement reverseVideo */
437 if (OPTION (Opt_reverseVideo)) 515 if (option (Opt_reverseVideo))
438 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 516 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439#endif 517#endif
440 518
441 /* convenient aliases for setting fg/bg to colors */ 519 /* convenient aliases for setting fg/bg to colors */
442 color_aliases (Color_fg); 520 color_aliases (Color_fg);
… …
463/*----------------------------------------------------------------------*/ 541/*----------------------------------------------------------------------*/
464void 542void
465rxvt_term::init_env () 543rxvt_term::init_env ()
466{ 544{
467 int i; 545 int i;
468 unsigned int u;
469 char *val; 546 char *val;
470 547
471#ifdef DISPLAY_IS_IP 548#ifdef DISPLAY_IS_IP
472 /* Fixup display_name for export over pty to any interested terminal 549 /* Fixup display_name for export over pty to any interested terminal
473 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 550 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
482 val = rxvt_network_display (rs[Rs_display_name]); 559 val = rxvt_network_display (rs[Rs_display_name]);
483 rs[Rs_display_name] = (const char *)val; 560 rs[Rs_display_name] = (const char *)val;
484 561
485 if (val == NULL) 562 if (val == NULL)
486#endif /* DISPLAY_IS_IP */ 563#endif /* DISPLAY_IS_IP */
487 val = XDisplayString (xdisp); 564 val = XDisplayString (dpy);
488 565
489 if (rs[Rs_display_name] == NULL) 566 if (rs[Rs_display_name] == NULL)
490 rs[Rs_display_name] = val; /* use broken `:0' value */ 567 rs[Rs_display_name] = val; /* use broken `:0' value */
491 568
492 i = strlen (val); 569 i = strlen (val);
493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 570 env_display = (char *)rxvt_malloc (i + 9);
494 571
495 sprintf (env_display, "DISPLAY=%s", val); 572 sprintf (env_display, "DISPLAY=%s", val);
496 573
497 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 574 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
498 575
… …
519 else 596 else
520 putenv ("COLORTERM=" COLORTERMENVFULL); 597 putenv ("COLORTERM=" COLORTERMENVFULL);
521 598
522 if (rs[Rs_term_name] != NULL) 599 if (rs[Rs_term_name] != NULL)
523 { 600 {
524 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 601 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
525 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 602 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
526 putenv (env_term); 603 putenv (env_term);
527 } 604 }
528 else 605 else
529 putenv ("TERM=" TERMENV); 606 putenv ("TERM=" TERMENV);
… …
616 * Initialize the command connection. 693 * Initialize the command connection.
617 * This should be called after the X server connection is established. 694 * This should be called after the X server connection is established.
618 */ 695 */
619 696
620#ifdef META8_OPTION 697#ifdef META8_OPTION
621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 698 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622#endif 699#endif
623 700
624 get_ourmods (); 701 get_ourmods ();
625 702
626 if (!OPTION (Opt_scrollTtyOutput)) 703 if (!option (Opt_scrollTtyOutput))
627 priv_modes |= PrivMode_TtyOutputInh; 704 priv_modes |= PrivMode_TtyOutputInh;
628 if (OPTION (Opt_scrollTtyKeypress)) 705 if (option (Opt_scrollTtyKeypress))
629 priv_modes |= PrivMode_Keypress; 706 priv_modes |= PrivMode_Keypress;
630 if (!OPTION (Opt_jumpScroll)) 707 if (!option (Opt_jumpScroll))
631 priv_modes |= PrivMode_smoothScroll; 708 priv_modes |= PrivMode_smoothScroll;
632 709
633#ifndef NO_BACKSPACE_KEY 710#ifndef NO_BACKSPACE_KEY
634 if (strcmp (key_backspace, "DEC") == 0) 711 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
635 priv_modes |= PrivMode_HaveBackSpace; 712 priv_modes |= PrivMode_HaveBackSpace;
636#endif 713#endif
637 714
638 /* add value for scrollBar */ 715 /* add value for scrollBar */
639 if (scrollBar.state) 716 if (scrollBar.state)
… …
655 pix_colors = pix_colors_focused; 732 pix_colors = pix_colors_focused;
656#endif 733#endif
657 734
658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 735 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 736 {
737 const char *name = rs[Rs_color + i];
738
739 if (!name)
740 continue;
741
660 rxvt_color xcol; 742 rxvt_color xcol;
661 743
662 if (!rs[Rs_color + i]) 744 if (!set_color (xcol, name))
663 continue;
664
665 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
666 { 745 {
667#ifndef XTERM_REVERSE_VIDEO 746#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 747 if (i < 2 && option (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 748 name = def_colorName [1 - i];
670 else 749 else
671#endif 750#endif
672 rs[Rs_color + i] = def_colorName[i]; 751 name = def_colorName [i];
673 752
674 if (!rs[Rs_color + i]) 753 if (!name)
675 continue; 754 continue;
676 755
677 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 756 if (!set_color (xcol, name))
678 { 757 {
679 switch (i) 758 switch (i)
680 { 759 {
681 case Color_fg: 760 case Color_fg:
682 case Color_bg: 761 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 762 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
685 /* NOTREACHED */ 763 name = "";
686 break; 764 break;
687#ifndef NO_CURSORCOLOR 765#ifndef NO_CURSORCOLOR
688 case Color_cursor2: 766 case Color_cursor2:
689 xcol = pix_colors[Color_fg]; 767#endif
690 break;
691#endif /* ! NO_CURSORCOLOR */
692 case Color_pointer_fg: 768 case Color_pointer_fg:
693 xcol = pix_colors[Color_fg]; 769 name = rs[Rs_color + Color_fg];
770 xcol.set (this, name);
694 break; 771 break;
695 default: 772 default:
696 xcol = pix_colors[Color_bg]; /* None */ 773 name = rs[Rs_color + Color_bg];
774 xcol.set (this, name);
697 break; 775 break;
698 } 776 }
699 } 777 }
700 } 778 }
701 779
702 pix_colors[i] = xcol; 780 pix_colors[i] = xcol;
703 SET_PIXCOLOR (i); 781 rs[Rs_color + i] = name;
704 } 782 }
705
706#ifdef OFF_FOCUS_FADING
707 if (rs[Rs_fade])
708 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
709 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
710#endif
711 783
712 if (depth <= 2) 784 if (depth <= 2)
713 { 785 {
714 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 786 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
715 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 787 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
716 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 788 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
717 } 789 }
718 790
719 /* 791 /*
720 * get scrollBar shadow colors 792 * get scrollBar shadow colors
721 * 793 *
722 * The calculations of topShadow/bottomShadow values are adapted 794 * The calculations of topShadow/bottomShadow values are adapted
723 * from the fvwm window manager. 795 * from the fvwm window manager.
724 */ 796 */
725#ifdef KEEP_SCROLLCOLOR 797#ifdef KEEP_SCROLLCOLOR
726
727 if (depth <= 2) 798 if (depth <= 2)
728 { 799 {
729 /* Monochrome */ 800 /* Monochrome */
730 pix_colors[Color_scroll] = pix_colors[Color_fg]; 801 alias_color (Color_scroll, Color_fg);
731 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 802 alias_color (Color_topShadow, Color_bg);
732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 803 alias_color (Color_bottomShadow, Color_bg);
733 } 804 }
734 else 805 else
735 { 806 {
736 rxvt_color xcol[2]; 807 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
737 /* xcol[0] == white
738 * xcol[1] == top shadow
739 * xcol[2] == bot shadow */
740 808
741 xcol[1] = pix_colors[Color_scroll]; 809 rgba cscroll;
742 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); 810 pix_colors [Color_scroll].get (cscroll);
743
744 rxvt_rgba c0, c1;
745
746 xcol[0].get (this, c0);
747 xcol[1].get (this, c1);
748
749 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
750 811
751 /* topShadowColor */ 812 /* topShadowColor */
752 if (!xcol[1].set (this, 813 if (!pix_colors[Color_topShadow].set (this,
753 rxvt_rgba ( 814 rgba (
754 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 815 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
755 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 816 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
756 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 817 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
757 c1.a) // pa1 vs. pa0: arbitrary 818 cscroll.a)
758 )); 819 ))
759 xcol[1] = pix_colors[Color_White]; 820 alias_color (Color_topShadow, Color_White);
760
761 pix_colors[Color_topShadow] = xcol[1];
762 } 821 }
763#endif /* KEEP_SCROLLCOLOR */ 822#endif /* KEEP_SCROLLCOLOR */
823
824#ifdef OFF_FOCUS_FADING
825 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
826 update_fade_color (i);
827#endif
764} 828}
765 829
766/*----------------------------------------------------------------------*/ 830/*----------------------------------------------------------------------*/
767/* color aliases, fg/bg bright-bold */ 831/* color aliases, fg/bg bright-bold */
768void 832void
… …
807 871
808 if (rsmod 872 if (rsmod
809 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 873 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
810 requestedmeta = rsmod[3] - '0'; 874 requestedmeta = rsmod[3] - '0';
811 875
812 map = XGetModifierMapping (xdisp); 876 map = XGetModifierMapping (dpy);
813 kc = map->modifiermap; 877 kc = map->modifiermap;
814 878
815 for (i = 1; i < 6; i++) 879 for (i = 1; i < 6; i++)
816 { 880 {
817 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 881 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
819 for (j = map->max_keypermod; j--; k++) 883 for (j = map->max_keypermod; j--; k++)
820 { 884 {
821 if (kc[k] == 0) 885 if (kc[k] == 0)
822 break; 886 break;
823 887
824 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 888 switch (XKeycodeToKeysym (dpy, kc[k], 0))
825 { 889 {
826 case XK_Num_Lock: 890 case XK_Num_Lock:
827 ModNumLockMask = modmasks[i - 1]; 891 ModNumLockMask = modmasks[i - 1];
828 continue; 892 continue;
829 893
… …
879rxvt_term::create_windows (int argc, const char *const *argv) 943rxvt_term::create_windows (int argc, const char *const *argv)
880{ 944{
881 XClassHint classHint; 945 XClassHint classHint;
882 XWMHints wmHint; 946 XWMHints wmHint;
883#if ENABLE_FRILLS 947#if ENABLE_FRILLS
884 MWMHints mwmhints; 948 MWMHints mwmhints = { };
885#endif 949#endif
886 XGCValues gcvalue; 950 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 951 XSetWindowAttributes attributes;
888 Window top, parent; 952 Window top, parent;
889 953
890 dLocal (Display *, xdisp); 954 dLocal (Display *, dpy);
891 955
892 /* grab colors before netscape does */ 956 /* grab colors before netscape does */
893 Get_Colours (); 957 Get_Colours ();
894 958
895 if (!set_fonts ()) 959 if (!set_fonts ())
896 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 960 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
897 961
898 parent = display->root; 962 parent = display->root;
899 963
900 attributes.override_redirect = !!OPTION (Opt_override_redirect); 964 attributes.override_redirect = !!option (Opt_override_redirect);
901 965
902#if ENABLE_FRILLS 966#if ENABLE_FRILLS
903 if (OPTION (Opt_borderLess)) 967 if (option (Opt_borderLess))
904 { 968 {
905 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 969 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
906 { 970 {
907 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 971 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
908 attributes.override_redirect = true; 972 attributes.override_redirect = true;
909 mwmhints.flags = 0;
910 } 973 }
911 else 974 else
912 { 975 {
913 mwmhints.flags = MWM_HINTS_DECORATIONS; 976 mwmhints.flags = MWM_HINTS_DECORATIONS;
914 mwmhints.decorations = 0;
915 } 977 }
916 } 978 }
917 else
918 mwmhints.flags = 0;
919#endif 979#endif
920 980
921#if ENABLE_XEMBED 981#if ENABLE_XEMBED
922 if (rs[Rs_embed]) 982 if (rs[Rs_embed])
923 { 983 {
924 XWindowAttributes wattr; 984 XWindowAttributes wattr;
925 985
926 parent = strtol (rs[Rs_embed], 0, 0); 986 parent = strtol (rs[Rs_embed], 0, 0);
927 987
928 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 988 if (!XGetWindowAttributes (dpy, parent, &wattr))
929 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
930 990
931 window_calc (wattr.width, wattr.height); 991 window_calc (wattr.width, wattr.height);
932 } 992 }
933#endif 993#endif
… …
937 /* sub-window placement & size in rxvt_resize_subwindows () */ 997 /* sub-window placement & size in rxvt_resize_subwindows () */
938 attributes.background_pixel = pix_colors_focused [Color_border]; 998 attributes.background_pixel = pix_colors_focused [Color_border];
939 attributes.border_pixel = pix_colors_focused [Color_border]; 999 attributes.border_pixel = pix_colors_focused [Color_border];
940 attributes.colormap = cmap; 1000 attributes.colormap = cmap;
941 1001
942 top = XCreateWindow (xdisp, parent, 1002 top = XCreateWindow (dpy, parent,
943 szHint.x, szHint.y, 1003 szHint.x, szHint.y,
944 szHint.width, szHint.height, 1004 szHint.width, szHint.height,
945 ext_bwidth, 1005 ext_bwidth,
946 depth, InputOutput, visual, 1006 depth, InputOutput, visual,
947 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1007 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
958 classHint.res_name = (char *)rs[Rs_name]; 1018 classHint.res_name = (char *)rs[Rs_name];
959 classHint.res_class = (char *)RESCLASS; 1019 classHint.res_class = (char *)RESCLASS;
960 1020
961 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1021 wmHint.flags = InputHint | StateHint | WindowGroupHint;
962 wmHint.input = True; 1022 wmHint.input = True;
963 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1023 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
964 wmHint.window_group = top; 1024 wmHint.window_group = top;
965 1025
966 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 1026 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
967 &szHint, &wmHint, &classHint); 1027 &szHint, &wmHint, &classHint);
968 1028
969#if ENABLE_FRILLS 1029#if ENABLE_FRILLS
970 if (mwmhints.flags) 1030 if (mwmhints.flags)
971 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1031 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
972 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1032 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
973#endif 1033#endif
974 1034
975 Atom protocols[] = { 1035 Atom protocols[] = {
976 xa[XA_WM_DELETE_WINDOW], 1036 xa[XA_WM_DELETE_WINDOW],
977#if ENABLE_EWMH 1037#if ENABLE_EWMH
978 xa[XA_NET_WM_PING], 1038 xa[XA_NET_WM_PING],
979#endif 1039#endif
980 }; 1040 };
981 1041
982 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1042 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
983 1043
984#if ENABLE_FRILLS 1044#if ENABLE_FRILLS
985 if (rs[Rs_transient_for]) 1045 if (rs[Rs_transient_for])
986 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1046 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
987#endif 1047#endif
988 1048
989#if ENABLE_EWMH 1049#if ENABLE_EWMH
990 long pid = getpid (); 1050 long pid = getpid ();
991 1051
992 XChangeProperty (xdisp, top, 1052 XChangeProperty (dpy, top,
993 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1053 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
994 PropModeReplace, (unsigned char *)&pid, 1); 1054 PropModeReplace, (unsigned char *)&pid, 1);
995 1055
996 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1056 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
997#endif 1057#endif
998 1058
999 XSelectInput (xdisp, top, 1059 XSelectInput (dpy, top,
1000 KeyPressMask 1060 KeyPressMask
1001#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1061#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1002 | KeyReleaseMask 1062 | KeyReleaseMask
1003#endif 1063#endif
1004 | FocusChangeMask | VisibilityChangeMask 1064 | FocusChangeMask | VisibilityChangeMask
1005 | ExposureMask | StructureNotifyMask); 1065 | ExposureMask | StructureNotifyMask);
1006 1066
1007 termwin_ev.start (display, top); 1067 termwin_ev.start (display, top);
1008 1068
1009 /* vt cursor: Black-on-White is standard, but this is more popular */ 1069 /* vt cursor: Black-on-White is standard, but this is more popular */
1010 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1070 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1011 1071
1012#ifdef HAVE_SCROLLBARS 1072#ifdef HAVE_SCROLLBARS
1013 /* cursor scrollBar: Black-on-White */ 1073 /* cursor scrollBar: Black-on-White */
1014 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1074 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1015#endif 1075#endif
1016 1076
1017 /* the vt window */ 1077 /* the vt window */
1018 vt = XCreateSimpleWindow (xdisp, top, 1078 vt = XCreateSimpleWindow (dpy, top,
1019 window_vt_x, window_vt_y, 1079 window_vt_x, window_vt_y,
1020 width, height, 1080 width, height,
1021 0, 1081 0,
1022 pix_colors_focused[Color_fg], 1082 pix_colors_focused[Color_fg],
1023 pix_colors_focused[Color_bg]); 1083 pix_colors_focused[Color_bg]);
1024 1084
1025 attributes.bit_gravity = NorthWestGravity; 1085 attributes.bit_gravity = NorthWestGravity;
1026 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1086 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1027 1087
1028 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1088 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1029 1089
1030 if (OPTION (Opt_pointerBlank)) 1090 if (option (Opt_pointerBlank))
1031 vt_emask |= PointerMotionMask; 1091 vt_emask |= PointerMotionMask;
1032 else 1092 else
1033 vt_emask |= Button1MotionMask | Button3MotionMask; 1093 vt_emask |= Button1MotionMask | Button3MotionMask;
1034 1094
1035 vt_select_input (); 1095 vt_select_input ();
1036 1096
1037 vt_ev.start (display, vt); 1097 vt_ev.start (display, vt);
1038 1098
1039#ifdef XPM_BACKGROUND
1040 if (rs[Rs_backgroundPixmap] != NULL
1041 && !OPTION (Opt_transparent))
1042 {
1043 const char *p = rs[Rs_backgroundPixmap];
1044
1045 if ((p = strchr (p, ';')) != NULL)
1046 {
1047 p++;
1048 scale_pixmap (p);
1049 }
1050
1051 set_bgPixmap (rs[Rs_backgroundPixmap]);
1052 scr_touch (true);
1053 }
1054#endif
1055
1056 /* graphics context for the vt window */ 1099 /* graphics context for the vt window */
1057 gcvalue.foreground = pix_colors[Color_fg]; 1100 gcvalue.foreground = pix_colors[Color_fg];
1058 gcvalue.background = pix_colors[Color_bg]; 1101 gcvalue.background = pix_colors[Color_bg];
1059 gcvalue.graphics_exposures = 1; 1102 gcvalue.graphics_exposures = 0;
1060 1103
1061 gc = XCreateGC (xdisp, vt, 1104 gc = XCreateGC (dpy, vt,
1062 GCForeground | GCBackground | GCGraphicsExposures, 1105 GCForeground | GCBackground | GCGraphicsExposures,
1063 &gcvalue); 1106 &gcvalue);
1064 1107
1065 drawable = new rxvt_drawable (this, vt); 1108 drawable = new rxvt_drawable (this, vt);
1066 1109
1067#ifdef RXVT_SCROLLBAR 1110#ifdef RXVT_SCROLLBAR
1068 gcvalue.foreground = pix_colors[Color_topShadow]; 1111 gcvalue.foreground = pix_colors[Color_topShadow];
1069 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1112 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1070 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1113 gcvalue.foreground = pix_colors[Color_bottomShadow];
1071 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1114 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1115 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1073 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1116 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074#endif 1117#endif
1075 1118
1076#ifdef OFF_FOCUS_FADING 1119#ifdef OFF_FOCUS_FADING
1077 // initially we are in unfocused state 1120 // initially we are in unfocused state
1078 if (rs[Rs_fade]) 1121 if (rs[Rs_fade])
… …
1087 * GET TTY CURRENT STATE * 1130 * GET TTY CURRENT STATE *
1088 * ------------------------------------------------------------------------- */ 1131 * ------------------------------------------------------------------------- */
1089void 1132void
1090rxvt_get_ttymode (ttymode_t *tio, int erase) 1133rxvt_get_ttymode (ttymode_t *tio, int erase)
1091{ 1134{
1092#ifdef HAVE_TERMIOS_H
1093 /* 1135 /*
1094 * standard System V termios interface 1136 * standard System V termios interface
1095 */ 1137 */
1096 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1138 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1097 { 1139 {
… …
1164 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1206 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1165# if defined (ECHOCTL) && defined (ECHOKE) 1207# if defined (ECHOCTL) && defined (ECHOKE)
1166 | ECHOCTL | ECHOKE 1208 | ECHOCTL | ECHOKE
1167# endif 1209# endif
1168 | ECHOE | ECHOK); 1210 | ECHOE | ECHOK);
1169# else /* HAVE_TERMIOS_H */
1170
1171 /*
1172 * sgtty interface
1173 */
1174
1175 /* get parameters -- gtty */
1176 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1177 {
1178 tio->sg.sg_erase = CERASE; /* ^H */
1179 tio->sg.sg_kill = CKILL; /* ^U */
1180 }
1181
1182 if (erase != -1)
1183 tio->sg.sg_erase = (char)erase;
1184
1185 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1186
1187 /* get special characters */
1188 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1189 {
1190 tio->tc.t_intrc = CINTR; /* ^C */
1191 tio->tc.t_quitc = CQUIT; /* ^\ */
1192 tio->tc.t_startc = CSTART; /* ^Q */
1193 tio->tc.t_stopc = CSTOP; /* ^S */
1194 tio->tc.t_eofc = CEOF; /* ^D */
1195 tio->tc.t_brkc = -1;
1196 }
1197
1198 /* get local special chars */
1199 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1200 {
1201 tio->lc.t_suspc = CSUSP; /* ^Z */
1202 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1203 tio->lc.t_rprntc = CRPRNT; /* ^R */
1204 tio->lc.t_flushc = CFLUSH; /* ^O */
1205 tio->lc.t_werasc = CWERASE; /* ^W */
1206 tio->lc.t_lnextc = CLNEXT; /* ^V */
1207 }
1208 /* get line discipline */
1209 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1210# ifdef NTTYDISC
1211 tio->line = NTTYDISC;
1212# endif /* NTTYDISC */
1213
1214 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1215#endif /* HAVE_TERMIOS_H */
1216 1211
1217 /* 1212 /*
1218 * Debugging 1213 * Debugging
1219 */ 1214 */
1220#ifdef DEBUG_TTYMODE 1215#ifdef DEBUG_TTYMODE
… …
1321 else 1316 else
1322#endif 1317#endif
1323 if (!pty->get ()) 1318 if (!pty->get ())
1324 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1319 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1325 1320
1321 int er;
1322
1323#ifndef NO_BACKSPACE_KEY
1324 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1325 er = rs[Rs_backspace_key][0];
1326 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1327 er = '\177'; /* the initial state anyway */
1328 else
1329#endif
1330 er = -1;
1331
1332 rxvt_get_ttymode (&tio, er);
1333 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1326 pty->set_utf8_mode (enc_utf8); 1334 pty->set_utf8_mode (enc_utf8);
1327 1335
1328 /* set initial window size */ 1336 /* set initial window size */
1329 tt_winch (); 1337 tt_winch ();
1330
1331 int er;
1332
1333#ifndef NO_BACKSPACE_KEY
1334 if (key_backspace[0] && !key_backspace[1])
1335 er = key_backspace[0];
1336 else if (strcmp (key_backspace, "DEC") == 0)
1337 er = '\177'; /* the initial state anyway */
1338 else
1339#endif
1340 er = -1;
1341
1342 rxvt_get_ttymode (&tio, er);
1343 1338
1344#if ENABLE_FRILLS 1339#if ENABLE_FRILLS
1345 if (rs[Rs_pty_fd]) 1340 if (rs[Rs_pty_fd])
1346 return; 1341 return;
1347#endif 1342#endif
… …
1378 } 1373 }
1379 1374
1380 _exit (EXIT_FAILURE); 1375 _exit (EXIT_FAILURE);
1381 1376
1382 default: 1377 default:
1383 if (!OPTION (Opt_utmpInhibit)) 1378 if (!option (Opt_utmpInhibit))
1384 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1379 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1385 1380
1386 pty->close_tty (); 1381 pty->close_tty ();
1387 1382
1388 child_ev.start (cmd_pid); 1383 child_ev.start (cmd_pid);
1389 1384
… …
1402int 1397int
1403rxvt_term::run_child (const char *const *argv) 1398rxvt_term::run_child (const char *const *argv)
1404{ 1399{
1405 char *login; 1400 char *login;
1406 1401
1407 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1408
1409 if (OPTION (Opt_console)) 1402 if (option (Opt_console))
1410 { /* be virtual console, fail silently */ 1403 { /* be virtual console, fail silently */
1411#ifdef TIOCCONS 1404#ifdef TIOCCONS
1412 unsigned int on = 1; 1405 unsigned int on = 1;
1413 1406
1414 ioctl (STDIN_FILENO, TIOCCONS, &on); 1407 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1442 sigset_t ss; 1435 sigset_t ss;
1443 sigemptyset (&ss); 1436 sigemptyset (&ss);
1444 sigprocmask (SIG_SETMASK, &ss, 0); 1437 sigprocmask (SIG_SETMASK, &ss, 0);
1445 1438
1446 /* command interpreter path */ 1439 /* command interpreter path */
1447 if (argv != NULL) 1440 if (argv)
1448 { 1441 {
1449# ifdef DEBUG_CMD 1442# ifdef DEBUG_CMD
1450 int i; 1443 int i;
1451 1444
1452 for (i = 0; argv[i]; i++) 1445 for (i = 0; argv[i]; i++)
… …
1461 const char *argv0, *shell; 1454 const char *argv0, *shell;
1462 1455
1463 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1456 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1464 shell = "/bin/sh"; 1457 shell = "/bin/sh";
1465 1458
1466 argv0 = (const char *)rxvt_r_basename (shell); 1459 argv0 = (const char *)rxvt_basename (shell);
1467 1460
1468 if (OPTION (Opt_loginShell)) 1461 if (option (Opt_loginShell))
1469 { 1462 {
1470 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1463 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1471 1464
1472 login[0] = '-'; 1465 login[0] = '-';
1473 strcpy (&login[1], argv0); 1466 strcpy (&login[1], argv0);
1474 argv0 = login; 1467 argv0 = login;
1475 } 1468 }
1476 1469
1477 execlp (shell, argv0, NULL); 1470 execlp (shell, argv0, (char *)0);
1478 /* no error message: STDERR is closed! */ 1471 /* no error message: STDERR is closed! */
1479 } 1472 }
1480 1473
1481 return -1; 1474 return -1;
1482} 1475}

Diff Legend

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