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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines