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.93 by root, Sun Oct 24 14:02:44 2004 UTC vs.
Revision 1.199 by sasha, Fri Aug 3 22:40:10 2007 UTC

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

Diff Legend

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