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.151 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.213 by root, Fri Sep 14 10:15:41 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>
… …
43const char *const def_colorName[] = 43const char *const def_colorName[] =
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 49 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 50 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 56 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 57# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 59# endif
60 /* high-intensity colors */ 60 /* high-intensity colors */
61# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 63# else
64 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 65# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 73
74 // 88 xterm colours 74 // 88 xterm colours
75 "rgb:00/00/00", 75 "rgb:00/00/00",
76 "rgb:00/00/8b", 76 "rgb:00/00/8b",
77 "rgb:00/00/cd", 77 "rgb:00/00/cd",
… …
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 "black", 175 "rgb:00/00/00",
176#endif
177 };
178
179const char *const xa_names[] =
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#if ENABLE_XEMBED
209 "_XEMBED",
210 "_XEMBED_INFO",
211#endif 176#endif
212 }; 177 };
213 178
214bool 179bool
215rxvt_term::init_vars () 180rxvt_term::init_vars ()
216{ 181{
182 pix_colors = //
217 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
218#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
219 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
220#endif 186#endif
221 pix_colors = pix_colors_focused;
222 187
223 if (pix_colors == NULL)
224 return false;
225
226#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
227 pixmap = None;
228#endif
229 188
230 MEvent.time = CurrentTime; 189 MEvent.time = CurrentTime;
231 MEvent.button = AnyButton; 190 MEvent.button = AnyButton;
232 options = DEFAULT_OPTIONS;
233 want_refresh = 1; 191 want_refresh = 1;
234 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
235 focus = 0;
236 ncol = 80; 193 ncol = 80;
237 nrow = 24; 194 nrow = 24;
238 int_bwidth = INTERNALBORDERWIDTH; 195 int_bwidth = INTERNALBORDERWIDTH;
239 ext_bwidth = EXTERNALBORDERWIDTH; 196 ext_bwidth = EXTERNALBORDERWIDTH;
240 lineSpace = LINESPACE; 197 lineSpace = LINESPACE;
241 saveLines = SAVELINES; 198 saveLines = SAVELINES;
242 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
243 200
244 refresh_limit = 1;
245 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
246 prev_nrow = prev_ncol = 0;
247 202
248 oldcursor.row = oldcursor.col = -1; 203 oldcursor.row = oldcursor.col = -1;
249#ifdef XPM_BACKGROUND
250 /* bgPixmap.w = bgPixmap.h = 0; */
251 bgPixmap.x = bgPixmap.y = 50;
252 bgPixmap.pixmap = None;
253#endif
254
255 last_bot = last_state = -1; 204 last_bot = last_state = -1;
205
206 set_option (Opt_scrollBar);
207 set_option (Opt_scrollTtyOutput);
208 set_option (Opt_jumpScroll);
209 set_option (Opt_skipScroll);
210 set_option (Opt_secondaryScreen);
211 set_option (Opt_secondaryScroll);
212 set_option (Opt_pastableTabs);
213 set_option (Opt_intensityStyles);
214 set_option (Opt_iso14755_52);
256 215
257 return true; 216 return true;
258} 217}
259 218
260void 219void
… …
294/*----------------------------------------------------------------------*/ 253/*----------------------------------------------------------------------*/
295const char ** 254const char **
296rxvt_term::init_resources (int argc, const char *const *argv) 255rxvt_term::init_resources (int argc, const char *const *argv)
297{ 256{
298 int i, r_argc; 257 int i, r_argc;
299 char *val;
300 const char **cmd_argv, **r_argv; 258 const char **cmd_argv, **r_argv;
301 259
302 /* 260 /*
303 * Look for -exec option. Find => split and make cmd_argv[] of command args 261 * Look for -e option. Find => split and make cmd_argv[] of command args
304 */ 262 */
305 for (r_argc = 0; r_argc < argc; r_argc++) 263 for (r_argc = 0; r_argc < argc; r_argc++)
306 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 264 if (!strcmp (argv[r_argc], "-e"))
307 break; 265 break;
308 266
309 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 267 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
310 268
311 for (i = 0; i < r_argc; i++) 269 for (i = 0; i < r_argc; i++)
… …
323 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 281 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
324 282
325 cmd_argv[i] = NULL; 283 cmd_argv[i] = NULL;
326 } 284 }
327 285
328 rs[Rs_name] = rxvt_r_basename (argv[0]); 286 rs[Rs_name] = rxvt_basename (argv[0]);
329 287
330 /* 288 /*
331 * Open display, get options/resources and create the window 289 * Open display, get options/resources and create the window
332 */ 290 */
333 291
… …
337 get_options (r_argc, r_argv); 295 get_options (r_argc, r_argv);
338 296
339 if (!(display = displays.get (rs[Rs_display_name]))) 297 if (!(display = displays.get (rs[Rs_display_name])))
340 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 298 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
341 299
300 // using a local pointer decreases code size a lot
301 xa = display->xa;
302
303 set (display);
342 extract_resources (); 304 extract_resources ();
343 305
306#if XFT
307 if (rs[Rs_depth])
308 select_visual (strtol (rs[Rs_depth], 0, 0));
309#endif
310
311#ifdef HAVE_AFTERIMAGE
312 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
313#endif
344 free (r_argv); 314 free (r_argv);
315
316 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef)
318 rs [i] = 0;
345 319
346#if ENABLE_PERL 320#if ENABLE_PERL
347 if (!rs[Rs_perl_ext_1]) 321 if (!rs[Rs_perl_ext_1])
348 rs[Rs_perl_ext_1] = "default"; 322 rs[Rs_perl_ext_1] = "default";
349 323
… …
360 * set any defaults not already set 334 * set any defaults not already set
361 */ 335 */
362 if (cmd_argv && cmd_argv[0]) 336 if (cmd_argv && cmd_argv[0])
363 { 337 {
364 if (!rs[Rs_title]) 338 if (!rs[Rs_title])
365 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 339 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
366 if (!rs[Rs_iconName]) 340 if (!rs[Rs_iconName])
367 rs[Rs_iconName] = rs[Rs_title]; 341 rs[Rs_iconName] = rs[Rs_title];
368 } 342 }
369 else 343 else
370 { 344 {
… …
408 rs[Rs_cutchars] = CUTCHARS; 382 rs[Rs_cutchars] = CUTCHARS;
409 383
410#ifndef NO_BACKSPACE_KEY 384#ifndef NO_BACKSPACE_KEY
411 if (!rs[Rs_backspace_key]) 385 if (!rs[Rs_backspace_key])
412# ifdef DEFAULT_BACKSPACE 386# ifdef DEFAULT_BACKSPACE
413 key_backspace = DEFAULT_BACKSPACE; 387 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
414# else 388# else
415 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 389 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
416# endif 390# endif
417 else
418 {
419 val = strdup (rs[Rs_backspace_key]);
420 rxvt_Str_trim (val);
421 rxvt_Str_escaped (val);
422 key_backspace = val;
423 }
424#endif 391#endif
425 392
426#ifndef NO_DELETE_KEY 393#ifndef NO_DELETE_KEY
427 if (!rs[Rs_delete_key]) 394 if (!rs[Rs_delete_key])
428# ifdef DEFAULT_DELETE 395# ifdef DEFAULT_DELETE
429 key_delete = DEFAULT_DELETE; 396 rs[Rs_delete_key] = DEFAULT_DELETE;
430# else 397# else
431 key_delete = "\033[3~"; 398 rs[Rs_delete_key] = "\033[3~";
432# endif
433 else
434 {
435 val = strdup (rs[Rs_delete_key]);
436 rxvt_Str_trim (val);
437 rxvt_Str_escaped (val);
438 key_delete = val;
439 }
440#endif 399# endif
441 if (rs[Rs_answerbackstring]) 400#endif
442 {
443 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
444 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
445 }
446 401
447#ifdef HAVE_SCROLLBARS 402#ifdef HAVE_SCROLLBARS
448 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 403 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
449#endif 404#endif
450 405
451#ifdef XTERM_REVERSE_VIDEO 406#ifdef XTERM_REVERSE_VIDEO
452 /* this is how xterm implements reverseVideo */ 407 /* this is how xterm implements reverseVideo */
453 if (OPTION (Opt_reverseVideo)) 408 if (option (Opt_reverseVideo))
454 { 409 {
455 if (!rs[Rs_color + Color_fg]) 410 if (!rs[Rs_color + Color_fg])
456 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 411 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
412
457 if (!rs[Rs_color + Color_bg]) 413 if (!rs[Rs_color + Color_bg])
458 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 414 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
459 } 415 }
460#endif 416#endif
461 417
… …
463 if (!rs[Rs_color + i]) 419 if (!rs[Rs_color + i])
464 rs[Rs_color + i] = def_colorName[i]; 420 rs[Rs_color + i] = def_colorName[i];
465 421
466#ifndef XTERM_REVERSE_VIDEO 422#ifndef XTERM_REVERSE_VIDEO
467 /* this is how we implement reverseVideo */ 423 /* this is how we implement reverseVideo */
468 if (OPTION (Opt_reverseVideo)) 424 if (option (Opt_reverseVideo))
469 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 425 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
470#endif 426#endif
471 427
472 /* convenient aliases for setting fg/bg to colors */ 428 /* convenient aliases for setting fg/bg to colors */
473 color_aliases (Color_fg); 429 color_aliases (Color_fg);
… …
494/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
495void 451void
496rxvt_term::init_env () 452rxvt_term::init_env ()
497{ 453{
498 int i; 454 int i;
499 unsigned int u;
500 char *val; 455 char *val;
501 456
502#ifdef DISPLAY_IS_IP 457#ifdef DISPLAY_IS_IP
503 /* Fixup display_name for export over pty to any interested terminal 458 /* Fixup display_name for export over pty to any interested terminal
504 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 459 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
513 val = rxvt_network_display (rs[Rs_display_name]); 468 val = rxvt_network_display (rs[Rs_display_name]);
514 rs[Rs_display_name] = (const char *)val; 469 rs[Rs_display_name] = (const char *)val;
515 470
516 if (val == NULL) 471 if (val == NULL)
517#endif /* DISPLAY_IS_IP */ 472#endif /* DISPLAY_IS_IP */
518 val = XDisplayString (display->display); 473 val = XDisplayString (dpy);
519 474
520 if (rs[Rs_display_name] == NULL) 475 if (rs[Rs_display_name] == NULL)
521 rs[Rs_display_name] = val; /* use broken `:0' value */ 476 rs[Rs_display_name] = val; /* use broken `:0' value */
522 477
523 i = strlen (val); 478 i = strlen (val);
524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 479 env_display = (char *)rxvt_malloc (i + 9);
525 480
526 sprintf (env_display, "DISPLAY=%s", val); 481 sprintf (env_display, "DISPLAY=%s", val);
527 482
528 /* avoiding the math library: 483 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
529 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
530 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
531 ;
532 max_it (i, 1);
533 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
534
535 sprintf (env_windowid, "WINDOWID=%u",
536 (unsigned int)parent[0]);
537 484
538 /* add entries to the environment: 485 /* add entries to the environment:
539 * @ DISPLAY: in case we started with -display 486 * @ DISPLAY: in case we started with -display
540 * @ WINDOWID: X window id number of the window 487 * @ WINDOWID: X window id number of the window
541 * @ COLORTERM: terminal sub-name and also indicates its color 488 * @ COLORTERM: terminal sub-name and also indicates its color
… …
543 * @ TERMINFO: path to terminfo directory 490 * @ TERMINFO: path to terminfo directory
544 * @ COLORFGBG: fg;bg color codes 491 * @ COLORFGBG: fg;bg color codes
545 */ 492 */
546 putenv (env_display); 493 putenv (env_display);
547 putenv (env_windowid); 494 putenv (env_windowid);
495
548 if (env_colorfgbg) 496 if (env_colorfgbg)
549 putenv (env_colorfgbg); 497 putenv (env_colorfgbg);
550 498
551#ifdef RXVT_TERMINFO 499#ifdef RXVT_TERMINFO
552 putenv ("TERMINFO=" RXVT_TERMINFO); 500 putenv ("TERMINFO=" RXVT_TERMINFO);
553#endif 501#endif
554 502
555 if (display->depth <= 2) 503 if (depth <= 2)
556 putenv ("COLORTERM=" COLORTERMENV "-mono"); 504 putenv ("COLORTERM=" COLORTERMENV "-mono");
557 else 505 else
558 putenv ("COLORTERM=" COLORTERMENVFULL); 506 putenv ("COLORTERM=" COLORTERMENVFULL);
559 507
560 if (rs[Rs_term_name] != NULL) 508 if (rs[Rs_term_name] != NULL)
561 { 509 {
562 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 510 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
563 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 511 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
564 putenv (env_term); 512 putenv (env_term);
565 } 513 }
566 else 514 else
567 putenv ("TERM=" TERMENV); 515 putenv ("TERM=" TERMENV);
… …
654 * Initialize the command connection. 602 * Initialize the command connection.
655 * This should be called after the X server connection is established. 603 * This should be called after the X server connection is established.
656 */ 604 */
657 605
658#ifdef META8_OPTION 606#ifdef META8_OPTION
659 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 607 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
660#endif 608#endif
661 609
662 get_ourmods (); 610 get_ourmods ();
663 611
664 if (!OPTION (Opt_scrollTtyOutput)) 612 if (!option (Opt_scrollTtyOutput))
665 priv_modes |= PrivMode_TtyOutputInh; 613 priv_modes |= PrivMode_TtyOutputInh;
666 if (OPTION (Opt_scrollTtyKeypress)) 614 if (option (Opt_scrollTtyKeypress))
667 priv_modes |= PrivMode_Keypress; 615 priv_modes |= PrivMode_Keypress;
668 if (!OPTION (Opt_jumpScroll)) 616 if (!option (Opt_jumpScroll))
669 priv_modes |= PrivMode_smoothScroll; 617 priv_modes |= PrivMode_smoothScroll;
670 618
671#ifndef NO_BACKSPACE_KEY 619#ifndef NO_BACKSPACE_KEY
672 if (strcmp (key_backspace, "DEC") == 0) 620 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
673 priv_modes |= PrivMode_HaveBackSpace; 621 priv_modes |= PrivMode_HaveBackSpace;
674#endif 622#endif
675 623
676 /* add value for scrollBar */ 624 /* add value for scrollBar */
677 if (scrollBar.state) 625 if (scrollBar.state)
… …
691 639
692#ifdef OFF_FOCUS_FADING 640#ifdef OFF_FOCUS_FADING
693 pix_colors = pix_colors_focused; 641 pix_colors = pix_colors_focused;
694#endif 642#endif
695 643
696 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 644 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
697 { 645 {
646 const char *name = rs[Rs_color + i];
647
648 if (!name)
649 continue;
650
698 rxvt_color xcol; 651 rxvt_color xcol;
699 652
700 if (!rs[Rs_color + i]) 653 if (!set_color (xcol, name))
701 continue;
702
703 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
704 { 654 {
705#ifndef XTERM_REVERSE_VIDEO 655#ifndef XTERM_REVERSE_VIDEO
706 if (i < 2 && OPTION (Opt_reverseVideo)) 656 if (i < 2 && option (Opt_reverseVideo))
707 rs[Rs_color + i] = def_colorName[!i]; 657 name = def_colorName [1 - i];
708 else 658 else
709#endif 659#endif
710 rs[Rs_color + i] = def_colorName[i]; 660 name = def_colorName [i];
711 661
712 if (!rs[Rs_color + i]) 662 if (!name)
713 continue; 663 continue;
714 664
715 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 665 if (!set_color (xcol, name))
716 { 666 {
717 switch (i) 667 switch (i)
718 { 668 {
719 case Color_fg: 669 case Color_fg:
720 case Color_bg: 670 case Color_bg:
721 /* fatal: need bg/fg color */
722 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 671 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
723 /* NOTREACHED */ 672 name = "";
724 break; 673 break;
725#ifndef NO_CURSORCOLOR 674#ifndef NO_CURSORCOLOR
726 case Color_cursor2: 675 case Color_cursor2:
727 xcol = pix_colors[Color_fg]; 676#endif
728 break;
729#endif /* ! NO_CURSORCOLOR */
730 case Color_pointer_fg: 677 case Color_pointer_fg:
731 xcol = pix_colors[Color_fg]; 678 name = rs[Rs_color + Color_fg];
679 xcol.set (this, name);
732 break; 680 break;
733 default: 681 default:
734 xcol = pix_colors[Color_bg]; /* None */ 682 name = rs[Rs_color + Color_bg];
683 xcol.set (this, name);
735 break; 684 break;
736 } 685 }
737 } 686 }
738 } 687 }
739 688
740 pix_colors[i] = xcol; 689 pix_colors[i] = xcol;
741 SET_PIXCOLOR (i); 690 rs[Rs_color + i] = name;
742 }
743
744#ifdef OFF_FOCUS_FADING
745 if (rs[Rs_fade])
746 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
747 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
748#endif
749
750 if (display->depth <= 2)
751 { 691 }
692
693 if (depth <= 2)
694 {
752 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 695 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
753 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 696 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
754 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 697 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
755 } 698 }
756 699
757 /* 700 /*
758 * get scrollBar shadow colors 701 * get scrollBar shadow colors
759 * 702 *
760 * The calculations of topShadow/bottomShadow values are adapted 703 * The calculations of topShadow/bottomShadow values are adapted
761 * from the fvwm window manager. 704 * from the fvwm window manager.
762 */ 705 */
763#ifdef KEEP_SCROLLCOLOR 706#ifdef KEEP_SCROLLCOLOR
764
765 if (display->depth <= 2) 707 if (depth <= 2)
766 { 708 {
767 /* Monochrome */ 709 /* Monochrome */
768 pix_colors[Color_scroll] = pix_colors[Color_fg]; 710 alias_color (Color_scroll, Color_fg);
769 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 711 alias_color (Color_topShadow, Color_bg);
770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 712 alias_color (Color_bottomShadow, Color_bg);
771 } 713 }
772 else 714 else
773 { 715 {
774 rxvt_color xcol[2]; 716 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
775 /* xcol[0] == white
776 * xcol[1] == top shadow
777 * xcol[2] == bot shadow */
778 717
779 xcol[1] = pix_colors[Color_scroll]; 718 rgba cscroll;
780 xcol[0].set (display, 65535, 65535, 65535); 719 pix_colors [Color_scroll].get (cscroll);
781
782 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
783
784 xcol[0].get (display, pr0, pg0, pb0);
785 xcol[1].get (display, pr1, pg1, pb1);
786
787 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
788 720
789 /* topShadowColor */ 721 /* topShadowColor */
790 if (!xcol[1].set (display, 722 if (!pix_colors[Color_topShadow].set (this,
791 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 723 rgba (
792 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 724 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
793 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 725 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
794 xcol[1] = pix_colors[Color_White]; 726 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
795 727 cscroll.a)
796 pix_colors[Color_topShadow] = xcol[1]; 728 ))
729 alias_color (Color_topShadow, Color_White);
797 } 730 }
798#endif /* KEEP_SCROLLCOLOR */ 731#endif /* KEEP_SCROLLCOLOR */
732
733#ifdef OFF_FOCUS_FADING
734 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
735 update_fade_color (i);
736#endif
799} 737}
800 738
801/*----------------------------------------------------------------------*/ 739/*----------------------------------------------------------------------*/
802/* color aliases, fg/bg bright-bold */ 740/* color aliases, fg/bg bright-bold */
803void 741void
… …
842 780
843 if (rsmod 781 if (rsmod
844 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 782 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
845 requestedmeta = rsmod[3] - '0'; 783 requestedmeta = rsmod[3] - '0';
846 784
847 map = XGetModifierMapping (display->display); 785 map = XGetModifierMapping (dpy);
848 kc = map->modifiermap; 786 kc = map->modifiermap;
849 787
850 for (i = 1; i < 6; i++) 788 for (i = 1; i < 6; i++)
851 { 789 {
852 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 790 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
854 for (j = map->max_keypermod; j--; k++) 792 for (j = map->max_keypermod; j--; k++)
855 { 793 {
856 if (kc[k] == 0) 794 if (kc[k] == 0)
857 break; 795 break;
858 796
859 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 797 switch (XKeycodeToKeysym (dpy, kc[k], 0))
860 { 798 {
861 case XK_Num_Lock: 799 case XK_Num_Lock:
862 ModNumLockMask = modmasks[i - 1]; 800 ModNumLockMask = modmasks[i - 1];
863 continue; 801 continue;
864 802
… …
914rxvt_term::create_windows (int argc, const char *const *argv) 852rxvt_term::create_windows (int argc, const char *const *argv)
915{ 853{
916 XClassHint classHint; 854 XClassHint classHint;
917 XWMHints wmHint; 855 XWMHints wmHint;
918#if ENABLE_FRILLS 856#if ENABLE_FRILLS
919 Atom prop = None;
920 MWMHints mwmhints; 857 MWMHints mwmhints = { };
921#endif 858#endif
922 XGCValues gcvalue; 859 XGCValues gcvalue;
923 XSetWindowAttributes attributes; 860 XSetWindowAttributes attributes;
924 XWindowAttributes gattr;
925 Window top, parent; 861 Window top, parent;
926 dDisp;
927 862
928#ifdef USING_W11LIB 863 dLocal (Display *, dpy);
929 /* enable W11 callbacks */
930 W11AddEventHandler (disp, rxvt_W11_process_x_event);
931#endif
932
933 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
934 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
935
936 if (OPTION (Opt_transparent))
937 {
938 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
939 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
940 }
941 864
942 /* grab colors before netscape does */ 865 /* grab colors before netscape does */
943 Get_Colours (); 866 Get_Colours ();
944 867
945 if (!set_fonts ()) 868 if (!set_fonts ())
946 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 869 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
947 870
948 parent = DefaultRootWindow (disp); 871 parent = display->root;
949 872
950 attributes.override_redirect = !!OPTION (Opt_override_redirect); 873 attributes.override_redirect = !!option (Opt_override_redirect);
951 874
952#if ENABLE_FRILLS 875#if ENABLE_FRILLS
953 if (OPTION (Opt_borderLess)) 876 if (option (Opt_borderLess))
954 { 877 {
955 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 878 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
956
957 if (prop == None)
958 { 879 {
959 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 880 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
960 attributes.override_redirect = TRUE; 881 attributes.override_redirect = true;
961 mwmhints.flags = 0;
962 } 882 }
963 else 883 else
964 { 884 {
965 mwmhints.flags = MWM_HINTS_DECORATIONS; 885 mwmhints.flags = MWM_HINTS_DECORATIONS;
966 mwmhints.decorations = 0;
967 } 886 }
968 } 887 }
969 else
970 mwmhints.flags = 0;
971#endif 888#endif
972 889
973#if ENABLE_XEMBED 890#if ENABLE_XEMBED
974 if (rs[Rs_embed]) 891 if (rs[Rs_embed])
975 { 892 {
976 XWindowAttributes wattr; 893 XWindowAttributes wattr;
977 894
978 parent = strtol (rs[Rs_embed], 0, 0); 895 parent = strtol (rs[Rs_embed], 0, 0);
979 896
980 if (!XGetWindowAttributes (disp, parent, &wattr)) 897 if (!XGetWindowAttributes (dpy, parent, &wattr))
981 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 898 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
982 899
983 window_calc (wattr.width, wattr.height); 900 window_calc (wattr.width, wattr.height);
984 } 901 }
985#endif 902#endif
986 903
987 window_calc (0, 0); 904 window_calc (0, 0);
988 905
989 /* sub-window placement & size in rxvt_resize_subwindows () */ 906 /* sub-window placement & size in rxvt_resize_subwindows () */
990 attributes.background_pixel = pix_colors_focused[Color_border]; 907 attributes.background_pixel = pix_colors_focused [Color_border];
991 attributes.border_pixel = pix_colors_focused[Color_border]; 908 attributes.border_pixel = pix_colors_focused [Color_border];
992 attributes.colormap = display->cmap; 909 attributes.colormap = cmap;
910
993 top = XCreateWindow (disp, parent, 911 top = XCreateWindow (dpy, parent,
994 szHint.x, szHint.y, 912 szHint.x, szHint.y,
995 szHint.width, szHint.height, 913 szHint.width, szHint.height,
996 ext_bwidth, 914 ext_bwidth,
997 display->depth, InputOutput, 915 depth, InputOutput, visual,
998 display->visual,
999 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 916 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1000 &attributes); 917 &attributes);
1001 918
1002 this->parent[0] = top; 919 this->parent[0] = top;
1003 920
1004 old_width = szHint.width; 921 old_width = szHint.width;
1005 old_height = szHint.height; 922 old_height = szHint.height;
1006 923
1007 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 924 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1008 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 925 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1009 926
1010 classHint.res_name = (char *)rs[Rs_name]; 927 classHint.res_name = (char *)rs[Rs_name];
1011 classHint.res_class = (char *)RESCLASS; 928 classHint.res_class = (char *)RESCLASS;
1012 929
1013 wmHint.flags = InputHint | StateHint | WindowGroupHint; 930 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1014 wmHint.input = True; 931 wmHint.input = True;
1015 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 932 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1016 wmHint.window_group = top; 933 wmHint.window_group = top;
1017 934
1018 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 935 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1019 &szHint, &wmHint, &classHint); 936 &szHint, &wmHint, &classHint);
937
938#if ENABLE_FRILLS
939 if (mwmhints.flags)
940 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
941 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
942#endif
1020 943
1021 Atom protocols[] = { 944 Atom protocols[] = {
1022 xa[XA_WM_DELETE_WINDOW], 945 xa[XA_WM_DELETE_WINDOW],
1023#if ENABLE_EWMH 946#if ENABLE_EWMH
1024 xa[XA_NET_WM_PING], 947 xa[XA_NET_WM_PING],
1025#endif 948#endif
1026 }; 949 };
1027 950
1028 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 951 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1029 952
1030#if ENABLE_FRILLS 953#if ENABLE_FRILLS
1031 if (rs[Rs_transient_for]) 954 if (rs[Rs_transient_for])
1032 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 955 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1033#endif 956#endif
1034 957
1035#if ENABLE_EWMH 958#if ENABLE_EWMH
1036 long pid = getpid (); 959 long pid = getpid ();
1037 960
1038 XChangeProperty (disp, top, 961 XChangeProperty (dpy, top,
1039 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 962 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1040 PropModeReplace, (unsigned char *)&pid, 1); 963 PropModeReplace, (unsigned char *)&pid, 1);
1041 964
1042 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 965 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1043#endif 966#endif
1044 967
1045 XSelectInput (disp, top, 968 XSelectInput (dpy, top,
1046 KeyPressMask 969 KeyPressMask
1047#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 970#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1048 | KeyReleaseMask 971 | KeyReleaseMask
1049#endif 972#endif
1050 | FocusChangeMask | VisibilityChangeMask 973 | FocusChangeMask | VisibilityChangeMask
1051 | ExposureMask | StructureNotifyMask); 974 | ExposureMask | StructureNotifyMask);
1052 975
1053 termwin_ev.start (display, top); 976 termwin_ev.start (display, top);
1054 977
1055#if ENABLE_FRILLS
1056 if (mwmhints.flags)
1057 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1058 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1059#endif
1060
1061 /* vt cursor: Black-on-White is standard, but this is more popular */ 978 /* vt cursor: Black-on-White is standard, but this is more popular */
1062 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 979 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1063 980
1064#ifdef HAVE_SCROLLBARS 981#ifdef HAVE_SCROLLBARS
1065 /* cursor scrollBar: Black-on-White */ 982 /* cursor scrollBar: Black-on-White */
1066 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 983 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1067#endif 984#endif
1068 985
1069 /* the vt window */ 986 /* the vt window */
1070 vt = XCreateSimpleWindow (disp, top, 987 vt = XCreateSimpleWindow (dpy, top,
1071 window_vt_x,
1072 window_vt_y, 988 window_vt_x, window_vt_y,
1073 width,
1074 height, 989 width, height,
1075 0, 990 0,
1076 pix_colors_focused[Color_fg], 991 pix_colors_focused[Color_fg],
1077 pix_colors_focused[Color_bg]); 992 pix_colors_focused[Color_bg]);
1078#ifdef DEBUG_X
1079 XStoreName (disp, vt, "vt window");
1080#endif
1081 993
1082 attributes.bit_gravity = NorthWestGravity; 994 attributes.bit_gravity = NorthWestGravity;
1083 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 995 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1084 996
1085 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 997 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1086 998
1087 if (OPTION (Opt_pointerBlank)) 999 if (option (Opt_pointerBlank))
1088 vt_emask |= PointerMotionMask; 1000 vt_emask |= PointerMotionMask;
1089 else 1001 else
1090 vt_emask |= Button1MotionMask | Button3MotionMask; 1002 vt_emask |= Button1MotionMask | Button3MotionMask;
1091 1003
1092 vt_select_input (); 1004 vt_select_input ();
1093 1005
1094 vt_ev.start (display, vt); 1006 vt_ev.start (display, vt);
1095 1007
1096#ifdef XPM_BACKGROUND
1097 if (rs[Rs_backgroundPixmap] != NULL
1098 && ! OPTION (Opt_transparent))
1099 {
1100 const char *p = rs[Rs_backgroundPixmap];
1101
1102 if ((p = strchr (p, ';')) != NULL)
1103 {
1104 p++;
1105 scale_pixmap (p);
1106 }
1107
1108 set_bgPixmap (rs[Rs_backgroundPixmap]);
1109 scr_touch (true);
1110 }
1111#endif
1112
1113 /* graphics context for the vt window */ 1008 /* graphics context for the vt window */
1114 gcvalue.foreground = pix_colors[Color_fg]; 1009 gcvalue.foreground = pix_colors[Color_fg];
1115 gcvalue.background = pix_colors[Color_bg]; 1010 gcvalue.background = pix_colors[Color_bg];
1116 gcvalue.graphics_exposures = 1; 1011 gcvalue.graphics_exposures = 0;
1012
1117 gc = XCreateGC (disp, vt, 1013 gc = XCreateGC (dpy, vt,
1118 GCForeground | GCBackground | GCGraphicsExposures, 1014 GCForeground | GCBackground | GCGraphicsExposures,
1119 &gcvalue); 1015 &gcvalue);
1120 1016
1121 drawable = new rxvt_drawable (display, vt); 1017 drawable = new rxvt_drawable (this, vt);
1122 1018
1123#ifdef RXVT_SCROLLBAR 1019#ifdef RXVT_SCROLLBAR
1124 gcvalue.foreground = pix_colors[Color_topShadow]; 1020 gcvalue.foreground = pix_colors[Color_topShadow];
1125 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1021 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1126 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1022 gcvalue.foreground = pix_colors[Color_bottomShadow];
1127 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1023 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1128 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1024 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1129 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1025 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1130#endif 1026#endif
1131 1027
1132#ifdef OFF_FOCUS_FADING 1028#ifdef OFF_FOCUS_FADING
1133 // initially we are in unfocused state 1029 // initially we are in unfocused state
1134 if (rs[Rs_fade]) 1030 if (rs[Rs_fade])
1135 pix_colors = pix_colors_unfocused; 1031 pix_colors = pix_colors_unfocused;
1136#endif 1032#endif
1137 1033
1138 pointer_unblank (); 1034 pointer_unblank ();
1139 scr_recolour (); 1035 scr_recolour ();
1140
1141#if ENABLE_XEMBED
1142 if (rs[Rs_embed])
1143 {
1144 long info[2] = { 0, XEMBED_MAPPED };
1145
1146 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1147 32, PropModeReplace, (unsigned char *)&info, 2);
1148 }
1149#endif
1150} 1036}
1151 1037
1152/* ------------------------------------------------------------------------- * 1038/* ------------------------------------------------------------------------- *
1153 * GET TTY CURRENT STATE * 1039 * GET TTY CURRENT STATE *
1154 * ------------------------------------------------------------------------- */ 1040 * ------------------------------------------------------------------------- */
1155void 1041void
1156rxvt_get_ttymode (ttymode_t *tio, int erase) 1042rxvt_get_ttymode (ttymode_t *tio, int erase)
1157{ 1043{
1158#ifdef HAVE_TERMIOS_H
1159 /* 1044 /*
1160 * standard System V termios interface 1045 * standard System V termios interface
1161 */ 1046 */
1162 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1047 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1163 { 1048 {
… …
1230 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1115 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1231# if defined (ECHOCTL) && defined (ECHOKE) 1116# if defined (ECHOCTL) && defined (ECHOKE)
1232 | ECHOCTL | ECHOKE 1117 | ECHOCTL | ECHOKE
1233# endif 1118# endif
1234 | ECHOE | ECHOK); 1119 | ECHOE | ECHOK);
1235# else /* HAVE_TERMIOS_H */
1236
1237 /*
1238 * sgtty interface
1239 */
1240
1241 /* get parameters -- gtty */
1242 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1243 {
1244 tio->sg.sg_erase = CERASE; /* ^H */
1245 tio->sg.sg_kill = CKILL; /* ^U */
1246 }
1247
1248 if (erase != -1)
1249 tio->sg.sg_erase = (char)erase;
1250
1251 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1252
1253 /* get special characters */
1254 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1255 {
1256 tio->tc.t_intrc = CINTR; /* ^C */
1257 tio->tc.t_quitc = CQUIT; /* ^\ */
1258 tio->tc.t_startc = CSTART; /* ^Q */
1259 tio->tc.t_stopc = CSTOP; /* ^S */
1260 tio->tc.t_eofc = CEOF; /* ^D */
1261 tio->tc.t_brkc = -1;
1262 }
1263
1264 /* get local special chars */
1265 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1266 {
1267 tio->lc.t_suspc = CSUSP; /* ^Z */
1268 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1269 tio->lc.t_rprntc = CRPRNT; /* ^R */
1270 tio->lc.t_flushc = CFLUSH; /* ^O */
1271 tio->lc.t_werasc = CWERASE; /* ^W */
1272 tio->lc.t_lnextc = CLNEXT; /* ^V */
1273 }
1274 /* get line discipline */
1275 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1276# ifdef NTTYDISC
1277 tio->line = NTTYDISC;
1278# endif /* NTTYDISC */
1279
1280 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1281#endif /* HAVE_TERMIOS_H */
1282 1120
1283 /* 1121 /*
1284 * Debugging 1122 * Debugging
1285 */ 1123 */
1286#ifdef DEBUG_TTYMODE 1124#ifdef DEBUG_TTYMODE
… …
1387 else 1225 else
1388#endif 1226#endif
1389 if (!pty->get ()) 1227 if (!pty->get ())
1390 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1228 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1391 1229
1230 int er;
1231
1232#ifndef NO_BACKSPACE_KEY
1233 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1234 er = rs[Rs_backspace_key][0];
1235 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1236 er = '\177'; /* the initial state anyway */
1237 else
1238#endif
1239 er = -1;
1240
1241 rxvt_get_ttymode (&tio, er);
1242 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1392 pty->set_utf8_mode (enc_utf8); 1243 pty->set_utf8_mode (enc_utf8);
1393 1244
1394 /* set initial window size */ 1245 /* set initial window size */
1395 tt_winch (); 1246 tt_winch ();
1396
1397 int er;
1398
1399#ifndef NO_BACKSPACE_KEY
1400 if (key_backspace[0] && !key_backspace[1])
1401 er = key_backspace[0];
1402 else if (strcmp (key_backspace, "DEC") == 0)
1403 er = '\177'; /* the initial state anyway */
1404 else
1405#endif
1406 er = -1;
1407
1408 rxvt_get_ttymode (&tio, er);
1409 1247
1410#if ENABLE_FRILLS 1248#if ENABLE_FRILLS
1411 if (rs[Rs_pty_fd]) 1249 if (rs[Rs_pty_fd])
1412 return; 1250 return;
1413#endif 1251#endif
… …
1444 } 1282 }
1445 1283
1446 _exit (EXIT_FAILURE); 1284 _exit (EXIT_FAILURE);
1447 1285
1448 default: 1286 default:
1449#if UTMP_SUPPORT
1450 if (!OPTION (Opt_utmpInhibit)) 1287 if (!option (Opt_utmpInhibit))
1451 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1288 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1452#endif
1453 1289
1454 pty->close_tty (); 1290 pty->close_tty ();
1455 1291
1456 child_ev.start (cmd_pid); 1292 child_ev.start (cmd_pid);
1457 1293
… …
1470int 1306int
1471rxvt_term::run_child (const char *const *argv) 1307rxvt_term::run_child (const char *const *argv)
1472{ 1308{
1473 char *login; 1309 char *login;
1474 1310
1475 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1476
1477 if (OPTION (Opt_console)) 1311 if (option (Opt_console))
1478 { /* be virtual console, fail silently */ 1312 { /* be virtual console, fail silently */
1479#ifdef TIOCCONS 1313#ifdef TIOCCONS
1480 unsigned int on = 1; 1314 unsigned int on = 1;
1481 1315
1482 ioctl (STDIN_FILENO, TIOCCONS, &on); 1316 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1510 sigset_t ss; 1344 sigset_t ss;
1511 sigemptyset (&ss); 1345 sigemptyset (&ss);
1512 sigprocmask (SIG_SETMASK, &ss, 0); 1346 sigprocmask (SIG_SETMASK, &ss, 0);
1513 1347
1514 /* command interpreter path */ 1348 /* command interpreter path */
1515 if (argv != NULL) 1349 if (argv)
1516 { 1350 {
1517# ifdef DEBUG_CMD 1351# ifdef DEBUG_CMD
1518 int i; 1352 int i;
1519 1353
1520 for (i = 0; argv[i]; i++) 1354 for (i = 0; argv[i]; i++)
… …
1529 const char *argv0, *shell; 1363 const char *argv0, *shell;
1530 1364
1531 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1365 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1532 shell = "/bin/sh"; 1366 shell = "/bin/sh";
1533 1367
1534 argv0 = (const char *)rxvt_r_basename (shell); 1368 argv0 = (const char *)rxvt_basename (shell);
1535 1369
1536 if (OPTION (Opt_loginShell)) 1370 if (option (Opt_loginShell))
1537 { 1371 {
1538 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1372 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1539 1373
1540 login[0] = '-'; 1374 login[0] = '-';
1541 strcpy (&login[1], argv0); 1375 strcpy (&login[1], argv0);
1542 argv0 = login; 1376 argv0 = login;
1543 } 1377 }
1544 1378
1545 execlp (shell, argv0, NULL); 1379 execlp (shell, argv0, (char *)0);
1546 /* no error message: STDERR is closed! */ 1380 /* no error message: STDERR is closed! */
1547 } 1381 }
1548 1382
1549 return -1; 1383 return -1;
1550} 1384}

Diff Legend

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