… | |
… | |
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 |
|
|
177 | }; |
|
|
178 | |
|
|
179 | const 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 | |
218 | bool |
179 | bool |
219 | rxvt_term::init_vars () |
180 | rxvt_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 | xa = display->xa; |
|
|
303 | |
|
|
304 | #if ENABLE_FRILLS |
|
|
305 | if (rs[Rs_depth]) |
|
|
306 | set (display, strtol (rs[Rs_depth], 0, 0)); |
|
|
307 | else |
|
|
308 | #endif |
|
|
309 | set (display); |
|
|
310 | |
346 | extract_resources (); |
311 | extract_resources (); |
347 | |
312 | |
348 | free (r_argv); |
313 | free (r_argv); |
|
|
314 | |
|
|
315 | #if ENABLE_PERL |
|
|
316 | if (!rs[Rs_perl_ext_1]) |
|
|
317 | rs[Rs_perl_ext_1] = "default"; |
|
|
318 | |
|
|
319 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
|
|
320 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
|
|
321 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
|
|
322 | { |
|
|
323 | rxvt_perl.init (this); |
|
|
324 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
|
|
325 | } |
|
|
326 | #endif |
349 | |
327 | |
350 | /* |
328 | /* |
351 | * set any defaults not already set |
329 | * set any defaults not already set |
352 | */ |
330 | */ |
353 | if (cmd_argv && cmd_argv[0]) |
331 | if (cmd_argv && cmd_argv[0]) |
… | |
… | |
504 | val = rxvt_network_display (rs[Rs_display_name]); |
482 | val = rxvt_network_display (rs[Rs_display_name]); |
505 | rs[Rs_display_name] = (const char *)val; |
483 | rs[Rs_display_name] = (const char *)val; |
506 | |
484 | |
507 | if (val == NULL) |
485 | if (val == NULL) |
508 | #endif /* DISPLAY_IS_IP */ |
486 | #endif /* DISPLAY_IS_IP */ |
509 | val = XDisplayString (display->display); |
487 | val = XDisplayString (xdisp); |
510 | |
488 | |
511 | if (rs[Rs_display_name] == NULL) |
489 | if (rs[Rs_display_name] == NULL) |
512 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
490 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
513 | |
491 | |
514 | i = strlen (val); |
492 | i = strlen (val); |
515 | env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); |
493 | env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); |
516 | |
494 | |
517 | sprintf (env_display, "DISPLAY=%s", val); |
495 | sprintf (env_display, "DISPLAY=%s", val); |
518 | |
496 | |
519 | /* avoiding the math library: |
497 | 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 | |
498 | |
529 | /* add entries to the environment: |
499 | /* add entries to the environment: |
530 | * @ DISPLAY: in case we started with -display |
500 | * @ DISPLAY: in case we started with -display |
531 | * @ WINDOWID: X window id number of the window |
501 | * @ WINDOWID: X window id number of the window |
532 | * @ COLORTERM: terminal sub-name and also indicates its color |
502 | * @ COLORTERM: terminal sub-name and also indicates its color |
… | |
… | |
534 | * @ TERMINFO: path to terminfo directory |
504 | * @ TERMINFO: path to terminfo directory |
535 | * @ COLORFGBG: fg;bg color codes |
505 | * @ COLORFGBG: fg;bg color codes |
536 | */ |
506 | */ |
537 | putenv (env_display); |
507 | putenv (env_display); |
538 | putenv (env_windowid); |
508 | putenv (env_windowid); |
|
|
509 | |
539 | if (env_colorfgbg) |
510 | if (env_colorfgbg) |
540 | putenv (env_colorfgbg); |
511 | putenv (env_colorfgbg); |
541 | |
512 | |
542 | #ifdef RXVT_TERMINFO |
513 | #ifdef RXVT_TERMINFO |
543 | putenv ("TERMINFO=" RXVT_TERMINFO); |
514 | putenv ("TERMINFO=" RXVT_TERMINFO); |
544 | #endif |
515 | #endif |
545 | |
516 | |
546 | if (display->depth <= 2) |
517 | if (depth <= 2) |
547 | putenv ("COLORTERM=" COLORTERMENV "-mono"); |
518 | putenv ("COLORTERM=" COLORTERMENV "-mono"); |
548 | else |
519 | else |
549 | putenv ("COLORTERM=" COLORTERMENVFULL); |
520 | putenv ("COLORTERM=" COLORTERMENVFULL); |
550 | |
521 | |
551 | if (rs[Rs_term_name] != NULL) |
522 | if (rs[Rs_term_name] != NULL) |
… | |
… | |
682 | |
653 | |
683 | #ifdef OFF_FOCUS_FADING |
654 | #ifdef OFF_FOCUS_FADING |
684 | pix_colors = pix_colors_focused; |
655 | pix_colors = pix_colors_focused; |
685 | #endif |
656 | #endif |
686 | |
657 | |
687 | for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) |
658 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
688 | { |
659 | { |
689 | rxvt_color xcol; |
660 | rxvt_color xcol; |
690 | |
661 | |
691 | if (!rs[Rs_color + i]) |
662 | if (!rs[Rs_color + i]) |
692 | continue; |
663 | continue; |
693 | |
664 | |
694 | if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) |
665 | if (!set_color (xcol, rs[Rs_color + i])) |
695 | { |
666 | { |
696 | #ifndef XTERM_REVERSE_VIDEO |
667 | #ifndef XTERM_REVERSE_VIDEO |
697 | if (i < 2 && OPTION (Opt_reverseVideo)) |
668 | if (i < 2 && OPTION (Opt_reverseVideo)) |
698 | rs[Rs_color + i] = def_colorName[!i]; |
669 | rs[Rs_color + i] = def_colorName[!i]; |
699 | else |
670 | else |
… | |
… | |
701 | rs[Rs_color + i] = def_colorName[i]; |
672 | rs[Rs_color + i] = def_colorName[i]; |
702 | |
673 | |
703 | if (!rs[Rs_color + i]) |
674 | if (!rs[Rs_color + i]) |
704 | continue; |
675 | continue; |
705 | |
676 | |
706 | if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) |
677 | if (!set_color (xcol, rs[Rs_color + i])) |
707 | { |
678 | { |
708 | switch (i) |
679 | switch (i) |
709 | { |
680 | { |
710 | case Color_fg: |
681 | case Color_fg: |
711 | case Color_bg: |
682 | case Color_bg: |
712 | /* fatal: need bg/fg color */ |
683 | /* fatal: need bg/fg color */ |
713 | rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); |
684 | rxvt_warn ("unable to get foreground/background colour, continuing.\n"); |
714 | /* NOTREACHED */ |
|
|
715 | break; |
685 | break; |
716 | #ifndef NO_CURSORCOLOR |
686 | #ifndef NO_CURSORCOLOR |
717 | case Color_cursor2: |
687 | case Color_cursor2: |
718 | xcol = pix_colors[Color_fg]; |
688 | xcol = pix_colors[Color_fg]; |
719 | break; |
689 | break; |
… | |
… | |
732 | SET_PIXCOLOR (i); |
702 | SET_PIXCOLOR (i); |
733 | } |
703 | } |
734 | |
704 | |
735 | #ifdef OFF_FOCUS_FADING |
705 | #ifdef OFF_FOCUS_FADING |
736 | if (rs[Rs_fade]) |
706 | if (rs[Rs_fade]) |
737 | for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) |
707 | for (i = 0; i < (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]); |
708 | pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
739 | #endif |
709 | #endif |
740 | |
710 | |
741 | if (display->depth <= 2) |
711 | if (depth <= 2) |
742 | { |
712 | { |
743 | if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; |
713 | if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; |
744 | if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; |
714 | if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; |
745 | if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; |
715 | if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; |
746 | } |
716 | } |
… | |
… | |
751 | * The calculations of topShadow/bottomShadow values are adapted |
721 | * The calculations of topShadow/bottomShadow values are adapted |
752 | * from the fvwm window manager. |
722 | * from the fvwm window manager. |
753 | */ |
723 | */ |
754 | #ifdef KEEP_SCROLLCOLOR |
724 | #ifdef KEEP_SCROLLCOLOR |
755 | |
725 | |
756 | if (display->depth <= 2) |
726 | if (depth <= 2) |
757 | { |
727 | { |
758 | /* Monochrome */ |
728 | /* Monochrome */ |
759 | pix_colors[Color_scroll] = pix_colors[Color_fg]; |
729 | pix_colors[Color_scroll] = pix_colors[Color_fg]; |
760 | pix_colors[Color_topShadow] = pix_colors[Color_bg]; |
730 | pix_colors[Color_topShadow] = pix_colors[Color_bg]; |
761 | pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; |
731 | pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; |
… | |
… | |
766 | /* xcol[0] == white |
736 | /* xcol[0] == white |
767 | * xcol[1] == top shadow |
737 | * xcol[1] == top shadow |
768 | * xcol[2] == bot shadow */ |
738 | * xcol[2] == bot shadow */ |
769 | |
739 | |
770 | xcol[1] = pix_colors[Color_scroll]; |
740 | xcol[1] = pix_colors[Color_scroll]; |
771 | xcol[0].set (display, 65535, 65535, 65535); |
741 | xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); |
772 | |
742 | |
773 | unsigned short pr1, pg1, pb1, pr0, pg0, pb0; |
743 | rxvt_rgba c0, c1; |
774 | |
744 | |
775 | xcol[0].get (display, pr0, pg0, pb0); |
745 | xcol[0].get (this, c0); |
776 | xcol[1].get (display, pr1, pg1, pb1); |
746 | xcol[1].get (this, c1); |
777 | |
747 | |
778 | pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); |
748 | pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50); |
779 | |
749 | |
780 | /* topShadowColor */ |
750 | /* topShadowColor */ |
781 | if (!xcol[1].set (display, |
751 | if (!xcol[1].set (this, |
|
|
752 | rxvt_rgba ( |
782 | min (pr0, max (pr0 / 5, pr1) * 7 / 5), |
753 | min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), |
783 | min (pg0, max (pg0 / 5, pg1) * 7 / 5), |
754 | min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), |
784 | min (pb0, max (pb0 / 5, pb1) * 7 / 5))) |
755 | min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), |
|
|
756 | c1.a) // pa1 vs. pa0: arbitrary |
|
|
757 | )); |
785 | xcol[1] = pix_colors[Color_White]; |
758 | xcol[1] = pix_colors[Color_White]; |
786 | |
759 | |
787 | pix_colors[Color_topShadow] = xcol[1]; |
760 | pix_colors[Color_topShadow] = xcol[1]; |
788 | } |
761 | } |
789 | #endif /* KEEP_SCROLLCOLOR */ |
762 | #endif /* KEEP_SCROLLCOLOR */ |
… | |
… | |
833 | |
806 | |
834 | if (rsmod |
807 | if (rsmod |
835 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
808 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
836 | requestedmeta = rsmod[3] - '0'; |
809 | requestedmeta = rsmod[3] - '0'; |
837 | |
810 | |
838 | map = XGetModifierMapping (display->display); |
811 | map = XGetModifierMapping (xdisp); |
839 | kc = map->modifiermap; |
812 | kc = map->modifiermap; |
840 | |
813 | |
841 | for (i = 1; i < 6; i++) |
814 | for (i = 1; i < 6; i++) |
842 | { |
815 | { |
843 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
816 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
… | |
… | |
845 | for (j = map->max_keypermod; j--; k++) |
818 | for (j = map->max_keypermod; j--; k++) |
846 | { |
819 | { |
847 | if (kc[k] == 0) |
820 | if (kc[k] == 0) |
848 | break; |
821 | break; |
849 | |
822 | |
850 | switch (XKeycodeToKeysym (display->display, kc[k], 0)) |
823 | switch (XKeycodeToKeysym (xdisp, kc[k], 0)) |
851 | { |
824 | { |
852 | case XK_Num_Lock: |
825 | case XK_Num_Lock: |
853 | ModNumLockMask = modmasks[i - 1]; |
826 | ModNumLockMask = modmasks[i - 1]; |
854 | continue; |
827 | continue; |
855 | |
828 | |
… | |
… | |
905 | rxvt_term::create_windows (int argc, const char *const *argv) |
878 | rxvt_term::create_windows (int argc, const char *const *argv) |
906 | { |
879 | { |
907 | XClassHint classHint; |
880 | XClassHint classHint; |
908 | XWMHints wmHint; |
881 | XWMHints wmHint; |
909 | #if ENABLE_FRILLS |
882 | #if ENABLE_FRILLS |
910 | Atom prop = None; |
|
|
911 | MWMHints mwmhints; |
883 | MWMHints mwmhints; |
912 | #endif |
884 | #endif |
913 | XGCValues gcvalue; |
885 | XGCValues gcvalue; |
914 | XSetWindowAttributes attributes; |
886 | XSetWindowAttributes attributes; |
915 | XWindowAttributes gattr; |
|
|
916 | Window top, parent; |
887 | Window top, parent; |
917 | dDisp; |
|
|
918 | |
888 | |
919 | #ifdef USING_W11LIB |
889 | dLocal (Display *, xdisp); |
920 | /* enable W11 callbacks */ |
|
|
921 | W11AddEventHandler (disp, rxvt_W11_process_x_event); |
|
|
922 | #endif |
|
|
923 | |
890 | |
924 | assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); |
891 | /* grab colors before netscape does */ |
925 | XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); |
892 | Get_Colours (); |
926 | |
893 | |
927 | if (OPTION (Opt_transparent)) |
894 | if (!set_fonts ()) |
928 | { |
895 | rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); |
929 | XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); |
896 | |
930 | display->depth = gattr.depth; // doh //TODO, per-term not per-display? |
897 | parent = display->root; |
931 | } |
898 | |
|
|
899 | attributes.override_redirect = !!OPTION (Opt_override_redirect); |
932 | |
900 | |
933 | #if ENABLE_FRILLS |
901 | #if ENABLE_FRILLS |
934 | if (OPTION (Opt_borderLess)) |
902 | if (OPTION (Opt_borderLess)) |
935 | { |
903 | { |
936 | prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); |
904 | if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) |
937 | |
|
|
938 | if (prop == None) |
|
|
939 | { |
905 | { |
940 | /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ |
906 | /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ |
941 | #ifdef PREFER_24BIT |
|
|
942 | attributes.override_redirect = TRUE; |
907 | attributes.override_redirect = true; |
943 | #endif |
|
|
944 | mwmhints.flags = 0; |
908 | mwmhints.flags = 0; |
945 | } |
909 | } |
946 | else |
910 | else |
947 | { |
911 | { |
948 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
912 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
… | |
… | |
951 | } |
915 | } |
952 | else |
916 | else |
953 | mwmhints.flags = 0; |
917 | mwmhints.flags = 0; |
954 | #endif |
918 | #endif |
955 | |
919 | |
956 | /* grab colors before netscape does */ |
|
|
957 | Get_Colours (); |
|
|
958 | |
|
|
959 | if (!set_fonts ()) |
|
|
960 | rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); |
|
|
961 | |
|
|
962 | parent = DefaultRootWindow (disp); |
|
|
963 | |
|
|
964 | #if ENABLE_XEMBED |
920 | #if ENABLE_XEMBED |
965 | if (rs[Rs_embed]) |
921 | if (rs[Rs_embed]) |
966 | { |
922 | { |
967 | XWindowAttributes wattr; |
923 | XWindowAttributes wattr; |
968 | |
924 | |
969 | parent = strtol (rs[Rs_embed], 0, 0); |
925 | parent = strtol (rs[Rs_embed], 0, 0); |
970 | |
926 | |
971 | if (!XGetWindowAttributes (disp, parent, &wattr)) |
927 | if (!XGetWindowAttributes (xdisp, parent, &wattr)) |
972 | rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); |
928 | rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); |
973 | |
929 | |
974 | window_calc (wattr.width, wattr.height); |
930 | window_calc (wattr.width, wattr.height); |
975 | } |
931 | } |
976 | #endif |
932 | #endif |
977 | |
933 | |
978 | window_calc (0, 0); |
934 | window_calc (0, 0); |
979 | |
935 | |
980 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
936 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
981 | #ifdef PREFER_24BIT |
|
|
982 | attributes.background_pixel = pix_colors_focused[Color_border]; |
937 | attributes.background_pixel = pix_colors_focused [Color_border]; |
983 | attributes.border_pixel = pix_colors_focused[Color_border]; |
938 | attributes.border_pixel = pix_colors_focused [Color_border]; |
984 | attributes.colormap = display->cmap; |
939 | attributes.colormap = cmap; |
|
|
940 | |
985 | top = XCreateWindow (disp, parent, |
941 | top = XCreateWindow (xdisp, parent, |
986 | szHint.x, szHint.y, |
942 | szHint.x, szHint.y, |
987 | szHint.width, szHint.height, |
943 | szHint.width, szHint.height, |
988 | ext_bwidth, |
944 | ext_bwidth, |
989 | display->depth, InputOutput, |
945 | depth, InputOutput, visual, |
990 | display->visual, |
|
|
991 | CWColormap | CWBackPixel | CWBorderPixel, &attributes); |
946 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
992 | #else |
947 | &attributes); |
993 | top = XCreateSimpleWindow (disp, parent, |
|
|
994 | szHint.x, szHint.y, |
|
|
995 | szHint.width, szHint.height, |
|
|
996 | ext_bwidth, |
|
|
997 | pix_colors_focused[Color_border], |
|
|
998 | pix_colors_focused[Color_border]); |
|
|
999 | #endif |
|
|
1000 | |
948 | |
1001 | this->parent[0] = top; |
949 | this->parent[0] = top; |
1002 | |
950 | |
1003 | old_width = szHint.width; |
951 | old_width = szHint.width; |
1004 | old_height = szHint.height; |
952 | old_height = szHint.height; |
1005 | |
953 | |
1006 | process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); |
954 | process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); |
1007 | process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); |
955 | process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); |
1008 | |
956 | |
1009 | classHint.res_name = (char *)rs[Rs_name]; |
957 | classHint.res_name = (char *)rs[Rs_name]; |
1010 | classHint.res_class = (char *)RESCLASS; |
958 | classHint.res_class = (char *)RESCLASS; |
1011 | |
959 | |
1012 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
960 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
1013 | wmHint.input = True; |
961 | wmHint.input = True; |
1014 | wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; |
962 | wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; |
1015 | wmHint.window_group = top; |
963 | wmHint.window_group = top; |
1016 | |
964 | |
1017 | XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, |
965 | XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, |
1018 | &szHint, &wmHint, &classHint); |
966 | &szHint, &wmHint, &classHint); |
|
|
967 | |
|
|
968 | #if ENABLE_FRILLS |
|
|
969 | if (mwmhints.flags) |
|
|
970 | XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, |
|
|
971 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
|
|
972 | #endif |
1019 | |
973 | |
1020 | Atom protocols[] = { |
974 | Atom protocols[] = { |
1021 | xa[XA_WM_DELETE_WINDOW], |
975 | xa[XA_WM_DELETE_WINDOW], |
1022 | #if ENABLE_EWMH |
976 | #if ENABLE_EWMH |
1023 | xa[XA_NET_WM_PING], |
977 | xa[XA_NET_WM_PING], |
1024 | #endif |
978 | #endif |
1025 | }; |
979 | }; |
1026 | |
980 | |
1027 | XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
981 | XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
1028 | |
982 | |
1029 | #if ENABLE_FRILLS |
983 | #if ENABLE_FRILLS |
1030 | if (rs[Rs_transient_for]) |
984 | if (rs[Rs_transient_for]) |
1031 | XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
985 | XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
1032 | #endif |
986 | #endif |
1033 | |
987 | |
1034 | #if ENABLE_EWMH |
988 | #if ENABLE_EWMH |
1035 | long pid = getpid (); |
989 | long pid = getpid (); |
1036 | |
990 | |
1037 | XChangeProperty (disp, top, |
991 | XChangeProperty (xdisp, top, |
1038 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
992 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
1039 | PropModeReplace, (unsigned char *)&pid, 1); |
993 | PropModeReplace, (unsigned char *)&pid, 1); |
1040 | |
994 | |
1041 | // _NET_WM_WINDOW_TYPE is NORMAL, which is the default |
995 | // _NET_WM_WINDOW_TYPE is NORMAL, which is the default |
1042 | #endif |
996 | #endif |
1043 | |
997 | |
1044 | XSelectInput (disp, top, |
998 | XSelectInput (xdisp, top, |
1045 | KeyPressMask |
999 | KeyPressMask |
1046 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
1000 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
1047 | | KeyReleaseMask |
1001 | | KeyReleaseMask |
1048 | #endif |
1002 | #endif |
1049 | | FocusChangeMask | VisibilityChangeMask |
1003 | | FocusChangeMask | VisibilityChangeMask |
1050 | | ExposureMask | StructureNotifyMask); |
1004 | | ExposureMask | StructureNotifyMask); |
1051 | |
1005 | |
1052 | termwin_ev.start (display, top); |
1006 | termwin_ev.start (display, top); |
1053 | |
1007 | |
1054 | #if ENABLE_FRILLS |
|
|
1055 | if (mwmhints.flags) |
|
|
1056 | XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, |
|
|
1057 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
|
|
1058 | #endif |
|
|
1059 | |
|
|
1060 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1008 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1061 | TermWin_cursor = XCreateFontCursor (disp, XC_xterm); |
1009 | TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); |
1062 | |
1010 | |
1063 | #ifdef HAVE_SCROLLBARS |
1011 | #ifdef HAVE_SCROLLBARS |
1064 | /* cursor scrollBar: Black-on-White */ |
1012 | /* cursor scrollBar: Black-on-White */ |
1065 | leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); |
1013 | leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); |
1066 | #endif |
1014 | #endif |
1067 | |
1015 | |
1068 | /* the vt window */ |
1016 | /* the vt window */ |
1069 | vt = XCreateSimpleWindow (disp, top, |
1017 | vt = XCreateSimpleWindow (xdisp, top, |
1070 | window_vt_x, |
|
|
1071 | window_vt_y, |
1018 | window_vt_x, window_vt_y, |
1072 | width, |
|
|
1073 | height, |
1019 | width, height, |
1074 | 0, |
1020 | 0, |
1075 | pix_colors_focused[Color_fg], |
1021 | pix_colors_focused[Color_fg], |
1076 | pix_colors_focused[Color_bg]); |
1022 | pix_colors_focused[Color_bg]); |
1077 | #ifdef DEBUG_X |
|
|
1078 | XStoreName (disp, vt, "vt window"); |
|
|
1079 | #endif |
|
|
1080 | |
1023 | |
1081 | attributes.bit_gravity = NorthWestGravity; |
1024 | attributes.bit_gravity = NorthWestGravity; |
1082 | XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); |
1025 | XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); |
1083 | |
1026 | |
1084 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1027 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1085 | |
1028 | |
1086 | if (OPTION (Opt_pointerBlank)) |
1029 | if (OPTION (Opt_pointerBlank)) |
1087 | vt_emask |= PointerMotionMask; |
1030 | vt_emask |= PointerMotionMask; |
… | |
… | |
1092 | |
1035 | |
1093 | vt_ev.start (display, vt); |
1036 | vt_ev.start (display, vt); |
1094 | |
1037 | |
1095 | #ifdef XPM_BACKGROUND |
1038 | #ifdef XPM_BACKGROUND |
1096 | if (rs[Rs_backgroundPixmap] != NULL |
1039 | if (rs[Rs_backgroundPixmap] != NULL |
1097 | && ! OPTION (Opt_transparent)) |
1040 | && !OPTION (Opt_transparent)) |
1098 | { |
1041 | { |
1099 | const char *p = rs[Rs_backgroundPixmap]; |
1042 | const char *p = rs[Rs_backgroundPixmap]; |
1100 | |
1043 | |
1101 | if ((p = strchr (p, ';')) != NULL) |
1044 | if ((p = strchr (p, ';')) != NULL) |
1102 | { |
1045 | { |
… | |
… | |
1108 | scr_touch (true); |
1051 | scr_touch (true); |
1109 | } |
1052 | } |
1110 | #endif |
1053 | #endif |
1111 | |
1054 | |
1112 | /* graphics context for the vt window */ |
1055 | /* graphics context for the vt window */ |
1113 | gcvalue.foreground = pix_colors[Color_fg]; |
1056 | gcvalue.foreground = pix_colors[Color_fg]; |
1114 | gcvalue.background = pix_colors[Color_bg]; |
1057 | gcvalue.background = pix_colors[Color_bg]; |
1115 | gcvalue.graphics_exposures = 1; |
1058 | gcvalue.graphics_exposures = 1; |
|
|
1059 | |
1116 | gc = XCreateGC (disp, vt, |
1060 | gc = XCreateGC (xdisp, vt, |
1117 | GCForeground | GCBackground | GCGraphicsExposures, |
1061 | GCForeground | GCBackground | GCGraphicsExposures, |
1118 | &gcvalue); |
1062 | &gcvalue); |
1119 | |
1063 | |
1120 | drawable = new rxvt_drawable (display, vt); |
1064 | drawable = new rxvt_drawable (this, vt); |
1121 | |
1065 | |
1122 | #ifdef RXVT_SCROLLBAR |
1066 | #ifdef RXVT_SCROLLBAR |
1123 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1067 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1124 | topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1068 | topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); |
1125 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1069 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1126 | botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1070 | botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); |
1127 | gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; |
1071 | gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; |
1128 | scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1072 | scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); |
1129 | #endif |
1073 | #endif |
1130 | |
1074 | |
1131 | #ifdef OFF_FOCUS_FADING |
1075 | #ifdef OFF_FOCUS_FADING |
1132 | // initially we are in unfocused state |
1076 | // initially we are in unfocused state |
1133 | if (rs[Rs_fade]) |
1077 | if (rs[Rs_fade]) |
1134 | pix_colors = pix_colors_unfocused; |
1078 | pix_colors = pix_colors_unfocused; |
1135 | #endif |
1079 | #endif |
1136 | |
1080 | |
1137 | pointer_unblank (); |
1081 | pointer_unblank (); |
1138 | scr_recolour (); |
1082 | scr_recolour (); |
1139 | |
|
|
1140 | #if ENABLE_XEMBED |
|
|
1141 | if (rs[Rs_embed]) |
|
|
1142 | { |
|
|
1143 | long info[2] = { 0, XEMBED_MAPPED }; |
|
|
1144 | |
|
|
1145 | XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
|
|
1146 | 32, PropModeReplace, (unsigned char *)&info, 2); |
|
|
1147 | } |
|
|
1148 | #endif |
|
|
1149 | } |
1083 | } |
1150 | |
1084 | |
1151 | /* ------------------------------------------------------------------------- * |
1085 | /* ------------------------------------------------------------------------- * |
1152 | * GET TTY CURRENT STATE * |
1086 | * GET TTY CURRENT STATE * |
1153 | * ------------------------------------------------------------------------- */ |
1087 | * ------------------------------------------------------------------------- */ |
… | |
… | |
1370 | rxvt_term::run_command (const char *const *argv) |
1304 | rxvt_term::run_command (const char *const *argv) |
1371 | { |
1305 | { |
1372 | #if ENABLE_FRILLS |
1306 | #if ENABLE_FRILLS |
1373 | if (rs[Rs_pty_fd]) |
1307 | if (rs[Rs_pty_fd]) |
1374 | { |
1308 | { |
1375 | pty.pty = atoi (rs[Rs_pty_fd]); |
1309 | pty->pty = atoi (rs[Rs_pty_fd]); |
1376 | |
1310 | |
1377 | if (pty.pty >= 0) |
1311 | if (pty->pty >= 0) |
1378 | { |
1312 | { |
1379 | if (getfd_hook) |
1313 | if (getfd_hook) |
1380 | pty.pty = (*getfd_hook) (pty.pty); |
1314 | pty->pty = (*getfd_hook) (pty->pty); |
1381 | |
1315 | |
1382 | if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) |
1316 | if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) |
1383 | rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); |
1317 | rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); |
1384 | } |
1318 | } |
1385 | } |
1319 | } |
1386 | else |
1320 | else |
1387 | #endif |
1321 | #endif |
1388 | if (!pty.get ()) |
1322 | if (!pty->get ()) |
1389 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1323 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1390 | |
1324 | |
1391 | pty.set_utf8_mode (enc_utf8); |
1325 | pty->set_utf8_mode (enc_utf8); |
1392 | |
1326 | |
1393 | /* set initial window size */ |
1327 | /* set initial window size */ |
1394 | tt_winch (); |
1328 | tt_winch (); |
1395 | |
1329 | |
1396 | int er; |
1330 | int er; |
… | |
… | |
1409 | #if ENABLE_FRILLS |
1343 | #if ENABLE_FRILLS |
1410 | if (rs[Rs_pty_fd]) |
1344 | if (rs[Rs_pty_fd]) |
1411 | return; |
1345 | return; |
1412 | #endif |
1346 | #endif |
1413 | |
1347 | |
1414 | #ifndef __QNX__ |
|
|
1415 | /* spin off the command interpreter */ |
1348 | /* spin off the command interpreter */ |
1416 | switch (cmd_pid = fork ()) |
1349 | switch (cmd_pid = fork ()) |
1417 | { |
1350 | { |
1418 | case -1: |
1351 | case -1: |
1419 | { |
1352 | { |
… | |
… | |
1421 | rxvt_fatal ("can't fork, aborting.\n"); |
1354 | rxvt_fatal ("can't fork, aborting.\n"); |
1422 | } |
1355 | } |
1423 | case 0: |
1356 | case 0: |
1424 | init_env (); |
1357 | init_env (); |
1425 | |
1358 | |
1426 | if (!pty.make_controlling_tty ()) |
1359 | if (!pty->make_controlling_tty ()) |
1427 | fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); |
1360 | fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); |
1428 | else |
1361 | else |
1429 | { |
1362 | { |
1430 | /* Reopen stdin, stdout and stderr over the tty file descriptor */ |
1363 | /* Reopen stdin, stdout and stderr over the tty file descriptor */ |
1431 | dup2 (pty.tty, STDIN_FILENO); |
1364 | dup2 (pty->tty, STDIN_FILENO); |
1432 | dup2 (pty.tty, STDOUT_FILENO); |
1365 | dup2 (pty->tty, STDOUT_FILENO); |
1433 | dup2 (pty.tty, STDERR_FILENO); |
1366 | dup2 (pty->tty, STDERR_FILENO); |
1434 | |
1367 | |
1435 | // close all our file handles that we do no longer need |
1368 | // close all our file handles that we do no longer need |
1436 | for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) |
1369 | for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) |
1437 | { |
1370 | { |
1438 | if ((*t)->pty.pty > 2) close ((*t)->pty.pty); |
1371 | if ((*t)->pty->pty > 2) close ((*t)->pty->pty); |
1439 | if ((*t)->pty.tty > 2) close ((*t)->pty.tty); |
1372 | if ((*t)->pty->tty > 2) close ((*t)->pty->tty); |
1440 | } |
1373 | } |
1441 | |
1374 | |
1442 | run_child (argv); |
1375 | run_child (argv); |
1443 | fprintf (stderr, "%s: unable to exec child.", RESNAME); |
1376 | fprintf (stderr, "%s: unable to exec child.", RESNAME); |
1444 | } |
1377 | } |
1445 | |
1378 | |
1446 | _exit (EXIT_FAILURE); |
1379 | _exit (EXIT_FAILURE); |
1447 | |
1380 | |
1448 | default: |
1381 | default: |
1449 | { |
1382 | if (!OPTION (Opt_utmpInhibit)) |
1450 | #if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) |
1383 | pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); |
1451 | int fdstdin; |
|
|
1452 | |
1384 | |
1453 | fdstdin = dup (STDIN_FILENO); |
1385 | pty->close_tty (); |
1454 | dup2 (pty.tty, STDIN_FILENO); |
|
|
1455 | #endif |
|
|
1456 | |
1386 | |
1457 | #ifdef UTMP_SUPPORT |
1387 | child_ev.start (cmd_pid); |
1458 | privileged_utmp (SAVE); |
|
|
1459 | #endif |
|
|
1460 | |
1388 | |
1461 | #if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) |
1389 | HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END)); |
1462 | |
|
|
1463 | dup2 (fdstdin, STDIN_FILENO); |
|
|
1464 | close (fdstdin); |
|
|
1465 | #endif |
|
|
1466 | } |
|
|
1467 | |
|
|
1468 | pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ |
|
|
1469 | break; |
1390 | break; |
1470 | } |
1391 | } |
1471 | #else /* __QNX__ uses qnxspawn () */ |
|
|
1472 | fchmod (pty.tty, 0622); |
|
|
1473 | fcntl (pty.tty, F_SETFD, FD_CLOEXEC); |
|
|
1474 | fcntl (pty.pty, F_SETFD, FD_CLOEXEC); |
|
|
1475 | |
|
|
1476 | if (run_child (argv) == -1) |
|
|
1477 | exit (EXIT_FAILURE); |
|
|
1478 | #endif |
|
|
1479 | } |
1392 | } |
1480 | |
1393 | |
1481 | /* ------------------------------------------------------------------------- * |
1394 | /* ------------------------------------------------------------------------- * |
1482 | * CHILD PROCESS OPERATIONS * |
1395 | * CHILD PROCESS OPERATIONS * |
1483 | * ------------------------------------------------------------------------- */ |
1396 | * ------------------------------------------------------------------------- */ |
… | |
… | |
1527 | // unblock signals (signals are blocked by iom.C |
1440 | // unblock signals (signals are blocked by iom.C |
1528 | sigset_t ss; |
1441 | sigset_t ss; |
1529 | sigemptyset (&ss); |
1442 | sigemptyset (&ss); |
1530 | sigprocmask (SIG_SETMASK, &ss, 0); |
1443 | sigprocmask (SIG_SETMASK, &ss, 0); |
1531 | |
1444 | |
1532 | #ifndef __QNX__ |
|
|
1533 | /* command interpreter path */ |
1445 | /* command interpreter path */ |
1534 | if (argv != NULL) |
1446 | if (argv != NULL) |
1535 | { |
1447 | { |
1536 | # ifdef DEBUG_CMD |
1448 | # ifdef DEBUG_CMD |
1537 | int i; |
1449 | int i; |
… | |
… | |
1563 | |
1475 | |
1564 | execlp (shell, argv0, NULL); |
1476 | execlp (shell, argv0, NULL); |
1565 | /* no error message: STDERR is closed! */ |
1477 | /* no error message: STDERR is closed! */ |
1566 | } |
1478 | } |
1567 | |
1479 | |
1568 | #else /* __QNX__ uses qnxspawn () */ |
|
|
1569 | |
|
|
1570 | char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; |
|
|
1571 | char *command = NULL, fullcommand[_MAX_PATH]; |
|
|
1572 | char **arg_v, *arg_a[2] = { NULL, NULL }; |
|
|
1573 | |
|
|
1574 | if (argv != NULL) |
|
|
1575 | { |
|
|
1576 | if (access (argv[0], X_OK) == -1) |
|
|
1577 | { |
|
|
1578 | if (strchr (argv[0], '/') == NULL) |
|
|
1579 | { |
|
|
1580 | searchenv (argv[0], "PATH", fullcommand); |
|
|
1581 | |
|
|
1582 | if (fullcommand[0] != '\0') |
|
|
1583 | command = fullcommand; |
|
|
1584 | } |
|
|
1585 | |
|
|
1586 | if (access (command, X_OK) == -1) |
|
|
1587 | return -1; |
|
|
1588 | } |
|
|
1589 | else |
|
|
1590 | command = argv[0]; |
|
|
1591 | |
|
|
1592 | arg_v = argv; |
|
|
1593 | } |
|
|
1594 | else |
|
|
1595 | { |
|
|
1596 | if ((command = getenv ("SHELL")) == NULL || *command == '\0') |
|
|
1597 | command = "/bin/sh"; |
|
|
1598 | |
|
|
1599 | arg_a[0] = my_basename (command); |
|
|
1600 | |
|
|
1601 | if (OPTION (Opt_loginShell)) |
|
|
1602 | { |
|
|
1603 | login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); |
|
|
1604 | |
|
|
1605 | login[0] = '-'; |
|
|
1606 | strcpy (&login[1], arg_a[0]); |
|
|
1607 | arg_a[0] = login; |
|
|
1608 | } |
|
|
1609 | |
|
|
1610 | arg_v = arg_a; |
|
|
1611 | } |
|
|
1612 | |
|
|
1613 | iov_a[0] = iov_a[1] = iov_a[2] = pty.tty; |
|
|
1614 | cmd_pid = qnx_spawn (0, 0, 0, -1, -1, |
|
|
1615 | _SPAWN_SETSID | _SPAWN_TCSETPGRP, |
|
|
1616 | command, arg_v, environ, iov_a, 0); |
|
|
1617 | if (login) |
|
|
1618 | free (login); |
|
|
1619 | |
|
|
1620 | pty.close_tty (); |
|
|
1621 | return pty.pty; |
|
|
1622 | #endif |
|
|
1623 | |
|
|
1624 | return -1; |
1480 | return -1; |
1625 | } |
1481 | } |
1626 | |
1482 | |
1627 | /*----------------------- end-of-file (C source) -----------------------*/ |
1483 | /*----------------------- end-of-file (C source) -----------------------*/ |