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

Diff Legend

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