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.176 by root, Sat Jan 20 00:40:23 2007 UTC vs.
Revision 1.212 by sasha, Wed Sep 12 21:06:08 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;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50;
212 bgPixmap.pixmap = None;
213#endif
214
215 last_bot = last_state = -1; 204 last_bot = last_state = -1;
205
206 set_option (Opt_scrollBar);
207 set_option (Opt_scrollTtyOutput);
208 set_option (Opt_jumpScroll);
209 set_option (Opt_skipScroll);
210 set_option (Opt_secondaryScreen);
211 set_option (Opt_secondaryScroll);
212 set_option (Opt_pastableTabs);
213 set_option (Opt_intensityStyles);
214 set_option (Opt_iso14755_52);
216 215
217 return true; 216 return true;
218} 217}
219 218
220void 219void
… …
254/*----------------------------------------------------------------------*/ 253/*----------------------------------------------------------------------*/
255const char ** 254const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 255rxvt_term::init_resources (int argc, const char *const *argv)
257{ 256{
258 int i, r_argc; 257 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 258 const char **cmd_argv, **r_argv;
261 259
262 /* 260 /*
263 * Look for -e option. Find => split and make cmd_argv[] of command args 261 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 262 */
… …
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 281 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284 282
285 cmd_argv[i] = NULL; 283 cmd_argv[i] = NULL;
286 } 284 }
287 285
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 286 rs[Rs_name] = rxvt_basename (argv[0]);
289 287
290 /* 288 /*
291 * Open display, get options/resources and create the window 289 * Open display, get options/resources and create the window
292 */ 290 */
293 291
… …
308#if XFT 306#if XFT
309 if (rs[Rs_depth]) 307 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0)); 308 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif 309#endif
312 310
311#ifdef HAVE_AFTERIMAGE
312 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
313#endif
313 free (r_argv); 314 free (r_argv);
314 315
315 for (int i = NUM_RESOURCES; i--; ) 316 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 317 if (rs [i] == resval_undef)
317 rs [i] = 0; 318 rs [i] = 0;
… …
333 * set any defaults not already set 334 * set any defaults not already set
334 */ 335 */
335 if (cmd_argv && cmd_argv[0]) 336 if (cmd_argv && cmd_argv[0])
336 { 337 {
337 if (!rs[Rs_title]) 338 if (!rs[Rs_title])
338 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 339 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
339 if (!rs[Rs_iconName]) 340 if (!rs[Rs_iconName])
340 rs[Rs_iconName] = rs[Rs_title]; 341 rs[Rs_iconName] = rs[Rs_title];
341 } 342 }
342 else 343 else
343 { 344 {
… …
381 rs[Rs_cutchars] = CUTCHARS; 382 rs[Rs_cutchars] = CUTCHARS;
382 383
383#ifndef NO_BACKSPACE_KEY 384#ifndef NO_BACKSPACE_KEY
384 if (!rs[Rs_backspace_key]) 385 if (!rs[Rs_backspace_key])
385# ifdef DEFAULT_BACKSPACE 386# ifdef DEFAULT_BACKSPACE
386 key_backspace = DEFAULT_BACKSPACE; 387 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
387# else 388# else
388 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 389 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
389# endif 390# endif
390 else
391 {
392 val = strdup (rs[Rs_backspace_key]);
393 rxvt_Str_trim (val);
394 rxvt_Str_escaped (val);
395 key_backspace = val;
396 }
397#endif 391#endif
398 392
399#ifndef NO_DELETE_KEY 393#ifndef NO_DELETE_KEY
400 if (!rs[Rs_delete_key]) 394 if (!rs[Rs_delete_key])
401# ifdef DEFAULT_DELETE 395# ifdef DEFAULT_DELETE
402 key_delete = DEFAULT_DELETE; 396 rs[Rs_delete_key] = DEFAULT_DELETE;
403# else 397# else
404 key_delete = "\033[3~"; 398 rs[Rs_delete_key] = "\033[3~";
405# endif
406 else
407 {
408 val = strdup (rs[Rs_delete_key]);
409 rxvt_Str_trim (val);
410 rxvt_Str_escaped (val);
411 key_delete = val;
412 }
413#endif 399# endif
414 if (rs[Rs_answerbackstring]) 400#endif
415 {
416 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
417 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
418 }
419 401
420#ifdef HAVE_SCROLLBARS 402#ifdef HAVE_SCROLLBARS
421 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 403 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
422#endif 404#endif
423 405
424#ifdef XTERM_REVERSE_VIDEO 406#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 407 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 408 if (option (Opt_reverseVideo))
427 { 409 {
428 if (!rs[Rs_color + Color_fg]) 410 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 411 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 412
431 if (!rs[Rs_color + Color_bg]) 413 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 419 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 420 rs[Rs_color + i] = def_colorName[i];
439 421
440#ifndef XTERM_REVERSE_VIDEO 422#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 423 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 424 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 425 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 426#endif
445 427
446 /* convenient aliases for setting fg/bg to colors */ 428 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 429 color_aliases (Color_fg);
… …
468/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
469void 451void
470rxvt_term::init_env () 452rxvt_term::init_env ()
471{ 453{
472 int i; 454 int i;
473 unsigned int u;
474 char *val; 455 char *val;
475 456
476#ifdef DISPLAY_IS_IP 457#ifdef DISPLAY_IS_IP
477 /* Fixup display_name for export over pty to any interested terminal 458 /* 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 459 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
493 474
494 if (rs[Rs_display_name] == NULL) 475 if (rs[Rs_display_name] == NULL)
495 rs[Rs_display_name] = val; /* use broken `:0' value */ 476 rs[Rs_display_name] = val; /* use broken `:0' value */
496 477
497 i = strlen (val); 478 i = strlen (val);
498 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 479 env_display = (char *)rxvt_malloc (i + 9);
499 480
500 sprintf (env_display, "DISPLAY=%s", val); 481 sprintf (env_display, "DISPLAY=%s", val);
501 482
502 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 483 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
503 484
… …
524 else 505 else
525 putenv ("COLORTERM=" COLORTERMENVFULL); 506 putenv ("COLORTERM=" COLORTERMENVFULL);
526 507
527 if (rs[Rs_term_name] != NULL) 508 if (rs[Rs_term_name] != NULL)
528 { 509 {
529 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 510 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
530 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 511 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
531 putenv (env_term); 512 putenv (env_term);
532 } 513 }
533 else 514 else
534 putenv ("TERM=" TERMENV); 515 putenv ("TERM=" TERMENV);
… …
621 * Initialize the command connection. 602 * Initialize the command connection.
622 * This should be called after the X server connection is established. 603 * This should be called after the X server connection is established.
623 */ 604 */
624 605
625#ifdef META8_OPTION 606#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 607 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 608#endif
628 609
629 get_ourmods (); 610 get_ourmods ();
630 611
631 if (!OPTION (Opt_scrollTtyOutput)) 612 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 613 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 614 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 615 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 616 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 617 priv_modes |= PrivMode_smoothScroll;
637 618
638#ifndef NO_BACKSPACE_KEY 619#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 620 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 621 priv_modes |= PrivMode_HaveBackSpace;
641#endif 622#endif
642 623
643 /* add value for scrollBar */ 624 /* add value for scrollBar */
644 if (scrollBar.state) 625 if (scrollBar.state)
… …
670 rxvt_color xcol; 651 rxvt_color xcol;
671 652
672 if (!set_color (xcol, name)) 653 if (!set_color (xcol, name))
673 { 654 {
674#ifndef XTERM_REVERSE_VIDEO 655#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 656 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 657 name = def_colorName [1 - i];
677 else 658 else
678#endif 659#endif
679 name = def_colorName [i]; 660 name = def_colorName [i];
680 661
… …
871rxvt_term::create_windows (int argc, const char *const *argv) 852rxvt_term::create_windows (int argc, const char *const *argv)
872{ 853{
873 XClassHint classHint; 854 XClassHint classHint;
874 XWMHints wmHint; 855 XWMHints wmHint;
875#if ENABLE_FRILLS 856#if ENABLE_FRILLS
876 MWMHints mwmhints; 857 MWMHints mwmhints = { };
877#endif 858#endif
878 XGCValues gcvalue; 859 XGCValues gcvalue;
879 XSetWindowAttributes attributes; 860 XSetWindowAttributes attributes;
880 Window top, parent; 861 Window top, parent;
881 862
… …
887 if (!set_fonts ()) 868 if (!set_fonts ())
888 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 869 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
889 870
890 parent = display->root; 871 parent = display->root;
891 872
892 attributes.override_redirect = !!OPTION (Opt_override_redirect); 873 attributes.override_redirect = !!option (Opt_override_redirect);
893 874
894#if ENABLE_FRILLS 875#if ENABLE_FRILLS
895 if (OPTION (Opt_borderLess)) 876 if (option (Opt_borderLess))
896 { 877 {
897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 878 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
898 { 879 {
899 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 880 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
900 attributes.override_redirect = true; 881 attributes.override_redirect = true;
901 mwmhints.flags = 0;
902 } 882 }
903 else 883 else
904 { 884 {
905 mwmhints.flags = MWM_HINTS_DECORATIONS; 885 mwmhints.flags = MWM_HINTS_DECORATIONS;
906 mwmhints.decorations = 0;
907 } 886 }
908 } 887 }
909 else
910 mwmhints.flags = 0;
911#endif 888#endif
912 889
913#if ENABLE_XEMBED 890#if ENABLE_XEMBED
914 if (rs[Rs_embed]) 891 if (rs[Rs_embed])
915 { 892 {
… …
950 classHint.res_name = (char *)rs[Rs_name]; 927 classHint.res_name = (char *)rs[Rs_name];
951 classHint.res_class = (char *)RESCLASS; 928 classHint.res_class = (char *)RESCLASS;
952 929
953 wmHint.flags = InputHint | StateHint | WindowGroupHint; 930 wmHint.flags = InputHint | StateHint | WindowGroupHint;
954 wmHint.input = True; 931 wmHint.input = True;
955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 932 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
956 wmHint.window_group = top; 933 wmHint.window_group = top;
957 934
958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 935 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959 &szHint, &wmHint, &classHint); 936 &szHint, &wmHint, &classHint);
960 937
… …
1017 attributes.bit_gravity = NorthWestGravity; 994 attributes.bit_gravity = NorthWestGravity;
1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 995 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1019 996
1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 997 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1021 998
1022 if (OPTION (Opt_pointerBlank)) 999 if (option (Opt_pointerBlank))
1023 vt_emask |= PointerMotionMask; 1000 vt_emask |= PointerMotionMask;
1024 else 1001 else
1025 vt_emask |= Button1MotionMask | Button3MotionMask; 1002 vt_emask |= Button1MotionMask | Button3MotionMask;
1026 1003
1027 vt_select_input (); 1004 vt_select_input ();
1028 1005
1029 vt_ev.start (display, vt); 1006 vt_ev.start (display, vt);
1030
1031#ifdef XPM_BACKGROUND
1032 if (rs[Rs_backgroundPixmap] != NULL
1033 && !OPTION (Opt_transparent))
1034 {
1035 const char *p = rs[Rs_backgroundPixmap];
1036
1037 if ((p = strchr (p, ';')) != NULL)
1038 {
1039 p++;
1040 scale_pixmap (p);
1041 }
1042
1043 set_bgPixmap (rs[Rs_backgroundPixmap]);
1044 scr_touch (true);
1045 }
1046#endif
1047 1007
1048 /* graphics context for the vt window */ 1008 /* graphics context for the vt window */
1049 gcvalue.foreground = pix_colors[Color_fg]; 1009 gcvalue.foreground = pix_colors[Color_fg];
1050 gcvalue.background = pix_colors[Color_bg]; 1010 gcvalue.background = pix_colors[Color_bg];
1051 gcvalue.graphics_exposures = 0; 1011 gcvalue.graphics_exposures = 0;
… …
1079 * GET TTY CURRENT STATE * 1039 * GET TTY CURRENT STATE *
1080 * ------------------------------------------------------------------------- */ 1040 * ------------------------------------------------------------------------- */
1081void 1041void
1082rxvt_get_ttymode (ttymode_t *tio, int erase) 1042rxvt_get_ttymode (ttymode_t *tio, int erase)
1083{ 1043{
1084#ifdef HAVE_TERMIOS_H
1085 /* 1044 /*
1086 * standard System V termios interface 1045 * standard System V termios interface
1087 */ 1046 */
1088 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1047 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1089 { 1048 {
… …
1156 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1115 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1157# if defined (ECHOCTL) && defined (ECHOKE) 1116# if defined (ECHOCTL) && defined (ECHOKE)
1158 | ECHOCTL | ECHOKE 1117 | ECHOCTL | ECHOKE
1159# endif 1118# endif
1160 | ECHOE | ECHOK); 1119 | ECHOE | ECHOK);
1161# else /* HAVE_TERMIOS_H */
1162
1163 /*
1164 * sgtty interface
1165 */
1166
1167 /* get parameters -- gtty */
1168 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1169 {
1170 tio->sg.sg_erase = CERASE; /* ^H */
1171 tio->sg.sg_kill = CKILL; /* ^U */
1172 }
1173
1174 if (erase != -1)
1175 tio->sg.sg_erase = (char)erase;
1176
1177 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1178
1179 /* get special characters */
1180 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1181 {
1182 tio->tc.t_intrc = CINTR; /* ^C */
1183 tio->tc.t_quitc = CQUIT; /* ^\ */
1184 tio->tc.t_startc = CSTART; /* ^Q */
1185 tio->tc.t_stopc = CSTOP; /* ^S */
1186 tio->tc.t_eofc = CEOF; /* ^D */
1187 tio->tc.t_brkc = -1;
1188 }
1189
1190 /* get local special chars */
1191 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1192 {
1193 tio->lc.t_suspc = CSUSP; /* ^Z */
1194 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1195 tio->lc.t_rprntc = CRPRNT; /* ^R */
1196 tio->lc.t_flushc = CFLUSH; /* ^O */
1197 tio->lc.t_werasc = CWERASE; /* ^W */
1198 tio->lc.t_lnextc = CLNEXT; /* ^V */
1199 }
1200 /* get line discipline */
1201 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1202# ifdef NTTYDISC
1203 tio->line = NTTYDISC;
1204# endif /* NTTYDISC */
1205
1206 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1207#endif /* HAVE_TERMIOS_H */
1208 1120
1209 /* 1121 /*
1210 * Debugging 1122 * Debugging
1211 */ 1123 */
1212#ifdef DEBUG_TTYMODE 1124#ifdef DEBUG_TTYMODE
… …
1316 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1228 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1317 1229
1318 int er; 1230 int er;
1319 1231
1320#ifndef NO_BACKSPACE_KEY 1232#ifndef NO_BACKSPACE_KEY
1321 if (key_backspace[0] && !key_backspace[1]) 1233 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1322 er = key_backspace[0]; 1234 er = rs[Rs_backspace_key][0];
1323 else if (strcmp (key_backspace, "DEC") == 0) 1235 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1324 er = '\177'; /* the initial state anyway */ 1236 er = '\177'; /* the initial state anyway */
1325 else 1237 else
1326#endif 1238#endif
1327 er = -1; 1239 er = -1;
1328 1240
1329 rxvt_get_ttymode (&tio, er); 1241 rxvt_get_ttymode (&tio, er);
1242 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1330 pty->set_utf8_mode (enc_utf8); 1243 pty->set_utf8_mode (enc_utf8);
1331 SET_TTYMODE (pty->tty, &tio); /* init terminal attributes */
1332 1244
1333 /* set initial window size */ 1245 /* set initial window size */
1334 tt_winch (); 1246 tt_winch ();
1335 1247
1336#if ENABLE_FRILLS 1248#if ENABLE_FRILLS
… …
1370 } 1282 }
1371 1283
1372 _exit (EXIT_FAILURE); 1284 _exit (EXIT_FAILURE);
1373 1285
1374 default: 1286 default:
1375 if (!OPTION (Opt_utmpInhibit)) 1287 if (!option (Opt_utmpInhibit))
1376 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1288 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1377 1289
1378 pty->close_tty (); 1290 pty->close_tty ();
1379 1291
1380 child_ev.start (cmd_pid); 1292 child_ev.start (cmd_pid);
1381 1293
… …
1394int 1306int
1395rxvt_term::run_child (const char *const *argv) 1307rxvt_term::run_child (const char *const *argv)
1396{ 1308{
1397 char *login; 1309 char *login;
1398 1310
1399 if (OPTION (Opt_console)) 1311 if (option (Opt_console))
1400 { /* be virtual console, fail silently */ 1312 { /* be virtual console, fail silently */
1401#ifdef TIOCCONS 1313#ifdef TIOCCONS
1402 unsigned int on = 1; 1314 unsigned int on = 1;
1403 1315
1404 ioctl (STDIN_FILENO, TIOCCONS, &on); 1316 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1451 const char *argv0, *shell; 1363 const char *argv0, *shell;
1452 1364
1453 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1365 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1454 shell = "/bin/sh"; 1366 shell = "/bin/sh";
1455 1367
1456 argv0 = (const char *)rxvt_r_basename (shell); 1368 argv0 = (const char *)rxvt_basename (shell);
1457 1369
1458 if (OPTION (Opt_loginShell)) 1370 if (option (Opt_loginShell))
1459 { 1371 {
1460 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1372 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1461 1373
1462 login[0] = '-'; 1374 login[0] = '-';
1463 strcpy (&login[1], argv0); 1375 strcpy (&login[1], argv0);
1464 argv0 = login; 1376 argv0 = login;
1465 } 1377 }

Diff Legend

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