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

Diff Legend

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