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.217 by root, Tue Oct 9 13:36:10 2007 UTC vs.
Revision 1.240 by ayin, Sat Jan 19 13:05:55 2008 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16 * - QNX support
17 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
18 * 16 *
19 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
20 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
21 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
22 * (at your option) any later version. 20 * (at your option) any later version.
… …
36 34
37#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
38#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
39#include "rxvtutil.h" 37#include "rxvtutil.h"
40#include "init.h" 38#include "init.h"
39#include "keyboard.h"
41 40
42#include <limits> 41#include <limits>
43 42
44#include <csignal> 43#include <csignal>
44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
45 59
46#ifdef DISPLAY_IS_IP 60#ifdef DISPLAY_IS_IP
47/* On Solaris link with -lsocket and -lnsl */ 61/* On Solaris link with -lsocket and -lnsl */
48#include <sys/types.h> 62#include <sys/types.h>
49#include <sys/socket.h> 63#include <sys/socket.h>
… …
141 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
142 "rgb:cd/cd/00", // 3: yellow (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
143 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
144 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
145 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
146# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
147 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
148# else 162# else
149 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
150# endif 164# endif
151 /* high-intensity colors */ 165 /* high-intensity colors */
152# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
153 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
237 "rgb:e7/e7/e7", 251 "rgb:e7/e7/e7",
238 252
239#ifndef NO_CURSORCOLOR 253#ifndef NO_CURSORCOLOR
240 COLOR_CURSOR_BACKGROUND, 254 COLOR_CURSOR_BACKGROUND,
241 COLOR_CURSOR_FOREGROUND, 255 COLOR_CURSOR_FOREGROUND,
242#endif /* ! NO_CURSORCOLOR */ 256#endif /* ! NO_CURSORCOLOR */
243 NULL, /* Color_pointer_fg */ 257 NULL, /* Color_pointer_fg */
244 NULL, /* Color_pointer_bg */ 258 NULL, /* Color_pointer_bg */
245 NULL, /* Color_border */ 259 NULL, /* Color_border */
246#ifndef NO_BOLD_UNDERLINE_REVERSE 260#ifndef NO_BOLD_UNDERLINE_REVERSE
247 NULL, /* Color_BD */ 261 NULL, /* Color_BD */
248 NULL, /* Color_IT */ 262 NULL, /* Color_IT */
249 NULL, /* Color_UL */ 263 NULL, /* Color_UL */
250 NULL, /* Color_RV */ 264 NULL, /* Color_RV */
251#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 265#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
252#if ENABLE_FRILLS 266#if ENABLE_FRILLS
253 NULL, // Color_underline 267 NULL, // Color_underline
254#endif 268#endif
255#ifdef OPTION_HC 269#ifdef OPTION_HC
256 NULL, 270 NULL,
257#endif 271#endif
258#ifdef KEEP_SCROLLCOLOR 272#ifdef KEEP_SCROLLCOLOR
259 COLOR_SCROLLBAR, 273 COLOR_SCROLLBAR,
260 COLOR_SCROLLTROUGH, 274 COLOR_SCROLLTROUGH,
261#endif /* KEEP_SCROLLCOLOR */ 275#endif /* KEEP_SCROLLCOLOR */
262#if ENABLE_TRANSPARENCY 276#if ENABLE_TRANSPARENCY
263 NULL, 277 NULL,
264#endif 278#endif
265#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
266 "rgb:00/00/00", 280 "rgb:00/00/00",
267#endif 281#endif
268 }; 282 };
269 283
270bool 284void
271rxvt_term::init_vars () 285rxvt_term::init_vars ()
272{ 286{
273 pix_colors = // 287 pix_colors = pix_colors_focused;
274 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
275#ifdef OFF_FOCUS_FADING
276 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
277#endif
278
279 288
280 MEvent.time = CurrentTime; 289 MEvent.time = CurrentTime;
281 MEvent.button = AnyButton; 290 MEvent.button = AnyButton;
282 want_refresh = 1; 291 want_refresh = 1;
283 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
… …
285 nrow = 24; 294 nrow = 24;
286 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
287 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
288 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
289 saveLines = SAVELINES; 298 saveLines = SAVELINES;
290 numpix_colors = TOTAL_COLORS;
291 299
292 refresh_type = SLOW_REFRESH; 300 refresh_type = SLOW_REFRESH;
293 301
294 oldcursor.row = oldcursor.col = -1; 302 oldcursor.row = oldcursor.col = -1;
295 last_bot = last_state = -1;
296 303
297 set_option (Opt_scrollBar); 304 set_option (Opt_scrollBar);
298 set_option (Opt_scrollTtyOutput); 305 set_option (Opt_scrollTtyOutput);
299 set_option (Opt_jumpScroll); 306 set_option (Opt_jumpScroll);
300 set_option (Opt_skipScroll); 307 set_option (Opt_skipScroll);
301 set_option (Opt_secondaryScreen); 308 set_option (Opt_secondaryScreen);
302 set_option (Opt_secondaryScroll); 309 set_option (Opt_secondaryScroll);
303 set_option (Opt_pastableTabs); 310 set_option (Opt_pastableTabs);
304 set_option (Opt_intensityStyles); 311 set_option (Opt_intensityStyles);
305 set_option (Opt_iso14755_52); 312 set_option (Opt_iso14755_52);
306
307 return true;
308} 313}
309 314
310void 315static void
311rxvt_term::init_secondary () 316init_secondary ()
312{ 317{
313 int i; 318 int i;
314 319
315 /* 320 /*
316 * Close all unused file descriptors 321 * Close all unused file descriptors
… …
356 break; 361 break;
357 362
358 if (r_argc == argc) 363 if (r_argc == argc)
359 cmd_argv = NULL; 364 cmd_argv = NULL;
360 else if (!argv[r_argc + 1]) 365 else if (!argv[r_argc + 1])
361 rxvt_fatal ("-e requires an argument\n"); 366 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
362 else 367 else
363 { 368 {
364 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); 369 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
365 370
366 for (i = 0; i < argc - r_argc - 1; i++) 371 for (i = 0; i < argc - r_argc - 1; i++)
… …
403 if (rs[Rs_depth]) 408 if (rs[Rs_depth])
404 select_visual (strtol (rs[Rs_depth], 0, 0)); 409 select_visual (strtol (rs[Rs_depth], 0, 0));
405#endif 410#endif
406 411
407#ifdef HAVE_AFTERIMAGE 412#ifdef HAVE_AFTERIMAGE
413 set_application_name ((char*)rs[Rs_name]);
414 set_output_threshold (OUTPUT_LEVEL_WARNING);
408 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 415 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
409#endif 416#endif
410 free (r_argv); 417 free (r_argv);
411 418
412 for (int i = NUM_RESOURCES; i--; ) 419 for (int i = NUM_RESOURCES; i--; )
… …
525 color_aliases (Color_fg); 532 color_aliases (Color_fg);
526 color_aliases (Color_bg); 533 color_aliases (Color_bg);
527#ifndef NO_CURSORCOLOR 534#ifndef NO_CURSORCOLOR
528 color_aliases (Color_cursor); 535 color_aliases (Color_cursor);
529 color_aliases (Color_cursor2); 536 color_aliases (Color_cursor2);
530#endif /* NO_CURSORCOLOR */ 537#endif /* NO_CURSORCOLOR */
531 color_aliases (Color_pointer_fg); 538 color_aliases (Color_pointer_fg);
532 color_aliases (Color_pointer_bg); 539 color_aliases (Color_pointer_bg);
533 color_aliases (Color_border); 540 color_aliases (Color_border);
534#ifndef NO_BOLD_UNDERLINE_REVERSE 541#ifndef NO_BOLD_UNDERLINE_REVERSE
535 color_aliases (Color_BD); 542 color_aliases (Color_BD);
536 color_aliases (Color_UL); 543 color_aliases (Color_UL);
537 color_aliases (Color_RV); 544 color_aliases (Color_RV);
538#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 545#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
539 546
540 if (!rs[Rs_color + Color_border]) 547 if (!rs[Rs_color + Color_border])
541 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 548 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
542 549
543 return cmd_argv; 550 return cmd_argv;
551}
552
553/*----------------------------------------------------------------------*/
554void
555rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
556{
557 this->envv = envv;
558
559 SET_R (this);
560 set_locale ("");
561 set_environ (envv); // few things in X do not call setlocale :(
562
563 init_vars ();
564
565 init_secondary ();
566
567 const char **cmd_argv = init_resources (argc, argv);
568
569#ifdef KEYSYM_RESOURCE
570 keyboard->register_done ();
571#endif
572
573#ifdef HAVE_SCROLLBARS
574 if (option (Opt_scrollBar))
575 scrollBar.setIdle (); /* set existence for size calculations */
576#endif
577
578 pty = ptytty::create ();
579
580 create_windows (argc, argv);
581
582 init_xlocale ();
583
584 scr_reset (); // initialize screen
585
586#if 0
587 XSynchronize (dpy, True);
588#endif
589
590#ifdef HAVE_SCROLLBARS
591 if (option (Opt_scrollBar))
592 resize_scrollbar (); /* create and map scrollbar */
593#endif
594#ifdef HAVE_BG_PIXMAP
595 {
596 bgPixmap.set_target (this);
597 bgPixmap.invalidate ();
598
599#ifdef ENABLE_TRANSPARENCY
600 if (option (Opt_transparent))
601 {
602 bgPixmap.set_transparent ();
603
604#ifdef HAVE_AFTERIMAGE
605 if (rs [Rs_blurradius])
606 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
607#endif
608 if (ISSET_PIXCOLOR (Color_tint))
609 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
610
611 if (rs [Rs_shade])
612 bgPixmap.set_shade (rs [Rs_shade]);
613
614 bgPixmap.set_root_pixmap ();
615 XSelectInput (dpy, display->root, PropertyChangeMask);
616 rootwin_ev.start (display, display->root);
617 }
618#endif
619
620#ifdef BG_IMAGE_FROM_FILE
621 if (rs[Rs_backgroundPixmap])
622 {
623 const char *p = rs[Rs_backgroundPixmap];
624
625 if ((p = strchr (p, ';')) != 0)
626 {
627 p++;
628 bgPixmap.set_geometry (p);
629 }
630 else
631 bgPixmap.set_defaultGeometry ();
632
633 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
634 if (!bgPixmap.window_position_sensitive ())
635 update_background ();
636 }
637#endif
638 }
639#endif
640
641#if ENABLE_PERL
642 rootwin_ev.start (display, display->root);
643#endif
644
645 set_colorfgbg ();
646
647 init_command (cmd_argv);
648
649 free (cmd_argv);
650
651 if (pty->pty >= 0)
652 pty_ev.start (pty->pty, ev::READ);
653
654 HOOK_INVOKE ((this, HOOK_START, DT_END));
655
656#if ENABLE_XEMBED
657 if (rs[Rs_embed])
658 {
659 long info[2] = { 0, XEMBED_MAPPED };
660
661 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
662 32, PropModeReplace, (unsigned char *)&info, 2);
663 }
664#endif
665
666 XMapWindow (dpy, vt);
667 XMapWindow (dpy, parent[0]);
668
669 refresh_check ();
544} 670}
545 671
546/*----------------------------------------------------------------------*/ 672/*----------------------------------------------------------------------*/
547void 673void
548rxvt_term::init_env () 674rxvt_term::init_env ()
… …
563 */ 689 */
564 val = rxvt_network_display (rs[Rs_display_name]); 690 val = rxvt_network_display (rs[Rs_display_name]);
565 rs[Rs_display_name] = (const char *)val; 691 rs[Rs_display_name] = (const char *)val;
566 692
567 if (val == NULL) 693 if (val == NULL)
568#endif /* DISPLAY_IS_IP */ 694#endif /* DISPLAY_IS_IP */
569 val = XDisplayString (dpy); 695 val = XDisplayString (dpy);
570 696
571 if (rs[Rs_display_name] == NULL) 697 if (rs[Rs_display_name] == NULL)
572 rs[Rs_display_name] = val; /* use broken `:0' value */ 698 rs[Rs_display_name] = val; /* use broken `:0' value */
573 699
… …
613#ifdef HAVE_UNSETENV 739#ifdef HAVE_UNSETENV
614 /* avoid passing old settings and confusing term size */ 740 /* avoid passing old settings and confusing term size */
615 unsetenv ("LINES"); 741 unsetenv ("LINES");
616 unsetenv ("COLUMNS"); 742 unsetenv ("COLUMNS");
617 unsetenv ("TERMCAP"); /* terminfo should be okay */ 743 unsetenv ("TERMCAP"); /* terminfo should be okay */
618#endif /* HAVE_UNSETENV */ 744#endif /* HAVE_UNSETENV */
619} 745}
620 746
621/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
622/* 748/*
623 * This is more or less stolen straight from XFree86 xterm. 749 * This is more or less stolen straight from XFree86 xterm.
… …
644 770
645 this->locale = "C"; 771 this->locale = "C";
646 } 772 }
647 773
648 774
649 this->locale = rxvt_strdup (this->locale); 775 this->locale = strdup (this->locale);
650 SET_LOCALE (this->locale); 776 SET_LOCALE (this->locale);
651 mbstate.reset (); 777 mbstate.reset ();
652#endif 778#endif
653 779
654#if HAVE_NL_LANGINFO 780#if HAVE_NL_LANGINFO
… …
734 int i; 860 int i;
735 861
736#ifdef OFF_FOCUS_FADING 862#ifdef OFF_FOCUS_FADING
737 pix_colors = pix_colors_focused; 863 pix_colors = pix_colors_focused;
738#endif 864#endif
739 865
740 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 866 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
741 { 867 {
742 const char *name = rs[Rs_color + i]; 868 const char *name = rs[Rs_color + i];
743 869
744 if (!name) 870 if (!name)
… …
822 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 948 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
823 cscroll.a) 949 cscroll.a)
824 )) 950 ))
825 alias_color (Color_topShadow, Color_White); 951 alias_color (Color_topShadow, Color_White);
826 } 952 }
827#endif /* KEEP_SCROLLCOLOR */ 953#endif /* KEEP_SCROLLCOLOR */
828 954
829#ifdef OFF_FOCUS_FADING 955#ifdef OFF_FOCUS_FADING
830 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 956 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
831 update_fade_color (i); 957 update_fade_color (i);
832#endif 958#endif
… …
840 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 966 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
841 { 967 {
842 int i = atoi (rs[Rs_color + idx]); 968 int i = atoi (rs[Rs_color + idx]);
843 969
844 if (i >= 8 && i <= 15) 970 if (i >= 8 && i <= 15)
845 { /* bright colors */ 971 /* bright colors */
846 i -= 8;
847 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 972 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
848 return; 973 else if (i >= 0 && i <= 7)
849 } 974 /* normal colors */
850
851 if (i >= 0 && i <= 7) /* normal colors */
852 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 975 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
853 } 976 }
854} 977}
855 978
856/*----------------------------------------------------------------------*/ 979/*----------------------------------------------------------------------*/
… …
1072 termwin_ev.start (display, top); 1195 termwin_ev.start (display, top);
1073 1196
1074 /* vt cursor: Black-on-White is standard, but this is more popular */ 1197 /* vt cursor: Black-on-White is standard, but this is more popular */
1075 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1198 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1076 1199
1077#ifdef HAVE_SCROLLBARS
1078 /* cursor scrollBar: Black-on-White */
1079 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1080#endif
1081
1082 /* the vt window */ 1200 /* the vt window */
1083 vt = XCreateSimpleWindow (dpy, top, 1201 vt = XCreateSimpleWindow (dpy, top,
1084 window_vt_x, window_vt_y, 1202 window_vt_x, window_vt_y,
1085 width, height, 1203 width, height,
1086 0, 1204 0,
… …
1110 GCForeground | GCBackground | GCGraphicsExposures, 1228 GCForeground | GCBackground | GCGraphicsExposures,
1111 &gcvalue); 1229 &gcvalue);
1112 1230
1113 drawable = new rxvt_drawable (this, vt); 1231 drawable = new rxvt_drawable (this, vt);
1114 1232
1115#ifdef RXVT_SCROLLBAR
1116 gcvalue.foreground = pix_colors[Color_topShadow];
1117 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1118 gcvalue.foreground = pix_colors[Color_bottomShadow];
1119 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1120 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1121 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1122#endif
1123
1124#ifdef OFF_FOCUS_FADING 1233#ifdef OFF_FOCUS_FADING
1125 // initially we are in unfocused state 1234 // initially we are in unfocused state
1126 if (rs[Rs_fade]) 1235 if (rs[Rs_fade])
1127 pix_colors = pix_colors_unfocused; 1236 pix_colors = pix_colors_unfocused;
1128#endif 1237#endif
… …
1133 1242
1134/* ------------------------------------------------------------------------- * 1243/* ------------------------------------------------------------------------- *
1135 * GET TTY CURRENT STATE * 1244 * GET TTY CURRENT STATE *
1136 * ------------------------------------------------------------------------- */ 1245 * ------------------------------------------------------------------------- */
1137void 1246void
1138rxvt_get_ttymode (ttymode_t *tio, int erase) 1247rxvt_get_ttymode (struct termios *tio, int erase)
1139{ 1248{
1140 /* 1249 /*
1141 * standard System V termios interface 1250 * standard System V termios interface
1142 */ 1251 */
1143 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1252 if (tcgetattr (STDIN_FILENO, tio) < 0)
1144 { 1253 {
1145 // return error - use system defaults, 1254 // return error - use system defaults,
1146 // where possible, and zero elsewhere 1255 // where possible, and zero elsewhere
1147 memset (tio, 0, sizeof (ttymode_t)); 1256 memset (tio, 0, sizeof (struct termios));
1148 1257
1149 tio->c_cc[VINTR] = CINTR; 1258 tio->c_cc[VINTR] = CINTR;
1150 tio->c_cc[VQUIT] = CQUIT; 1259 tio->c_cc[VQUIT] = CQUIT;
1151 tio->c_cc[VERASE] = CERASE; 1260 tio->c_cc[VERASE] = CERASE;
1152#ifdef VERASE2 1261#ifdef VERASE2
… …
1216 1325
1217 /* 1326 /*
1218 * Debugging 1327 * Debugging
1219 */ 1328 */
1220#ifdef DEBUG_TTYMODE 1329#ifdef DEBUG_TTYMODE
1221#ifdef HAVE_TERMIOS_H
1222 /* c_iflag bits */ 1330 /* c_iflag bits */
1223 fprintf (stderr, "Input flags\n"); 1331 fprintf (stderr, "Input flags\n");
1224 1332
1225 /* cpp token stringize doesn't work on all machines <sigh> */ 1333 /* cpp token stringize doesn't work on all machines <sigh> */
1226# define FOO(flag,name) \ 1334# define FOO(flag,name) \
… …
1289 FOO (VLNEXT, "VLNEXT"); 1397 FOO (VLNEXT, "VLNEXT");
1290# endif 1398# endif
1291 1399
1292 fprintf (stderr, "\n"); 1400 fprintf (stderr, "\n");
1293# undef FOO 1401# undef FOO
1294# endif /* HAVE_TERMIOS_H */ 1402#endif /* DEBUG_TTYMODE */
1295#endif /* DEBUG_TTYMODE */
1296} 1403}
1297 1404
1298/*----------------------------------------------------------------------*/ 1405/*----------------------------------------------------------------------*/
1299/* 1406/*
1300 * Run the command in a subprocess and return a file descriptor for the 1407 * Run the command in a subprocess and return a file descriptor for the
… …
1333 else 1440 else
1334#endif 1441#endif
1335 er = -1; 1442 er = -1;
1336 1443
1337 rxvt_get_ttymode (&tio, er); 1444 rxvt_get_ttymode (&tio, er);
1338 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1445 /* init terminal attributes */
1446 cfsetospeed (&tio, BAUDRATE);
1447 cfsetispeed (&tio, BAUDRATE);
1448 tcsetattr (pty->tty, TCSANOW, &tio);
1339 pty->set_utf8_mode (enc_utf8); 1449 pty->set_utf8_mode (enc_utf8);
1340 1450
1341 /* set initial window size */ 1451 /* set initial window size */
1342 tt_winch (); 1452 tt_winch ();
1343 1453
… …
1403rxvt_term::run_child (const char *const *argv) 1513rxvt_term::run_child (const char *const *argv)
1404{ 1514{
1405 char *login; 1515 char *login;
1406 1516
1407 if (option (Opt_console)) 1517 if (option (Opt_console))
1518 {
1408 { /* be virtual console, fail silently */ 1519 /* be virtual console, fail silently */
1409#ifdef TIOCCONS 1520#ifdef TIOCCONS
1410 unsigned int on = 1; 1521 unsigned int on = 1;
1411 1522
1412 ioctl (STDIN_FILENO, TIOCCONS, &on); 1523 ioctl (STDIN_FILENO, TIOCCONS, &on);
1413#elif defined (SRIOCSREDIR) 1524#elif defined (SRIOCSREDIR)
… …
1415 1526
1416 fd = open (CONSOLE, O_WRONLY, 0); 1527 fd = open (CONSOLE, O_WRONLY, 0);
1417 if (fd >= 0) 1528 if (fd >= 0)
1418 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1529 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1419 close (fd); 1530 close (fd);
1420#endif /* SRIOCSREDIR */ 1531#endif /* SRIOCSREDIR */
1421 } 1532 }
1422 1533
1423 /* reset signals and spin off the command interpreter */ 1534 /* reset signals and spin off the command interpreter */
1424 signal (SIGINT, SIG_DFL); 1535 signal (SIGINT, SIG_DFL);
1425 signal (SIGQUIT, SIG_DFL); 1536 signal (SIGQUIT, SIG_DFL);
… …
1432 */ 1543 */
1433#ifdef SIGTSTP 1544#ifdef SIGTSTP
1434 signal (SIGTSTP, SIG_IGN); 1545 signal (SIGTSTP, SIG_IGN);
1435 signal (SIGTTIN, SIG_IGN); 1546 signal (SIGTTIN, SIG_IGN);
1436 signal (SIGTTOU, SIG_IGN); 1547 signal (SIGTTOU, SIG_IGN);
1437#endif /* SIGTSTP */ 1548#endif /* SIGTSTP */
1438 1549
1439 // unblock signals (signals are blocked by iom.C 1550 // unblock signals (signals are blocked by iom.C
1440 sigset_t ss; 1551 sigset_t ss;
1441 sigemptyset (&ss); 1552 sigemptyset (&ss);
1442 sigprocmask (SIG_SETMASK, &ss, 0); 1553 sigprocmask (SIG_SETMASK, &ss, 0);

Diff Legend

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