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

Diff Legend

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