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.224 by ayin, Mon Nov 26 11:20:16 2007 UTC vs.
Revision 1.256 by root, Wed Nov 5 12:28:15 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-2008 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>
45 46
46#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
47# define X_LOCALE 48# define X_LOCALE
48# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
49#else 50#else
… …
266 NULL, // Color_underline 267 NULL, // Color_underline
267#endif 268#endif
268#ifdef OPTION_HC 269#ifdef OPTION_HC
269 NULL, 270 NULL,
270#endif 271#endif
271#ifdef KEEP_SCROLLCOLOR
272 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR
273 COLOR_SCROLLTROUGH, 274 COLOR_SCROLLTROUGH,
274#endif /* KEEP_SCROLLCOLOR */ 275#endif
275#if ENABLE_TRANSPARENCY 276#if ENABLE_TRANSPARENCY
276 NULL, 277 NULL,
277#endif 278#endif
278#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
279 "rgb:00/00/00", 280 "rgb:00/00/00",
280#endif 281#endif
281 }; 282 };
282 283
283bool 284void
284rxvt_term::init_vars () 285rxvt_term::init_vars ()
285{ 286{
286 pix_colors = // 287 pix_colors = pix_colors_focused;
287 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
288#ifdef OFF_FOCUS_FADING
289 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
290#endif
291
292 288
293 MEvent.time = CurrentTime; 289 MEvent.time = CurrentTime;
294 MEvent.button = AnyButton; 290 MEvent.button = AnyButton;
295 want_refresh = 1; 291 want_refresh = 1;
296 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
… …
298 nrow = 24; 294 nrow = 24;
299 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
300 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
301 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
302 saveLines = SAVELINES; 298 saveLines = SAVELINES;
303 numpix_colors = TOTAL_COLORS;
304 299
305 refresh_type = SLOW_REFRESH; 300 refresh_type = SLOW_REFRESH;
306 301
307 oldcursor.row = oldcursor.col = -1; 302 oldcursor.row = oldcursor.col = -1;
308 last_bot = last_state = -1;
309 303
310 set_option (Opt_scrollBar); 304 set_option (Opt_scrollBar);
311 set_option (Opt_scrollTtyOutput); 305 set_option (Opt_scrollTtyOutput);
312 set_option (Opt_jumpScroll); 306 set_option (Opt_jumpScroll);
313 set_option (Opt_skipScroll); 307 set_option (Opt_skipScroll);
314 set_option (Opt_secondaryScreen); 308 set_option (Opt_secondaryScreen);
315 set_option (Opt_secondaryScroll); 309 set_option (Opt_secondaryScroll);
316 set_option (Opt_pastableTabs); 310 set_option (Opt_pastableTabs);
317 set_option (Opt_intensityStyles); 311 set_option (Opt_intensityStyles);
318 set_option (Opt_iso14755_52); 312 set_option (Opt_iso14755_52);
319 313 set_option (Opt_buffered);
320 return true;
321} 314}
322 315
323void 316static void
324rxvt_term::init_secondary () 317init_secondary ()
325{ 318{
326 int i; 319 int i;
327 320
328 /*
329 * Close all unused file descriptors
330 * We don't want them, we don't need them.
331 */
332 if ((i = open ("/dev/null", O_RDONLY)) < 0) 321 if ((i = open ("/dev/null", O_RDONLY)) < 0)
333 { 322 {
334 /* TODO: BOO HISS */
335 dup2 (STDERR_FILENO, STDIN_FILENO); 323 dup2 (STDERR_FILENO, STDIN_FILENO);
336 } 324 }
337 else if (i != STDIN_FILENO) 325 else if (i != STDIN_FILENO)
338 { 326 {
339 dup2 (i, STDIN_FILENO); 327 dup2 (i, STDIN_FILENO);
340 close (i); 328 close (i);
341 } 329 }
342 330
343 dup2 (STDERR_FILENO, STDOUT_FILENO); 331 dup2 (STDERR_FILENO, STDOUT_FILENO);
344
345#if 0 // schmorp sayz closing filies is murder
346 for (i = STDERR_FILENO + 1; i < num_fds; i++)
347 {
348#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
349 if (i == 4 || i == 7)
350 continue;
351#endif
352 close (i);
353 }
354#endif
355} 332}
356 333
357/*----------------------------------------------------------------------*/ 334/*----------------------------------------------------------------------*/
358const char ** 335const char **
359rxvt_term::init_resources (int argc, const char *const *argv) 336rxvt_term::init_resources (int argc, const char *const *argv)
… …
415#if XFT 392#if XFT
416 if (rs[Rs_depth]) 393 if (rs[Rs_depth])
417 select_visual (strtol (rs[Rs_depth], 0, 0)); 394 select_visual (strtol (rs[Rs_depth], 0, 0));
418#endif 395#endif
419 396
420#ifdef HAVE_AFTERIMAGE
421 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
422#endif
423 free (r_argv); 397 free (r_argv);
424 398
425 for (int i = NUM_RESOURCES; i--; ) 399 for (int i = NUM_RESOURCES; i--; )
426 if (rs [i] == resval_undef) 400 if (rs [i] == resval_undef)
427 rs [i] = 0; 401 rs [i] = 0;
402
403#ifdef HAVE_AFTERIMAGE
404 set_application_name ((char *)rs[Rs_name]);
405 set_output_threshold (OUTPUT_LEVEL_WARNING);
406#endif
428 407
429#if ENABLE_PERL 408#if ENABLE_PERL
430 if (!rs[Rs_perl_ext_1]) 409 if (!rs[Rs_perl_ext_1])
431 rs[Rs_perl_ext_1] = "default"; 410 rs[Rs_perl_ext_1] = "default";
432 411
… …
444 */ 423 */
445 if (cmd_argv && cmd_argv[0]) 424 if (cmd_argv && cmd_argv[0])
446 { 425 {
447 if (!rs[Rs_title]) 426 if (!rs[Rs_title])
448 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 427 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
428
449 if (!rs[Rs_iconName]) 429 if (!rs[Rs_iconName])
450 rs[Rs_iconName] = rs[Rs_title]; 430 rs[Rs_iconName] = rs[Rs_title];
451 } 431 }
452 else 432 else
453 { 433 {
454 if (!rs[Rs_title]) 434 if (!rs[Rs_title])
455 rs[Rs_title] = rs[Rs_name]; 435 rs[Rs_title] = rs[Rs_name];
436
456 if (!rs[Rs_iconName]) 437 if (!rs[Rs_iconName])
457 rs[Rs_iconName] = rs[Rs_name]; 438 rs[Rs_iconName] = rs[Rs_name];
458 } 439 }
459 440
460 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 441 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
479#endif 460#endif
480 461
481 /* no point having a scrollbar without having any scrollback! */ 462 /* no point having a scrollbar without having any scrollback! */
482 if (!saveLines) 463 if (!saveLines)
483 set_option (Opt_scrollBar, 0); 464 set_option (Opt_scrollBar, 0);
484
485#ifdef PRINTPIPE
486 if (!rs[Rs_print_pipe])
487 rs[Rs_print_pipe] = PRINTPIPE;
488#endif
489 465
490 if (!rs[Rs_cutchars]) 466 if (!rs[Rs_cutchars])
491 rs[Rs_cutchars] = CUTCHARS; 467 rs[Rs_cutchars] = CUTCHARS;
492 468
493#ifndef NO_BACKSPACE_KEY 469#ifndef NO_BACKSPACE_KEY
… …
506# else 482# else
507 rs[Rs_delete_key] = "\033[3~"; 483 rs[Rs_delete_key] = "\033[3~";
508# endif 484# endif
509#endif 485#endif
510 486
511#ifdef HAVE_SCROLLBARS 487 scrollBar.setup (this);
512 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
513#endif
514 488
515#ifdef XTERM_REVERSE_VIDEO 489#ifdef XTERM_REVERSE_VIDEO
516 /* this is how xterm implements reverseVideo */ 490 /* this is how xterm implements reverseVideo */
517 if (option (Opt_reverseVideo)) 491 if (option (Opt_reverseVideo))
518 { 492 {
… …
556 return cmd_argv; 530 return cmd_argv;
557} 531}
558 532
559/*----------------------------------------------------------------------*/ 533/*----------------------------------------------------------------------*/
560void 534void
535rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
536{
537 this->envv = envv;
538
539 SET_R (this);
540 set_locale ("");
541 set_environ (envv); // a few things in X do not call setlocale :(
542
543 init_vars ();
544
545 init_secondary ();
546
547 const char **cmd_argv = init_resources (argc, argv);
548
549#ifdef KEYSYM_RESOURCE
550 keyboard->register_done ();
551#endif
552
553 if (const char *path = rs[Rs_chdir])
554 if (*path) // ignored if empty
555 {
556 if (*path != '/')
557 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
558
559 if (chdir (path))
560 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
561 }
562
563 if (option (Opt_scrollBar))
564 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
565
566 pty = ptytty::create ();
567
568 create_windows (argc, argv);
569
570 init_xlocale ();
571
572 scr_poweron (); // initialize screen
573
574#if 0
575 XSynchronize (dpy, True);
576#endif
577
578 if (option (Opt_scrollBar))
579 scrollBar.resize (); /* create and map scrollbar */
580#ifdef HAVE_BG_PIXMAP
581 {
582 bgPixmap.set_target (this);
583 bgPixmap.invalidate ();
584
585#ifdef ENABLE_TRANSPARENCY
586 if (option (Opt_transparent))
587 {
588 bgPixmap.set_transparent ();
589
590#ifdef HAVE_AFTERIMAGE
591 if (rs [Rs_blurradius])
592 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
593#endif
594 if (ISSET_PIXCOLOR (Color_tint))
595 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
596
597 if (rs [Rs_shade])
598 bgPixmap.set_shade (rs [Rs_shade]);
599
600 bgPixmap.set_root_pixmap ();
601 XSelectInput (dpy, display->root, PropertyChangeMask);
602 rootwin_ev.start (display, display->root);
603 }
604#endif
605
606#ifdef BG_IMAGE_FROM_FILE
607 if (rs[Rs_backgroundPixmap])
608 {
609 const char *p = rs[Rs_backgroundPixmap];
610
611 if ((p = strchr (p, ';')) != 0)
612 {
613 p++;
614 bgPixmap.set_geometry (p);
615 }
616 else
617 bgPixmap.set_defaultGeometry ();
618
619 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
620 if (!bgPixmap.window_position_sensitive ())
621 update_background ();
622 }
623#endif
624 }
625#endif
626
627#if ENABLE_PERL
628 rootwin_ev.start (display, display->root);
629#endif
630
631 set_colorfgbg ();
632
633 init_command (cmd_argv);
634
635 free (cmd_argv);
636
637 if (pty->pty >= 0)
638 pty_ev.start (pty->pty, ev::READ);
639
640 HOOK_INVOKE ((this, HOOK_START, DT_END));
641
642#if ENABLE_XEMBED
643 if (rs[Rs_embed])
644 {
645 long info[2] = { 0, XEMBED_MAPPED };
646
647 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
648 32, PropModeReplace, (unsigned char *)&info, 2);
649 }
650#endif
651
652 XMapWindow (dpy, vt);
653 XMapWindow (dpy, parent[0]);
654
655 refresh_check ();
656}
657
658/*----------------------------------------------------------------------*/
659void
561rxvt_term::init_env () 660rxvt_term::init_env ()
562{ 661{
563 int i; 662 int i;
564 char *val; 663 char *val;
565 664
… …
740 run_command (argv); 839 run_command (argv);
741} 840}
742 841
743/*----------------------------------------------------------------------*/ 842/*----------------------------------------------------------------------*/
744void 843void
745rxvt_term::Get_Colours () 844rxvt_term::get_colours ()
746{ 845{
747 int i; 846 int i;
748 847
749#ifdef OFF_FOCUS_FADING 848#ifdef OFF_FOCUS_FADING
750 pix_colors = pix_colors_focused; 849 pix_colors = pix_colors_focused;
… …
810 * get scrollBar shadow colors 909 * get scrollBar shadow colors
811 * 910 *
812 * The calculations of topShadow/bottomShadow values are adapted 911 * The calculations of topShadow/bottomShadow values are adapted
813 * from the fvwm window manager. 912 * from the fvwm window manager.
814 */ 913 */
815#ifdef KEEP_SCROLLCOLOR 914#ifdef RXVT_SCROLLBAR
816 if (depth <= 2) 915 if (depth <= 2)
817 { 916 {
818 /* Monochrome */ 917 /* Monochrome */
819 alias_color (Color_scroll, Color_fg); 918 alias_color (Color_scroll, Color_fg);
820 alias_color (Color_topShadow, Color_bg); 919 alias_color (Color_topShadow, Color_bg);
… …
835 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 934 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
836 cscroll.a) 935 cscroll.a)
837 )) 936 ))
838 alias_color (Color_topShadow, Color_White); 937 alias_color (Color_topShadow, Color_White);
839 } 938 }
840#endif /* KEEP_SCROLLCOLOR */ 939#endif
841 940
842#ifdef OFF_FOCUS_FADING 941#ifdef OFF_FOCUS_FADING
843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 942 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
844 update_fade_color (i); 943 update_fade_color (i);
845#endif 944#endif
… …
967 Window top, parent; 1066 Window top, parent;
968 1067
969 dLocal (Display *, dpy); 1068 dLocal (Display *, dpy);
970 1069
971 /* grab colors before netscape does */ 1070 /* grab colors before netscape does */
972 Get_Colours (); 1071 get_colours ();
973 1072
974 if (!set_fonts ()) 1073 if (!set_fonts ())
975 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1074 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
976 1075
977 parent = display->root; 1076 parent = display->root;
… …
1038 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1137 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1039 wmHint.window_group = top; 1138 wmHint.window_group = top;
1040 1139
1041 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1140 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1042 &szHint, &wmHint, &classHint); 1141 &szHint, &wmHint, &classHint);
1142#if ENABLE_EWMH
1143# ifdef HAVE_AFTERIMAGE
1144 /*
1145 * set up icon hint
1146 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1147 */
1148
1149 if (rs [Rs_iconfile])
1150 {
1151 init_asv ();
1152
1153 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1154 if (asv && im)
1155 {
1156 int w = im->width;
1157 int h = im->height;
1158 long* buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1159 ASImage *result = scale_asimage (asv, im,
1160 w, h, ASA_ARGB32,
1161 100, ASIMAGE_QUALITY_DEFAULT);
1162 destroy_asimage (&im);
1163
1164 if (buffer && result)
1165 {
1166 ARGB32 *asbuf = result->alt.argb32;
1167 buffer [0] = w;
1168 buffer [1] = h;
1169
1170 for (unsigned int i = 0; i < w * h; ++i)
1171 buffer [i + 2] = asbuf [i];
1172
1173 destroy_asimage (&result);
1174 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1175 PropModeReplace, (const unsigned char*) buffer, 2 + w * h);
1176 free (buffer);
1177 }
1178 else
1179 {
1180 if (!buffer)
1181 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1182
1183 if (!result)
1184 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1185 }
1186 }
1187 else
1188 rxvt_warn ("Loading image icon failed, continuing without.\n");
1189 }
1190# endif
1191#endif
1043 1192
1044#if ENABLE_FRILLS 1193#if ENABLE_FRILLS
1045 if (mwmhints.flags) 1194 if (mwmhints.flags)
1046 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1195 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1047 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1196 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1081 1230
1082 termwin_ev.start (display, top); 1231 termwin_ev.start (display, top);
1083 1232
1084 /* vt cursor: Black-on-White is standard, but this is more popular */ 1233 /* vt cursor: Black-on-White is standard, but this is more popular */
1085 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1234 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1086
1087#ifdef HAVE_SCROLLBARS
1088 /* cursor scrollBar: Black-on-White */
1089 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1090#endif
1091 1235
1092 /* the vt window */ 1236 /* the vt window */
1093 vt = XCreateSimpleWindow (dpy, top, 1237 vt = XCreateSimpleWindow (dpy, top,
1094 window_vt_x, window_vt_y, 1238 window_vt_x, window_vt_y,
1095 width, height, 1239 width, height,
… …
1120 GCForeground | GCBackground | GCGraphicsExposures, 1264 GCForeground | GCBackground | GCGraphicsExposures,
1121 &gcvalue); 1265 &gcvalue);
1122 1266
1123 drawable = new rxvt_drawable (this, vt); 1267 drawable = new rxvt_drawable (this, vt);
1124 1268
1125#ifdef RXVT_SCROLLBAR
1126 gcvalue.foreground = pix_colors[Color_topShadow];
1127 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1128 gcvalue.foreground = pix_colors[Color_bottomShadow];
1129 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1130 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1131 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1132#endif
1133
1134#ifdef OFF_FOCUS_FADING 1269#ifdef OFF_FOCUS_FADING
1135 // initially we are in unfocused state 1270 // initially we are in unfocused state
1136 if (rs[Rs_fade]) 1271 if (rs[Rs_fade])
1137 pix_colors = pix_colors_unfocused; 1272 pix_colors = pix_colors_unfocused;
1138#endif 1273#endif
… …
1143 1278
1144/* ------------------------------------------------------------------------- * 1279/* ------------------------------------------------------------------------- *
1145 * GET TTY CURRENT STATE * 1280 * GET TTY CURRENT STATE *
1146 * ------------------------------------------------------------------------- */ 1281 * ------------------------------------------------------------------------- */
1147void 1282void
1148rxvt_get_ttymode (ttymode_t *tio, int erase) 1283rxvt_get_ttymode (struct termios *tio, int erase)
1149{ 1284{
1150 /* 1285 /*
1151 * standard System V termios interface 1286 * standard System V termios interface
1152 */ 1287 */
1153 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1288 if (tcgetattr (STDIN_FILENO, tio) < 0)
1154 { 1289 {
1155 // return error - use system defaults, 1290 // return error - use system defaults,
1156 // where possible, and zero elsewhere 1291 // where possible, and zero elsewhere
1157 memset (tio, 0, sizeof (ttymode_t)); 1292 memset (tio, 0, sizeof (struct termios));
1158 1293
1159 tio->c_cc[VINTR] = CINTR; 1294 tio->c_cc[VINTR] = CINTR;
1160 tio->c_cc[VQUIT] = CQUIT; 1295 tio->c_cc[VQUIT] = CQUIT;
1161 tio->c_cc[VERASE] = CERASE; 1296 tio->c_cc[VERASE] = CERASE;
1162#ifdef VERASE2 1297#ifdef VERASE2
… …
1226 1361
1227 /* 1362 /*
1228 * Debugging 1363 * Debugging
1229 */ 1364 */
1230#ifdef DEBUG_TTYMODE 1365#ifdef DEBUG_TTYMODE
1231#ifdef HAVE_TERMIOS_H
1232 /* c_iflag bits */ 1366 /* c_iflag bits */
1233 fprintf (stderr, "Input flags\n"); 1367 fprintf (stderr, "Input flags\n");
1234 1368
1235 /* cpp token stringize doesn't work on all machines <sigh> */ 1369 /* cpp token stringize doesn't work on all machines <sigh> */
1236# define FOO(flag,name) \ 1370# define FOO(flag,name) \
… …
1299 FOO (VLNEXT, "VLNEXT"); 1433 FOO (VLNEXT, "VLNEXT");
1300# endif 1434# endif
1301 1435
1302 fprintf (stderr, "\n"); 1436 fprintf (stderr, "\n");
1303# undef FOO 1437# undef FOO
1304# endif /* HAVE_TERMIOS_H */
1305#endif /* DEBUG_TTYMODE */ 1438#endif /* DEBUG_TTYMODE */
1306} 1439}
1307 1440
1308/*----------------------------------------------------------------------*/ 1441/*----------------------------------------------------------------------*/
1309/* 1442/*
… …
1343 else 1476 else
1344#endif 1477#endif
1345 er = -1; 1478 er = -1;
1346 1479
1347 rxvt_get_ttymode (&tio, er); 1480 rxvt_get_ttymode (&tio, er);
1348 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1481 /* init terminal attributes */
1482 cfsetospeed (&tio, BAUDRATE);
1483 cfsetispeed (&tio, BAUDRATE);
1484 tcsetattr (pty->tty, TCSANOW, &tio);
1349 pty->set_utf8_mode (enc_utf8); 1485 pty->set_utf8_mode (enc_utf8);
1350 1486
1351 /* set initial window size */ 1487 /* set initial window size */
1352 tt_winch (); 1488 tt_winch ();
1353 1489
… …
1445 signal (SIGTSTP, SIG_IGN); 1581 signal (SIGTSTP, SIG_IGN);
1446 signal (SIGTTIN, SIG_IGN); 1582 signal (SIGTTIN, SIG_IGN);
1447 signal (SIGTTOU, SIG_IGN); 1583 signal (SIGTTOU, SIG_IGN);
1448#endif /* SIGTSTP */ 1584#endif /* SIGTSTP */
1449 1585
1450 // unblock signals (signals are blocked by iom.C
1451 sigset_t ss;
1452 sigemptyset (&ss);
1453 sigprocmask (SIG_SETMASK, &ss, 0);
1454
1455 /* command interpreter path */ 1586 /* command interpreter path */
1456 if (argv) 1587 if (argv)
1457 { 1588 {
1458# ifdef DEBUG_CMD 1589# ifdef DEBUG_CMD
1459 int i; 1590 int i;

Diff Legend

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