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

Diff Legend

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