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.155 by root, Wed Jan 25 02:53:13 2006 UTC vs.
Revision 1.187 by root, Mon Jun 18 12:53:26 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
43const char *const def_colorName[] = 43const char *const def_colorName[] =
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 49 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 50 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 56 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 57# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 59# endif
60 /* high-intensity colors */ 60 /* high-intensity colors */
61# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 63# else
64 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 65# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 73
74 // 88 xterm colours 74 // 88 xterm colours
75 "rgb:00/00/00", 75 "rgb:00/00/00",
76 "rgb:00/00/8b", 76 "rgb:00/00/8b",
77 "rgb:00/00/cd", 77 "rgb:00/00/cd",
… …
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 176#endif
177 }; 177 };
178 178
179bool 179bool
180rxvt_term::init_vars () 180rxvt_term::init_vars ()
… …
189 pixmap = None; 189 pixmap = None;
190#endif 190#endif
191 191
192 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 194 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 195 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 196 ncol = 80;
198 nrow = 24; 197 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 198 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 199 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 200 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 201 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 202 numpix_colors = TOTAL_COLORS;
204 203
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 204 refresh_type = SLOW_REFRESH;
207 205
208 oldcursor.row = oldcursor.col = -1; 206 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND 207#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */ 208 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50; 209 bgPixmap.x = bgPixmap.y = 0;
212 bgPixmap.pixmap = None; 210 bgPixmap.pixmap = None;
213#endif 211#endif
214 212
215 last_bot = last_state = -1; 213 last_bot = last_state = -1;
214
215 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll);
218 set_option (Opt_secondaryScreen);
219 set_option (Opt_secondaryScroll);
220 set_option (Opt_pastableTabs);
221 set_option (Opt_intensityStyles);
222 set_option (Opt_iso14755_52);
216 223
217 return true; 224 return true;
218} 225}
219 226
220void 227void
… …
258 int i, r_argc; 265 int i, r_argc;
259 char *val; 266 char *val;
260 const char **cmd_argv, **r_argv; 267 const char **cmd_argv, **r_argv;
261 268
262 /* 269 /*
263 * 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
264 */ 271 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 272 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 273 if (!strcmp (argv[r_argc], "-e"))
267 break; 274 break;
268 275
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 276 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 277
271 for (i = 0; i < r_argc; i++) 278 for (i = 0; i < r_argc; i++)
… …
297 get_options (r_argc, r_argv); 304 get_options (r_argc, r_argv);
298 305
299 if (!(display = displays.get (rs[Rs_display_name]))) 306 if (!(display = displays.get (rs[Rs_display_name])))
300 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]);
301 308
309 // using a local pointer decreases code size a lot
310 xa = display->xa;
311
312 set (display);
302 extract_resources (); 313 extract_resources ();
303 314
315#if XFT
316 if (rs[Rs_depth])
317 select_visual (strtol (rs[Rs_depth], 0, 0));
318#endif
319
304 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;
305 325
306#if ENABLE_PERL 326#if ENABLE_PERL
307 if (!rs[Rs_perl_ext_1]) 327 if (!rs[Rs_perl_ext_1])
308 rs[Rs_perl_ext_1] = "default"; 328 rs[Rs_perl_ext_1] = "default";
309 329
… …
408 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]);
409#endif 429#endif
410 430
411#ifdef XTERM_REVERSE_VIDEO 431#ifdef XTERM_REVERSE_VIDEO
412 /* this is how xterm implements reverseVideo */ 432 /* this is how xterm implements reverseVideo */
413 if (OPTION (Opt_reverseVideo)) 433 if (option (Opt_reverseVideo))
414 { 434 {
415 if (!rs[Rs_color + Color_fg]) 435 if (!rs[Rs_color + Color_fg])
416 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 436 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
437
417 if (!rs[Rs_color + Color_bg]) 438 if (!rs[Rs_color + Color_bg])
418 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 439 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
419 } 440 }
420#endif 441#endif
421 442
… …
423 if (!rs[Rs_color + i]) 444 if (!rs[Rs_color + i])
424 rs[Rs_color + i] = def_colorName[i]; 445 rs[Rs_color + i] = def_colorName[i];
425 446
426#ifndef XTERM_REVERSE_VIDEO 447#ifndef XTERM_REVERSE_VIDEO
427 /* this is how we implement reverseVideo */ 448 /* this is how we implement reverseVideo */
428 if (OPTION (Opt_reverseVideo)) 449 if (option (Opt_reverseVideo))
429 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 450 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
430#endif 451#endif
431 452
432 /* convenient aliases for setting fg/bg to colors */ 453 /* convenient aliases for setting fg/bg to colors */
433 color_aliases (Color_fg); 454 color_aliases (Color_fg);
… …
473 val = rxvt_network_display (rs[Rs_display_name]); 494 val = rxvt_network_display (rs[Rs_display_name]);
474 rs[Rs_display_name] = (const char *)val; 495 rs[Rs_display_name] = (const char *)val;
475 496
476 if (val == NULL) 497 if (val == NULL)
477#endif /* DISPLAY_IS_IP */ 498#endif /* DISPLAY_IS_IP */
478 val = XDisplayString (display->display); 499 val = XDisplayString (dpy);
479 500
480 if (rs[Rs_display_name] == NULL) 501 if (rs[Rs_display_name] == NULL)
481 rs[Rs_display_name] = val; /* use broken `:0' value */ 502 rs[Rs_display_name] = val; /* use broken `:0' value */
482 503
483 i = strlen (val); 504 i = strlen (val);
… …
503 524
504#ifdef RXVT_TERMINFO 525#ifdef RXVT_TERMINFO
505 putenv ("TERMINFO=" RXVT_TERMINFO); 526 putenv ("TERMINFO=" RXVT_TERMINFO);
506#endif 527#endif
507 528
508 if (display->depth <= 2) 529 if (depth <= 2)
509 putenv ("COLORTERM=" COLORTERMENV "-mono"); 530 putenv ("COLORTERM=" COLORTERMENV "-mono");
510 else 531 else
511 putenv ("COLORTERM=" COLORTERMENVFULL); 532 putenv ("COLORTERM=" COLORTERMENVFULL);
512 533
513 if (rs[Rs_term_name] != NULL) 534 if (rs[Rs_term_name] != NULL)
… …
607 * Initialize the command connection. 628 * Initialize the command connection.
608 * This should be called after the X server connection is established. 629 * This should be called after the X server connection is established.
609 */ 630 */
610 631
611#ifdef META8_OPTION 632#ifdef META8_OPTION
612 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 633 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
613#endif 634#endif
614 635
615 get_ourmods (); 636 get_ourmods ();
616 637
617 if (!OPTION (Opt_scrollTtyOutput)) 638 if (!option (Opt_scrollTtyOutput))
618 priv_modes |= PrivMode_TtyOutputInh; 639 priv_modes |= PrivMode_TtyOutputInh;
619 if (OPTION (Opt_scrollTtyKeypress)) 640 if (option (Opt_scrollTtyKeypress))
620 priv_modes |= PrivMode_Keypress; 641 priv_modes |= PrivMode_Keypress;
621 if (!OPTION (Opt_jumpScroll)) 642 if (!option (Opt_jumpScroll))
622 priv_modes |= PrivMode_smoothScroll; 643 priv_modes |= PrivMode_smoothScroll;
623 644
624#ifndef NO_BACKSPACE_KEY 645#ifndef NO_BACKSPACE_KEY
625 if (strcmp (key_backspace, "DEC") == 0) 646 if (strcmp (key_backspace, "DEC") == 0)
626 priv_modes |= PrivMode_HaveBackSpace; 647 priv_modes |= PrivMode_HaveBackSpace;
… …
644 665
645#ifdef OFF_FOCUS_FADING 666#ifdef OFF_FOCUS_FADING
646 pix_colors = pix_colors_focused; 667 pix_colors = pix_colors_focused;
647#endif 668#endif
648 669
649 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 670 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
650 { 671 {
672 const char *name = rs[Rs_color + i];
673
674 if (!name)
675 continue;
676
651 rxvt_color xcol; 677 rxvt_color xcol;
652 678
653 if (!rs[Rs_color + i]) 679 if (!set_color (xcol, name))
654 continue;
655
656 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
657 { 680 {
658#ifndef XTERM_REVERSE_VIDEO 681#ifndef XTERM_REVERSE_VIDEO
659 if (i < 2 && OPTION (Opt_reverseVideo)) 682 if (i < 2 && option (Opt_reverseVideo))
660 rs[Rs_color + i] = def_colorName[!i]; 683 name = def_colorName [1 - i];
661 else 684 else
662#endif 685#endif
663 rs[Rs_color + i] = def_colorName[i]; 686 name = def_colorName [i];
664 687
665 if (!rs[Rs_color + i]) 688 if (!name)
666 continue; 689 continue;
667 690
668 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 691 if (!set_color (xcol, name))
669 { 692 {
670 switch (i) 693 switch (i)
671 { 694 {
672 case Color_fg: 695 case Color_fg:
673 case Color_bg: 696 case Color_bg:
674 /* fatal: need bg/fg color */
675 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 697 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
676 /* NOTREACHED */ 698 name = "";
677 break; 699 break;
678#ifndef NO_CURSORCOLOR 700#ifndef NO_CURSORCOLOR
679 case Color_cursor2: 701 case Color_cursor2:
680 xcol = pix_colors[Color_fg]; 702#endif
681 break;
682#endif /* ! NO_CURSORCOLOR */
683 case Color_pointer_fg: 703 case Color_pointer_fg:
684 xcol = pix_colors[Color_fg]; 704 name = rs[Rs_color + Color_fg];
705 xcol.set (this, name);
685 break; 706 break;
686 default: 707 default:
687 xcol = pix_colors[Color_bg]; /* None */ 708 name = rs[Rs_color + Color_bg];
709 xcol.set (this, name);
688 break; 710 break;
689 } 711 }
690 } 712 }
691 } 713 }
692 714
693 pix_colors[i] = xcol; 715 pix_colors[i] = xcol;
694 SET_PIXCOLOR (i); 716 rs[Rs_color + i] = name;
695 }
696
697#ifdef OFF_FOCUS_FADING
698 if (rs[Rs_fade])
699 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
700 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
701#endif
702
703 if (display->depth <= 2)
704 { 717 }
718
719 if (depth <= 2)
720 {
705 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);
706 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);
707 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);
708 } 724 }
709 725
710 /* 726 /*
711 * get scrollBar shadow colors 727 * get scrollBar shadow colors
712 * 728 *
713 * The calculations of topShadow/bottomShadow values are adapted 729 * The calculations of topShadow/bottomShadow values are adapted
714 * from the fvwm window manager. 730 * from the fvwm window manager.
715 */ 731 */
716#ifdef KEEP_SCROLLCOLOR 732#ifdef KEEP_SCROLLCOLOR
717
718 if (display->depth <= 2) 733 if (depth <= 2)
719 { 734 {
720 /* Monochrome */ 735 /* Monochrome */
721 pix_colors[Color_scroll] = pix_colors[Color_fg]; 736 alias_color (Color_scroll, Color_fg);
722 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 737 alias_color (Color_topShadow, Color_bg);
723 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 738 alias_color (Color_bottomShadow, Color_bg);
724 } 739 }
725 else 740 else
726 { 741 {
727 rxvt_color xcol[2]; 742 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
728 /* xcol[0] == white
729 * xcol[1] == top shadow
730 * xcol[2] == bot shadow */
731 743
732 xcol[1] = pix_colors[Color_scroll]; 744 rgba cscroll;
733 xcol[0].set (display, 65535, 65535, 65535); 745 pix_colors [Color_scroll].get (cscroll);
734
735 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
736
737 xcol[0].get (display, pr0, pg0, pb0);
738 xcol[1].get (display, pr1, pg1, pb1);
739
740 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
741 746
742 /* topShadowColor */ 747 /* topShadowColor */
743 if (!xcol[1].set (display, 748 if (!pix_colors[Color_topShadow].set (this,
744 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 749 rgba (
745 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 750 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
746 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 751 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
747 xcol[1] = pix_colors[Color_White]; 752 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
748 753 cscroll.a)
749 pix_colors[Color_topShadow] = xcol[1]; 754 ))
755 alias_color (Color_topShadow, Color_White);
750 } 756 }
751#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
752} 763}
753 764
754/*----------------------------------------------------------------------*/ 765/*----------------------------------------------------------------------*/
755/* color aliases, fg/bg bright-bold */ 766/* color aliases, fg/bg bright-bold */
756void 767void
… …
795 806
796 if (rsmod 807 if (rsmod
797 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 808 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
798 requestedmeta = rsmod[3] - '0'; 809 requestedmeta = rsmod[3] - '0';
799 810
800 map = XGetModifierMapping (display->display); 811 map = XGetModifierMapping (dpy);
801 kc = map->modifiermap; 812 kc = map->modifiermap;
802 813
803 for (i = 1; i < 6; i++) 814 for (i = 1; i < 6; i++)
804 { 815 {
805 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 816 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
807 for (j = map->max_keypermod; j--; k++) 818 for (j = map->max_keypermod; j--; k++)
808 { 819 {
809 if (kc[k] == 0) 820 if (kc[k] == 0)
810 break; 821 break;
811 822
812 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 823 switch (XKeycodeToKeysym (dpy, kc[k], 0))
813 { 824 {
814 case XK_Num_Lock: 825 case XK_Num_Lock:
815 ModNumLockMask = modmasks[i - 1]; 826 ModNumLockMask = modmasks[i - 1];
816 continue; 827 continue;
817 828
… …
872 MWMHints mwmhints; 883 MWMHints mwmhints;
873#endif 884#endif
874 XGCValues gcvalue; 885 XGCValues gcvalue;
875 XSetWindowAttributes attributes; 886 XSetWindowAttributes attributes;
876 Window top, parent; 887 Window top, parent;
877 dDisp;
878 888
879 xa = display->xa; 889 dLocal (Display *, dpy);
880 890
881 /* grab colors before netscape does */ 891 /* grab colors before netscape does */
882 Get_Colours (); 892 Get_Colours ();
883 893
884 if (!set_fonts ()) 894 if (!set_fonts ())
885 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 895 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
886 896
887 parent = display->root; 897 parent = display->root;
888 898
889 attributes.override_redirect = !!OPTION (Opt_override_redirect); 899 attributes.override_redirect = !!option (Opt_override_redirect);
890 900
891#if ENABLE_FRILLS 901#if ENABLE_FRILLS
892 if (OPTION (Opt_borderLess)) 902 if (option (Opt_borderLess))
893 { 903 {
894 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
895 { 905 {
896 /* 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");*/
897 attributes.override_redirect = TRUE; 907 attributes.override_redirect = true;
898 mwmhints.flags = 0; 908 mwmhints.flags = 0;
899 } 909 }
900 else 910 else
901 { 911 {
902 mwmhints.flags = MWM_HINTS_DECORATIONS; 912 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
912 { 922 {
913 XWindowAttributes wattr; 923 XWindowAttributes wattr;
914 924
915 parent = strtol (rs[Rs_embed], 0, 0); 925 parent = strtol (rs[Rs_embed], 0, 0);
916 926
917 if (!XGetWindowAttributes (disp, parent, &wattr)) 927 if (!XGetWindowAttributes (dpy, parent, &wattr))
918 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 928 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
919 929
920 window_calc (wattr.width, wattr.height); 930 window_calc (wattr.width, wattr.height);
921 } 931 }
922#endif 932#endif
923 933
924 window_calc (0, 0); 934 window_calc (0, 0);
925 935
926 /* sub-window placement & size in rxvt_resize_subwindows () */ 936 /* sub-window placement & size in rxvt_resize_subwindows () */
927 attributes.background_pixel = pix_colors_focused[Color_border]; 937 attributes.background_pixel = pix_colors_focused [Color_border];
928 attributes.border_pixel = pix_colors_focused[Color_border]; 938 attributes.border_pixel = pix_colors_focused [Color_border];
929 attributes.colormap = display->cmap; 939 attributes.colormap = cmap;
930 940
931 top = XCreateWindow (disp, parent, 941 top = XCreateWindow (dpy, parent,
932 szHint.x, szHint.y, 942 szHint.x, szHint.y,
933 szHint.width, szHint.height, 943 szHint.width, szHint.height,
934 ext_bwidth, 944 ext_bwidth,
935 display->depth, InputOutput, 945 depth, InputOutput, visual,
936 display->visual,
937 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 946 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
938 &attributes); 947 &attributes);
939 948
940 this->parent[0] = top; 949 this->parent[0] = top;
941 950
… …
948 classHint.res_name = (char *)rs[Rs_name]; 957 classHint.res_name = (char *)rs[Rs_name];
949 classHint.res_class = (char *)RESCLASS; 958 classHint.res_class = (char *)RESCLASS;
950 959
951 wmHint.flags = InputHint | StateHint | WindowGroupHint; 960 wmHint.flags = InputHint | StateHint | WindowGroupHint;
952 wmHint.input = True; 961 wmHint.input = True;
953 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 962 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
954 wmHint.window_group = top; 963 wmHint.window_group = top;
955 964
956 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 965 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
957 &szHint, &wmHint, &classHint); 966 &szHint, &wmHint, &classHint);
958 967
959#if ENABLE_FRILLS 968#if ENABLE_FRILLS
960 if (mwmhints.flags) 969 if (mwmhints.flags)
961 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 970 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
962 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 971 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
963#endif 972#endif
964 973
965 Atom protocols[] = { 974 Atom protocols[] = {
966 xa[XA_WM_DELETE_WINDOW], 975 xa[XA_WM_DELETE_WINDOW],
967#if ENABLE_EWMH 976#if ENABLE_EWMH
968 xa[XA_NET_WM_PING], 977 xa[XA_NET_WM_PING],
969#endif 978#endif
970 }; 979 };
971 980
972 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 981 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
973 982
974#if ENABLE_FRILLS 983#if ENABLE_FRILLS
975 if (rs[Rs_transient_for]) 984 if (rs[Rs_transient_for])
976 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 985 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
977#endif 986#endif
978 987
979#if ENABLE_EWMH 988#if ENABLE_EWMH
980 long pid = getpid (); 989 long pid = getpid ();
981 990
982 XChangeProperty (disp, top, 991 XChangeProperty (dpy, top,
983 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 992 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
984 PropModeReplace, (unsigned char *)&pid, 1); 993 PropModeReplace, (unsigned char *)&pid, 1);
985 994
986 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 995 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
987#endif 996#endif
988 997
989 XSelectInput (disp, top, 998 XSelectInput (dpy, top,
990 KeyPressMask 999 KeyPressMask
991#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
992 | KeyReleaseMask 1001 | KeyReleaseMask
993#endif 1002#endif
994 | FocusChangeMask | VisibilityChangeMask 1003 | FocusChangeMask | VisibilityChangeMask
995 | ExposureMask | StructureNotifyMask); 1004 | ExposureMask | StructureNotifyMask);
996 1005
997 termwin_ev.start (display, top); 1006 termwin_ev.start (display, top);
998 1007
999 /* 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 */
1000 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1009 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1001 1010
1002#ifdef HAVE_SCROLLBARS 1011#ifdef HAVE_SCROLLBARS
1003 /* cursor scrollBar: Black-on-White */ 1012 /* cursor scrollBar: Black-on-White */
1004 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1013 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1005#endif 1014#endif
1006 1015
1007 /* the vt window */ 1016 /* the vt window */
1008 vt = XCreateSimpleWindow (disp, top, 1017 vt = XCreateSimpleWindow (dpy, top,
1009 window_vt_x, window_vt_y, 1018 window_vt_x, window_vt_y,
1010 width, height, 1019 width, height,
1011 0, 1020 0,
1012 pix_colors_focused[Color_fg], 1021 pix_colors_focused[Color_fg],
1013 pix_colors_focused[Color_bg]); 1022 pix_colors_focused[Color_bg]);
1014 1023
1015 attributes.bit_gravity = NorthWestGravity; 1024 attributes.bit_gravity = NorthWestGravity;
1016 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1025 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1017 1026
1018 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1019 1028
1020 if (OPTION (Opt_pointerBlank)) 1029 if (option (Opt_pointerBlank))
1021 vt_emask |= PointerMotionMask; 1030 vt_emask |= PointerMotionMask;
1022 else 1031 else
1023 vt_emask |= Button1MotionMask | Button3MotionMask; 1032 vt_emask |= Button1MotionMask | Button3MotionMask;
1024 1033
1025 vt_select_input (); 1034 vt_select_input ();
1026 1035
1027 vt_ev.start (display, vt); 1036 vt_ev.start (display, vt);
1028 1037
1029#ifdef XPM_BACKGROUND 1038#ifdef XPM_BACKGROUND
1030 if (rs[Rs_backgroundPixmap] != NULL 1039 if (rs[Rs_backgroundPixmap] != NULL
1040#ifndef HAVE_AFTERIMAGE
1031 && !OPTION (Opt_transparent)) 1041 && !option (Opt_transparent)
1042#endif
1043 )
1032 { 1044 {
1033 const char *p = rs[Rs_backgroundPixmap]; 1045 const char *p = rs[Rs_backgroundPixmap];
1034 1046
1035 if ((p = strchr (p, ';')) != NULL) 1047 if ((p = strchr (p, ';')) != NULL)
1036 { 1048 {
… …
1044#endif 1056#endif
1045 1057
1046 /* graphics context for the vt window */ 1058 /* graphics context for the vt window */
1047 gcvalue.foreground = pix_colors[Color_fg]; 1059 gcvalue.foreground = pix_colors[Color_fg];
1048 gcvalue.background = pix_colors[Color_bg]; 1060 gcvalue.background = pix_colors[Color_bg];
1049 gcvalue.graphics_exposures = 1; 1061 gcvalue.graphics_exposures = 0;
1050 1062
1051 gc = XCreateGC (disp, vt, 1063 gc = XCreateGC (dpy, vt,
1052 GCForeground | GCBackground | GCGraphicsExposures, 1064 GCForeground | GCBackground | GCGraphicsExposures,
1053 &gcvalue); 1065 &gcvalue);
1054 1066
1055 drawable = new rxvt_drawable (display, vt); 1067 drawable = new rxvt_drawable (this, vt);
1056 1068
1057#ifdef RXVT_SCROLLBAR 1069#ifdef RXVT_SCROLLBAR
1058 gcvalue.foreground = pix_colors[Color_topShadow]; 1070 gcvalue.foreground = pix_colors[Color_topShadow];
1059 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1071 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1060 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1072 gcvalue.foreground = pix_colors[Color_bottomShadow];
1061 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1073 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1062 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1074 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1063 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1075 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1064#endif 1076#endif
1065 1077
1066#ifdef OFF_FOCUS_FADING 1078#ifdef OFF_FOCUS_FADING
1067 // initially we are in unfocused state 1079 // initially we are in unfocused state
1068 if (rs[Rs_fade]) 1080 if (rs[Rs_fade])
… …
1077 * GET TTY CURRENT STATE * 1089 * GET TTY CURRENT STATE *
1078 * ------------------------------------------------------------------------- */ 1090 * ------------------------------------------------------------------------- */
1079void 1091void
1080rxvt_get_ttymode (ttymode_t *tio, int erase) 1092rxvt_get_ttymode (ttymode_t *tio, int erase)
1081{ 1093{
1082#ifdef HAVE_TERMIOS_H
1083 /* 1094 /*
1084 * standard System V termios interface 1095 * standard System V termios interface
1085 */ 1096 */
1086 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1097 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1087 { 1098 {
… …
1154 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1165 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1155# if defined (ECHOCTL) && defined (ECHOKE) 1166# if defined (ECHOCTL) && defined (ECHOKE)
1156 | ECHOCTL | ECHOKE 1167 | ECHOCTL | ECHOKE
1157# endif 1168# endif
1158 | ECHOE | ECHOK); 1169 | ECHOE | ECHOK);
1159# else /* HAVE_TERMIOS_H */
1160
1161 /*
1162 * sgtty interface
1163 */
1164
1165 /* get parameters -- gtty */
1166 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1167 {
1168 tio->sg.sg_erase = CERASE; /* ^H */
1169 tio->sg.sg_kill = CKILL; /* ^U */
1170 }
1171
1172 if (erase != -1)
1173 tio->sg.sg_erase = (char)erase;
1174
1175 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1176
1177 /* get special characters */
1178 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1179 {
1180 tio->tc.t_intrc = CINTR; /* ^C */
1181 tio->tc.t_quitc = CQUIT; /* ^\ */
1182 tio->tc.t_startc = CSTART; /* ^Q */
1183 tio->tc.t_stopc = CSTOP; /* ^S */
1184 tio->tc.t_eofc = CEOF; /* ^D */
1185 tio->tc.t_brkc = -1;
1186 }
1187
1188 /* get local special chars */
1189 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1190 {
1191 tio->lc.t_suspc = CSUSP; /* ^Z */
1192 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1193 tio->lc.t_rprntc = CRPRNT; /* ^R */
1194 tio->lc.t_flushc = CFLUSH; /* ^O */
1195 tio->lc.t_werasc = CWERASE; /* ^W */
1196 tio->lc.t_lnextc = CLNEXT; /* ^V */
1197 }
1198 /* get line discipline */
1199 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1200# ifdef NTTYDISC
1201 tio->line = NTTYDISC;
1202# endif /* NTTYDISC */
1203
1204 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1205#endif /* HAVE_TERMIOS_H */
1206 1170
1207 /* 1171 /*
1208 * Debugging 1172 * Debugging
1209 */ 1173 */
1210#ifdef DEBUG_TTYMODE 1174#ifdef DEBUG_TTYMODE
… …
1311 else 1275 else
1312#endif 1276#endif
1313 if (!pty->get ()) 1277 if (!pty->get ())
1314 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1278 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1315 1279
1316 pty->set_utf8_mode (enc_utf8);
1317
1318 /* set initial window size */
1319 tt_winch ();
1320
1321 int er; 1280 int er;
1322 1281
1323#ifndef NO_BACKSPACE_KEY 1282#ifndef NO_BACKSPACE_KEY
1324 if (key_backspace[0] && !key_backspace[1]) 1283 if (key_backspace[0] && !key_backspace[1])
1325 er = key_backspace[0]; 1284 er = key_backspace[0];
… …
1328 else 1287 else
1329#endif 1288#endif
1330 er = -1; 1289 er = -1;
1331 1290
1332 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 ();
1333 1297
1334#if ENABLE_FRILLS 1298#if ENABLE_FRILLS
1335 if (rs[Rs_pty_fd]) 1299 if (rs[Rs_pty_fd])
1336 return; 1300 return;
1337#endif 1301#endif
… …
1368 } 1332 }
1369 1333
1370 _exit (EXIT_FAILURE); 1334 _exit (EXIT_FAILURE);
1371 1335
1372 default: 1336 default:
1373 if (!OPTION (Opt_utmpInhibit)) 1337 if (!option (Opt_utmpInhibit))
1374 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1338 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1375 1339
1376 pty->close_tty (); 1340 pty->close_tty ();
1377 1341
1378 child_ev.start (cmd_pid); 1342 child_ev.start (cmd_pid);
1379 1343
… …
1392int 1356int
1393rxvt_term::run_child (const char *const *argv) 1357rxvt_term::run_child (const char *const *argv)
1394{ 1358{
1395 char *login; 1359 char *login;
1396 1360
1397 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1398
1399 if (OPTION (Opt_console)) 1361 if (option (Opt_console))
1400 { /* be virtual console, fail silently */ 1362 { /* be virtual console, fail silently */
1401#ifdef TIOCCONS 1363#ifdef TIOCCONS
1402 unsigned int on = 1; 1364 unsigned int on = 1;
1403 1365
1404 ioctl (STDIN_FILENO, TIOCCONS, &on); 1366 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1453 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1415 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1454 shell = "/bin/sh"; 1416 shell = "/bin/sh";
1455 1417
1456 argv0 = (const char *)rxvt_r_basename (shell); 1418 argv0 = (const char *)rxvt_r_basename (shell);
1457 1419
1458 if (OPTION (Opt_loginShell)) 1420 if (option (Opt_loginShell))
1459 { 1421 {
1460 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1422 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1461 1423
1462 login[0] = '-'; 1424 login[0] = '-';
1463 strcpy (&login[1], argv0); 1425 strcpy (&login[1], argv0);

Diff Legend

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