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.167 by root, Tue Jan 31 19:54: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 (xdisp);
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:
698 name = rs[Rs_color + Color_fg];
718 xcol = pix_colors[Color_fg]; 699 xcol = pix_colors[Color_fg];
719 break; 700 break;
720 default: 701 default:
702 name = rs[Rs_color + Color_bg];
721 xcol = pix_colors[Color_bg]; /* None */ 703 xcol = pix_colors[Color_bg];
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 } 711 }
730 712
731#ifdef OFF_FOCUS_FADING 713#ifdef OFF_FOCUS_FADING
732 if (rs[Rs_fade]) 714 if (rs[Rs_fade])
733 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 715 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]); 716 {
717 rgba c;
718 pix_colors[Color_fade].get (c);
719 pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
720 }
735#endif 721#endif
736 722
737 if (display->depth <= 2) 723 if (depth <= 2)
738 { 724 {
739 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 725 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]; 726 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]; 727 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
742 } 728 }
… …
747 * The calculations of topShadow/bottomShadow values are adapted 733 * The calculations of topShadow/bottomShadow values are adapted
748 * from the fvwm window manager. 734 * from the fvwm window manager.
749 */ 735 */
750#ifdef KEEP_SCROLLCOLOR 736#ifdef KEEP_SCROLLCOLOR
751 737
752 if (display->depth <= 2) 738 if (depth <= 2)
753 { 739 {
754 /* Monochrome */ 740 /* Monochrome */
755 pix_colors[Color_scroll] = pix_colors[Color_fg]; 741 pix_colors[Color_scroll] = pix_colors[Color_fg];
756 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 742 pix_colors[Color_topShadow] = pix_colors[Color_bg];
757 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 743 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
… …
762 /* xcol[0] == white 748 /* xcol[0] == white
763 * xcol[1] == top shadow 749 * xcol[1] == top shadow
764 * xcol[2] == bot shadow */ 750 * xcol[2] == bot shadow */
765 751
766 xcol[1] = pix_colors[Color_scroll]; 752 xcol[1] = pix_colors[Color_scroll];
767 xcol[0].set (display, 65535, 65535, 65535); 753 xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
768 754
769 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 755 rgba c0, c1;
770 756
771 xcol[0].get (display, pr0, pg0, pb0); 757 xcol[0].get (c0);
772 xcol[1].get (display, pr1, pg1, pb1); 758 xcol[1].get (c1);
773 759
774 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 760 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
775 761
776 /* topShadowColor */ 762 /* topShadowColor */
777 if (!xcol[1].set (display, 763 if (!xcol[1].set (this,
764 rgba (
778 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 765 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),
779 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 766 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),
780 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 767 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),
768 c1.a) // pa1 vs. pa0: arbitrary
769 ));
781 xcol[1] = pix_colors[Color_White]; 770 xcol[1] = pix_colors[Color_White];
782 771
783 pix_colors[Color_topShadow] = xcol[1]; 772 pix_colors[Color_topShadow] = xcol[1];
784 } 773 }
785#endif /* KEEP_SCROLLCOLOR */ 774#endif /* KEEP_SCROLLCOLOR */
… …
829 818
830 if (rsmod 819 if (rsmod
831 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 820 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
832 requestedmeta = rsmod[3] - '0'; 821 requestedmeta = rsmod[3] - '0';
833 822
834 map = XGetModifierMapping (display->display); 823 map = XGetModifierMapping (xdisp);
835 kc = map->modifiermap; 824 kc = map->modifiermap;
836 825
837 for (i = 1; i < 6; i++) 826 for (i = 1; i < 6; i++)
838 { 827 {
839 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 828 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
841 for (j = map->max_keypermod; j--; k++) 830 for (j = map->max_keypermod; j--; k++)
842 { 831 {
843 if (kc[k] == 0) 832 if (kc[k] == 0)
844 break; 833 break;
845 834
846 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 835 switch (XKeycodeToKeysym (xdisp, kc[k], 0))
847 { 836 {
848 case XK_Num_Lock: 837 case XK_Num_Lock:
849 ModNumLockMask = modmasks[i - 1]; 838 ModNumLockMask = modmasks[i - 1];
850 continue; 839 continue;
851 840
… …
901rxvt_term::create_windows (int argc, const char *const *argv) 890rxvt_term::create_windows (int argc, const char *const *argv)
902{ 891{
903 XClassHint classHint; 892 XClassHint classHint;
904 XWMHints wmHint; 893 XWMHints wmHint;
905#if ENABLE_FRILLS 894#if ENABLE_FRILLS
906 Atom prop = None;
907 MWMHints mwmhints; 895 MWMHints mwmhints;
908#endif 896#endif
909 XGCValues gcvalue; 897 XGCValues gcvalue;
910 XSetWindowAttributes attributes; 898 XSetWindowAttributes attributes;
911 XWindowAttributes gattr;
912 Window top, parent; 899 Window top, parent;
913 dDisp;
914 900
915#ifdef USING_W11LIB 901 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 902
929 /* grab colors before netscape does */ 903 /* grab colors before netscape does */
930 Get_Colours (); 904 Get_Colours ();
931 905
932 if (!set_fonts ()) 906 if (!set_fonts ())
933 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 907 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
934 908
935 parent = DefaultRootWindow (disp); 909 parent = display->root;
936 910
937 attributes.override_redirect = !!OPTION (Opt_override_redirect); 911 attributes.override_redirect = !!OPTION (Opt_override_redirect);
938 912
939#if ENABLE_FRILLS 913#if ENABLE_FRILLS
940 if (OPTION (Opt_borderLess)) 914 if (OPTION (Opt_borderLess))
941 { 915 {
942 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 916 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
943
944 if (prop == None)
945 { 917 {
946 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 918 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
947 attributes.override_redirect = TRUE; 919 attributes.override_redirect = true;
948 mwmhints.flags = 0; 920 mwmhints.flags = 0;
949 } 921 }
950 else 922 else
951 { 923 {
952 mwmhints.flags = MWM_HINTS_DECORATIONS; 924 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
962 { 934 {
963 XWindowAttributes wattr; 935 XWindowAttributes wattr;
964 936
965 parent = strtol (rs[Rs_embed], 0, 0); 937 parent = strtol (rs[Rs_embed], 0, 0);
966 938
967 if (!XGetWindowAttributes (disp, parent, &wattr)) 939 if (!XGetWindowAttributes (xdisp, parent, &wattr))
968 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 940 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
969 941
970 window_calc (wattr.width, wattr.height); 942 window_calc (wattr.width, wattr.height);
971 } 943 }
972#endif 944#endif
973 945
974 window_calc (0, 0); 946 window_calc (0, 0);
975 947
976 /* sub-window placement & size in rxvt_resize_subwindows () */ 948 /* sub-window placement & size in rxvt_resize_subwindows () */
977 attributes.background_pixel = pix_colors_focused[Color_border]; 949 attributes.background_pixel = pix_colors_focused [Color_border];
978 attributes.border_pixel = pix_colors_focused[Color_border]; 950 attributes.border_pixel = pix_colors_focused [Color_border];
979 attributes.colormap = display->cmap; 951 attributes.colormap = cmap;
952
980 top = XCreateWindow (disp, parent, 953 top = XCreateWindow (xdisp, parent,
981 szHint.x, szHint.y, 954 szHint.x, szHint.y,
982 szHint.width, szHint.height, 955 szHint.width, szHint.height,
983 ext_bwidth, 956 ext_bwidth,
984 display->depth, InputOutput, 957 depth, InputOutput, visual,
985 display->visual,
986 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 958 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
987 &attributes); 959 &attributes);
988 960
989 this->parent[0] = top; 961 this->parent[0] = top;
990 962
991 old_width = szHint.width; 963 old_width = szHint.width;
992 old_height = szHint.height; 964 old_height = szHint.height;
993 965
994 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 966 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
995 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 967 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
996 968
997 classHint.res_name = (char *)rs[Rs_name]; 969 classHint.res_name = (char *)rs[Rs_name];
998 classHint.res_class = (char *)RESCLASS; 970 classHint.res_class = (char *)RESCLASS;
999 971
1000 wmHint.flags = InputHint | StateHint | WindowGroupHint; 972 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1001 wmHint.input = True; 973 wmHint.input = True;
1002 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 974 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1003 wmHint.window_group = top; 975 wmHint.window_group = top;
1004 976
1005 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 977 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1006 &szHint, &wmHint, &classHint); 978 &szHint, &wmHint, &classHint);
979
980#if ENABLE_FRILLS
981 if (mwmhints.flags)
982 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
983 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
984#endif
1007 985
1008 Atom protocols[] = { 986 Atom protocols[] = {
1009 xa[XA_WM_DELETE_WINDOW], 987 xa[XA_WM_DELETE_WINDOW],
1010#if ENABLE_EWMH 988#if ENABLE_EWMH
1011 xa[XA_NET_WM_PING], 989 xa[XA_NET_WM_PING],
1012#endif 990#endif
1013 }; 991 };
1014 992
1015 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 993 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1016 994
1017#if ENABLE_FRILLS 995#if ENABLE_FRILLS
1018 if (rs[Rs_transient_for]) 996 if (rs[Rs_transient_for])
1019 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 997 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1020#endif 998#endif
1021 999
1022#if ENABLE_EWMH 1000#if ENABLE_EWMH
1023 long pid = getpid (); 1001 long pid = getpid ();
1024 1002
1025 XChangeProperty (disp, top, 1003 XChangeProperty (xdisp, top,
1026 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1004 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1027 PropModeReplace, (unsigned char *)&pid, 1); 1005 PropModeReplace, (unsigned char *)&pid, 1);
1028 1006
1029 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1007 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1030#endif 1008#endif
1031 1009
1032 XSelectInput (disp, top, 1010 XSelectInput (xdisp, top,
1033 KeyPressMask 1011 KeyPressMask
1034#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1012#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1035 | KeyReleaseMask 1013 | KeyReleaseMask
1036#endif 1014#endif
1037 | FocusChangeMask | VisibilityChangeMask 1015 | FocusChangeMask | VisibilityChangeMask
1038 | ExposureMask | StructureNotifyMask); 1016 | ExposureMask | StructureNotifyMask);
1039 1017
1040 termwin_ev.start (display, top); 1018 termwin_ev.start (display, top);
1041 1019
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 */ 1020 /* vt cursor: Black-on-White is standard, but this is more popular */
1049 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1021 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1050 1022
1051#ifdef HAVE_SCROLLBARS 1023#ifdef HAVE_SCROLLBARS
1052 /* cursor scrollBar: Black-on-White */ 1024 /* cursor scrollBar: Black-on-White */
1053 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1025 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1054#endif 1026#endif
1055 1027
1056 /* the vt window */ 1028 /* the vt window */
1057 vt = XCreateSimpleWindow (disp, top, 1029 vt = XCreateSimpleWindow (xdisp, top,
1058 window_vt_x,
1059 window_vt_y, 1030 window_vt_x, window_vt_y,
1060 width,
1061 height, 1031 width, height,
1062 0, 1032 0,
1063 pix_colors_focused[Color_fg], 1033 pix_colors_focused[Color_fg],
1064 pix_colors_focused[Color_bg]); 1034 pix_colors_focused[Color_bg]);
1065#ifdef DEBUG_X
1066 XStoreName (disp, vt, "vt window");
1067#endif
1068 1035
1069 attributes.bit_gravity = NorthWestGravity; 1036 attributes.bit_gravity = NorthWestGravity;
1070 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1037 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1071 1038
1072 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1039 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1073 1040
1074 if (OPTION (Opt_pointerBlank)) 1041 if (OPTION (Opt_pointerBlank))
1075 vt_emask |= PointerMotionMask; 1042 vt_emask |= PointerMotionMask;
… …
1080 1047
1081 vt_ev.start (display, vt); 1048 vt_ev.start (display, vt);
1082 1049
1083#ifdef XPM_BACKGROUND 1050#ifdef XPM_BACKGROUND
1084 if (rs[Rs_backgroundPixmap] != NULL 1051 if (rs[Rs_backgroundPixmap] != NULL
1085 && ! OPTION (Opt_transparent)) 1052 && !OPTION (Opt_transparent))
1086 { 1053 {
1087 const char *p = rs[Rs_backgroundPixmap]; 1054 const char *p = rs[Rs_backgroundPixmap];
1088 1055
1089 if ((p = strchr (p, ';')) != NULL) 1056 if ((p = strchr (p, ';')) != NULL)
1090 { 1057 {
… …
1096 scr_touch (true); 1063 scr_touch (true);
1097 } 1064 }
1098#endif 1065#endif
1099 1066
1100 /* graphics context for the vt window */ 1067 /* graphics context for the vt window */
1101 gcvalue.foreground = pix_colors[Color_fg]; 1068 gcvalue.foreground = pix_colors[Color_fg];
1102 gcvalue.background = pix_colors[Color_bg]; 1069 gcvalue.background = pix_colors[Color_bg];
1103 gcvalue.graphics_exposures = 1; 1070 gcvalue.graphics_exposures = 1;
1071
1104 gc = XCreateGC (disp, vt, 1072 gc = XCreateGC (xdisp, vt,
1105 GCForeground | GCBackground | GCGraphicsExposures, 1073 GCForeground | GCBackground | GCGraphicsExposures,
1106 &gcvalue); 1074 &gcvalue);
1107 1075
1108 drawable = new rxvt_drawable (display, vt); 1076 drawable = new rxvt_drawable (this, vt);
1109 1077
1110#ifdef RXVT_SCROLLBAR 1078#ifdef RXVT_SCROLLBAR
1111 gcvalue.foreground = pix_colors[Color_topShadow]; 1079 gcvalue.foreground = pix_colors[Color_topShadow];
1112 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1080 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1113 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1081 gcvalue.foreground = pix_colors[Color_bottomShadow];
1114 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1082 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1115 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1083 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1116 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1084 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1117#endif 1085#endif
1118 1086
1119#ifdef OFF_FOCUS_FADING 1087#ifdef OFF_FOCUS_FADING
1120 // initially we are in unfocused state 1088 // initially we are in unfocused state
1121 if (rs[Rs_fade]) 1089 if (rs[Rs_fade])
1122 pix_colors = pix_colors_unfocused; 1090 pix_colors = pix_colors_unfocused;
1123#endif 1091#endif
1124 1092
1125 pointer_unblank (); 1093 pointer_unblank ();
1126 scr_recolour (); 1094 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} 1095}
1138 1096
1139/* ------------------------------------------------------------------------- * 1097/* ------------------------------------------------------------------------- *
1140 * GET TTY CURRENT STATE * 1098 * GET TTY CURRENT STATE *
1141 * ------------------------------------------------------------------------- */ 1099 * ------------------------------------------------------------------------- */
… …
1431 } 1389 }
1432 1390
1433 _exit (EXIT_FAILURE); 1391 _exit (EXIT_FAILURE);
1434 1392
1435 default: 1393 default:
1436#if UTMP_SUPPORT
1437 if (!OPTION (Opt_utmpInhibit)) 1394 if (!OPTION (Opt_utmpInhibit))
1438 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1395 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1439#endif
1440 1396
1441 pty->close_tty (); 1397 pty->close_tty ();
1442 1398
1443 child_ev.start (cmd_pid); 1399 child_ev.start (cmd_pid);
1444 1400

Diff Legend

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