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.187 by root, Mon Jun 18 12:53:26 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",
… …
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if TINTING
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 ()
… …
189 pixmap = None; 189 pixmap = None;
190#endif 190#endif
191 191
192 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 194 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 195 priv_modes = SavedModes = PrivMode_Default;
197 focus = 0;
198 ncol = 80; 196 ncol = 80;
199 nrow = 24; 197 nrow = 24;
200 int_bwidth = INTERNALBORDERWIDTH; 198 int_bwidth = INTERNALBORDERWIDTH;
201 ext_bwidth = EXTERNALBORDERWIDTH; 199 ext_bwidth = EXTERNALBORDERWIDTH;
202 lineSpace = LINESPACE; 200 lineSpace = LINESPACE;
203 saveLines = SAVELINES; 201 saveLines = SAVELINES;
204 numpix_colors = TOTAL_COLORS; 202 numpix_colors = TOTAL_COLORS;
205 203
206 refresh_limit = 1;
207 refresh_type = SLOW_REFRESH; 204 refresh_type = SLOW_REFRESH;
208 prev_nrow = prev_ncol = 0;
209 205
210 oldcursor.row = oldcursor.col = -1; 206 oldcursor.row = oldcursor.col = -1;
211#ifdef XPM_BACKGROUND 207#ifdef XPM_BACKGROUND
212 /* bgPixmap.w = bgPixmap.h = 0; */ 208 /* bgPixmap.w = bgPixmap.h = 0; */
213 bgPixmap.x = bgPixmap.y = 50; 209 bgPixmap.x = bgPixmap.y = 0;
214 bgPixmap.pixmap = None; 210 bgPixmap.pixmap = None;
215#endif 211#endif
216 212
217 last_bot = last_state = -1; 213 last_bot = last_state = -1;
214
215 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll);
218 set_option (Opt_secondaryScreen);
219 set_option (Opt_secondaryScroll);
220 set_option (Opt_pastableTabs);
221 set_option (Opt_intensityStyles);
222 set_option (Opt_iso14755_52);
218 223
219 return true; 224 return true;
220} 225}
221 226
222void 227void
… …
260 int i, r_argc; 265 int i, r_argc;
261 char *val; 266 char *val;
262 const char **cmd_argv, **r_argv; 267 const char **cmd_argv, **r_argv;
263 268
264 /* 269 /*
265 * Look for -exec option. Find => split and make cmd_argv[] of command args 270 * Look for -e option. Find => split and make cmd_argv[] of command args
266 */ 271 */
267 for (r_argc = 0; r_argc < argc; r_argc++) 272 for (r_argc = 0; r_argc < argc; r_argc++)
268 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 273 if (!strcmp (argv[r_argc], "-e"))
269 break; 274 break;
270 275
271 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 276 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
272 277
273 for (i = 0; i < r_argc; i++) 278 for (i = 0; i < r_argc; i++)
… …
299 get_options (r_argc, r_argv); 304 get_options (r_argc, r_argv);
300 305
301 if (!(display = displays.get (rs[Rs_display_name]))) 306 if (!(display = displays.get (rs[Rs_display_name])))
302 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 307 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
303 308
309 // using a local pointer decreases code size a lot
310 xa = display->xa;
311
312 set (display);
304 extract_resources (); 313 extract_resources ();
305 314
315#if XFT
316 if (rs[Rs_depth])
317 select_visual (strtol (rs[Rs_depth], 0, 0));
318#endif
319
306 free (r_argv); 320 free (r_argv);
321
322 for (int i = NUM_RESOURCES; i--; )
323 if (rs [i] == resval_undef)
324 rs [i] = 0;
307 325
308#if ENABLE_PERL 326#if ENABLE_PERL
309 if (!rs[Rs_perl_ext_1]) 327 if (!rs[Rs_perl_ext_1])
310 rs[Rs_perl_ext_1] = "default"; 328 rs[Rs_perl_ext_1] = "default";
311 329
… …
410 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 428 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
411#endif 429#endif
412 430
413#ifdef XTERM_REVERSE_VIDEO 431#ifdef XTERM_REVERSE_VIDEO
414 /* this is how xterm implements reverseVideo */ 432 /* this is how xterm implements reverseVideo */
415 if (OPTION (Opt_reverseVideo)) 433 if (option (Opt_reverseVideo))
416 { 434 {
417 if (!rs[Rs_color + Color_fg]) 435 if (!rs[Rs_color + Color_fg])
418 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 436 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
437
419 if (!rs[Rs_color + Color_bg]) 438 if (!rs[Rs_color + Color_bg])
420 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 439 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
421 } 440 }
422#endif 441#endif
423 442
… …
425 if (!rs[Rs_color + i]) 444 if (!rs[Rs_color + i])
426 rs[Rs_color + i] = def_colorName[i]; 445 rs[Rs_color + i] = def_colorName[i];
427 446
428#ifndef XTERM_REVERSE_VIDEO 447#ifndef XTERM_REVERSE_VIDEO
429 /* this is how we implement reverseVideo */ 448 /* this is how we implement reverseVideo */
430 if (OPTION (Opt_reverseVideo)) 449 if (option (Opt_reverseVideo))
431 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 450 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
432#endif 451#endif
433 452
434 /* convenient aliases for setting fg/bg to colors */ 453 /* convenient aliases for setting fg/bg to colors */
435 color_aliases (Color_fg); 454 color_aliases (Color_fg);
… …
475 val = rxvt_network_display (rs[Rs_display_name]); 494 val = rxvt_network_display (rs[Rs_display_name]);
476 rs[Rs_display_name] = (const char *)val; 495 rs[Rs_display_name] = (const char *)val;
477 496
478 if (val == NULL) 497 if (val == NULL)
479#endif /* DISPLAY_IS_IP */ 498#endif /* DISPLAY_IS_IP */
480 val = XDisplayString (display->display); 499 val = XDisplayString (dpy);
481 500
482 if (rs[Rs_display_name] == NULL) 501 if (rs[Rs_display_name] == NULL)
483 rs[Rs_display_name] = val; /* use broken `:0' value */ 502 rs[Rs_display_name] = val; /* use broken `:0' value */
484 503
485 i = strlen (val); 504 i = strlen (val);
486 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 505 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
487 506
488 sprintf (env_display, "DISPLAY=%s", val); 507 sprintf (env_display, "DISPLAY=%s", val);
489 508
490 /* avoiding the math library: 509 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 510
500 /* add entries to the environment: 511 /* add entries to the environment:
501 * @ DISPLAY: in case we started with -display 512 * @ DISPLAY: in case we started with -display
502 * @ WINDOWID: X window id number of the window 513 * @ WINDOWID: X window id number of the window
503 * @ COLORTERM: terminal sub-name and also indicates its color 514 * @ COLORTERM: terminal sub-name and also indicates its color
… …
505 * @ TERMINFO: path to terminfo directory 516 * @ TERMINFO: path to terminfo directory
506 * @ COLORFGBG: fg;bg color codes 517 * @ COLORFGBG: fg;bg color codes
507 */ 518 */
508 putenv (env_display); 519 putenv (env_display);
509 putenv (env_windowid); 520 putenv (env_windowid);
521
510 if (env_colorfgbg) 522 if (env_colorfgbg)
511 putenv (env_colorfgbg); 523 putenv (env_colorfgbg);
512 524
513#ifdef RXVT_TERMINFO 525#ifdef RXVT_TERMINFO
514 putenv ("TERMINFO=" RXVT_TERMINFO); 526 putenv ("TERMINFO=" RXVT_TERMINFO);
515#endif 527#endif
516 528
517 if (display->depth <= 2) 529 if (depth <= 2)
518 putenv ("COLORTERM=" COLORTERMENV "-mono"); 530 putenv ("COLORTERM=" COLORTERMENV "-mono");
519 else 531 else
520 putenv ("COLORTERM=" COLORTERMENVFULL); 532 putenv ("COLORTERM=" COLORTERMENVFULL);
521 533
522 if (rs[Rs_term_name] != NULL) 534 if (rs[Rs_term_name] != NULL)
… …
616 * Initialize the command connection. 628 * Initialize the command connection.
617 * This should be called after the X server connection is established. 629 * This should be called after the X server connection is established.
618 */ 630 */
619 631
620#ifdef META8_OPTION 632#ifdef META8_OPTION
621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 633 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622#endif 634#endif
623 635
624 get_ourmods (); 636 get_ourmods ();
625 637
626 if (!OPTION (Opt_scrollTtyOutput)) 638 if (!option (Opt_scrollTtyOutput))
627 priv_modes |= PrivMode_TtyOutputInh; 639 priv_modes |= PrivMode_TtyOutputInh;
628 if (OPTION (Opt_scrollTtyKeypress)) 640 if (option (Opt_scrollTtyKeypress))
629 priv_modes |= PrivMode_Keypress; 641 priv_modes |= PrivMode_Keypress;
630 if (!OPTION (Opt_jumpScroll)) 642 if (!option (Opt_jumpScroll))
631 priv_modes |= PrivMode_smoothScroll; 643 priv_modes |= PrivMode_smoothScroll;
632 644
633#ifndef NO_BACKSPACE_KEY 645#ifndef NO_BACKSPACE_KEY
634 if (strcmp (key_backspace, "DEC") == 0) 646 if (strcmp (key_backspace, "DEC") == 0)
635 priv_modes |= PrivMode_HaveBackSpace; 647 priv_modes |= PrivMode_HaveBackSpace;
… …
653 665
654#ifdef OFF_FOCUS_FADING 666#ifdef OFF_FOCUS_FADING
655 pix_colors = pix_colors_focused; 667 pix_colors = pix_colors_focused;
656#endif 668#endif
657 669
658 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 670 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 671 {
672 const char *name = rs[Rs_color + i];
673
674 if (!name)
675 continue;
676
660 rxvt_color xcol; 677 rxvt_color xcol;
661 678
662 if (!rs[Rs_color + i]) 679 if (!set_color (xcol, name))
663 continue;
664
665 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
666 { 680 {
667#ifndef XTERM_REVERSE_VIDEO 681#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 682 if (i < 2 && option (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 683 name = def_colorName [1 - i];
670 else 684 else
671#endif 685#endif
672 rs[Rs_color + i] = def_colorName[i]; 686 name = def_colorName [i];
673 687
674 if (!rs[Rs_color + i]) 688 if (!name)
675 continue; 689 continue;
676 690
677 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 691 if (!set_color (xcol, name))
678 { 692 {
679 switch (i) 693 switch (i)
680 { 694 {
681 case Color_fg: 695 case Color_fg:
682 case Color_bg: 696 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 697 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
685 /* NOTREACHED */ 698 name = "";
686 break; 699 break;
687#ifndef NO_CURSORCOLOR 700#ifndef NO_CURSORCOLOR
688 case Color_cursor2: 701 case Color_cursor2:
689 xcol = pix_colors[Color_fg]; 702#endif
690 break;
691#endif /* ! NO_CURSORCOLOR */
692 case Color_pointer_fg: 703 case Color_pointer_fg:
693 xcol = pix_colors[Color_fg]; 704 name = rs[Rs_color + Color_fg];
705 xcol.set (this, name);
694 break; 706 break;
695 default: 707 default:
696 xcol = pix_colors[Color_bg]; /* None */ 708 name = rs[Rs_color + Color_bg];
709 xcol.set (this, name);
697 break; 710 break;
698 } 711 }
699 } 712 }
700 } 713 }
701 714
702 pix_colors[i] = xcol; 715 pix_colors[i] = xcol;
703 SET_PIXCOLOR (i); 716 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 { 717 }
718
719 if (depth <= 2)
720 {
714 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 721 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]; 722 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]; 723 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
717 } 724 }
718 725
719 /* 726 /*
720 * get scrollBar shadow colors 727 * get scrollBar shadow colors
721 * 728 *
722 * The calculations of topShadow/bottomShadow values are adapted 729 * The calculations of topShadow/bottomShadow values are adapted
723 * from the fvwm window manager. 730 * from the fvwm window manager.
724 */ 731 */
725#ifdef KEEP_SCROLLCOLOR 732#ifdef KEEP_SCROLLCOLOR
726
727 if (display->depth <= 2) 733 if (depth <= 2)
728 { 734 {
729 /* Monochrome */ 735 /* Monochrome */
730 pix_colors[Color_scroll] = pix_colors[Color_fg]; 736 alias_color (Color_scroll, Color_fg);
731 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 737 alias_color (Color_topShadow, Color_bg);
732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 738 alias_color (Color_bottomShadow, Color_bg);
733 } 739 }
734 else 740 else
735 { 741 {
736 rxvt_color xcol[2]; 742 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 743
741 xcol[1] = pix_colors[Color_scroll]; 744 rgba cscroll;
742 xcol[0].set (display, 65535, 65535, 65535); 745 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 746
751 /* topShadowColor */ 747 /* topShadowColor */
752 if (!xcol[1].set (display, 748 if (!pix_colors[Color_topShadow].set (this,
753 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 749 rgba (
754 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 750 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
755 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 751 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
756 xcol[1] = pix_colors[Color_White]; 752 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
757 753 cscroll.a)
758 pix_colors[Color_topShadow] = xcol[1]; 754 ))
755 alias_color (Color_topShadow, Color_White);
759 } 756 }
760#endif /* KEEP_SCROLLCOLOR */ 757#endif /* KEEP_SCROLLCOLOR */
758
759#ifdef OFF_FOCUS_FADING
760 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
761 update_fade_color (i);
762#endif
761} 763}
762 764
763/*----------------------------------------------------------------------*/ 765/*----------------------------------------------------------------------*/
764/* color aliases, fg/bg bright-bold */ 766/* color aliases, fg/bg bright-bold */
765void 767void
… …
804 806
805 if (rsmod 807 if (rsmod
806 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 808 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
807 requestedmeta = rsmod[3] - '0'; 809 requestedmeta = rsmod[3] - '0';
808 810
809 map = XGetModifierMapping (display->display); 811 map = XGetModifierMapping (dpy);
810 kc = map->modifiermap; 812 kc = map->modifiermap;
811 813
812 for (i = 1; i < 6; i++) 814 for (i = 1; i < 6; i++)
813 { 815 {
814 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 816 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
816 for (j = map->max_keypermod; j--; k++) 818 for (j = map->max_keypermod; j--; k++)
817 { 819 {
818 if (kc[k] == 0) 820 if (kc[k] == 0)
819 break; 821 break;
820 822
821 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 823 switch (XKeycodeToKeysym (dpy, kc[k], 0))
822 { 824 {
823 case XK_Num_Lock: 825 case XK_Num_Lock:
824 ModNumLockMask = modmasks[i - 1]; 826 ModNumLockMask = modmasks[i - 1];
825 continue; 827 continue;
826 828
… …
881 MWMHints mwmhints; 883 MWMHints mwmhints;
882#endif 884#endif
883 XGCValues gcvalue; 885 XGCValues gcvalue;
884 XSetWindowAttributes attributes; 886 XSetWindowAttributes attributes;
885 Window top, parent; 887 Window top, parent;
886 dDisp;
887 888
888 xa = display->xa; 889 dLocal (Display *, dpy);
889 890
890 /* grab colors before netscape does */ 891 /* grab colors before netscape does */
891 Get_Colours (); 892 Get_Colours ();
892 893
893 if (!set_fonts ()) 894 if (!set_fonts ())
894 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 895 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
895 896
896 parent = display->root; 897 parent = display->root;
897 898
898 attributes.override_redirect = !!OPTION (Opt_override_redirect); 899 attributes.override_redirect = !!option (Opt_override_redirect);
899 900
900#if ENABLE_FRILLS 901#if ENABLE_FRILLS
901 if (OPTION (Opt_borderLess)) 902 if (option (Opt_borderLess))
902 { 903 {
903 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
904 { 905 {
905 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
906 attributes.override_redirect = TRUE; 907 attributes.override_redirect = true;
907 mwmhints.flags = 0; 908 mwmhints.flags = 0;
908 } 909 }
909 else 910 else
910 { 911 {
911 mwmhints.flags = MWM_HINTS_DECORATIONS; 912 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
921 { 922 {
922 XWindowAttributes wattr; 923 XWindowAttributes wattr;
923 924
924 parent = strtol (rs[Rs_embed], 0, 0); 925 parent = strtol (rs[Rs_embed], 0, 0);
925 926
926 if (!XGetWindowAttributes (disp, parent, &wattr)) 927 if (!XGetWindowAttributes (dpy, parent, &wattr))
927 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 928 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
928 929
929 window_calc (wattr.width, wattr.height); 930 window_calc (wattr.width, wattr.height);
930 } 931 }
931#endif 932#endif
932 933
933 window_calc (0, 0); 934 window_calc (0, 0);
934 935
935 /* sub-window placement & size in rxvt_resize_subwindows () */ 936 /* sub-window placement & size in rxvt_resize_subwindows () */
936 attributes.background_pixel = pix_colors_focused[Color_border]; 937 attributes.background_pixel = pix_colors_focused [Color_border];
937 attributes.border_pixel = pix_colors_focused[Color_border]; 938 attributes.border_pixel = pix_colors_focused [Color_border];
938 attributes.colormap = display->cmap; 939 attributes.colormap = cmap;
939 940
940 top = XCreateWindow (disp, parent, 941 top = XCreateWindow (dpy, parent,
941 szHint.x, szHint.y, 942 szHint.x, szHint.y,
942 szHint.width, szHint.height, 943 szHint.width, szHint.height,
943 ext_bwidth, 944 ext_bwidth,
944 display->depth, InputOutput, 945 depth, InputOutput, visual,
945 display->visual,
946 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 946 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
947 &attributes); 947 &attributes);
948 948
949 this->parent[0] = top; 949 this->parent[0] = top;
950 950
… …
957 classHint.res_name = (char *)rs[Rs_name]; 957 classHint.res_name = (char *)rs[Rs_name];
958 classHint.res_class = (char *)RESCLASS; 958 classHint.res_class = (char *)RESCLASS;
959 959
960 wmHint.flags = InputHint | StateHint | WindowGroupHint; 960 wmHint.flags = InputHint | StateHint | WindowGroupHint;
961 wmHint.input = True; 961 wmHint.input = True;
962 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 962 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
963 wmHint.window_group = top; 963 wmHint.window_group = top;
964 964
965 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 965 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
966 &szHint, &wmHint, &classHint); 966 &szHint, &wmHint, &classHint);
967 967
968#if ENABLE_FRILLS 968#if ENABLE_FRILLS
969 if (mwmhints.flags) 969 if (mwmhints.flags)
970 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 970 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
971 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 971 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
972#endif 972#endif
973 973
974 Atom protocols[] = { 974 Atom protocols[] = {
975 xa[XA_WM_DELETE_WINDOW], 975 xa[XA_WM_DELETE_WINDOW],
976#if ENABLE_EWMH 976#if ENABLE_EWMH
977 xa[XA_NET_WM_PING], 977 xa[XA_NET_WM_PING],
978#endif 978#endif
979 }; 979 };
980 980
981 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 981 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
982 982
983#if ENABLE_FRILLS 983#if ENABLE_FRILLS
984 if (rs[Rs_transient_for]) 984 if (rs[Rs_transient_for])
985 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 985 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
986#endif 986#endif
987 987
988#if ENABLE_EWMH 988#if ENABLE_EWMH
989 long pid = getpid (); 989 long pid = getpid ();
990 990
991 XChangeProperty (disp, top, 991 XChangeProperty (dpy, top,
992 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 992 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
993 PropModeReplace, (unsigned char *)&pid, 1); 993 PropModeReplace, (unsigned char *)&pid, 1);
994 994
995 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 995 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
996#endif 996#endif
997 997
998 XSelectInput (disp, top, 998 XSelectInput (dpy, top,
999 KeyPressMask 999 KeyPressMask
1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1001 | KeyReleaseMask 1001 | KeyReleaseMask
1002#endif 1002#endif
1003 | FocusChangeMask | VisibilityChangeMask 1003 | FocusChangeMask | VisibilityChangeMask
1004 | ExposureMask | StructureNotifyMask); 1004 | ExposureMask | StructureNotifyMask);
1005 1005
1006 termwin_ev.start (display, top); 1006 termwin_ev.start (display, top);
1007 1007
1008 /* vt cursor: Black-on-White is standard, but this is more popular */ 1008 /* vt cursor: Black-on-White is standard, but this is more popular */
1009 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1009 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1010 1010
1011#ifdef HAVE_SCROLLBARS 1011#ifdef HAVE_SCROLLBARS
1012 /* cursor scrollBar: Black-on-White */ 1012 /* cursor scrollBar: Black-on-White */
1013 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1013 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1014#endif 1014#endif
1015 1015
1016 /* the vt window */ 1016 /* the vt window */
1017 vt = XCreateSimpleWindow (disp, top, 1017 vt = XCreateSimpleWindow (dpy, top,
1018 window_vt_x, window_vt_y, 1018 window_vt_x, window_vt_y,
1019 width, height, 1019 width, height,
1020 0, 1020 0,
1021 pix_colors_focused[Color_fg], 1021 pix_colors_focused[Color_fg],
1022 pix_colors_focused[Color_bg]); 1022 pix_colors_focused[Color_bg]);
1023 1023
1024 attributes.bit_gravity = NorthWestGravity; 1024 attributes.bit_gravity = NorthWestGravity;
1025 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1025 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1026 1026
1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1028 1028
1029 if (OPTION (Opt_pointerBlank)) 1029 if (option (Opt_pointerBlank))
1030 vt_emask |= PointerMotionMask; 1030 vt_emask |= PointerMotionMask;
1031 else 1031 else
1032 vt_emask |= Button1MotionMask | Button3MotionMask; 1032 vt_emask |= Button1MotionMask | Button3MotionMask;
1033 1033
1034 vt_select_input (); 1034 vt_select_input ();
1035 1035
1036 vt_ev.start (display, vt); 1036 vt_ev.start (display, vt);
1037 1037
1038#ifdef XPM_BACKGROUND 1038#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL 1039 if (rs[Rs_backgroundPixmap] != NULL
1040#ifndef HAVE_AFTERIMAGE
1040 && !OPTION (Opt_transparent)) 1041 && !option (Opt_transparent)
1042#endif
1043 )
1041 { 1044 {
1042 const char *p = rs[Rs_backgroundPixmap]; 1045 const char *p = rs[Rs_backgroundPixmap];
1043 1046
1044 if ((p = strchr (p, ';')) != NULL) 1047 if ((p = strchr (p, ';')) != NULL)
1045 { 1048 {
… …
1053#endif 1056#endif
1054 1057
1055 /* graphics context for the vt window */ 1058 /* graphics context for the vt window */
1056 gcvalue.foreground = pix_colors[Color_fg]; 1059 gcvalue.foreground = pix_colors[Color_fg];
1057 gcvalue.background = pix_colors[Color_bg]; 1060 gcvalue.background = pix_colors[Color_bg];
1058 gcvalue.graphics_exposures = 1; 1061 gcvalue.graphics_exposures = 0;
1059 1062
1060 gc = XCreateGC (disp, vt, 1063 gc = XCreateGC (dpy, vt,
1061 GCForeground | GCBackground | GCGraphicsExposures, 1064 GCForeground | GCBackground | GCGraphicsExposures,
1062 &gcvalue); 1065 &gcvalue);
1063 1066
1064 drawable = new rxvt_drawable (display, vt); 1067 drawable = new rxvt_drawable (this, vt);
1065 1068
1066#ifdef RXVT_SCROLLBAR 1069#ifdef RXVT_SCROLLBAR
1067 gcvalue.foreground = pix_colors[Color_topShadow]; 1070 gcvalue.foreground = pix_colors[Color_topShadow];
1068 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1071 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1069 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1072 gcvalue.foreground = pix_colors[Color_bottomShadow];
1070 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1073 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1071 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1074 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1072 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1075 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1073#endif 1076#endif
1074 1077
1075#ifdef OFF_FOCUS_FADING 1078#ifdef OFF_FOCUS_FADING
1076 // initially we are in unfocused state 1079 // initially we are in unfocused state
1077 if (rs[Rs_fade]) 1080 if (rs[Rs_fade])
… …
1086 * GET TTY CURRENT STATE * 1089 * GET TTY CURRENT STATE *
1087 * ------------------------------------------------------------------------- */ 1090 * ------------------------------------------------------------------------- */
1088void 1091void
1089rxvt_get_ttymode (ttymode_t *tio, int erase) 1092rxvt_get_ttymode (ttymode_t *tio, int erase)
1090{ 1093{
1091#ifdef HAVE_TERMIOS_H
1092 /* 1094 /*
1093 * standard System V termios interface 1095 * standard System V termios interface
1094 */ 1096 */
1095 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1097 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1096 { 1098 {
… …
1163 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1165 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1164# if defined (ECHOCTL) && defined (ECHOKE) 1166# if defined (ECHOCTL) && defined (ECHOKE)
1165 | ECHOCTL | ECHOKE 1167 | ECHOCTL | ECHOKE
1166# endif 1168# endif
1167 | ECHOE | ECHOK); 1169 | 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 1170
1216 /* 1171 /*
1217 * Debugging 1172 * Debugging
1218 */ 1173 */
1219#ifdef DEBUG_TTYMODE 1174#ifdef DEBUG_TTYMODE
… …
1320 else 1275 else
1321#endif 1276#endif
1322 if (!pty->get ()) 1277 if (!pty->get ())
1323 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1278 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1324 1279
1325 pty->set_utf8_mode (enc_utf8);
1326
1327 /* set initial window size */
1328 tt_winch ();
1329
1330 int er; 1280 int er;
1331 1281
1332#ifndef NO_BACKSPACE_KEY 1282#ifndef NO_BACKSPACE_KEY
1333 if (key_backspace[0] && !key_backspace[1]) 1283 if (key_backspace[0] && !key_backspace[1])
1334 er = key_backspace[0]; 1284 er = key_backspace[0];
… …
1337 else 1287 else
1338#endif 1288#endif
1339 er = -1; 1289 er = -1;
1340 1290
1341 rxvt_get_ttymode (&tio, er); 1291 rxvt_get_ttymode (&tio, er);
1292 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1293 pty->set_utf8_mode (enc_utf8);
1294
1295 /* set initial window size */
1296 tt_winch ();
1342 1297
1343#if ENABLE_FRILLS 1298#if ENABLE_FRILLS
1344 if (rs[Rs_pty_fd]) 1299 if (rs[Rs_pty_fd])
1345 return; 1300 return;
1346#endif 1301#endif
… …
1377 } 1332 }
1378 1333
1379 _exit (EXIT_FAILURE); 1334 _exit (EXIT_FAILURE);
1380 1335
1381 default: 1336 default:
1382 if (!OPTION (Opt_utmpInhibit)) 1337 if (!option (Opt_utmpInhibit))
1383 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1338 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1384 1339
1385 pty->close_tty (); 1340 pty->close_tty ();
1386 1341
1387 child_ev.start (cmd_pid); 1342 child_ev.start (cmd_pid);
1388 1343
… …
1401int 1356int
1402rxvt_term::run_child (const char *const *argv) 1357rxvt_term::run_child (const char *const *argv)
1403{ 1358{
1404 char *login; 1359 char *login;
1405 1360
1406 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1407
1408 if (OPTION (Opt_console)) 1361 if (option (Opt_console))
1409 { /* be virtual console, fail silently */ 1362 { /* be virtual console, fail silently */
1410#ifdef TIOCCONS 1363#ifdef TIOCCONS
1411 unsigned int on = 1; 1364 unsigned int on = 1;
1412 1365
1413 ioctl (STDIN_FILENO, TIOCCONS, &on); 1366 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1462 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1415 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1463 shell = "/bin/sh"; 1416 shell = "/bin/sh";
1464 1417
1465 argv0 = (const char *)rxvt_r_basename (shell); 1418 argv0 = (const char *)rxvt_r_basename (shell);
1466 1419
1467 if (OPTION (Opt_loginShell)) 1420 if (option (Opt_loginShell))
1468 { 1421 {
1469 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1422 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1470 1423
1471 login[0] = '-'; 1424 login[0] = '-';
1472 strcpy (&login[1], argv0); 1425 strcpy (&login[1], argv0);

Diff Legend

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