… | |
… | |
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; |
256 | bgPixmap.pixmap = None; |
212 | bgPixmap.pixmap = None; |
257 | #endif |
213 | #endif |
258 | |
214 | |
259 | last_bot = last_state = -1; |
215 | last_bot = last_state = -1; |
260 | |
|
|
261 | #ifdef MENUBAR |
|
|
262 | menu_readonly = 1; |
|
|
263 | # if ! (MENUBAR_MAX > 1) |
|
|
264 | CurrentBar = &BarList; |
|
|
265 | # endif /* (MENUBAR_MAX > 1) */ |
|
|
266 | #endif |
|
|
267 | |
216 | |
268 | return true; |
217 | return true; |
269 | } |
218 | } |
270 | |
219 | |
271 | void |
220 | void |
… | |
… | |
348 | get_options (r_argc, r_argv); |
297 | get_options (r_argc, r_argv); |
349 | |
298 | |
350 | if (!(display = displays.get (rs[Rs_display_name]))) |
299 | if (!(display = displays.get (rs[Rs_display_name]))) |
351 | 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]); |
352 | |
301 | |
|
|
302 | xa = display->xa; |
|
|
303 | |
|
|
304 | #if XFT |
|
|
305 | if (rs[Rs_depth]) |
|
|
306 | set (display, strtol (rs[Rs_depth], 0, 0)); |
|
|
307 | else |
|
|
308 | #endif |
|
|
309 | set (display); |
|
|
310 | |
353 | extract_resources (); |
311 | extract_resources (); |
354 | |
312 | |
355 | 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 |
356 | |
327 | |
357 | /* |
328 | /* |
358 | * set any defaults not already set |
329 | * set any defaults not already set |
359 | */ |
330 | */ |
360 | if (cmd_argv && cmd_argv[0]) |
331 | if (cmd_argv && cmd_argv[0]) |
… | |
… | |
511 | val = rxvt_network_display (rs[Rs_display_name]); |
482 | val = rxvt_network_display (rs[Rs_display_name]); |
512 | rs[Rs_display_name] = (const char *)val; |
483 | rs[Rs_display_name] = (const char *)val; |
513 | |
484 | |
514 | if (val == NULL) |
485 | if (val == NULL) |
515 | #endif /* DISPLAY_IS_IP */ |
486 | #endif /* DISPLAY_IS_IP */ |
516 | val = XDisplayString (display->display); |
487 | val = XDisplayString (xdisp); |
517 | |
488 | |
518 | if (rs[Rs_display_name] == NULL) |
489 | if (rs[Rs_display_name] == NULL) |
519 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
490 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
520 | |
491 | |
521 | i = strlen (val); |
492 | i = strlen (val); |
522 | env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); |
493 | env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); |
523 | |
494 | |
524 | sprintf (env_display, "DISPLAY=%s", val); |
495 | sprintf (env_display, "DISPLAY=%s", val); |
525 | |
496 | |
526 | /* avoiding the math library: |
497 | sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); |
527 | * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */ |
|
|
528 | for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++) |
|
|
529 | ; |
|
|
530 | max_it (i, 1); |
|
|
531 | env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); |
|
|
532 | |
|
|
533 | sprintf (env_windowid, "WINDOWID=%u", |
|
|
534 | (unsigned int)parent[0]); |
|
|
535 | |
498 | |
536 | /* add entries to the environment: |
499 | /* add entries to the environment: |
537 | * @ DISPLAY: in case we started with -display |
500 | * @ DISPLAY: in case we started with -display |
538 | * @ WINDOWID: X window id number of the window |
501 | * @ WINDOWID: X window id number of the window |
539 | * @ COLORTERM: terminal sub-name and also indicates its color |
502 | * @ COLORTERM: terminal sub-name and also indicates its color |
… | |
… | |
541 | * @ TERMINFO: path to terminfo directory |
504 | * @ TERMINFO: path to terminfo directory |
542 | * @ COLORFGBG: fg;bg color codes |
505 | * @ COLORFGBG: fg;bg color codes |
543 | */ |
506 | */ |
544 | putenv (env_display); |
507 | putenv (env_display); |
545 | putenv (env_windowid); |
508 | putenv (env_windowid); |
|
|
509 | |
546 | if (env_colorfgbg) |
510 | if (env_colorfgbg) |
547 | putenv (env_colorfgbg); |
511 | putenv (env_colorfgbg); |
548 | |
512 | |
549 | #ifdef RXVT_TERMINFO |
513 | #ifdef RXVT_TERMINFO |
550 | putenv ("TERMINFO=" RXVT_TERMINFO); |
514 | putenv ("TERMINFO=" RXVT_TERMINFO); |
551 | #endif |
515 | #endif |
552 | |
516 | |
553 | if (display->depth <= 2) |
517 | if (depth <= 2) |
554 | putenv ("COLORTERM=" COLORTERMENV "-mono"); |
518 | putenv ("COLORTERM=" COLORTERMENV "-mono"); |
555 | else |
519 | else |
556 | putenv ("COLORTERM=" COLORTERMENVFULL); |
520 | putenv ("COLORTERM=" COLORTERMENVFULL); |
557 | |
521 | |
558 | if (rs[Rs_term_name] != NULL) |
522 | if (rs[Rs_term_name] != NULL) |
… | |
… | |
670 | if (strcmp (key_backspace, "DEC") == 0) |
634 | if (strcmp (key_backspace, "DEC") == 0) |
671 | priv_modes |= PrivMode_HaveBackSpace; |
635 | priv_modes |= PrivMode_HaveBackSpace; |
672 | #endif |
636 | #endif |
673 | |
637 | |
674 | /* add value for scrollBar */ |
638 | /* add value for scrollBar */ |
675 | if (scrollbar_visible ()) |
639 | if (scrollBar.state) |
676 | { |
640 | { |
677 | priv_modes |= PrivMode_scrollBar; |
641 | priv_modes |= PrivMode_scrollBar; |
678 | SavedModes |= PrivMode_scrollBar; |
642 | SavedModes |= PrivMode_scrollBar; |
679 | } |
|
|
680 | |
|
|
681 | if (menubar_visible ()) |
|
|
682 | { |
|
|
683 | priv_modes |= PrivMode_menuBar; |
|
|
684 | SavedModes |= PrivMode_menuBar; |
|
|
685 | } |
643 | } |
686 | |
644 | |
687 | run_command (argv); |
645 | run_command (argv); |
688 | } |
646 | } |
689 | |
647 | |
… | |
… | |
695 | |
653 | |
696 | #ifdef OFF_FOCUS_FADING |
654 | #ifdef OFF_FOCUS_FADING |
697 | pix_colors = pix_colors_focused; |
655 | pix_colors = pix_colors_focused; |
698 | #endif |
656 | #endif |
699 | |
657 | |
700 | for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) |
658 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
701 | { |
659 | { |
702 | rxvt_color xcol; |
660 | rxvt_color xcol; |
703 | |
661 | |
704 | if (!rs[Rs_color + i]) |
662 | if (!rs[Rs_color + i]) |
705 | continue; |
663 | continue; |
706 | |
664 | |
707 | if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) |
665 | if (!set_color (xcol, rs[Rs_color + i])) |
708 | { |
666 | { |
709 | #ifndef XTERM_REVERSE_VIDEO |
667 | #ifndef XTERM_REVERSE_VIDEO |
710 | if (i < 2 && OPTION (Opt_reverseVideo)) |
668 | if (i < 2 && OPTION (Opt_reverseVideo)) |
711 | rs[Rs_color + i] = def_colorName[!i]; |
669 | rs[Rs_color + i] = def_colorName[!i]; |
712 | else |
670 | else |
… | |
… | |
714 | rs[Rs_color + i] = def_colorName[i]; |
672 | rs[Rs_color + i] = def_colorName[i]; |
715 | |
673 | |
716 | if (!rs[Rs_color + i]) |
674 | if (!rs[Rs_color + i]) |
717 | continue; |
675 | continue; |
718 | |
676 | |
719 | if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) |
677 | if (!set_color (xcol, rs[Rs_color + i])) |
720 | { |
678 | { |
721 | switch (i) |
679 | switch (i) |
722 | { |
680 | { |
723 | case Color_fg: |
681 | case Color_fg: |
724 | case Color_bg: |
682 | case Color_bg: |
725 | /* fatal: need bg/fg color */ |
683 | /* fatal: need bg/fg color */ |
726 | rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); |
684 | rxvt_warn ("unable to get foreground/background colour, continuing.\n"); |
727 | /* NOTREACHED */ |
|
|
728 | break; |
685 | break; |
729 | #ifndef NO_CURSORCOLOR |
686 | #ifndef NO_CURSORCOLOR |
730 | case Color_cursor2: |
687 | case Color_cursor2: |
731 | xcol = pix_colors[Color_fg]; |
688 | xcol = pix_colors[Color_fg]; |
732 | break; |
689 | break; |
… | |
… | |
745 | SET_PIXCOLOR (i); |
702 | SET_PIXCOLOR (i); |
746 | } |
703 | } |
747 | |
704 | |
748 | #ifdef OFF_FOCUS_FADING |
705 | #ifdef OFF_FOCUS_FADING |
749 | if (rs[Rs_fade]) |
706 | if (rs[Rs_fade]) |
750 | for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) |
707 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
|
|
708 | { |
|
|
709 | rxvt_rgba c; |
|
|
710 | pix_colors[Color_fade].get (this, c); |
751 | pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
711 | pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), c); |
|
|
712 | } |
752 | #endif |
713 | #endif |
753 | |
714 | |
754 | if (display->depth <= 2) |
715 | if (depth <= 2) |
755 | { |
716 | { |
756 | if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; |
717 | if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; |
757 | if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; |
718 | if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; |
758 | if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; |
719 | if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; |
759 | } |
720 | } |
760 | |
721 | |
761 | /* |
722 | /* |
762 | * get scrollBar/menuBar shadow colors |
723 | * get scrollBar shadow colors |
763 | * |
724 | * |
764 | * The calculations of topShadow/bottomShadow values are adapted |
725 | * The calculations of topShadow/bottomShadow values are adapted |
765 | * from the fvwm window manager. |
726 | * from the fvwm window manager. |
766 | */ |
727 | */ |
767 | #ifdef KEEP_SCROLLCOLOR |
728 | #ifdef KEEP_SCROLLCOLOR |
768 | |
729 | |
769 | if (display->depth <= 2) |
730 | if (depth <= 2) |
770 | { |
731 | { |
771 | /* Monochrome */ |
732 | /* Monochrome */ |
772 | pix_colors[Color_scroll] = pix_colors[Color_fg]; |
733 | pix_colors[Color_scroll] = pix_colors[Color_fg]; |
773 | pix_colors[Color_topShadow] = pix_colors[Color_bg]; |
734 | pix_colors[Color_topShadow] = pix_colors[Color_bg]; |
774 | pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; |
735 | pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; |
… | |
… | |
779 | /* xcol[0] == white |
740 | /* xcol[0] == white |
780 | * xcol[1] == top shadow |
741 | * xcol[1] == top shadow |
781 | * xcol[2] == bot shadow */ |
742 | * xcol[2] == bot shadow */ |
782 | |
743 | |
783 | xcol[1] = pix_colors[Color_scroll]; |
744 | xcol[1] = pix_colors[Color_scroll]; |
784 | xcol[0].set (display, 65535, 65535, 65535); |
745 | xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); |
785 | |
746 | |
786 | unsigned short pr1, pg1, pb1, pr0, pg0, pb0; |
747 | rxvt_rgba c0, c1; |
787 | |
748 | |
788 | xcol[0].get (display, pr0, pg0, pb0); |
749 | xcol[0].get (this, c0); |
789 | xcol[1].get (display, pr1, pg1, pb1); |
750 | xcol[1].get (this, c1); |
790 | |
751 | |
791 | pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); |
752 | pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50); |
792 | |
753 | |
793 | /* topShadowColor */ |
754 | /* topShadowColor */ |
794 | if (!xcol[1].set (display, |
755 | if (!xcol[1].set (this, |
|
|
756 | rxvt_rgba ( |
795 | min (pr0, max (pr0 / 5, pr1) * 7 / 5), |
757 | min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), |
796 | min (pg0, max (pg0 / 5, pg1) * 7 / 5), |
758 | min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), |
797 | min (pb0, max (pb0 / 5, pb1) * 7 / 5))) |
759 | min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), |
|
|
760 | c1.a) // pa1 vs. pa0: arbitrary |
|
|
761 | )); |
798 | xcol[1] = pix_colors[Color_White]; |
762 | xcol[1] = pix_colors[Color_White]; |
799 | |
763 | |
800 | pix_colors[Color_topShadow] = xcol[1]; |
764 | pix_colors[Color_topShadow] = xcol[1]; |
801 | } |
765 | } |
802 | #endif /* KEEP_SCROLLCOLOR */ |
766 | #endif /* KEEP_SCROLLCOLOR */ |
… | |
… | |
846 | |
810 | |
847 | if (rsmod |
811 | if (rsmod |
848 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
812 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
849 | requestedmeta = rsmod[3] - '0'; |
813 | requestedmeta = rsmod[3] - '0'; |
850 | |
814 | |
851 | map = XGetModifierMapping (display->display); |
815 | map = XGetModifierMapping (xdisp); |
852 | kc = map->modifiermap; |
816 | kc = map->modifiermap; |
853 | |
817 | |
854 | for (i = 1; i < 6; i++) |
818 | for (i = 1; i < 6; i++) |
855 | { |
819 | { |
856 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
820 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
… | |
… | |
858 | for (j = map->max_keypermod; j--; k++) |
822 | for (j = map->max_keypermod; j--; k++) |
859 | { |
823 | { |
860 | if (kc[k] == 0) |
824 | if (kc[k] == 0) |
861 | break; |
825 | break; |
862 | |
826 | |
863 | switch (XKeycodeToKeysym (display->display, kc[k], 0)) |
827 | switch (XKeycodeToKeysym (xdisp, kc[k], 0)) |
864 | { |
828 | { |
865 | case XK_Num_Lock: |
829 | case XK_Num_Lock: |
866 | ModNumLockMask = modmasks[i - 1]; |
830 | ModNumLockMask = modmasks[i - 1]; |
867 | continue; |
831 | continue; |
868 | |
832 | |
… | |
… | |
918 | rxvt_term::create_windows (int argc, const char *const *argv) |
882 | rxvt_term::create_windows (int argc, const char *const *argv) |
919 | { |
883 | { |
920 | XClassHint classHint; |
884 | XClassHint classHint; |
921 | XWMHints wmHint; |
885 | XWMHints wmHint; |
922 | #if ENABLE_FRILLS |
886 | #if ENABLE_FRILLS |
923 | Atom prop = None; |
|
|
924 | MWMHints mwmhints; |
887 | MWMHints mwmhints; |
925 | #endif |
888 | #endif |
926 | XGCValues gcvalue; |
889 | XGCValues gcvalue; |
927 | XSetWindowAttributes attributes; |
890 | XSetWindowAttributes attributes; |
928 | XWindowAttributes gattr; |
|
|
929 | Window top, parent; |
891 | Window top, parent; |
930 | dDisp; |
|
|
931 | |
892 | |
932 | #ifdef USING_W11LIB |
893 | dLocal (Display *, xdisp); |
933 | /* enable W11 callbacks */ |
|
|
934 | W11AddEventHandler (disp, rxvt_W11_process_x_event); |
|
|
935 | #endif |
|
|
936 | |
894 | |
937 | assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); |
895 | /* grab colors before netscape does */ |
938 | XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); |
896 | Get_Colours (); |
939 | |
897 | |
940 | if (OPTION (Opt_transparent)) |
898 | if (!set_fonts ()) |
941 | { |
899 | rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); |
942 | XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); |
900 | |
943 | display->depth = gattr.depth; // doh //TODO, per-term not per-display? |
901 | parent = display->root; |
944 | } |
902 | |
|
|
903 | attributes.override_redirect = !!OPTION (Opt_override_redirect); |
945 | |
904 | |
946 | #if ENABLE_FRILLS |
905 | #if ENABLE_FRILLS |
947 | if (OPTION (Opt_borderLess)) |
906 | if (OPTION (Opt_borderLess)) |
948 | { |
907 | { |
949 | prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); |
908 | if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) |
950 | |
|
|
951 | if (prop == None) |
|
|
952 | { |
909 | { |
953 | /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ |
910 | /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ |
954 | #ifdef PREFER_24BIT |
|
|
955 | attributes.override_redirect = TRUE; |
911 | attributes.override_redirect = true; |
956 | #endif |
|
|
957 | mwmhints.flags = 0; |
912 | mwmhints.flags = 0; |
958 | } |
913 | } |
959 | else |
914 | else |
960 | { |
915 | { |
961 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
916 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
… | |
… | |
964 | } |
919 | } |
965 | else |
920 | else |
966 | mwmhints.flags = 0; |
921 | mwmhints.flags = 0; |
967 | #endif |
922 | #endif |
968 | |
923 | |
969 | /* grab colors before netscape does */ |
|
|
970 | Get_Colours (); |
|
|
971 | |
|
|
972 | if (!set_fonts ()) |
|
|
973 | rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); |
|
|
974 | |
|
|
975 | parent = DefaultRootWindow (disp); |
|
|
976 | |
|
|
977 | #if ENABLE_XEMBED |
924 | #if ENABLE_XEMBED |
978 | if (rs[Rs_embed]) |
925 | if (rs[Rs_embed]) |
979 | { |
926 | { |
980 | XWindowAttributes wattr; |
927 | XWindowAttributes wattr; |
981 | |
928 | |
982 | parent = strtol (rs[Rs_embed], 0, 0); |
929 | parent = strtol (rs[Rs_embed], 0, 0); |
983 | |
930 | |
984 | if (!XGetWindowAttributes (disp, parent, &wattr)) |
931 | if (!XGetWindowAttributes (xdisp, parent, &wattr)) |
985 | rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); |
932 | rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); |
986 | |
933 | |
987 | window_calc (wattr.width, wattr.height); |
934 | window_calc (wattr.width, wattr.height); |
988 | } |
935 | } |
989 | #endif |
936 | #endif |
990 | |
937 | |
991 | window_calc (0, 0); |
938 | window_calc (0, 0); |
992 | |
939 | |
993 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
940 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
994 | #ifdef PREFER_24BIT |
|
|
995 | attributes.background_pixel = pix_colors_focused[Color_border]; |
941 | attributes.background_pixel = pix_colors_focused [Color_border]; |
996 | attributes.border_pixel = pix_colors_focused[Color_border]; |
942 | attributes.border_pixel = pix_colors_focused [Color_border]; |
997 | attributes.colormap = display->cmap; |
943 | attributes.colormap = cmap; |
|
|
944 | |
998 | top = XCreateWindow (disp, parent, |
945 | top = XCreateWindow (xdisp, parent, |
999 | szHint.x, szHint.y, |
946 | szHint.x, szHint.y, |
1000 | szHint.width, szHint.height, |
947 | szHint.width, szHint.height, |
1001 | ext_bwidth, |
948 | ext_bwidth, |
1002 | display->depth, InputOutput, |
949 | depth, InputOutput, visual, |
1003 | display->visual, |
|
|
1004 | CWColormap | CWBackPixel | CWBorderPixel, &attributes); |
950 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
1005 | #else |
951 | &attributes); |
1006 | top = XCreateSimpleWindow (disp, parent, |
|
|
1007 | szHint.x, szHint.y, |
|
|
1008 | szHint.width, szHint.height, |
|
|
1009 | ext_bwidth, |
|
|
1010 | pix_colors_focused[Color_border], |
|
|
1011 | pix_colors_focused[Color_border]); |
|
|
1012 | #endif |
|
|
1013 | |
952 | |
1014 | this->parent[0] = top; |
953 | this->parent[0] = top; |
1015 | |
954 | |
1016 | old_width = szHint.width; |
955 | old_width = szHint.width; |
1017 | old_height = szHint.height; |
956 | old_height = szHint.height; |
1018 | |
957 | |
1019 | process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); |
958 | process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); |
1020 | process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); |
959 | process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); |
1021 | |
960 | |
1022 | classHint.res_name = (char *)rs[Rs_name]; |
961 | classHint.res_name = (char *)rs[Rs_name]; |
1023 | classHint.res_class = (char *)RESCLASS; |
962 | classHint.res_class = (char *)RESCLASS; |
1024 | |
963 | |
1025 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
964 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
1026 | wmHint.input = True; |
965 | wmHint.input = True; |
1027 | wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; |
966 | wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; |
1028 | wmHint.window_group = top; |
967 | wmHint.window_group = top; |
1029 | |
968 | |
1030 | XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, |
969 | XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, |
1031 | &szHint, &wmHint, &classHint); |
970 | &szHint, &wmHint, &classHint); |
|
|
971 | |
|
|
972 | #if ENABLE_FRILLS |
|
|
973 | if (mwmhints.flags) |
|
|
974 | XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, |
|
|
975 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
|
|
976 | #endif |
1032 | |
977 | |
1033 | Atom protocols[] = { |
978 | Atom protocols[] = { |
1034 | xa[XA_WM_DELETE_WINDOW], |
979 | xa[XA_WM_DELETE_WINDOW], |
1035 | #if ENABLE_EWMH |
980 | #if ENABLE_EWMH |
1036 | xa[XA_NET_WM_PING], |
981 | xa[XA_NET_WM_PING], |
1037 | #endif |
982 | #endif |
1038 | }; |
983 | }; |
1039 | |
984 | |
1040 | XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
985 | XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
1041 | |
986 | |
1042 | #if ENABLE_FRILLS |
987 | #if ENABLE_FRILLS |
1043 | if (rs[Rs_transient_for]) |
988 | if (rs[Rs_transient_for]) |
1044 | XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
989 | XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
1045 | #endif |
990 | #endif |
1046 | |
991 | |
1047 | #if ENABLE_EWMH |
992 | #if ENABLE_EWMH |
1048 | long pid = getpid (); |
993 | long pid = getpid (); |
1049 | |
994 | |
1050 | XChangeProperty (disp, top, |
995 | XChangeProperty (xdisp, top, |
1051 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
996 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
1052 | PropModeReplace, (unsigned char *)&pid, 1); |
997 | PropModeReplace, (unsigned char *)&pid, 1); |
1053 | |
998 | |
1054 | // _NET_WM_WINDOW_TYPE is NORMAL, which is the default |
999 | // _NET_WM_WINDOW_TYPE is NORMAL, which is the default |
1055 | #endif |
1000 | #endif |
1056 | |
1001 | |
1057 | XSelectInput (disp, top, |
1002 | XSelectInput (xdisp, top, |
1058 | KeyPressMask |
1003 | KeyPressMask |
1059 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
1004 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
1060 | | KeyReleaseMask |
1005 | | KeyReleaseMask |
1061 | #endif |
1006 | #endif |
1062 | | FocusChangeMask | VisibilityChangeMask |
1007 | | FocusChangeMask | VisibilityChangeMask |
1063 | | ExposureMask | StructureNotifyMask); |
1008 | | ExposureMask | StructureNotifyMask); |
1064 | |
1009 | |
1065 | termwin_ev.start (display, top); |
1010 | termwin_ev.start (display, top); |
1066 | |
1011 | |
1067 | #if ENABLE_FRILLS |
|
|
1068 | if (mwmhints.flags) |
|
|
1069 | XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, |
|
|
1070 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
|
|
1071 | #endif |
|
|
1072 | |
|
|
1073 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1012 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1074 | TermWin_cursor = XCreateFontCursor (disp, XC_xterm); |
1013 | TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); |
1075 | |
1014 | |
1076 | #if defined(HAVE_SCROLLBARS) || defined(MENUBAR) |
1015 | #ifdef HAVE_SCROLLBARS |
1077 | /* cursor (menuBar/scrollBar): Black-on-White */ |
1016 | /* cursor scrollBar: Black-on-White */ |
1078 | leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); |
1017 | leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); |
1079 | #endif |
1018 | #endif |
1080 | |
1019 | |
1081 | /* the vt window */ |
1020 | /* the vt window */ |
1082 | vt = XCreateSimpleWindow (disp, top, |
1021 | vt = XCreateSimpleWindow (xdisp, top, |
1083 | window_vt_x, |
|
|
1084 | window_vt_y, |
1022 | window_vt_x, window_vt_y, |
1085 | width, |
|
|
1086 | height, |
1023 | width, height, |
1087 | 0, |
1024 | 0, |
1088 | pix_colors_focused[Color_fg], |
1025 | pix_colors_focused[Color_fg], |
1089 | pix_colors_focused[Color_bg]); |
1026 | pix_colors_focused[Color_bg]); |
1090 | #ifdef DEBUG_X |
|
|
1091 | XStoreName (disp, vt, "vt window"); |
|
|
1092 | #endif |
|
|
1093 | |
1027 | |
1094 | attributes.bit_gravity = NorthWestGravity; |
1028 | attributes.bit_gravity = NorthWestGravity; |
1095 | XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); |
1029 | XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); |
1096 | |
1030 | |
1097 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1031 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1098 | |
1032 | |
1099 | if (OPTION (Opt_pointerBlank)) |
1033 | if (OPTION (Opt_pointerBlank)) |
1100 | vt_emask |= PointerMotionMask; |
1034 | vt_emask |= PointerMotionMask; |
… | |
… | |
1103 | |
1037 | |
1104 | vt_select_input (); |
1038 | vt_select_input (); |
1105 | |
1039 | |
1106 | vt_ev.start (display, vt); |
1040 | vt_ev.start (display, vt); |
1107 | |
1041 | |
1108 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
|
|
1109 | if (menuBar_height ()) |
|
|
1110 | { |
|
|
1111 | menuBar.win = XCreateSimpleWindow (disp, top, |
|
|
1112 | window_vt_x, 0, |
|
|
1113 | width, |
|
|
1114 | menuBar_TotalHeight (), |
|
|
1115 | 0, |
|
|
1116 | pix_colors_focused[Color_fg], |
|
|
1117 | pix_colors_focused[Color_scroll]); |
|
|
1118 | |
|
|
1119 | #ifdef DEBUG_X |
|
|
1120 | XStoreName (disp, menuBar.win, "menubar"); |
|
|
1121 | #endif |
|
|
1122 | |
|
|
1123 | menuBar.drawable = new rxvt_drawable (display, menuBar.win); |
|
|
1124 | |
|
|
1125 | XDefineCursor (disp, menuBar.win, |
|
|
1126 | XCreateFontCursor (disp, XC_left_ptr)); |
|
|
1127 | |
|
|
1128 | XSelectInput (disp, menuBar.win, |
|
|
1129 | (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask)); |
|
|
1130 | menubar_ev.start (display, menuBar.win); |
|
|
1131 | } |
|
|
1132 | #endif |
|
|
1133 | |
|
|
1134 | #ifdef XPM_BACKGROUND |
1042 | #ifdef XPM_BACKGROUND |
1135 | if (rs[Rs_backgroundPixmap] != NULL |
1043 | if (rs[Rs_backgroundPixmap] != NULL |
1136 | && ! OPTION (Opt_transparent)) |
1044 | && !OPTION (Opt_transparent)) |
1137 | { |
1045 | { |
1138 | const char *p = rs[Rs_backgroundPixmap]; |
1046 | const char *p = rs[Rs_backgroundPixmap]; |
1139 | |
1047 | |
1140 | if ((p = strchr (p, ';')) != NULL) |
1048 | if ((p = strchr (p, ';')) != NULL) |
1141 | { |
1049 | { |
… | |
… | |
1147 | scr_touch (true); |
1055 | scr_touch (true); |
1148 | } |
1056 | } |
1149 | #endif |
1057 | #endif |
1150 | |
1058 | |
1151 | /* graphics context for the vt window */ |
1059 | /* graphics context for the vt window */ |
1152 | gcvalue.foreground = pix_colors[Color_fg]; |
1060 | gcvalue.foreground = pix_colors[Color_fg]; |
1153 | gcvalue.background = pix_colors[Color_bg]; |
1061 | gcvalue.background = pix_colors[Color_bg]; |
1154 | gcvalue.graphics_exposures = 1; |
1062 | gcvalue.graphics_exposures = 1; |
|
|
1063 | |
1155 | gc = XCreateGC (disp, vt, |
1064 | gc = XCreateGC (xdisp, vt, |
1156 | GCForeground | GCBackground | GCGraphicsExposures, |
1065 | GCForeground | GCBackground | GCGraphicsExposures, |
1157 | &gcvalue); |
1066 | &gcvalue); |
1158 | |
1067 | |
1159 | drawable = new rxvt_drawable (display, vt); |
1068 | drawable = new rxvt_drawable (this, vt); |
1160 | |
1069 | |
1161 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
1070 | #ifdef RXVT_SCROLLBAR |
1162 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1071 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1163 | topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1072 | topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); |
1164 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1073 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1165 | botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1074 | botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); |
1166 | gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; |
1075 | gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; |
1167 | scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1076 | scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); |
1168 | #endif |
1077 | #endif |
1169 | |
1078 | |
1170 | #ifdef OFF_FOCUS_FADING |
1079 | #ifdef OFF_FOCUS_FADING |
1171 | // initially we are in unfocused state |
1080 | // initially we are in unfocused state |
1172 | if (rs[Rs_fade]) |
1081 | if (rs[Rs_fade]) |
1173 | pix_colors = pix_colors_unfocused; |
1082 | pix_colors = pix_colors_unfocused; |
1174 | #endif |
1083 | #endif |
1175 | |
1084 | |
1176 | pointer_unblank (); |
1085 | pointer_unblank (); |
1177 | scr_recolour (); |
1086 | scr_recolour (); |
1178 | |
|
|
1179 | #if ENABLE_XEMBED |
|
|
1180 | if (rs[Rs_embed]) |
|
|
1181 | { |
|
|
1182 | long info[2] = { 0, XEMBED_MAPPED }; |
|
|
1183 | |
|
|
1184 | XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
|
|
1185 | 32, PropModeReplace, (unsigned char *)&info, 2); |
|
|
1186 | } |
|
|
1187 | #endif |
|
|
1188 | } |
1087 | } |
1189 | |
1088 | |
1190 | /* ------------------------------------------------------------------------- * |
1089 | /* ------------------------------------------------------------------------- * |
1191 | * GET TTY CURRENT STATE * |
1090 | * GET TTY CURRENT STATE * |
1192 | * ------------------------------------------------------------------------- */ |
1091 | * ------------------------------------------------------------------------- */ |
… | |
… | |
1409 | rxvt_term::run_command (const char *const *argv) |
1308 | rxvt_term::run_command (const char *const *argv) |
1410 | { |
1309 | { |
1411 | #if ENABLE_FRILLS |
1310 | #if ENABLE_FRILLS |
1412 | if (rs[Rs_pty_fd]) |
1311 | if (rs[Rs_pty_fd]) |
1413 | { |
1312 | { |
1414 | pty.pty = atoi (rs[Rs_pty_fd]); |
1313 | pty->pty = atoi (rs[Rs_pty_fd]); |
1415 | |
1314 | |
1416 | if (pty.pty >= 0) |
1315 | if (pty->pty >= 0) |
1417 | { |
1316 | { |
1418 | if (getfd_hook) |
1317 | if (getfd_hook) |
1419 | pty.pty = (*getfd_hook) (pty.pty); |
1318 | pty->pty = (*getfd_hook) (pty->pty); |
1420 | |
1319 | |
1421 | if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) |
1320 | if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) |
1422 | rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); |
1321 | rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); |
1423 | } |
1322 | } |
1424 | } |
1323 | } |
1425 | else |
1324 | else |
1426 | #endif |
1325 | #endif |
1427 | if (!pty.get ()) |
1326 | if (!pty->get ()) |
1428 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1327 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1429 | |
1328 | |
1430 | pty.set_utf8_mode (enc_utf8); |
1329 | pty->set_utf8_mode (enc_utf8); |
1431 | |
1330 | |
1432 | /* set initial window size */ |
1331 | /* set initial window size */ |
1433 | tt_winch (); |
1332 | tt_winch (); |
1434 | |
1333 | |
1435 | int er; |
1334 | int er; |
… | |
… | |
1448 | #if ENABLE_FRILLS |
1347 | #if ENABLE_FRILLS |
1449 | if (rs[Rs_pty_fd]) |
1348 | if (rs[Rs_pty_fd]) |
1450 | return; |
1349 | return; |
1451 | #endif |
1350 | #endif |
1452 | |
1351 | |
1453 | #ifndef __QNX__ |
|
|
1454 | /* spin off the command interpreter */ |
1352 | /* spin off the command interpreter */ |
1455 | switch (cmd_pid = fork ()) |
1353 | switch (cmd_pid = fork ()) |
1456 | { |
1354 | { |
1457 | case -1: |
1355 | case -1: |
1458 | { |
1356 | { |
… | |
… | |
1460 | rxvt_fatal ("can't fork, aborting.\n"); |
1358 | rxvt_fatal ("can't fork, aborting.\n"); |
1461 | } |
1359 | } |
1462 | case 0: |
1360 | case 0: |
1463 | init_env (); |
1361 | init_env (); |
1464 | |
1362 | |
1465 | if (!pty.make_controlling_tty ()) |
1363 | if (!pty->make_controlling_tty ()) |
1466 | fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); |
1364 | fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); |
1467 | else |
1365 | else |
1468 | { |
1366 | { |
1469 | /* Reopen stdin, stdout and stderr over the tty file descriptor */ |
1367 | /* Reopen stdin, stdout and stderr over the tty file descriptor */ |
1470 | dup2 (pty.tty, STDIN_FILENO); |
1368 | dup2 (pty->tty, STDIN_FILENO); |
1471 | dup2 (pty.tty, STDOUT_FILENO); |
1369 | dup2 (pty->tty, STDOUT_FILENO); |
1472 | dup2 (pty.tty, STDERR_FILENO); |
1370 | dup2 (pty->tty, STDERR_FILENO); |
1473 | |
1371 | |
1474 | // close all our file handles that we do no longer need |
1372 | // close all our file handles that we do no longer need |
1475 | for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) |
1373 | for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) |
1476 | { |
1374 | { |
1477 | if ((*t)->pty.pty > 2) close ((*t)->pty.pty); |
1375 | if ((*t)->pty->pty > 2) close ((*t)->pty->pty); |
1478 | if ((*t)->pty.tty > 2) close ((*t)->pty.tty); |
1376 | if ((*t)->pty->tty > 2) close ((*t)->pty->tty); |
1479 | } |
1377 | } |
1480 | |
1378 | |
1481 | run_child (argv); |
1379 | run_child (argv); |
1482 | fprintf (stderr, "%s: unable to exec child.", RESNAME); |
1380 | fprintf (stderr, "%s: unable to exec child.", RESNAME); |
1483 | } |
1381 | } |
1484 | |
1382 | |
1485 | _exit (EXIT_FAILURE); |
1383 | _exit (EXIT_FAILURE); |
1486 | |
1384 | |
1487 | default: |
1385 | default: |
1488 | { |
1386 | if (!OPTION (Opt_utmpInhibit)) |
1489 | #if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) |
1387 | pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); |
1490 | int fdstdin; |
|
|
1491 | |
1388 | |
1492 | fdstdin = dup (STDIN_FILENO); |
1389 | pty->close_tty (); |
1493 | dup2 (pty.tty, STDIN_FILENO); |
|
|
1494 | #endif |
|
|
1495 | |
1390 | |
1496 | #ifdef UTMP_SUPPORT |
1391 | child_ev.start (cmd_pid); |
1497 | privileged_utmp (SAVE); |
|
|
1498 | #endif |
|
|
1499 | |
1392 | |
1500 | #if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) |
1393 | HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END)); |
1501 | |
|
|
1502 | dup2 (fdstdin, STDIN_FILENO); |
|
|
1503 | close (fdstdin); |
|
|
1504 | #endif |
|
|
1505 | } |
|
|
1506 | |
|
|
1507 | pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ |
|
|
1508 | break; |
1394 | break; |
1509 | } |
1395 | } |
1510 | #else /* __QNX__ uses qnxspawn () */ |
|
|
1511 | fchmod (pty.tty, 0622); |
|
|
1512 | fcntl (pty.tty, F_SETFD, FD_CLOEXEC); |
|
|
1513 | fcntl (pty.pty, F_SETFD, FD_CLOEXEC); |
|
|
1514 | |
|
|
1515 | if (run_child (argv) == -1) |
|
|
1516 | exit (EXIT_FAILURE); |
|
|
1517 | #endif |
|
|
1518 | } |
1396 | } |
1519 | |
1397 | |
1520 | /* ------------------------------------------------------------------------- * |
1398 | /* ------------------------------------------------------------------------- * |
1521 | * CHILD PROCESS OPERATIONS * |
1399 | * CHILD PROCESS OPERATIONS * |
1522 | * ------------------------------------------------------------------------- */ |
1400 | * ------------------------------------------------------------------------- */ |
… | |
… | |
1566 | // unblock signals (signals are blocked by iom.C |
1444 | // unblock signals (signals are blocked by iom.C |
1567 | sigset_t ss; |
1445 | sigset_t ss; |
1568 | sigemptyset (&ss); |
1446 | sigemptyset (&ss); |
1569 | sigprocmask (SIG_SETMASK, &ss, 0); |
1447 | sigprocmask (SIG_SETMASK, &ss, 0); |
1570 | |
1448 | |
1571 | #ifndef __QNX__ |
|
|
1572 | /* command interpreter path */ |
1449 | /* command interpreter path */ |
1573 | if (argv != NULL) |
1450 | if (argv != NULL) |
1574 | { |
1451 | { |
1575 | # ifdef DEBUG_CMD |
1452 | # ifdef DEBUG_CMD |
1576 | int i; |
1453 | int i; |
… | |
… | |
1602 | |
1479 | |
1603 | execlp (shell, argv0, NULL); |
1480 | execlp (shell, argv0, NULL); |
1604 | /* no error message: STDERR is closed! */ |
1481 | /* no error message: STDERR is closed! */ |
1605 | } |
1482 | } |
1606 | |
1483 | |
1607 | #else /* __QNX__ uses qnxspawn () */ |
|
|
1608 | |
|
|
1609 | char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; |
|
|
1610 | char *command = NULL, fullcommand[_MAX_PATH]; |
|
|
1611 | char **arg_v, *arg_a[2] = { NULL, NULL }; |
|
|
1612 | |
|
|
1613 | if (argv != NULL) |
|
|
1614 | { |
|
|
1615 | if (access (argv[0], X_OK) == -1) |
|
|
1616 | { |
|
|
1617 | if (strchr (argv[0], '/') == NULL) |
|
|
1618 | { |
|
|
1619 | searchenv (argv[0], "PATH", fullcommand); |
|
|
1620 | |
|
|
1621 | if (fullcommand[0] != '\0') |
|
|
1622 | command = fullcommand; |
|
|
1623 | } |
|
|
1624 | |
|
|
1625 | if (access (command, X_OK) == -1) |
|
|
1626 | return -1; |
|
|
1627 | } |
|
|
1628 | else |
|
|
1629 | command = argv[0]; |
|
|
1630 | |
|
|
1631 | arg_v = argv; |
|
|
1632 | } |
|
|
1633 | else |
|
|
1634 | { |
|
|
1635 | if ((command = getenv ("SHELL")) == NULL || *command == '\0') |
|
|
1636 | command = "/bin/sh"; |
|
|
1637 | |
|
|
1638 | arg_a[0] = my_basename (command); |
|
|
1639 | |
|
|
1640 | if (OPTION (Opt_loginShell)) |
|
|
1641 | { |
|
|
1642 | login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); |
|
|
1643 | |
|
|
1644 | login[0] = '-'; |
|
|
1645 | strcpy (&login[1], arg_a[0]); |
|
|
1646 | arg_a[0] = login; |
|
|
1647 | } |
|
|
1648 | |
|
|
1649 | arg_v = arg_a; |
|
|
1650 | } |
|
|
1651 | |
|
|
1652 | iov_a[0] = iov_a[1] = iov_a[2] = pty.tty; |
|
|
1653 | cmd_pid = qnx_spawn (0, 0, 0, -1, -1, |
|
|
1654 | _SPAWN_SETSID | _SPAWN_TCSETPGRP, |
|
|
1655 | command, arg_v, environ, iov_a, 0); |
|
|
1656 | if (login) |
|
|
1657 | free (login); |
|
|
1658 | |
|
|
1659 | pty.close_tty (); |
|
|
1660 | return pty.pty; |
|
|
1661 | #endif |
|
|
1662 | |
|
|
1663 | return -1; |
1484 | return -1; |
1664 | } |
1485 | } |
1665 | |
1486 | |
1666 | /*----------------------- end-of-file (C source) -----------------------*/ |
1487 | /*----------------------- end-of-file (C source) -----------------------*/ |