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.163 by root, Tue Jan 31 16:57:35 2006 UTC

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

Diff Legend

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