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.154 by root, Wed Jan 25 02:45:36 2006 UTC vs.
Revision 1.212 by sasha, Wed Sep 12 21:06:08 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>
… …
43const char *const def_colorName[] = 43const char *const def_colorName[] =
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 49 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 50 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 56 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 57# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 59# endif
60 /* high-intensity colors */ 60 /* high-intensity colors */
61# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 63# else
64 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 65# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 73
74 // 88 xterm colours 74 // 88 xterm colours
75 "rgb:00/00/00", 75 "rgb:00/00/00",
76 "rgb:00/00/8b", 76 "rgb:00/00/8b",
77 "rgb:00/00/cd", 77 "rgb:00/00/cd",
… …
166#endif 166#endif
167#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if ENABLE_TRANSPARENCY
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "rgb:00/00/00",
176#endif 176#endif
177 }; 177 };
178 178
179bool 179bool
180rxvt_term::init_vars () 180rxvt_term::init_vars ()
… …
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 186#endif
187 187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 188
192 MEvent.time = CurrentTime; 189 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 190 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 191 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
197 focus = 0;
198 ncol = 80; 193 ncol = 80;
199 nrow = 24; 194 nrow = 24;
200 int_bwidth = INTERNALBORDERWIDTH; 195 int_bwidth = INTERNALBORDERWIDTH;
201 ext_bwidth = EXTERNALBORDERWIDTH; 196 ext_bwidth = EXTERNALBORDERWIDTH;
202 lineSpace = LINESPACE; 197 lineSpace = LINESPACE;
203 saveLines = SAVELINES; 198 saveLines = SAVELINES;
204 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
205 200
206 refresh_limit = 1;
207 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
208 prev_nrow = prev_ncol = 0;
209 202
210 oldcursor.row = oldcursor.col = -1; 203 oldcursor.row = oldcursor.col = -1;
211#ifdef XPM_BACKGROUND
212 /* bgPixmap.w = bgPixmap.h = 0; */
213 bgPixmap.x = bgPixmap.y = 50;
214 bgPixmap.pixmap = None;
215#endif
216
217 last_bot = last_state = -1; 204 last_bot = last_state = -1;
205
206 set_option (Opt_scrollBar);
207 set_option (Opt_scrollTtyOutput);
208 set_option (Opt_jumpScroll);
209 set_option (Opt_skipScroll);
210 set_option (Opt_secondaryScreen);
211 set_option (Opt_secondaryScroll);
212 set_option (Opt_pastableTabs);
213 set_option (Opt_intensityStyles);
214 set_option (Opt_iso14755_52);
218 215
219 return true; 216 return true;
220} 217}
221 218
222void 219void
… …
256/*----------------------------------------------------------------------*/ 253/*----------------------------------------------------------------------*/
257const char ** 254const char **
258rxvt_term::init_resources (int argc, const char *const *argv) 255rxvt_term::init_resources (int argc, const char *const *argv)
259{ 256{
260 int i, r_argc; 257 int i, r_argc;
261 char *val;
262 const char **cmd_argv, **r_argv; 258 const char **cmd_argv, **r_argv;
263 259
264 /* 260 /*
265 * Look for -exec option. Find => split and make cmd_argv[] of command args 261 * Look for -e option. Find => split and make cmd_argv[] of command args
266 */ 262 */
267 for (r_argc = 0; r_argc < argc; r_argc++) 263 for (r_argc = 0; r_argc < argc; r_argc++)
268 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 264 if (!strcmp (argv[r_argc], "-e"))
269 break; 265 break;
270 266
271 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 267 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
272 268
273 for (i = 0; i < r_argc; i++) 269 for (i = 0; i < r_argc; i++)
… …
285 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 281 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
286 282
287 cmd_argv[i] = NULL; 283 cmd_argv[i] = NULL;
288 } 284 }
289 285
290 rs[Rs_name] = rxvt_r_basename (argv[0]); 286 rs[Rs_name] = rxvt_basename (argv[0]);
291 287
292 /* 288 /*
293 * Open display, get options/resources and create the window 289 * Open display, get options/resources and create the window
294 */ 290 */
295 291
… …
299 get_options (r_argc, r_argv); 295 get_options (r_argc, r_argv);
300 296
301 if (!(display = displays.get (rs[Rs_display_name]))) 297 if (!(display = displays.get (rs[Rs_display_name])))
302 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 298 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
303 299
300 // using a local pointer decreases code size a lot
301 xa = display->xa;
302
303 set (display);
304 extract_resources (); 304 extract_resources ();
305 305
306#if XFT
307 if (rs[Rs_depth])
308 select_visual (strtol (rs[Rs_depth], 0, 0));
309#endif
310
311#ifdef HAVE_AFTERIMAGE
312 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
313#endif
306 free (r_argv); 314 free (r_argv);
315
316 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef)
318 rs [i] = 0;
307 319
308#if ENABLE_PERL 320#if ENABLE_PERL
309 if (!rs[Rs_perl_ext_1]) 321 if (!rs[Rs_perl_ext_1])
310 rs[Rs_perl_ext_1] = "default"; 322 rs[Rs_perl_ext_1] = "default";
311 323
… …
322 * set any defaults not already set 334 * set any defaults not already set
323 */ 335 */
324 if (cmd_argv && cmd_argv[0]) 336 if (cmd_argv && cmd_argv[0])
325 { 337 {
326 if (!rs[Rs_title]) 338 if (!rs[Rs_title])
327 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 339 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
328 if (!rs[Rs_iconName]) 340 if (!rs[Rs_iconName])
329 rs[Rs_iconName] = rs[Rs_title]; 341 rs[Rs_iconName] = rs[Rs_title];
330 } 342 }
331 else 343 else
332 { 344 {
… …
370 rs[Rs_cutchars] = CUTCHARS; 382 rs[Rs_cutchars] = CUTCHARS;
371 383
372#ifndef NO_BACKSPACE_KEY 384#ifndef NO_BACKSPACE_KEY
373 if (!rs[Rs_backspace_key]) 385 if (!rs[Rs_backspace_key])
374# ifdef DEFAULT_BACKSPACE 386# ifdef DEFAULT_BACKSPACE
375 key_backspace = DEFAULT_BACKSPACE; 387 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
376# else 388# else
377 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 389 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
378# endif 390# endif
379 else
380 {
381 val = strdup (rs[Rs_backspace_key]);
382 rxvt_Str_trim (val);
383 rxvt_Str_escaped (val);
384 key_backspace = val;
385 }
386#endif 391#endif
387 392
388#ifndef NO_DELETE_KEY 393#ifndef NO_DELETE_KEY
389 if (!rs[Rs_delete_key]) 394 if (!rs[Rs_delete_key])
390# ifdef DEFAULT_DELETE 395# ifdef DEFAULT_DELETE
391 key_delete = DEFAULT_DELETE; 396 rs[Rs_delete_key] = DEFAULT_DELETE;
392# else 397# else
393 key_delete = "\033[3~"; 398 rs[Rs_delete_key] = "\033[3~";
394# endif
395 else
396 {
397 val = strdup (rs[Rs_delete_key]);
398 rxvt_Str_trim (val);
399 rxvt_Str_escaped (val);
400 key_delete = val;
401 }
402#endif 399# endif
403 if (rs[Rs_answerbackstring]) 400#endif
404 {
405 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
406 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
407 }
408 401
409#ifdef HAVE_SCROLLBARS 402#ifdef HAVE_SCROLLBARS
410 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 403 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
411#endif 404#endif
412 405
413#ifdef XTERM_REVERSE_VIDEO 406#ifdef XTERM_REVERSE_VIDEO
414 /* this is how xterm implements reverseVideo */ 407 /* this is how xterm implements reverseVideo */
415 if (OPTION (Opt_reverseVideo)) 408 if (option (Opt_reverseVideo))
416 { 409 {
417 if (!rs[Rs_color + Color_fg]) 410 if (!rs[Rs_color + Color_fg])
418 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 411 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
412
419 if (!rs[Rs_color + Color_bg]) 413 if (!rs[Rs_color + Color_bg])
420 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 414 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
421 } 415 }
422#endif 416#endif
423 417
… …
425 if (!rs[Rs_color + i]) 419 if (!rs[Rs_color + i])
426 rs[Rs_color + i] = def_colorName[i]; 420 rs[Rs_color + i] = def_colorName[i];
427 421
428#ifndef XTERM_REVERSE_VIDEO 422#ifndef XTERM_REVERSE_VIDEO
429 /* this is how we implement reverseVideo */ 423 /* this is how we implement reverseVideo */
430 if (OPTION (Opt_reverseVideo)) 424 if (option (Opt_reverseVideo))
431 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 425 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
432#endif 426#endif
433 427
434 /* convenient aliases for setting fg/bg to colors */ 428 /* convenient aliases for setting fg/bg to colors */
435 color_aliases (Color_fg); 429 color_aliases (Color_fg);
… …
456/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
457void 451void
458rxvt_term::init_env () 452rxvt_term::init_env ()
459{ 453{
460 int i; 454 int i;
461 unsigned int u;
462 char *val; 455 char *val;
463 456
464#ifdef DISPLAY_IS_IP 457#ifdef DISPLAY_IS_IP
465 /* Fixup display_name for export over pty to any interested terminal 458 /* Fixup display_name for export over pty to any interested terminal
466 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 459 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
475 val = rxvt_network_display (rs[Rs_display_name]); 468 val = rxvt_network_display (rs[Rs_display_name]);
476 rs[Rs_display_name] = (const char *)val; 469 rs[Rs_display_name] = (const char *)val;
477 470
478 if (val == NULL) 471 if (val == NULL)
479#endif /* DISPLAY_IS_IP */ 472#endif /* DISPLAY_IS_IP */
480 val = XDisplayString (display->display); 473 val = XDisplayString (dpy);
481 474
482 if (rs[Rs_display_name] == NULL) 475 if (rs[Rs_display_name] == NULL)
483 rs[Rs_display_name] = val; /* use broken `:0' value */ 476 rs[Rs_display_name] = val; /* use broken `:0' value */
484 477
485 i = strlen (val); 478 i = strlen (val);
486 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 479 env_display = (char *)rxvt_malloc (i + 9);
487 480
488 sprintf (env_display, "DISPLAY=%s", val); 481 sprintf (env_display, "DISPLAY=%s", val);
489 482
490 /* avoiding the math library: 483 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
491 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
492 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
493 ;
494 max_it (i, 1);
495 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
496
497 sprintf (env_windowid, "WINDOWID=%u",
498 (unsigned int)parent[0]);
499 484
500 /* add entries to the environment: 485 /* add entries to the environment:
501 * @ DISPLAY: in case we started with -display 486 * @ DISPLAY: in case we started with -display
502 * @ WINDOWID: X window id number of the window 487 * @ WINDOWID: X window id number of the window
503 * @ COLORTERM: terminal sub-name and also indicates its color 488 * @ COLORTERM: terminal sub-name and also indicates its color
… …
505 * @ TERMINFO: path to terminfo directory 490 * @ TERMINFO: path to terminfo directory
506 * @ COLORFGBG: fg;bg color codes 491 * @ COLORFGBG: fg;bg color codes
507 */ 492 */
508 putenv (env_display); 493 putenv (env_display);
509 putenv (env_windowid); 494 putenv (env_windowid);
495
510 if (env_colorfgbg) 496 if (env_colorfgbg)
511 putenv (env_colorfgbg); 497 putenv (env_colorfgbg);
512 498
513#ifdef RXVT_TERMINFO 499#ifdef RXVT_TERMINFO
514 putenv ("TERMINFO=" RXVT_TERMINFO); 500 putenv ("TERMINFO=" RXVT_TERMINFO);
515#endif 501#endif
516 502
517 if (display->depth <= 2) 503 if (depth <= 2)
518 putenv ("COLORTERM=" COLORTERMENV "-mono"); 504 putenv ("COLORTERM=" COLORTERMENV "-mono");
519 else 505 else
520 putenv ("COLORTERM=" COLORTERMENVFULL); 506 putenv ("COLORTERM=" COLORTERMENVFULL);
521 507
522 if (rs[Rs_term_name] != NULL) 508 if (rs[Rs_term_name] != NULL)
523 { 509 {
524 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 510 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
525 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 511 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
526 putenv (env_term); 512 putenv (env_term);
527 } 513 }
528 else 514 else
529 putenv ("TERM=" TERMENV); 515 putenv ("TERM=" TERMENV);
… …
616 * Initialize the command connection. 602 * Initialize the command connection.
617 * This should be called after the X server connection is established. 603 * This should be called after the X server connection is established.
618 */ 604 */
619 605
620#ifdef META8_OPTION 606#ifdef META8_OPTION
621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 607 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622#endif 608#endif
623 609
624 get_ourmods (); 610 get_ourmods ();
625 611
626 if (!OPTION (Opt_scrollTtyOutput)) 612 if (!option (Opt_scrollTtyOutput))
627 priv_modes |= PrivMode_TtyOutputInh; 613 priv_modes |= PrivMode_TtyOutputInh;
628 if (OPTION (Opt_scrollTtyKeypress)) 614 if (option (Opt_scrollTtyKeypress))
629 priv_modes |= PrivMode_Keypress; 615 priv_modes |= PrivMode_Keypress;
630 if (!OPTION (Opt_jumpScroll)) 616 if (!option (Opt_jumpScroll))
631 priv_modes |= PrivMode_smoothScroll; 617 priv_modes |= PrivMode_smoothScroll;
632 618
633#ifndef NO_BACKSPACE_KEY 619#ifndef NO_BACKSPACE_KEY
634 if (strcmp (key_backspace, "DEC") == 0) 620 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
635 priv_modes |= PrivMode_HaveBackSpace; 621 priv_modes |= PrivMode_HaveBackSpace;
636#endif 622#endif
637 623
638 /* add value for scrollBar */ 624 /* add value for scrollBar */
639 if (scrollBar.state) 625 if (scrollBar.state)
… …
653 639
654#ifdef OFF_FOCUS_FADING 640#ifdef OFF_FOCUS_FADING
655 pix_colors = pix_colors_focused; 641 pix_colors = pix_colors_focused;
656#endif 642#endif
657 643
658 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 644 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 645 {
646 const char *name = rs[Rs_color + i];
647
648 if (!name)
649 continue;
650
660 rxvt_color xcol; 651 rxvt_color xcol;
661 652
662 if (!rs[Rs_color + i]) 653 if (!set_color (xcol, name))
663 continue;
664
665 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
666 { 654 {
667#ifndef XTERM_REVERSE_VIDEO 655#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 656 if (i < 2 && option (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 657 name = def_colorName [1 - i];
670 else 658 else
671#endif 659#endif
672 rs[Rs_color + i] = def_colorName[i]; 660 name = def_colorName [i];
673 661
674 if (!rs[Rs_color + i]) 662 if (!name)
675 continue; 663 continue;
676 664
677 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 665 if (!set_color (xcol, name))
678 { 666 {
679 switch (i) 667 switch (i)
680 { 668 {
681 case Color_fg: 669 case Color_fg:
682 case Color_bg: 670 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 671 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
685 /* NOTREACHED */ 672 name = "";
686 break; 673 break;
687#ifndef NO_CURSORCOLOR 674#ifndef NO_CURSORCOLOR
688 case Color_cursor2: 675 case Color_cursor2:
689 xcol = pix_colors[Color_fg]; 676#endif
690 break;
691#endif /* ! NO_CURSORCOLOR */
692 case Color_pointer_fg: 677 case Color_pointer_fg:
693 xcol = pix_colors[Color_fg]; 678 name = rs[Rs_color + Color_fg];
679 xcol.set (this, name);
694 break; 680 break;
695 default: 681 default:
696 xcol = pix_colors[Color_bg]; /* None */ 682 name = rs[Rs_color + Color_bg];
683 xcol.set (this, name);
697 break; 684 break;
698 } 685 }
699 } 686 }
700 } 687 }
701 688
702 pix_colors[i] = xcol; 689 pix_colors[i] = xcol;
703 SET_PIXCOLOR (i); 690 rs[Rs_color + i] = name;
704 }
705
706#ifdef OFF_FOCUS_FADING
707 if (rs[Rs_fade])
708 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
709 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
710#endif
711
712 if (display->depth <= 2)
713 { 691 }
692
693 if (depth <= 2)
694 {
714 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 695 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]; 696 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]; 697 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
717 } 698 }
718 699
719 /* 700 /*
720 * get scrollBar shadow colors 701 * get scrollBar shadow colors
721 * 702 *
722 * The calculations of topShadow/bottomShadow values are adapted 703 * The calculations of topShadow/bottomShadow values are adapted
723 * from the fvwm window manager. 704 * from the fvwm window manager.
724 */ 705 */
725#ifdef KEEP_SCROLLCOLOR 706#ifdef KEEP_SCROLLCOLOR
726
727 if (display->depth <= 2) 707 if (depth <= 2)
728 { 708 {
729 /* Monochrome */ 709 /* Monochrome */
730 pix_colors[Color_scroll] = pix_colors[Color_fg]; 710 alias_color (Color_scroll, Color_fg);
731 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 711 alias_color (Color_topShadow, Color_bg);
732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 712 alias_color (Color_bottomShadow, Color_bg);
733 } 713 }
734 else 714 else
735 { 715 {
736 rxvt_color xcol[2]; 716 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 717
741 xcol[1] = pix_colors[Color_scroll]; 718 rgba cscroll;
742 xcol[0].set (display, 65535, 65535, 65535); 719 pix_colors [Color_scroll].get (cscroll);
743
744 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
745
746 xcol[0].get (display, pr0, pg0, pb0);
747 xcol[1].get (display, pr1, pg1, pb1);
748
749 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
750 720
751 /* topShadowColor */ 721 /* topShadowColor */
752 if (!xcol[1].set (display, 722 if (!pix_colors[Color_topShadow].set (this,
753 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 723 rgba (
754 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 724 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
755 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 725 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
756 xcol[1] = pix_colors[Color_White]; 726 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
757 727 cscroll.a)
758 pix_colors[Color_topShadow] = xcol[1]; 728 ))
729 alias_color (Color_topShadow, Color_White);
759 } 730 }
760#endif /* KEEP_SCROLLCOLOR */ 731#endif /* KEEP_SCROLLCOLOR */
732
733#ifdef OFF_FOCUS_FADING
734 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
735 update_fade_color (i);
736#endif
761} 737}
762 738
763/*----------------------------------------------------------------------*/ 739/*----------------------------------------------------------------------*/
764/* color aliases, fg/bg bright-bold */ 740/* color aliases, fg/bg bright-bold */
765void 741void
… …
804 780
805 if (rsmod 781 if (rsmod
806 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 782 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
807 requestedmeta = rsmod[3] - '0'; 783 requestedmeta = rsmod[3] - '0';
808 784
809 map = XGetModifierMapping (display->display); 785 map = XGetModifierMapping (dpy);
810 kc = map->modifiermap; 786 kc = map->modifiermap;
811 787
812 for (i = 1; i < 6; i++) 788 for (i = 1; i < 6; i++)
813 { 789 {
814 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 790 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
816 for (j = map->max_keypermod; j--; k++) 792 for (j = map->max_keypermod; j--; k++)
817 { 793 {
818 if (kc[k] == 0) 794 if (kc[k] == 0)
819 break; 795 break;
820 796
821 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 797 switch (XKeycodeToKeysym (dpy, kc[k], 0))
822 { 798 {
823 case XK_Num_Lock: 799 case XK_Num_Lock:
824 ModNumLockMask = modmasks[i - 1]; 800 ModNumLockMask = modmasks[i - 1];
825 continue; 801 continue;
826 802
… …
876rxvt_term::create_windows (int argc, const char *const *argv) 852rxvt_term::create_windows (int argc, const char *const *argv)
877{ 853{
878 XClassHint classHint; 854 XClassHint classHint;
879 XWMHints wmHint; 855 XWMHints wmHint;
880#if ENABLE_FRILLS 856#if ENABLE_FRILLS
881 MWMHints mwmhints; 857 MWMHints mwmhints = { };
882#endif 858#endif
883 XGCValues gcvalue; 859 XGCValues gcvalue;
884 XSetWindowAttributes attributes; 860 XSetWindowAttributes attributes;
885 Window top, parent; 861 Window top, parent;
886 dDisp;
887 862
888 xa = display->xa; 863 dLocal (Display *, dpy);
889 864
890 /* grab colors before netscape does */ 865 /* grab colors before netscape does */
891 Get_Colours (); 866 Get_Colours ();
892 867
893 if (!set_fonts ()) 868 if (!set_fonts ())
894 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 869 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
895 870
896 parent = display->root; 871 parent = display->root;
897 872
898 attributes.override_redirect = !!OPTION (Opt_override_redirect); 873 attributes.override_redirect = !!option (Opt_override_redirect);
899 874
900#if ENABLE_FRILLS 875#if ENABLE_FRILLS
901 if (OPTION (Opt_borderLess)) 876 if (option (Opt_borderLess))
902 { 877 {
903 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 878 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
904 { 879 {
905 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 880 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
906 attributes.override_redirect = TRUE; 881 attributes.override_redirect = true;
907 mwmhints.flags = 0;
908 } 882 }
909 else 883 else
910 { 884 {
911 mwmhints.flags = MWM_HINTS_DECORATIONS; 885 mwmhints.flags = MWM_HINTS_DECORATIONS;
912 mwmhints.decorations = 0;
913 } 886 }
914 } 887 }
915 else
916 mwmhints.flags = 0;
917#endif 888#endif
918 889
919#if ENABLE_XEMBED 890#if ENABLE_XEMBED
920 if (rs[Rs_embed]) 891 if (rs[Rs_embed])
921 { 892 {
922 XWindowAttributes wattr; 893 XWindowAttributes wattr;
923 894
924 parent = strtol (rs[Rs_embed], 0, 0); 895 parent = strtol (rs[Rs_embed], 0, 0);
925 896
926 if (!XGetWindowAttributes (disp, parent, &wattr)) 897 if (!XGetWindowAttributes (dpy, parent, &wattr))
927 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 898 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
928 899
929 window_calc (wattr.width, wattr.height); 900 window_calc (wattr.width, wattr.height);
930 } 901 }
931#endif 902#endif
932 903
933 window_calc (0, 0); 904 window_calc (0, 0);
934 905
935 /* sub-window placement & size in rxvt_resize_subwindows () */ 906 /* sub-window placement & size in rxvt_resize_subwindows () */
936 attributes.background_pixel = pix_colors_focused[Color_border]; 907 attributes.background_pixel = pix_colors_focused [Color_border];
937 attributes.border_pixel = pix_colors_focused[Color_border]; 908 attributes.border_pixel = pix_colors_focused [Color_border];
938 attributes.colormap = display->cmap; 909 attributes.colormap = cmap;
939 910
940 top = XCreateWindow (disp, parent, 911 top = XCreateWindow (dpy, parent,
941 szHint.x, szHint.y, 912 szHint.x, szHint.y,
942 szHint.width, szHint.height, 913 szHint.width, szHint.height,
943 ext_bwidth, 914 ext_bwidth,
944 display->depth, InputOutput, 915 depth, InputOutput, visual,
945 display->visual,
946 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 916 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
947 &attributes); 917 &attributes);
948 918
949 this->parent[0] = top; 919 this->parent[0] = top;
950 920
… …
957 classHint.res_name = (char *)rs[Rs_name]; 927 classHint.res_name = (char *)rs[Rs_name];
958 classHint.res_class = (char *)RESCLASS; 928 classHint.res_class = (char *)RESCLASS;
959 929
960 wmHint.flags = InputHint | StateHint | WindowGroupHint; 930 wmHint.flags = InputHint | StateHint | WindowGroupHint;
961 wmHint.input = True; 931 wmHint.input = True;
962 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 932 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
963 wmHint.window_group = top; 933 wmHint.window_group = top;
964 934
965 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 935 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
966 &szHint, &wmHint, &classHint); 936 &szHint, &wmHint, &classHint);
967 937
968#if ENABLE_FRILLS 938#if ENABLE_FRILLS
969 if (mwmhints.flags) 939 if (mwmhints.flags)
970 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 940 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
971 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 941 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
972#endif 942#endif
973 943
974 Atom protocols[] = { 944 Atom protocols[] = {
975 xa[XA_WM_DELETE_WINDOW], 945 xa[XA_WM_DELETE_WINDOW],
976#if ENABLE_EWMH 946#if ENABLE_EWMH
977 xa[XA_NET_WM_PING], 947 xa[XA_NET_WM_PING],
978#endif 948#endif
979 }; 949 };
980 950
981 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 951 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
982 952
983#if ENABLE_FRILLS 953#if ENABLE_FRILLS
984 if (rs[Rs_transient_for]) 954 if (rs[Rs_transient_for])
985 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 955 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
986#endif 956#endif
987 957
988#if ENABLE_EWMH 958#if ENABLE_EWMH
989 long pid = getpid (); 959 long pid = getpid ();
990 960
991 XChangeProperty (disp, top, 961 XChangeProperty (dpy, top,
992 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 962 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
993 PropModeReplace, (unsigned char *)&pid, 1); 963 PropModeReplace, (unsigned char *)&pid, 1);
994 964
995 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 965 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
996#endif 966#endif
997 967
998 XSelectInput (disp, top, 968 XSelectInput (dpy, top,
999 KeyPressMask 969 KeyPressMask
1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 970#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1001 | KeyReleaseMask 971 | KeyReleaseMask
1002#endif 972#endif
1003 | FocusChangeMask | VisibilityChangeMask 973 | FocusChangeMask | VisibilityChangeMask
1004 | ExposureMask | StructureNotifyMask); 974 | ExposureMask | StructureNotifyMask);
1005 975
1006 termwin_ev.start (display, top); 976 termwin_ev.start (display, top);
1007 977
1008 /* vt cursor: Black-on-White is standard, but this is more popular */ 978 /* vt cursor: Black-on-White is standard, but this is more popular */
1009 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 979 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1010 980
1011#ifdef HAVE_SCROLLBARS 981#ifdef HAVE_SCROLLBARS
1012 /* cursor scrollBar: Black-on-White */ 982 /* cursor scrollBar: Black-on-White */
1013 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 983 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1014#endif 984#endif
1015 985
1016 /* the vt window */ 986 /* the vt window */
1017 vt = XCreateSimpleWindow (disp, top, 987 vt = XCreateSimpleWindow (dpy, top,
1018 window_vt_x, window_vt_y, 988 window_vt_x, window_vt_y,
1019 width, height, 989 width, height,
1020 0, 990 0,
1021 pix_colors_focused[Color_fg], 991 pix_colors_focused[Color_fg],
1022 pix_colors_focused[Color_bg]); 992 pix_colors_focused[Color_bg]);
1023 993
1024 attributes.bit_gravity = NorthWestGravity; 994 attributes.bit_gravity = NorthWestGravity;
1025 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 995 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1026 996
1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 997 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1028 998
1029 if (OPTION (Opt_pointerBlank)) 999 if (option (Opt_pointerBlank))
1030 vt_emask |= PointerMotionMask; 1000 vt_emask |= PointerMotionMask;
1031 else 1001 else
1032 vt_emask |= Button1MotionMask | Button3MotionMask; 1002 vt_emask |= Button1MotionMask | Button3MotionMask;
1033 1003
1034 vt_select_input (); 1004 vt_select_input ();
1035 1005
1036 vt_ev.start (display, vt); 1006 vt_ev.start (display, vt);
1037 1007
1038#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL
1040 && !OPTION (Opt_transparent))
1041 {
1042 const char *p = rs[Rs_backgroundPixmap];
1043
1044 if ((p = strchr (p, ';')) != NULL)
1045 {
1046 p++;
1047 scale_pixmap (p);
1048 }
1049
1050 set_bgPixmap (rs[Rs_backgroundPixmap]);
1051 scr_touch (true);
1052 }
1053#endif
1054
1055 /* graphics context for the vt window */ 1008 /* graphics context for the vt window */
1056 gcvalue.foreground = pix_colors[Color_fg]; 1009 gcvalue.foreground = pix_colors[Color_fg];
1057 gcvalue.background = pix_colors[Color_bg]; 1010 gcvalue.background = pix_colors[Color_bg];
1058 gcvalue.graphics_exposures = 1; 1011 gcvalue.graphics_exposures = 0;
1059 1012
1060 gc = XCreateGC (disp, vt, 1013 gc = XCreateGC (dpy, vt,
1061 GCForeground | GCBackground | GCGraphicsExposures, 1014 GCForeground | GCBackground | GCGraphicsExposures,
1062 &gcvalue); 1015 &gcvalue);
1063 1016
1064 drawable = new rxvt_drawable (display, vt); 1017 drawable = new rxvt_drawable (this, vt);
1065 1018
1066#ifdef RXVT_SCROLLBAR 1019#ifdef RXVT_SCROLLBAR
1067 gcvalue.foreground = pix_colors[Color_topShadow]; 1020 gcvalue.foreground = pix_colors[Color_topShadow];
1068 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1021 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1069 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1022 gcvalue.foreground = pix_colors[Color_bottomShadow];
1070 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1023 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1071 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1024 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1072 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1025 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1073#endif 1026#endif
1074 1027
1075#ifdef OFF_FOCUS_FADING 1028#ifdef OFF_FOCUS_FADING
1076 // initially we are in unfocused state 1029 // initially we are in unfocused state
1077 if (rs[Rs_fade]) 1030 if (rs[Rs_fade])
… …
1086 * GET TTY CURRENT STATE * 1039 * GET TTY CURRENT STATE *
1087 * ------------------------------------------------------------------------- */ 1040 * ------------------------------------------------------------------------- */
1088void 1041void
1089rxvt_get_ttymode (ttymode_t *tio, int erase) 1042rxvt_get_ttymode (ttymode_t *tio, int erase)
1090{ 1043{
1091#ifdef HAVE_TERMIOS_H
1092 /* 1044 /*
1093 * standard System V termios interface 1045 * standard System V termios interface
1094 */ 1046 */
1095 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1047 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1096 { 1048 {
… …
1163 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1115 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1164# if defined (ECHOCTL) && defined (ECHOKE) 1116# if defined (ECHOCTL) && defined (ECHOKE)
1165 | ECHOCTL | ECHOKE 1117 | ECHOCTL | ECHOKE
1166# endif 1118# endif
1167 | ECHOE | ECHOK); 1119 | ECHOE | ECHOK);
1168# else /* HAVE_TERMIOS_H */
1169
1170 /*
1171 * sgtty interface
1172 */
1173
1174 /* get parameters -- gtty */
1175 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1176 {
1177 tio->sg.sg_erase = CERASE; /* ^H */
1178 tio->sg.sg_kill = CKILL; /* ^U */
1179 }
1180
1181 if (erase != -1)
1182 tio->sg.sg_erase = (char)erase;
1183
1184 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1185
1186 /* get special characters */
1187 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1188 {
1189 tio->tc.t_intrc = CINTR; /* ^C */
1190 tio->tc.t_quitc = CQUIT; /* ^\ */
1191 tio->tc.t_startc = CSTART; /* ^Q */
1192 tio->tc.t_stopc = CSTOP; /* ^S */
1193 tio->tc.t_eofc = CEOF; /* ^D */
1194 tio->tc.t_brkc = -1;
1195 }
1196
1197 /* get local special chars */
1198 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1199 {
1200 tio->lc.t_suspc = CSUSP; /* ^Z */
1201 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1202 tio->lc.t_rprntc = CRPRNT; /* ^R */
1203 tio->lc.t_flushc = CFLUSH; /* ^O */
1204 tio->lc.t_werasc = CWERASE; /* ^W */
1205 tio->lc.t_lnextc = CLNEXT; /* ^V */
1206 }
1207 /* get line discipline */
1208 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1209# ifdef NTTYDISC
1210 tio->line = NTTYDISC;
1211# endif /* NTTYDISC */
1212
1213 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1214#endif /* HAVE_TERMIOS_H */
1215 1120
1216 /* 1121 /*
1217 * Debugging 1122 * Debugging
1218 */ 1123 */
1219#ifdef DEBUG_TTYMODE 1124#ifdef DEBUG_TTYMODE
… …
1320 else 1225 else
1321#endif 1226#endif
1322 if (!pty->get ()) 1227 if (!pty->get ())
1323 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1228 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1324 1229
1230 int er;
1231
1232#ifndef NO_BACKSPACE_KEY
1233 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1234 er = rs[Rs_backspace_key][0];
1235 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1236 er = '\177'; /* the initial state anyway */
1237 else
1238#endif
1239 er = -1;
1240
1241 rxvt_get_ttymode (&tio, er);
1242 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1325 pty->set_utf8_mode (enc_utf8); 1243 pty->set_utf8_mode (enc_utf8);
1326 1244
1327 /* set initial window size */ 1245 /* set initial window size */
1328 tt_winch (); 1246 tt_winch ();
1329
1330 int er;
1331
1332#ifndef NO_BACKSPACE_KEY
1333 if (key_backspace[0] && !key_backspace[1])
1334 er = key_backspace[0];
1335 else if (strcmp (key_backspace, "DEC") == 0)
1336 er = '\177'; /* the initial state anyway */
1337 else
1338#endif
1339 er = -1;
1340
1341 rxvt_get_ttymode (&tio, er);
1342 1247
1343#if ENABLE_FRILLS 1248#if ENABLE_FRILLS
1344 if (rs[Rs_pty_fd]) 1249 if (rs[Rs_pty_fd])
1345 return; 1250 return;
1346#endif 1251#endif
… …
1377 } 1282 }
1378 1283
1379 _exit (EXIT_FAILURE); 1284 _exit (EXIT_FAILURE);
1380 1285
1381 default: 1286 default:
1382 if (!OPTION (Opt_utmpInhibit)) 1287 if (!option (Opt_utmpInhibit))
1383 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1288 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1384 1289
1385 pty->close_tty (); 1290 pty->close_tty ();
1386 1291
1387 child_ev.start (cmd_pid); 1292 child_ev.start (cmd_pid);
1388 1293
… …
1401int 1306int
1402rxvt_term::run_child (const char *const *argv) 1307rxvt_term::run_child (const char *const *argv)
1403{ 1308{
1404 char *login; 1309 char *login;
1405 1310
1406 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1407
1408 if (OPTION (Opt_console)) 1311 if (option (Opt_console))
1409 { /* be virtual console, fail silently */ 1312 { /* be virtual console, fail silently */
1410#ifdef TIOCCONS 1313#ifdef TIOCCONS
1411 unsigned int on = 1; 1314 unsigned int on = 1;
1412 1315
1413 ioctl (STDIN_FILENO, TIOCCONS, &on); 1316 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1460 const char *argv0, *shell; 1363 const char *argv0, *shell;
1461 1364
1462 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1365 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1463 shell = "/bin/sh"; 1366 shell = "/bin/sh";
1464 1367
1465 argv0 = (const char *)rxvt_r_basename (shell); 1368 argv0 = (const char *)rxvt_basename (shell);
1466 1369
1467 if (OPTION (Opt_loginShell)) 1370 if (option (Opt_loginShell))
1468 { 1371 {
1469 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1372 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1470 1373
1471 login[0] = '-'; 1374 login[0] = '-';
1472 strcpy (&login[1], argv0); 1375 strcpy (&login[1], argv0);
1473 argv0 = login; 1376 argv0 = login;
1474 } 1377 }

Diff Legend

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