… | |
… | |
9 | * - extensive modifications |
9 | * - extensive modifications |
10 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
10 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
11 | * - extensive modifications |
11 | * - extensive modifications |
12 | * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> |
12 | * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> |
13 | * - QNX support |
13 | * - QNX support |
14 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
14 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
15 | * |
15 | * |
16 | * This program is free software; you can redistribute it and/or modify |
16 | * This program is free software; you can redistribute it and/or modify |
17 | * it under the terms of the GNU General Public License as published by |
17 | * it under the terms of the GNU General Public License as published by |
18 | * the Free Software Foundation; either version 2 of the License, or |
18 | * the Free Software Foundation; either version 2 of the License, or |
19 | * (at your option) any later version. |
19 | * (at your option) any later version. |
… | |
… | |
34 | #include "../config.h" /* NECESSARY */ |
34 | #include "../config.h" /* NECESSARY */ |
35 | #include "rxvt.h" /* NECESSARY */ |
35 | #include "rxvt.h" /* NECESSARY */ |
36 | #include "rxvtutil.h" |
36 | #include "rxvtutil.h" |
37 | #include "init.h" |
37 | #include "init.h" |
38 | |
38 | |
|
|
39 | #include <limits> |
|
|
40 | |
39 | #include <csignal> |
41 | #include <csignal> |
40 | |
42 | |
41 | const char *const def_colorName[] = |
43 | const char *const def_colorName[] = |
42 | { |
44 | { |
43 | COLOR_FOREGROUND, |
45 | COLOR_FOREGROUND, |
44 | COLOR_BACKGROUND, |
46 | COLOR_BACKGROUND, |
45 | /* low-intensity colors */ |
47 | /* low-intensity colors */ |
46 | "Black", /* 0: black (#000000) */ |
48 | "Black", /* 0: black (#000000) */ |
47 | #ifndef NO_BRIGHTCOLOR |
|
|
48 | "Red3", /* 1: red (#CD0000) */ |
49 | "Red3", /* 1: red (#CD0000) */ |
49 | "Green3", /* 2: green (#00CD00) */ |
50 | "Green3", /* 2: green (#00CD00) */ |
50 | "Yellow3", /* 3: yellow (#CDCD00) */ |
51 | "Yellow3", /* 3: yellow (#CDCD00) */ |
51 | "Blue3", /* 4: blue (#0000CD) */ |
52 | "Blue3", /* 4: blue (#0000CD) */ |
52 | "Magenta3", /* 5: magenta (#CD00CD) */ |
53 | "Magenta3", /* 5: magenta (#CD00CD) */ |
… | |
… | |
60 | # ifdef XTERM_COLORS |
61 | # ifdef XTERM_COLORS |
61 | "Grey30", /* 8: bright black (#4D4D4D) */ |
62 | "Grey30", /* 8: bright black (#4D4D4D) */ |
62 | # else |
63 | # else |
63 | "Grey25", /* 8: bright black (#404040) */ |
64 | "Grey25", /* 8: bright black (#404040) */ |
64 | # endif |
65 | # endif |
65 | #endif /* NO_BRIGHTCOLOR */ |
|
|
66 | "Red", /* 1/9: bright red (#FF0000) */ |
66 | "Red", /* 1/9: bright red (#FF0000) */ |
67 | "Green", /* 2/10: bright green (#00FF00) */ |
67 | "Green", /* 2/10: bright green (#00FF00) */ |
68 | "Yellow", /* 3/11: bright yellow (#FFFF00) */ |
68 | "Yellow", /* 3/11: bright yellow (#FFFF00) */ |
69 | "Blue", /* 4/12: bright blue (#0000FF) */ |
69 | "Blue", /* 4/12: bright blue (#0000FF) */ |
70 | "Magenta", /* 5/13: bright magenta (#FF00FF) */ |
70 | "Magenta", /* 5/13: bright magenta (#FF00FF) */ |
… | |
… | |
169 | COLOR_SCROLLTROUGH, |
169 | COLOR_SCROLLTROUGH, |
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 |
|
|
175 | "black", |
|
|
176 | #endif |
174 | }; |
177 | }; |
175 | |
178 | |
176 | const char *const xa_names[] = |
179 | const char *const xa_names[] = |
177 | { |
180 | { |
178 | "TEXT", |
181 | "TEXT", |
… | |
… | |
185 | "INCR", |
188 | "INCR", |
186 | "WM_PROTOCOLS", |
189 | "WM_PROTOCOLS", |
187 | "WM_DELETE_WINDOW", |
190 | "WM_DELETE_WINDOW", |
188 | "CLIPBOARD", |
191 | "CLIPBOARD", |
189 | #if ENABLE_FRILLS |
192 | #if ENABLE_FRILLS |
|
|
193 | "_MOTIF_WM_HINTS", |
|
|
194 | #endif |
|
|
195 | #if ENABLE_EWMH |
190 | "_NET_WM_PID", |
196 | "_NET_WM_PID", |
191 | "_MOTIF_WM_HINTS", |
|
|
192 | "_NET_WM_NAME", |
197 | "_NET_WM_NAME", |
193 | "_NET_WM_ICON_NAME", |
198 | "_NET_WM_ICON_NAME", |
|
|
199 | "_NET_WM_PING", |
194 | #endif |
200 | #endif |
195 | #if USE_XIM |
201 | #if USE_XIM |
196 | "WM_LOCALE_NAME", |
202 | "WM_LOCALE_NAME", |
197 | #endif |
203 | #endif |
198 | #ifdef TRANSPARENT |
204 | #ifdef TRANSPARENT |
… | |
… | |
203 | "DndProtocol", |
209 | "DndProtocol", |
204 | "DndSelection", |
210 | "DndSelection", |
205 | #endif |
211 | #endif |
206 | #if ENABLE_XEMBED |
212 | #if ENABLE_XEMBED |
207 | "_XEMBED", |
213 | "_XEMBED", |
|
|
214 | "_XEMBED_INFO", |
208 | #endif |
215 | #endif |
209 | }; |
216 | }; |
210 | |
217 | |
211 | bool |
218 | bool |
212 | rxvt_term::init_vars () |
219 | rxvt_term::init_vars () |
213 | { |
220 | { |
214 | sw_term.start (SIGTERM); |
|
|
215 | sw_int.start (SIGINT); |
|
|
216 | |
|
|
217 | pix_colors_focused = new rxvt_color [TOTAL_COLORS]; |
221 | pix_colors_focused = new rxvt_color [TOTAL_COLORS]; |
218 | #ifdef OFF_FOCUS_FADING |
222 | #ifdef OFF_FOCUS_FADING |
219 | pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; |
223 | pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; |
220 | #endif |
224 | #endif |
221 | pix_colors = pix_colors_focused; |
225 | pix_colors = pix_colors_focused; |
222 | |
226 | |
223 | if (pix_colors == NULL) |
227 | if (pix_colors == NULL) |
224 | return false; |
228 | return false; |
225 | |
229 | |
226 | #if defined(XPM_BACKGROUND) || defined(TRANSPARENT) |
230 | #if defined(XPM_BACKGROUND) || defined(TRANSPARENT) |
227 | TermWin.pixmap = None; |
231 | pixmap = None; |
228 | #endif |
232 | #endif |
229 | |
233 | |
230 | MEvent.time = CurrentTime; |
234 | MEvent.time = CurrentTime; |
231 | MEvent.button = AnyButton; |
235 | MEvent.button = AnyButton; |
232 | options = DEFAULT_OPTIONS; |
236 | options = DEFAULT_OPTIONS; |
233 | want_refresh = 1; |
237 | want_refresh = 1; |
234 | priv_modes = SavedModes = PrivMode_Default; |
238 | priv_modes = SavedModes = PrivMode_Default; |
235 | TermWin.focus = 0; |
239 | focus = 0; |
236 | TermWin.ncol = 80; |
240 | ncol = 80; |
237 | TermWin.nrow = 24; |
241 | nrow = 24; |
238 | TermWin.int_bwidth = INTERNALBORDERWIDTH; |
242 | int_bwidth = INTERNALBORDERWIDTH; |
239 | TermWin.ext_bwidth = EXTERNALBORDERWIDTH; |
243 | ext_bwidth = EXTERNALBORDERWIDTH; |
240 | TermWin.lineSpace = LINESPACE; |
244 | lineSpace = LINESPACE; |
241 | TermWin.saveLines = SAVELINES; |
245 | saveLines = SAVELINES; |
242 | numpix_colors = TOTAL_COLORS; |
246 | numpix_colors = TOTAL_COLORS; |
243 | |
247 | |
244 | refresh_limit = 1; |
248 | refresh_limit = 1; |
245 | refresh_type = SLOW_REFRESH; |
249 | refresh_type = SLOW_REFRESH; |
246 | prev_nrow = prev_ncol = 0; |
250 | prev_nrow = prev_ncol = 0; |
… | |
… | |
251 | bgPixmap.x = bgPixmap.y = 50; |
255 | bgPixmap.x = bgPixmap.y = 50; |
252 | bgPixmap.pixmap = None; |
256 | bgPixmap.pixmap = None; |
253 | #endif |
257 | #endif |
254 | |
258 | |
255 | last_bot = last_state = -1; |
259 | last_bot = last_state = -1; |
256 | |
|
|
257 | #ifdef MENUBAR |
|
|
258 | menu_readonly = 1; |
|
|
259 | # if ! (MENUBAR_MAX > 1) |
|
|
260 | CurrentBar = &BarList; |
|
|
261 | # endif /* (MENUBAR_MAX > 1) */ |
|
|
262 | #endif |
|
|
263 | |
260 | |
264 | return true; |
261 | return true; |
265 | } |
262 | } |
266 | |
263 | |
267 | void |
264 | void |
… | |
… | |
335 | rs[Rs_name] = rxvt_r_basename (argv[0]); |
332 | rs[Rs_name] = rxvt_r_basename (argv[0]); |
336 | |
333 | |
337 | /* |
334 | /* |
338 | * Open display, get options/resources and create the window |
335 | * Open display, get options/resources and create the window |
339 | */ |
336 | */ |
|
|
337 | |
340 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
338 | if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) |
341 | rs[Rs_display_name] = ":0"; |
339 | rs[Rs_display_name] = ":0"; |
342 | |
340 | |
343 | get_options (r_argc, r_argv); |
341 | get_options (r_argc, r_argv); |
344 | |
342 | |
345 | #ifdef LOCAL_X_IS_UNIX |
|
|
346 | if (rs[Rs_display_name][0] == ':') |
|
|
347 | { |
|
|
348 | val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); |
|
|
349 | strcpy (val, "unix"); |
|
|
350 | strcat (val, rs[Rs_display_name]); |
|
|
351 | display = displays.get (val); |
|
|
352 | free (val); |
|
|
353 | } |
|
|
354 | #endif |
|
|
355 | |
|
|
356 | if (!display |
|
|
357 | && ! (display = displays.get (rs[Rs_display_name]))) |
343 | if (!(display = displays.get (rs[Rs_display_name]))) |
358 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
344 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
359 | |
345 | |
360 | extract_resources (); |
346 | extract_resources (); |
|
|
347 | |
361 | free (r_argv); |
348 | free (r_argv); |
362 | |
349 | |
363 | /* |
350 | /* |
364 | * set any defaults not already set |
351 | * set any defaults not already set |
365 | */ |
352 | */ |
… | |
… | |
377 | if (!rs[Rs_iconName]) |
364 | if (!rs[Rs_iconName]) |
378 | rs[Rs_iconName] = rs[Rs_name]; |
365 | rs[Rs_iconName] = rs[Rs_name]; |
379 | } |
366 | } |
380 | |
367 | |
381 | if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) |
368 | if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) |
382 | TermWin.saveLines = BOUND_POSITIVE_INT16 (i); |
369 | saveLines = min (i, MAX_SAVELINES); |
383 | |
370 | |
384 | #if ENABLE_FRILLS |
371 | #if ENABLE_FRILLS |
385 | if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) |
372 | if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) |
386 | TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ |
373 | int_bwidth = min (i, std::numeric_limits<int16_t>::max ()); |
|
|
374 | |
387 | if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) |
375 | if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) |
388 | TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ |
376 | ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); |
|
|
377 | |
389 | if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) |
378 | if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) |
390 | TermWin.lineSpace = min (i, 100); /* arbitrary limit */ |
379 | lineSpace = min (i, std::numeric_limits<int16_t>::max ()); |
391 | #endif |
380 | #endif |
392 | |
381 | |
393 | #ifdef POINTER_BLANK |
382 | #ifdef POINTER_BLANK |
394 | if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) |
383 | if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) |
395 | pointerBlankDelay = i; |
384 | pointerBlankDelay = i; |
396 | else |
385 | else |
397 | pointerBlankDelay = 2; |
386 | pointerBlankDelay = 2; |
398 | #endif |
387 | #endif |
399 | |
388 | |
400 | /* no point having a scrollbar without having any scrollback! */ |
389 | /* no point having a scrollbar without having any scrollback! */ |
401 | if (!TermWin.saveLines) |
390 | if (!saveLines) |
402 | options &= ~Opt_scrollBar; |
391 | set_option (Opt_scrollBar, 0); |
403 | |
392 | |
404 | #ifdef PRINTPIPE |
393 | #ifdef PRINTPIPE |
405 | if (!rs[Rs_print_pipe]) |
394 | if (!rs[Rs_print_pipe]) |
406 | rs[Rs_print_pipe] = PRINTPIPE; |
395 | rs[Rs_print_pipe] = PRINTPIPE; |
407 | #endif |
396 | #endif |
… | |
… | |
450 | setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); |
439 | setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); |
451 | #endif |
440 | #endif |
452 | |
441 | |
453 | #ifdef XTERM_REVERSE_VIDEO |
442 | #ifdef XTERM_REVERSE_VIDEO |
454 | /* this is how xterm implements reverseVideo */ |
443 | /* this is how xterm implements reverseVideo */ |
455 | if (options & Opt_reverseVideo) |
444 | if (OPTION (Opt_reverseVideo)) |
456 | { |
445 | { |
457 | if (!rs[Rs_color + Color_fg]) |
446 | if (!rs[Rs_color + Color_fg]) |
458 | rs[Rs_color + Color_fg] = def_colorName[Color_bg]; |
447 | rs[Rs_color + Color_fg] = def_colorName[Color_bg]; |
459 | if (!rs[Rs_color + Color_bg]) |
448 | if (!rs[Rs_color + Color_bg]) |
460 | rs[Rs_color + Color_bg] = def_colorName[Color_fg]; |
449 | rs[Rs_color + Color_bg] = def_colorName[Color_fg]; |
… | |
… | |
465 | if (!rs[Rs_color + i]) |
454 | if (!rs[Rs_color + i]) |
466 | rs[Rs_color + i] = def_colorName[i]; |
455 | rs[Rs_color + i] = def_colorName[i]; |
467 | |
456 | |
468 | #ifndef XTERM_REVERSE_VIDEO |
457 | #ifndef XTERM_REVERSE_VIDEO |
469 | /* this is how we implement reverseVideo */ |
458 | /* this is how we implement reverseVideo */ |
470 | if (options & Opt_reverseVideo) |
459 | if (OPTION (Opt_reverseVideo)) |
471 | SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); |
460 | ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); |
472 | #endif |
461 | #endif |
473 | |
462 | |
474 | /* convenient aliases for setting fg/bg to colors */ |
463 | /* convenient aliases for setting fg/bg to colors */ |
475 | color_aliases (Color_fg); |
464 | color_aliases (Color_fg); |
476 | color_aliases (Color_bg); |
465 | color_aliases (Color_bg); |
… | |
… | |
526 | env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); |
515 | env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); |
527 | |
516 | |
528 | sprintf (env_display, "DISPLAY=%s", val); |
517 | sprintf (env_display, "DISPLAY=%s", val); |
529 | |
518 | |
530 | /* avoiding the math library: |
519 | /* avoiding the math library: |
531 | * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ |
520 | * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */ |
532 | for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) |
521 | for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++) |
533 | ; |
522 | ; |
534 | MAX_IT (i, 1); |
523 | max_it (i, 1); |
535 | env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); |
524 | env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); |
536 | |
525 | |
537 | sprintf (env_windowid, "WINDOWID=%u", |
526 | sprintf (env_windowid, "WINDOWID=%u", |
538 | (unsigned int)TermWin.parent[0]); |
527 | (unsigned int)parent[0]); |
539 | |
528 | |
540 | /* add entries to the environment: |
529 | /* add entries to the environment: |
541 | * @ DISPLAY: in case we started with -display |
530 | * @ DISPLAY: in case we started with -display |
542 | * @ WINDOWID: X window id number of the window |
531 | * @ WINDOWID: X window id number of the window |
543 | * @ COLORTERM: terminal sub-name and also indicates its color |
532 | * @ COLORTERM: terminal sub-name and also indicates its color |
… | |
… | |
582 | * This should support all European type languages. |
571 | * This should support all European type languages. |
583 | */ |
572 | */ |
584 | void |
573 | void |
585 | rxvt_term::set_locale (const char *locale) |
574 | rxvt_term::set_locale (const char *locale) |
586 | { |
575 | { |
|
|
576 | set_environ (envv); |
|
|
577 | |
587 | #if HAVE_XSETLOCALE || HAVE_SETLOCALE |
578 | #if HAVE_XSETLOCALE || HAVE_SETLOCALE |
588 | free (this->locale); |
579 | free (this->locale); |
589 | this->locale = setlocale (LC_CTYPE, locale); |
580 | this->locale = setlocale (LC_CTYPE, locale); |
590 | |
581 | |
591 | if (!this->locale) |
582 | if (!this->locale) |
592 | { |
583 | { |
593 | if (*locale) |
584 | if (*locale) |
594 | { |
585 | { |
595 | rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); |
586 | rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale); |
596 | setlocale (LC_CTYPE, ""); |
587 | setlocale (LC_CTYPE, "C"); |
597 | } |
588 | } |
598 | else |
589 | else |
599 | rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); |
590 | rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); |
600 | |
591 | |
601 | this->locale = ""; |
592 | this->locale = "C"; |
602 | } |
593 | } |
603 | |
594 | |
604 | |
595 | |
605 | this->locale = rxvt_strdup (this->locale); |
596 | this->locale = rxvt_strdup (this->locale); |
606 | SET_LOCALE (this->locale); |
597 | SET_LOCALE (this->locale); |
… | |
… | |
621 | } |
612 | } |
622 | |
613 | |
623 | void |
614 | void |
624 | rxvt_term::init_xlocale () |
615 | rxvt_term::init_xlocale () |
625 | { |
616 | { |
|
|
617 | set_environ (envv); |
|
|
618 | |
626 | #ifdef USE_XIM |
619 | #ifdef USE_XIM |
627 | if (!locale) |
620 | if (!locale) |
628 | rxvt_warn ("setting locale failed, working without locale support.\n"); |
621 | rxvt_warn ("setting locale failed, working without locale support.\n"); |
629 | else |
622 | else |
630 | { |
623 | { |
… | |
… | |
652 | * Initialize the command connection. |
645 | * Initialize the command connection. |
653 | * This should be called after the X server connection is established. |
646 | * This should be called after the X server connection is established. |
654 | */ |
647 | */ |
655 | |
648 | |
656 | #ifdef META8_OPTION |
649 | #ifdef META8_OPTION |
657 | meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); |
650 | meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; |
658 | #endif |
651 | #endif |
659 | |
652 | |
660 | get_ourmods (); |
653 | get_ourmods (); |
661 | |
654 | |
662 | if (!(options & Opt_scrollTtyOutput)) |
655 | if (!OPTION (Opt_scrollTtyOutput)) |
663 | priv_modes |= PrivMode_TtyOutputInh; |
656 | priv_modes |= PrivMode_TtyOutputInh; |
664 | if (options & Opt_scrollTtyKeypress) |
657 | if (OPTION (Opt_scrollTtyKeypress)) |
665 | priv_modes |= PrivMode_Keypress; |
658 | priv_modes |= PrivMode_Keypress; |
666 | if (!(options & Opt_jumpScroll)) |
659 | if (!OPTION (Opt_jumpScroll)) |
667 | priv_modes |= PrivMode_smoothScroll; |
660 | priv_modes |= PrivMode_smoothScroll; |
668 | |
661 | |
669 | #ifndef NO_BACKSPACE_KEY |
662 | #ifndef NO_BACKSPACE_KEY |
670 | if (strcmp (key_backspace, "DEC") == 0) |
663 | if (strcmp (key_backspace, "DEC") == 0) |
671 | priv_modes |= PrivMode_HaveBackSpace; |
664 | priv_modes |= PrivMode_HaveBackSpace; |
672 | #endif |
665 | #endif |
673 | |
666 | |
674 | /* add value for scrollBar */ |
667 | /* add value for scrollBar */ |
675 | if (scrollbar_visible ()) |
668 | if (scrollBar.state) |
676 | { |
669 | { |
677 | priv_modes |= PrivMode_scrollBar; |
670 | priv_modes |= PrivMode_scrollBar; |
678 | SavedModes |= PrivMode_scrollBar; |
671 | SavedModes |= PrivMode_scrollBar; |
679 | } |
672 | } |
680 | |
|
|
681 | if (menubar_visible ()) |
|
|
682 | { |
|
|
683 | priv_modes |= PrivMode_menuBar; |
|
|
684 | SavedModes |= PrivMode_menuBar; |
|
|
685 | } |
|
|
686 | |
|
|
687 | #ifdef CURSOR_BLINK |
|
|
688 | if (options & Opt_cursorBlink) |
|
|
689 | (void)gettimeofday (&lastcursorchange, NULL); |
|
|
690 | #endif |
|
|
691 | |
673 | |
692 | run_command (argv); |
674 | run_command (argv); |
693 | } |
675 | } |
694 | |
676 | |
695 | /*----------------------------------------------------------------------*/ |
677 | /*----------------------------------------------------------------------*/ |
… | |
… | |
710 | continue; |
692 | continue; |
711 | |
693 | |
712 | if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) |
694 | if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) |
713 | { |
695 | { |
714 | #ifndef XTERM_REVERSE_VIDEO |
696 | #ifndef XTERM_REVERSE_VIDEO |
715 | if (i < 2 && (options & Opt_reverseVideo)) |
697 | if (i < 2 && OPTION (Opt_reverseVideo)) |
716 | rs[Rs_color + i] = def_colorName[!i]; |
698 | rs[Rs_color + i] = def_colorName[!i]; |
717 | else |
699 | else |
718 | #endif |
700 | #endif |
719 | rs[Rs_color + i] = def_colorName[i]; |
701 | rs[Rs_color + i] = def_colorName[i]; |
720 | |
702 | |
… | |
… | |
745 | } |
727 | } |
746 | } |
728 | } |
747 | } |
729 | } |
748 | |
730 | |
749 | pix_colors[i] = xcol; |
731 | pix_colors[i] = xcol; |
|
|
732 | SET_PIXCOLOR (i); |
|
|
733 | } |
|
|
734 | |
750 | #ifdef OFF_FOCUS_FADING |
735 | #ifdef OFF_FOCUS_FADING |
751 | if (rs[Rs_fade]) |
736 | if (rs[Rs_fade]) |
|
|
737 | for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) |
752 | pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); |
738 | pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
753 | #endif |
739 | #endif |
754 | SET_PIXCOLOR (i); |
|
|
755 | } |
|
|
756 | |
740 | |
757 | if (display->depth <= 2) |
741 | if (display->depth <= 2) |
758 | { |
742 | { |
759 | if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; |
743 | if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; |
760 | if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; |
744 | if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; |
761 | if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; |
745 | if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; |
762 | } |
746 | } |
763 | |
747 | |
764 | /* |
748 | /* |
765 | * get scrollBar/menuBar shadow colors |
749 | * get scrollBar shadow colors |
766 | * |
750 | * |
767 | * The calculations of topShadow/bottomShadow values are adapted |
751 | * The calculations of topShadow/bottomShadow values are adapted |
768 | * from the fvwm window manager. |
752 | * from the fvwm window manager. |
769 | */ |
753 | */ |
770 | #ifdef KEEP_SCROLLCOLOR |
754 | #ifdef KEEP_SCROLLCOLOR |
771 | |
755 | |
772 | if (display->depth <= 2) |
756 | if (display->depth <= 2) |
|
|
757 | { |
773 | { /* Monochrome */ |
758 | /* Monochrome */ |
774 | pix_colors[Color_scroll] = pix_colors[Color_fg]; |
759 | pix_colors[Color_scroll] = pix_colors[Color_fg]; |
775 | pix_colors[Color_topShadow] = pix_colors[Color_bg]; |
760 | pix_colors[Color_topShadow] = pix_colors[Color_bg]; |
776 | pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; |
761 | pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; |
777 | } |
762 | } |
778 | else |
763 | else |
… | |
… | |
814 | int i = atoi (rs[Rs_color + idx]); |
799 | int i = atoi (rs[Rs_color + idx]); |
815 | |
800 | |
816 | if (i >= 8 && i <= 15) |
801 | if (i >= 8 && i <= 15) |
817 | { /* bright colors */ |
802 | { /* bright colors */ |
818 | i -= 8; |
803 | i -= 8; |
819 | #ifndef NO_BRIGHTCOLOR |
|
|
820 | rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; |
804 | rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; |
821 | return; |
805 | return; |
822 | #endif |
|
|
823 | } |
806 | } |
824 | |
807 | |
825 | if (i >= 0 && i <= 7) /* normal colors */ |
808 | if (i >= 0 && i <= 7) /* normal colors */ |
826 | rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; |
809 | rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; |
827 | } |
810 | } |
… | |
… | |
926 | #if ENABLE_FRILLS |
909 | #if ENABLE_FRILLS |
927 | Atom prop = None; |
910 | Atom prop = None; |
928 | MWMHints mwmhints; |
911 | MWMHints mwmhints; |
929 | #endif |
912 | #endif |
930 | XGCValues gcvalue; |
913 | XGCValues gcvalue; |
931 | long vt_emask; |
|
|
932 | XSetWindowAttributes attributes; |
914 | XSetWindowAttributes attributes; |
933 | XWindowAttributes gattr; |
915 | XWindowAttributes gattr; |
934 | Window top; |
916 | Window top, parent; |
935 | dDisp; |
917 | dDisp; |
936 | |
918 | |
937 | #ifdef USING_W11LIB |
919 | #ifdef USING_W11LIB |
938 | /* enable W11 callbacks */ |
920 | /* enable W11 callbacks */ |
939 | W11AddEventHandler (disp, rxvt_W11_process_x_event); |
921 | W11AddEventHandler (disp, rxvt_W11_process_x_event); |
940 | #endif |
922 | #endif |
941 | |
923 | |
942 | assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); |
924 | assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); |
943 | XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); |
925 | XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); |
944 | |
926 | |
945 | if (options & Opt_transparent) |
927 | if (OPTION (Opt_transparent)) |
946 | { |
928 | { |
947 | XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); |
929 | XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); |
948 | display->depth = gattr.depth; // doh //TODO, per-term not per-display? |
930 | display->depth = gattr.depth; // doh //TODO, per-term not per-display? |
949 | } |
931 | } |
950 | |
932 | |
|
|
933 | /* grab colors before netscape does */ |
|
|
934 | Get_Colours (); |
|
|
935 | |
|
|
936 | if (!set_fonts ()) |
|
|
937 | rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); |
|
|
938 | |
|
|
939 | parent = DefaultRootWindow (disp); |
|
|
940 | |
|
|
941 | attributes.override_redirect = !!OPTION (Opt_override_redirect); |
|
|
942 | |
951 | #if ENABLE_FRILLS |
943 | #if ENABLE_FRILLS |
952 | if (options & Opt_borderLess) |
944 | if (OPTION (Opt_borderLess)) |
953 | { |
945 | { |
954 | prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); |
946 | prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); |
955 | |
947 | |
956 | if (prop == None) |
948 | if (prop == None) |
957 | { |
949 | { |
958 | /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ |
950 | /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ |
959 | #ifdef PREFER_24BIT |
|
|
960 | attributes.override_redirect = TRUE; |
951 | attributes.override_redirect = TRUE; |
961 | #endif |
|
|
962 | mwmhints.flags = 0; |
952 | mwmhints.flags = 0; |
963 | } |
953 | } |
964 | else |
954 | else |
965 | { |
955 | { |
966 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
956 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
967 | mwmhints.decorations = 0; |
957 | mwmhints.decorations = 0; |
968 | } |
958 | } |
969 | } |
959 | } |
970 | else |
960 | else |
971 | { |
|
|
972 | mwmhints.flags = 0; |
961 | mwmhints.flags = 0; |
973 | } |
|
|
974 | #endif |
962 | #endif |
975 | |
|
|
976 | /* grab colors before netscape does */ |
|
|
977 | Get_Colours (); |
|
|
978 | |
|
|
979 | if (!set_fonts ()) |
|
|
980 | rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); |
|
|
981 | |
963 | |
982 | #if ENABLE_XEMBED |
964 | #if ENABLE_XEMBED |
983 | if (rs[Rs_embed]) |
965 | if (rs[Rs_embed]) |
984 | { |
966 | { |
985 | XWindowAttributes wattr; |
967 | XWindowAttributes wattr; |
986 | |
968 | |
987 | top = strtol (rs[Rs_embed], 0, 0); |
969 | parent = strtol (rs[Rs_embed], 0, 0); |
988 | |
970 | |
989 | if (!XGetWindowAttributes (disp, top, &wattr)) |
971 | if (!XGetWindowAttributes (disp, parent, &wattr)) |
990 | rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); |
972 | rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); |
991 | |
973 | |
992 | window_calc (wattr.width, wattr.height); |
974 | window_calc (wattr.width, wattr.height); |
993 | |
|
|
994 | #if 0 |
|
|
995 | if (wattr.map_state == IsViewable) |
|
|
996 | { |
|
|
997 | TermWin.mapped = 1; |
|
|
998 | refresh_type = FAST_REFRESH; |
|
|
999 | XClearWindow (disp, top); |
|
|
1000 | // TODO: make XMapNotify-event-code a function and call it |
|
|
1001 | // TODO: how can I detect visibility without unmap/map? |
|
|
1002 | // TODO: focusin etc. |
|
|
1003 | } |
|
|
1004 | #else |
|
|
1005 | // it's easiest just to unmap/map to get all state correctly set-up |
|
|
1006 | XUnmapWindow (disp, top); |
|
|
1007 | #endif |
|
|
1008 | } |
|
|
1009 | else |
|
|
1010 | #endif |
|
|
1011 | { |
975 | } |
|
|
976 | #endif |
|
|
977 | |
1012 | window_calc (0, 0); |
978 | window_calc (0, 0); |
1013 | |
979 | |
1014 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
980 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
1015 | #ifdef PREFER_24BIT |
|
|
1016 | attributes.background_pixel = pix_colors_focused[Color_border]; |
981 | attributes.background_pixel = pix_colors_focused[Color_border]; |
1017 | attributes.border_pixel = pix_colors_focused[Color_border]; |
982 | attributes.border_pixel = pix_colors_focused[Color_border]; |
1018 | attributes.colormap = display->cmap; |
983 | attributes.colormap = display->cmap; |
1019 | top = XCreateWindow (disp, DefaultRootWindow (disp), |
984 | top = XCreateWindow (disp, parent, |
1020 | szHint.x, szHint.y, |
985 | szHint.x, szHint.y, |
1021 | szHint.width, szHint.height, |
986 | szHint.width, szHint.height, |
1022 | TermWin.ext_bwidth, |
987 | ext_bwidth, |
1023 | display->depth, InputOutput, |
988 | display->depth, InputOutput, |
1024 | display->visual, |
989 | display->visual, |
1025 | CWColormap | CWBackPixel | CWBorderPixel, &attributes); |
990 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
1026 | #else |
991 | &attributes); |
1027 | top = XCreateSimpleWindow (disp, DefaultRootWindow (disp), |
|
|
1028 | szHint.x, szHint.y, |
|
|
1029 | szHint.width, szHint.height, |
|
|
1030 | TermWin.ext_bwidth, |
|
|
1031 | pix_colors_focused[Color_border], |
|
|
1032 | pix_colors_focused[Color_border]); |
|
|
1033 | #endif |
|
|
1034 | } |
|
|
1035 | |
992 | |
1036 | TermWin.parent[0] = top; |
993 | this->parent[0] = top; |
1037 | |
994 | |
1038 | old_width = szHint.width; |
995 | old_width = szHint.width; |
1039 | old_height = szHint.height; |
996 | old_height = szHint.height; |
1040 | |
997 | |
1041 | process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); |
998 | process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); |
… | |
… | |
1044 | classHint.res_name = (char *)rs[Rs_name]; |
1001 | classHint.res_name = (char *)rs[Rs_name]; |
1045 | classHint.res_class = (char *)RESCLASS; |
1002 | classHint.res_class = (char *)RESCLASS; |
1046 | |
1003 | |
1047 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
1004 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
1048 | wmHint.input = True; |
1005 | wmHint.input = True; |
1049 | wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; |
1006 | wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; |
1050 | wmHint.window_group = top; |
1007 | wmHint.window_group = top; |
1051 | |
1008 | |
1052 | XSetWMProperties (disp, top, NULL, NULL, |
1009 | XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, |
1053 | (char **)argv, argc, &szHint, &wmHint, &classHint); |
1010 | &szHint, &wmHint, &classHint); |
1054 | |
1011 | |
1055 | /* Enable delete window protocol */ |
1012 | Atom protocols[] = { |
1056 | XSetWMProtocols (disp, top, &xa[XA_WM_DELETE_WINDOW], 1); |
1013 | xa[XA_WM_DELETE_WINDOW], |
|
|
1014 | #if ENABLE_EWMH |
|
|
1015 | xa[XA_NET_WM_PING], |
|
|
1016 | #endif |
|
|
1017 | }; |
|
|
1018 | |
|
|
1019 | XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
1057 | |
1020 | |
1058 | #if ENABLE_FRILLS |
1021 | #if ENABLE_FRILLS |
|
|
1022 | if (rs[Rs_transient_for]) |
|
|
1023 | XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
|
|
1024 | #endif |
|
|
1025 | |
|
|
1026 | #if ENABLE_EWMH |
1059 | long pid = getpid (); |
1027 | long pid = getpid (); |
1060 | |
1028 | |
1061 | XChangeProperty (disp, top, |
1029 | XChangeProperty (disp, top, |
1062 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
1030 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
1063 | PropModeReplace, (unsigned char *)&pid, 1); |
1031 | PropModeReplace, (unsigned char *)&pid, 1); |
|
|
1032 | |
|
|
1033 | // _NET_WM_WINDOW_TYPE is NORMAL, which is the default |
1064 | #endif |
1034 | #endif |
1065 | |
1035 | |
1066 | XSelectInput (disp, top, |
1036 | XSelectInput (disp, top, |
1067 | KeyPressMask |
1037 | KeyPressMask |
1068 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
1038 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
… | |
… | |
1080 | #endif |
1050 | #endif |
1081 | |
1051 | |
1082 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1052 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1083 | TermWin_cursor = XCreateFontCursor (disp, XC_xterm); |
1053 | TermWin_cursor = XCreateFontCursor (disp, XC_xterm); |
1084 | |
1054 | |
1085 | #if defined(HAVE_SCROLLBARS) || defined(MENUBAR) |
1055 | #ifdef HAVE_SCROLLBARS |
1086 | /* cursor (menuBar/scrollBar): Black-on-White */ |
1056 | /* cursor scrollBar: Black-on-White */ |
1087 | leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); |
1057 | leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); |
1088 | #endif |
1058 | #endif |
1089 | |
1059 | |
1090 | /* the vt window */ |
1060 | /* the vt window */ |
1091 | TermWin.vt = XCreateSimpleWindow (disp, top, |
1061 | vt = XCreateSimpleWindow (disp, top, |
1092 | window_vt_x, |
1062 | window_vt_x, |
1093 | window_vt_y, |
1063 | window_vt_y, |
1094 | TermWin_TotalWidth (), |
1064 | width, |
1095 | TermWin_TotalHeight (), |
1065 | height, |
1096 | 0, |
1066 | 0, |
1097 | pix_colors_focused[Color_fg], |
1067 | pix_colors_focused[Color_fg], |
1098 | pix_colors_focused[Color_bg]); |
1068 | pix_colors_focused[Color_bg]); |
1099 | #ifdef DEBUG_X |
1069 | #ifdef DEBUG_X |
1100 | XStoreName (disp, TermWin.vt, "vt window"); |
1070 | XStoreName (disp, vt, "vt window"); |
1101 | #endif |
1071 | #endif |
1102 | |
1072 | |
1103 | attributes.bit_gravity = NorthWestGravity; |
1073 | attributes.bit_gravity = NorthWestGravity; |
1104 | XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); |
1074 | XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); |
1105 | |
1075 | |
1106 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1076 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1107 | |
1077 | |
1108 | #ifdef POINTER_BLANK |
1078 | if (OPTION (Opt_pointerBlank)) |
1109 | if (options & Opt_pointerBlank) |
|
|
1110 | vt_emask |= PointerMotionMask; |
1079 | vt_emask |= PointerMotionMask; |
1111 | else |
1080 | else |
1112 | #endif |
|
|
1113 | vt_emask |= Button1MotionMask | Button3MotionMask; |
1081 | vt_emask |= Button1MotionMask | Button3MotionMask; |
1114 | |
1082 | |
1115 | XSelectInput (disp, TermWin.vt, vt_emask); |
1083 | vt_select_input (); |
|
|
1084 | |
1116 | vt_ev.start (display, TermWin.vt); |
1085 | vt_ev.start (display, vt); |
1117 | |
|
|
1118 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
|
|
1119 | if (menuBar_height ()) |
|
|
1120 | { |
|
|
1121 | menuBar.win = XCreateSimpleWindow (disp, top, |
|
|
1122 | window_vt_x, 0, |
|
|
1123 | TermWin_TotalWidth (), |
|
|
1124 | menuBar_TotalHeight (), |
|
|
1125 | 0, |
|
|
1126 | pix_colors_focused[Color_fg], |
|
|
1127 | pix_colors_focused[Color_scroll]); |
|
|
1128 | |
|
|
1129 | #ifdef DEBUG_X |
|
|
1130 | XStoreName (disp, menuBar.win, "menubar"); |
|
|
1131 | #endif |
|
|
1132 | |
|
|
1133 | menuBar.drawable = new rxvt_drawable (display, menuBar.win); |
|
|
1134 | |
|
|
1135 | XDefineCursor (disp, menuBar.win, |
|
|
1136 | XCreateFontCursor (disp, XC_left_ptr)); |
|
|
1137 | |
|
|
1138 | XSelectInput (disp, menuBar.win, |
|
|
1139 | (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask)); |
|
|
1140 | menubar_ev.start (display, menuBar.win); |
|
|
1141 | } |
|
|
1142 | #endif |
|
|
1143 | |
1086 | |
1144 | #ifdef XPM_BACKGROUND |
1087 | #ifdef XPM_BACKGROUND |
1145 | if (rs[Rs_backgroundPixmap] != NULL |
1088 | if (rs[Rs_backgroundPixmap] != NULL |
1146 | && ! (options & Opt_transparent)) |
1089 | && ! OPTION (Opt_transparent)) |
1147 | { |
1090 | { |
1148 | const char *p = rs[Rs_backgroundPixmap]; |
1091 | const char *p = rs[Rs_backgroundPixmap]; |
1149 | |
1092 | |
1150 | if ((p = strchr (p, ';')) != NULL) |
1093 | if ((p = strchr (p, ';')) != NULL) |
1151 | { |
1094 | { |
… | |
… | |
1160 | |
1103 | |
1161 | /* graphics context for the vt window */ |
1104 | /* graphics context for the vt window */ |
1162 | gcvalue.foreground = pix_colors[Color_fg]; |
1105 | gcvalue.foreground = pix_colors[Color_fg]; |
1163 | gcvalue.background = pix_colors[Color_bg]; |
1106 | gcvalue.background = pix_colors[Color_bg]; |
1164 | gcvalue.graphics_exposures = 1; |
1107 | gcvalue.graphics_exposures = 1; |
1165 | TermWin.gc = XCreateGC (disp, TermWin.vt, |
1108 | gc = XCreateGC (disp, vt, |
1166 | GCForeground | GCBackground | GCGraphicsExposures, |
1109 | GCForeground | GCBackground | GCGraphicsExposures, |
1167 | &gcvalue); |
1110 | &gcvalue); |
1168 | |
1111 | |
1169 | TermWin.drawable = new rxvt_drawable (display, TermWin.vt); |
1112 | drawable = new rxvt_drawable (display, vt); |
1170 | |
1113 | |
1171 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
1114 | #ifdef RXVT_SCROLLBAR |
1172 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1115 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1173 | topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); |
1116 | topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1174 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1117 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1175 | botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); |
1118 | botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1176 | gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; |
1119 | gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; |
1177 | scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); |
1120 | scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1178 | #endif |
1121 | #endif |
1179 | |
1122 | |
1180 | #ifdef OFF_FOCUS_FADING |
1123 | #ifdef OFF_FOCUS_FADING |
1181 | // initially we are in unfocused state |
1124 | // initially we are in unfocused state |
1182 | if (rs[Rs_fade]) |
1125 | if (rs[Rs_fade]) |
… | |
… | |
1185 | |
1128 | |
1186 | pointer_unblank (); |
1129 | pointer_unblank (); |
1187 | scr_recolour (); |
1130 | scr_recolour (); |
1188 | |
1131 | |
1189 | #if ENABLE_XEMBED |
1132 | #if ENABLE_XEMBED |
1190 | // why this is necessary, I don't know, race condition?? |
1133 | if (rs[Rs_embed]) |
1191 | XMoveWindow (disp, TermWin.vt, window_vt_x, window_vt_y); |
1134 | { |
|
|
1135 | long info[2] = { 0, XEMBED_MAPPED }; |
|
|
1136 | |
|
|
1137 | XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
|
|
1138 | 32, PropModeReplace, (unsigned char *)&info, 2); |
|
|
1139 | } |
1192 | #endif |
1140 | #endif |
1193 | } |
1141 | } |
1194 | |
1142 | |
1195 | /* ------------------------------------------------------------------------- * |
1143 | /* ------------------------------------------------------------------------- * |
1196 | * GET TTY CURRENT STATE * |
1144 | * GET TTY CURRENT STATE * |
… | |
… | |
1202 | /* |
1150 | /* |
1203 | * standard System V termios interface |
1151 | * standard System V termios interface |
1204 | */ |
1152 | */ |
1205 | if (GET_TERMIOS (STDIN_FILENO, tio) < 0) |
1153 | if (GET_TERMIOS (STDIN_FILENO, tio) < 0) |
1206 | { |
1154 | { |
1207 | /* return error - use system defaults */ |
1155 | // return error - use system defaults, |
|
|
1156 | // where possible, and zero elsewhere |
|
|
1157 | memset (tio, 0, sizeof (ttymode_t)); |
|
|
1158 | |
1208 | tio->c_cc[VINTR] = CINTR; |
1159 | tio->c_cc[VINTR] = CINTR; |
1209 | tio->c_cc[VQUIT] = CQUIT; |
1160 | tio->c_cc[VQUIT] = CQUIT; |
1210 | tio->c_cc[VERASE] = CERASE; |
1161 | tio->c_cc[VERASE] = CERASE; |
|
|
1162 | #ifdef VERASE2 |
|
|
1163 | tio->c_cc[VERASE2] = CERASE2; |
|
|
1164 | #endif |
1211 | tio->c_cc[VKILL] = CKILL; |
1165 | tio->c_cc[VKILL] = CKILL; |
1212 | tio->c_cc[VSTART] = CSTART; |
1166 | tio->c_cc[VSTART] = CSTART; |
1213 | tio->c_cc[VSTOP] = CSTOP; |
1167 | tio->c_cc[VSTOP] = CSTOP; |
1214 | tio->c_cc[VSUSP] = CSUSP; |
1168 | tio->c_cc[VSUSP] = CSUSP; |
1215 | # ifdef VDSUSP |
1169 | # ifdef VDSUSP |
1216 | |
|
|
1217 | tio->c_cc[VDSUSP] = CDSUSP; |
1170 | tio->c_cc[VDSUSP] = CDSUSP; |
1218 | # endif |
1171 | # endif |
1219 | # ifdef VREPRINT |
1172 | # ifdef VREPRINT |
1220 | |
|
|
1221 | tio->c_cc[VREPRINT] = CRPRNT; |
1173 | tio->c_cc[VREPRINT] = CRPRNT; |
1222 | # endif |
1174 | # endif |
1223 | # ifdef VDISCRD |
1175 | # ifdef VDISCRD |
1224 | |
|
|
1225 | tio->c_cc[VDISCRD] = CFLUSH; |
1176 | tio->c_cc[VDISCRD] = CFLUSH; |
1226 | # endif |
1177 | # endif |
1227 | # ifdef VWERSE |
1178 | # ifdef VWERSE |
1228 | |
|
|
1229 | tio->c_cc[VWERSE] = CWERASE; |
1179 | tio->c_cc[VWERSE] = CWERASE; |
1230 | # endif |
1180 | # endif |
1231 | # ifdef VLNEXT |
1181 | # ifdef VLNEXT |
1232 | |
|
|
1233 | tio->c_cc[VLNEXT] = CLNEXT; |
1182 | tio->c_cc[VLNEXT] = CLNEXT; |
1234 | # endif |
1183 | # endif |
1235 | |
|
|
1236 | } |
1184 | } |
|
|
1185 | |
1237 | tio->c_cc[VEOF] = CEOF; |
1186 | tio->c_cc[VEOF] = CEOF; |
1238 | tio->c_cc[VEOL] = VDISABLE; |
1187 | tio->c_cc[VEOL] = VDISABLE; |
1239 | # ifdef VEOL2 |
1188 | # ifdef VEOL2 |
1240 | |
|
|
1241 | tio->c_cc[VEOL2] = VDISABLE; |
1189 | tio->c_cc[VEOL2] = VDISABLE; |
1242 | # endif |
1190 | # endif |
1243 | # ifdef VSWTC |
1191 | # ifdef VSWTC |
1244 | |
|
|
1245 | tio->c_cc[VSWTC] = VDISABLE; |
1192 | tio->c_cc[VSWTC] = VDISABLE; |
1246 | # endif |
1193 | # endif |
1247 | # ifdef VSWTCH |
1194 | # ifdef VSWTCH |
1248 | |
|
|
1249 | tio->c_cc[VSWTCH] = VDISABLE; |
1195 | tio->c_cc[VSWTCH] = VDISABLE; |
1250 | # endif |
1196 | # endif |
1251 | # if VMIN != VEOF |
1197 | # if VMIN != VEOF |
1252 | |
|
|
1253 | tio->c_cc[VMIN] = 1; |
1198 | tio->c_cc[VMIN] = 1; |
1254 | # endif |
1199 | # endif |
1255 | # if VTIME != VEOL |
1200 | # if VTIME != VEOL |
1256 | |
|
|
1257 | tio->c_cc[VTIME] = 0; |
1201 | tio->c_cc[VTIME] = 0; |
1258 | # endif |
1202 | # endif |
1259 | |
1203 | |
1260 | if (erase != -1) |
1204 | if (erase != -1) |
1261 | tio->c_cc[VERASE] = (char)erase; |
1205 | tio->c_cc[VERASE] = (char)erase; |
… | |
… | |
1289 | if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) |
1233 | if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) |
1290 | { |
1234 | { |
1291 | tio->sg.sg_erase = CERASE; /* ^H */ |
1235 | tio->sg.sg_erase = CERASE; /* ^H */ |
1292 | tio->sg.sg_kill = CKILL; /* ^U */ |
1236 | tio->sg.sg_kill = CKILL; /* ^U */ |
1293 | } |
1237 | } |
|
|
1238 | |
1294 | if (erase != -1) |
1239 | if (erase != -1) |
1295 | tio->sg.sg_erase = (char)erase; |
1240 | tio->sg.sg_erase = (char)erase; |
1296 | |
1241 | |
1297 | tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); |
1242 | tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); |
1298 | |
1243 | |
… | |
… | |
1304 | tio->tc.t_startc = CSTART; /* ^Q */ |
1249 | tio->tc.t_startc = CSTART; /* ^Q */ |
1305 | tio->tc.t_stopc = CSTOP; /* ^S */ |
1250 | tio->tc.t_stopc = CSTOP; /* ^S */ |
1306 | tio->tc.t_eofc = CEOF; /* ^D */ |
1251 | tio->tc.t_eofc = CEOF; /* ^D */ |
1307 | tio->tc.t_brkc = -1; |
1252 | tio->tc.t_brkc = -1; |
1308 | } |
1253 | } |
|
|
1254 | |
1309 | /* get local special chars */ |
1255 | /* get local special chars */ |
1310 | if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) |
1256 | if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) |
1311 | { |
1257 | { |
1312 | tio->lc.t_suspc = CSUSP; /* ^Z */ |
1258 | tio->lc.t_suspc = CSUSP; /* ^Z */ |
1313 | tio->lc.t_dsuspc = CDSUSP; /* ^Y */ |
1259 | tio->lc.t_dsuspc = CDSUSP; /* ^Y */ |
… | |
… | |
1317 | tio->lc.t_lnextc = CLNEXT; /* ^V */ |
1263 | tio->lc.t_lnextc = CLNEXT; /* ^V */ |
1318 | } |
1264 | } |
1319 | /* get line discipline */ |
1265 | /* get line discipline */ |
1320 | ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); |
1266 | ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); |
1321 | # ifdef NTTYDISC |
1267 | # ifdef NTTYDISC |
1322 | |
|
|
1323 | tio->line = NTTYDISC; |
1268 | tio->line = NTTYDISC; |
1324 | # endif /* NTTYDISC */ |
1269 | # endif /* NTTYDISC */ |
1325 | |
1270 | |
1326 | tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); |
1271 | tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); |
1327 | #endif /* HAVE_TERMIOS_H */ |
1272 | #endif /* HAVE_TERMIOS_H */ |
… | |
… | |
1350 | FOO (IGNCR, "IGNCR"); |
1295 | FOO (IGNCR, "IGNCR"); |
1351 | FOO (ICRNL, "ICRNL"); |
1296 | FOO (ICRNL, "ICRNL"); |
1352 | FOO (IXON, "IXON"); |
1297 | FOO (IXON, "IXON"); |
1353 | FOO (IXOFF, "IXOFF"); |
1298 | FOO (IXOFF, "IXOFF"); |
1354 | # ifdef IUCLC |
1299 | # ifdef IUCLC |
1355 | |
|
|
1356 | FOO (IUCLC, "IUCLC"); |
1300 | FOO (IUCLC, "IUCLC"); |
1357 | # endif |
1301 | # endif |
1358 | # ifdef IXANY |
1302 | # ifdef IXANY |
1359 | |
|
|
1360 | FOO (IXANY, "IXANY"); |
1303 | FOO (IXANY, "IXANY"); |
1361 | # endif |
1304 | # endif |
1362 | # ifdef IMAXBEL |
1305 | # ifdef IMAXBEL |
1363 | |
|
|
1364 | FOO (IMAXBEL, "IMAXBEL"); |
1306 | FOO (IMAXBEL, "IMAXBEL"); |
1365 | # endif |
1307 | # endif |
1366 | |
1308 | |
1367 | fprintf (stderr, "\n"); |
1309 | fprintf (stderr, "\n"); |
1368 | |
1310 | |
… | |
… | |
1375 | FOO (VERASE, "VERASE"); |
1317 | FOO (VERASE, "VERASE"); |
1376 | FOO (VKILL, "VKILL"); |
1318 | FOO (VKILL, "VKILL"); |
1377 | FOO (VEOF, "VEOF"); |
1319 | FOO (VEOF, "VEOF"); |
1378 | FOO (VEOL, "VEOL"); |
1320 | FOO (VEOL, "VEOL"); |
1379 | # ifdef VEOL2 |
1321 | # ifdef VEOL2 |
1380 | |
|
|
1381 | FOO (VEOL2, "VEOL2"); |
1322 | FOO (VEOL2, "VEOL2"); |
1382 | # endif |
1323 | # endif |
1383 | # ifdef VSWTC |
1324 | # ifdef VSWTC |
1384 | |
|
|
1385 | FOO (VSWTC, "VSWTC"); |
1325 | FOO (VSWTC, "VSWTC"); |
1386 | # endif |
1326 | # endif |
1387 | # ifdef VSWTCH |
1327 | # ifdef VSWTCH |
1388 | |
|
|
1389 | FOO (VSWTCH, "VSWTCH"); |
1328 | FOO (VSWTCH, "VSWTCH"); |
1390 | # endif |
1329 | # endif |
1391 | |
|
|
1392 | FOO (VSTART, "VSTART"); |
1330 | FOO (VSTART, "VSTART"); |
1393 | FOO (VSTOP, "VSTOP"); |
1331 | FOO (VSTOP, "VSTOP"); |
1394 | FOO (VSUSP, "VSUSP"); |
1332 | FOO (VSUSP, "VSUSP"); |
1395 | # ifdef VDSUSP |
1333 | # ifdef VDSUSP |
1396 | |
|
|
1397 | FOO (VDSUSP, "VDSUSP"); |
1334 | FOO (VDSUSP, "VDSUSP"); |
1398 | # endif |
1335 | # endif |
1399 | # ifdef VREPRINT |
1336 | # ifdef VREPRINT |
1400 | |
|
|
1401 | FOO (VREPRINT, "VREPRINT"); |
1337 | FOO (VREPRINT, "VREPRINT"); |
1402 | # endif |
1338 | # endif |
1403 | # ifdef VDISCRD |
1339 | # ifdef VDISCRD |
1404 | |
|
|
1405 | FOO (VDISCRD, "VDISCRD"); |
1340 | FOO (VDISCRD, "VDISCRD"); |
1406 | # endif |
1341 | # endif |
1407 | # ifdef VWERSE |
1342 | # ifdef VWERSE |
1408 | |
|
|
1409 | FOO (VWERSE, "VWERSE"); |
1343 | FOO (VWERSE, "VWERSE"); |
1410 | # endif |
1344 | # endif |
1411 | # ifdef VLNEXT |
1345 | # ifdef VLNEXT |
1412 | |
|
|
1413 | FOO (VLNEXT, "VLNEXT"); |
1346 | FOO (VLNEXT, "VLNEXT"); |
1414 | # endif |
1347 | # endif |
1415 | |
1348 | |
1416 | fprintf (stderr, "\n"); |
1349 | fprintf (stderr, "\n"); |
1417 | # undef FOO |
1350 | # undef FOO |
… | |
… | |
1429 | rxvt_term::run_command (const char *const *argv) |
1362 | rxvt_term::run_command (const char *const *argv) |
1430 | { |
1363 | { |
1431 | #if ENABLE_FRILLS |
1364 | #if ENABLE_FRILLS |
1432 | if (rs[Rs_pty_fd]) |
1365 | if (rs[Rs_pty_fd]) |
1433 | { |
1366 | { |
1434 | pty.pty = atoi (rs[Rs_pty_fd]); |
1367 | pty->pty = atoi (rs[Rs_pty_fd]); |
1435 | fcntl (pty.pty, F_SETFL, O_NONBLOCK); |
1368 | |
|
|
1369 | if (pty->pty >= 0) |
|
|
1370 | { |
|
|
1371 | if (getfd_hook) |
|
|
1372 | pty->pty = (*getfd_hook) (pty->pty); |
|
|
1373 | |
|
|
1374 | if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) |
|
|
1375 | rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); |
|
|
1376 | } |
1436 | } |
1377 | } |
1437 | else |
1378 | else |
1438 | #endif |
1379 | #endif |
1439 | if (!pty.get ()) |
1380 | if (!pty->get ()) |
1440 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1381 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1441 | |
1382 | |
1442 | pty.set_utf8_mode (enc_utf8); |
1383 | pty->set_utf8_mode (enc_utf8); |
1443 | |
1384 | |
1444 | /* set initial window size */ |
1385 | /* set initial window size */ |
1445 | tt_winch (); |
1386 | tt_winch (); |
1446 | |
1387 | |
1447 | int er; |
1388 | int er; |
… | |
… | |
1460 | #if ENABLE_FRILLS |
1401 | #if ENABLE_FRILLS |
1461 | if (rs[Rs_pty_fd]) |
1402 | if (rs[Rs_pty_fd]) |
1462 | return; |
1403 | return; |
1463 | #endif |
1404 | #endif |
1464 | |
1405 | |
1465 | sw_chld.start (SIGCHLD); |
|
|
1466 | |
|
|
1467 | #ifndef __QNX__ |
|
|
1468 | /* spin off the command interpreter */ |
1406 | /* spin off the command interpreter */ |
1469 | switch (cmd_pid = fork ()) |
1407 | switch (cmd_pid = fork ()) |
1470 | { |
1408 | { |
1471 | case -1: |
1409 | case -1: |
1472 | { |
1410 | { |
… | |
… | |
1474 | rxvt_fatal ("can't fork, aborting.\n"); |
1412 | rxvt_fatal ("can't fork, aborting.\n"); |
1475 | } |
1413 | } |
1476 | case 0: |
1414 | case 0: |
1477 | init_env (); |
1415 | init_env (); |
1478 | |
1416 | |
1479 | if (!pty.make_controlling_tty ()) |
1417 | if (!pty->make_controlling_tty ()) |
1480 | fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); |
1418 | fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); |
1481 | else |
1419 | else |
1482 | { |
1420 | { |
1483 | /* Reopen stdin, stdout and stderr over the tty file descriptor */ |
1421 | /* Reopen stdin, stdout and stderr over the tty file descriptor */ |
1484 | dup2 (pty.tty, STDIN_FILENO); |
1422 | dup2 (pty->tty, STDIN_FILENO); |
1485 | dup2 (pty.tty, STDOUT_FILENO); |
1423 | dup2 (pty->tty, STDOUT_FILENO); |
1486 | dup2 (pty.tty, STDERR_FILENO); |
1424 | dup2 (pty->tty, STDERR_FILENO); |
1487 | |
1425 | |
1488 | // close all our file handles that we do no longer need |
1426 | // close all our file handles that we do no longer need |
1489 | for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) |
1427 | for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) |
1490 | { |
1428 | { |
1491 | if ((*t)->pty.pty > 2) close ((*t)->pty.pty); |
1429 | if ((*t)->pty->pty > 2) close ((*t)->pty->pty); |
1492 | if ((*t)->pty.tty > 2) close ((*t)->pty.tty); |
1430 | if ((*t)->pty->tty > 2) close ((*t)->pty->tty); |
1493 | } |
1431 | } |
1494 | |
1432 | |
1495 | run_child (argv); |
1433 | run_child (argv); |
1496 | fprintf (stderr, "%s: unable to exec child.", RESNAME); |
1434 | fprintf (stderr, "%s: unable to exec child.", RESNAME); |
1497 | } |
1435 | } |
1498 | |
1436 | |
1499 | _exit (EXIT_FAILURE); |
1437 | _exit (EXIT_FAILURE); |
1500 | |
1438 | |
1501 | default: |
1439 | default: |
1502 | { |
|
|
1503 | #if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) |
|
|
1504 | int fdstdin; |
|
|
1505 | |
|
|
1506 | fdstdin = dup (STDIN_FILENO); |
|
|
1507 | dup2 (pty.tty, STDIN_FILENO); |
|
|
1508 | #endif |
|
|
1509 | |
|
|
1510 | #ifdef UTMP_SUPPORT |
1440 | #if UTMP_SUPPORT |
1511 | privileged_utmp (SAVE); |
1441 | if (!OPTION (Opt_utmpInhibit)) |
|
|
1442 | pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); |
1512 | #endif |
1443 | #endif |
1513 | |
1444 | |
1514 | #if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) |
1445 | pty->close_tty (); |
1515 | |
1446 | |
1516 | dup2 (fdstdin, STDIN_FILENO); |
1447 | child_ev.start (cmd_pid); |
1517 | close (fdstdin); |
|
|
1518 | #endif |
|
|
1519 | } |
|
|
1520 | |
1448 | |
1521 | pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ |
1449 | HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END)); |
1522 | break; |
1450 | break; |
1523 | } |
1451 | } |
1524 | #else /* __QNX__ uses qnxspawn () */ |
|
|
1525 | fchmod (pty.tty, 0622); |
|
|
1526 | fcntl (pty.tty, F_SETFD, FD_CLOEXEC); |
|
|
1527 | fcntl (pty.pty, F_SETFD, FD_CLOEXEC); |
|
|
1528 | |
|
|
1529 | if (run_child (argv) == -1) |
|
|
1530 | exit (EXIT_FAILURE); |
|
|
1531 | #endif |
|
|
1532 | } |
1452 | } |
1533 | |
1453 | |
1534 | /* ------------------------------------------------------------------------- * |
1454 | /* ------------------------------------------------------------------------- * |
1535 | * CHILD PROCESS OPERATIONS * |
1455 | * CHILD PROCESS OPERATIONS * |
1536 | * ------------------------------------------------------------------------- */ |
1456 | * ------------------------------------------------------------------------- */ |
… | |
… | |
1543 | { |
1463 | { |
1544 | char *login; |
1464 | char *login; |
1545 | |
1465 | |
1546 | SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ |
1466 | SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ |
1547 | |
1467 | |
1548 | if (options & Opt_console) |
1468 | if (OPTION (Opt_console)) |
1549 | { /* be virtual console, fail silently */ |
1469 | { /* be virtual console, fail silently */ |
1550 | #ifdef TIOCCONS |
1470 | #ifdef TIOCCONS |
1551 | unsigned int on = 1; |
1471 | unsigned int on = 1; |
1552 | |
1472 | |
1553 | ioctl (STDIN_FILENO, TIOCCONS, &on); |
1473 | ioctl (STDIN_FILENO, TIOCCONS, &on); |
… | |
… | |
1580 | // unblock signals (signals are blocked by iom.C |
1500 | // unblock signals (signals are blocked by iom.C |
1581 | sigset_t ss; |
1501 | sigset_t ss; |
1582 | sigemptyset (&ss); |
1502 | sigemptyset (&ss); |
1583 | sigprocmask (SIG_SETMASK, &ss, 0); |
1503 | sigprocmask (SIG_SETMASK, &ss, 0); |
1584 | |
1504 | |
1585 | #ifndef __QNX__ |
|
|
1586 | /* command interpreter path */ |
1505 | /* command interpreter path */ |
1587 | if (argv != NULL) |
1506 | if (argv != NULL) |
1588 | { |
1507 | { |
1589 | # ifdef DEBUG_CMD |
1508 | # ifdef DEBUG_CMD |
1590 | int i; |
1509 | int i; |
… | |
… | |
1596 | execvp (argv[0], (char *const *)argv); |
1515 | execvp (argv[0], (char *const *)argv); |
1597 | /* no error message: STDERR is closed! */ |
1516 | /* no error message: STDERR is closed! */ |
1598 | } |
1517 | } |
1599 | else |
1518 | else |
1600 | { |
1519 | { |
1601 | const char *argv0, *shell; |
1520 | const char *argv0, *shell; |
1602 | |
1521 | |
1603 | if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') |
1522 | if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') |
1604 | shell = "/bin/sh"; |
1523 | shell = "/bin/sh"; |
1605 | |
1524 | |
1606 | argv0 = (const char *)rxvt_r_basename (shell); |
1525 | argv0 = (const char *)rxvt_r_basename (shell); |
1607 | |
1526 | |
1608 | if (options & Opt_loginShell) |
1527 | if (OPTION (Opt_loginShell)) |
1609 | { |
1528 | { |
1610 | login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); |
1529 | login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); |
1611 | |
1530 | |
1612 | login[0] = '-'; |
1531 | login[0] = '-'; |
1613 | strcpy (&login[1], argv0); |
1532 | strcpy (&login[1], argv0); |
1614 | argv0 = login; |
1533 | argv0 = login; |
1615 | } |
1534 | } |
|
|
1535 | |
1616 | execlp (shell, argv0, NULL); |
1536 | execlp (shell, argv0, NULL); |
1617 | /* no error message: STDERR is closed! */ |
1537 | /* no error message: STDERR is closed! */ |
1618 | } |
1538 | } |
1619 | |
1539 | |
1620 | #else /* __QNX__ uses qnxspawn () */ |
|
|
1621 | |
|
|
1622 | char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; |
|
|
1623 | char *command = NULL, fullcommand[_MAX_PATH]; |
|
|
1624 | char **arg_v, *arg_a[2] = { NULL, NULL }; |
|
|
1625 | |
|
|
1626 | if (argv != NULL) |
|
|
1627 | { |
|
|
1628 | if (access (argv[0], X_OK) == -1) |
|
|
1629 | { |
|
|
1630 | if (strchr (argv[0], '/') == NULL) |
|
|
1631 | { |
|
|
1632 | searchenv (argv[0], "PATH", fullcommand); |
|
|
1633 | |
|
|
1634 | if (fullcommand[0] != '\0') |
|
|
1635 | command = fullcommand; |
|
|
1636 | } |
|
|
1637 | |
|
|
1638 | if (access (command, X_OK) == -1) |
|
|
1639 | return -1; |
|
|
1640 | } |
|
|
1641 | else |
|
|
1642 | command = argv[0]; |
|
|
1643 | |
|
|
1644 | arg_v = argv; |
|
|
1645 | } |
|
|
1646 | else |
|
|
1647 | { |
|
|
1648 | if ((command = getenv ("SHELL")) == NULL || *command == '\0') |
|
|
1649 | command = "/bin/sh"; |
|
|
1650 | |
|
|
1651 | arg_a[0] = my_basename (command); |
|
|
1652 | |
|
|
1653 | if (options & Opt_loginShell) |
|
|
1654 | { |
|
|
1655 | login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); |
|
|
1656 | |
|
|
1657 | login[0] = '-'; |
|
|
1658 | strcpy (&login[1], arg_a[0]); |
|
|
1659 | arg_a[0] = login; |
|
|
1660 | } |
|
|
1661 | |
|
|
1662 | arg_v = arg_a; |
|
|
1663 | } |
|
|
1664 | |
|
|
1665 | iov_a[0] = iov_a[1] = iov_a[2] = pty.tty; |
|
|
1666 | cmd_pid = qnx_spawn (0, 0, 0, -1, -1, |
|
|
1667 | _SPAWN_SETSID | _SPAWN_TCSETPGRP, |
|
|
1668 | command, arg_v, environ, iov_a, 0); |
|
|
1669 | if (login) |
|
|
1670 | free (login); |
|
|
1671 | |
|
|
1672 | pty.close_tty (); |
|
|
1673 | return pty.pty; |
|
|
1674 | #endif |
|
|
1675 | |
|
|
1676 | return -1; |
1540 | return -1; |
1677 | } |
1541 | } |
1678 | |
1542 | |
1679 | /*----------------------- end-of-file (C source) -----------------------*/ |
1543 | /*----------------------- end-of-file (C source) -----------------------*/ |