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

Diff Legend

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