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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines