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.163 by root, Tue Jan 31 16:57:35 2006 UTC vs.
Revision 1.178 by root, Sat Jan 20 00:51:31 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>
… …
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;
304
305 set (display);
306 extract_resources ();
303 307
304#if XFT 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])
663 continue;
664
665 if (!set_color (xcol, rs[Rs_color + i])) 672 if (!set_color (xcol, name))
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 (!set_color (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_warn ("unable to get foreground/background colour, continuing.\n"); 690 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
691 name = "";
685 break; 692 break;
686#ifndef NO_CURSORCOLOR 693#ifndef NO_CURSORCOLOR
687 case Color_cursor2: 694 case Color_cursor2:
688 xcol = pix_colors[Color_fg]; 695#endif
689 break;
690#endif /* ! NO_CURSORCOLOR */
691 case Color_pointer_fg: 696 case Color_pointer_fg:
692 xcol = pix_colors[Color_fg]; 697 name = rs[Rs_color + Color_fg];
698 xcol.set (this, name);
693 break; 699 break;
694 default: 700 default:
695 xcol = pix_colors[Color_bg]; /* None */ 701 name = rs[Rs_color + Color_bg];
702 xcol.set (this, name);
696 break; 703 break;
697 } 704 }
698 } 705 }
699 } 706 }
700 707
701 pix_colors[i] = xcol; 708 pix_colors[i] = xcol;
702 SET_PIXCOLOR (i); 709 rs[Rs_color + i] = name;
703 }
704
705#ifdef OFF_FOCUS_FADING
706 if (rs[Rs_fade])
707 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
708 {
709 rxvt_rgba c;
710 pix_colors[Color_fade].get (this, c);
711 pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
712 } 710 }
713#endif
714 711
715 if (depth <= 2) 712 if (depth <= 2)
716 { 713 {
717 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);
718 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);
719 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);
720 } 717 }
721 718
722 /* 719 /*
723 * get scrollBar shadow colors 720 * get scrollBar shadow colors
724 * 721 *
725 * The calculations of topShadow/bottomShadow values are adapted 722 * The calculations of topShadow/bottomShadow values are adapted
726 * from the fvwm window manager. 723 * from the fvwm window manager.
727 */ 724 */
728#ifdef KEEP_SCROLLCOLOR 725#ifdef KEEP_SCROLLCOLOR
729
730 if (depth <= 2) 726 if (depth <= 2)
731 { 727 {
732 /* Monochrome */ 728 /* Monochrome */
733 pix_colors[Color_scroll] = pix_colors[Color_fg]; 729 alias_color (Color_scroll, Color_fg);
734 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 730 alias_color (Color_topShadow, Color_bg);
735 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 731 alias_color (Color_bottomShadow, Color_bg);
736 } 732 }
737 else 733 else
738 { 734 {
739 rxvt_color xcol[2]; 735 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 736
744 xcol[1] = pix_colors[Color_scroll]; 737 rgba cscroll;
745 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); 738 pix_colors [Color_scroll].get (cscroll);
746
747 rxvt_rgba c0, c1;
748
749 xcol[0].get (this, c0);
750 xcol[1].get (this, c1);
751
752 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
753 739
754 /* topShadowColor */ 740 /* topShadowColor */
755 if (!xcol[1].set (this, 741 if (!pix_colors[Color_topShadow].set (this,
756 rxvt_rgba ( 742 rgba (
757 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 743 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
758 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 744 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
759 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 745 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
760 c1.a) // pa1 vs. pa0: arbitrary 746 cscroll.a)
761 )); 747 ))
762 xcol[1] = pix_colors[Color_White]; 748 alias_color (Color_topShadow, Color_White);
763
764 pix_colors[Color_topShadow] = xcol[1];
765 } 749 }
766#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
767} 756}
768 757
769/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
770/* color aliases, fg/bg bright-bold */ 759/* color aliases, fg/bg bright-bold */
771void 760void
… …
810 799
811 if (rsmod 800 if (rsmod
812 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 801 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
813 requestedmeta = rsmod[3] - '0'; 802 requestedmeta = rsmod[3] - '0';
814 803
815 map = XGetModifierMapping (xdisp); 804 map = XGetModifierMapping (dpy);
816 kc = map->modifiermap; 805 kc = map->modifiermap;
817 806
818 for (i = 1; i < 6; i++) 807 for (i = 1; i < 6; i++)
819 { 808 {
820 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 809 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
822 for (j = map->max_keypermod; j--; k++) 811 for (j = map->max_keypermod; j--; k++)
823 { 812 {
824 if (kc[k] == 0) 813 if (kc[k] == 0)
825 break; 814 break;
826 815
827 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 816 switch (XKeycodeToKeysym (dpy, kc[k], 0))
828 { 817 {
829 case XK_Num_Lock: 818 case XK_Num_Lock:
830 ModNumLockMask = modmasks[i - 1]; 819 ModNumLockMask = modmasks[i - 1];
831 continue; 820 continue;
832 821
… …
888#endif 877#endif
889 XGCValues gcvalue; 878 XGCValues gcvalue;
890 XSetWindowAttributes attributes; 879 XSetWindowAttributes attributes;
891 Window top, parent; 880 Window top, parent;
892 881
893 dLocal (Display *, xdisp); 882 dLocal (Display *, dpy);
894 883
895 /* grab colors before netscape does */ 884 /* grab colors before netscape does */
896 Get_Colours (); 885 Get_Colours ();
897 886
898 if (!set_fonts ()) 887 if (!set_fonts ())
… …
903 attributes.override_redirect = !!OPTION (Opt_override_redirect); 892 attributes.override_redirect = !!OPTION (Opt_override_redirect);
904 893
905#if ENABLE_FRILLS 894#if ENABLE_FRILLS
906 if (OPTION (Opt_borderLess)) 895 if (OPTION (Opt_borderLess))
907 { 896 {
908 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
909 { 898 {
910 /* 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");*/
911 attributes.override_redirect = true; 900 attributes.override_redirect = true;
912 mwmhints.flags = 0; 901 mwmhints.flags = 0;
913 } 902 }
… …
926 { 915 {
927 XWindowAttributes wattr; 916 XWindowAttributes wattr;
928 917
929 parent = strtol (rs[Rs_embed], 0, 0); 918 parent = strtol (rs[Rs_embed], 0, 0);
930 919
931 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 920 if (!XGetWindowAttributes (dpy, parent, &wattr))
932 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 921 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
933 922
934 window_calc (wattr.width, wattr.height); 923 window_calc (wattr.width, wattr.height);
935 } 924 }
936#endif 925#endif
… …
940 /* sub-window placement & size in rxvt_resize_subwindows () */ 929 /* sub-window placement & size in rxvt_resize_subwindows () */
941 attributes.background_pixel = pix_colors_focused [Color_border]; 930 attributes.background_pixel = pix_colors_focused [Color_border];
942 attributes.border_pixel = pix_colors_focused [Color_border]; 931 attributes.border_pixel = pix_colors_focused [Color_border];
943 attributes.colormap = cmap; 932 attributes.colormap = cmap;
944 933
945 top = XCreateWindow (xdisp, parent, 934 top = XCreateWindow (dpy, parent,
946 szHint.x, szHint.y, 935 szHint.x, szHint.y,
947 szHint.width, szHint.height, 936 szHint.width, szHint.height,
948 ext_bwidth, 937 ext_bwidth,
949 depth, InputOutput, visual, 938 depth, InputOutput, visual,
950 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 939 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
964 wmHint.flags = InputHint | StateHint | WindowGroupHint; 953 wmHint.flags = InputHint | StateHint | WindowGroupHint;
965 wmHint.input = True; 954 wmHint.input = True;
966 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
967 wmHint.window_group = top; 956 wmHint.window_group = top;
968 957
969 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
970 &szHint, &wmHint, &classHint); 959 &szHint, &wmHint, &classHint);
971 960
972#if ENABLE_FRILLS 961#if ENABLE_FRILLS
973 if (mwmhints.flags) 962 if (mwmhints.flags)
974 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,
975 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 964 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
976#endif 965#endif
977 966
978 Atom protocols[] = { 967 Atom protocols[] = {
979 xa[XA_WM_DELETE_WINDOW], 968 xa[XA_WM_DELETE_WINDOW],
980#if ENABLE_EWMH 969#if ENABLE_EWMH
981 xa[XA_NET_WM_PING], 970 xa[XA_NET_WM_PING],
982#endif 971#endif
983 }; 972 };
984 973
985 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 974 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
986 975
987#if ENABLE_FRILLS 976#if ENABLE_FRILLS
988 if (rs[Rs_transient_for]) 977 if (rs[Rs_transient_for])
989 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 978 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
990#endif 979#endif
991 980
992#if ENABLE_EWMH 981#if ENABLE_EWMH
993 long pid = getpid (); 982 long pid = getpid ();
994 983
995 XChangeProperty (xdisp, top, 984 XChangeProperty (dpy, top,
996 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 985 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
997 PropModeReplace, (unsigned char *)&pid, 1); 986 PropModeReplace, (unsigned char *)&pid, 1);
998 987
999 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 988 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1000#endif 989#endif
1001 990
1002 XSelectInput (xdisp, top, 991 XSelectInput (dpy, top,
1003 KeyPressMask 992 KeyPressMask
1004#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 993#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1005 | KeyReleaseMask 994 | KeyReleaseMask
1006#endif 995#endif
1007 | FocusChangeMask | VisibilityChangeMask 996 | FocusChangeMask | VisibilityChangeMask
1008 | ExposureMask | StructureNotifyMask); 997 | ExposureMask | StructureNotifyMask);
1009 998
1010 termwin_ev.start (display, top); 999 termwin_ev.start (display, top);
1011 1000
1012 /* 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 */
1013 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1002 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1014 1003
1015#ifdef HAVE_SCROLLBARS 1004#ifdef HAVE_SCROLLBARS
1016 /* cursor scrollBar: Black-on-White */ 1005 /* cursor scrollBar: Black-on-White */
1017 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1006 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1018#endif 1007#endif
1019 1008
1020 /* the vt window */ 1009 /* the vt window */
1021 vt = XCreateSimpleWindow (xdisp, top, 1010 vt = XCreateSimpleWindow (dpy, top,
1022 window_vt_x, window_vt_y, 1011 window_vt_x, window_vt_y,
1023 width, height, 1012 width, height,
1024 0, 1013 0,
1025 pix_colors_focused[Color_fg], 1014 pix_colors_focused[Color_fg],
1026 pix_colors_focused[Color_bg]); 1015 pix_colors_focused[Color_bg]);
1027 1016
1028 attributes.bit_gravity = NorthWestGravity; 1017 attributes.bit_gravity = NorthWestGravity;
1029 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1030 1019
1031 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1032 1021
1033 if (OPTION (Opt_pointerBlank)) 1022 if (OPTION (Opt_pointerBlank))
1034 vt_emask |= PointerMotionMask; 1023 vt_emask |= PointerMotionMask;
… …
1057#endif 1046#endif
1058 1047
1059 /* graphics context for the vt window */ 1048 /* graphics context for the vt window */
1060 gcvalue.foreground = pix_colors[Color_fg]; 1049 gcvalue.foreground = pix_colors[Color_fg];
1061 gcvalue.background = pix_colors[Color_bg]; 1050 gcvalue.background = pix_colors[Color_bg];
1062 gcvalue.graphics_exposures = 1; 1051 gcvalue.graphics_exposures = 0;
1063 1052
1064 gc = XCreateGC (xdisp, vt, 1053 gc = XCreateGC (dpy, vt,
1065 GCForeground | GCBackground | GCGraphicsExposures, 1054 GCForeground | GCBackground | GCGraphicsExposures,
1066 &gcvalue); 1055 &gcvalue);
1067 1056
1068 drawable = new rxvt_drawable (this, vt); 1057 drawable = new rxvt_drawable (this, vt);
1069 1058
1070#ifdef RXVT_SCROLLBAR 1059#ifdef RXVT_SCROLLBAR
1071 gcvalue.foreground = pix_colors[Color_topShadow]; 1060 gcvalue.foreground = pix_colors[Color_topShadow];
1072 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1061 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1073 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1062 gcvalue.foreground = pix_colors[Color_bottomShadow];
1074 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1063 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1075 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1064 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1076 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1065 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1077#endif 1066#endif
1078 1067
1079#ifdef OFF_FOCUS_FADING 1068#ifdef OFF_FOCUS_FADING
1080 // initially we are in unfocused state 1069 // initially we are in unfocused state
1081 if (rs[Rs_fade]) 1070 if (rs[Rs_fade])
… …
1090 * GET TTY CURRENT STATE * 1079 * GET TTY CURRENT STATE *
1091 * ------------------------------------------------------------------------- */ 1080 * ------------------------------------------------------------------------- */
1092void 1081void
1093rxvt_get_ttymode (ttymode_t *tio, int erase) 1082rxvt_get_ttymode (ttymode_t *tio, int erase)
1094{ 1083{
1095#ifdef HAVE_TERMIOS_H
1096 /* 1084 /*
1097 * standard System V termios interface 1085 * standard System V termios interface
1098 */ 1086 */
1099 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1087 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1100 { 1088 {
… …
1167 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1155 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1168# if defined (ECHOCTL) && defined (ECHOKE) 1156# if defined (ECHOCTL) && defined (ECHOKE)
1169 | ECHOCTL | ECHOKE 1157 | ECHOCTL | ECHOKE
1170# endif 1158# endif
1171 | ECHOE | ECHOK); 1159 | ECHOE | ECHOK);
1172# else /* HAVE_TERMIOS_H */
1173
1174 /*
1175 * sgtty interface
1176 */
1177
1178 /* get parameters -- gtty */
1179 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1180 {
1181 tio->sg.sg_erase = CERASE; /* ^H */
1182 tio->sg.sg_kill = CKILL; /* ^U */
1183 }
1184
1185 if (erase != -1)
1186 tio->sg.sg_erase = (char)erase;
1187
1188 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1189
1190 /* get special characters */
1191 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1192 {
1193 tio->tc.t_intrc = CINTR; /* ^C */
1194 tio->tc.t_quitc = CQUIT; /* ^\ */
1195 tio->tc.t_startc = CSTART; /* ^Q */
1196 tio->tc.t_stopc = CSTOP; /* ^S */
1197 tio->tc.t_eofc = CEOF; /* ^D */
1198 tio->tc.t_brkc = -1;
1199 }
1200
1201 /* get local special chars */
1202 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1203 {
1204 tio->lc.t_suspc = CSUSP; /* ^Z */
1205 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1206 tio->lc.t_rprntc = CRPRNT; /* ^R */
1207 tio->lc.t_flushc = CFLUSH; /* ^O */
1208 tio->lc.t_werasc = CWERASE; /* ^W */
1209 tio->lc.t_lnextc = CLNEXT; /* ^V */
1210 }
1211 /* get line discipline */
1212 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1213# ifdef NTTYDISC
1214 tio->line = NTTYDISC;
1215# endif /* NTTYDISC */
1216
1217 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1218#endif /* HAVE_TERMIOS_H */
1219 1160
1220 /* 1161 /*
1221 * Debugging 1162 * Debugging
1222 */ 1163 */
1223#ifdef DEBUG_TTYMODE 1164#ifdef DEBUG_TTYMODE
… …
1324 else 1265 else
1325#endif 1266#endif
1326 if (!pty->get ()) 1267 if (!pty->get ())
1327 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1268 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1328 1269
1329 pty->set_utf8_mode (enc_utf8);
1330
1331 /* set initial window size */
1332 tt_winch ();
1333
1334 int er; 1270 int er;
1335 1271
1336#ifndef NO_BACKSPACE_KEY 1272#ifndef NO_BACKSPACE_KEY
1337 if (key_backspace[0] && !key_backspace[1]) 1273 if (key_backspace[0] && !key_backspace[1])
1338 er = key_backspace[0]; 1274 er = key_backspace[0];
… …
1341 else 1277 else
1342#endif 1278#endif
1343 er = -1; 1279 er = -1;
1344 1280
1345 rxvt_get_ttymode (&tio, er); 1281 rxvt_get_ttymode (&tio, er);
1282 pty->set_utf8_mode (enc_utf8);
1283 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1284
1285 /* set initial window size */
1286 tt_winch ();
1346 1287
1347#if ENABLE_FRILLS 1288#if ENABLE_FRILLS
1348 if (rs[Rs_pty_fd]) 1289 if (rs[Rs_pty_fd])
1349 return; 1290 return;
1350#endif 1291#endif
… …
1404 */ 1345 */
1405int 1346int
1406rxvt_term::run_child (const char *const *argv) 1347rxvt_term::run_child (const char *const *argv)
1407{ 1348{
1408 char *login; 1349 char *login;
1409
1410 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1411 1350
1412 if (OPTION (Opt_console)) 1351 if (OPTION (Opt_console))
1413 { /* be virtual console, fail silently */ 1352 { /* be virtual console, fail silently */
1414#ifdef TIOCCONS 1353#ifdef TIOCCONS
1415 unsigned int on = 1; 1354 unsigned int on = 1;

Diff Legend

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