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.167 by root, Tue Jan 31 19:54:39 2006 UTC vs.
Revision 1.180 by ayin, Fri Feb 16 21:46:05 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>
… …
206 refresh_type = SLOW_REFRESH; 206 refresh_type = SLOW_REFRESH;
207 207
208 oldcursor.row = oldcursor.col = -1; 208 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */ 210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50; 211 bgPixmap.x = bgPixmap.y = 0;
212 bgPixmap.pixmap = None; 212 bgPixmap.pixmap = None;
213#endif 213#endif
214 214
215 last_bot = last_state = -1; 215 last_bot = last_state = -1;
216 216
… …
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++)
… …
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 // using a local pointer decreases code size a lot
303 xa = display->xa; 303 xa = display->xa;
304 304
305 set (display);
306 extract_resources ();
307
305#if XFT 308#if XFT
306 if (rs[Rs_depth]) 309 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0)); 310 select_visual (strtol (rs[Rs_depth], 0, 0));
308 else
309#endif 311#endif
310 set (display);
311
312 extract_resources ();
313 312
314 free (r_argv); 313 free (r_argv);
315 314
316 for (int i = NUM_RESOURCES; i--; ) 315 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 316 if (rs [i] == resval_undef)
… …
488 val = rxvt_network_display (rs[Rs_display_name]); 487 val = rxvt_network_display (rs[Rs_display_name]);
489 rs[Rs_display_name] = (const char *)val; 488 rs[Rs_display_name] = (const char *)val;
490 489
491 if (val == NULL) 490 if (val == NULL)
492#endif /* DISPLAY_IS_IP */ 491#endif /* DISPLAY_IS_IP */
493 val = XDisplayString (xdisp); 492 val = XDisplayString (dpy);
494 493
495 if (rs[Rs_display_name] == NULL) 494 if (rs[Rs_display_name] == NULL)
496 rs[Rs_display_name] = val; /* use broken `:0' value */ 495 rs[Rs_display_name] = val; /* use broken `:0' value */
497 496
498 i = strlen (val); 497 i = strlen (val);
… …
694#ifndef NO_CURSORCOLOR 693#ifndef NO_CURSORCOLOR
695 case Color_cursor2: 694 case Color_cursor2:
696#endif 695#endif
697 case Color_pointer_fg: 696 case Color_pointer_fg:
698 name = rs[Rs_color + Color_fg]; 697 name = rs[Rs_color + Color_fg];
699 xcol = pix_colors[Color_fg]; 698 xcol.set (this, name);
700 break; 699 break;
701 default: 700 default:
702 name = rs[Rs_color + Color_bg]; 701 name = rs[Rs_color + Color_bg];
703 xcol = pix_colors[Color_bg]; 702 xcol.set (this, name);
704 break; 703 break;
705 } 704 }
706 } 705 }
707 } 706 }
708 707
709 pix_colors[i] = xcol; 708 pix_colors[i] = xcol;
710 rs[Rs_color + i] = name; 709 rs[Rs_color + i] = name;
711 } 710 }
712 711
713#ifdef OFF_FOCUS_FADING
714 if (rs[Rs_fade])
715 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
716 {
717 rgba c;
718 pix_colors[Color_fade].get (c);
719 pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
720 }
721#endif
722
723 if (depth <= 2) 712 if (depth <= 2)
724 { 713 {
725 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);
726 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);
727 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);
728 } 717 }
729 718
730 /* 719 /*
731 * get scrollBar shadow colors 720 * get scrollBar shadow colors
732 * 721 *
733 * The calculations of topShadow/bottomShadow values are adapted 722 * The calculations of topShadow/bottomShadow values are adapted
734 * from the fvwm window manager. 723 * from the fvwm window manager.
735 */ 724 */
736#ifdef KEEP_SCROLLCOLOR 725#ifdef KEEP_SCROLLCOLOR
737
738 if (depth <= 2) 726 if (depth <= 2)
739 { 727 {
740 /* Monochrome */ 728 /* Monochrome */
741 pix_colors[Color_scroll] = pix_colors[Color_fg]; 729 alias_color (Color_scroll, Color_fg);
742 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 730 alias_color (Color_topShadow, Color_bg);
743 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 731 alias_color (Color_bottomShadow, Color_bg);
744 } 732 }
745 else 733 else
746 { 734 {
747 rxvt_color xcol[2]; 735 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
748 /* xcol[0] == white
749 * xcol[1] == top shadow
750 * xcol[2] == bot shadow */
751 736
752 xcol[1] = pix_colors[Color_scroll];
753 xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
754
755 rgba c0, c1; 737 rgba cscroll;
756 738 pix_colors [Color_scroll].get (cscroll);
757 xcol[0].get (c0);
758 xcol[1].get (c1);
759
760 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
761 739
762 /* topShadowColor */ 740 /* topShadowColor */
763 if (!xcol[1].set (this, 741 if (!pix_colors[Color_topShadow].set (this,
764 rgba ( 742 rgba (
765 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),
766 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),
767 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),
768 c1.a) // pa1 vs. pa0: arbitrary 746 cscroll.a)
769 )); 747 ))
770 xcol[1] = pix_colors[Color_White]; 748 alias_color (Color_topShadow, Color_White);
771
772 pix_colors[Color_topShadow] = xcol[1];
773 } 749 }
774#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
775} 756}
776 757
777/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
778/* color aliases, fg/bg bright-bold */ 759/* color aliases, fg/bg bright-bold */
779void 760void
… …
818 799
819 if (rsmod 800 if (rsmod
820 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 801 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
821 requestedmeta = rsmod[3] - '0'; 802 requestedmeta = rsmod[3] - '0';
822 803
823 map = XGetModifierMapping (xdisp); 804 map = XGetModifierMapping (dpy);
824 kc = map->modifiermap; 805 kc = map->modifiermap;
825 806
826 for (i = 1; i < 6; i++) 807 for (i = 1; i < 6; i++)
827 { 808 {
828 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 809 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
830 for (j = map->max_keypermod; j--; k++) 811 for (j = map->max_keypermod; j--; k++)
831 { 812 {
832 if (kc[k] == 0) 813 if (kc[k] == 0)
833 break; 814 break;
834 815
835 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 816 switch (XKeycodeToKeysym (dpy, kc[k], 0))
836 { 817 {
837 case XK_Num_Lock: 818 case XK_Num_Lock:
838 ModNumLockMask = modmasks[i - 1]; 819 ModNumLockMask = modmasks[i - 1];
839 continue; 820 continue;
840 821
… …
896#endif 877#endif
897 XGCValues gcvalue; 878 XGCValues gcvalue;
898 XSetWindowAttributes attributes; 879 XSetWindowAttributes attributes;
899 Window top, parent; 880 Window top, parent;
900 881
901 dLocal (Display *, xdisp); 882 dLocal (Display *, dpy);
902 883
903 /* grab colors before netscape does */ 884 /* grab colors before netscape does */
904 Get_Colours (); 885 Get_Colours ();
905 886
906 if (!set_fonts ()) 887 if (!set_fonts ())
… …
911 attributes.override_redirect = !!OPTION (Opt_override_redirect); 892 attributes.override_redirect = !!OPTION (Opt_override_redirect);
912 893
913#if ENABLE_FRILLS 894#if ENABLE_FRILLS
914 if (OPTION (Opt_borderLess)) 895 if (OPTION (Opt_borderLess))
915 { 896 {
916 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
917 { 898 {
918 /* 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");*/
919 attributes.override_redirect = true; 900 attributes.override_redirect = true;
920 mwmhints.flags = 0; 901 mwmhints.flags = 0;
921 } 902 }
… …
934 { 915 {
935 XWindowAttributes wattr; 916 XWindowAttributes wattr;
936 917
937 parent = strtol (rs[Rs_embed], 0, 0); 918 parent = strtol (rs[Rs_embed], 0, 0);
938 919
939 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 920 if (!XGetWindowAttributes (dpy, parent, &wattr))
940 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 921 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
941 922
942 window_calc (wattr.width, wattr.height); 923 window_calc (wattr.width, wattr.height);
943 } 924 }
944#endif 925#endif
… …
948 /* sub-window placement & size in rxvt_resize_subwindows () */ 929 /* sub-window placement & size in rxvt_resize_subwindows () */
949 attributes.background_pixel = pix_colors_focused [Color_border]; 930 attributes.background_pixel = pix_colors_focused [Color_border];
950 attributes.border_pixel = pix_colors_focused [Color_border]; 931 attributes.border_pixel = pix_colors_focused [Color_border];
951 attributes.colormap = cmap; 932 attributes.colormap = cmap;
952 933
953 top = XCreateWindow (xdisp, parent, 934 top = XCreateWindow (dpy, parent,
954 szHint.x, szHint.y, 935 szHint.x, szHint.y,
955 szHint.width, szHint.height, 936 szHint.width, szHint.height,
956 ext_bwidth, 937 ext_bwidth,
957 depth, InputOutput, visual, 938 depth, InputOutput, visual,
958 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 939 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
972 wmHint.flags = InputHint | StateHint | WindowGroupHint; 953 wmHint.flags = InputHint | StateHint | WindowGroupHint;
973 wmHint.input = True; 954 wmHint.input = True;
974 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
975 wmHint.window_group = top; 956 wmHint.window_group = top;
976 957
977 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
978 &szHint, &wmHint, &classHint); 959 &szHint, &wmHint, &classHint);
979 960
980#if ENABLE_FRILLS 961#if ENABLE_FRILLS
981 if (mwmhints.flags) 962 if (mwmhints.flags)
982 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,
983 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 964 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
984#endif 965#endif
985 966
986 Atom protocols[] = { 967 Atom protocols[] = {
987 xa[XA_WM_DELETE_WINDOW], 968 xa[XA_WM_DELETE_WINDOW],
988#if ENABLE_EWMH 969#if ENABLE_EWMH
989 xa[XA_NET_WM_PING], 970 xa[XA_NET_WM_PING],
990#endif 971#endif
991 }; 972 };
992 973
993 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 974 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
994 975
995#if ENABLE_FRILLS 976#if ENABLE_FRILLS
996 if (rs[Rs_transient_for]) 977 if (rs[Rs_transient_for])
997 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 978 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
998#endif 979#endif
999 980
1000#if ENABLE_EWMH 981#if ENABLE_EWMH
1001 long pid = getpid (); 982 long pid = getpid ();
1002 983
1003 XChangeProperty (xdisp, top, 984 XChangeProperty (dpy, top,
1004 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 985 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1005 PropModeReplace, (unsigned char *)&pid, 1); 986 PropModeReplace, (unsigned char *)&pid, 1);
1006 987
1007 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 988 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1008#endif 989#endif
1009 990
1010 XSelectInput (xdisp, top, 991 XSelectInput (dpy, top,
1011 KeyPressMask 992 KeyPressMask
1012#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 993#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1013 | KeyReleaseMask 994 | KeyReleaseMask
1014#endif 995#endif
1015 | FocusChangeMask | VisibilityChangeMask 996 | FocusChangeMask | VisibilityChangeMask
1016 | ExposureMask | StructureNotifyMask); 997 | ExposureMask | StructureNotifyMask);
1017 998
1018 termwin_ev.start (display, top); 999 termwin_ev.start (display, top);
1019 1000
1020 /* 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 */
1021 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1002 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1022 1003
1023#ifdef HAVE_SCROLLBARS 1004#ifdef HAVE_SCROLLBARS
1024 /* cursor scrollBar: Black-on-White */ 1005 /* cursor scrollBar: Black-on-White */
1025 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1006 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1026#endif 1007#endif
1027 1008
1028 /* the vt window */ 1009 /* the vt window */
1029 vt = XCreateSimpleWindow (xdisp, top, 1010 vt = XCreateSimpleWindow (dpy, top,
1030 window_vt_x, window_vt_y, 1011 window_vt_x, window_vt_y,
1031 width, height, 1012 width, height,
1032 0, 1013 0,
1033 pix_colors_focused[Color_fg], 1014 pix_colors_focused[Color_fg],
1034 pix_colors_focused[Color_bg]); 1015 pix_colors_focused[Color_bg]);
1035 1016
1036 attributes.bit_gravity = NorthWestGravity; 1017 attributes.bit_gravity = NorthWestGravity;
1037 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1038 1019
1039 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1040 1021
1041 if (OPTION (Opt_pointerBlank)) 1022 if (OPTION (Opt_pointerBlank))
1042 vt_emask |= PointerMotionMask; 1023 vt_emask |= PointerMotionMask;
… …
1065#endif 1046#endif
1066 1047
1067 /* graphics context for the vt window */ 1048 /* graphics context for the vt window */
1068 gcvalue.foreground = pix_colors[Color_fg]; 1049 gcvalue.foreground = pix_colors[Color_fg];
1069 gcvalue.background = pix_colors[Color_bg]; 1050 gcvalue.background = pix_colors[Color_bg];
1070 gcvalue.graphics_exposures = 1; 1051 gcvalue.graphics_exposures = 0;
1071 1052
1072 gc = XCreateGC (xdisp, vt, 1053 gc = XCreateGC (dpy, vt,
1073 GCForeground | GCBackground | GCGraphicsExposures, 1054 GCForeground | GCBackground | GCGraphicsExposures,
1074 &gcvalue); 1055 &gcvalue);
1075 1056
1076 drawable = new rxvt_drawable (this, vt); 1057 drawable = new rxvt_drawable (this, vt);
1077 1058
1078#ifdef RXVT_SCROLLBAR 1059#ifdef RXVT_SCROLLBAR
1079 gcvalue.foreground = pix_colors[Color_topShadow]; 1060 gcvalue.foreground = pix_colors[Color_topShadow];
1080 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1061 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1081 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1062 gcvalue.foreground = pix_colors[Color_bottomShadow];
1082 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1063 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1083 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1064 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1084 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1065 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1085#endif 1066#endif
1086 1067
1087#ifdef OFF_FOCUS_FADING 1068#ifdef OFF_FOCUS_FADING
1088 // initially we are in unfocused state 1069 // initially we are in unfocused state
1089 if (rs[Rs_fade]) 1070 if (rs[Rs_fade])
… …
1098 * GET TTY CURRENT STATE * 1079 * GET TTY CURRENT STATE *
1099 * ------------------------------------------------------------------------- */ 1080 * ------------------------------------------------------------------------- */
1100void 1081void
1101rxvt_get_ttymode (ttymode_t *tio, int erase) 1082rxvt_get_ttymode (ttymode_t *tio, int erase)
1102{ 1083{
1103#ifdef HAVE_TERMIOS_H
1104 /* 1084 /*
1105 * standard System V termios interface 1085 * standard System V termios interface
1106 */ 1086 */
1107 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1087 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1108 { 1088 {
… …
1175 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1155 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1176# if defined (ECHOCTL) && defined (ECHOKE) 1156# if defined (ECHOCTL) && defined (ECHOKE)
1177 | ECHOCTL | ECHOKE 1157 | ECHOCTL | ECHOKE
1178# endif 1158# endif
1179 | ECHOE | ECHOK); 1159 | ECHOE | ECHOK);
1180# else /* HAVE_TERMIOS_H */
1181
1182 /*
1183 * sgtty interface
1184 */
1185
1186 /* get parameters -- gtty */
1187 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1188 {
1189 tio->sg.sg_erase = CERASE; /* ^H */
1190 tio->sg.sg_kill = CKILL; /* ^U */
1191 }
1192
1193 if (erase != -1)
1194 tio->sg.sg_erase = (char)erase;
1195
1196 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1197
1198 /* get special characters */
1199 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1200 {
1201 tio->tc.t_intrc = CINTR; /* ^C */
1202 tio->tc.t_quitc = CQUIT; /* ^\ */
1203 tio->tc.t_startc = CSTART; /* ^Q */
1204 tio->tc.t_stopc = CSTOP; /* ^S */
1205 tio->tc.t_eofc = CEOF; /* ^D */
1206 tio->tc.t_brkc = -1;
1207 }
1208
1209 /* get local special chars */
1210 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1211 {
1212 tio->lc.t_suspc = CSUSP; /* ^Z */
1213 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1214 tio->lc.t_rprntc = CRPRNT; /* ^R */
1215 tio->lc.t_flushc = CFLUSH; /* ^O */
1216 tio->lc.t_werasc = CWERASE; /* ^W */
1217 tio->lc.t_lnextc = CLNEXT; /* ^V */
1218 }
1219 /* get line discipline */
1220 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1221# ifdef NTTYDISC
1222 tio->line = NTTYDISC;
1223# endif /* NTTYDISC */
1224
1225 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1226#endif /* HAVE_TERMIOS_H */
1227 1160
1228 /* 1161 /*
1229 * Debugging 1162 * Debugging
1230 */ 1163 */
1231#ifdef DEBUG_TTYMODE 1164#ifdef DEBUG_TTYMODE
… …
1332 else 1265 else
1333#endif 1266#endif
1334 if (!pty->get ()) 1267 if (!pty->get ())
1335 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1268 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1336 1269
1337 pty->set_utf8_mode (enc_utf8);
1338
1339 /* set initial window size */
1340 tt_winch ();
1341
1342 int er; 1270 int er;
1343 1271
1344#ifndef NO_BACKSPACE_KEY 1272#ifndef NO_BACKSPACE_KEY
1345 if (key_backspace[0] && !key_backspace[1]) 1273 if (key_backspace[0] && !key_backspace[1])
1346 er = key_backspace[0]; 1274 er = key_backspace[0];
… …
1349 else 1277 else
1350#endif 1278#endif
1351 er = -1; 1279 er = -1;
1352 1280
1353 rxvt_get_ttymode (&tio, er); 1281 rxvt_get_ttymode (&tio, er);
1282 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1283 pty->set_utf8_mode (enc_utf8);
1284
1285 /* set initial window size */
1286 tt_winch ();
1354 1287
1355#if ENABLE_FRILLS 1288#if ENABLE_FRILLS
1356 if (rs[Rs_pty_fd]) 1289 if (rs[Rs_pty_fd])
1357 return; 1290 return;
1358#endif 1291#endif
… …
1412 */ 1345 */
1413int 1346int
1414rxvt_term::run_child (const char *const *argv) 1347rxvt_term::run_child (const char *const *argv)
1415{ 1348{
1416 char *login; 1349 char *login;
1417
1418 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1419 1350
1420 if (OPTION (Opt_console)) 1351 if (OPTION (Opt_console))
1421 { /* be virtual console, fail silently */ 1352 { /* be virtual console, fail silently */
1422#ifdef TIOCCONS 1353#ifdef TIOCCONS
1423 unsigned int on = 1; 1354 unsigned int on = 1;

Diff Legend

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