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.96 by root, Sat Dec 11 23:01:36 2004 UTC vs.
Revision 1.184 by sasha, Fri Jun 8 20:04:12 2007 UTC

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

Diff Legend

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