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.173 by root, Wed Jul 5 20:31:48 2006 UTC vs.
Revision 1.209 by ayin, Sat Sep 8 20:54:50 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
… …
308#if XFT 319#if XFT
309 if (rs[Rs_depth]) 320 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0)); 321 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif 322#endif
312 323
324#ifdef HAVE_AFTERIMAGE
325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
313 free (r_argv); 327 free (r_argv);
314 328
315 for (int i = NUM_RESOURCES; i--; ) 329 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 330 if (rs [i] == resval_undef)
317 rs [i] = 0; 331 rs [i] = 0;
… …
388 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 402 key_backspace = "DEC"; /* can toggle between \010 or \177 */
389# endif 403# endif
390 else 404 else
391 { 405 {
392 val = strdup (rs[Rs_backspace_key]); 406 val = strdup (rs[Rs_backspace_key]);
393 rxvt_Str_trim (val);
394 rxvt_Str_escaped (val);
395 key_backspace = val; 407 key_backspace = val;
396 } 408 }
397#endif 409#endif
398 410
399#ifndef NO_DELETE_KEY 411#ifndef NO_DELETE_KEY
… …
404 key_delete = "\033[3~"; 416 key_delete = "\033[3~";
405# endif 417# endif
406 else 418 else
407 { 419 {
408 val = strdup (rs[Rs_delete_key]); 420 val = strdup (rs[Rs_delete_key]);
409 rxvt_Str_trim (val);
410 rxvt_Str_escaped (val);
411 key_delete = val; 421 key_delete = val;
412 } 422 }
413#endif 423#endif
414 if (rs[Rs_answerbackstring])
415 {
416 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
417 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
418 }
419 424
420#ifdef HAVE_SCROLLBARS 425#ifdef HAVE_SCROLLBARS
421 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]);
422#endif 427#endif
423 428
424#ifdef XTERM_REVERSE_VIDEO 429#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 430 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 431 if (option (Opt_reverseVideo))
427 { 432 {
428 if (!rs[Rs_color + Color_fg]) 433 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 434 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 435
431 if (!rs[Rs_color + Color_bg]) 436 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 442 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 443 rs[Rs_color + i] = def_colorName[i];
439 444
440#ifndef XTERM_REVERSE_VIDEO 445#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 446 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 447 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 448 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 449#endif
445 450
446 /* convenient aliases for setting fg/bg to colors */ 451 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 452 color_aliases (Color_fg);
… …
468/*----------------------------------------------------------------------*/ 473/*----------------------------------------------------------------------*/
469void 474void
470rxvt_term::init_env () 475rxvt_term::init_env ()
471{ 476{
472 int i; 477 int i;
473 unsigned int u;
474 char *val; 478 char *val;
475 479
476#ifdef DISPLAY_IS_IP 480#ifdef DISPLAY_IS_IP
477 /* Fixup display_name for export over pty to any interested terminal 481 /* Fixup display_name for export over pty to any interested terminal
478 * 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
… …
493 497
494 if (rs[Rs_display_name] == NULL) 498 if (rs[Rs_display_name] == NULL)
495 rs[Rs_display_name] = val; /* use broken `:0' value */ 499 rs[Rs_display_name] = val; /* use broken `:0' value */
496 500
497 i = strlen (val); 501 i = strlen (val);
498 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 502 env_display = (char *)rxvt_malloc (i + 9);
499 503
500 sprintf (env_display, "DISPLAY=%s", val); 504 sprintf (env_display, "DISPLAY=%s", val);
501 505
502 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 506 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
503 507
… …
524 else 528 else
525 putenv ("COLORTERM=" COLORTERMENVFULL); 529 putenv ("COLORTERM=" COLORTERMENVFULL);
526 530
527 if (rs[Rs_term_name] != NULL) 531 if (rs[Rs_term_name] != NULL)
528 { 532 {
529 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);
530 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 534 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
531 putenv (env_term); 535 putenv (env_term);
532 } 536 }
533 else 537 else
534 putenv ("TERM=" TERMENV); 538 putenv ("TERM=" TERMENV);
… …
621 * Initialize the command connection. 625 * Initialize the command connection.
622 * This should be called after the X server connection is established. 626 * This should be called after the X server connection is established.
623 */ 627 */
624 628
625#ifdef META8_OPTION 629#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 630 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 631#endif
628 632
629 get_ourmods (); 633 get_ourmods ();
630 634
631 if (!OPTION (Opt_scrollTtyOutput)) 635 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 636 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 637 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 638 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 639 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 640 priv_modes |= PrivMode_smoothScroll;
637 641
638#ifndef NO_BACKSPACE_KEY 642#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 643 if (strcmp (key_backspace, "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 644 priv_modes |= PrivMode_HaveBackSpace;
… …
670 rxvt_color xcol; 674 rxvt_color xcol;
671 675
672 if (!set_color (xcol, name)) 676 if (!set_color (xcol, name))
673 { 677 {
674#ifndef XTERM_REVERSE_VIDEO 678#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 679 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 680 name = def_colorName [1 - i];
677 else 681 else
678#endif 682#endif
679 name = def_colorName [i]; 683 name = def_colorName [i];
680 684
… …
748 alias_color (Color_topShadow, Color_White); 752 alias_color (Color_topShadow, Color_White);
749 } 753 }
750#endif /* KEEP_SCROLLCOLOR */ 754#endif /* KEEP_SCROLLCOLOR */
751 755
752#ifdef OFF_FOCUS_FADING 756#ifdef OFF_FOCUS_FADING
753 if (rs[Rs_fade])
754 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 757 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
755 { 758 update_fade_color (i);
756 rgba c;
757 pix_colors [Color_fade].get (c);
758 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
759 }
760#endif 759#endif
761} 760}
762 761
763/*----------------------------------------------------------------------*/ 762/*----------------------------------------------------------------------*/
764/* color aliases, fg/bg bright-bold */ 763/* color aliases, fg/bg bright-bold */
… …
876rxvt_term::create_windows (int argc, const char *const *argv) 875rxvt_term::create_windows (int argc, const char *const *argv)
877{ 876{
878 XClassHint classHint; 877 XClassHint classHint;
879 XWMHints wmHint; 878 XWMHints wmHint;
880#if ENABLE_FRILLS 879#if ENABLE_FRILLS
881 MWMHints mwmhints; 880 MWMHints mwmhints = { };
882#endif 881#endif
883 XGCValues gcvalue; 882 XGCValues gcvalue;
884 XSetWindowAttributes attributes; 883 XSetWindowAttributes attributes;
885 Window top, parent; 884 Window top, parent;
886 885
… …
892 if (!set_fonts ()) 891 if (!set_fonts ())
893 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");
894 893
895 parent = display->root; 894 parent = display->root;
896 895
897 attributes.override_redirect = !!OPTION (Opt_override_redirect); 896 attributes.override_redirect = !!option (Opt_override_redirect);
898 897
899#if ENABLE_FRILLS 898#if ENABLE_FRILLS
900 if (OPTION (Opt_borderLess)) 899 if (option (Opt_borderLess))
901 { 900 {
902 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 901 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
903 { 902 {
904 /* 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");
905 attributes.override_redirect = true; 904 attributes.override_redirect = true;
906 mwmhints.flags = 0;
907 } 905 }
908 else 906 else
909 { 907 {
910 mwmhints.flags = MWM_HINTS_DECORATIONS; 908 mwmhints.flags = MWM_HINTS_DECORATIONS;
911 mwmhints.decorations = 0;
912 } 909 }
913 } 910 }
914 else
915 mwmhints.flags = 0;
916#endif 911#endif
917 912
918#if ENABLE_XEMBED 913#if ENABLE_XEMBED
919 if (rs[Rs_embed]) 914 if (rs[Rs_embed])
920 { 915 {
… …
955 classHint.res_name = (char *)rs[Rs_name]; 950 classHint.res_name = (char *)rs[Rs_name];
956 classHint.res_class = (char *)RESCLASS; 951 classHint.res_class = (char *)RESCLASS;
957 952
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 (dpy, 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
… …
1022 attributes.bit_gravity = NorthWestGravity; 1017 attributes.bit_gravity = NorthWestGravity;
1023 XChangeWindowAttributes (dpy, 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;
1029 else 1024 else
1030 vt_emask |= Button1MotionMask | Button3MotionMask; 1025 vt_emask |= Button1MotionMask | Button3MotionMask;
1031 1026
1032 vt_select_input (); 1027 vt_select_input ();
1033 1028
1034 vt_ev.start (display, vt); 1029 vt_ev.start (display, vt);
1035
1036#ifdef XPM_BACKGROUND
1037 if (rs[Rs_backgroundPixmap] != NULL
1038 && !OPTION (Opt_transparent))
1039 {
1040 const char *p = rs[Rs_backgroundPixmap];
1041
1042 if ((p = strchr (p, ';')) != NULL)
1043 {
1044 p++;
1045 scale_pixmap (p);
1046 }
1047
1048 set_bgPixmap (rs[Rs_backgroundPixmap]);
1049 scr_touch (true);
1050 }
1051#endif
1052 1030
1053 /* graphics context for the vt window */ 1031 /* graphics context for the vt window */
1054 gcvalue.foreground = pix_colors[Color_fg]; 1032 gcvalue.foreground = pix_colors[Color_fg];
1055 gcvalue.background = pix_colors[Color_bg]; 1033 gcvalue.background = pix_colors[Color_bg];
1056 gcvalue.graphics_exposures = 0; 1034 gcvalue.graphics_exposures = 0;
… …
1084 * GET TTY CURRENT STATE * 1062 * GET TTY CURRENT STATE *
1085 * ------------------------------------------------------------------------- */ 1063 * ------------------------------------------------------------------------- */
1086void 1064void
1087rxvt_get_ttymode (ttymode_t *tio, int erase) 1065rxvt_get_ttymode (ttymode_t *tio, int erase)
1088{ 1066{
1089#ifdef HAVE_TERMIOS_H
1090 /* 1067 /*
1091 * standard System V termios interface 1068 * standard System V termios interface
1092 */ 1069 */
1093 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1070 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1094 { 1071 {
… …
1161 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1138 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1162# if defined (ECHOCTL) && defined (ECHOKE) 1139# if defined (ECHOCTL) && defined (ECHOKE)
1163 | ECHOCTL | ECHOKE 1140 | ECHOCTL | ECHOKE
1164# endif 1141# endif
1165 | ECHOE | ECHOK); 1142 | ECHOE | ECHOK);
1166# else /* HAVE_TERMIOS_H */
1167
1168 /*
1169 * sgtty interface
1170 */
1171
1172 /* get parameters -- gtty */
1173 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1174 {
1175 tio->sg.sg_erase = CERASE; /* ^H */
1176 tio->sg.sg_kill = CKILL; /* ^U */
1177 }
1178
1179 if (erase != -1)
1180 tio->sg.sg_erase = (char)erase;
1181
1182 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1183
1184 /* get special characters */
1185 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1186 {
1187 tio->tc.t_intrc = CINTR; /* ^C */
1188 tio->tc.t_quitc = CQUIT; /* ^\ */
1189 tio->tc.t_startc = CSTART; /* ^Q */
1190 tio->tc.t_stopc = CSTOP; /* ^S */
1191 tio->tc.t_eofc = CEOF; /* ^D */
1192 tio->tc.t_brkc = -1;
1193 }
1194
1195 /* get local special chars */
1196 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1197 {
1198 tio->lc.t_suspc = CSUSP; /* ^Z */
1199 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1200 tio->lc.t_rprntc = CRPRNT; /* ^R */
1201 tio->lc.t_flushc = CFLUSH; /* ^O */
1202 tio->lc.t_werasc = CWERASE; /* ^W */
1203 tio->lc.t_lnextc = CLNEXT; /* ^V */
1204 }
1205 /* get line discipline */
1206 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1207# ifdef NTTYDISC
1208 tio->line = NTTYDISC;
1209# endif /* NTTYDISC */
1210
1211 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1212#endif /* HAVE_TERMIOS_H */
1213 1143
1214 /* 1144 /*
1215 * Debugging 1145 * Debugging
1216 */ 1146 */
1217#ifdef DEBUG_TTYMODE 1147#ifdef DEBUG_TTYMODE
… …
1318 else 1248 else
1319#endif 1249#endif
1320 if (!pty->get ()) 1250 if (!pty->get ())
1321 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1251 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1322 1252
1323 pty->set_utf8_mode (enc_utf8);
1324
1325 /* set initial window size */
1326 tt_winch ();
1327
1328 int er; 1253 int er;
1329 1254
1330#ifndef NO_BACKSPACE_KEY 1255#ifndef NO_BACKSPACE_KEY
1331 if (key_backspace[0] && !key_backspace[1]) 1256 if (key_backspace[0] && !key_backspace[1])
1332 er = key_backspace[0]; 1257 er = key_backspace[0];
… …
1335 else 1260 else
1336#endif 1261#endif
1337 er = -1; 1262 er = -1;
1338 1263
1339 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 ();
1340 1270
1341#if ENABLE_FRILLS 1271#if ENABLE_FRILLS
1342 if (rs[Rs_pty_fd]) 1272 if (rs[Rs_pty_fd])
1343 return; 1273 return;
1344#endif 1274#endif
… …
1375 } 1305 }
1376 1306
1377 _exit (EXIT_FAILURE); 1307 _exit (EXIT_FAILURE);
1378 1308
1379 default: 1309 default:
1380 if (!OPTION (Opt_utmpInhibit)) 1310 if (!option (Opt_utmpInhibit))
1381 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1311 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1382 1312
1383 pty->close_tty (); 1313 pty->close_tty ();
1384 1314
1385 child_ev.start (cmd_pid); 1315 child_ev.start (cmd_pid);
1386 1316
… …
1399int 1329int
1400rxvt_term::run_child (const char *const *argv) 1330rxvt_term::run_child (const char *const *argv)
1401{ 1331{
1402 char *login; 1332 char *login;
1403 1333
1404 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1405
1406 if (OPTION (Opt_console)) 1334 if (option (Opt_console))
1407 { /* be virtual console, fail silently */ 1335 { /* be virtual console, fail silently */
1408#ifdef TIOCCONS 1336#ifdef TIOCCONS
1409 unsigned int on = 1; 1337 unsigned int on = 1;
1410 1338
1411 ioctl (STDIN_FILENO, TIOCCONS, &on); 1339 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1460 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1388 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1461 shell = "/bin/sh"; 1389 shell = "/bin/sh";
1462 1390
1463 argv0 = (const char *)rxvt_r_basename (shell); 1391 argv0 = (const char *)rxvt_r_basename (shell);
1464 1392
1465 if (OPTION (Opt_loginShell)) 1393 if (option (Opt_loginShell))
1466 { 1394 {
1467 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1395 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1468 1396
1469 login[0] = '-'; 1397 login[0] = '-';
1470 strcpy (&login[1], argv0); 1398 strcpy (&login[1], argv0);
1471 argv0 = login; 1399 argv0 = login;
1472 } 1400 }

Diff Legend

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