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.190 by sasha, Thu Jul 12 22:33:16 2007 UTC

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

Diff Legend

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