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.230 by root, Fri Dec 14 05:25:24 2007 UTC vs.
Revision 1.259 by root, Sat May 30 08:51:23 2009 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) 2003-2007 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
16 * 16 *
17 * 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
18 * 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
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
… …
34 34
35#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
36#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
37#include "rxvtutil.h" 37#include "rxvtutil.h"
38#include "init.h" 38#include "init.h"
39#include "keyboard.h"
39 40
40#include <limits> 41#include <limits>
41 42
42#include <csignal> 43#include <csignal>
43 44
… …
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",
… …
281 }; 282 };
282 283
283void 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 288
292 MEvent.time = CurrentTime; 289 MEvent.time = CurrentTime;
293 MEvent.button = AnyButton; 290 MEvent.button = AnyButton;
294 want_refresh = 1; 291 want_refresh = 1;
295 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
296 ncol = 80; 293 ncol = 80;
297 nrow = 24; 294 nrow = 24;
298 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
299 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
300 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
298 letterSpace = LETTERSPACE;
301 saveLines = SAVELINES; 299 saveLines = SAVELINES;
302 numpix_colors = TOTAL_COLORS;
303 300
304 refresh_type = SLOW_REFRESH; 301 refresh_type = SLOW_REFRESH;
305 302
306 oldcursor.row = oldcursor.col = -1; 303 oldcursor.row = oldcursor.col = -1;
307 last_bot = last_state = -1;
308 304
309 set_option (Opt_scrollBar); 305 set_option (Opt_scrollBar);
310 set_option (Opt_scrollTtyOutput); 306 set_option (Opt_scrollTtyOutput);
311 set_option (Opt_jumpScroll); 307 set_option (Opt_jumpScroll);
312 set_option (Opt_skipScroll); 308 set_option (Opt_skipScroll);
313 set_option (Opt_secondaryScreen); 309 set_option (Opt_secondaryScreen);
314 set_option (Opt_secondaryScroll); 310 set_option (Opt_secondaryScroll);
315 set_option (Opt_pastableTabs); 311 set_option (Opt_pastableTabs);
316 set_option (Opt_intensityStyles); 312 set_option (Opt_intensityStyles);
317 set_option (Opt_iso14755_52); 313 set_option (Opt_iso14755_52);
314 set_option (Opt_buffered);
318} 315}
319 316
320void 317static void
321rxvt_term::init_secondary () 318init_secondary ()
322{ 319{
323 int i; 320 int i;
324 321
325 /*
326 * Close all unused file descriptors
327 * We don't want them, we don't need them.
328 */
329 if ((i = open ("/dev/null", O_RDONLY)) < 0) 322 if ((i = open ("/dev/null", O_RDONLY)) < 0)
330 { 323 {
331 /* TODO: BOO HISS */
332 dup2 (STDERR_FILENO, STDIN_FILENO); 324 dup2 (STDERR_FILENO, STDIN_FILENO);
333 } 325 }
334 else if (i != STDIN_FILENO) 326 else if (i != STDIN_FILENO)
335 { 327 {
336 dup2 (i, STDIN_FILENO); 328 dup2 (i, STDIN_FILENO);
337 close (i); 329 close (i);
338 } 330 }
339 331
340 dup2 (STDERR_FILENO, STDOUT_FILENO); 332 dup2 (STDERR_FILENO, STDOUT_FILENO);
341
342#if 0 // schmorp sayz closing filies is murder
343 for (i = STDERR_FILENO + 1; i < num_fds; i++)
344 {
345#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
346 if (i == 4 || i == 7)
347 continue;
348#endif
349 close (i);
350 }
351#endif
352} 333}
353 334
354/*----------------------------------------------------------------------*/ 335/*----------------------------------------------------------------------*/
355const char ** 336const char **
356rxvt_term::init_resources (int argc, const char *const *argv) 337rxvt_term::init_resources (int argc, const char *const *argv)
… …
412#if XFT 393#if XFT
413 if (rs[Rs_depth]) 394 if (rs[Rs_depth])
414 select_visual (strtol (rs[Rs_depth], 0, 0)); 395 select_visual (strtol (rs[Rs_depth], 0, 0));
415#endif 396#endif
416 397
417#ifdef HAVE_AFTERIMAGE
418 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
419#endif
420 free (r_argv); 398 free (r_argv);
421 399
422 for (int i = NUM_RESOURCES; i--; ) 400 for (int i = NUM_RESOURCES; i--; )
423 if (rs [i] == resval_undef) 401 if (rs [i] == resval_undef)
424 rs [i] = 0; 402 rs [i] = 0;
403
404#ifdef HAVE_AFTERIMAGE
405 set_application_name ((char *)rs[Rs_name]);
406 set_output_threshold (OUTPUT_LEVEL_WARNING);
407#endif
425 408
426#if ENABLE_PERL 409#if ENABLE_PERL
427 if (!rs[Rs_perl_ext_1]) 410 if (!rs[Rs_perl_ext_1])
428 rs[Rs_perl_ext_1] = "default"; 411 rs[Rs_perl_ext_1] = "default";
429 412
… …
441 */ 424 */
442 if (cmd_argv && cmd_argv[0]) 425 if (cmd_argv && cmd_argv[0])
443 { 426 {
444 if (!rs[Rs_title]) 427 if (!rs[Rs_title])
445 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 428 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
429
446 if (!rs[Rs_iconName]) 430 if (!rs[Rs_iconName])
447 rs[Rs_iconName] = rs[Rs_title]; 431 rs[Rs_iconName] = rs[Rs_title];
448 } 432 }
449 else 433 else
450 { 434 {
451 if (!rs[Rs_title]) 435 if (!rs[Rs_title])
452 rs[Rs_title] = rs[Rs_name]; 436 rs[Rs_title] = rs[Rs_name];
437
453 if (!rs[Rs_iconName]) 438 if (!rs[Rs_iconName])
454 rs[Rs_iconName] = rs[Rs_name]; 439 rs[Rs_iconName] = rs[Rs_name];
455 } 440 }
456 441
457 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 442 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
464 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 449 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
465 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 450 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
466 451
467 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 452 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
468 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 453 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
454
455 if (rs[Rs_letterSpace])
456 letterSpace = atoi (rs[Rs_letterSpace]);
469#endif 457#endif
470 458
471#ifdef POINTER_BLANK 459#ifdef POINTER_BLANK
472 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 460 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
473 pointerBlankDelay = i; 461 pointerBlankDelay = i;
… …
476#endif 464#endif
477 465
478 /* no point having a scrollbar without having any scrollback! */ 466 /* no point having a scrollbar without having any scrollback! */
479 if (!saveLines) 467 if (!saveLines)
480 set_option (Opt_scrollBar, 0); 468 set_option (Opt_scrollBar, 0);
481
482#ifdef PRINTPIPE
483 if (!rs[Rs_print_pipe])
484 rs[Rs_print_pipe] = PRINTPIPE;
485#endif
486 469
487 if (!rs[Rs_cutchars]) 470 if (!rs[Rs_cutchars])
488 rs[Rs_cutchars] = CUTCHARS; 471 rs[Rs_cutchars] = CUTCHARS;
489 472
490#ifndef NO_BACKSPACE_KEY 473#ifndef NO_BACKSPACE_KEY
… …
503# else 486# else
504 rs[Rs_delete_key] = "\033[3~"; 487 rs[Rs_delete_key] = "\033[3~";
505# endif 488# endif
506#endif 489#endif
507 490
508#ifdef HAVE_SCROLLBARS 491 scrollBar.setup (this);
509 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
510#endif
511 492
512#ifdef XTERM_REVERSE_VIDEO 493#ifdef XTERM_REVERSE_VIDEO
513 /* this is how xterm implements reverseVideo */ 494 /* this is how xterm implements reverseVideo */
514 if (option (Opt_reverseVideo)) 495 if (option (Opt_reverseVideo))
515 { 496 {
… …
553 return cmd_argv; 534 return cmd_argv;
554} 535}
555 536
556/*----------------------------------------------------------------------*/ 537/*----------------------------------------------------------------------*/
557void 538void
539rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
540{
541 this->envv = envv;
542
543 SET_R (this);
544 set_locale ("");
545 set_environ (envv); // a few things in X do not call setlocale :(
546
547 init_vars ();
548
549 init_secondary ();
550
551 const char **cmd_argv = init_resources (argc, argv);
552
553#ifdef KEYSYM_RESOURCE
554 keyboard->register_done ();
555#endif
556
557 if (const char *path = rs[Rs_chdir])
558 if (*path) // ignored if empty
559 {
560 if (*path != '/')
561 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
562
563 if (chdir (path))
564 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
565 }
566
567 if (option (Opt_scrollBar))
568 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
569
570 pty = ptytty::create ();
571
572 create_windows (argc, argv);
573
574 init_xlocale ();
575
576 scr_poweron (); // initialize screen
577
578#if 0
579 XSynchronize (dpy, True);
580#endif
581
582 if (option (Opt_scrollBar))
583 scrollBar.resize (); /* create and map scrollbar */
584#ifdef HAVE_BG_PIXMAP
585 {
586 bgPixmap.set_target (this);
587 bgPixmap.invalidate ();
588
589#ifdef ENABLE_TRANSPARENCY
590 if (option (Opt_transparent))
591 {
592 bgPixmap.set_transparent ();
593
594#ifdef HAVE_AFTERIMAGE
595 if (rs [Rs_blurradius])
596 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
597#endif
598 if (ISSET_PIXCOLOR (Color_tint))
599 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
600
601 if (rs [Rs_shade])
602 bgPixmap.set_shade (rs [Rs_shade]);
603
604 bgPixmap.set_root_pixmap ();
605 XSelectInput (dpy, display->root, PropertyChangeMask);
606 rootwin_ev.start (display, display->root);
607 }
608#endif
609
610#ifdef BG_IMAGE_FROM_FILE
611 if (rs[Rs_backgroundPixmap])
612 {
613 const char *p = rs[Rs_backgroundPixmap];
614
615 if ((p = strchr (p, ';')) != 0)
616 {
617 p++;
618 bgPixmap.set_geometry (p);
619 }
620 else
621 bgPixmap.set_defaultGeometry ();
622
623 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
624 if (!bgPixmap.window_position_sensitive ())
625 update_background ();
626 }
627#endif
628 }
629#endif
630
631#if ENABLE_PERL
632 rootwin_ev.start (display, display->root);
633#endif
634
635 set_colorfgbg ();
636
637 init_command (cmd_argv);
638
639 free (cmd_argv);
640
641 if (pty->pty >= 0)
642 pty_ev.start (pty->pty, ev::READ);
643
644 HOOK_INVOKE ((this, HOOK_START, DT_END));
645
646#if ENABLE_XEMBED
647 if (rs[Rs_embed])
648 {
649 long info[2] = { 0, XEMBED_MAPPED };
650
651 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
652 32, PropModeReplace, (unsigned char *)&info, 2);
653 }
654#endif
655
656 XMapWindow (dpy, vt);
657 XMapWindow (dpy, parent[0]);
658
659 refresh_check ();
660}
661
662/*----------------------------------------------------------------------*/
663void
558rxvt_term::init_env () 664rxvt_term::init_env ()
559{ 665{
560 int i; 666 int i;
561 char *val; 667 char *val;
562 668
… …
737 run_command (argv); 843 run_command (argv);
738} 844}
739 845
740/*----------------------------------------------------------------------*/ 846/*----------------------------------------------------------------------*/
741void 847void
742rxvt_term::Get_Colours () 848rxvt_term::get_colours ()
743{ 849{
744 int i; 850 int i;
745 851
746#ifdef OFF_FOCUS_FADING 852#ifdef OFF_FOCUS_FADING
747 pix_colors = pix_colors_focused; 853 pix_colors = pix_colors_focused;
… …
807 * get scrollBar shadow colors 913 * get scrollBar shadow colors
808 * 914 *
809 * The calculations of topShadow/bottomShadow values are adapted 915 * The calculations of topShadow/bottomShadow values are adapted
810 * from the fvwm window manager. 916 * from the fvwm window manager.
811 */ 917 */
812#ifdef KEEP_SCROLLCOLOR 918#ifdef RXVT_SCROLLBAR
813 if (depth <= 2) 919 if (depth <= 2)
814 { 920 {
815 /* Monochrome */ 921 /* Monochrome */
816 alias_color (Color_scroll, Color_fg); 922 alias_color (Color_scroll, Color_fg);
817 alias_color (Color_topShadow, Color_bg); 923 alias_color (Color_topShadow, Color_bg);
… …
832 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 938 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
833 cscroll.a) 939 cscroll.a)
834 )) 940 ))
835 alias_color (Color_topShadow, Color_White); 941 alias_color (Color_topShadow, Color_White);
836 } 942 }
837#endif /* KEEP_SCROLLCOLOR */ 943#endif
838 944
839#ifdef OFF_FOCUS_FADING 945#ifdef OFF_FOCUS_FADING
840 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 946 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
841 update_fade_color (i); 947 update_fade_color (i);
842#endif 948#endif
… …
964 Window top, parent; 1070 Window top, parent;
965 1071
966 dLocal (Display *, dpy); 1072 dLocal (Display *, dpy);
967 1073
968 /* grab colors before netscape does */ 1074 /* grab colors before netscape does */
969 Get_Colours (); 1075 get_colours ();
970 1076
971 if (!set_fonts ()) 1077 if (!set_fonts ())
972 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1078 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
973 1079
974 parent = display->root; 1080 parent = display->root;
… …
1022 this->parent[0] = top; 1128 this->parent[0] = top;
1023 1129
1024 old_width = szHint.width; 1130 old_width = szHint.width;
1025 old_height = szHint.height; 1131 old_height = szHint.height;
1026 1132
1027 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1133 set_title (rs [Rs_title]);
1028 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1134 set_icon_name (rs [Rs_iconName]);
1029 1135
1030 classHint.res_name = (char *)rs[Rs_name]; 1136 classHint.res_name = (char *)rs[Rs_name];
1031 classHint.res_class = (char *)RESCLASS; 1137 classHint.res_class = (char *)RESCLASS;
1032 1138
1033 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1139 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1035 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1141 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1036 wmHint.window_group = top; 1142 wmHint.window_group = top;
1037 1143
1038 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1144 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1039 &szHint, &wmHint, &classHint); 1145 &szHint, &wmHint, &classHint);
1146#if ENABLE_EWMH
1147# ifdef HAVE_AFTERIMAGE
1148 /*
1149 * set up icon hint
1150 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1151 */
1152
1153 if (rs [Rs_iconfile])
1154 {
1155 init_asv ();
1156
1157 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1158 if (asv && im)
1159 {
1160 int w = im->width;
1161 int h = im->height;
1162 long* buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1163 ASImage *result = scale_asimage (asv, im,
1164 w, h, ASA_ARGB32,
1165 100, ASIMAGE_QUALITY_DEFAULT);
1166 destroy_asimage (&im);
1167
1168 if (buffer && result)
1169 {
1170 ARGB32 *asbuf = result->alt.argb32;
1171 buffer [0] = w;
1172 buffer [1] = h;
1173
1174 for (unsigned int i = 0; i < w * h; ++i)
1175 buffer [i + 2] = asbuf [i];
1176
1177 destroy_asimage (&result);
1178 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1179 PropModeReplace, (const unsigned char*) buffer, 2 + w * h);
1180 free (buffer);
1181 }
1182 else
1183 {
1184 if (!buffer)
1185 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1186
1187 if (!result)
1188 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1189 }
1190 }
1191 else
1192 rxvt_warn ("Loading image icon failed, continuing without.\n");
1193 }
1194# endif
1195#endif
1040 1196
1041#if ENABLE_FRILLS 1197#if ENABLE_FRILLS
1042 if (mwmhints.flags) 1198 if (mwmhints.flags)
1043 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1199 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1044 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1200 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1078 1234
1079 termwin_ev.start (display, top); 1235 termwin_ev.start (display, top);
1080 1236
1081 /* vt cursor: Black-on-White is standard, but this is more popular */ 1237 /* vt cursor: Black-on-White is standard, but this is more popular */
1082 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1238 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1083
1084#ifdef HAVE_SCROLLBARS
1085 /* cursor scrollBar: Black-on-White */
1086 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1087#endif
1088 1239
1089 /* the vt window */ 1240 /* the vt window */
1090 vt = XCreateSimpleWindow (dpy, top, 1241 vt = XCreateSimpleWindow (dpy, top,
1091 window_vt_x, window_vt_y, 1242 window_vt_x, window_vt_y,
1092 width, height, 1243 width, height,
… …
1117 GCForeground | GCBackground | GCGraphicsExposures, 1268 GCForeground | GCBackground | GCGraphicsExposures,
1118 &gcvalue); 1269 &gcvalue);
1119 1270
1120 drawable = new rxvt_drawable (this, vt); 1271 drawable = new rxvt_drawable (this, vt);
1121 1272
1122#ifdef RXVT_SCROLLBAR
1123 gcvalue.foreground = pix_colors[Color_topShadow];
1124 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1125 gcvalue.foreground = pix_colors[Color_bottomShadow];
1126 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1127 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1128 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1129#endif
1130
1131#ifdef OFF_FOCUS_FADING 1273#ifdef OFF_FOCUS_FADING
1132 // initially we are in unfocused state 1274 // initially we are in unfocused state
1133 if (rs[Rs_fade]) 1275 if (rs[Rs_fade])
1134 pix_colors = pix_colors_unfocused; 1276 pix_colors = pix_colors_unfocused;
1135#endif 1277#endif
… …
1140 1282
1141/* ------------------------------------------------------------------------- * 1283/* ------------------------------------------------------------------------- *
1142 * GET TTY CURRENT STATE * 1284 * GET TTY CURRENT STATE *
1143 * ------------------------------------------------------------------------- */ 1285 * ------------------------------------------------------------------------- */
1144void 1286void
1145rxvt_get_ttymode (ttymode_t *tio, int erase) 1287rxvt_get_ttymode (struct termios *tio, int erase)
1146{ 1288{
1147 /* 1289 /*
1148 * standard System V termios interface 1290 * standard System V termios interface
1149 */ 1291 */
1150 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1292 if (tcgetattr (STDIN_FILENO, tio) < 0)
1151 { 1293 {
1152 // return error - use system defaults, 1294 // return error - use system defaults,
1153 // where possible, and zero elsewhere 1295 // where possible, and zero elsewhere
1154 memset (tio, 0, sizeof (ttymode_t)); 1296 memset (tio, 0, sizeof (struct termios));
1155 1297
1156 tio->c_cc[VINTR] = CINTR; 1298 tio->c_cc[VINTR] = CINTR;
1157 tio->c_cc[VQUIT] = CQUIT; 1299 tio->c_cc[VQUIT] = CQUIT;
1158 tio->c_cc[VERASE] = CERASE; 1300 tio->c_cc[VERASE] = CERASE;
1159#ifdef VERASE2 1301#ifdef VERASE2
… …
1338 else 1480 else
1339#endif 1481#endif
1340 er = -1; 1482 er = -1;
1341 1483
1342 rxvt_get_ttymode (&tio, er); 1484 rxvt_get_ttymode (&tio, er);
1343 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1485 /* init terminal attributes */
1486 cfsetospeed (&tio, BAUDRATE);
1487 cfsetispeed (&tio, BAUDRATE);
1488 tcsetattr (pty->tty, TCSANOW, &tio);
1344 pty->set_utf8_mode (enc_utf8); 1489 pty->set_utf8_mode (enc_utf8);
1345 1490
1346 /* set initial window size */ 1491 /* set initial window size */
1347 tt_winch (); 1492 tt_winch ();
1348 1493
… …
1440 signal (SIGTSTP, SIG_IGN); 1585 signal (SIGTSTP, SIG_IGN);
1441 signal (SIGTTIN, SIG_IGN); 1586 signal (SIGTTIN, SIG_IGN);
1442 signal (SIGTTOU, SIG_IGN); 1587 signal (SIGTTOU, SIG_IGN);
1443#endif /* SIGTSTP */ 1588#endif /* SIGTSTP */
1444 1589
1445 // unblock signals (signals are blocked by iom.C
1446 sigset_t ss;
1447 sigemptyset (&ss);
1448 sigprocmask (SIG_SETMASK, &ss, 0);
1449
1450 /* command interpreter path */ 1590 /* command interpreter path */
1451 if (argv) 1591 if (argv)
1452 { 1592 {
1453# ifdef DEBUG_CMD 1593# ifdef DEBUG_CMD
1454 int i; 1594 int i;
… …
1465 const char *argv0, *shell; 1605 const char *argv0, *shell;
1466 1606
1467 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1607 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1468 shell = "/bin/sh"; 1608 shell = "/bin/sh";
1469 1609
1470 argv0 = (const char *)rxvt_basename (shell); 1610 argv0 = rxvt_basename (shell);
1471 1611
1472 if (option (Opt_loginShell)) 1612 if (option (Opt_loginShell))
1473 { 1613 {
1474 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1614 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1475 1615

Diff Legend

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