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

Diff Legend

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