… | |
… | |
43 | const char *const def_colorName[] = |
43 | const 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 |
176 | #endif |
177 | }; |
177 | }; |
178 | |
178 | |
179 | bool |
179 | bool |
180 | rxvt_term::init_vars () |
180 | rxvt_term::init_vars () |
… | |
… | |
258 | int i, r_argc; |
258 | int i, r_argc; |
259 | char *val; |
259 | char *val; |
260 | const char **cmd_argv, **r_argv; |
260 | const char **cmd_argv, **r_argv; |
261 | |
261 | |
262 | /* |
262 | /* |
263 | * Look for -exec option. Find => split and make cmd_argv[] of command args |
263 | * Look for -e option. Find => split and make cmd_argv[] of command args |
264 | */ |
264 | */ |
265 | for (r_argc = 0; r_argc < argc; r_argc++) |
265 | for (r_argc = 0; r_argc < argc; r_argc++) |
266 | if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) |
266 | if (!strcmp (argv[r_argc], "-e")) |
267 | break; |
267 | break; |
268 | |
268 | |
269 | r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); |
269 | r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); |
270 | |
270 | |
271 | for (i = 0; i < r_argc; i++) |
271 | for (i = 0; i < r_argc; i++) |
… | |
… | |
297 | get_options (r_argc, r_argv); |
297 | get_options (r_argc, r_argv); |
298 | |
298 | |
299 | if (!(display = displays.get (rs[Rs_display_name]))) |
299 | if (!(display = displays.get (rs[Rs_display_name]))) |
300 | 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]); |
301 | |
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 | |
302 | extract_resources (); |
312 | extract_resources (); |
303 | |
313 | |
304 | 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; |
305 | |
319 | |
306 | #if ENABLE_PERL |
320 | #if ENABLE_PERL |
307 | if (!rs[Rs_perl_ext_1]) |
321 | if (!rs[Rs_perl_ext_1]) |
308 | rs[Rs_perl_ext_1] = "default"; |
322 | rs[Rs_perl_ext_1] = "default"; |
309 | |
323 | |
… | |
… | |
313 | { |
327 | { |
314 | rxvt_perl.init (this); |
328 | rxvt_perl.init (this); |
315 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
329 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
316 | } |
330 | } |
317 | #endif |
331 | #endif |
318 | |
|
|
319 | xa = display->xa; |
|
|
320 | |
|
|
321 | #if ENABLE_FRILLS |
|
|
322 | if (rs[Rs_depth]) |
|
|
323 | set (display, strtol (rs[Rs_depth], 0, 0)); |
|
|
324 | else |
|
|
325 | #endif |
|
|
326 | set (display); |
|
|
327 | |
332 | |
328 | /* |
333 | /* |
329 | * set any defaults not already set |
334 | * set any defaults not already set |
330 | */ |
335 | */ |
331 | if (cmd_argv && cmd_argv[0]) |
336 | if (cmd_argv && cmd_argv[0]) |
… | |
… | |
421 | /* this is how xterm implements reverseVideo */ |
426 | /* this is how xterm implements reverseVideo */ |
422 | if (OPTION (Opt_reverseVideo)) |
427 | if (OPTION (Opt_reverseVideo)) |
423 | { |
428 | { |
424 | if (!rs[Rs_color + Color_fg]) |
429 | if (!rs[Rs_color + Color_fg]) |
425 | rs[Rs_color + Color_fg] = def_colorName[Color_bg]; |
430 | rs[Rs_color + Color_fg] = def_colorName[Color_bg]; |
|
|
431 | |
426 | if (!rs[Rs_color + Color_bg]) |
432 | if (!rs[Rs_color + Color_bg]) |
427 | rs[Rs_color + Color_bg] = def_colorName[Color_fg]; |
433 | rs[Rs_color + Color_bg] = def_colorName[Color_fg]; |
428 | } |
434 | } |
429 | #endif |
435 | #endif |
430 | |
436 | |
… | |
… | |
482 | val = rxvt_network_display (rs[Rs_display_name]); |
488 | val = rxvt_network_display (rs[Rs_display_name]); |
483 | rs[Rs_display_name] = (const char *)val; |
489 | rs[Rs_display_name] = (const char *)val; |
484 | |
490 | |
485 | if (val == NULL) |
491 | if (val == NULL) |
486 | #endif /* DISPLAY_IS_IP */ |
492 | #endif /* DISPLAY_IS_IP */ |
487 | val = XDisplayString (display->display); |
493 | val = XDisplayString (dpy); |
488 | |
494 | |
489 | if (rs[Rs_display_name] == NULL) |
495 | if (rs[Rs_display_name] == NULL) |
490 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
496 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
491 | |
497 | |
492 | i = strlen (val); |
498 | i = strlen (val); |
… | |
… | |
655 | pix_colors = pix_colors_focused; |
661 | pix_colors = pix_colors_focused; |
656 | #endif |
662 | #endif |
657 | |
663 | |
658 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
664 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
659 | { |
665 | { |
|
|
666 | const char *name = rs[Rs_color + i]; |
|
|
667 | |
|
|
668 | if (!name) |
|
|
669 | continue; |
|
|
670 | |
660 | rxvt_color xcol; |
671 | rxvt_color xcol; |
661 | |
672 | |
662 | if (!rs[Rs_color + i]) |
673 | if (!set_color (xcol, name)) |
663 | continue; |
|
|
664 | |
|
|
665 | if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) |
|
|
666 | { |
674 | { |
667 | #ifndef XTERM_REVERSE_VIDEO |
675 | #ifndef XTERM_REVERSE_VIDEO |
668 | if (i < 2 && OPTION (Opt_reverseVideo)) |
676 | if (i < 2 && OPTION (Opt_reverseVideo)) |
669 | rs[Rs_color + i] = def_colorName[!i]; |
677 | name = def_colorName [1 - i]; |
670 | else |
678 | else |
671 | #endif |
679 | #endif |
672 | rs[Rs_color + i] = def_colorName[i]; |
680 | name = def_colorName [i]; |
673 | |
681 | |
674 | if (!rs[Rs_color + i]) |
682 | if (!name) |
675 | continue; |
683 | continue; |
676 | |
684 | |
677 | if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) |
685 | if (!set_color (xcol, name)) |
678 | { |
686 | { |
679 | switch (i) |
687 | switch (i) |
680 | { |
688 | { |
681 | case Color_fg: |
689 | case Color_fg: |
682 | case Color_bg: |
690 | case Color_bg: |
683 | /* fatal: need bg/fg color */ |
|
|
684 | rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); |
691 | rxvt_warn ("unable to get foreground/background colour, continuing.\n"); |
685 | /* NOTREACHED */ |
692 | name = ""; |
686 | break; |
693 | break; |
687 | #ifndef NO_CURSORCOLOR |
694 | #ifndef NO_CURSORCOLOR |
688 | case Color_cursor2: |
695 | case Color_cursor2: |
689 | xcol = pix_colors[Color_fg]; |
696 | #endif |
690 | break; |
|
|
691 | #endif /* ! NO_CURSORCOLOR */ |
|
|
692 | case Color_pointer_fg: |
697 | case Color_pointer_fg: |
693 | xcol = pix_colors[Color_fg]; |
698 | name = rs[Rs_color + Color_fg]; |
|
|
699 | xcol.set (this, name); |
694 | break; |
700 | break; |
695 | default: |
701 | default: |
696 | xcol = pix_colors[Color_bg]; /* None */ |
702 | name = rs[Rs_color + Color_bg]; |
|
|
703 | xcol.set (this, name); |
697 | break; |
704 | break; |
698 | } |
705 | } |
699 | } |
706 | } |
700 | } |
707 | } |
701 | |
708 | |
702 | pix_colors[i] = xcol; |
709 | pix_colors[i] = xcol; |
703 | SET_PIXCOLOR (i); |
710 | rs[Rs_color + i] = name; |
704 | } |
711 | } |
705 | |
|
|
706 | #ifdef OFF_FOCUS_FADING |
|
|
707 | if (rs[Rs_fade]) |
|
|
708 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
|
|
709 | pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
|
|
710 | #endif |
|
|
711 | |
712 | |
712 | if (depth <= 2) |
713 | if (depth <= 2) |
713 | { |
714 | { |
714 | 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); |
715 | 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); |
716 | 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); |
717 | } |
718 | } |
718 | |
719 | |
719 | /* |
720 | /* |
720 | * get scrollBar shadow colors |
721 | * get scrollBar shadow colors |
721 | * |
722 | * |
722 | * The calculations of topShadow/bottomShadow values are adapted |
723 | * The calculations of topShadow/bottomShadow values are adapted |
723 | * from the fvwm window manager. |
724 | * from the fvwm window manager. |
724 | */ |
725 | */ |
725 | #ifdef KEEP_SCROLLCOLOR |
726 | #ifdef KEEP_SCROLLCOLOR |
726 | |
|
|
727 | if (depth <= 2) |
727 | if (depth <= 2) |
728 | { |
728 | { |
729 | /* Monochrome */ |
729 | /* Monochrome */ |
730 | pix_colors[Color_scroll] = pix_colors[Color_fg]; |
730 | alias_color (Color_scroll, Color_fg); |
731 | pix_colors[Color_topShadow] = pix_colors[Color_bg]; |
731 | alias_color (Color_topShadow, Color_bg); |
732 | pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; |
732 | alias_color (Color_bottomShadow, Color_bg); |
733 | } |
733 | } |
734 | else |
734 | else |
735 | { |
735 | { |
736 | rxvt_color xcol[2]; |
736 | pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); |
737 | /* xcol[0] == white |
|
|
738 | * xcol[1] == top shadow |
|
|
739 | * xcol[2] == bot shadow */ |
|
|
740 | |
737 | |
741 | xcol[1] = pix_colors[Color_scroll]; |
738 | rgba cscroll; |
742 | xcol[0].set (this, 65535, 65535, 65535); |
739 | pix_colors [Color_scroll].get (cscroll); |
743 | |
|
|
744 | unsigned short pr1, pg1, pb1, pr0, pg0, pb0; |
|
|
745 | |
|
|
746 | xcol[0].get (this, pr0, pg0, pb0); |
|
|
747 | xcol[1].get (this, pr1, pg1, pb1); |
|
|
748 | |
|
|
749 | pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50); |
|
|
750 | |
740 | |
751 | /* topShadowColor */ |
741 | /* topShadowColor */ |
752 | if (!xcol[1].set (this, |
742 | if (!pix_colors[Color_topShadow].set (this, |
753 | min (pr0, max (pr0 / 5, pr1) * 7 / 5), |
743 | rgba ( |
754 | min (pg0, max (pg0 / 5, pg1) * 7 / 5), |
744 | min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), |
755 | min (pb0, max (pb0 / 5, pb1) * 7 / 5))) |
745 | min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), |
756 | xcol[1] = pix_colors[Color_White]; |
746 | min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), |
757 | |
747 | cscroll.a) |
758 | pix_colors[Color_topShadow] = xcol[1]; |
748 | )) |
|
|
749 | alias_color (Color_topShadow, Color_White); |
759 | } |
750 | } |
760 | #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 |
761 | } |
762 | } |
762 | |
763 | |
763 | /*----------------------------------------------------------------------*/ |
764 | /*----------------------------------------------------------------------*/ |
764 | /* color aliases, fg/bg bright-bold */ |
765 | /* color aliases, fg/bg bright-bold */ |
765 | void |
766 | void |
… | |
… | |
804 | |
805 | |
805 | if (rsmod |
806 | if (rsmod |
806 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
807 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
807 | requestedmeta = rsmod[3] - '0'; |
808 | requestedmeta = rsmod[3] - '0'; |
808 | |
809 | |
809 | map = XGetModifierMapping (display->display); |
810 | map = XGetModifierMapping (dpy); |
810 | kc = map->modifiermap; |
811 | kc = map->modifiermap; |
811 | |
812 | |
812 | for (i = 1; i < 6; i++) |
813 | for (i = 1; i < 6; i++) |
813 | { |
814 | { |
814 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
815 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
… | |
… | |
816 | for (j = map->max_keypermod; j--; k++) |
817 | for (j = map->max_keypermod; j--; k++) |
817 | { |
818 | { |
818 | if (kc[k] == 0) |
819 | if (kc[k] == 0) |
819 | break; |
820 | break; |
820 | |
821 | |
821 | switch (XKeycodeToKeysym (display->display, kc[k], 0)) |
822 | switch (XKeycodeToKeysym (dpy, kc[k], 0)) |
822 | { |
823 | { |
823 | case XK_Num_Lock: |
824 | case XK_Num_Lock: |
824 | ModNumLockMask = modmasks[i - 1]; |
825 | ModNumLockMask = modmasks[i - 1]; |
825 | continue; |
826 | continue; |
826 | |
827 | |
… | |
… | |
882 | #endif |
883 | #endif |
883 | XGCValues gcvalue; |
884 | XGCValues gcvalue; |
884 | XSetWindowAttributes attributes; |
885 | XSetWindowAttributes attributes; |
885 | Window top, parent; |
886 | Window top, parent; |
886 | |
887 | |
887 | dLocal (Display *, xdisp); |
888 | dLocal (Display *, dpy); |
888 | |
889 | |
889 | /* grab colors before netscape does */ |
890 | /* grab colors before netscape does */ |
890 | Get_Colours (); |
891 | Get_Colours (); |
891 | |
892 | |
892 | if (!set_fonts ()) |
893 | if (!set_fonts ()) |
… | |
… | |
897 | attributes.override_redirect = !!OPTION (Opt_override_redirect); |
898 | attributes.override_redirect = !!OPTION (Opt_override_redirect); |
898 | |
899 | |
899 | #if ENABLE_FRILLS |
900 | #if ENABLE_FRILLS |
900 | if (OPTION (Opt_borderLess)) |
901 | if (OPTION (Opt_borderLess)) |
901 | { |
902 | { |
902 | if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) |
903 | if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) |
903 | { |
904 | { |
904 | /* 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");*/ |
905 | attributes.override_redirect = TRUE; |
906 | attributes.override_redirect = true; |
906 | mwmhints.flags = 0; |
907 | mwmhints.flags = 0; |
907 | } |
908 | } |
908 | else |
909 | else |
909 | { |
910 | { |
910 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
911 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
… | |
… | |
920 | { |
921 | { |
921 | XWindowAttributes wattr; |
922 | XWindowAttributes wattr; |
922 | |
923 | |
923 | parent = strtol (rs[Rs_embed], 0, 0); |
924 | parent = strtol (rs[Rs_embed], 0, 0); |
924 | |
925 | |
925 | if (!XGetWindowAttributes (xdisp, parent, &wattr)) |
926 | if (!XGetWindowAttributes (dpy, parent, &wattr)) |
926 | rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); |
927 | rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); |
927 | |
928 | |
928 | window_calc (wattr.width, wattr.height); |
929 | window_calc (wattr.width, wattr.height); |
929 | } |
930 | } |
930 | #endif |
931 | #endif |
… | |
… | |
934 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
935 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
935 | attributes.background_pixel = pix_colors_focused [Color_border]; |
936 | attributes.background_pixel = pix_colors_focused [Color_border]; |
936 | attributes.border_pixel = pix_colors_focused [Color_border]; |
937 | attributes.border_pixel = pix_colors_focused [Color_border]; |
937 | attributes.colormap = cmap; |
938 | attributes.colormap = cmap; |
938 | |
939 | |
939 | top = XCreateWindow (xdisp, parent, |
940 | top = XCreateWindow (dpy, parent, |
940 | szHint.x, szHint.y, |
941 | szHint.x, szHint.y, |
941 | szHint.width, szHint.height, |
942 | szHint.width, szHint.height, |
942 | ext_bwidth, |
943 | ext_bwidth, |
943 | depth, InputOutput, visual, |
944 | depth, InputOutput, visual, |
944 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
945 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
… | |
… | |
958 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
959 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
959 | wmHint.input = True; |
960 | wmHint.input = True; |
960 | wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; |
961 | wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; |
961 | wmHint.window_group = top; |
962 | wmHint.window_group = top; |
962 | |
963 | |
963 | XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, |
964 | XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, |
964 | &szHint, &wmHint, &classHint); |
965 | &szHint, &wmHint, &classHint); |
965 | |
966 | |
966 | #if ENABLE_FRILLS |
967 | #if ENABLE_FRILLS |
967 | if (mwmhints.flags) |
968 | if (mwmhints.flags) |
968 | XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, |
969 | XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, |
969 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
970 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
970 | #endif |
971 | #endif |
971 | |
972 | |
972 | Atom protocols[] = { |
973 | Atom protocols[] = { |
973 | xa[XA_WM_DELETE_WINDOW], |
974 | xa[XA_WM_DELETE_WINDOW], |
974 | #if ENABLE_EWMH |
975 | #if ENABLE_EWMH |
975 | xa[XA_NET_WM_PING], |
976 | xa[XA_NET_WM_PING], |
976 | #endif |
977 | #endif |
977 | }; |
978 | }; |
978 | |
979 | |
979 | XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
980 | XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
980 | |
981 | |
981 | #if ENABLE_FRILLS |
982 | #if ENABLE_FRILLS |
982 | if (rs[Rs_transient_for]) |
983 | if (rs[Rs_transient_for]) |
983 | XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
984 | XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
984 | #endif |
985 | #endif |
985 | |
986 | |
986 | #if ENABLE_EWMH |
987 | #if ENABLE_EWMH |
987 | long pid = getpid (); |
988 | long pid = getpid (); |
988 | |
989 | |
989 | XChangeProperty (xdisp, top, |
990 | XChangeProperty (dpy, top, |
990 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
991 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
991 | PropModeReplace, (unsigned char *)&pid, 1); |
992 | PropModeReplace, (unsigned char *)&pid, 1); |
992 | |
993 | |
993 | // _NET_WM_WINDOW_TYPE is NORMAL, which is the default |
994 | // _NET_WM_WINDOW_TYPE is NORMAL, which is the default |
994 | #endif |
995 | #endif |
995 | |
996 | |
996 | XSelectInput (xdisp, top, |
997 | XSelectInput (dpy, top, |
997 | KeyPressMask |
998 | KeyPressMask |
998 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
999 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
999 | | KeyReleaseMask |
1000 | | KeyReleaseMask |
1000 | #endif |
1001 | #endif |
1001 | | FocusChangeMask | VisibilityChangeMask |
1002 | | FocusChangeMask | VisibilityChangeMask |
1002 | | ExposureMask | StructureNotifyMask); |
1003 | | ExposureMask | StructureNotifyMask); |
1003 | |
1004 | |
1004 | termwin_ev.start (display, top); |
1005 | termwin_ev.start (display, top); |
1005 | |
1006 | |
1006 | /* 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 */ |
1007 | TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); |
1008 | TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); |
1008 | |
1009 | |
1009 | #ifdef HAVE_SCROLLBARS |
1010 | #ifdef HAVE_SCROLLBARS |
1010 | /* cursor scrollBar: Black-on-White */ |
1011 | /* cursor scrollBar: Black-on-White */ |
1011 | leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); |
1012 | leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr); |
1012 | #endif |
1013 | #endif |
1013 | |
1014 | |
1014 | /* the vt window */ |
1015 | /* the vt window */ |
1015 | vt = XCreateSimpleWindow (xdisp, top, |
1016 | vt = XCreateSimpleWindow (dpy, top, |
1016 | window_vt_x, window_vt_y, |
1017 | window_vt_x, window_vt_y, |
1017 | width, height, |
1018 | width, height, |
1018 | 0, |
1019 | 0, |
1019 | pix_colors_focused[Color_fg], |
1020 | pix_colors_focused[Color_fg], |
1020 | pix_colors_focused[Color_bg]); |
1021 | pix_colors_focused[Color_bg]); |
1021 | |
1022 | |
1022 | attributes.bit_gravity = NorthWestGravity; |
1023 | attributes.bit_gravity = NorthWestGravity; |
1023 | XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); |
1024 | XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); |
1024 | |
1025 | |
1025 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1026 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1026 | |
1027 | |
1027 | if (OPTION (Opt_pointerBlank)) |
1028 | if (OPTION (Opt_pointerBlank)) |
1028 | vt_emask |= PointerMotionMask; |
1029 | vt_emask |= PointerMotionMask; |
… | |
… | |
1051 | #endif |
1052 | #endif |
1052 | |
1053 | |
1053 | /* graphics context for the vt window */ |
1054 | /* graphics context for the vt window */ |
1054 | gcvalue.foreground = pix_colors[Color_fg]; |
1055 | gcvalue.foreground = pix_colors[Color_fg]; |
1055 | gcvalue.background = pix_colors[Color_bg]; |
1056 | gcvalue.background = pix_colors[Color_bg]; |
1056 | gcvalue.graphics_exposures = 1; |
1057 | gcvalue.graphics_exposures = 0; |
1057 | |
1058 | |
1058 | gc = XCreateGC (xdisp, vt, |
1059 | gc = XCreateGC (dpy, vt, |
1059 | GCForeground | GCBackground | GCGraphicsExposures, |
1060 | GCForeground | GCBackground | GCGraphicsExposures, |
1060 | &gcvalue); |
1061 | &gcvalue); |
1061 | |
1062 | |
1062 | drawable = new rxvt_drawable (this, vt); |
1063 | drawable = new rxvt_drawable (this, vt); |
1063 | |
1064 | |
1064 | #ifdef RXVT_SCROLLBAR |
1065 | #ifdef RXVT_SCROLLBAR |
1065 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1066 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1066 | topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); |
1067 | topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); |
1067 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1068 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1068 | botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); |
1069 | botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); |
1069 | gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; |
1070 | gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; |
1070 | scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); |
1071 | scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); |
1071 | #endif |
1072 | #endif |
1072 | |
1073 | |
1073 | #ifdef OFF_FOCUS_FADING |
1074 | #ifdef OFF_FOCUS_FADING |
1074 | // initially we are in unfocused state |
1075 | // initially we are in unfocused state |
1075 | if (rs[Rs_fade]) |
1076 | if (rs[Rs_fade]) |