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.171 by root, Mon Feb 20 20:44:22 2006 UTC vs.
Revision 1.211 by ayin, Sun Sep 9 10:14:40 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>
… …
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
… …
254/*----------------------------------------------------------------------*/ 265/*----------------------------------------------------------------------*/
255const char ** 266const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 267rxvt_term::init_resources (int argc, const char *const *argv)
257{ 268{
258 int i, r_argc; 269 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 270 const char **cmd_argv, **r_argv;
261 271
262 /* 272 /*
263 * Look for -e option. Find => split and make cmd_argv[] of command args 273 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 274 */
… …
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 293 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284 294
285 cmd_argv[i] = NULL; 295 cmd_argv[i] = NULL;
286 } 296 }
287 297
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 298 rs[Rs_name] = rxvt_basename (argv[0]);
289 299
290 /* 300 /*
291 * Open display, get options/resources and create the window 301 * Open display, get options/resources and create the window
292 */ 302 */
293 303
… …
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 310 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 311
302 // using a local pointer decreases code size a lot 312 // using a local pointer decreases code size a lot
303 xa = display->xa; 313 xa = display->xa;
304 314
315 set (display);
316 extract_resources ();
317
305#if XFT 318#if XFT
306 if (rs[Rs_depth]) 319 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0)); 320 select_visual (strtol (rs[Rs_depth], 0, 0));
308 else
309#endif 321#endif
310 set (display);
311 322
312 extract_resources (); 323#ifdef HAVE_AFTERIMAGE
313 324 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
325#endif
314 free (r_argv); 326 free (r_argv);
315 327
316 for (int i = NUM_RESOURCES; i--; ) 328 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 329 if (rs [i] == resval_undef)
318 rs [i] = 0; 330 rs [i] = 0;
… …
334 * set any defaults not already set 346 * set any defaults not already set
335 */ 347 */
336 if (cmd_argv && cmd_argv[0]) 348 if (cmd_argv && cmd_argv[0])
337 { 349 {
338 if (!rs[Rs_title]) 350 if (!rs[Rs_title])
339 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 351 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
340 if (!rs[Rs_iconName]) 352 if (!rs[Rs_iconName])
341 rs[Rs_iconName] = rs[Rs_title]; 353 rs[Rs_iconName] = rs[Rs_title];
342 } 354 }
343 else 355 else
344 { 356 {
… …
382 rs[Rs_cutchars] = CUTCHARS; 394 rs[Rs_cutchars] = CUTCHARS;
383 395
384#ifndef NO_BACKSPACE_KEY 396#ifndef NO_BACKSPACE_KEY
385 if (!rs[Rs_backspace_key]) 397 if (!rs[Rs_backspace_key])
386# ifdef DEFAULT_BACKSPACE 398# ifdef DEFAULT_BACKSPACE
387 key_backspace = DEFAULT_BACKSPACE; 399 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
388# else 400# else
389 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 401 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
390# endif 402# endif
391 else
392 {
393 val = strdup (rs[Rs_backspace_key]);
394 rxvt_Str_trim (val);
395 rxvt_Str_escaped (val);
396 key_backspace = val;
397 }
398#endif 403#endif
399 404
400#ifndef NO_DELETE_KEY 405#ifndef NO_DELETE_KEY
401 if (!rs[Rs_delete_key]) 406 if (!rs[Rs_delete_key])
402# ifdef DEFAULT_DELETE 407# ifdef DEFAULT_DELETE
403 key_delete = DEFAULT_DELETE; 408 rs[Rs_delete_key] = DEFAULT_DELETE;
404# else 409# else
405 key_delete = "\033[3~"; 410 rs[Rs_delete_key] = "\033[3~";
406# endif
407 else
408 {
409 val = strdup (rs[Rs_delete_key]);
410 rxvt_Str_trim (val);
411 rxvt_Str_escaped (val);
412 key_delete = val;
413 }
414#endif 411# endif
415 if (rs[Rs_answerbackstring]) 412#endif
416 {
417 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
418 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
419 }
420 413
421#ifdef HAVE_SCROLLBARS 414#ifdef HAVE_SCROLLBARS
422 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 415 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
423#endif 416#endif
424 417
425#ifdef XTERM_REVERSE_VIDEO 418#ifdef XTERM_REVERSE_VIDEO
426 /* this is how xterm implements reverseVideo */ 419 /* this is how xterm implements reverseVideo */
427 if (OPTION (Opt_reverseVideo)) 420 if (option (Opt_reverseVideo))
428 { 421 {
429 if (!rs[Rs_color + Color_fg]) 422 if (!rs[Rs_color + Color_fg])
430 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 423 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431 424
432 if (!rs[Rs_color + Color_bg]) 425 if (!rs[Rs_color + Color_bg])
… …
438 if (!rs[Rs_color + i]) 431 if (!rs[Rs_color + i])
439 rs[Rs_color + i] = def_colorName[i]; 432 rs[Rs_color + i] = def_colorName[i];
440 433
441#ifndef XTERM_REVERSE_VIDEO 434#ifndef XTERM_REVERSE_VIDEO
442 /* this is how we implement reverseVideo */ 435 /* this is how we implement reverseVideo */
443 if (OPTION (Opt_reverseVideo)) 436 if (option (Opt_reverseVideo))
444 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 437 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
445#endif 438#endif
446 439
447 /* convenient aliases for setting fg/bg to colors */ 440 /* convenient aliases for setting fg/bg to colors */
448 color_aliases (Color_fg); 441 color_aliases (Color_fg);
… …
469/*----------------------------------------------------------------------*/ 462/*----------------------------------------------------------------------*/
470void 463void
471rxvt_term::init_env () 464rxvt_term::init_env ()
472{ 465{
473 int i; 466 int i;
474 unsigned int u;
475 char *val; 467 char *val;
476 468
477#ifdef DISPLAY_IS_IP 469#ifdef DISPLAY_IS_IP
478 /* Fixup display_name for export over pty to any interested terminal 470 /* 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 471 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
494 486
495 if (rs[Rs_display_name] == NULL) 487 if (rs[Rs_display_name] == NULL)
496 rs[Rs_display_name] = val; /* use broken `:0' value */ 488 rs[Rs_display_name] = val; /* use broken `:0' value */
497 489
498 i = strlen (val); 490 i = strlen (val);
499 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 491 env_display = (char *)rxvt_malloc (i + 9);
500 492
501 sprintf (env_display, "DISPLAY=%s", val); 493 sprintf (env_display, "DISPLAY=%s", val);
502 494
503 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 495 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
504 496
… …
525 else 517 else
526 putenv ("COLORTERM=" COLORTERMENVFULL); 518 putenv ("COLORTERM=" COLORTERMENVFULL);
527 519
528 if (rs[Rs_term_name] != NULL) 520 if (rs[Rs_term_name] != NULL)
529 { 521 {
530 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 522 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
531 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 523 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
532 putenv (env_term); 524 putenv (env_term);
533 } 525 }
534 else 526 else
535 putenv ("TERM=" TERMENV); 527 putenv ("TERM=" TERMENV);
… …
622 * Initialize the command connection. 614 * Initialize the command connection.
623 * This should be called after the X server connection is established. 615 * This should be called after the X server connection is established.
624 */ 616 */
625 617
626#ifdef META8_OPTION 618#ifdef META8_OPTION
627 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 619 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
628#endif 620#endif
629 621
630 get_ourmods (); 622 get_ourmods ();
631 623
632 if (!OPTION (Opt_scrollTtyOutput)) 624 if (!option (Opt_scrollTtyOutput))
633 priv_modes |= PrivMode_TtyOutputInh; 625 priv_modes |= PrivMode_TtyOutputInh;
634 if (OPTION (Opt_scrollTtyKeypress)) 626 if (option (Opt_scrollTtyKeypress))
635 priv_modes |= PrivMode_Keypress; 627 priv_modes |= PrivMode_Keypress;
636 if (!OPTION (Opt_jumpScroll)) 628 if (!option (Opt_jumpScroll))
637 priv_modes |= PrivMode_smoothScroll; 629 priv_modes |= PrivMode_smoothScroll;
638 630
639#ifndef NO_BACKSPACE_KEY 631#ifndef NO_BACKSPACE_KEY
640 if (strcmp (key_backspace, "DEC") == 0) 632 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
641 priv_modes |= PrivMode_HaveBackSpace; 633 priv_modes |= PrivMode_HaveBackSpace;
642#endif 634#endif
643 635
644 /* add value for scrollBar */ 636 /* add value for scrollBar */
645 if (scrollBar.state) 637 if (scrollBar.state)
… …
671 rxvt_color xcol; 663 rxvt_color xcol;
672 664
673 if (!set_color (xcol, name)) 665 if (!set_color (xcol, name))
674 { 666 {
675#ifndef XTERM_REVERSE_VIDEO 667#ifndef XTERM_REVERSE_VIDEO
676 if (i < 2 && OPTION (Opt_reverseVideo)) 668 if (i < 2 && option (Opt_reverseVideo))
677 name = def_colorName [1 - i]; 669 name = def_colorName [1 - i];
678 else 670 else
679#endif 671#endif
680 name = def_colorName [i]; 672 name = def_colorName [i];
681 673
… …
749 alias_color (Color_topShadow, Color_White); 741 alias_color (Color_topShadow, Color_White);
750 } 742 }
751#endif /* KEEP_SCROLLCOLOR */ 743#endif /* KEEP_SCROLLCOLOR */
752 744
753#ifdef OFF_FOCUS_FADING 745#ifdef OFF_FOCUS_FADING
754 if (rs[Rs_fade])
755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 746 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
756 { 747 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 748#endif
762} 749}
763 750
764/*----------------------------------------------------------------------*/ 751/*----------------------------------------------------------------------*/
765/* color aliases, fg/bg bright-bold */ 752/* color aliases, fg/bg bright-bold */
… …
877rxvt_term::create_windows (int argc, const char *const *argv) 864rxvt_term::create_windows (int argc, const char *const *argv)
878{ 865{
879 XClassHint classHint; 866 XClassHint classHint;
880 XWMHints wmHint; 867 XWMHints wmHint;
881#if ENABLE_FRILLS 868#if ENABLE_FRILLS
882 MWMHints mwmhints; 869 MWMHints mwmhints = { };
883#endif 870#endif
884 XGCValues gcvalue; 871 XGCValues gcvalue;
885 XSetWindowAttributes attributes; 872 XSetWindowAttributes attributes;
886 Window top, parent; 873 Window top, parent;
887 874
… …
893 if (!set_fonts ()) 880 if (!set_fonts ())
894 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 881 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
895 882
896 parent = display->root; 883 parent = display->root;
897 884
898 attributes.override_redirect = !!OPTION (Opt_override_redirect); 885 attributes.override_redirect = !!option (Opt_override_redirect);
899 886
900#if ENABLE_FRILLS 887#if ENABLE_FRILLS
901 if (OPTION (Opt_borderLess)) 888 if (option (Opt_borderLess))
902 { 889 {
903 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 890 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
904 { 891 {
905 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 892 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
906 attributes.override_redirect = true; 893 attributes.override_redirect = true;
907 mwmhints.flags = 0;
908 } 894 }
909 else 895 else
910 { 896 {
911 mwmhints.flags = MWM_HINTS_DECORATIONS; 897 mwmhints.flags = MWM_HINTS_DECORATIONS;
912 mwmhints.decorations = 0;
913 } 898 }
914 } 899 }
915 else
916 mwmhints.flags = 0;
917#endif 900#endif
918 901
919#if ENABLE_XEMBED 902#if ENABLE_XEMBED
920 if (rs[Rs_embed]) 903 if (rs[Rs_embed])
921 { 904 {
… …
956 classHint.res_name = (char *)rs[Rs_name]; 939 classHint.res_name = (char *)rs[Rs_name];
957 classHint.res_class = (char *)RESCLASS; 940 classHint.res_class = (char *)RESCLASS;
958 941
959 wmHint.flags = InputHint | StateHint | WindowGroupHint; 942 wmHint.flags = InputHint | StateHint | WindowGroupHint;
960 wmHint.input = True; 943 wmHint.input = True;
961 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 944 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
962 wmHint.window_group = top; 945 wmHint.window_group = top;
963 946
964 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 947 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
965 &szHint, &wmHint, &classHint); 948 &szHint, &wmHint, &classHint);
966 949
… …
1023 attributes.bit_gravity = NorthWestGravity; 1006 attributes.bit_gravity = NorthWestGravity;
1024 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1007 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1025 1008
1026 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1009 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1027 1010
1028 if (OPTION (Opt_pointerBlank)) 1011 if (option (Opt_pointerBlank))
1029 vt_emask |= PointerMotionMask; 1012 vt_emask |= PointerMotionMask;
1030 else 1013 else
1031 vt_emask |= Button1MotionMask | Button3MotionMask; 1014 vt_emask |= Button1MotionMask | Button3MotionMask;
1032 1015
1033 vt_select_input (); 1016 vt_select_input ();
1034 1017
1035 vt_ev.start (display, vt); 1018 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 1019
1054 /* graphics context for the vt window */ 1020 /* graphics context for the vt window */
1055 gcvalue.foreground = pix_colors[Color_fg]; 1021 gcvalue.foreground = pix_colors[Color_fg];
1056 gcvalue.background = pix_colors[Color_bg]; 1022 gcvalue.background = pix_colors[Color_bg];
1057 gcvalue.graphics_exposures = 0; 1023 gcvalue.graphics_exposures = 0;
… …
1085 * GET TTY CURRENT STATE * 1051 * GET TTY CURRENT STATE *
1086 * ------------------------------------------------------------------------- */ 1052 * ------------------------------------------------------------------------- */
1087void 1053void
1088rxvt_get_ttymode (ttymode_t *tio, int erase) 1054rxvt_get_ttymode (ttymode_t *tio, int erase)
1089{ 1055{
1090#ifdef HAVE_TERMIOS_H
1091 /* 1056 /*
1092 * standard System V termios interface 1057 * standard System V termios interface
1093 */ 1058 */
1094 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1059 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1095 { 1060 {
… …
1162 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1127 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1163# if defined (ECHOCTL) && defined (ECHOKE) 1128# if defined (ECHOCTL) && defined (ECHOKE)
1164 | ECHOCTL | ECHOKE 1129 | ECHOCTL | ECHOKE
1165# endif 1130# endif
1166 | ECHOE | ECHOK); 1131 | 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 1132
1215 /* 1133 /*
1216 * Debugging 1134 * Debugging
1217 */ 1135 */
1218#ifdef DEBUG_TTYMODE 1136#ifdef DEBUG_TTYMODE
… …
1319 else 1237 else
1320#endif 1238#endif
1321 if (!pty->get ()) 1239 if (!pty->get ())
1322 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1240 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1323 1241
1242 int er;
1243
1244#ifndef NO_BACKSPACE_KEY
1245 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1246 er = rs[Rs_backspace_key][0];
1247 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1248 er = '\177'; /* the initial state anyway */
1249 else
1250#endif
1251 er = -1;
1252
1253 rxvt_get_ttymode (&tio, er);
1254 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1324 pty->set_utf8_mode (enc_utf8); 1255 pty->set_utf8_mode (enc_utf8);
1325 1256
1326 /* set initial window size */ 1257 /* set initial window size */
1327 tt_winch (); 1258 tt_winch ();
1328
1329 int er;
1330
1331#ifndef NO_BACKSPACE_KEY
1332 if (key_backspace[0] && !key_backspace[1])
1333 er = key_backspace[0];
1334 else if (strcmp (key_backspace, "DEC") == 0)
1335 er = '\177'; /* the initial state anyway */
1336 else
1337#endif
1338 er = -1;
1339
1340 rxvt_get_ttymode (&tio, er);
1341 1259
1342#if ENABLE_FRILLS 1260#if ENABLE_FRILLS
1343 if (rs[Rs_pty_fd]) 1261 if (rs[Rs_pty_fd])
1344 return; 1262 return;
1345#endif 1263#endif
… …
1376 } 1294 }
1377 1295
1378 _exit (EXIT_FAILURE); 1296 _exit (EXIT_FAILURE);
1379 1297
1380 default: 1298 default:
1381 if (!OPTION (Opt_utmpInhibit)) 1299 if (!option (Opt_utmpInhibit))
1382 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1300 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1383 1301
1384 pty->close_tty (); 1302 pty->close_tty ();
1385 1303
1386 child_ev.start (cmd_pid); 1304 child_ev.start (cmd_pid);
1387 1305
… …
1400int 1318int
1401rxvt_term::run_child (const char *const *argv) 1319rxvt_term::run_child (const char *const *argv)
1402{ 1320{
1403 char *login; 1321 char *login;
1404 1322
1405 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1406
1407 if (OPTION (Opt_console)) 1323 if (option (Opt_console))
1408 { /* be virtual console, fail silently */ 1324 { /* be virtual console, fail silently */
1409#ifdef TIOCCONS 1325#ifdef TIOCCONS
1410 unsigned int on = 1; 1326 unsigned int on = 1;
1411 1327
1412 ioctl (STDIN_FILENO, TIOCCONS, &on); 1328 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1459 const char *argv0, *shell; 1375 const char *argv0, *shell;
1460 1376
1461 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1377 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1462 shell = "/bin/sh"; 1378 shell = "/bin/sh";
1463 1379
1464 argv0 = (const char *)rxvt_r_basename (shell); 1380 argv0 = (const char *)rxvt_basename (shell);
1465 1381
1466 if (OPTION (Opt_loginShell)) 1382 if (option (Opt_loginShell))
1467 { 1383 {
1468 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1384 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1469 1385
1470 login[0] = '-'; 1386 login[0] = '-';
1471 strcpy (&login[1], argv0); 1387 strcpy (&login[1], argv0);
1472 argv0 = login; 1388 argv0 = login;
1473 } 1389 }

Diff Legend

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