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.150 by root, Fri Jan 20 11:02:46 2006 UTC vs.
Revision 1.165 by root, Tue Jan 31 19:11:43 2006 UTC

… …
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: ywlloe (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#if ENABLE_XEMBED
209 "_XEMBED",
210 "_XEMBED_INFO",
211#endif 176#endif
212 }; 177 };
213 178
214bool 179bool
215rxvt_term::init_vars () 180rxvt_term::init_vars ()
216{ 181{
182 pix_colors = //
217 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
218#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
219 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
220#endif 186#endif
221 pix_colors = pix_colors_focused;
222
223 if (pix_colors == NULL)
224 return false;
225 187
226#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
227 pixmap = None; 189 pixmap = None;
228#endif 190#endif
229 191
230 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
231 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
232 options = DEFAULT_OPTIONS; 194 options = DEFAULT_OPTIONS;
233 want_refresh = 1; 195 want_refresh = 1;
234 priv_modes = SavedModes = PrivMode_Default; 196 priv_modes = SavedModes = PrivMode_Default;
235 focus = 0;
236 ncol = 80; 197 ncol = 80;
237 nrow = 24; 198 nrow = 24;
238 int_bwidth = INTERNALBORDERWIDTH; 199 int_bwidth = INTERNALBORDERWIDTH;
239 ext_bwidth = EXTERNALBORDERWIDTH; 200 ext_bwidth = EXTERNALBORDERWIDTH;
240 lineSpace = LINESPACE; 201 lineSpace = LINESPACE;
241 saveLines = SAVELINES; 202 saveLines = SAVELINES;
242 numpix_colors = TOTAL_COLORS; 203 numpix_colors = TOTAL_COLORS;
243 204
244 refresh_limit = 1; 205 refresh_limit = 1;
245 refresh_type = SLOW_REFRESH; 206 refresh_type = SLOW_REFRESH;
246 prev_nrow = prev_ncol = 0;
247 207
248 oldcursor.row = oldcursor.col = -1; 208 oldcursor.row = oldcursor.col = -1;
249#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
250 /* bgPixmap.w = bgPixmap.h = 0; */ 210 /* bgPixmap.w = bgPixmap.h = 0; */
251 bgPixmap.x = bgPixmap.y = 50; 211 bgPixmap.x = bgPixmap.y = 50;
… …
337 get_options (r_argc, r_argv); 297 get_options (r_argc, r_argv);
338 298
339 if (!(display = displays.get (rs[Rs_display_name]))) 299 if (!(display = displays.get (rs[Rs_display_name])))
340 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
341 301
302 xa = display->xa;
303
304#if XFT
305 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0));
307 else
308#endif
309 set (display);
310
342 extract_resources (); 311 extract_resources ();
343 312
344 free (r_argv); 313 free (r_argv);
314
315#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default";
318
319 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
320 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
321 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
322 {
323 rxvt_perl.init (this);
324 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
325 }
326#endif
345 327
346 /* 328 /*
347 * set any defaults not already set 329 * set any defaults not already set
348 */ 330 */
349 if (cmd_argv && cmd_argv[0]) 331 if (cmd_argv && cmd_argv[0])
… …
439 /* this is how xterm implements reverseVideo */ 421 /* this is how xterm implements reverseVideo */
440 if (OPTION (Opt_reverseVideo)) 422 if (OPTION (Opt_reverseVideo))
441 { 423 {
442 if (!rs[Rs_color + Color_fg]) 424 if (!rs[Rs_color + Color_fg])
443 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 425 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
426
444 if (!rs[Rs_color + Color_bg]) 427 if (!rs[Rs_color + Color_bg])
445 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 428 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
446 } 429 }
447#endif 430#endif
448 431
… …
500 val = rxvt_network_display (rs[Rs_display_name]); 483 val = rxvt_network_display (rs[Rs_display_name]);
501 rs[Rs_display_name] = (const char *)val; 484 rs[Rs_display_name] = (const char *)val;
502 485
503 if (val == NULL) 486 if (val == NULL)
504#endif /* DISPLAY_IS_IP */ 487#endif /* DISPLAY_IS_IP */
505 val = XDisplayString (display->display); 488 val = XDisplayString (xdisp);
506 489
507 if (rs[Rs_display_name] == NULL) 490 if (rs[Rs_display_name] == NULL)
508 rs[Rs_display_name] = val; /* use broken `:0' value */ 491 rs[Rs_display_name] = val; /* use broken `:0' value */
509 492
510 i = strlen (val); 493 i = strlen (val);
511 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 494 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
512 495
513 sprintf (env_display, "DISPLAY=%s", val); 496 sprintf (env_display, "DISPLAY=%s", val);
514 497
515 /* avoiding the math library: 498 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
516 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
517 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
518 ;
519 max_it (i, 1);
520 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
521
522 sprintf (env_windowid, "WINDOWID=%u",
523 (unsigned int)parent[0]);
524 499
525 /* add entries to the environment: 500 /* add entries to the environment:
526 * @ DISPLAY: in case we started with -display 501 * @ DISPLAY: in case we started with -display
527 * @ WINDOWID: X window id number of the window 502 * @ WINDOWID: X window id number of the window
528 * @ COLORTERM: terminal sub-name and also indicates its color 503 * @ COLORTERM: terminal sub-name and also indicates its color
… …
530 * @ TERMINFO: path to terminfo directory 505 * @ TERMINFO: path to terminfo directory
531 * @ COLORFGBG: fg;bg color codes 506 * @ COLORFGBG: fg;bg color codes
532 */ 507 */
533 putenv (env_display); 508 putenv (env_display);
534 putenv (env_windowid); 509 putenv (env_windowid);
510
535 if (env_colorfgbg) 511 if (env_colorfgbg)
536 putenv (env_colorfgbg); 512 putenv (env_colorfgbg);
537 513
538#ifdef RXVT_TERMINFO 514#ifdef RXVT_TERMINFO
539 putenv ("TERMINFO=" RXVT_TERMINFO); 515 putenv ("TERMINFO=" RXVT_TERMINFO);
540#endif 516#endif
541 517
542 if (display->depth <= 2) 518 if (depth <= 2)
543 putenv ("COLORTERM=" COLORTERMENV "-mono"); 519 putenv ("COLORTERM=" COLORTERMENV "-mono");
544 else 520 else
545 putenv ("COLORTERM=" COLORTERMENVFULL); 521 putenv ("COLORTERM=" COLORTERMENVFULL);
546 522
547 if (rs[Rs_term_name] != NULL) 523 if (rs[Rs_term_name] != NULL)
… …
678 654
679#ifdef OFF_FOCUS_FADING 655#ifdef OFF_FOCUS_FADING
680 pix_colors = pix_colors_focused; 656 pix_colors = pix_colors_focused;
681#endif 657#endif
682 658
683 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 659 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
684 { 660 {
661 const char *name = rs[Rs_color + i];
662
663 if (!name)
664 continue;
665
685 rxvt_color xcol; 666 rxvt_color xcol;
686 667
687 if (!rs[Rs_color + i]) 668 if (!set_color (xcol, name))
688 continue;
689
690 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
691 { 669 {
692#ifndef XTERM_REVERSE_VIDEO 670#ifndef XTERM_REVERSE_VIDEO
693 if (i < 2 && OPTION (Opt_reverseVideo)) 671 if (i < 2 && OPTION (Opt_reverseVideo))
694 rs[Rs_color + i] = def_colorName[!i]; 672 name = def_colorName [1 - i];
695 else 673 else
696#endif 674#endif
697 rs[Rs_color + i] = def_colorName[i]; 675 name = def_colorName [i];
698 676
699 if (!rs[Rs_color + i]) 677 if (!name)
700 continue; 678 continue;
701 679
702 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 680 if (!set_color (xcol, name))
703 { 681 {
704 switch (i) 682 switch (i)
705 { 683 {
706 case Color_fg: 684 case Color_fg:
707 case Color_bg: 685 case Color_bg:
708 /* fatal: need bg/fg color */
709 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 686 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
710 /* NOTREACHED */ 687 name = "";
711 break; 688 break;
712#ifndef NO_CURSORCOLOR 689#ifndef NO_CURSORCOLOR
713 case Color_cursor2: 690 case Color_cursor2:
714 xcol = pix_colors[Color_fg]; 691#endif
715 break;
716#endif /* ! NO_CURSORCOLOR */
717 case Color_pointer_fg: 692 case Color_pointer_fg:
693 name = rs[Rs_color + Color_fg];
718 xcol = pix_colors[Color_fg]; 694 xcol = pix_colors[Color_fg];
719 break; 695 break;
720 default: 696 default:
697 name = rs[Rs_color + Color_bg];
721 xcol = pix_colors[Color_bg]; /* None */ 698 xcol = pix_colors[Color_bg];
722 break; 699 break;
723 } 700 }
724 } 701 }
725 } 702 }
726 703
727 pix_colors[i] = xcol; 704 pix_colors[i] = xcol;
728 SET_PIXCOLOR (i); 705 rs[Rs_color + i] = name;
729 } 706 }
730 707
731#ifdef OFF_FOCUS_FADING 708#ifdef OFF_FOCUS_FADING
732 if (rs[Rs_fade]) 709 if (rs[Rs_fade])
733 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 710 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
734 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 711 {
712 rgba c;
713 pix_colors[Color_fade].get (this, c);
714 pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
715 }
735#endif 716#endif
736 717
737 if (display->depth <= 2) 718 if (depth <= 2)
738 { 719 {
739 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 720 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
740 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 721 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
741 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 722 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
742 } 723 }
… …
747 * The calculations of topShadow/bottomShadow values are adapted 728 * The calculations of topShadow/bottomShadow values are adapted
748 * from the fvwm window manager. 729 * from the fvwm window manager.
749 */ 730 */
750#ifdef KEEP_SCROLLCOLOR 731#ifdef KEEP_SCROLLCOLOR
751 732
752 if (display->depth <= 2) 733 if (depth <= 2)
753 { 734 {
754 /* Monochrome */ 735 /* Monochrome */
755 pix_colors[Color_scroll] = pix_colors[Color_fg]; 736 pix_colors[Color_scroll] = pix_colors[Color_fg];
756 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 737 pix_colors[Color_topShadow] = pix_colors[Color_bg];
757 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 738 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
… …
762 /* xcol[0] == white 743 /* xcol[0] == white
763 * xcol[1] == top shadow 744 * xcol[1] == top shadow
764 * xcol[2] == bot shadow */ 745 * xcol[2] == bot shadow */
765 746
766 xcol[1] = pix_colors[Color_scroll]; 747 xcol[1] = pix_colors[Color_scroll];
767 xcol[0].set (display, 65535, 65535, 65535); 748 xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
768 749
769 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 750 rgba c0, c1;
770 751
771 xcol[0].get (display, pr0, pg0, pb0); 752 xcol[0].get (this, c0);
772 xcol[1].get (display, pr1, pg1, pb1); 753 xcol[1].get (this, c1);
773 754
774 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 755 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
775 756
776 /* topShadowColor */ 757 /* topShadowColor */
777 if (!xcol[1].set (display, 758 if (!xcol[1].set (this,
759 rgba (
778 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 760 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),
779 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 761 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),
780 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 762 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),
763 c1.a) // pa1 vs. pa0: arbitrary
764 ));
781 xcol[1] = pix_colors[Color_White]; 765 xcol[1] = pix_colors[Color_White];
782 766
783 pix_colors[Color_topShadow] = xcol[1]; 767 pix_colors[Color_topShadow] = xcol[1];
784 } 768 }
785#endif /* KEEP_SCROLLCOLOR */ 769#endif /* KEEP_SCROLLCOLOR */
… …
829 813
830 if (rsmod 814 if (rsmod
831 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 815 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
832 requestedmeta = rsmod[3] - '0'; 816 requestedmeta = rsmod[3] - '0';
833 817
834 map = XGetModifierMapping (display->display); 818 map = XGetModifierMapping (xdisp);
835 kc = map->modifiermap; 819 kc = map->modifiermap;
836 820
837 for (i = 1; i < 6; i++) 821 for (i = 1; i < 6; i++)
838 { 822 {
839 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 823 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
841 for (j = map->max_keypermod; j--; k++) 825 for (j = map->max_keypermod; j--; k++)
842 { 826 {
843 if (kc[k] == 0) 827 if (kc[k] == 0)
844 break; 828 break;
845 829
846 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 830 switch (XKeycodeToKeysym (xdisp, kc[k], 0))
847 { 831 {
848 case XK_Num_Lock: 832 case XK_Num_Lock:
849 ModNumLockMask = modmasks[i - 1]; 833 ModNumLockMask = modmasks[i - 1];
850 continue; 834 continue;
851 835
… …
901rxvt_term::create_windows (int argc, const char *const *argv) 885rxvt_term::create_windows (int argc, const char *const *argv)
902{ 886{
903 XClassHint classHint; 887 XClassHint classHint;
904 XWMHints wmHint; 888 XWMHints wmHint;
905#if ENABLE_FRILLS 889#if ENABLE_FRILLS
906 Atom prop = None;
907 MWMHints mwmhints; 890 MWMHints mwmhints;
908#endif 891#endif
909 XGCValues gcvalue; 892 XGCValues gcvalue;
910 XSetWindowAttributes attributes; 893 XSetWindowAttributes attributes;
911 XWindowAttributes gattr;
912 Window top, parent; 894 Window top, parent;
913 dDisp;
914 895
915#ifdef USING_W11LIB 896 dLocal (Display *, xdisp);
916 /* enable W11 callbacks */
917 W11AddEventHandler (disp, rxvt_W11_process_x_event);
918#endif
919
920 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
921 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
922
923 if (OPTION (Opt_transparent))
924 {
925 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
926 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
927 }
928 897
929 /* grab colors before netscape does */ 898 /* grab colors before netscape does */
930 Get_Colours (); 899 Get_Colours ();
931 900
932 if (!set_fonts ()) 901 if (!set_fonts ())
933 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 902 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
934 903
935 parent = DefaultRootWindow (disp); 904 parent = display->root;
936 905
937 attributes.override_redirect = !!OPTION (Opt_override_redirect); 906 attributes.override_redirect = !!OPTION (Opt_override_redirect);
938 907
939#if ENABLE_FRILLS 908#if ENABLE_FRILLS
940 if (OPTION (Opt_borderLess)) 909 if (OPTION (Opt_borderLess))
941 { 910 {
942 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 911 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
943
944 if (prop == None)
945 { 912 {
946 /* 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");*/
947 attributes.override_redirect = TRUE; 914 attributes.override_redirect = true;
948 mwmhints.flags = 0; 915 mwmhints.flags = 0;
949 } 916 }
950 else 917 else
951 { 918 {
952 mwmhints.flags = MWM_HINTS_DECORATIONS; 919 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
962 { 929 {
963 XWindowAttributes wattr; 930 XWindowAttributes wattr;
964 931
965 parent = strtol (rs[Rs_embed], 0, 0); 932 parent = strtol (rs[Rs_embed], 0, 0);
966 933
967 if (!XGetWindowAttributes (disp, parent, &wattr)) 934 if (!XGetWindowAttributes (xdisp, parent, &wattr))
968 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 935 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
969 936
970 window_calc (wattr.width, wattr.height); 937 window_calc (wattr.width, wattr.height);
971 } 938 }
972#endif 939#endif
973 940
974 window_calc (0, 0); 941 window_calc (0, 0);
975 942
976 /* sub-window placement & size in rxvt_resize_subwindows () */ 943 /* sub-window placement & size in rxvt_resize_subwindows () */
977 attributes.background_pixel = pix_colors_focused[Color_border]; 944 attributes.background_pixel = pix_colors_focused [Color_border];
978 attributes.border_pixel = pix_colors_focused[Color_border]; 945 attributes.border_pixel = pix_colors_focused [Color_border];
979 attributes.colormap = display->cmap; 946 attributes.colormap = cmap;
947
980 top = XCreateWindow (disp, parent, 948 top = XCreateWindow (xdisp, parent,
981 szHint.x, szHint.y, 949 szHint.x, szHint.y,
982 szHint.width, szHint.height, 950 szHint.width, szHint.height,
983 ext_bwidth, 951 ext_bwidth,
984 display->depth, InputOutput, 952 depth, InputOutput, visual,
985 display->visual,
986 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 953 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
987 &attributes); 954 &attributes);
988 955
989 this->parent[0] = top; 956 this->parent[0] = top;
990 957
991 old_width = szHint.width; 958 old_width = szHint.width;
992 old_height = szHint.height; 959 old_height = szHint.height;
993 960
994 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 961 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
995 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 962 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
996 963
997 classHint.res_name = (char *)rs[Rs_name]; 964 classHint.res_name = (char *)rs[Rs_name];
998 classHint.res_class = (char *)RESCLASS; 965 classHint.res_class = (char *)RESCLASS;
999 966
1000 wmHint.flags = InputHint | StateHint | WindowGroupHint; 967 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1001 wmHint.input = True; 968 wmHint.input = True;
1002 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 969 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1003 wmHint.window_group = top; 970 wmHint.window_group = top;
1004 971
1005 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 972 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1006 &szHint, &wmHint, &classHint); 973 &szHint, &wmHint, &classHint);
974
975#if ENABLE_FRILLS
976 if (mwmhints.flags)
977 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
978 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
979#endif
1007 980
1008 Atom protocols[] = { 981 Atom protocols[] = {
1009 xa[XA_WM_DELETE_WINDOW], 982 xa[XA_WM_DELETE_WINDOW],
1010#if ENABLE_EWMH 983#if ENABLE_EWMH
1011 xa[XA_NET_WM_PING], 984 xa[XA_NET_WM_PING],
1012#endif 985#endif
1013 }; 986 };
1014 987
1015 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 988 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1016 989
1017#if ENABLE_FRILLS 990#if ENABLE_FRILLS
1018 if (rs[Rs_transient_for]) 991 if (rs[Rs_transient_for])
1019 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 992 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1020#endif 993#endif
1021 994
1022#if ENABLE_EWMH 995#if ENABLE_EWMH
1023 long pid = getpid (); 996 long pid = getpid ();
1024 997
1025 XChangeProperty (disp, top, 998 XChangeProperty (xdisp, top,
1026 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 999 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1027 PropModeReplace, (unsigned char *)&pid, 1); 1000 PropModeReplace, (unsigned char *)&pid, 1);
1028 1001
1029 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1002 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1030#endif 1003#endif
1031 1004
1032 XSelectInput (disp, top, 1005 XSelectInput (xdisp, top,
1033 KeyPressMask 1006 KeyPressMask
1034#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1007#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1035 | KeyReleaseMask 1008 | KeyReleaseMask
1036#endif 1009#endif
1037 | FocusChangeMask | VisibilityChangeMask 1010 | FocusChangeMask | VisibilityChangeMask
1038 | ExposureMask | StructureNotifyMask); 1011 | ExposureMask | StructureNotifyMask);
1039 1012
1040 termwin_ev.start (display, top); 1013 termwin_ev.start (display, top);
1041 1014
1042#if ENABLE_FRILLS
1043 if (mwmhints.flags)
1044 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1045 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1046#endif
1047
1048 /* 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 */
1049 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1016 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1050 1017
1051#ifdef HAVE_SCROLLBARS 1018#ifdef HAVE_SCROLLBARS
1052 /* cursor scrollBar: Black-on-White */ 1019 /* cursor scrollBar: Black-on-White */
1053 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1020 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1054#endif 1021#endif
1055 1022
1056 /* the vt window */ 1023 /* the vt window */
1057 vt = XCreateSimpleWindow (disp, top, 1024 vt = XCreateSimpleWindow (xdisp, top,
1058 window_vt_x,
1059 window_vt_y, 1025 window_vt_x, window_vt_y,
1060 width,
1061 height, 1026 width, height,
1062 0, 1027 0,
1063 pix_colors_focused[Color_fg], 1028 pix_colors_focused[Color_fg],
1064 pix_colors_focused[Color_bg]); 1029 pix_colors_focused[Color_bg]);
1065#ifdef DEBUG_X
1066 XStoreName (disp, vt, "vt window");
1067#endif
1068 1030
1069 attributes.bit_gravity = NorthWestGravity; 1031 attributes.bit_gravity = NorthWestGravity;
1070 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1032 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1071 1033
1072 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1034 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1073 1035
1074 if (OPTION (Opt_pointerBlank)) 1036 if (OPTION (Opt_pointerBlank))
1075 vt_emask |= PointerMotionMask; 1037 vt_emask |= PointerMotionMask;
… …
1080 1042
1081 vt_ev.start (display, vt); 1043 vt_ev.start (display, vt);
1082 1044
1083#ifdef XPM_BACKGROUND 1045#ifdef XPM_BACKGROUND
1084 if (rs[Rs_backgroundPixmap] != NULL 1046 if (rs[Rs_backgroundPixmap] != NULL
1085 && ! OPTION (Opt_transparent)) 1047 && !OPTION (Opt_transparent))
1086 { 1048 {
1087 const char *p = rs[Rs_backgroundPixmap]; 1049 const char *p = rs[Rs_backgroundPixmap];
1088 1050
1089 if ((p = strchr (p, ';')) != NULL) 1051 if ((p = strchr (p, ';')) != NULL)
1090 { 1052 {
… …
1096 scr_touch (true); 1058 scr_touch (true);
1097 } 1059 }
1098#endif 1060#endif
1099 1061
1100 /* graphics context for the vt window */ 1062 /* graphics context for the vt window */
1101 gcvalue.foreground = pix_colors[Color_fg]; 1063 gcvalue.foreground = pix_colors[Color_fg];
1102 gcvalue.background = pix_colors[Color_bg]; 1064 gcvalue.background = pix_colors[Color_bg];
1103 gcvalue.graphics_exposures = 1; 1065 gcvalue.graphics_exposures = 1;
1066
1104 gc = XCreateGC (disp, vt, 1067 gc = XCreateGC (xdisp, vt,
1105 GCForeground | GCBackground | GCGraphicsExposures, 1068 GCForeground | GCBackground | GCGraphicsExposures,
1106 &gcvalue); 1069 &gcvalue);
1107 1070
1108 drawable = new rxvt_drawable (display, vt); 1071 drawable = new rxvt_drawable (this, vt);
1109 1072
1110#ifdef RXVT_SCROLLBAR 1073#ifdef RXVT_SCROLLBAR
1111 gcvalue.foreground = pix_colors[Color_topShadow]; 1074 gcvalue.foreground = pix_colors[Color_topShadow];
1112 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1075 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1113 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1076 gcvalue.foreground = pix_colors[Color_bottomShadow];
1114 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1077 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1115 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1078 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1116 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1079 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1117#endif 1080#endif
1118 1081
1119#ifdef OFF_FOCUS_FADING 1082#ifdef OFF_FOCUS_FADING
1120 // initially we are in unfocused state 1083 // initially we are in unfocused state
1121 if (rs[Rs_fade]) 1084 if (rs[Rs_fade])
1122 pix_colors = pix_colors_unfocused; 1085 pix_colors = pix_colors_unfocused;
1123#endif 1086#endif
1124 1087
1125 pointer_unblank (); 1088 pointer_unblank ();
1126 scr_recolour (); 1089 scr_recolour ();
1127
1128#if ENABLE_XEMBED
1129 if (rs[Rs_embed])
1130 {
1131 long info[2] = { 0, XEMBED_MAPPED };
1132
1133 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1134 32, PropModeReplace, (unsigned char *)&info, 2);
1135 }
1136#endif
1137} 1090}
1138 1091
1139/* ------------------------------------------------------------------------- * 1092/* ------------------------------------------------------------------------- *
1140 * GET TTY CURRENT STATE * 1093 * GET TTY CURRENT STATE *
1141 * ------------------------------------------------------------------------- */ 1094 * ------------------------------------------------------------------------- */
… …
1431 } 1384 }
1432 1385
1433 _exit (EXIT_FAILURE); 1386 _exit (EXIT_FAILURE);
1434 1387
1435 default: 1388 default:
1436#if UTMP_SUPPORT
1437 if (!OPTION (Opt_utmpInhibit)) 1389 if (!OPTION (Opt_utmpInhibit))
1438 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1390 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1439#endif
1440 1391
1441 pty->close_tty (); 1392 pty->close_tty ();
1442 1393
1443 child_ev.start (cmd_pid); 1394 child_ev.start (cmd_pid);
1444 1395

Diff Legend

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