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

Diff Legend

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