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.157 by root, Wed Jan 25 21:09:21 2006 UTC vs.
Revision 1.176 by root, Sat Jan 20 00:40:23 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: ywlloe (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 ()
258 int i, r_argc; 258 int i, r_argc;
259 char *val; 259 char *val;
260 const char **cmd_argv, **r_argv; 260 const char **cmd_argv, **r_argv;
261 261
262 /* 262 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 263 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 264 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 265 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 266 if (!strcmp (argv[r_argc], "-e"))
267 break; 267 break;
268 268
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 270
271 for (i = 0; i < r_argc; i++) 271 for (i = 0; i < r_argc; i++)
297 get_options (r_argc, r_argv); 297 get_options (r_argc, r_argv);
298 298
299 if (!(display = displays.get (rs[Rs_display_name]))) 299 if (!(display = displays.get (rs[Rs_display_name])))
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 301
302 // using a local pointer decreases code size a lot
302 xa = display->xa; 303 xa = display->xa;
303 304
304#if ENABLE_FRILLS 305 set (display);
306 extract_resources ();
307
308#if XFT
305 if (rs[Rs_depth]) 309 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0)); 310 select_visual (strtol (rs[Rs_depth], 0, 0));
307 else
308#endif 311#endif
309 set (display);
310
311 extract_resources ();
312 312
313 free (r_argv); 313 free (r_argv);
314
315 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef)
317 rs [i] = 0;
314 318
315#if ENABLE_PERL 319#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1]) 320 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default"; 321 rs[Rs_perl_ext_1] = "default";
318 322
421 /* this is how xterm implements reverseVideo */ 425 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 426 if (OPTION (Opt_reverseVideo))
423 { 427 {
424 if (!rs[Rs_color + Color_fg]) 428 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 429 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430
426 if (!rs[Rs_color + Color_bg]) 431 if (!rs[Rs_color + Color_bg])
427 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 432 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428 } 433 }
429#endif 434#endif
430 435
482 val = rxvt_network_display (rs[Rs_display_name]); 487 val = rxvt_network_display (rs[Rs_display_name]);
483 rs[Rs_display_name] = (const char *)val; 488 rs[Rs_display_name] = (const char *)val;
484 489
485 if (val == NULL) 490 if (val == NULL)
486#endif /* DISPLAY_IS_IP */ 491#endif /* DISPLAY_IS_IP */
487 val = XDisplayString (xdisp); 492 val = XDisplayString (dpy);
488 493
489 if (rs[Rs_display_name] == NULL) 494 if (rs[Rs_display_name] == NULL)
490 rs[Rs_display_name] = val; /* use broken `:0' value */ 495 rs[Rs_display_name] = val; /* use broken `:0' value */
491 496
492 i = strlen (val); 497 i = strlen (val);
655 pix_colors = pix_colors_focused; 660 pix_colors = pix_colors_focused;
656#endif 661#endif
657 662
658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 663 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 664 {
665 const char *name = rs[Rs_color + i];
666
667 if (!name)
668 continue;
669
660 rxvt_color xcol; 670 rxvt_color xcol;
661 671
662 if (!rs[Rs_color + i]) 672 if (!set_color (xcol, name))
663 continue;
664
665 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
666 { 673 {
667#ifndef XTERM_REVERSE_VIDEO 674#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 675 if (i < 2 && OPTION (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 676 name = def_colorName [1 - i];
670 else 677 else
671#endif 678#endif
672 rs[Rs_color + i] = def_colorName[i]; 679 name = def_colorName [i];
673 680
674 if (!rs[Rs_color + i]) 681 if (!name)
675 continue; 682 continue;
676 683
677 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 684 if (!set_color (xcol, name))
678 { 685 {
679 switch (i) 686 switch (i)
680 { 687 {
681 case Color_fg: 688 case Color_fg:
682 case Color_bg: 689 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 690 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
685 /* NOTREACHED */ 691 name = "";
686 break; 692 break;
687#ifndef NO_CURSORCOLOR 693#ifndef NO_CURSORCOLOR
688 case Color_cursor2: 694 case Color_cursor2:
689 xcol = pix_colors[Color_fg]; 695#endif
690 break;
691#endif /* ! NO_CURSORCOLOR */
692 case Color_pointer_fg: 696 case Color_pointer_fg:
693 xcol = pix_colors[Color_fg]; 697 name = rs[Rs_color + Color_fg];
698 xcol.set (this, name);
694 break; 699 break;
695 default: 700 default:
696 xcol = pix_colors[Color_bg]; /* None */ 701 name = rs[Rs_color + Color_bg];
702 xcol.set (this, name);
697 break; 703 break;
698 } 704 }
699 } 705 }
700 } 706 }
701 707
702 pix_colors[i] = xcol; 708 pix_colors[i] = xcol;
703 SET_PIXCOLOR (i); 709 rs[Rs_color + i] = name;
704 } 710 }
705
706#ifdef OFF_FOCUS_FADING
707 if (rs[Rs_fade])
708 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
709 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
710#endif
711 711
712 if (depth <= 2) 712 if (depth <= 2)
713 { 713 {
714 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 714 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]; 715 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]; 716 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
717 } 717 }
718 718
719 /* 719 /*
720 * get scrollBar shadow colors 720 * get scrollBar shadow colors
721 * 721 *
722 * The calculations of topShadow/bottomShadow values are adapted 722 * The calculations of topShadow/bottomShadow values are adapted
723 * from the fvwm window manager. 723 * from the fvwm window manager.
724 */ 724 */
725#ifdef KEEP_SCROLLCOLOR 725#ifdef KEEP_SCROLLCOLOR
726
727 if (depth <= 2) 726 if (depth <= 2)
728 { 727 {
729 /* Monochrome */ 728 /* Monochrome */
730 pix_colors[Color_scroll] = pix_colors[Color_fg]; 729 alias_color (Color_scroll, Color_fg);
731 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 730 alias_color (Color_topShadow, Color_bg);
732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 731 alias_color (Color_bottomShadow, Color_bg);
733 } 732 }
734 else 733 else
735 { 734 {
736 rxvt_color xcol[2]; 735 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 736
741 xcol[1] = pix_colors[Color_scroll]; 737 rgba cscroll;
742 xcol[0].set (this, 65535, 65535, 65535); 738 pix_colors [Color_scroll].get (cscroll);
743
744 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
745
746 xcol[0].get (this, pr0, pg0, pb0);
747 xcol[1].get (this, pr1, pg1, pb1);
748
749 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
750 739
751 /* topShadowColor */ 740 /* topShadowColor */
752 if (!xcol[1].set (this, 741 if (!pix_colors[Color_topShadow].set (this,
753 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 742 rgba (
754 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 743 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
755 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 744 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
756 xcol[1] = pix_colors[Color_White]; 745 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
757 746 cscroll.a)
758 pix_colors[Color_topShadow] = xcol[1]; 747 ))
748 alias_color (Color_topShadow, Color_White);
759 } 749 }
760#endif /* KEEP_SCROLLCOLOR */ 750#endif /* KEEP_SCROLLCOLOR */
751
752#ifdef OFF_FOCUS_FADING
753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
754 update_fade_color (i);
755#endif
761} 756}
762 757
763/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
764/* color aliases, fg/bg bright-bold */ 759/* color aliases, fg/bg bright-bold */
765void 760void
804 799
805 if (rsmod 800 if (rsmod
806 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 801 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
807 requestedmeta = rsmod[3] - '0'; 802 requestedmeta = rsmod[3] - '0';
808 803
809 map = XGetModifierMapping (xdisp); 804 map = XGetModifierMapping (dpy);
810 kc = map->modifiermap; 805 kc = map->modifiermap;
811 806
812 for (i = 1; i < 6; i++) 807 for (i = 1; i < 6; i++)
813 { 808 {
814 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 809 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
816 for (j = map->max_keypermod; j--; k++) 811 for (j = map->max_keypermod; j--; k++)
817 { 812 {
818 if (kc[k] == 0) 813 if (kc[k] == 0)
819 break; 814 break;
820 815
821 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 816 switch (XKeycodeToKeysym (dpy, kc[k], 0))
822 { 817 {
823 case XK_Num_Lock: 818 case XK_Num_Lock:
824 ModNumLockMask = modmasks[i - 1]; 819 ModNumLockMask = modmasks[i - 1];
825 continue; 820 continue;
826 821
882#endif 877#endif
883 XGCValues gcvalue; 878 XGCValues gcvalue;
884 XSetWindowAttributes attributes; 879 XSetWindowAttributes attributes;
885 Window top, parent; 880 Window top, parent;
886 881
887 dLocal (Display *, xdisp); 882 dLocal (Display *, dpy);
888 883
889 /* grab colors before netscape does */ 884 /* grab colors before netscape does */
890 Get_Colours (); 885 Get_Colours ();
891 886
892 if (!set_fonts ()) 887 if (!set_fonts ())
897 attributes.override_redirect = !!OPTION (Opt_override_redirect); 892 attributes.override_redirect = !!OPTION (Opt_override_redirect);
898 893
899#if ENABLE_FRILLS 894#if ENABLE_FRILLS
900 if (OPTION (Opt_borderLess)) 895 if (OPTION (Opt_borderLess))
901 { 896 {
902 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
903 { 898 {
904 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 899 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
905 attributes.override_redirect = TRUE; 900 attributes.override_redirect = true;
906 mwmhints.flags = 0; 901 mwmhints.flags = 0;
907 } 902 }
908 else 903 else
909 { 904 {
910 mwmhints.flags = MWM_HINTS_DECORATIONS; 905 mwmhints.flags = MWM_HINTS_DECORATIONS;
920 { 915 {
921 XWindowAttributes wattr; 916 XWindowAttributes wattr;
922 917
923 parent = strtol (rs[Rs_embed], 0, 0); 918 parent = strtol (rs[Rs_embed], 0, 0);
924 919
925 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 920 if (!XGetWindowAttributes (dpy, parent, &wattr))
926 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 921 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
927 922
928 window_calc (wattr.width, wattr.height); 923 window_calc (wattr.width, wattr.height);
929 } 924 }
930#endif 925#endif
934 /* sub-window placement & size in rxvt_resize_subwindows () */ 929 /* sub-window placement & size in rxvt_resize_subwindows () */
935 attributes.background_pixel = pix_colors_focused [Color_border]; 930 attributes.background_pixel = pix_colors_focused [Color_border];
936 attributes.border_pixel = pix_colors_focused [Color_border]; 931 attributes.border_pixel = pix_colors_focused [Color_border];
937 attributes.colormap = cmap; 932 attributes.colormap = cmap;
938 933
939 top = XCreateWindow (xdisp, parent, 934 top = XCreateWindow (dpy, parent,
940 szHint.x, szHint.y, 935 szHint.x, szHint.y,
941 szHint.width, szHint.height, 936 szHint.width, szHint.height,
942 ext_bwidth, 937 ext_bwidth,
943 depth, InputOutput, visual, 938 depth, InputOutput, visual,
944 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 939 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
958 wmHint.flags = InputHint | StateHint | WindowGroupHint; 953 wmHint.flags = InputHint | StateHint | WindowGroupHint;
959 wmHint.input = True; 954 wmHint.input = True;
960 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
961 wmHint.window_group = top; 956 wmHint.window_group = top;
962 957
963 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
964 &szHint, &wmHint, &classHint); 959 &szHint, &wmHint, &classHint);
965 960
966#if ENABLE_FRILLS 961#if ENABLE_FRILLS
967 if (mwmhints.flags) 962 if (mwmhints.flags)
968 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 963 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
969 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 964 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
970#endif 965#endif
971 966
972 Atom protocols[] = { 967 Atom protocols[] = {
973 xa[XA_WM_DELETE_WINDOW], 968 xa[XA_WM_DELETE_WINDOW],
974#if ENABLE_EWMH 969#if ENABLE_EWMH
975 xa[XA_NET_WM_PING], 970 xa[XA_NET_WM_PING],
976#endif 971#endif
977 }; 972 };
978 973
979 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 974 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
980 975
981#if ENABLE_FRILLS 976#if ENABLE_FRILLS
982 if (rs[Rs_transient_for]) 977 if (rs[Rs_transient_for])
983 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 978 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
984#endif 979#endif
985 980
986#if ENABLE_EWMH 981#if ENABLE_EWMH
987 long pid = getpid (); 982 long pid = getpid ();
988 983
989 XChangeProperty (xdisp, top, 984 XChangeProperty (dpy, top,
990 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 985 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
991 PropModeReplace, (unsigned char *)&pid, 1); 986 PropModeReplace, (unsigned char *)&pid, 1);
992 987
993 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 988 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
994#endif 989#endif
995 990
996 XSelectInput (xdisp, top, 991 XSelectInput (dpy, top,
997 KeyPressMask 992 KeyPressMask
998#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 993#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
999 | KeyReleaseMask 994 | KeyReleaseMask
1000#endif 995#endif
1001 | FocusChangeMask | VisibilityChangeMask 996 | FocusChangeMask | VisibilityChangeMask
1002 | ExposureMask | StructureNotifyMask); 997 | ExposureMask | StructureNotifyMask);
1003 998
1004 termwin_ev.start (display, top); 999 termwin_ev.start (display, top);
1005 1000
1006 /* vt cursor: Black-on-White is standard, but this is more popular */ 1001 /* vt cursor: Black-on-White is standard, but this is more popular */
1007 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1002 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1008 1003
1009#ifdef HAVE_SCROLLBARS 1004#ifdef HAVE_SCROLLBARS
1010 /* cursor scrollBar: Black-on-White */ 1005 /* cursor scrollBar: Black-on-White */
1011 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1006 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1012#endif 1007#endif
1013 1008
1014 /* the vt window */ 1009 /* the vt window */
1015 vt = XCreateSimpleWindow (xdisp, top, 1010 vt = XCreateSimpleWindow (dpy, top,
1016 window_vt_x, window_vt_y, 1011 window_vt_x, window_vt_y,
1017 width, height, 1012 width, height,
1018 0, 1013 0,
1019 pix_colors_focused[Color_fg], 1014 pix_colors_focused[Color_fg],
1020 pix_colors_focused[Color_bg]); 1015 pix_colors_focused[Color_bg]);
1021 1016
1022 attributes.bit_gravity = NorthWestGravity; 1017 attributes.bit_gravity = NorthWestGravity;
1023 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1024 1019
1025 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1026 1021
1027 if (OPTION (Opt_pointerBlank)) 1022 if (OPTION (Opt_pointerBlank))
1028 vt_emask |= PointerMotionMask; 1023 vt_emask |= PointerMotionMask;
1051#endif 1046#endif
1052 1047
1053 /* graphics context for the vt window */ 1048 /* graphics context for the vt window */
1054 gcvalue.foreground = pix_colors[Color_fg]; 1049 gcvalue.foreground = pix_colors[Color_fg];
1055 gcvalue.background = pix_colors[Color_bg]; 1050 gcvalue.background = pix_colors[Color_bg];
1056 gcvalue.graphics_exposures = 1; 1051 gcvalue.graphics_exposures = 0;
1057 1052
1058 gc = XCreateGC (xdisp, vt, 1053 gc = XCreateGC (dpy, vt,
1059 GCForeground | GCBackground | GCGraphicsExposures, 1054 GCForeground | GCBackground | GCGraphicsExposures,
1060 &gcvalue); 1055 &gcvalue);
1061 1056
1062 drawable = new rxvt_drawable (this, vt); 1057 drawable = new rxvt_drawable (this, vt);
1063 1058
1064#ifdef RXVT_SCROLLBAR 1059#ifdef RXVT_SCROLLBAR
1065 gcvalue.foreground = pix_colors[Color_topShadow]; 1060 gcvalue.foreground = pix_colors[Color_topShadow];
1066 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1061 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1067 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1062 gcvalue.foreground = pix_colors[Color_bottomShadow];
1068 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1063 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1069 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1064 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1070 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1065 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1071#endif 1066#endif
1072 1067
1073#ifdef OFF_FOCUS_FADING 1068#ifdef OFF_FOCUS_FADING
1074 // initially we are in unfocused state 1069 // initially we are in unfocused state
1075 if (rs[Rs_fade]) 1070 if (rs[Rs_fade])
1318 else 1313 else
1319#endif 1314#endif
1320 if (!pty->get ()) 1315 if (!pty->get ())
1321 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1316 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1322 1317
1323 pty->set_utf8_mode (enc_utf8);
1324
1325 /* set initial window size */
1326 tt_winch ();
1327
1328 int er; 1318 int er;
1329 1319
1330#ifndef NO_BACKSPACE_KEY 1320#ifndef NO_BACKSPACE_KEY
1331 if (key_backspace[0] && !key_backspace[1]) 1321 if (key_backspace[0] && !key_backspace[1])
1332 er = key_backspace[0]; 1322 er = key_backspace[0];
1335 else 1325 else
1336#endif 1326#endif
1337 er = -1; 1327 er = -1;
1338 1328
1339 rxvt_get_ttymode (&tio, er); 1329 rxvt_get_ttymode (&tio, er);
1330 pty->set_utf8_mode (enc_utf8);
1331 SET_TTYMODE (pty->tty, &tio); /* init terminal attributes */
1332
1333 /* set initial window size */
1334 tt_winch ();
1340 1335
1341#if ENABLE_FRILLS 1336#if ENABLE_FRILLS
1342 if (rs[Rs_pty_fd]) 1337 if (rs[Rs_pty_fd])
1343 return; 1338 return;
1344#endif 1339#endif
1398 */ 1393 */
1399int 1394int
1400rxvt_term::run_child (const char *const *argv) 1395rxvt_term::run_child (const char *const *argv)
1401{ 1396{
1402 char *login; 1397 char *login;
1403
1404 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1405 1398
1406 if (OPTION (Opt_console)) 1399 if (OPTION (Opt_console))
1407 { /* be virtual console, fail silently */ 1400 { /* be virtual console, fail silently */
1408#ifdef TIOCCONS 1401#ifdef TIOCCONS
1409 unsigned int on = 1; 1402 unsigned int on = 1;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines