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.98 by root, Wed Dec 15 00:53:23 2004 UTC vs.
Revision 1.208 by ayin, Mon Sep 3 08:48:00 2007 UTC

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

Diff Legend

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