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.172 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.210 by ayin, Sat Sep 8 21:25:56 2007 UTC

… …
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 48 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 49 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 50 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 56 "rgb:e5/e5/e5", // 7: white (Grey90)
… …
166#endif 166#endif
167#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if ENABLE_TRANSPARENCY
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 175 "rgb:00/00/00",
176#endif 176#endif
… …
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 186#endif
187 187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 188
192 MEvent.time = CurrentTime; 189 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 190 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 191 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 193 ncol = 80;
198 nrow = 24; 194 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 195 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 196 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 197 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 198 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
204 200
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
207 202
208 oldcursor.row = oldcursor.col = -1; 203 oldcursor.row = oldcursor.col = -1;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
209#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50; 210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
212 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
213#endif 215#endif
214
215 last_bot = last_state = -1; 216 last_bot = last_state = -1;
217
218 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll);
221 set_option (Opt_skipScroll);
222 set_option (Opt_secondaryScreen);
223 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles);
226 set_option (Opt_iso14755_52);
216 227
217 return true; 228 return true;
218} 229}
219 230
220void 231void
… …
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 294 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284 295
285 cmd_argv[i] = NULL; 296 cmd_argv[i] = NULL;
286 } 297 }
287 298
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 299 rs[Rs_name] = rxvt_basename (argv[0]);
289 300
290 /* 301 /*
291 * Open display, get options/resources and create the window 302 * Open display, get options/resources and create the window
292 */ 303 */
293 304
… …
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 311 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 312
302 // using a local pointer decreases code size a lot 313 // using a local pointer decreases code size a lot
303 xa = display->xa; 314 xa = display->xa;
304 315
316 set (display);
317 extract_resources ();
318
305#if XFT 319#if XFT
306 if (rs[Rs_depth]) 320 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0)); 321 select_visual (strtol (rs[Rs_depth], 0, 0));
308 else
309#endif 322#endif
310 set (display);
311 323
312 extract_resources (); 324#ifdef HAVE_AFTERIMAGE
313 325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
314 free (r_argv); 327 free (r_argv);
315 328
316 for (int i = NUM_RESOURCES; i--; ) 329 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 330 if (rs [i] == resval_undef)
318 rs [i] = 0; 331 rs [i] = 0;
… …
334 * set any defaults not already set 347 * set any defaults not already set
335 */ 348 */
336 if (cmd_argv && cmd_argv[0]) 349 if (cmd_argv && cmd_argv[0])
337 { 350 {
338 if (!rs[Rs_title]) 351 if (!rs[Rs_title])
339 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 352 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
340 if (!rs[Rs_iconName]) 353 if (!rs[Rs_iconName])
341 rs[Rs_iconName] = rs[Rs_title]; 354 rs[Rs_iconName] = rs[Rs_title];
342 } 355 }
343 else 356 else
344 { 357 {
… …
389 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 402 key_backspace = "DEC"; /* can toggle between \010 or \177 */
390# endif 403# endif
391 else 404 else
392 { 405 {
393 val = strdup (rs[Rs_backspace_key]); 406 val = strdup (rs[Rs_backspace_key]);
394 rxvt_Str_trim (val);
395 rxvt_Str_escaped (val);
396 key_backspace = val; 407 key_backspace = val;
397 } 408 }
398#endif 409#endif
399 410
400#ifndef NO_DELETE_KEY 411#ifndef NO_DELETE_KEY
… …
405 key_delete = "\033[3~"; 416 key_delete = "\033[3~";
406# endif 417# endif
407 else 418 else
408 { 419 {
409 val = strdup (rs[Rs_delete_key]); 420 val = strdup (rs[Rs_delete_key]);
410 rxvt_Str_trim (val);
411 rxvt_Str_escaped (val);
412 key_delete = val; 421 key_delete = val;
413 } 422 }
414#endif 423#endif
415 if (rs[Rs_answerbackstring])
416 {
417 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
418 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
419 }
420 424
421#ifdef HAVE_SCROLLBARS 425#ifdef HAVE_SCROLLBARS
422 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 426 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
423#endif 427#endif
424 428
425#ifdef XTERM_REVERSE_VIDEO 429#ifdef XTERM_REVERSE_VIDEO
426 /* this is how xterm implements reverseVideo */ 430 /* this is how xterm implements reverseVideo */
427 if (OPTION (Opt_reverseVideo)) 431 if (option (Opt_reverseVideo))
428 { 432 {
429 if (!rs[Rs_color + Color_fg]) 433 if (!rs[Rs_color + Color_fg])
430 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 434 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431 435
432 if (!rs[Rs_color + Color_bg]) 436 if (!rs[Rs_color + Color_bg])
… …
438 if (!rs[Rs_color + i]) 442 if (!rs[Rs_color + i])
439 rs[Rs_color + i] = def_colorName[i]; 443 rs[Rs_color + i] = def_colorName[i];
440 444
441#ifndef XTERM_REVERSE_VIDEO 445#ifndef XTERM_REVERSE_VIDEO
442 /* this is how we implement reverseVideo */ 446 /* this is how we implement reverseVideo */
443 if (OPTION (Opt_reverseVideo)) 447 if (option (Opt_reverseVideo))
444 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 448 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
445#endif 449#endif
446 450
447 /* convenient aliases for setting fg/bg to colors */ 451 /* convenient aliases for setting fg/bg to colors */
448 color_aliases (Color_fg); 452 color_aliases (Color_fg);
… …
469/*----------------------------------------------------------------------*/ 473/*----------------------------------------------------------------------*/
470void 474void
471rxvt_term::init_env () 475rxvt_term::init_env ()
472{ 476{
473 int i; 477 int i;
474 unsigned int u;
475 char *val; 478 char *val;
476 479
477#ifdef DISPLAY_IS_IP 480#ifdef DISPLAY_IS_IP
478 /* Fixup display_name for export over pty to any interested terminal 481 /* Fixup display_name for export over pty to any interested terminal
479 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 482 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
494 497
495 if (rs[Rs_display_name] == NULL) 498 if (rs[Rs_display_name] == NULL)
496 rs[Rs_display_name] = val; /* use broken `:0' value */ 499 rs[Rs_display_name] = val; /* use broken `:0' value */
497 500
498 i = strlen (val); 501 i = strlen (val);
499 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 502 env_display = (char *)rxvt_malloc (i + 9);
500 503
501 sprintf (env_display, "DISPLAY=%s", val); 504 sprintf (env_display, "DISPLAY=%s", val);
502 505
503 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 506 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
504 507
… …
525 else 528 else
526 putenv ("COLORTERM=" COLORTERMENVFULL); 529 putenv ("COLORTERM=" COLORTERMENVFULL);
527 530
528 if (rs[Rs_term_name] != NULL) 531 if (rs[Rs_term_name] != NULL)
529 { 532 {
530 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 533 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
531 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 534 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
532 putenv (env_term); 535 putenv (env_term);
533 } 536 }
534 else 537 else
535 putenv ("TERM=" TERMENV); 538 putenv ("TERM=" TERMENV);
… …
622 * Initialize the command connection. 625 * Initialize the command connection.
623 * This should be called after the X server connection is established. 626 * This should be called after the X server connection is established.
624 */ 627 */
625 628
626#ifdef META8_OPTION 629#ifdef META8_OPTION
627 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 630 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
628#endif 631#endif
629 632
630 get_ourmods (); 633 get_ourmods ();
631 634
632 if (!OPTION (Opt_scrollTtyOutput)) 635 if (!option (Opt_scrollTtyOutput))
633 priv_modes |= PrivMode_TtyOutputInh; 636 priv_modes |= PrivMode_TtyOutputInh;
634 if (OPTION (Opt_scrollTtyKeypress)) 637 if (option (Opt_scrollTtyKeypress))
635 priv_modes |= PrivMode_Keypress; 638 priv_modes |= PrivMode_Keypress;
636 if (!OPTION (Opt_jumpScroll)) 639 if (!option (Opt_jumpScroll))
637 priv_modes |= PrivMode_smoothScroll; 640 priv_modes |= PrivMode_smoothScroll;
638 641
639#ifndef NO_BACKSPACE_KEY 642#ifndef NO_BACKSPACE_KEY
640 if (strcmp (key_backspace, "DEC") == 0) 643 if (strcmp (key_backspace, "DEC") == 0)
641 priv_modes |= PrivMode_HaveBackSpace; 644 priv_modes |= PrivMode_HaveBackSpace;
… …
671 rxvt_color xcol; 674 rxvt_color xcol;
672 675
673 if (!set_color (xcol, name)) 676 if (!set_color (xcol, name))
674 { 677 {
675#ifndef XTERM_REVERSE_VIDEO 678#ifndef XTERM_REVERSE_VIDEO
676 if (i < 2 && OPTION (Opt_reverseVideo)) 679 if (i < 2 && option (Opt_reverseVideo))
677 name = def_colorName [1 - i]; 680 name = def_colorName [1 - i];
678 else 681 else
679#endif 682#endif
680 name = def_colorName [i]; 683 name = def_colorName [i];
681 684
… …
749 alias_color (Color_topShadow, Color_White); 752 alias_color (Color_topShadow, Color_White);
750 } 753 }
751#endif /* KEEP_SCROLLCOLOR */ 754#endif /* KEEP_SCROLLCOLOR */
752 755
753#ifdef OFF_FOCUS_FADING 756#ifdef OFF_FOCUS_FADING
754 if (rs[Rs_fade])
755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 757 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
756 { 758 update_fade_color (i);
757 rgba c;
758 pix_colors [Color_fade].get (c);
759 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
760 }
761#endif 759#endif
762} 760}
763 761
764/*----------------------------------------------------------------------*/ 762/*----------------------------------------------------------------------*/
765/* color aliases, fg/bg bright-bold */ 763/* color aliases, fg/bg bright-bold */
… …
877rxvt_term::create_windows (int argc, const char *const *argv) 875rxvt_term::create_windows (int argc, const char *const *argv)
878{ 876{
879 XClassHint classHint; 877 XClassHint classHint;
880 XWMHints wmHint; 878 XWMHints wmHint;
881#if ENABLE_FRILLS 879#if ENABLE_FRILLS
882 MWMHints mwmhints; 880 MWMHints mwmhints = { };
883#endif 881#endif
884 XGCValues gcvalue; 882 XGCValues gcvalue;
885 XSetWindowAttributes attributes; 883 XSetWindowAttributes attributes;
886 Window top, parent; 884 Window top, parent;
887 885
… …
893 if (!set_fonts ()) 891 if (!set_fonts ())
894 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 892 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
895 893
896 parent = display->root; 894 parent = display->root;
897 895
898 attributes.override_redirect = !!OPTION (Opt_override_redirect); 896 attributes.override_redirect = !!option (Opt_override_redirect);
899 897
900#if ENABLE_FRILLS 898#if ENABLE_FRILLS
901 if (OPTION (Opt_borderLess)) 899 if (option (Opt_borderLess))
902 { 900 {
903 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 901 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
904 { 902 {
905 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 903 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
906 attributes.override_redirect = true; 904 attributes.override_redirect = true;
907 mwmhints.flags = 0;
908 } 905 }
909 else 906 else
910 { 907 {
911 mwmhints.flags = MWM_HINTS_DECORATIONS; 908 mwmhints.flags = MWM_HINTS_DECORATIONS;
912 mwmhints.decorations = 0;
913 } 909 }
914 } 910 }
915 else
916 mwmhints.flags = 0;
917#endif 911#endif
918 912
919#if ENABLE_XEMBED 913#if ENABLE_XEMBED
920 if (rs[Rs_embed]) 914 if (rs[Rs_embed])
921 { 915 {
… …
956 classHint.res_name = (char *)rs[Rs_name]; 950 classHint.res_name = (char *)rs[Rs_name];
957 classHint.res_class = (char *)RESCLASS; 951 classHint.res_class = (char *)RESCLASS;
958 952
959 wmHint.flags = InputHint | StateHint | WindowGroupHint; 953 wmHint.flags = InputHint | StateHint | WindowGroupHint;
960 wmHint.input = True; 954 wmHint.input = True;
961 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 955 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
962 wmHint.window_group = top; 956 wmHint.window_group = top;
963 957
964 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
965 &szHint, &wmHint, &classHint); 959 &szHint, &wmHint, &classHint);
966 960
… …
1023 attributes.bit_gravity = NorthWestGravity; 1017 attributes.bit_gravity = NorthWestGravity;
1024 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1025 1019
1026 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1027 1021
1028 if (OPTION (Opt_pointerBlank)) 1022 if (option (Opt_pointerBlank))
1029 vt_emask |= PointerMotionMask; 1023 vt_emask |= PointerMotionMask;
1030 else 1024 else
1031 vt_emask |= Button1MotionMask | Button3MotionMask; 1025 vt_emask |= Button1MotionMask | Button3MotionMask;
1032 1026
1033 vt_select_input (); 1027 vt_select_input ();
1034 1028
1035 vt_ev.start (display, vt); 1029 vt_ev.start (display, vt);
1036
1037#ifdef XPM_BACKGROUND
1038 if (rs[Rs_backgroundPixmap] != NULL
1039 && !OPTION (Opt_transparent))
1040 {
1041 const char *p = rs[Rs_backgroundPixmap];
1042
1043 if ((p = strchr (p, ';')) != NULL)
1044 {
1045 p++;
1046 scale_pixmap (p);
1047 }
1048
1049 set_bgPixmap (rs[Rs_backgroundPixmap]);
1050 scr_touch (true);
1051 }
1052#endif
1053 1030
1054 /* graphics context for the vt window */ 1031 /* graphics context for the vt window */
1055 gcvalue.foreground = pix_colors[Color_fg]; 1032 gcvalue.foreground = pix_colors[Color_fg];
1056 gcvalue.background = pix_colors[Color_bg]; 1033 gcvalue.background = pix_colors[Color_bg];
1057 gcvalue.graphics_exposures = 0; 1034 gcvalue.graphics_exposures = 0;
… …
1085 * GET TTY CURRENT STATE * 1062 * GET TTY CURRENT STATE *
1086 * ------------------------------------------------------------------------- */ 1063 * ------------------------------------------------------------------------- */
1087void 1064void
1088rxvt_get_ttymode (ttymode_t *tio, int erase) 1065rxvt_get_ttymode (ttymode_t *tio, int erase)
1089{ 1066{
1090#ifdef HAVE_TERMIOS_H
1091 /* 1067 /*
1092 * standard System V termios interface 1068 * standard System V termios interface
1093 */ 1069 */
1094 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1070 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1095 { 1071 {
… …
1162 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1138 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1163# if defined (ECHOCTL) && defined (ECHOKE) 1139# if defined (ECHOCTL) && defined (ECHOKE)
1164 | ECHOCTL | ECHOKE 1140 | ECHOCTL | ECHOKE
1165# endif 1141# endif
1166 | ECHOE | ECHOK); 1142 | ECHOE | ECHOK);
1167# else /* HAVE_TERMIOS_H */
1168
1169 /*
1170 * sgtty interface
1171 */
1172
1173 /* get parameters -- gtty */
1174 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1175 {
1176 tio->sg.sg_erase = CERASE; /* ^H */
1177 tio->sg.sg_kill = CKILL; /* ^U */
1178 }
1179
1180 if (erase != -1)
1181 tio->sg.sg_erase = (char)erase;
1182
1183 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1184
1185 /* get special characters */
1186 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1187 {
1188 tio->tc.t_intrc = CINTR; /* ^C */
1189 tio->tc.t_quitc = CQUIT; /* ^\ */
1190 tio->tc.t_startc = CSTART; /* ^Q */
1191 tio->tc.t_stopc = CSTOP; /* ^S */
1192 tio->tc.t_eofc = CEOF; /* ^D */
1193 tio->tc.t_brkc = -1;
1194 }
1195
1196 /* get local special chars */
1197 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1198 {
1199 tio->lc.t_suspc = CSUSP; /* ^Z */
1200 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1201 tio->lc.t_rprntc = CRPRNT; /* ^R */
1202 tio->lc.t_flushc = CFLUSH; /* ^O */
1203 tio->lc.t_werasc = CWERASE; /* ^W */
1204 tio->lc.t_lnextc = CLNEXT; /* ^V */
1205 }
1206 /* get line discipline */
1207 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1208# ifdef NTTYDISC
1209 tio->line = NTTYDISC;
1210# endif /* NTTYDISC */
1211
1212 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1213#endif /* HAVE_TERMIOS_H */
1214 1143
1215 /* 1144 /*
1216 * Debugging 1145 * Debugging
1217 */ 1146 */
1218#ifdef DEBUG_TTYMODE 1147#ifdef DEBUG_TTYMODE
… …
1319 else 1248 else
1320#endif 1249#endif
1321 if (!pty->get ()) 1250 if (!pty->get ())
1322 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1251 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1323 1252
1324 pty->set_utf8_mode (enc_utf8);
1325
1326 /* set initial window size */
1327 tt_winch ();
1328
1329 int er; 1253 int er;
1330 1254
1331#ifndef NO_BACKSPACE_KEY 1255#ifndef NO_BACKSPACE_KEY
1332 if (key_backspace[0] && !key_backspace[1]) 1256 if (key_backspace[0] && !key_backspace[1])
1333 er = key_backspace[0]; 1257 er = key_backspace[0];
… …
1336 else 1260 else
1337#endif 1261#endif
1338 er = -1; 1262 er = -1;
1339 1263
1340 rxvt_get_ttymode (&tio, er); 1264 rxvt_get_ttymode (&tio, er);
1265 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1266 pty->set_utf8_mode (enc_utf8);
1267
1268 /* set initial window size */
1269 tt_winch ();
1341 1270
1342#if ENABLE_FRILLS 1271#if ENABLE_FRILLS
1343 if (rs[Rs_pty_fd]) 1272 if (rs[Rs_pty_fd])
1344 return; 1273 return;
1345#endif 1274#endif
… …
1376 } 1305 }
1377 1306
1378 _exit (EXIT_FAILURE); 1307 _exit (EXIT_FAILURE);
1379 1308
1380 default: 1309 default:
1381 if (!OPTION (Opt_utmpInhibit)) 1310 if (!option (Opt_utmpInhibit))
1382 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1311 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1383 1312
1384 pty->close_tty (); 1313 pty->close_tty ();
1385 1314
1386 child_ev.start (cmd_pid); 1315 child_ev.start (cmd_pid);
1387 1316
… …
1400int 1329int
1401rxvt_term::run_child (const char *const *argv) 1330rxvt_term::run_child (const char *const *argv)
1402{ 1331{
1403 char *login; 1332 char *login;
1404 1333
1405 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1406
1407 if (OPTION (Opt_console)) 1334 if (option (Opt_console))
1408 { /* be virtual console, fail silently */ 1335 { /* be virtual console, fail silently */
1409#ifdef TIOCCONS 1336#ifdef TIOCCONS
1410 unsigned int on = 1; 1337 unsigned int on = 1;
1411 1338
1412 ioctl (STDIN_FILENO, TIOCCONS, &on); 1339 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1459 const char *argv0, *shell; 1386 const char *argv0, *shell;
1460 1387
1461 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1388 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1462 shell = "/bin/sh"; 1389 shell = "/bin/sh";
1463 1390
1464 argv0 = (const char *)rxvt_r_basename (shell); 1391 argv0 = (const char *)rxvt_basename (shell);
1465 1392
1466 if (OPTION (Opt_loginShell)) 1393 if (option (Opt_loginShell))
1467 { 1394 {
1468 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1395 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1469 1396
1470 login[0] = '-'; 1397 login[0] = '-';
1471 strcpy (&login[1], argv0); 1398 strcpy (&login[1], argv0);
1472 argv0 = login; 1399 argv0 = login;
1473 } 1400 }

Diff Legend

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