ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.105 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.208 by ayin, Mon Sep 3 08:48:00 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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
41const char *const def_colorName[] = 43const 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 "rgb:00/00/00", // 0: black (Black)
47#ifndef NO_BRIGHTCOLOR 49 "rgb:cd/00/00", // 1: red (Red3)
48 "Red3", /* 1: red (#CD0000) */ 50 "rgb:00/cd/00", // 2: green (Green3)
49 "Green3", /* 2: green (#00CD00) */ 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
50 "Yellow3", /* 3: yellow (#CDCD00) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
51 "Blue3", /* 4: blue (#0000CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
52 "Magenta3", /* 5: magenta (#CD00CD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
53 "Cyan3", /* 6: cyan (#00CDCD) */ 55# ifdef XTERM_COLORS
54# ifdef XTERM_COLORS 56 "rgb:e5/e5/e5", // 7: white (Grey90)
55 "Grey90", /* 7: white (#E5E5E5) */ 57# else
56# else 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
57 "AntiqueWhite", /* 7: white (#FAEBD7) */
58# endif 59# endif
59 /* high-intensity colors */ 60 /* high-intensity colors */
60# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
61 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
62# else 63# else
63 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
64# endif 65# endif
65#endif /* NO_BRIGHTCOLOR */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
66 "Red", /* 1/9: bright red (#FF0000) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
67 "Green", /* 2/10: bright green (#00FF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
72 "White", /* 7/15: bright white (#FFFFFF) */
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",
… …
166#endif 166#endif
167#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if ENABLE_TRANSPARENCY
172 NULL, 172 NULL,
173#endif 173#endif
174 }; 174#if OFF_FOCUS_FADING
175 175 "rgb:00/00/00",
176const char *const xa_names[] =
177 {
178 "TEXT",
179 "COMPOUND_TEXT",
180 "UTF8_STRING",
181 "MULTIPLE",
182 "TARGETS",
183 "TIMESTAMP",
184 "VT_SELECTION",
185 "INCR",
186 "WM_DELETE_WINDOW",
187 "CLIPBOARD",
188#if ENABLE_FRILLS
189 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME",
193#endif
194#if USE_XIM
195 "WM_LOCALE_NAME",
196#endif
197#ifdef TRANSPARENT
198 "_XROOTPMAP_ID",
199 "ESETROOT_PMAP_ID",
200#endif
201#ifdef OFFIX_DND
202 "DndProtocol",
203 "DndSelection",
204#endif 176#endif
205 }; 177 };
206 178
207bool 179bool
208rxvt_term::init_vars () 180rxvt_term::init_vars ()
209{ 181{
210 sw_term.start (SIGTERM); 182 pix_colors = //
211
212 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
213#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
214 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
215#endif 186#endif
216 pix_colors = pix_colors_focused;
217 187
218 if (pix_colors == NULL)
219 return false;
220
221#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
222 TermWin.pixmap = None;
223#endif
224 188
225 MEvent.time = CurrentTime; 189 MEvent.time = CurrentTime;
226 MEvent.button = AnyButton; 190 MEvent.button = AnyButton;
227 options = DEFAULT_OPTIONS;
228 want_refresh = 1; 191 want_refresh = 1;
229 cmd_pid = -1;
230 pty.pty = pty.tty = -1;
231 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
232 TermWin.focus = 0;
233 TermWin.ncol = 80; 193 ncol = 80;
234 TermWin.nrow = 24; 194 nrow = 24;
235 TermWin.int_bwidth = INTERNALBORDERWIDTH; 195 int_bwidth = INTERNALBORDERWIDTH;
236 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 196 ext_bwidth = EXTERNALBORDERWIDTH;
237 TermWin.lineSpace = LINESPACE; 197 lineSpace = LINESPACE;
238 TermWin.saveLines = SAVELINES; 198 saveLines = SAVELINES;
239 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
240 200
241 refresh_limit = 1;
242 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
243 prev_nrow = prev_ncol = 0;
244 202
245 oldcursor.row = oldcursor.col = -1; 203 oldcursor.row = oldcursor.col = -1;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
246#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
247 /* bgPixmap.w = bgPixmap.h = 0; */
248 bgPixmap.x = bgPixmap.y = 50; 210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
249 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
250#endif 215#endif
251
252 last_bot = last_state = -1; 216 last_bot = last_state = -1;
253 217
254#ifdef MENUBAR 218 set_option (Opt_scrollBar);
255 menu_readonly = 1; 219 set_option (Opt_scrollTtyOutput);
256# if ! (MENUBAR_MAX > 1) 220 set_option (Opt_jumpScroll);
257 CurrentBar = & (BarList); 221 set_option (Opt_skipScroll);
258# endif /* (MENUBAR_MAX > 1) */ 222 set_option (Opt_secondaryScreen);
259#endif 223 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles);
226 set_option (Opt_iso14755_52);
260 227
261 return true; 228 return true;
262} 229}
263 230
264void 231void
… …
302 int i, r_argc; 269 int i, r_argc;
303 char *val; 270 char *val;
304 const char **cmd_argv, **r_argv; 271 const char **cmd_argv, **r_argv;
305 272
306 /* 273 /*
307 * Look for -exec option. Find => split and make cmd_argv[] of command args 274 * Look for -e option. Find => split and make cmd_argv[] of command args
308 */ 275 */
309 for (r_argc = 0; r_argc < argc; r_argc++) 276 for (r_argc = 0; r_argc < argc; r_argc++)
310 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 277 if (!strcmp (argv[r_argc], "-e"))
311 break; 278 break;
312 279
313 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 280 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
314 281
315 for (i = 0; i < r_argc; i++) 282 for (i = 0; i < r_argc; i++)
… …
332 rs[Rs_name] = rxvt_r_basename (argv[0]); 299 rs[Rs_name] = rxvt_r_basename (argv[0]);
333 300
334 /* 301 /*
335 * Open display, get options/resources and create the window 302 * Open display, get options/resources and create the window
336 */ 303 */
304
337 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 305 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
338 rs[Rs_display_name] = ":0"; 306 rs[Rs_display_name] = ":0";
339 307
340 get_options (r_argc, r_argv); 308 get_options (r_argc, r_argv);
309
310 if (!(display = displays.get (rs[Rs_display_name])))
311 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
312
313 // using a local pointer decreases code size a lot
314 xa = display->xa;
315
316 set (display);
317 extract_resources ();
318
319#if XFT
320 if (rs[Rs_depth])
321 select_visual (strtol (rs[Rs_depth], 0, 0));
322#endif
323
324#ifdef HAVE_AFTERIMAGE
325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
341 free (r_argv); 327 free (r_argv);
342 328
343#ifdef LOCAL_X_IS_UNIX 329 for (int i = NUM_RESOURCES; i--; )
344 if (rs[Rs_display_name][0] == ':') 330 if (rs [i] == resval_undef)
345 { 331 rs [i] = 0;
346 val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); 332
347 strcpy (val, "unix"); 333#if ENABLE_PERL
348 strcat (val, rs[Rs_display_name]); 334 if (!rs[Rs_perl_ext_1])
349 display = displays.get (val); 335 rs[Rs_perl_ext_1] = "default";
350 free (val); 336
337 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
338 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
339 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
351 } 340 {
341 rxvt_perl.init (this);
342 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
343 }
352#endif 344#endif
353
354 if (!display
355 && ! (display = displays.get (rs[Rs_display_name])))
356 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
357
358 extract_resources (display->display, rs[Rs_name]);
359 345
360 /* 346 /*
361 * set any defaults not already set 347 * set any defaults not already set
362 */ 348 */
363 if (cmd_argv && cmd_argv[0]) 349 if (cmd_argv && cmd_argv[0])
… …
374 if (!rs[Rs_iconName]) 360 if (!rs[Rs_iconName])
375 rs[Rs_iconName] = rs[Rs_name]; 361 rs[Rs_iconName] = rs[Rs_name];
376 } 362 }
377 363
378 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 364 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
379 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 365 saveLines = min (i, MAX_SAVELINES);
380 366
381#if ENABLE_FRILLS 367#if ENABLE_FRILLS
382 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 368 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
383 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 369 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
370
384 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 371 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
385 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 372 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
373
386 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 374 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
387 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 375 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
388#endif 376#endif
389 377
390#ifdef POINTER_BLANK 378#ifdef POINTER_BLANK
391 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 379 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
392 pointerBlankDelay = i; 380 pointerBlankDelay = i;
393 else 381 else
394 pointerBlankDelay = 2; 382 pointerBlankDelay = 2;
395#endif 383#endif
396 384
397 /* no point having a scrollbar without having any scrollback! */ 385 /* no point having a scrollbar without having any scrollback! */
398 if (!TermWin.saveLines) 386 if (!saveLines)
399 options &= ~Opt_scrollBar; 387 set_option (Opt_scrollBar, 0);
400 388
401#ifdef PRINTPIPE 389#ifdef PRINTPIPE
402 if (!rs[Rs_print_pipe]) 390 if (!rs[Rs_print_pipe])
403 rs[Rs_print_pipe] = PRINTPIPE; 391 rs[Rs_print_pipe] = PRINTPIPE;
404#endif 392#endif
… …
447 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 435 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
448#endif 436#endif
449 437
450#ifdef XTERM_REVERSE_VIDEO 438#ifdef XTERM_REVERSE_VIDEO
451 /* this is how xterm implements reverseVideo */ 439 /* this is how xterm implements reverseVideo */
452 if (options & Opt_reverseVideo) 440 if (option (Opt_reverseVideo))
453 { 441 {
454 if (!rs[Rs_color + Color_fg]) 442 if (!rs[Rs_color + Color_fg])
455 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 443 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
444
456 if (!rs[Rs_color + Color_bg]) 445 if (!rs[Rs_color + Color_bg])
457 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 446 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
458 } 447 }
459#endif 448#endif
460 449
… …
462 if (!rs[Rs_color + i]) 451 if (!rs[Rs_color + i])
463 rs[Rs_color + i] = def_colorName[i]; 452 rs[Rs_color + i] = def_colorName[i];
464 453
465#ifndef XTERM_REVERSE_VIDEO 454#ifndef XTERM_REVERSE_VIDEO
466 /* this is how we implement reverseVideo */ 455 /* this is how we implement reverseVideo */
467 if (options & Opt_reverseVideo) 456 if (option (Opt_reverseVideo))
468 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 457 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
469#endif 458#endif
470 459
471 /* convenient aliases for setting fg/bg to colors */ 460 /* convenient aliases for setting fg/bg to colors */
472 color_aliases (Color_fg); 461 color_aliases (Color_fg);
473 color_aliases (Color_bg); 462 color_aliases (Color_bg);
… …
493/*----------------------------------------------------------------------*/ 482/*----------------------------------------------------------------------*/
494void 483void
495rxvt_term::init_env () 484rxvt_term::init_env ()
496{ 485{
497 int i; 486 int i;
498 unsigned int u;
499 char *val; 487 char *val;
500 488
501#ifdef DISPLAY_IS_IP 489#ifdef DISPLAY_IS_IP
502 /* Fixup display_name for export over pty to any interested terminal 490 /* Fixup display_name for export over pty to any interested terminal
503 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 491 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
512 val = rxvt_network_display (rs[Rs_display_name]); 500 val = rxvt_network_display (rs[Rs_display_name]);
513 rs[Rs_display_name] = (const char *)val; 501 rs[Rs_display_name] = (const char *)val;
514 502
515 if (val == NULL) 503 if (val == NULL)
516#endif /* DISPLAY_IS_IP */ 504#endif /* DISPLAY_IS_IP */
517 val = XDisplayString (display->display); 505 val = XDisplayString (dpy);
518 506
519 if (rs[Rs_display_name] == NULL) 507 if (rs[Rs_display_name] == NULL)
520 rs[Rs_display_name] = val; /* use broken `:0' value */ 508 rs[Rs_display_name] = val; /* use broken `:0' value */
521 509
522 i = strlen (val); 510 i = strlen (val);
523 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 511 env_display = (char *)rxvt_malloc (i + 9);
524 512
525 sprintf (env_display, "DISPLAY=%s", val); 513 sprintf (env_display, "DISPLAY=%s", val);
526 514
527 /* avoiding the math library: 515 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
528 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
529 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
530 ;
531 MAX_IT (i, 1);
532 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
533
534 sprintf (env_windowid, "WINDOWID=%u",
535 (unsigned int)TermWin.parent[0]);
536 516
537 /* add entries to the environment: 517 /* add entries to the environment:
538 * @ DISPLAY: in case we started with -display 518 * @ DISPLAY: in case we started with -display
539 * @ WINDOWID: X window id number of the window 519 * @ WINDOWID: X window id number of the window
540 * @ COLORTERM: terminal sub-name and also indicates its color 520 * @ COLORTERM: terminal sub-name and also indicates its color
… …
542 * @ TERMINFO: path to terminfo directory 522 * @ TERMINFO: path to terminfo directory
543 * @ COLORFGBG: fg;bg color codes 523 * @ COLORFGBG: fg;bg color codes
544 */ 524 */
545 putenv (env_display); 525 putenv (env_display);
546 putenv (env_windowid); 526 putenv (env_windowid);
527
547 if (env_colorfgbg) 528 if (env_colorfgbg)
548 putenv (env_colorfgbg); 529 putenv (env_colorfgbg);
549 530
550#ifdef RXVT_TERMINFO 531#ifdef RXVT_TERMINFO
551 putenv ("TERMINFO=" RXVT_TERMINFO); 532 putenv ("TERMINFO=" RXVT_TERMINFO);
552#endif 533#endif
553 534
554 if (display->depth <= 2) 535 if (depth <= 2)
555 putenv ("COLORTERM=" COLORTERMENV "-mono"); 536 putenv ("COLORTERM=" COLORTERMENV "-mono");
556 else 537 else
557 putenv ("COLORTERM=" COLORTERMENVFULL); 538 putenv ("COLORTERM=" COLORTERMENVFULL);
558 539
559 if (rs[Rs_term_name] != NULL) 540 if (rs[Rs_term_name] != NULL)
560 { 541 {
561 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 542 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
562 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 543 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
563 putenv (env_term); 544 putenv (env_term);
564 } 545 }
565 else 546 else
566 putenv ("TERM=" TERMENV); 547 putenv ("TERM=" TERMENV);
… …
579 * This should support all European type languages. 560 * This should support all European type languages.
580 */ 561 */
581void 562void
582rxvt_term::set_locale (const char *locale) 563rxvt_term::set_locale (const char *locale)
583{ 564{
565 set_environ (envv);
566
584#if HAVE_XSETLOCALE || HAVE_SETLOCALE 567#if HAVE_XSETLOCALE || HAVE_SETLOCALE
585 free (this->locale); 568 free (this->locale);
586 this->locale = setlocale (LC_CTYPE, locale); 569 this->locale = setlocale (LC_CTYPE, locale);
587 570
588 if (!this->locale) 571 if (!this->locale)
589 { 572 {
590 if (*locale) 573 if (*locale)
591 { 574 {
592 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 575 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
593 setlocale (LC_CTYPE, ""); 576 setlocale (LC_CTYPE, "C");
594 } 577 }
595 else 578 else
596 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 579 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
597 580
598 this->locale = ""; 581 this->locale = "C";
599 } 582 }
600 583
601 584
602 this->locale = rxvt_strdup (this->locale); 585 this->locale = rxvt_strdup (this->locale);
603 SET_LOCALE (this->locale); 586 SET_LOCALE (this->locale);
… …
618} 601}
619 602
620void 603void
621rxvt_term::init_xlocale () 604rxvt_term::init_xlocale ()
622{ 605{
606 set_environ (envv);
607
623#ifdef USE_XIM 608#ifdef USE_XIM
624 if (!locale) 609 if (!locale)
625 rxvt_warn ("setting locale failed, working without locale support.\n"); 610 rxvt_warn ("setting locale failed, working without locale support.\n");
626 else 611 else
627 { 612 {
… …
649 * Initialize the command connection. 634 * Initialize the command connection.
650 * This should be called after the X server connection is established. 635 * This should be called after the X server connection is established.
651 */ 636 */
652 637
653#ifdef META8_OPTION 638#ifdef META8_OPTION
654 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 639 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
655#endif 640#endif
656 641
657 get_ourmods (); 642 get_ourmods ();
658 643
659 if (!(options & Opt_scrollTtyOutput)) 644 if (!option (Opt_scrollTtyOutput))
660 priv_modes |= PrivMode_TtyOutputInh; 645 priv_modes |= PrivMode_TtyOutputInh;
661 if (options & Opt_scrollTtyKeypress) 646 if (option (Opt_scrollTtyKeypress))
662 priv_modes |= PrivMode_Keypress; 647 priv_modes |= PrivMode_Keypress;
663 if (!(options & Opt_jumpScroll)) 648 if (!option (Opt_jumpScroll))
664 priv_modes |= PrivMode_smoothScroll; 649 priv_modes |= PrivMode_smoothScroll;
665 650
666#ifndef NO_BACKSPACE_KEY 651#ifndef NO_BACKSPACE_KEY
667 if (strcmp (key_backspace, "DEC") == 0) 652 if (strcmp (key_backspace, "DEC") == 0)
668 priv_modes |= PrivMode_HaveBackSpace; 653 priv_modes |= PrivMode_HaveBackSpace;
669#endif 654#endif
670 655
671 /* add value for scrollBar */ 656 /* add value for scrollBar */
672 if (scrollbar_visible ()) 657 if (scrollBar.state)
673 { 658 {
674 priv_modes |= PrivMode_scrollBar; 659 priv_modes |= PrivMode_scrollBar;
675 SavedModes |= PrivMode_scrollBar; 660 SavedModes |= PrivMode_scrollBar;
676 } 661 }
677 if (menubar_visible ())
678 {
679 priv_modes |= PrivMode_menuBar;
680 SavedModes |= PrivMode_menuBar;
681 }
682
683#ifdef CURSOR_BLINK
684 if (options & Opt_cursorBlink)
685 (void)gettimeofday (&lastcursorchange, NULL);
686#endif
687 662
688 run_command (argv); 663 run_command (argv);
689} 664}
690 665
691/*----------------------------------------------------------------------*/ 666/*----------------------------------------------------------------------*/
… …
696 671
697#ifdef OFF_FOCUS_FADING 672#ifdef OFF_FOCUS_FADING
698 pix_colors = pix_colors_focused; 673 pix_colors = pix_colors_focused;
699#endif 674#endif
700 675
701 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 676 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
702 { 677 {
678 const char *name = rs[Rs_color + i];
679
680 if (!name)
681 continue;
682
703 rxvt_color xcol; 683 rxvt_color xcol;
704 684
705 if (!rs[Rs_color + i]) 685 if (!set_color (xcol, name))
706 continue;
707
708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
709 { 686 {
710#ifndef XTERM_REVERSE_VIDEO 687#ifndef XTERM_REVERSE_VIDEO
711 if (i < 2 && (options & Opt_reverseVideo)) 688 if (i < 2 && option (Opt_reverseVideo))
712 rs[Rs_color + i] = def_colorName[!i]; 689 name = def_colorName [1 - i];
713 else 690 else
714#endif 691#endif
715 rs[Rs_color + i] = def_colorName[i]; 692 name = def_colorName [i];
716 693
717 if (!rs[Rs_color + i]) 694 if (!name)
718 continue; 695 continue;
719 696
720 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 697 if (!set_color (xcol, name))
721 { 698 {
722 switch (i) 699 switch (i)
723 { 700 {
724 case Color_fg: 701 case Color_fg:
725 case Color_bg: 702 case Color_bg:
726 /* fatal: need bg/fg color */
727 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 703 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
728 /* NOTREACHED */ 704 name = "";
729 break; 705 break;
730#ifndef NO_CURSORCOLOR 706#ifndef NO_CURSORCOLOR
731 case Color_cursor2: 707 case Color_cursor2:
732 xcol = pix_colors[Color_fg]; 708#endif
733 break;
734#endif /* ! NO_CURSORCOLOR */
735 case Color_pointer_fg: 709 case Color_pointer_fg:
736 xcol = pix_colors[Color_fg]; 710 name = rs[Rs_color + Color_fg];
711 xcol.set (this, name);
737 break; 712 break;
738 default: 713 default:
739 xcol = pix_colors[Color_bg]; /* None */ 714 name = rs[Rs_color + Color_bg];
715 xcol.set (this, name);
740 break; 716 break;
741 } 717 }
742 } 718 }
743 } 719 }
744 720
745 pix_colors[i] = xcol; 721 pix_colors[i] = xcol;
746#ifdef OFF_FOCUS_FADING 722 rs[Rs_color + i] = name;
747 if (rs[Rs_fade])
748 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
749#endif
750 SET_PIXCOLOR (i);
751 }
752
753 if (display->depth <= 2)
754 { 723 }
724
725 if (depth <= 2)
726 {
755 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 727 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
756 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 728 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
757 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 729 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
758 } 730 }
759 731
760 /* 732 /*
761 * get scrollBar/menuBar shadow colors 733 * get scrollBar shadow colors
762 * 734 *
763 * The calculations of topShadow/bottomShadow values are adapted 735 * The calculations of topShadow/bottomShadow values are adapted
764 * from the fvwm window manager. 736 * from the fvwm window manager.
765 */ 737 */
766#ifdef KEEP_SCROLLCOLOR 738#ifdef KEEP_SCROLLCOLOR
767
768 if (display->depth <= 2) 739 if (depth <= 2)
740 {
769 { /* Monochrome */ 741 /* Monochrome */
770 pix_colors[Color_scroll] = pix_colors[Color_fg]; 742 alias_color (Color_scroll, Color_fg);
771 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 743 alias_color (Color_topShadow, Color_bg);
772 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 744 alias_color (Color_bottomShadow, Color_bg);
773 } 745 }
774 else 746 else
775 { 747 {
776 rxvt_color xcol[2]; 748 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
777 /* xcol[0] == white
778 * xcol[1] == top shadow
779 * xcol[2] == bot shadow */
780 749
781 xcol[1] = pix_colors[Color_scroll]; 750 rgba cscroll;
782 xcol[0].set (display, 65535, 65535, 65535); 751 pix_colors [Color_scroll].get (cscroll);
783
784 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
785
786 xcol[0].get (display, pr0, pg0, pb0);
787 xcol[1].get (display, pr1, pg1, pb1);
788
789 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
790 752
791 /* topShadowColor */ 753 /* topShadowColor */
792 if (!xcol[1].set (display, 754 if (!pix_colors[Color_topShadow].set (this,
793 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 755 rgba (
794 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 756 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
795 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 757 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
796 xcol[1] = pix_colors[Color_White]; 758 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
797 759 cscroll.a)
798 pix_colors[Color_topShadow] = xcol[1]; 760 ))
761 alias_color (Color_topShadow, Color_White);
799 } 762 }
800#endif /* KEEP_SCROLLCOLOR */ 763#endif /* KEEP_SCROLLCOLOR */
764
765#ifdef OFF_FOCUS_FADING
766 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
767 update_fade_color (i);
768#endif
801} 769}
802 770
803/*----------------------------------------------------------------------*/ 771/*----------------------------------------------------------------------*/
804/* color aliases, fg/bg bright-bold */ 772/* color aliases, fg/bg bright-bold */
805void 773void
… …
810 int i = atoi (rs[Rs_color + idx]); 778 int i = atoi (rs[Rs_color + idx]);
811 779
812 if (i >= 8 && i <= 15) 780 if (i >= 8 && i <= 15)
813 { /* bright colors */ 781 { /* bright colors */
814 i -= 8; 782 i -= 8;
815#ifndef NO_BRIGHTCOLOR
816 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 783 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
817 return; 784 return;
818#endif
819 } 785 }
820 786
821 if (i >= 0 && i <= 7) /* normal colors */ 787 if (i >= 0 && i <= 7) /* normal colors */
822 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 788 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
823 } 789 }
… …
829 * Use resource ``modifier'' to override the Meta modifier 795 * Use resource ``modifier'' to override the Meta modifier
830 */ 796 */
831void 797void
832rxvt_term::get_ourmods () 798rxvt_term::get_ourmods ()
833{ 799{
834 int i, j, k; 800 int i, j, k;
835 int requestedmeta, realmeta, realalt; 801 int requestedmeta, realmeta, realalt;
836 const char *cm, *rsmod; 802 const char *cm, *rsmod;
837 XModifierKeymap *map; 803 XModifierKeymap *map;
838 KeyCode *kc; 804 KeyCode *kc;
839 const unsigned int modmasks[] = 805 const unsigned int modmasks[] =
840 { 806 {
841 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 807 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
842 }; 808 };
843 809
… …
846 812
847 if (rsmod 813 if (rsmod
848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 814 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
849 requestedmeta = rsmod[3] - '0'; 815 requestedmeta = rsmod[3] - '0';
850 816
851 map = XGetModifierMapping (display->display); 817 map = XGetModifierMapping (dpy);
852 kc = map->modifiermap; 818 kc = map->modifiermap;
853 819
854 for (i = 1; i < 6; i++) 820 for (i = 1; i < 6; i++)
855 { 821 {
856 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 822 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
858 for (j = map->max_keypermod; j--; k++) 824 for (j = map->max_keypermod; j--; k++)
859 { 825 {
860 if (kc[k] == 0) 826 if (kc[k] == 0)
861 break; 827 break;
862 828
863 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 829 switch (XKeycodeToKeysym (dpy, kc[k], 0))
864 { 830 {
865 case XK_Num_Lock: 831 case XK_Num_Lock:
866 ModNumLockMask = modmasks[i - 1]; 832 ModNumLockMask = modmasks[i - 1];
867 continue; 833 continue;
868 834
… …
918rxvt_term::create_windows (int argc, const char *const *argv) 884rxvt_term::create_windows (int argc, const char *const *argv)
919{ 885{
920 XClassHint classHint; 886 XClassHint classHint;
921 XWMHints wmHint; 887 XWMHints wmHint;
922#if ENABLE_FRILLS 888#if ENABLE_FRILLS
923 Atom prop = None;
924 MWMHints mwmhints; 889 MWMHints mwmhints = { };
925#endif 890#endif
926 XGCValues gcvalue; 891 XGCValues gcvalue;
927 long vt_emask;
928 XSetWindowAttributes attributes; 892 XSetWindowAttributes attributes;
929 XWindowAttributes gattr; 893 Window top, parent;
930 894
931#ifdef USING_W11LIB 895 dLocal (Display *, dpy);
932 /* enable W11 callbacks */
933 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
934#endif
935 896
936 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 897 /* grab colors before netscape does */
937 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 898 Get_Colours ();
938 899
939 if (options & Opt_transparent) 900 if (!set_fonts ())
940 { 901 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
941 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 902
942 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 903 parent = display->root;
943 } 904
905 attributes.override_redirect = !!option (Opt_override_redirect);
944 906
945#if ENABLE_FRILLS 907#if ENABLE_FRILLS
946 if (options & Opt_borderLess) 908 if (option (Opt_borderLess))
947 { 909 {
948 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 910 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
949
950 if (prop == None)
951 { 911 {
952 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 912 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
953#ifdef PREFER_24BIT
954 attributes.override_redirect = TRUE; 913 attributes.override_redirect = true;
955#endif
956 mwmhints.flags = 0;
957 } 914 }
958 else 915 else
959 { 916 {
960 mwmhints.flags = MWM_HINTS_DECORATIONS; 917 mwmhints.flags = MWM_HINTS_DECORATIONS;
961 mwmhints.decorations = 0;
962 } 918 }
963 } 919 }
964 else 920#endif
965 { 921
966 mwmhints.flags = 0; 922#if ENABLE_XEMBED
923 if (rs[Rs_embed])
967 } 924 {
968#endif 925 XWindowAttributes wattr;
969 926
970 /* grab colors before netscape does */ 927 parent = strtol (rs[Rs_embed], 0, 0);
971 Get_Colours ();
972 928
973 if (!set_fonts ()) 929 if (!XGetWindowAttributes (dpy, parent, &wattr))
974 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 930 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
931
932 window_calc (wattr.width, wattr.height);
933 }
934#endif
975 935
976 window_calc (0, 0); 936 window_calc (0, 0);
937
938 /* sub-window placement & size in rxvt_resize_subwindows () */
939 attributes.background_pixel = pix_colors_focused [Color_border];
940 attributes.border_pixel = pix_colors_focused [Color_border];
941 attributes.colormap = cmap;
942
943 top = XCreateWindow (dpy, parent,
944 szHint.x, szHint.y,
945 szHint.width, szHint.height,
946 ext_bwidth,
947 depth, InputOutput, visual,
948 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
949 &attributes);
950
951 this->parent[0] = top;
952
977 old_width = szHint.width; 953 old_width = szHint.width;
978 old_height = szHint.height; 954 old_height = szHint.height;
979 955
980 /* sub-window placement & size in rxvt_resize_subwindows () */
981
982#ifdef PREFER_24BIT
983 attributes.background_pixel = pix_colors_focused[Color_border];
984 attributes.border_pixel = pix_colors_focused[Color_border];
985 attributes.colormap = display->cmap;
986 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
987 szHint.x, szHint.y,
988 szHint.width, szHint.height,
989 TermWin.ext_bwidth,
990 display->depth, InputOutput,
991 display->visual,
992 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
993#else
994 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
995 szHint.x, szHint.y,
996 szHint.width, szHint.height,
997 TermWin.ext_bwidth,
998 pix_colors_focused[Color_border],
999 pix_colors_focused[Color_border]);
1000#endif
1001
1002 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 956 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1003 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 957 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1004 958
1005 classHint.res_name = (char *)rs[Rs_name]; 959 classHint.res_name = (char *)rs[Rs_name];
1006 classHint.res_class = (char *)RESCLASS; 960 classHint.res_class = (char *)RESCLASS;
1007 961
1008 wmHint.flags = InputHint | StateHint | WindowGroupHint; 962 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1009 wmHint.input = True; 963 wmHint.input = True;
1010 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 964 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1011 wmHint.window_group = TermWin.parent[0]; 965 wmHint.window_group = top;
1012 966
1013 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 967 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1014 (char **)argv, argc, &szHint, &wmHint, &classHint); 968 &szHint, &wmHint, &classHint);
1015
1016 /* Enable delete window protocol */
1017 XSetWMProtocols (display->display, TermWin.parent[0],
1018 &xa[XA_WMDELETEWINDOW], 1);
1019 969
1020#if ENABLE_FRILLS 970#if ENABLE_FRILLS
971 if (mwmhints.flags)
972 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
973 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
974#endif
975
976 Atom protocols[] = {
977 xa[XA_WM_DELETE_WINDOW],
978#if ENABLE_EWMH
979 xa[XA_NET_WM_PING],
980#endif
981 };
982
983 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
984
985#if ENABLE_FRILLS
986 if (rs[Rs_transient_for])
987 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
988#endif
989
990#if ENABLE_EWMH
1021 long pid = getpid (); 991 long pid = getpid ();
1022 992
1023 XChangeProperty (display->display, TermWin.parent[0], 993 XChangeProperty (dpy, top,
1024 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 994 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1025 PropModeReplace, (unsigned char *)&pid, 1); 995 PropModeReplace, (unsigned char *)&pid, 1);
1026#endif
1027 996
1028 XSelectInput (display->display, TermWin.parent[0], 997 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
998#endif
999
1000 XSelectInput (dpy, top,
1029 KeyPressMask 1001 KeyPressMask
1030#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1002#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1031 | KeyReleaseMask 1003 | KeyReleaseMask
1032#endif 1004#endif
1033 | FocusChangeMask | VisibilityChangeMask 1005 | FocusChangeMask | VisibilityChangeMask
1034 | ExposureMask
1035 | StructureNotifyMask); 1006 | ExposureMask | StructureNotifyMask);
1007
1036 termwin_ev.start (display, TermWin.parent[0]); 1008 termwin_ev.start (display, top);
1037
1038#if ENABLE_FRILLS
1039 if (mwmhints.flags)
1040 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1041 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1042#endif
1043 1009
1044 /* vt cursor: Black-on-White is standard, but this is more popular */ 1010 /* vt cursor: Black-on-White is standard, but this is more popular */
1045 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1011 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1046 1012
1047#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1013#ifdef HAVE_SCROLLBARS
1048 /* cursor (menuBar/scrollBar): Black-on-White */ 1014 /* cursor scrollBar: Black-on-White */
1049 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1015 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1050#endif 1016#endif
1051 1017
1052 /* the vt window */ 1018 /* the vt window */
1053 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1019 vt = XCreateSimpleWindow (dpy, top,
1054 window_vt_x,
1055 window_vt_y, 1020 window_vt_x, window_vt_y,
1056 TermWin_TotalWidth (), 1021 width, height,
1057 TermWin_TotalHeight (),
1058 0, 1022 0,
1059 pix_colors_focused[Color_fg], 1023 pix_colors_focused[Color_fg],
1060 pix_colors_focused[Color_bg]); 1024 pix_colors_focused[Color_bg]);
1061#ifdef DEBUG_X
1062 XStoreName (display->display, TermWin.vt, "vt window");
1063#endif
1064 1025
1065 attributes.bit_gravity = NorthWestGravity; 1026 attributes.bit_gravity = NorthWestGravity;
1066 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1027 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1067 1028
1068 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1029 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1069 1030
1070 pointer_unblank ();
1071
1072#ifdef POINTER_BLANK
1073 if (options & Opt_pointerBlank) 1031 if (option (Opt_pointerBlank))
1074 vt_emask |= PointerMotionMask; 1032 vt_emask |= PointerMotionMask;
1075 else 1033 else
1076#endif
1077 vt_emask |= Button1MotionMask | Button3MotionMask; 1034 vt_emask |= Button1MotionMask | Button3MotionMask;
1078 1035
1079 XSelectInput (display->display, TermWin.vt, vt_emask); 1036 vt_select_input ();
1037
1080 vt_ev.start (display, TermWin.vt); 1038 vt_ev.start (display, vt);
1081
1082#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1083 if (menuBar_height ())
1084 {
1085 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1086 window_vt_x, 0,
1087 TermWin_TotalWidth (),
1088 menuBar_TotalHeight (),
1089 0,
1090 pix_colors_focused[Color_fg],
1091 pix_colors_focused[Color_scroll]);
1092
1093#ifdef DEBUG_X
1094 XStoreName (display->display, menuBar.win, "menubar");
1095#endif
1096
1097 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1098
1099 XDefineCursor (display->display, menuBar.win,
1100 XCreateFontCursor (display->display, XC_left_ptr));
1101
1102 XSelectInput (display->display, menuBar.win,
1103 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1104 | Button1MotionMask));
1105 menubar_ev.start (display, menuBar.win);
1106 }
1107#endif
1108
1109#ifdef XPM_BACKGROUND
1110 if (rs[Rs_backgroundPixmap] != NULL
1111 && ! (options & Opt_transparent))
1112 {
1113 const char *p = rs[Rs_backgroundPixmap];
1114
1115 if ((p = strchr (p, ';')) != NULL)
1116 {
1117 p++;
1118 scale_pixmap (p);
1119 }
1120
1121 set_bgPixmap (rs[Rs_backgroundPixmap]);
1122 scr_touch (true);
1123 }
1124#endif
1125 1039
1126 /* graphics context for the vt window */ 1040 /* graphics context for the vt window */
1127 gcvalue.foreground = pix_colors[Color_fg]; 1041 gcvalue.foreground = pix_colors[Color_fg];
1128 gcvalue.background = pix_colors[Color_bg]; 1042 gcvalue.background = pix_colors[Color_bg];
1129 gcvalue.graphics_exposures = 1; 1043 gcvalue.graphics_exposures = 0;
1130 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1044
1045 gc = XCreateGC (dpy, vt,
1131 GCForeground | GCBackground | GCGraphicsExposures, 1046 GCForeground | GCBackground | GCGraphicsExposures,
1132 &gcvalue); 1047 &gcvalue);
1133 1048
1134 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1049 drawable = new rxvt_drawable (this, vt);
1135 1050
1136#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1051#ifdef RXVT_SCROLLBAR
1137 gcvalue.foreground = pix_colors[Color_topShadow]; 1052 gcvalue.foreground = pix_colors[Color_topShadow];
1138 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1053 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1139 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1054 gcvalue.foreground = pix_colors[Color_bottomShadow];
1140 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1055 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1141 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1056 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1142 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1057 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1143#endif 1058#endif
1144 1059
1145#ifdef OFF_FOCUS_FADING 1060#ifdef OFF_FOCUS_FADING
1146 // initially we are in unfocused state 1061 // initially we are in unfocused state
1147 if (rs[Rs_fade]) 1062 if (rs[Rs_fade])
1148 pix_colors = pix_colors_unfocused; 1063 pix_colors = pix_colors_unfocused;
1149#endif 1064#endif
1150 1065
1066 pointer_unblank ();
1151 scr_recolour (); 1067 scr_recolour ();
1152} 1068}
1153 1069
1154/* ------------------------------------------------------------------------- * 1070/* ------------------------------------------------------------------------- *
1155 * GET TTY CURRENT STATE * 1071 * GET TTY CURRENT STATE *
1156 * ------------------------------------------------------------------------- */ 1072 * ------------------------------------------------------------------------- */
1157void 1073void
1158rxvt_get_ttymode (ttymode_t *tio, int erase) 1074rxvt_get_ttymode (ttymode_t *tio, int erase)
1159{ 1075{
1160#ifdef HAVE_TERMIOS_H
1161 /* 1076 /*
1162 * standard System V termios interface 1077 * standard System V termios interface
1163 */ 1078 */
1164 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1079 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1165 { 1080 {
1166 /* return error - use system defaults */ 1081 // return error - use system defaults,
1082 // where possible, and zero elsewhere
1083 memset (tio, 0, sizeof (ttymode_t));
1084
1167 tio->c_cc[VINTR] = CINTR; 1085 tio->c_cc[VINTR] = CINTR;
1168 tio->c_cc[VQUIT] = CQUIT; 1086 tio->c_cc[VQUIT] = CQUIT;
1169 tio->c_cc[VERASE] = CERASE; 1087 tio->c_cc[VERASE] = CERASE;
1088#ifdef VERASE2
1089 tio->c_cc[VERASE2] = CERASE2;
1090#endif
1170 tio->c_cc[VKILL] = CKILL; 1091 tio->c_cc[VKILL] = CKILL;
1171 tio->c_cc[VSTART] = CSTART; 1092 tio->c_cc[VSTART] = CSTART;
1172 tio->c_cc[VSTOP] = CSTOP; 1093 tio->c_cc[VSTOP] = CSTOP;
1173 tio->c_cc[VSUSP] = CSUSP; 1094 tio->c_cc[VSUSP] = CSUSP;
1174# ifdef VDSUSP 1095# ifdef VDSUSP
1175
1176 tio->c_cc[VDSUSP] = CDSUSP; 1096 tio->c_cc[VDSUSP] = CDSUSP;
1177# endif 1097# endif
1178# ifdef VREPRINT 1098# ifdef VREPRINT
1179
1180 tio->c_cc[VREPRINT] = CRPRNT; 1099 tio->c_cc[VREPRINT] = CRPRNT;
1181# endif 1100# endif
1182# ifdef VDISCRD 1101# ifdef VDISCRD
1183
1184 tio->c_cc[VDISCRD] = CFLUSH; 1102 tio->c_cc[VDISCRD] = CFLUSH;
1185# endif 1103# endif
1186# ifdef VWERSE 1104# ifdef VWERSE
1187
1188 tio->c_cc[VWERSE] = CWERASE; 1105 tio->c_cc[VWERSE] = CWERASE;
1189# endif 1106# endif
1190# ifdef VLNEXT 1107# ifdef VLNEXT
1191
1192 tio->c_cc[VLNEXT] = CLNEXT; 1108 tio->c_cc[VLNEXT] = CLNEXT;
1193# endif 1109# endif
1194
1195 } 1110 }
1111
1196 tio->c_cc[VEOF] = CEOF; 1112 tio->c_cc[VEOF] = CEOF;
1197 tio->c_cc[VEOL] = VDISABLE; 1113 tio->c_cc[VEOL] = VDISABLE;
1198# ifdef VEOL2 1114# ifdef VEOL2
1199
1200 tio->c_cc[VEOL2] = VDISABLE; 1115 tio->c_cc[VEOL2] = VDISABLE;
1201# endif 1116# endif
1202# ifdef VSWTC 1117# ifdef VSWTC
1203
1204 tio->c_cc[VSWTC] = VDISABLE; 1118 tio->c_cc[VSWTC] = VDISABLE;
1205# endif 1119# endif
1206# ifdef VSWTCH 1120# ifdef VSWTCH
1207
1208 tio->c_cc[VSWTCH] = VDISABLE; 1121 tio->c_cc[VSWTCH] = VDISABLE;
1209# endif 1122# endif
1210# if VMIN != VEOF 1123# if VMIN != VEOF
1211
1212 tio->c_cc[VMIN] = 1; 1124 tio->c_cc[VMIN] = 1;
1213# endif 1125# endif
1214# if VTIME != VEOL 1126# if VTIME != VEOL
1215
1216 tio->c_cc[VTIME] = 0; 1127 tio->c_cc[VTIME] = 0;
1217# endif 1128# endif
1218 1129
1219 if (erase != -1) 1130 if (erase != -1)
1220 tio->c_cc[VERASE] = (char)erase; 1131 tio->c_cc[VERASE] = (char)erase;
… …
1236 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1147 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1237# if defined (ECHOCTL) && defined (ECHOKE) 1148# if defined (ECHOCTL) && defined (ECHOKE)
1238 | ECHOCTL | ECHOKE 1149 | ECHOCTL | ECHOKE
1239# endif 1150# endif
1240 | ECHOE | ECHOK); 1151 | ECHOE | ECHOK);
1241# else /* HAVE_TERMIOS_H */
1242
1243 /*
1244 * sgtty interface
1245 */
1246
1247 /* get parameters -- gtty */
1248 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1249 {
1250 tio->sg.sg_erase = CERASE; /* ^H */
1251 tio->sg.sg_kill = CKILL; /* ^U */
1252 }
1253 if (erase != -1)
1254 tio->sg.sg_erase = (char)erase;
1255
1256 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1257
1258 /* get special characters */
1259 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1260 {
1261 tio->tc.t_intrc = CINTR; /* ^C */
1262 tio->tc.t_quitc = CQUIT; /* ^\ */
1263 tio->tc.t_startc = CSTART; /* ^Q */
1264 tio->tc.t_stopc = CSTOP; /* ^S */
1265 tio->tc.t_eofc = CEOF; /* ^D */
1266 tio->tc.t_brkc = -1;
1267 }
1268 /* get local special chars */
1269 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1270 {
1271 tio->lc.t_suspc = CSUSP; /* ^Z */
1272 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1273 tio->lc.t_rprntc = CRPRNT; /* ^R */
1274 tio->lc.t_flushc = CFLUSH; /* ^O */
1275 tio->lc.t_werasc = CWERASE; /* ^W */
1276 tio->lc.t_lnextc = CLNEXT; /* ^V */
1277 }
1278 /* get line discipline */
1279 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1280# ifdef NTTYDISC
1281
1282 tio->line = NTTYDISC;
1283# endif /* NTTYDISC */
1284
1285 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1286#endif /* HAVE_TERMIOS_H */
1287 1152
1288 /* 1153 /*
1289 * Debugging 1154 * Debugging
1290 */ 1155 */
1291#ifdef DEBUG_TTYMODE 1156#ifdef DEBUG_TTYMODE
… …
1309 FOO (IGNCR, "IGNCR"); 1174 FOO (IGNCR, "IGNCR");
1310 FOO (ICRNL, "ICRNL"); 1175 FOO (ICRNL, "ICRNL");
1311 FOO (IXON, "IXON"); 1176 FOO (IXON, "IXON");
1312 FOO (IXOFF, "IXOFF"); 1177 FOO (IXOFF, "IXOFF");
1313# ifdef IUCLC 1178# ifdef IUCLC
1314
1315 FOO (IUCLC, "IUCLC"); 1179 FOO (IUCLC, "IUCLC");
1316# endif 1180# endif
1317# ifdef IXANY 1181# ifdef IXANY
1318
1319 FOO (IXANY, "IXANY"); 1182 FOO (IXANY, "IXANY");
1320# endif 1183# endif
1321# ifdef IMAXBEL 1184# ifdef IMAXBEL
1322
1323 FOO (IMAXBEL, "IMAXBEL"); 1185 FOO (IMAXBEL, "IMAXBEL");
1324# endif 1186# endif
1325 1187
1326 fprintf (stderr, "\n"); 1188 fprintf (stderr, "\n");
1327 1189
… …
1334 FOO (VERASE, "VERASE"); 1196 FOO (VERASE, "VERASE");
1335 FOO (VKILL, "VKILL"); 1197 FOO (VKILL, "VKILL");
1336 FOO (VEOF, "VEOF"); 1198 FOO (VEOF, "VEOF");
1337 FOO (VEOL, "VEOL"); 1199 FOO (VEOL, "VEOL");
1338# ifdef VEOL2 1200# ifdef VEOL2
1339
1340 FOO (VEOL2, "VEOL2"); 1201 FOO (VEOL2, "VEOL2");
1341# endif 1202# endif
1342# ifdef VSWTC 1203# ifdef VSWTC
1343
1344 FOO (VSWTC, "VSWTC"); 1204 FOO (VSWTC, "VSWTC");
1345# endif 1205# endif
1346# ifdef VSWTCH 1206# ifdef VSWTCH
1347
1348 FOO (VSWTCH, "VSWTCH"); 1207 FOO (VSWTCH, "VSWTCH");
1349# endif 1208# endif
1350
1351 FOO (VSTART, "VSTART"); 1209 FOO (VSTART, "VSTART");
1352 FOO (VSTOP, "VSTOP"); 1210 FOO (VSTOP, "VSTOP");
1353 FOO (VSUSP, "VSUSP"); 1211 FOO (VSUSP, "VSUSP");
1354# ifdef VDSUSP 1212# ifdef VDSUSP
1355
1356 FOO (VDSUSP, "VDSUSP"); 1213 FOO (VDSUSP, "VDSUSP");
1357# endif 1214# endif
1358# ifdef VREPRINT 1215# ifdef VREPRINT
1359
1360 FOO (VREPRINT, "VREPRINT"); 1216 FOO (VREPRINT, "VREPRINT");
1361# endif 1217# endif
1362# ifdef VDISCRD 1218# ifdef VDISCRD
1363
1364 FOO (VDISCRD, "VDISCRD"); 1219 FOO (VDISCRD, "VDISCRD");
1365# endif 1220# endif
1366# ifdef VWERSE 1221# ifdef VWERSE
1367
1368 FOO (VWERSE, "VWERSE"); 1222 FOO (VWERSE, "VWERSE");
1369# endif 1223# endif
1370# ifdef VLNEXT 1224# ifdef VLNEXT
1371
1372 FOO (VLNEXT, "VLNEXT"); 1225 FOO (VLNEXT, "VLNEXT");
1373# endif 1226# endif
1374 1227
1375 fprintf (stderr, "\n"); 1228 fprintf (stderr, "\n");
1376# undef FOO 1229# undef FOO
… …
1385 * the slave. 1238 * the slave.
1386 */ 1239 */
1387void 1240void
1388rxvt_term::run_command (const char *const *argv) 1241rxvt_term::run_command (const char *const *argv)
1389{ 1242{
1243#if ENABLE_FRILLS
1244 if (rs[Rs_pty_fd])
1245 {
1246 pty->pty = atoi (rs[Rs_pty_fd]);
1247
1248 if (pty->pty >= 0)
1249 {
1250 if (getfd_hook)
1251 pty->pty = (*getfd_hook) (pty->pty);
1252
1253 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1254 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1255 }
1256 }
1257 else
1258#endif
1390 if (!pty.get ()) 1259 if (!pty->get ())
1391 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1260 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1392
1393 pty.set_utf8_mode (enc_utf8);
1394
1395 /* set initial window size */
1396 tt_winch ();
1397 1261
1398 int er; 1262 int er;
1399 1263
1400#ifndef NO_BACKSPACE_KEY 1264#ifndef NO_BACKSPACE_KEY
1401 if (key_backspace[0] && !key_backspace[1]) 1265 if (key_backspace[0] && !key_backspace[1])
… …
1405 else 1269 else
1406#endif 1270#endif
1407 er = -1; 1271 er = -1;
1408 1272
1409 rxvt_get_ttymode (&tio, er); 1273 rxvt_get_ttymode (&tio, er);
1274 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1275 pty->set_utf8_mode (enc_utf8);
1410 1276
1411 sw_chld.start (SIGCHLD); 1277 /* set initial window size */
1278 tt_winch ();
1412 1279
1413#ifndef __QNX__ 1280#if ENABLE_FRILLS
1281 if (rs[Rs_pty_fd])
1282 return;
1283#endif
1284
1414 /* spin off the command interpreter */ 1285 /* spin off the command interpreter */
1415 switch (cmd_pid = fork ()) 1286 switch (cmd_pid = fork ())
1416 { 1287 {
1417 case -1: 1288 case -1:
1289 {
1290 cmd_pid = 0;
1418 rxvt_fatal ("can't fork, aborting.\n"); 1291 rxvt_fatal ("can't fork, aborting.\n");
1292 }
1419 case 0: 1293 case 0:
1420 init_env (); 1294 init_env ();
1421 1295
1422 if (!pty.make_controlling_tty ()) 1296 if (!pty->make_controlling_tty ())
1423 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1297 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1424 else 1298 else
1425 { 1299 {
1426 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1300 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1427 dup2 (pty.tty, STDIN_FILENO); 1301 dup2 (pty->tty, STDIN_FILENO);
1428 dup2 (pty.tty, STDOUT_FILENO); 1302 dup2 (pty->tty, STDOUT_FILENO);
1429 dup2 (pty.tty, STDERR_FILENO); 1303 dup2 (pty->tty, STDERR_FILENO);
1430 1304
1431 // close all our file handles that we do no longer need 1305 // close all our file handles that we do no longer need
1432 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1306 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1433 { 1307 {
1434 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1308 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1435 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1309 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1436 } 1310 }
1437 1311
1438 run_child (argv); 1312 run_child (argv);
1439 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1313 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1440 } 1314 }
1441 1315
1442 _exit (EXIT_FAILURE); 1316 _exit (EXIT_FAILURE);
1443 1317
1444 default: 1318 default:
1445 { 1319 if (!option (Opt_utmpInhibit))
1446#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1320 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1447 int fdstdin;
1448 1321
1449 fdstdin = dup (STDIN_FILENO); 1322 pty->close_tty ();
1450 dup2 (pty.tty, STDIN_FILENO);
1451#endif
1452 1323
1453#ifdef UTMP_SUPPORT 1324 child_ev.start (cmd_pid);
1454 privileged_utmp (SAVE);
1455#endif
1456 1325
1457#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1326 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1458
1459 dup2 (fdstdin, STDIN_FILENO);
1460 close (fdstdin);
1461#endif
1462 }
1463
1464 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1465 break; 1327 break;
1466 } 1328 }
1467#else /* __QNX__ uses qnxspawn () */
1468 fchmod (pty.tty, 0622);
1469 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1470 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1471
1472 if (run_child (argv) == -1)
1473 exit (EXIT_FAILURE);
1474#endif
1475} 1329}
1476 1330
1477/* ------------------------------------------------------------------------- * 1331/* ------------------------------------------------------------------------- *
1478 * CHILD PROCESS OPERATIONS * 1332 * CHILD PROCESS OPERATIONS *
1479 * ------------------------------------------------------------------------- */ 1333 * ------------------------------------------------------------------------- */
… …
1484int 1338int
1485rxvt_term::run_child (const char *const *argv) 1339rxvt_term::run_child (const char *const *argv)
1486{ 1340{
1487 char *login; 1341 char *login;
1488 1342
1489 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1490
1491 if (options & Opt_console) 1343 if (option (Opt_console))
1492 { /* be virtual console, fail silently */ 1344 { /* be virtual console, fail silently */
1493#ifdef TIOCCONS 1345#ifdef TIOCCONS
1494 unsigned int on = 1; 1346 unsigned int on = 1;
1495 1347
1496 ioctl (STDIN_FILENO, TIOCCONS, &on); 1348 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1523 // unblock signals (signals are blocked by iom.C 1375 // unblock signals (signals are blocked by iom.C
1524 sigset_t ss; 1376 sigset_t ss;
1525 sigemptyset (&ss); 1377 sigemptyset (&ss);
1526 sigprocmask (SIG_SETMASK, &ss, 0); 1378 sigprocmask (SIG_SETMASK, &ss, 0);
1527 1379
1528#ifndef __QNX__
1529 /* command interpreter path */ 1380 /* command interpreter path */
1530 if (argv != NULL) 1381 if (argv != NULL)
1531 { 1382 {
1532# ifdef DEBUG_CMD 1383# ifdef DEBUG_CMD
1533 int i; 1384 int i;
… …
1539 execvp (argv[0], (char *const *)argv); 1390 execvp (argv[0], (char *const *)argv);
1540 /* no error message: STDERR is closed! */ 1391 /* no error message: STDERR is closed! */
1541 } 1392 }
1542 else 1393 else
1543 { 1394 {
1544 const char *argv0, *shell; 1395 const char *argv0, *shell;
1545 1396
1546 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1397 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1547 shell = "/bin/sh"; 1398 shell = "/bin/sh";
1548 1399
1549 argv0 = (const char *)rxvt_r_basename (shell); 1400 argv0 = (const char *)rxvt_r_basename (shell);
1550 1401
1551 if (options & Opt_loginShell) 1402 if (option (Opt_loginShell))
1552 { 1403 {
1553 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1404 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1554 1405
1555 login[0] = '-'; 1406 login[0] = '-';
1556 strcpy (&login[1], argv0); 1407 strcpy (&login[1], argv0);
1557 argv0 = login; 1408 argv0 = login;
1558 } 1409 }
1410
1559 execlp (shell, argv0, NULL); 1411 execlp (shell, argv0, NULL);
1560 /* no error message: STDERR is closed! */ 1412 /* no error message: STDERR is closed! */
1561 } 1413 }
1562 1414
1563#else /* __QNX__ uses qnxspawn () */
1564
1565 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1566 char *command = NULL, fullcommand[_MAX_PATH];
1567 char **arg_v, *arg_a[2] = { NULL, NULL };
1568
1569 if (argv != NULL)
1570 {
1571 if (access (argv[0], X_OK) == -1)
1572 {
1573 if (strchr (argv[0], '/') == NULL)
1574 {
1575 searchenv (argv[0], "PATH", fullcommand);
1576
1577 if (fullcommand[0] != '\0')
1578 command = fullcommand;
1579 }
1580
1581 if (access (command, X_OK) == -1)
1582 return -1;
1583 }
1584 else
1585 command = argv[0];
1586
1587 arg_v = argv;
1588 }
1589 else
1590 {
1591 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1592 command = "/bin/sh";
1593
1594 arg_a[0] = my_basename (command);
1595
1596 if (options & Opt_loginShell)
1597 {
1598 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1599
1600 login[0] = '-';
1601 strcpy (&login[1], arg_a[0]);
1602 arg_a[0] = login;
1603 }
1604
1605 arg_v = arg_a;
1606 }
1607
1608 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1609 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1610 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1611 command, arg_v, environ, iov_a, 0);
1612 if (login)
1613 free (login);
1614
1615 pty.close_tty ();
1616 return pty.pty;
1617#endif
1618
1619 return -1; 1415 return -1;
1620} 1416}
1621 1417
1622/*----------------------- end-of-file (C source) -----------------------*/ 1418/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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