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

Diff Legend

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