ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines