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

Diff Legend

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