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.170 by root, Sat Feb 18 15:24:39 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 // using a local pointer decreases code size a lot
303 xa = display->xa;
304
305#if XFT
306 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0));
308 else
309#endif
310 set (display);
311
342 extract_resources (); 312 extract_resources ();
343 313
344 free (r_argv); 314 free (r_argv);
315
316 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef)
318 rs [i] = 0;
319
320#if ENABLE_PERL
321 if (!rs[Rs_perl_ext_1])
322 rs[Rs_perl_ext_1] = "default";
323
324 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
325 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
326 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
327 {
328 rxvt_perl.init (this);
329 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
330 }
331#endif
345 332
346 /* 333 /*
347 * set any defaults not already set 334 * set any defaults not already set
348 */ 335 */
349 if (cmd_argv && cmd_argv[0]) 336 if (cmd_argv && cmd_argv[0])
… …
439 /* this is how xterm implements reverseVideo */ 426 /* this is how xterm implements reverseVideo */
440 if (OPTION (Opt_reverseVideo)) 427 if (OPTION (Opt_reverseVideo))
441 { 428 {
442 if (!rs[Rs_color + Color_fg]) 429 if (!rs[Rs_color + Color_fg])
443 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 430 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431
444 if (!rs[Rs_color + Color_bg]) 432 if (!rs[Rs_color + Color_bg])
445 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 433 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
446 } 434 }
447#endif 435#endif
448 436
… …
500 val = rxvt_network_display (rs[Rs_display_name]); 488 val = rxvt_network_display (rs[Rs_display_name]);
501 rs[Rs_display_name] = (const char *)val; 489 rs[Rs_display_name] = (const char *)val;
502 490
503 if (val == NULL) 491 if (val == NULL)
504#endif /* DISPLAY_IS_IP */ 492#endif /* DISPLAY_IS_IP */
505 val = XDisplayString (display->display); 493 val = XDisplayString (dpy);
506 494
507 if (rs[Rs_display_name] == NULL) 495 if (rs[Rs_display_name] == NULL)
508 rs[Rs_display_name] = val; /* use broken `:0' value */ 496 rs[Rs_display_name] = val; /* use broken `:0' value */
509 497
510 i = strlen (val); 498 i = strlen (val);
511 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 499 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
512 500
513 sprintf (env_display, "DISPLAY=%s", val); 501 sprintf (env_display, "DISPLAY=%s", val);
514 502
515 /* avoiding the math library: 503 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 504
525 /* add entries to the environment: 505 /* add entries to the environment:
526 * @ DISPLAY: in case we started with -display 506 * @ DISPLAY: in case we started with -display
527 * @ WINDOWID: X window id number of the window 507 * @ WINDOWID: X window id number of the window
528 * @ COLORTERM: terminal sub-name and also indicates its color 508 * @ COLORTERM: terminal sub-name and also indicates its color
… …
530 * @ TERMINFO: path to terminfo directory 510 * @ TERMINFO: path to terminfo directory
531 * @ COLORFGBG: fg;bg color codes 511 * @ COLORFGBG: fg;bg color codes
532 */ 512 */
533 putenv (env_display); 513 putenv (env_display);
534 putenv (env_windowid); 514 putenv (env_windowid);
515
535 if (env_colorfgbg) 516 if (env_colorfgbg)
536 putenv (env_colorfgbg); 517 putenv (env_colorfgbg);
537 518
538#ifdef RXVT_TERMINFO 519#ifdef RXVT_TERMINFO
539 putenv ("TERMINFO=" RXVT_TERMINFO); 520 putenv ("TERMINFO=" RXVT_TERMINFO);
540#endif 521#endif
541 522
542 if (display->depth <= 2) 523 if (depth <= 2)
543 putenv ("COLORTERM=" COLORTERMENV "-mono"); 524 putenv ("COLORTERM=" COLORTERMENV "-mono");
544 else 525 else
545 putenv ("COLORTERM=" COLORTERMENVFULL); 526 putenv ("COLORTERM=" COLORTERMENVFULL);
546 527
547 if (rs[Rs_term_name] != NULL) 528 if (rs[Rs_term_name] != NULL)
… …
678 659
679#ifdef OFF_FOCUS_FADING 660#ifdef OFF_FOCUS_FADING
680 pix_colors = pix_colors_focused; 661 pix_colors = pix_colors_focused;
681#endif 662#endif
682 663
683 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 664 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
684 { 665 {
666 const char *name = rs[Rs_color + i];
667
668 if (!name)
669 continue;
670
685 rxvt_color xcol; 671 rxvt_color xcol;
686 672
687 if (!rs[Rs_color + i]) 673 if (!set_color (xcol, name))
688 continue;
689
690 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
691 { 674 {
692#ifndef XTERM_REVERSE_VIDEO 675#ifndef XTERM_REVERSE_VIDEO
693 if (i < 2 && OPTION (Opt_reverseVideo)) 676 if (i < 2 && OPTION (Opt_reverseVideo))
694 rs[Rs_color + i] = def_colorName[!i]; 677 name = def_colorName [1 - i];
695 else 678 else
696#endif 679#endif
697 rs[Rs_color + i] = def_colorName[i]; 680 name = def_colorName [i];
698 681
699 if (!rs[Rs_color + i]) 682 if (!name)
700 continue; 683 continue;
701 684
702 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 685 if (!set_color (xcol, name))
703 { 686 {
704 switch (i) 687 switch (i)
705 { 688 {
706 case Color_fg: 689 case Color_fg:
707 case Color_bg: 690 case Color_bg:
708 /* fatal: need bg/fg color */
709 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 691 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
710 /* NOTREACHED */ 692 name = "";
711 break; 693 break;
712#ifndef NO_CURSORCOLOR 694#ifndef NO_CURSORCOLOR
713 case Color_cursor2: 695 case Color_cursor2:
714 xcol = pix_colors[Color_fg]; 696#endif
715 break;
716#endif /* ! NO_CURSORCOLOR */
717 case Color_pointer_fg: 697 case Color_pointer_fg:
718 xcol = pix_colors[Color_fg]; 698 name = rs[Rs_color + Color_fg];
699 xcol.set (this, name);
719 break; 700 break;
720 default: 701 default:
721 xcol = pix_colors[Color_bg]; /* None */ 702 name = rs[Rs_color + Color_bg];
703 xcol.set (this, name);
722 break; 704 break;
723 } 705 }
724 } 706 }
725 } 707 }
726 708
727 pix_colors[i] = xcol; 709 pix_colors[i] = xcol;
728 SET_PIXCOLOR (i); 710 rs[Rs_color + i] = name;
729 }
730
731#ifdef OFF_FOCUS_FADING
732 if (rs[Rs_fade])
733 for (i = 0; i < (display->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]);
735#endif
736
737 if (display->depth <= 2)
738 { 711 }
712
713 if (depth <= 2)
714 {
739 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 715 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
740 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 716 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
741 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 717 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
742 } 718 }
743 719
744 /* 720 /*
745 * get scrollBar shadow colors 721 * get scrollBar shadow colors
746 * 722 *
747 * The calculations of topShadow/bottomShadow values are adapted 723 * The calculations of topShadow/bottomShadow values are adapted
748 * from the fvwm window manager. 724 * from the fvwm window manager.
749 */ 725 */
750#ifdef KEEP_SCROLLCOLOR 726#ifdef KEEP_SCROLLCOLOR
751
752 if (display->depth <= 2) 727 if (depth <= 2)
753 { 728 {
754 /* Monochrome */ 729 /* Monochrome */
755 pix_colors[Color_scroll] = pix_colors[Color_fg]; 730 alias_color (Color_scroll, Color_fg);
756 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 731 alias_color (Color_topShadow, Color_bg);
757 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 732 alias_color (Color_bottomShadow, Color_bg);
758 } 733 }
759 else 734 else
760 { 735 {
761 rxvt_color xcol[2]; 736 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
762 /* xcol[0] == white
763 * xcol[1] == top shadow
764 * xcol[2] == bot shadow */
765 737
766 xcol[1] = pix_colors[Color_scroll]; 738 rgba cscroll;
767 xcol[0].set (display, 65535, 65535, 65535); 739 pix_colors [Color_scroll].get (cscroll);
768
769 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
770
771 xcol[0].get (display, pr0, pg0, pb0);
772 xcol[1].get (display, pr1, pg1, pb1);
773
774 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
775 740
776 /* topShadowColor */ 741 /* topShadowColor */
777 if (!xcol[1].set (display, 742 if (!pix_colors[Color_topShadow].set (this,
778 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 743 rgba (
779 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 744 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
780 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 745 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
781 xcol[1] = pix_colors[Color_White]; 746 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
782 747 cscroll.a)
783 pix_colors[Color_topShadow] = xcol[1]; 748 ))
749 alias_color (Color_topShadow, Color_White);
784 } 750 }
785#endif /* KEEP_SCROLLCOLOR */ 751#endif /* KEEP_SCROLLCOLOR */
752
753#ifdef OFF_FOCUS_FADING
754 if (rs[Rs_fade])
755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
756 {
757 rgba c;
758 pix_colors [Color_fade].get (c);
759 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
760 }
761#endif
786} 762}
787 763
788/*----------------------------------------------------------------------*/ 764/*----------------------------------------------------------------------*/
789/* color aliases, fg/bg bright-bold */ 765/* color aliases, fg/bg bright-bold */
790void 766void
… …
829 805
830 if (rsmod 806 if (rsmod
831 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 807 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
832 requestedmeta = rsmod[3] - '0'; 808 requestedmeta = rsmod[3] - '0';
833 809
834 map = XGetModifierMapping (display->display); 810 map = XGetModifierMapping (dpy);
835 kc = map->modifiermap; 811 kc = map->modifiermap;
836 812
837 for (i = 1; i < 6; i++) 813 for (i = 1; i < 6; i++)
838 { 814 {
839 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 815 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
841 for (j = map->max_keypermod; j--; k++) 817 for (j = map->max_keypermod; j--; k++)
842 { 818 {
843 if (kc[k] == 0) 819 if (kc[k] == 0)
844 break; 820 break;
845 821
846 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 822 switch (XKeycodeToKeysym (dpy, kc[k], 0))
847 { 823 {
848 case XK_Num_Lock: 824 case XK_Num_Lock:
849 ModNumLockMask = modmasks[i - 1]; 825 ModNumLockMask = modmasks[i - 1];
850 continue; 826 continue;
851 827
… …
901rxvt_term::create_windows (int argc, const char *const *argv) 877rxvt_term::create_windows (int argc, const char *const *argv)
902{ 878{
903 XClassHint classHint; 879 XClassHint classHint;
904 XWMHints wmHint; 880 XWMHints wmHint;
905#if ENABLE_FRILLS 881#if ENABLE_FRILLS
906 Atom prop = None;
907 MWMHints mwmhints; 882 MWMHints mwmhints;
908#endif 883#endif
909 XGCValues gcvalue; 884 XGCValues gcvalue;
910 XSetWindowAttributes attributes; 885 XSetWindowAttributes attributes;
911 XWindowAttributes gattr;
912 Window top, parent; 886 Window top, parent;
913 dDisp;
914 887
915#ifdef USING_W11LIB 888 dLocal (Display *, dpy);
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 889
929 /* grab colors before netscape does */ 890 /* grab colors before netscape does */
930 Get_Colours (); 891 Get_Colours ();
931 892
932 if (!set_fonts ()) 893 if (!set_fonts ())
933 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 894 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
934 895
935 parent = DefaultRootWindow (disp); 896 parent = display->root;
936 897
937 attributes.override_redirect = !!OPTION (Opt_override_redirect); 898 attributes.override_redirect = !!OPTION (Opt_override_redirect);
938 899
939#if ENABLE_FRILLS 900#if ENABLE_FRILLS
940 if (OPTION (Opt_borderLess)) 901 if (OPTION (Opt_borderLess))
941 { 902 {
942 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 903 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
943
944 if (prop == None)
945 { 904 {
946 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 905 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
947 attributes.override_redirect = TRUE; 906 attributes.override_redirect = true;
948 mwmhints.flags = 0; 907 mwmhints.flags = 0;
949 } 908 }
950 else 909 else
951 { 910 {
952 mwmhints.flags = MWM_HINTS_DECORATIONS; 911 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
962 { 921 {
963 XWindowAttributes wattr; 922 XWindowAttributes wattr;
964 923
965 parent = strtol (rs[Rs_embed], 0, 0); 924 parent = strtol (rs[Rs_embed], 0, 0);
966 925
967 if (!XGetWindowAttributes (disp, parent, &wattr)) 926 if (!XGetWindowAttributes (dpy, parent, &wattr))
968 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 927 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
969 928
970 window_calc (wattr.width, wattr.height); 929 window_calc (wattr.width, wattr.height);
971 } 930 }
972#endif 931#endif
973 932
974 window_calc (0, 0); 933 window_calc (0, 0);
975 934
976 /* sub-window placement & size in rxvt_resize_subwindows () */ 935 /* sub-window placement & size in rxvt_resize_subwindows () */
977 attributes.background_pixel = pix_colors_focused[Color_border]; 936 attributes.background_pixel = pix_colors_focused [Color_border];
978 attributes.border_pixel = pix_colors_focused[Color_border]; 937 attributes.border_pixel = pix_colors_focused [Color_border];
979 attributes.colormap = display->cmap; 938 attributes.colormap = cmap;
939
980 top = XCreateWindow (disp, parent, 940 top = XCreateWindow (dpy, parent,
981 szHint.x, szHint.y, 941 szHint.x, szHint.y,
982 szHint.width, szHint.height, 942 szHint.width, szHint.height,
983 ext_bwidth, 943 ext_bwidth,
984 display->depth, InputOutput, 944 depth, InputOutput, visual,
985 display->visual,
986 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 945 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
987 &attributes); 946 &attributes);
988 947
989 this->parent[0] = top; 948 this->parent[0] = top;
990 949
991 old_width = szHint.width; 950 old_width = szHint.width;
992 old_height = szHint.height; 951 old_height = szHint.height;
993 952
994 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 953 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
995 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 954 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
996 955
997 classHint.res_name = (char *)rs[Rs_name]; 956 classHint.res_name = (char *)rs[Rs_name];
998 classHint.res_class = (char *)RESCLASS; 957 classHint.res_class = (char *)RESCLASS;
999 958
1000 wmHint.flags = InputHint | StateHint | WindowGroupHint; 959 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1001 wmHint.input = True; 960 wmHint.input = True;
1002 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 961 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1003 wmHint.window_group = top; 962 wmHint.window_group = top;
1004 963
1005 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 964 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1006 &szHint, &wmHint, &classHint); 965 &szHint, &wmHint, &classHint);
966
967#if ENABLE_FRILLS
968 if (mwmhints.flags)
969 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
970 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
971#endif
1007 972
1008 Atom protocols[] = { 973 Atom protocols[] = {
1009 xa[XA_WM_DELETE_WINDOW], 974 xa[XA_WM_DELETE_WINDOW],
1010#if ENABLE_EWMH 975#if ENABLE_EWMH
1011 xa[XA_NET_WM_PING], 976 xa[XA_NET_WM_PING],
1012#endif 977#endif
1013 }; 978 };
1014 979
1015 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 980 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1016 981
1017#if ENABLE_FRILLS 982#if ENABLE_FRILLS
1018 if (rs[Rs_transient_for]) 983 if (rs[Rs_transient_for])
1019 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 984 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1020#endif 985#endif
1021 986
1022#if ENABLE_EWMH 987#if ENABLE_EWMH
1023 long pid = getpid (); 988 long pid = getpid ();
1024 989
1025 XChangeProperty (disp, top, 990 XChangeProperty (dpy, top,
1026 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 991 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1027 PropModeReplace, (unsigned char *)&pid, 1); 992 PropModeReplace, (unsigned char *)&pid, 1);
1028 993
1029 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 994 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1030#endif 995#endif
1031 996
1032 XSelectInput (disp, top, 997 XSelectInput (dpy, top,
1033 KeyPressMask 998 KeyPressMask
1034#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 999#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1035 | KeyReleaseMask 1000 | KeyReleaseMask
1036#endif 1001#endif
1037 | FocusChangeMask | VisibilityChangeMask 1002 | FocusChangeMask | VisibilityChangeMask
1038 | ExposureMask | StructureNotifyMask); 1003 | ExposureMask | StructureNotifyMask);
1039 1004
1040 termwin_ev.start (display, top); 1005 termwin_ev.start (display, top);
1041 1006
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 */ 1007 /* vt cursor: Black-on-White is standard, but this is more popular */
1049 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1008 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1050 1009
1051#ifdef HAVE_SCROLLBARS 1010#ifdef HAVE_SCROLLBARS
1052 /* cursor scrollBar: Black-on-White */ 1011 /* cursor scrollBar: Black-on-White */
1053 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1012 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1054#endif 1013#endif
1055 1014
1056 /* the vt window */ 1015 /* the vt window */
1057 vt = XCreateSimpleWindow (disp, top, 1016 vt = XCreateSimpleWindow (dpy, top,
1058 window_vt_x,
1059 window_vt_y, 1017 window_vt_x, window_vt_y,
1060 width,
1061 height, 1018 width, height,
1062 0, 1019 0,
1063 pix_colors_focused[Color_fg], 1020 pix_colors_focused[Color_fg],
1064 pix_colors_focused[Color_bg]); 1021 pix_colors_focused[Color_bg]);
1065#ifdef DEBUG_X
1066 XStoreName (disp, vt, "vt window");
1067#endif
1068 1022
1069 attributes.bit_gravity = NorthWestGravity; 1023 attributes.bit_gravity = NorthWestGravity;
1070 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1024 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1071 1025
1072 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1026 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1073 1027
1074 if (OPTION (Opt_pointerBlank)) 1028 if (OPTION (Opt_pointerBlank))
1075 vt_emask |= PointerMotionMask; 1029 vt_emask |= PointerMotionMask;
… …
1080 1034
1081 vt_ev.start (display, vt); 1035 vt_ev.start (display, vt);
1082 1036
1083#ifdef XPM_BACKGROUND 1037#ifdef XPM_BACKGROUND
1084 if (rs[Rs_backgroundPixmap] != NULL 1038 if (rs[Rs_backgroundPixmap] != NULL
1085 && ! OPTION (Opt_transparent)) 1039 && !OPTION (Opt_transparent))
1086 { 1040 {
1087 const char *p = rs[Rs_backgroundPixmap]; 1041 const char *p = rs[Rs_backgroundPixmap];
1088 1042
1089 if ((p = strchr (p, ';')) != NULL) 1043 if ((p = strchr (p, ';')) != NULL)
1090 { 1044 {
… …
1096 scr_touch (true); 1050 scr_touch (true);
1097 } 1051 }
1098#endif 1052#endif
1099 1053
1100 /* graphics context for the vt window */ 1054 /* graphics context for the vt window */
1101 gcvalue.foreground = pix_colors[Color_fg]; 1055 gcvalue.foreground = pix_colors[Color_fg];
1102 gcvalue.background = pix_colors[Color_bg]; 1056 gcvalue.background = pix_colors[Color_bg];
1103 gcvalue.graphics_exposures = 1; 1057 gcvalue.graphics_exposures = 0;
1058
1104 gc = XCreateGC (disp, vt, 1059 gc = XCreateGC (dpy, vt,
1105 GCForeground | GCBackground | GCGraphicsExposures, 1060 GCForeground | GCBackground | GCGraphicsExposures,
1106 &gcvalue); 1061 &gcvalue);
1107 1062
1108 drawable = new rxvt_drawable (display, vt); 1063 drawable = new rxvt_drawable (this, vt);
1109 1064
1110#ifdef RXVT_SCROLLBAR 1065#ifdef RXVT_SCROLLBAR
1111 gcvalue.foreground = pix_colors[Color_topShadow]; 1066 gcvalue.foreground = pix_colors[Color_topShadow];
1112 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1067 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1113 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1068 gcvalue.foreground = pix_colors[Color_bottomShadow];
1114 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1069 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1115 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1070 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1116 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1071 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1117#endif 1072#endif
1118 1073
1119#ifdef OFF_FOCUS_FADING 1074#ifdef OFF_FOCUS_FADING
1120 // initially we are in unfocused state 1075 // initially we are in unfocused state
1121 if (rs[Rs_fade]) 1076 if (rs[Rs_fade])
1122 pix_colors = pix_colors_unfocused; 1077 pix_colors = pix_colors_unfocused;
1123#endif 1078#endif
1124 1079
1125 pointer_unblank (); 1080 pointer_unblank ();
1126 scr_recolour (); 1081 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} 1082}
1138 1083
1139/* ------------------------------------------------------------------------- * 1084/* ------------------------------------------------------------------------- *
1140 * GET TTY CURRENT STATE * 1085 * GET TTY CURRENT STATE *
1141 * ------------------------------------------------------------------------- */ 1086 * ------------------------------------------------------------------------- */
… …
1431 } 1376 }
1432 1377
1433 _exit (EXIT_FAILURE); 1378 _exit (EXIT_FAILURE);
1434 1379
1435 default: 1380 default:
1436#if UTMP_SUPPORT
1437 if (!OPTION (Opt_utmpInhibit)) 1381 if (!OPTION (Opt_utmpInhibit))
1438 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1382 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1439#endif
1440 1383
1441 pty->close_tty (); 1384 pty->close_tty ();
1442 1385
1443 child_ev.start (cmd_pid); 1386 child_ev.start (cmd_pid);
1444 1387

Diff Legend

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