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

Diff Legend

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