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.130 by root, Wed Jan 4 04:42:45 2006 UTC vs.
Revision 1.191 by root, Tue Jul 24 14:32:47 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>
… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
15 * 15 *
16 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 19 * (at your option) any later version.
… …
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#ifndef NO_BRIGHTCOLOR 49 "rgb:cd/00/00", // 1: red (Red3)
50 "Red3", /* 1: red (#CD0000) */ 50 "rgb:00/cd/00", // 2: green (Green3)
51 "Green3", /* 2: green (#00CD00) */ 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Yellow3", /* 3: yellow (#CDCD00) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Blue3", /* 4: blue (#0000CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Magenta3", /* 5: magenta (#CD00CD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55 "Cyan3", /* 6: cyan (#00CDCD) */ 55# ifdef XTERM_COLORS
56# ifdef XTERM_COLORS 56 "rgb:e5/e5/e5", // 7: white (Grey90)
57 "Grey90", /* 7: white (#E5E5E5) */ 57# else
58# else 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59 "AntiqueWhite", /* 7: white (#FAEBD7) */
60# endif 59# endif
61 /* high-intensity colors */ 60 /* high-intensity colors */
62# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
63 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
64# else 63# else
65 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
66# endif 65# endif
67#endif /* NO_BRIGHTCOLOR */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
68 "Red", /* 1/9: bright red (#FF0000) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
69 "Green", /* 2/10: bright green (#00FF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
70 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
71 "Blue", /* 4/12: bright blue (#0000FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
72 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
73 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
74 "White", /* 7/15: bright white (#FFFFFF) */
75 73
76 // 88 xterm colours 74 // 88 xterm colours
77 "rgb:00/00/00", 75 "rgb:00/00/00",
78 "rgb:00/00/8b", 76 "rgb:00/00/8b",
79 "rgb:00/00/cd", 77 "rgb:00/00/cd",
… …
172#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
173#if TINTING 171#if TINTING
174 NULL, 172 NULL,
175#endif 173#endif
176#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
177 "black", 175 "rgb:00/00/00",
178#endif
179 };
180
181const char *const xa_names[] =
182 {
183 "TEXT",
184 "COMPOUND_TEXT",
185 "UTF8_STRING",
186 "MULTIPLE",
187 "TARGETS",
188 "TIMESTAMP",
189 "VT_SELECTION",
190 "INCR",
191 "WM_PROTOCOLS",
192 "WM_DELETE_WINDOW",
193 "CLIPBOARD",
194#if ENABLE_FRILLS
195 "_MOTIF_WM_HINTS",
196#endif
197#if ENABLE_EWMH
198 "_NET_WM_PID",
199 "_NET_WM_NAME",
200 "_NET_WM_ICON_NAME",
201 "_NET_WM_PING",
202#endif
203#if USE_XIM
204 "WM_LOCALE_NAME",
205#endif
206#ifdef TRANSPARENT
207 "_XROOTPMAP_ID",
208 "ESETROOT_PMAP_ID",
209#endif
210#ifdef OFFIX_DND
211 "DndProtocol",
212 "DndSelection",
213#endif
214#if ENABLE_XEMBED
215 "_XEMBED",
216 "_XEMBED_INFO",
217#endif 176#endif
218 }; 177 };
219 178
220bool 179bool
221rxvt_term::init_vars () 180rxvt_term::init_vars ()
222{ 181{
182 pix_colors = //
223 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
224#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
225 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
226#endif 186#endif
227 pix_colors = pix_colors_focused;
228 187
229 if (pix_colors == NULL)
230 return false;
231
232#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
233 pixmap = None; 189 pixmap = None;
234#endif 190#endif
235 191
236 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
237 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
238 options = DEFAULT_OPTIONS;
239 want_refresh = 1; 194 want_refresh = 1;
240 priv_modes = SavedModes = PrivMode_Default; 195 priv_modes = SavedModes = PrivMode_Default;
241 focus = 0;
242 ncol = 80; 196 ncol = 80;
243 nrow = 24; 197 nrow = 24;
244 int_bwidth = INTERNALBORDERWIDTH; 198 int_bwidth = INTERNALBORDERWIDTH;
245 ext_bwidth = EXTERNALBORDERWIDTH; 199 ext_bwidth = EXTERNALBORDERWIDTH;
246 lineSpace = LINESPACE; 200 lineSpace = LINESPACE;
247 saveLines = SAVELINES; 201 saveLines = SAVELINES;
248 numpix_colors = TOTAL_COLORS; 202 numpix_colors = TOTAL_COLORS;
249 203
250 refresh_limit = 1;
251 refresh_type = SLOW_REFRESH; 204 refresh_type = SLOW_REFRESH;
252 prev_nrow = prev_ncol = 0;
253 205
254 oldcursor.row = oldcursor.col = -1; 206 oldcursor.row = oldcursor.col = -1;
255#ifdef XPM_BACKGROUND 207#ifdef XPM_BACKGROUND
256 /* bgPixmap.w = bgPixmap.h = 0; */ 208 /* bgPixmap.w = bgPixmap.h = 0; */
257 bgPixmap.x = bgPixmap.y = 50; 209 bgPixmap.x = bgPixmap.y = 0;
258 bgPixmap.pixmap = None; 210 bgPixmap.pixmap = None;
259#endif 211#endif
260 212
261 last_bot = last_state = -1; 213 last_bot = last_state = -1;
262 214
263#ifdef MENUBAR 215 set_option (Opt_scrollBar);
264 menu_readonly = 1; 216 set_option (Opt_scrollTtyOutput);
265# if ! (MENUBAR_MAX > 1) 217 set_option (Opt_jumpScroll);
266 CurrentBar = &BarList; 218 set_option (Opt_skipScroll);
267# endif /* (MENUBAR_MAX > 1) */ 219 set_option (Opt_secondaryScreen);
268#endif 220 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles);
223 set_option (Opt_iso14755_52);
269 224
270 return true; 225 return true;
271} 226}
272 227
273void 228void
… …
311 int i, r_argc; 266 int i, r_argc;
312 char *val; 267 char *val;
313 const char **cmd_argv, **r_argv; 268 const char **cmd_argv, **r_argv;
314 269
315 /* 270 /*
316 * Look for -exec option. Find => split and make cmd_argv[] of command args 271 * Look for -e option. Find => split and make cmd_argv[] of command args
317 */ 272 */
318 for (r_argc = 0; r_argc < argc; r_argc++) 273 for (r_argc = 0; r_argc < argc; r_argc++)
319 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 274 if (!strcmp (argv[r_argc], "-e"))
320 break; 275 break;
321 276
322 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 277 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
323 278
324 for (i = 0; i < r_argc; i++) 279 for (i = 0; i < r_argc; i++)
… …
341 rs[Rs_name] = rxvt_r_basename (argv[0]); 296 rs[Rs_name] = rxvt_r_basename (argv[0]);
342 297
343 /* 298 /*
344 * Open display, get options/resources and create the window 299 * Open display, get options/resources and create the window
345 */ 300 */
301
346 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 302 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
347 rs[Rs_display_name] = ":0"; 303 rs[Rs_display_name] = ":0";
348 304
349 get_options (r_argc, r_argv); 305 get_options (r_argc, r_argv);
350 306
351 if (!(display = displays.get (rs[Rs_display_name]))) 307 if (!(display = displays.get (rs[Rs_display_name])))
352 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 308 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
353 309
310 // using a local pointer decreases code size a lot
311 xa = display->xa;
312
313 set (display);
354 extract_resources (); 314 extract_resources ();
315
316#if XFT
317 if (rs[Rs_depth])
318 select_visual (strtol (rs[Rs_depth], 0, 0));
319#endif
320
321#ifdef HAVE_AFTERIMAGE
322 ::dpy = NULL ; /* init global var from libAfter... */
323 asv = AFTERIMAGE_DPY_OP (create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL));
324#endif
355 free (r_argv); 325 free (r_argv);
326
327 for (int i = NUM_RESOURCES; i--; )
328 if (rs [i] == resval_undef)
329 rs [i] = 0;
330
331#if ENABLE_PERL
332 if (!rs[Rs_perl_ext_1])
333 rs[Rs_perl_ext_1] = "default";
334
335 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
336 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
337 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
338 {
339 rxvt_perl.init (this);
340 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
341 }
342#endif
356 343
357 /* 344 /*
358 * set any defaults not already set 345 * set any defaults not already set
359 */ 346 */
360 if (cmd_argv && cmd_argv[0]) 347 if (cmd_argv && cmd_argv[0])
… …
393 pointerBlankDelay = 2; 380 pointerBlankDelay = 2;
394#endif 381#endif
395 382
396 /* no point having a scrollbar without having any scrollback! */ 383 /* no point having a scrollbar without having any scrollback! */
397 if (!saveLines) 384 if (!saveLines)
398 CLR_OPTION (Opt_scrollBar); 385 set_option (Opt_scrollBar, 0);
399 386
400#ifdef PRINTPIPE 387#ifdef PRINTPIPE
401 if (!rs[Rs_print_pipe]) 388 if (!rs[Rs_print_pipe])
402 rs[Rs_print_pipe] = PRINTPIPE; 389 rs[Rs_print_pipe] = PRINTPIPE;
403#endif 390#endif
… …
446 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 433 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
447#endif 434#endif
448 435
449#ifdef XTERM_REVERSE_VIDEO 436#ifdef XTERM_REVERSE_VIDEO
450 /* this is how xterm implements reverseVideo */ 437 /* this is how xterm implements reverseVideo */
451 if (OPTION (Opt_reverseVideo)) 438 if (option (Opt_reverseVideo))
452 { 439 {
453 if (!rs[Rs_color + Color_fg]) 440 if (!rs[Rs_color + Color_fg])
454 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 441 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
442
455 if (!rs[Rs_color + Color_bg]) 443 if (!rs[Rs_color + Color_bg])
456 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 444 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
457 } 445 }
458#endif 446#endif
459 447
… …
461 if (!rs[Rs_color + i]) 449 if (!rs[Rs_color + i])
462 rs[Rs_color + i] = def_colorName[i]; 450 rs[Rs_color + i] = def_colorName[i];
463 451
464#ifndef XTERM_REVERSE_VIDEO 452#ifndef XTERM_REVERSE_VIDEO
465 /* this is how we implement reverseVideo */ 453 /* this is how we implement reverseVideo */
466 if (OPTION (Opt_reverseVideo)) 454 if (option (Opt_reverseVideo))
467 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 455 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
468#endif 456#endif
469 457
470 /* convenient aliases for setting fg/bg to colors */ 458 /* convenient aliases for setting fg/bg to colors */
471 color_aliases (Color_fg); 459 color_aliases (Color_fg);
… …
511 val = rxvt_network_display (rs[Rs_display_name]); 499 val = rxvt_network_display (rs[Rs_display_name]);
512 rs[Rs_display_name] = (const char *)val; 500 rs[Rs_display_name] = (const char *)val;
513 501
514 if (val == NULL) 502 if (val == NULL)
515#endif /* DISPLAY_IS_IP */ 503#endif /* DISPLAY_IS_IP */
516 val = XDisplayString (display->display); 504 val = XDisplayString (dpy);
517 505
518 if (rs[Rs_display_name] == NULL) 506 if (rs[Rs_display_name] == NULL)
519 rs[Rs_display_name] = val; /* use broken `:0' value */ 507 rs[Rs_display_name] = val; /* use broken `:0' value */
520 508
521 i = strlen (val); 509 i = strlen (val);
522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 510 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
523 511
524 sprintf (env_display, "DISPLAY=%s", val); 512 sprintf (env_display, "DISPLAY=%s", val);
525 513
526 /* avoiding the math library: 514 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
527 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
528 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
529 ;
530 max_it (i, 1);
531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
532
533 sprintf (env_windowid, "WINDOWID=%u",
534 (unsigned int)parent[0]);
535 515
536 /* add entries to the environment: 516 /* add entries to the environment:
537 * @ DISPLAY: in case we started with -display 517 * @ DISPLAY: in case we started with -display
538 * @ WINDOWID: X window id number of the window 518 * @ WINDOWID: X window id number of the window
539 * @ COLORTERM: terminal sub-name and also indicates its color 519 * @ COLORTERM: terminal sub-name and also indicates its color
… …
541 * @ TERMINFO: path to terminfo directory 521 * @ TERMINFO: path to terminfo directory
542 * @ COLORFGBG: fg;bg color codes 522 * @ COLORFGBG: fg;bg color codes
543 */ 523 */
544 putenv (env_display); 524 putenv (env_display);
545 putenv (env_windowid); 525 putenv (env_windowid);
526
546 if (env_colorfgbg) 527 if (env_colorfgbg)
547 putenv (env_colorfgbg); 528 putenv (env_colorfgbg);
548 529
549#ifdef RXVT_TERMINFO 530#ifdef RXVT_TERMINFO
550 putenv ("TERMINFO=" RXVT_TERMINFO); 531 putenv ("TERMINFO=" RXVT_TERMINFO);
551#endif 532#endif
552 533
553 if (display->depth <= 2) 534 if (depth <= 2)
554 putenv ("COLORTERM=" COLORTERMENV "-mono"); 535 putenv ("COLORTERM=" COLORTERMENV "-mono");
555 else 536 else
556 putenv ("COLORTERM=" COLORTERMENVFULL); 537 putenv ("COLORTERM=" COLORTERMENVFULL);
557 538
558 if (rs[Rs_term_name] != NULL) 539 if (rs[Rs_term_name] != NULL)
… …
578 * This should support all European type languages. 559 * This should support all European type languages.
579 */ 560 */
580void 561void
581rxvt_term::set_locale (const char *locale) 562rxvt_term::set_locale (const char *locale)
582{ 563{
564 set_environ (envv);
565
583#if HAVE_XSETLOCALE || HAVE_SETLOCALE 566#if HAVE_XSETLOCALE || HAVE_SETLOCALE
584 free (this->locale); 567 free (this->locale);
585 this->locale = setlocale (LC_CTYPE, locale); 568 this->locale = setlocale (LC_CTYPE, locale);
586 569
587 if (!this->locale) 570 if (!this->locale)
588 { 571 {
589 if (*locale) 572 if (*locale)
590 { 573 {
591 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 574 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
592 setlocale (LC_CTYPE, ""); 575 setlocale (LC_CTYPE, "C");
593 } 576 }
594 else 577 else
595 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 578 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
596 579
597 this->locale = ""; 580 this->locale = "C";
598 } 581 }
599 582
600 583
601 this->locale = rxvt_strdup (this->locale); 584 this->locale = rxvt_strdup (this->locale);
602 SET_LOCALE (this->locale); 585 SET_LOCALE (this->locale);
… …
617} 600}
618 601
619void 602void
620rxvt_term::init_xlocale () 603rxvt_term::init_xlocale ()
621{ 604{
605 set_environ (envv);
606
622#ifdef USE_XIM 607#ifdef USE_XIM
623 if (!locale) 608 if (!locale)
624 rxvt_warn ("setting locale failed, working without locale support.\n"); 609 rxvt_warn ("setting locale failed, working without locale support.\n");
625 else 610 else
626 { 611 {
… …
648 * Initialize the command connection. 633 * Initialize the command connection.
649 * This should be called after the X server connection is established. 634 * This should be called after the X server connection is established.
650 */ 635 */
651 636
652#ifdef META8_OPTION 637#ifdef META8_OPTION
653 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 638 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
654#endif 639#endif
655 640
656 get_ourmods (); 641 get_ourmods ();
657 642
658 if (!OPTION (Opt_scrollTtyOutput)) 643 if (!option (Opt_scrollTtyOutput))
659 priv_modes |= PrivMode_TtyOutputInh; 644 priv_modes |= PrivMode_TtyOutputInh;
660 if (OPTION (Opt_scrollTtyKeypress)) 645 if (option (Opt_scrollTtyKeypress))
661 priv_modes |= PrivMode_Keypress; 646 priv_modes |= PrivMode_Keypress;
662 if (!OPTION (Opt_jumpScroll)) 647 if (!option (Opt_jumpScroll))
663 priv_modes |= PrivMode_smoothScroll; 648 priv_modes |= PrivMode_smoothScroll;
664 649
665#ifndef NO_BACKSPACE_KEY 650#ifndef NO_BACKSPACE_KEY
666 if (strcmp (key_backspace, "DEC") == 0) 651 if (strcmp (key_backspace, "DEC") == 0)
667 priv_modes |= PrivMode_HaveBackSpace; 652 priv_modes |= PrivMode_HaveBackSpace;
668#endif 653#endif
669 654
670 /* add value for scrollBar */ 655 /* add value for scrollBar */
671 if (scrollbar_visible ()) 656 if (scrollBar.state)
672 { 657 {
673 priv_modes |= PrivMode_scrollBar; 658 priv_modes |= PrivMode_scrollBar;
674 SavedModes |= PrivMode_scrollBar; 659 SavedModes |= PrivMode_scrollBar;
675 }
676
677 if (menubar_visible ())
678 {
679 priv_modes |= PrivMode_menuBar;
680 SavedModes |= PrivMode_menuBar;
681 } 660 }
682 661
683 run_command (argv); 662 run_command (argv);
684} 663}
685 664
… …
691 670
692#ifdef OFF_FOCUS_FADING 671#ifdef OFF_FOCUS_FADING
693 pix_colors = pix_colors_focused; 672 pix_colors = pix_colors_focused;
694#endif 673#endif
695 674
696 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 675 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
697 { 676 {
677 const char *name = rs[Rs_color + i];
678
679 if (!name)
680 continue;
681
698 rxvt_color xcol; 682 rxvt_color xcol;
699 683
700 if (!rs[Rs_color + i]) 684 if (!set_color (xcol, name))
701 continue;
702
703 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
704 { 685 {
705#ifndef XTERM_REVERSE_VIDEO 686#ifndef XTERM_REVERSE_VIDEO
706 if (i < 2 && OPTION (Opt_reverseVideo)) 687 if (i < 2 && option (Opt_reverseVideo))
707 rs[Rs_color + i] = def_colorName[!i]; 688 name = def_colorName [1 - i];
708 else 689 else
709#endif 690#endif
710 rs[Rs_color + i] = def_colorName[i]; 691 name = def_colorName [i];
711 692
712 if (!rs[Rs_color + i]) 693 if (!name)
713 continue; 694 continue;
714 695
715 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 696 if (!set_color (xcol, name))
716 { 697 {
717 switch (i) 698 switch (i)
718 { 699 {
719 case Color_fg: 700 case Color_fg:
720 case Color_bg: 701 case Color_bg:
721 /* fatal: need bg/fg color */
722 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 702 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
723 /* NOTREACHED */ 703 name = "";
724 break; 704 break;
725#ifndef NO_CURSORCOLOR 705#ifndef NO_CURSORCOLOR
726 case Color_cursor2: 706 case Color_cursor2:
727 xcol = pix_colors[Color_fg]; 707#endif
728 break;
729#endif /* ! NO_CURSORCOLOR */
730 case Color_pointer_fg: 708 case Color_pointer_fg:
731 xcol = pix_colors[Color_fg]; 709 name = rs[Rs_color + Color_fg];
710 xcol.set (this, name);
732 break; 711 break;
733 default: 712 default:
734 xcol = pix_colors[Color_bg]; /* None */ 713 name = rs[Rs_color + Color_bg];
714 xcol.set (this, name);
735 break; 715 break;
736 } 716 }
737 } 717 }
738 } 718 }
739 719
740 pix_colors[i] = xcol; 720 pix_colors[i] = xcol;
741 SET_PIXCOLOR (i); 721 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 { 722 }
723
724 if (depth <= 2)
725 {
752 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 726 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]; 727 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]; 728 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
755 } 729 }
756 730
757 /* 731 /*
758 * get scrollBar/menuBar shadow colors 732 * get scrollBar shadow colors
759 * 733 *
760 * The calculations of topShadow/bottomShadow values are adapted 734 * The calculations of topShadow/bottomShadow values are adapted
761 * from the fvwm window manager. 735 * from the fvwm window manager.
762 */ 736 */
763#ifdef KEEP_SCROLLCOLOR 737#ifdef KEEP_SCROLLCOLOR
764
765 if (display->depth <= 2) 738 if (depth <= 2)
766 { 739 {
767 /* Monochrome */ 740 /* Monochrome */
768 pix_colors[Color_scroll] = pix_colors[Color_fg]; 741 alias_color (Color_scroll, Color_fg);
769 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 742 alias_color (Color_topShadow, Color_bg);
770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 743 alias_color (Color_bottomShadow, Color_bg);
771 } 744 }
772 else 745 else
773 { 746 {
774 rxvt_color xcol[2]; 747 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 748
779 xcol[1] = pix_colors[Color_scroll]; 749 rgba cscroll;
780 xcol[0].set (display, 65535, 65535, 65535); 750 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 751
789 /* topShadowColor */ 752 /* topShadowColor */
790 if (!xcol[1].set (display, 753 if (!pix_colors[Color_topShadow].set (this,
791 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 754 rgba (
792 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 755 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
793 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 756 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
794 xcol[1] = pix_colors[Color_White]; 757 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
795 758 cscroll.a)
796 pix_colors[Color_topShadow] = xcol[1]; 759 ))
760 alias_color (Color_topShadow, Color_White);
797 } 761 }
798#endif /* KEEP_SCROLLCOLOR */ 762#endif /* KEEP_SCROLLCOLOR */
763
764#ifdef OFF_FOCUS_FADING
765 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
766 update_fade_color (i);
767#endif
799} 768}
800 769
801/*----------------------------------------------------------------------*/ 770/*----------------------------------------------------------------------*/
802/* color aliases, fg/bg bright-bold */ 771/* color aliases, fg/bg bright-bold */
803void 772void
… …
808 int i = atoi (rs[Rs_color + idx]); 777 int i = atoi (rs[Rs_color + idx]);
809 778
810 if (i >= 8 && i <= 15) 779 if (i >= 8 && i <= 15)
811 { /* bright colors */ 780 { /* bright colors */
812 i -= 8; 781 i -= 8;
813#ifndef NO_BRIGHTCOLOR
814 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 782 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
815 return; 783 return;
816#endif
817 } 784 }
818 785
819 if (i >= 0 && i <= 7) /* normal colors */ 786 if (i >= 0 && i <= 7) /* normal colors */
820 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 787 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
821 } 788 }
… …
844 811
845 if (rsmod 812 if (rsmod
846 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 813 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
847 requestedmeta = rsmod[3] - '0'; 814 requestedmeta = rsmod[3] - '0';
848 815
849 map = XGetModifierMapping (display->display); 816 map = XGetModifierMapping (dpy);
850 kc = map->modifiermap; 817 kc = map->modifiermap;
851 818
852 for (i = 1; i < 6; i++) 819 for (i = 1; i < 6; i++)
853 { 820 {
854 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 821 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
856 for (j = map->max_keypermod; j--; k++) 823 for (j = map->max_keypermod; j--; k++)
857 { 824 {
858 if (kc[k] == 0) 825 if (kc[k] == 0)
859 break; 826 break;
860 827
861 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 828 switch (XKeycodeToKeysym (dpy, kc[k], 0))
862 { 829 {
863 case XK_Num_Lock: 830 case XK_Num_Lock:
864 ModNumLockMask = modmasks[i - 1]; 831 ModNumLockMask = modmasks[i - 1];
865 continue; 832 continue;
866 833
… …
916rxvt_term::create_windows (int argc, const char *const *argv) 883rxvt_term::create_windows (int argc, const char *const *argv)
917{ 884{
918 XClassHint classHint; 885 XClassHint classHint;
919 XWMHints wmHint; 886 XWMHints wmHint;
920#if ENABLE_FRILLS 887#if ENABLE_FRILLS
921 Atom prop = None;
922 MWMHints mwmhints; 888 MWMHints mwmhints;
923#endif 889#endif
924 XGCValues gcvalue; 890 XGCValues gcvalue;
925 long vt_emask;
926 XSetWindowAttributes attributes; 891 XSetWindowAttributes attributes;
927 XWindowAttributes gattr;
928 Window top, parent; 892 Window top, parent;
929 dDisp;
930 893
931#ifdef USING_W11LIB 894 dLocal (Display *, dpy);
932 /* enable W11 callbacks */
933 W11AddEventHandler (disp, rxvt_W11_process_x_event);
934#endif
935 895
936 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 896 /* grab colors before netscape does */
937 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 897 Get_Colours ();
938 898
939 if (OPTION (Opt_transparent)) 899 if (!set_fonts ())
940 { 900 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
941 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 901
942 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 902 parent = display->root;
943 } 903
904 attributes.override_redirect = !!option (Opt_override_redirect);
944 905
945#if ENABLE_FRILLS 906#if ENABLE_FRILLS
946 if (OPTION (Opt_borderLess)) 907 if (option (Opt_borderLess))
947 { 908 {
948 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 909 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
949
950 if (prop == None)
951 { 910 {
952 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 911 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
953#ifdef PREFER_24BIT
954 attributes.override_redirect = TRUE; 912 attributes.override_redirect = true;
955#endif
956 mwmhints.flags = 0; 913 mwmhints.flags = 0;
957 } 914 }
958 else 915 else
959 { 916 {
960 mwmhints.flags = MWM_HINTS_DECORATIONS; 917 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
963 } 920 }
964 else 921 else
965 mwmhints.flags = 0; 922 mwmhints.flags = 0;
966#endif 923#endif
967 924
968 /* grab colors before netscape does */
969 Get_Colours ();
970
971 if (!set_fonts ())
972 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
973
974 parent = DefaultRootWindow (disp);
975
976#if ENABLE_XEMBED 925#if ENABLE_XEMBED
977 if (rs[Rs_embed]) 926 if (rs[Rs_embed])
978 { 927 {
979 XWindowAttributes wattr; 928 XWindowAttributes wattr;
980 929
981 parent = strtol (rs[Rs_embed], 0, 0); 930 parent = strtol (rs[Rs_embed], 0, 0);
982 931
983 if (!XGetWindowAttributes (disp, parent, &wattr)) 932 if (!XGetWindowAttributes (dpy, parent, &wattr))
984 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 933 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
985 934
986 window_calc (wattr.width, wattr.height); 935 window_calc (wattr.width, wattr.height);
987 } 936 }
988#endif 937#endif
989 938
990 window_calc (0, 0); 939 window_calc (0, 0);
991 940
992 /* sub-window placement & size in rxvt_resize_subwindows () */ 941 /* sub-window placement & size in rxvt_resize_subwindows () */
993#ifdef PREFER_24BIT
994 attributes.background_pixel = pix_colors_focused[Color_border]; 942 attributes.background_pixel = pix_colors_focused [Color_border];
995 attributes.border_pixel = pix_colors_focused[Color_border]; 943 attributes.border_pixel = pix_colors_focused [Color_border];
996 attributes.colormap = display->cmap; 944 attributes.colormap = cmap;
945
997 top = XCreateWindow (disp, parent, 946 top = XCreateWindow (dpy, parent,
998 szHint.x, szHint.y, 947 szHint.x, szHint.y,
999 szHint.width, szHint.height, 948 szHint.width, szHint.height,
1000 ext_bwidth, 949 ext_bwidth,
1001 display->depth, InputOutput, 950 depth, InputOutput, visual,
1002 display->visual,
1003 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 951 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1004#else 952 &attributes);
1005 top = XCreateSimpleWindow (disp, parent,
1006 szHint.x, szHint.y,
1007 szHint.width, szHint.height,
1008 ext_bwidth,
1009 pix_colors_focused[Color_border],
1010 pix_colors_focused[Color_border]);
1011#endif
1012 953
1013 this->parent[0] = top; 954 this->parent[0] = top;
1014 955
1015 old_width = szHint.width; 956 old_width = szHint.width;
1016 old_height = szHint.height; 957 old_height = szHint.height;
1017 958
1018 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 959 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1019 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 960 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1020 961
1021 classHint.res_name = (char *)rs[Rs_name]; 962 classHint.res_name = (char *)rs[Rs_name];
1022 classHint.res_class = (char *)RESCLASS; 963 classHint.res_class = (char *)RESCLASS;
1023 964
1024 wmHint.flags = InputHint | StateHint | WindowGroupHint; 965 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1025 wmHint.input = True; 966 wmHint.input = True;
1026 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 967 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1027 wmHint.window_group = top; 968 wmHint.window_group = top;
1028 969
1029 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 970 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1030 &szHint, &wmHint, &classHint); 971 &szHint, &wmHint, &classHint);
972
973#if ENABLE_FRILLS
974 if (mwmhints.flags)
975 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
976 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
977#endif
1031 978
1032 Atom protocols[] = { 979 Atom protocols[] = {
1033 xa[XA_WM_DELETE_WINDOW], 980 xa[XA_WM_DELETE_WINDOW],
1034#if ENABLE_EWMH 981#if ENABLE_EWMH
1035 xa[XA_NET_WM_PING], 982 xa[XA_NET_WM_PING],
1036#endif 983#endif
1037 }; 984 };
1038 985
1039 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 986 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
987
988#if ENABLE_FRILLS
989 if (rs[Rs_transient_for])
990 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
991#endif
1040 992
1041#if ENABLE_EWMH 993#if ENABLE_EWMH
1042 long pid = getpid (); 994 long pid = getpid ();
1043 995
1044 XChangeProperty (disp, top, 996 XChangeProperty (dpy, top,
1045 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 997 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1046 PropModeReplace, (unsigned char *)&pid, 1); 998 PropModeReplace, (unsigned char *)&pid, 1);
1047 999
1048 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1000 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1049#endif 1001#endif
1050 1002
1051 XSelectInput (disp, top, 1003 XSelectInput (dpy, top,
1052 KeyPressMask 1004 KeyPressMask
1053#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1005#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1054 | KeyReleaseMask 1006 | KeyReleaseMask
1055#endif 1007#endif
1056 | FocusChangeMask | VisibilityChangeMask 1008 | FocusChangeMask | VisibilityChangeMask
1057 | ExposureMask | StructureNotifyMask); 1009 | ExposureMask | StructureNotifyMask);
1058 1010
1059 termwin_ev.start (display, top); 1011 termwin_ev.start (display, top);
1060 1012
1061#if ENABLE_FRILLS
1062 if (mwmhints.flags)
1063 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1064 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1065#endif
1066
1067 /* vt cursor: Black-on-White is standard, but this is more popular */ 1013 /* vt cursor: Black-on-White is standard, but this is more popular */
1068 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1014 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1069 1015
1070#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1016#ifdef HAVE_SCROLLBARS
1071 /* cursor (menuBar/scrollBar): Black-on-White */ 1017 /* cursor scrollBar: Black-on-White */
1072 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1018 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1073#endif 1019#endif
1074 1020
1075 /* the vt window */ 1021 /* the vt window */
1076 vt = XCreateSimpleWindow (disp, top, 1022 vt = XCreateSimpleWindow (dpy, top,
1077 window_vt_x,
1078 window_vt_y, 1023 window_vt_x, window_vt_y,
1079 width,
1080 height, 1024 width, height,
1081 0, 1025 0,
1082 pix_colors_focused[Color_fg], 1026 pix_colors_focused[Color_fg],
1083 pix_colors_focused[Color_bg]); 1027 pix_colors_focused[Color_bg]);
1084#ifdef DEBUG_X
1085 XStoreName (disp, vt, "vt window");
1086#endif
1087 1028
1088 attributes.bit_gravity = NorthWestGravity; 1029 attributes.bit_gravity = NorthWestGravity;
1089 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1030 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1090 1031
1091 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1032 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1092 1033
1093#ifdef POINTER_BLANK
1094 if (OPTION (Opt_pointerBlank)) 1034 if (option (Opt_pointerBlank))
1095 vt_emask |= PointerMotionMask; 1035 vt_emask |= PointerMotionMask;
1096 else 1036 else
1097#endif
1098 vt_emask |= Button1MotionMask | Button3MotionMask; 1037 vt_emask |= Button1MotionMask | Button3MotionMask;
1099 1038
1100 XSelectInput (disp, vt, vt_emask); 1039 vt_select_input ();
1040
1101 vt_ev.start (display, vt); 1041 vt_ev.start (display, vt);
1102
1103#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1104 if (menuBar_height ())
1105 {
1106 menuBar.win = XCreateSimpleWindow (disp, top,
1107 window_vt_x, 0,
1108 width,
1109 menuBar_TotalHeight (),
1110 0,
1111 pix_colors_focused[Color_fg],
1112 pix_colors_focused[Color_scroll]);
1113
1114#ifdef DEBUG_X
1115 XStoreName (disp, menuBar.win, "menubar");
1116#endif
1117
1118 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1119
1120 XDefineCursor (disp, menuBar.win,
1121 XCreateFontCursor (disp, XC_left_ptr));
1122
1123 XSelectInput (disp, menuBar.win,
1124 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1125 menubar_ev.start (display, menuBar.win);
1126 }
1127#endif
1128 1042
1129#ifdef XPM_BACKGROUND 1043#ifdef XPM_BACKGROUND
1130 if (rs[Rs_backgroundPixmap] != NULL 1044 if (rs[Rs_backgroundPixmap] != NULL
1045#ifndef HAVE_AFTERIMAGE
1131 && ! OPTION (Opt_transparent)) 1046 && !option (Opt_transparent)
1047#endif
1048 )
1132 { 1049 {
1133 const char *p = rs[Rs_backgroundPixmap]; 1050 const char *p = rs[Rs_backgroundPixmap];
1134 1051
1135 if ((p = strchr (p, ';')) != NULL) 1052 if ((p = strchr (p, ';')) != NULL)
1136 { 1053 {
… …
1142 scr_touch (true); 1059 scr_touch (true);
1143 } 1060 }
1144#endif 1061#endif
1145 1062
1146 /* graphics context for the vt window */ 1063 /* graphics context for the vt window */
1147 gcvalue.foreground = pix_colors[Color_fg]; 1064 gcvalue.foreground = pix_colors[Color_fg];
1148 gcvalue.background = pix_colors[Color_bg]; 1065 gcvalue.background = pix_colors[Color_bg];
1149 gcvalue.graphics_exposures = 1; 1066 gcvalue.graphics_exposures = 0;
1067
1150 gc = XCreateGC (disp, vt, 1068 gc = XCreateGC (dpy, vt,
1151 GCForeground | GCBackground | GCGraphicsExposures, 1069 GCForeground | GCBackground | GCGraphicsExposures,
1152 &gcvalue); 1070 &gcvalue);
1153 1071
1154 drawable = new rxvt_drawable (display, vt); 1072 drawable = new rxvt_drawable (this, vt);
1155 1073
1156#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1074#ifdef RXVT_SCROLLBAR
1157 gcvalue.foreground = pix_colors[Color_topShadow]; 1075 gcvalue.foreground = pix_colors[Color_topShadow];
1158 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1076 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1159 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1077 gcvalue.foreground = pix_colors[Color_bottomShadow];
1160 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1078 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1161 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1079 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1162 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1080 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1163#endif 1081#endif
1164 1082
1165#ifdef OFF_FOCUS_FADING 1083#ifdef OFF_FOCUS_FADING
1166 // initially we are in unfocused state 1084 // initially we are in unfocused state
1167 if (rs[Rs_fade]) 1085 if (rs[Rs_fade])
1168 pix_colors = pix_colors_unfocused; 1086 pix_colors = pix_colors_unfocused;
1169#endif 1087#endif
1170 1088
1171 pointer_unblank (); 1089 pointer_unblank ();
1172 scr_recolour (); 1090 scr_recolour ();
1173
1174#if ENABLE_XEMBED
1175 if (rs[Rs_embed])
1176 {
1177 long info[2] = { 0, XEMBED_MAPPED };
1178
1179 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1180 32, PropModeReplace, (unsigned char *)&info, 2);
1181 }
1182#endif
1183} 1091}
1184 1092
1185/* ------------------------------------------------------------------------- * 1093/* ------------------------------------------------------------------------- *
1186 * GET TTY CURRENT STATE * 1094 * GET TTY CURRENT STATE *
1187 * ------------------------------------------------------------------------- */ 1095 * ------------------------------------------------------------------------- */
1188void 1096void
1189rxvt_get_ttymode (ttymode_t *tio, int erase) 1097rxvt_get_ttymode (ttymode_t *tio, int erase)
1190{ 1098{
1191#ifdef HAVE_TERMIOS_H
1192 /* 1099 /*
1193 * standard System V termios interface 1100 * standard System V termios interface
1194 */ 1101 */
1195 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1102 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1196 { 1103 {
… …
1263 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1170 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1264# if defined (ECHOCTL) && defined (ECHOKE) 1171# if defined (ECHOCTL) && defined (ECHOKE)
1265 | ECHOCTL | ECHOKE 1172 | ECHOCTL | ECHOKE
1266# endif 1173# endif
1267 | ECHOE | ECHOK); 1174 | ECHOE | ECHOK);
1268# else /* HAVE_TERMIOS_H */
1269
1270 /*
1271 * sgtty interface
1272 */
1273
1274 /* get parameters -- gtty */
1275 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1276 {
1277 tio->sg.sg_erase = CERASE; /* ^H */
1278 tio->sg.sg_kill = CKILL; /* ^U */
1279 }
1280
1281 if (erase != -1)
1282 tio->sg.sg_erase = (char)erase;
1283
1284 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1285
1286 /* get special characters */
1287 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1288 {
1289 tio->tc.t_intrc = CINTR; /* ^C */
1290 tio->tc.t_quitc = CQUIT; /* ^\ */
1291 tio->tc.t_startc = CSTART; /* ^Q */
1292 tio->tc.t_stopc = CSTOP; /* ^S */
1293 tio->tc.t_eofc = CEOF; /* ^D */
1294 tio->tc.t_brkc = -1;
1295 }
1296
1297 /* get local special chars */
1298 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1299 {
1300 tio->lc.t_suspc = CSUSP; /* ^Z */
1301 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1302 tio->lc.t_rprntc = CRPRNT; /* ^R */
1303 tio->lc.t_flushc = CFLUSH; /* ^O */
1304 tio->lc.t_werasc = CWERASE; /* ^W */
1305 tio->lc.t_lnextc = CLNEXT; /* ^V */
1306 }
1307 /* get line discipline */
1308 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1309# ifdef NTTYDISC
1310 tio->line = NTTYDISC;
1311# endif /* NTTYDISC */
1312
1313 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1314#endif /* HAVE_TERMIOS_H */
1315 1175
1316 /* 1176 /*
1317 * Debugging 1177 * Debugging
1318 */ 1178 */
1319#ifdef DEBUG_TTYMODE 1179#ifdef DEBUG_TTYMODE
… …
1404rxvt_term::run_command (const char *const *argv) 1264rxvt_term::run_command (const char *const *argv)
1405{ 1265{
1406#if ENABLE_FRILLS 1266#if ENABLE_FRILLS
1407 if (rs[Rs_pty_fd]) 1267 if (rs[Rs_pty_fd])
1408 { 1268 {
1409 pty.pty = atoi (rs[Rs_pty_fd]); 1269 pty->pty = atoi (rs[Rs_pty_fd]);
1410 1270
1271 if (pty->pty >= 0)
1272 {
1411 if (getfd_hook) 1273 if (getfd_hook)
1412 pty.pty = (*getfd_hook) (pty.pty); 1274 pty->pty = (*getfd_hook) (pty->pty);
1413 1275
1414 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1276 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1415 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1277 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1278 }
1416 } 1279 }
1417 else 1280 else
1418#endif 1281#endif
1419 if (!pty.get ()) 1282 if (!pty->get ())
1420 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1283 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1421
1422 pty.set_utf8_mode (enc_utf8);
1423
1424 /* set initial window size */
1425 tt_winch ();
1426 1284
1427 int er; 1285 int er;
1428 1286
1429#ifndef NO_BACKSPACE_KEY 1287#ifndef NO_BACKSPACE_KEY
1430 if (key_backspace[0] && !key_backspace[1]) 1288 if (key_backspace[0] && !key_backspace[1])
… …
1434 else 1292 else
1435#endif 1293#endif
1436 er = -1; 1294 er = -1;
1437 1295
1438 rxvt_get_ttymode (&tio, er); 1296 rxvt_get_ttymode (&tio, er);
1297 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1298 pty->set_utf8_mode (enc_utf8);
1299
1300 /* set initial window size */
1301 tt_winch ();
1439 1302
1440#if ENABLE_FRILLS 1303#if ENABLE_FRILLS
1441 if (rs[Rs_pty_fd]) 1304 if (rs[Rs_pty_fd])
1442 return; 1305 return;
1443#endif 1306#endif
1444 1307
1445#ifndef __QNX__
1446 /* spin off the command interpreter */ 1308 /* spin off the command interpreter */
1447 switch (cmd_pid = fork ()) 1309 switch (cmd_pid = fork ())
1448 { 1310 {
1449 case -1: 1311 case -1:
1450 { 1312 {
… …
1452 rxvt_fatal ("can't fork, aborting.\n"); 1314 rxvt_fatal ("can't fork, aborting.\n");
1453 } 1315 }
1454 case 0: 1316 case 0:
1455 init_env (); 1317 init_env ();
1456 1318
1457 if (!pty.make_controlling_tty ()) 1319 if (!pty->make_controlling_tty ())
1458 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1320 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1459 else 1321 else
1460 { 1322 {
1461 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1323 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1462 dup2 (pty.tty, STDIN_FILENO); 1324 dup2 (pty->tty, STDIN_FILENO);
1463 dup2 (pty.tty, STDOUT_FILENO); 1325 dup2 (pty->tty, STDOUT_FILENO);
1464 dup2 (pty.tty, STDERR_FILENO); 1326 dup2 (pty->tty, STDERR_FILENO);
1465 1327
1466 // close all our file handles that we do no longer need 1328 // close all our file handles that we do no longer need
1467 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1329 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1468 { 1330 {
1469 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1331 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1470 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1332 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1471 } 1333 }
1472 1334
1473 run_child (argv); 1335 run_child (argv);
1474 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1336 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1475 } 1337 }
1476 1338
1477 _exit (EXIT_FAILURE); 1339 _exit (EXIT_FAILURE);
1478 1340
1479 default: 1341 default:
1480 { 1342 if (!option (Opt_utmpInhibit))
1481#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1343 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1482 int fdstdin;
1483 1344
1484 fdstdin = dup (STDIN_FILENO); 1345 pty->close_tty ();
1485 dup2 (pty.tty, STDIN_FILENO);
1486#endif
1487 1346
1488#ifdef UTMP_SUPPORT 1347 child_ev.start (cmd_pid);
1489 privileged_utmp (SAVE);
1490#endif
1491 1348
1492#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1349 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1493
1494 dup2 (fdstdin, STDIN_FILENO);
1495 close (fdstdin);
1496#endif
1497 }
1498
1499 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1500 break; 1350 break;
1501 } 1351 }
1502#else /* __QNX__ uses qnxspawn () */
1503 fchmod (pty.tty, 0622);
1504 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1505 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1506
1507 if (run_child (argv) == -1)
1508 exit (EXIT_FAILURE);
1509#endif
1510} 1352}
1511 1353
1512/* ------------------------------------------------------------------------- * 1354/* ------------------------------------------------------------------------- *
1513 * CHILD PROCESS OPERATIONS * 1355 * CHILD PROCESS OPERATIONS *
1514 * ------------------------------------------------------------------------- */ 1356 * ------------------------------------------------------------------------- */
… …
1519int 1361int
1520rxvt_term::run_child (const char *const *argv) 1362rxvt_term::run_child (const char *const *argv)
1521{ 1363{
1522 char *login; 1364 char *login;
1523 1365
1524 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1525
1526 if (OPTION (Opt_console)) 1366 if (option (Opt_console))
1527 { /* be virtual console, fail silently */ 1367 { /* be virtual console, fail silently */
1528#ifdef TIOCCONS 1368#ifdef TIOCCONS
1529 unsigned int on = 1; 1369 unsigned int on = 1;
1530 1370
1531 ioctl (STDIN_FILENO, TIOCCONS, &on); 1371 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1558 // unblock signals (signals are blocked by iom.C 1398 // unblock signals (signals are blocked by iom.C
1559 sigset_t ss; 1399 sigset_t ss;
1560 sigemptyset (&ss); 1400 sigemptyset (&ss);
1561 sigprocmask (SIG_SETMASK, &ss, 0); 1401 sigprocmask (SIG_SETMASK, &ss, 0);
1562 1402
1563#ifndef __QNX__
1564 /* command interpreter path */ 1403 /* command interpreter path */
1565 if (argv != NULL) 1404 if (argv != NULL)
1566 { 1405 {
1567# ifdef DEBUG_CMD 1406# ifdef DEBUG_CMD
1568 int i; 1407 int i;
… …
1574 execvp (argv[0], (char *const *)argv); 1413 execvp (argv[0], (char *const *)argv);
1575 /* no error message: STDERR is closed! */ 1414 /* no error message: STDERR is closed! */
1576 } 1415 }
1577 else 1416 else
1578 { 1417 {
1579 const char *argv0, *shell; 1418 const char *argv0, *shell;
1580 1419
1581 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1420 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1582 shell = "/bin/sh"; 1421 shell = "/bin/sh";
1583 1422
1584 argv0 = (const char *)rxvt_r_basename (shell); 1423 argv0 = (const char *)rxvt_r_basename (shell);
1585 1424
1586 if (OPTION (Opt_loginShell)) 1425 if (option (Opt_loginShell))
1587 { 1426 {
1588 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1427 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1589 1428
1590 login[0] = '-'; 1429 login[0] = '-';
1591 strcpy (&login[1], argv0); 1430 strcpy (&login[1], argv0);
1592 argv0 = login; 1431 argv0 = login;
1593 } 1432 }
1433
1594 execlp (shell, argv0, NULL); 1434 execlp (shell, argv0, NULL);
1595 /* no error message: STDERR is closed! */ 1435 /* no error message: STDERR is closed! */
1596 } 1436 }
1597 1437
1598#else /* __QNX__ uses qnxspawn () */
1599
1600 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1601 char *command = NULL, fullcommand[_MAX_PATH];
1602 char **arg_v, *arg_a[2] = { NULL, NULL };
1603
1604 if (argv != NULL)
1605 {
1606 if (access (argv[0], X_OK) == -1)
1607 {
1608 if (strchr (argv[0], '/') == NULL)
1609 {
1610 searchenv (argv[0], "PATH", fullcommand);
1611
1612 if (fullcommand[0] != '\0')
1613 command = fullcommand;
1614 }
1615
1616 if (access (command, X_OK) == -1)
1617 return -1;
1618 }
1619 else
1620 command = argv[0];
1621
1622 arg_v = argv;
1623 }
1624 else
1625 {
1626 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1627 command = "/bin/sh";
1628
1629 arg_a[0] = my_basename (command);
1630
1631 if (OPTION (Opt_loginShell))
1632 {
1633 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1634
1635 login[0] = '-';
1636 strcpy (&login[1], arg_a[0]);
1637 arg_a[0] = login;
1638 }
1639
1640 arg_v = arg_a;
1641 }
1642
1643 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1644 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1645 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1646 command, arg_v, environ, iov_a, 0);
1647 if (login)
1648 free (login);
1649
1650 pty.close_tty ();
1651 return pty.pty;
1652#endif
1653
1654 return -1; 1438 return -1;
1655} 1439}
1656 1440
1657/*----------------------- end-of-file (C source) -----------------------*/ 1441/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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