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.105 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.157 by root, Wed Jan 25 21:09:21 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.
… …
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 "rxvtutil.h"
37#include "init.h" 37#include "init.h"
38 38
39#include <limits>
40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
43 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
44 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
45 /* low-intensity colors */ 47 /* low-intensity colors */
46 "Black", /* 0: black (#000000) */ 48 "Black", /* 0: black (#000000) */
47#ifndef NO_BRIGHTCOLOR
48 "Red3", /* 1: red (#CD0000) */ 49 "Red3", /* 1: red (#CD0000) */
49 "Green3", /* 2: green (#00CD00) */ 50 "Green3", /* 2: green (#00CD00) */
50 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "Yellow3", /* 3: yellow (#CDCD00) */
51 "Blue3", /* 4: blue (#0000CD) */ 52 "Blue3", /* 4: blue (#0000CD) */
52 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "Magenta3", /* 5: magenta (#CD00CD) */
… …
60# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
61 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "Grey30", /* 8: bright black (#4D4D4D) */
62# else 63# else
63 "Grey25", /* 8: bright black (#404040) */ 64 "Grey25", /* 8: bright black (#404040) */
64# endif 65# endif
65#endif /* NO_BRIGHTCOLOR */
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "Red", /* 1/9: bright red (#FF0000) */
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "Green", /* 2/10: bright green (#00FF00) */
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
… …
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if TINTING
172 NULL, 172 NULL,
173#endif 173#endif
174 }; 174#if OFF_FOCUS_FADING
175 175 "black",
176const char *const xa_names[] =
177 {
178 "TEXT",
179 "COMPOUND_TEXT",
180 "UTF8_STRING",
181 "MULTIPLE",
182 "TARGETS",
183 "TIMESTAMP",
184 "VT_SELECTION",
185 "INCR",
186 "WM_DELETE_WINDOW",
187 "CLIPBOARD",
188#if ENABLE_FRILLS
189 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME",
193#endif
194#if USE_XIM
195 "WM_LOCALE_NAME",
196#endif
197#ifdef TRANSPARENT
198 "_XROOTPMAP_ID",
199 "ESETROOT_PMAP_ID",
200#endif
201#ifdef OFFIX_DND
202 "DndProtocol",
203 "DndSelection",
204#endif 176#endif
205 }; 177 };
206 178
207bool 179bool
208rxvt_term::init_vars () 180rxvt_term::init_vars ()
209{ 181{
210 sw_term.start (SIGTERM); 182 pix_colors = //
211
212 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
213#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
214 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
215#endif 186#endif
216 pix_colors = pix_colors_focused;
217
218 if (pix_colors == NULL)
219 return false;
220 187
221#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
222 TermWin.pixmap = None; 189 pixmap = None;
223#endif 190#endif
224 191
225 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
226 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
227 options = DEFAULT_OPTIONS; 194 options = DEFAULT_OPTIONS;
228 want_refresh = 1; 195 want_refresh = 1;
229 cmd_pid = -1;
230 pty.pty = pty.tty = -1;
231 priv_modes = SavedModes = PrivMode_Default; 196 priv_modes = SavedModes = PrivMode_Default;
232 TermWin.focus = 0;
233 TermWin.ncol = 80; 197 ncol = 80;
234 TermWin.nrow = 24; 198 nrow = 24;
235 TermWin.int_bwidth = INTERNALBORDERWIDTH; 199 int_bwidth = INTERNALBORDERWIDTH;
236 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 200 ext_bwidth = EXTERNALBORDERWIDTH;
237 TermWin.lineSpace = LINESPACE; 201 lineSpace = LINESPACE;
238 TermWin.saveLines = SAVELINES; 202 saveLines = SAVELINES;
239 numpix_colors = TOTAL_COLORS; 203 numpix_colors = TOTAL_COLORS;
240 204
241 refresh_limit = 1; 205 refresh_limit = 1;
242 refresh_type = SLOW_REFRESH; 206 refresh_type = SLOW_REFRESH;
243 prev_nrow = prev_ncol = 0;
244 207
245 oldcursor.row = oldcursor.col = -1; 208 oldcursor.row = oldcursor.col = -1;
246#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
247 /* bgPixmap.w = bgPixmap.h = 0; */ 210 /* bgPixmap.w = bgPixmap.h = 0; */
248 bgPixmap.x = bgPixmap.y = 50; 211 bgPixmap.x = bgPixmap.y = 50;
249 bgPixmap.pixmap = None; 212 bgPixmap.pixmap = None;
250#endif 213#endif
251 214
252 last_bot = last_state = -1; 215 last_bot = last_state = -1;
253
254#ifdef MENUBAR
255 menu_readonly = 1;
256# if ! (MENUBAR_MAX > 1)
257 CurrentBar = & (BarList);
258# endif /* (MENUBAR_MAX > 1) */
259#endif
260 216
261 return true; 217 return true;
262} 218}
263 219
264void 220void
… …
332 rs[Rs_name] = rxvt_r_basename (argv[0]); 288 rs[Rs_name] = rxvt_r_basename (argv[0]);
333 289
334 /* 290 /*
335 * Open display, get options/resources and create the window 291 * Open display, get options/resources and create the window
336 */ 292 */
293
337 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 294 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
338 rs[Rs_display_name] = ":0"; 295 rs[Rs_display_name] = ":0";
339 296
340 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 ENABLE_FRILLS
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
341 free (r_argv); 313 free (r_argv);
342 314
343#ifdef LOCAL_X_IS_UNIX 315#if ENABLE_PERL
344 if (rs[Rs_display_name][0] == ':') 316 if (!rs[Rs_perl_ext_1])
345 { 317 rs[Rs_perl_ext_1] = "default";
346 val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); 318
347 strcpy (val, "unix"); 319 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
348 strcat (val, rs[Rs_display_name]); 320 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
349 display = displays.get (val); 321 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
350 free (val);
351 } 322 {
323 rxvt_perl.init (this);
324 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
325 }
352#endif 326#endif
353
354 if (!display
355 && ! (display = displays.get (rs[Rs_display_name])))
356 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
357
358 extract_resources (display->display, rs[Rs_name]);
359 327
360 /* 328 /*
361 * set any defaults not already set 329 * set any defaults not already set
362 */ 330 */
363 if (cmd_argv && cmd_argv[0]) 331 if (cmd_argv && cmd_argv[0])
… …
374 if (!rs[Rs_iconName]) 342 if (!rs[Rs_iconName])
375 rs[Rs_iconName] = rs[Rs_name]; 343 rs[Rs_iconName] = rs[Rs_name];
376 } 344 }
377 345
378 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 346 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
379 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 347 saveLines = min (i, MAX_SAVELINES);
380 348
381#if ENABLE_FRILLS 349#if ENABLE_FRILLS
382 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)
383 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 351 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
352
384 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)
385 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 354 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
355
386 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 356 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
387 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 357 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
388#endif 358#endif
389 359
390#ifdef POINTER_BLANK 360#ifdef POINTER_BLANK
391 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 361 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
392 pointerBlankDelay = i; 362 pointerBlankDelay = i;
393 else 363 else
394 pointerBlankDelay = 2; 364 pointerBlankDelay = 2;
395#endif 365#endif
396 366
397 /* no point having a scrollbar without having any scrollback! */ 367 /* no point having a scrollbar without having any scrollback! */
398 if (!TermWin.saveLines) 368 if (!saveLines)
399 options &= ~Opt_scrollBar; 369 set_option (Opt_scrollBar, 0);
400 370
401#ifdef PRINTPIPE 371#ifdef PRINTPIPE
402 if (!rs[Rs_print_pipe]) 372 if (!rs[Rs_print_pipe])
403 rs[Rs_print_pipe] = PRINTPIPE; 373 rs[Rs_print_pipe] = PRINTPIPE;
404#endif 374#endif
… …
447 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]);
448#endif 418#endif
449 419
450#ifdef XTERM_REVERSE_VIDEO 420#ifdef XTERM_REVERSE_VIDEO
451 /* this is how xterm implements reverseVideo */ 421 /* this is how xterm implements reverseVideo */
452 if (options & Opt_reverseVideo) 422 if (OPTION (Opt_reverseVideo))
453 { 423 {
454 if (!rs[Rs_color + Color_fg]) 424 if (!rs[Rs_color + Color_fg])
455 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 425 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
456 if (!rs[Rs_color + Color_bg]) 426 if (!rs[Rs_color + Color_bg])
457 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 427 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
462 if (!rs[Rs_color + i]) 432 if (!rs[Rs_color + i])
463 rs[Rs_color + i] = def_colorName[i]; 433 rs[Rs_color + i] = def_colorName[i];
464 434
465#ifndef XTERM_REVERSE_VIDEO 435#ifndef XTERM_REVERSE_VIDEO
466 /* this is how we implement reverseVideo */ 436 /* this is how we implement reverseVideo */
467 if (options & Opt_reverseVideo) 437 if (OPTION (Opt_reverseVideo))
468 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]);
469#endif 439#endif
470 440
471 /* convenient aliases for setting fg/bg to colors */ 441 /* convenient aliases for setting fg/bg to colors */
472 color_aliases (Color_fg); 442 color_aliases (Color_fg);
473 color_aliases (Color_bg); 443 color_aliases (Color_bg);
… …
512 val = rxvt_network_display (rs[Rs_display_name]); 482 val = rxvt_network_display (rs[Rs_display_name]);
513 rs[Rs_display_name] = (const char *)val; 483 rs[Rs_display_name] = (const char *)val;
514 484
515 if (val == NULL) 485 if (val == NULL)
516#endif /* DISPLAY_IS_IP */ 486#endif /* DISPLAY_IS_IP */
517 val = XDisplayString (display->display); 487 val = XDisplayString (xdisp);
518 488
519 if (rs[Rs_display_name] == NULL) 489 if (rs[Rs_display_name] == NULL)
520 rs[Rs_display_name] = val; /* use broken `:0' value */ 490 rs[Rs_display_name] = val; /* use broken `:0' value */
521 491
522 i = strlen (val); 492 i = strlen (val);
523 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
524 494
525 sprintf (env_display, "DISPLAY=%s", val); 495 sprintf (env_display, "DISPLAY=%s", val);
526 496
527 /* avoiding the math library: 497 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
528 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
529 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
530 ;
531 MAX_IT (i, 1);
532 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
533
534 sprintf (env_windowid, "WINDOWID=%u",
535 (unsigned int)TermWin.parent[0]);
536 498
537 /* add entries to the environment: 499 /* add entries to the environment:
538 * @ DISPLAY: in case we started with -display 500 * @ DISPLAY: in case we started with -display
539 * @ WINDOWID: X window id number of the window 501 * @ WINDOWID: X window id number of the window
540 * @ COLORTERM: terminal sub-name and also indicates its color 502 * @ COLORTERM: terminal sub-name and also indicates its color
… …
542 * @ TERMINFO: path to terminfo directory 504 * @ TERMINFO: path to terminfo directory
543 * @ COLORFGBG: fg;bg color codes 505 * @ COLORFGBG: fg;bg color codes
544 */ 506 */
545 putenv (env_display); 507 putenv (env_display);
546 putenv (env_windowid); 508 putenv (env_windowid);
509
547 if (env_colorfgbg) 510 if (env_colorfgbg)
548 putenv (env_colorfgbg); 511 putenv (env_colorfgbg);
549 512
550#ifdef RXVT_TERMINFO 513#ifdef RXVT_TERMINFO
551 putenv ("TERMINFO=" RXVT_TERMINFO); 514 putenv ("TERMINFO=" RXVT_TERMINFO);
552#endif 515#endif
553 516
554 if (display->depth <= 2) 517 if (depth <= 2)
555 putenv ("COLORTERM=" COLORTERMENV "-mono"); 518 putenv ("COLORTERM=" COLORTERMENV "-mono");
556 else 519 else
557 putenv ("COLORTERM=" COLORTERMENVFULL); 520 putenv ("COLORTERM=" COLORTERMENVFULL);
558 521
559 if (rs[Rs_term_name] != NULL) 522 if (rs[Rs_term_name] != NULL)
… …
579 * This should support all European type languages. 542 * This should support all European type languages.
580 */ 543 */
581void 544void
582rxvt_term::set_locale (const char *locale) 545rxvt_term::set_locale (const char *locale)
583{ 546{
547 set_environ (envv);
548
584#if HAVE_XSETLOCALE || HAVE_SETLOCALE 549#if HAVE_XSETLOCALE || HAVE_SETLOCALE
585 free (this->locale); 550 free (this->locale);
586 this->locale = setlocale (LC_CTYPE, locale); 551 this->locale = setlocale (LC_CTYPE, locale);
587 552
588 if (!this->locale) 553 if (!this->locale)
589 { 554 {
590 if (*locale) 555 if (*locale)
591 { 556 {
592 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);
593 setlocale (LC_CTYPE, ""); 558 setlocale (LC_CTYPE, "C");
594 } 559 }
595 else 560 else
596 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");
597 562
598 this->locale = ""; 563 this->locale = "C";
599 } 564 }
600 565
601 566
602 this->locale = rxvt_strdup (this->locale); 567 this->locale = rxvt_strdup (this->locale);
603 SET_LOCALE (this->locale); 568 SET_LOCALE (this->locale);
… …
618} 583}
619 584
620void 585void
621rxvt_term::init_xlocale () 586rxvt_term::init_xlocale ()
622{ 587{
588 set_environ (envv);
589
623#ifdef USE_XIM 590#ifdef USE_XIM
624 if (!locale) 591 if (!locale)
625 rxvt_warn ("setting locale failed, working without locale support.\n"); 592 rxvt_warn ("setting locale failed, working without locale support.\n");
626 else 593 else
627 { 594 {
… …
649 * Initialize the command connection. 616 * Initialize the command connection.
650 * This should be called after the X server connection is established. 617 * This should be called after the X server connection is established.
651 */ 618 */
652 619
653#ifdef META8_OPTION 620#ifdef META8_OPTION
654 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
655#endif 622#endif
656 623
657 get_ourmods (); 624 get_ourmods ();
658 625
659 if (!(options & Opt_scrollTtyOutput)) 626 if (!OPTION (Opt_scrollTtyOutput))
660 priv_modes |= PrivMode_TtyOutputInh; 627 priv_modes |= PrivMode_TtyOutputInh;
661 if (options & Opt_scrollTtyKeypress) 628 if (OPTION (Opt_scrollTtyKeypress))
662 priv_modes |= PrivMode_Keypress; 629 priv_modes |= PrivMode_Keypress;
663 if (!(options & Opt_jumpScroll)) 630 if (!OPTION (Opt_jumpScroll))
664 priv_modes |= PrivMode_smoothScroll; 631 priv_modes |= PrivMode_smoothScroll;
665 632
666#ifndef NO_BACKSPACE_KEY 633#ifndef NO_BACKSPACE_KEY
667 if (strcmp (key_backspace, "DEC") == 0) 634 if (strcmp (key_backspace, "DEC") == 0)
668 priv_modes |= PrivMode_HaveBackSpace; 635 priv_modes |= PrivMode_HaveBackSpace;
669#endif 636#endif
670 637
671 /* add value for scrollBar */ 638 /* add value for scrollBar */
672 if (scrollbar_visible ()) 639 if (scrollBar.state)
673 { 640 {
674 priv_modes |= PrivMode_scrollBar; 641 priv_modes |= PrivMode_scrollBar;
675 SavedModes |= PrivMode_scrollBar; 642 SavedModes |= PrivMode_scrollBar;
676 } 643 }
677 if (menubar_visible ())
678 {
679 priv_modes |= PrivMode_menuBar;
680 SavedModes |= PrivMode_menuBar;
681 }
682
683#ifdef CURSOR_BLINK
684 if (options & Opt_cursorBlink)
685 (void)gettimeofday (&lastcursorchange, NULL);
686#endif
687 644
688 run_command (argv); 645 run_command (argv);
689} 646}
690 647
691/*----------------------------------------------------------------------*/ 648/*----------------------------------------------------------------------*/
… …
696 653
697#ifdef OFF_FOCUS_FADING 654#ifdef OFF_FOCUS_FADING
698 pix_colors = pix_colors_focused; 655 pix_colors = pix_colors_focused;
699#endif 656#endif
700 657
701 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
702 { 659 {
703 rxvt_color xcol; 660 rxvt_color xcol;
704 661
705 if (!rs[Rs_color + i]) 662 if (!rs[Rs_color + i])
706 continue; 663 continue;
707 664
708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 665 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
709 { 666 {
710#ifndef XTERM_REVERSE_VIDEO 667#ifndef XTERM_REVERSE_VIDEO
711 if (i < 2 && (options & Opt_reverseVideo)) 668 if (i < 2 && OPTION (Opt_reverseVideo))
712 rs[Rs_color + i] = def_colorName[!i]; 669 rs[Rs_color + i] = def_colorName[!i];
713 else 670 else
714#endif 671#endif
715 rs[Rs_color + i] = def_colorName[i]; 672 rs[Rs_color + i] = def_colorName[i];
716 673
… …
741 } 698 }
742 } 699 }
743 } 700 }
744 701
745 pix_colors[i] = xcol; 702 pix_colors[i] = xcol;
703 SET_PIXCOLOR (i);
704 }
705
746#ifdef OFF_FOCUS_FADING 706#ifdef OFF_FOCUS_FADING
747 if (rs[Rs_fade]) 707 if (rs[Rs_fade])
748 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 708 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
709 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
749#endif 710#endif
750 SET_PIXCOLOR (i);
751 }
752 711
753 if (display->depth <= 2) 712 if (depth <= 2)
754 { 713 {
755 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 714 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
756 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 715 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
757 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 716 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
758 } 717 }
759 718
760 /* 719 /*
761 * get scrollBar/menuBar shadow colors 720 * get scrollBar shadow colors
762 * 721 *
763 * The calculations of topShadow/bottomShadow values are adapted 722 * The calculations of topShadow/bottomShadow values are adapted
764 * from the fvwm window manager. 723 * from the fvwm window manager.
765 */ 724 */
766#ifdef KEEP_SCROLLCOLOR 725#ifdef KEEP_SCROLLCOLOR
767 726
768 if (display->depth <= 2) 727 if (depth <= 2)
728 {
769 { /* Monochrome */ 729 /* Monochrome */
770 pix_colors[Color_scroll] = pix_colors[Color_fg]; 730 pix_colors[Color_scroll] = pix_colors[Color_fg];
771 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 731 pix_colors[Color_topShadow] = pix_colors[Color_bg];
772 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
773 } 733 }
774 else 734 else
… …
777 /* xcol[0] == white 737 /* xcol[0] == white
778 * xcol[1] == top shadow 738 * xcol[1] == top shadow
779 * xcol[2] == bot shadow */ 739 * xcol[2] == bot shadow */
780 740
781 xcol[1] = pix_colors[Color_scroll]; 741 xcol[1] = pix_colors[Color_scroll];
782 xcol[0].set (display, 65535, 65535, 65535); 742 xcol[0].set (this, 65535, 65535, 65535);
783 743
784 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 744 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
785 745
786 xcol[0].get (display, pr0, pg0, pb0); 746 xcol[0].get (this, pr0, pg0, pb0);
787 xcol[1].get (display, pr1, pg1, pb1); 747 xcol[1].get (this, pr1, pg1, pb1);
788 748
789 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 749 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
790 750
791 /* topShadowColor */ 751 /* topShadowColor */
792 if (!xcol[1].set (display, 752 if (!xcol[1].set (this,
793 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 753 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
794 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 754 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
795 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 755 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
796 xcol[1] = pix_colors[Color_White]; 756 xcol[1] = pix_colors[Color_White];
797 757
… …
810 int i = atoi (rs[Rs_color + idx]); 770 int i = atoi (rs[Rs_color + idx]);
811 771
812 if (i >= 8 && i <= 15) 772 if (i >= 8 && i <= 15)
813 { /* bright colors */ 773 { /* bright colors */
814 i -= 8; 774 i -= 8;
815#ifndef NO_BRIGHTCOLOR
816 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 775 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
817 return; 776 return;
818#endif
819 } 777 }
820 778
821 if (i >= 0 && i <= 7) /* normal colors */ 779 if (i >= 0 && i <= 7) /* normal colors */
822 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 780 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
823 } 781 }
… …
829 * Use resource ``modifier'' to override the Meta modifier 787 * Use resource ``modifier'' to override the Meta modifier
830 */ 788 */
831void 789void
832rxvt_term::get_ourmods () 790rxvt_term::get_ourmods ()
833{ 791{
834 int i, j, k; 792 int i, j, k;
835 int requestedmeta, realmeta, realalt; 793 int requestedmeta, realmeta, realalt;
836 const char *cm, *rsmod; 794 const char *cm, *rsmod;
837 XModifierKeymap *map; 795 XModifierKeymap *map;
838 KeyCode *kc; 796 KeyCode *kc;
839 const unsigned int modmasks[] = 797 const unsigned int modmasks[] =
840 { 798 {
841 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 799 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
842 }; 800 };
843 801
… …
846 804
847 if (rsmod 805 if (rsmod
848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 806 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
849 requestedmeta = rsmod[3] - '0'; 807 requestedmeta = rsmod[3] - '0';
850 808
851 map = XGetModifierMapping (display->display); 809 map = XGetModifierMapping (xdisp);
852 kc = map->modifiermap; 810 kc = map->modifiermap;
853 811
854 for (i = 1; i < 6; i++) 812 for (i = 1; i < 6; i++)
855 { 813 {
856 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 814 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
858 for (j = map->max_keypermod; j--; k++) 816 for (j = map->max_keypermod; j--; k++)
859 { 817 {
860 if (kc[k] == 0) 818 if (kc[k] == 0)
861 break; 819 break;
862 820
863 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 821 switch (XKeycodeToKeysym (xdisp, kc[k], 0))
864 { 822 {
865 case XK_Num_Lock: 823 case XK_Num_Lock:
866 ModNumLockMask = modmasks[i - 1]; 824 ModNumLockMask = modmasks[i - 1];
867 continue; 825 continue;
868 826
… …
918rxvt_term::create_windows (int argc, const char *const *argv) 876rxvt_term::create_windows (int argc, const char *const *argv)
919{ 877{
920 XClassHint classHint; 878 XClassHint classHint;
921 XWMHints wmHint; 879 XWMHints wmHint;
922#if ENABLE_FRILLS 880#if ENABLE_FRILLS
923 Atom prop = None;
924 MWMHints mwmhints; 881 MWMHints mwmhints;
925#endif 882#endif
926 XGCValues gcvalue; 883 XGCValues gcvalue;
927 long vt_emask;
928 XSetWindowAttributes attributes; 884 XSetWindowAttributes attributes;
929 XWindowAttributes gattr; 885 Window top, parent;
930 886
931#ifdef USING_W11LIB 887 dLocal (Display *, xdisp);
932 /* enable W11 callbacks */
933 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
934#endif
935 888
936 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 889 /* grab colors before netscape does */
937 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 890 Get_Colours ();
938 891
939 if (options & Opt_transparent) 892 if (!set_fonts ())
940 { 893 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
941 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 894
942 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 895 parent = display->root;
943 } 896
897 attributes.override_redirect = !!OPTION (Opt_override_redirect);
944 898
945#if ENABLE_FRILLS 899#if ENABLE_FRILLS
946 if (options & Opt_borderLess) 900 if (OPTION (Opt_borderLess))
947 { 901 {
948 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 902 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
949
950 if (prop == None)
951 { 903 {
952 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 904 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
953#ifdef PREFER_24BIT
954 attributes.override_redirect = TRUE; 905 attributes.override_redirect = TRUE;
955#endif
956 mwmhints.flags = 0; 906 mwmhints.flags = 0;
957 } 907 }
958 else 908 else
959 { 909 {
960 mwmhints.flags = MWM_HINTS_DECORATIONS; 910 mwmhints.flags = MWM_HINTS_DECORATIONS;
961 mwmhints.decorations = 0; 911 mwmhints.decorations = 0;
962 } 912 }
963 } 913 }
964 else 914 else
965 {
966 mwmhints.flags = 0; 915 mwmhints.flags = 0;
916#endif
917
918#if ENABLE_XEMBED
919 if (rs[Rs_embed])
967 } 920 {
968#endif 921 XWindowAttributes wattr;
969 922
970 /* grab colors before netscape does */ 923 parent = strtol (rs[Rs_embed], 0, 0);
971 Get_Colours ();
972 924
973 if (!set_fonts ()) 925 if (!XGetWindowAttributes (xdisp, parent, &wattr))
974 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 926 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
927
928 window_calc (wattr.width, wattr.height);
929 }
930#endif
975 931
976 window_calc (0, 0); 932 window_calc (0, 0);
933
934 /* sub-window placement & size in rxvt_resize_subwindows () */
935 attributes.background_pixel = pix_colors_focused [Color_border];
936 attributes.border_pixel = pix_colors_focused [Color_border];
937 attributes.colormap = cmap;
938
939 top = XCreateWindow (xdisp, parent,
940 szHint.x, szHint.y,
941 szHint.width, szHint.height,
942 ext_bwidth,
943 depth, InputOutput, visual,
944 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
945 &attributes);
946
947 this->parent[0] = top;
948
977 old_width = szHint.width; 949 old_width = szHint.width;
978 old_height = szHint.height; 950 old_height = szHint.height;
979 951
980 /* sub-window placement & size in rxvt_resize_subwindows () */
981
982#ifdef PREFER_24BIT
983 attributes.background_pixel = pix_colors_focused[Color_border];
984 attributes.border_pixel = pix_colors_focused[Color_border];
985 attributes.colormap = display->cmap;
986 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
987 szHint.x, szHint.y,
988 szHint.width, szHint.height,
989 TermWin.ext_bwidth,
990 display->depth, InputOutput,
991 display->visual,
992 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
993#else
994 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
995 szHint.x, szHint.y,
996 szHint.width, szHint.height,
997 TermWin.ext_bwidth,
998 pix_colors_focused[Color_border],
999 pix_colors_focused[Color_border]);
1000#endif
1001
1002 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 952 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1003 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 953 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1004 954
1005 classHint.res_name = (char *)rs[Rs_name]; 955 classHint.res_name = (char *)rs[Rs_name];
1006 classHint.res_class = (char *)RESCLASS; 956 classHint.res_class = (char *)RESCLASS;
1007 957
1008 wmHint.flags = InputHint | StateHint | WindowGroupHint; 958 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1009 wmHint.input = True; 959 wmHint.input = True;
1010 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 960 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1011 wmHint.window_group = TermWin.parent[0]; 961 wmHint.window_group = top;
1012 962
1013 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 963 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1014 (char **)argv, argc, &szHint, &wmHint, &classHint); 964 &szHint, &wmHint, &classHint);
1015
1016 /* Enable delete window protocol */
1017 XSetWMProtocols (display->display, TermWin.parent[0],
1018 &xa[XA_WMDELETEWINDOW], 1);
1019 965
1020#if ENABLE_FRILLS 966#if ENABLE_FRILLS
967 if (mwmhints.flags)
968 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
969 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
970#endif
971
972 Atom protocols[] = {
973 xa[XA_WM_DELETE_WINDOW],
974#if ENABLE_EWMH
975 xa[XA_NET_WM_PING],
976#endif
977 };
978
979 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
980
981#if ENABLE_FRILLS
982 if (rs[Rs_transient_for])
983 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
984#endif
985
986#if ENABLE_EWMH
1021 long pid = getpid (); 987 long pid = getpid ();
1022 988
1023 XChangeProperty (display->display, TermWin.parent[0], 989 XChangeProperty (xdisp, top,
1024 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 990 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1025 PropModeReplace, (unsigned char *)&pid, 1); 991 PropModeReplace, (unsigned char *)&pid, 1);
1026#endif
1027 992
1028 XSelectInput (display->display, TermWin.parent[0], 993 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
994#endif
995
996 XSelectInput (xdisp, top,
1029 KeyPressMask 997 KeyPressMask
1030#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 998#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1031 | KeyReleaseMask 999 | KeyReleaseMask
1032#endif 1000#endif
1033 | FocusChangeMask | VisibilityChangeMask 1001 | FocusChangeMask | VisibilityChangeMask
1034 | ExposureMask
1035 | StructureNotifyMask); 1002 | ExposureMask | StructureNotifyMask);
1003
1036 termwin_ev.start (display, TermWin.parent[0]); 1004 termwin_ev.start (display, top);
1037
1038#if ENABLE_FRILLS
1039 if (mwmhints.flags)
1040 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1041 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1042#endif
1043 1005
1044 /* vt cursor: Black-on-White is standard, but this is more popular */ 1006 /* vt cursor: Black-on-White is standard, but this is more popular */
1045 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1007 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1046 1008
1047#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1009#ifdef HAVE_SCROLLBARS
1048 /* cursor (menuBar/scrollBar): Black-on-White */ 1010 /* cursor scrollBar: Black-on-White */
1049 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1011 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1050#endif 1012#endif
1051 1013
1052 /* the vt window */ 1014 /* the vt window */
1053 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1015 vt = XCreateSimpleWindow (xdisp, top,
1054 window_vt_x,
1055 window_vt_y, 1016 window_vt_x, window_vt_y,
1056 TermWin_TotalWidth (), 1017 width, height,
1057 TermWin_TotalHeight (),
1058 0, 1018 0,
1059 pix_colors_focused[Color_fg], 1019 pix_colors_focused[Color_fg],
1060 pix_colors_focused[Color_bg]); 1020 pix_colors_focused[Color_bg]);
1061#ifdef DEBUG_X
1062 XStoreName (display->display, TermWin.vt, "vt window");
1063#endif
1064 1021
1065 attributes.bit_gravity = NorthWestGravity; 1022 attributes.bit_gravity = NorthWestGravity;
1066 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1023 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1067 1024
1068 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1025 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1069 1026
1070 pointer_unblank (); 1027 if (OPTION (Opt_pointerBlank))
1071
1072#ifdef POINTER_BLANK
1073 if (options & Opt_pointerBlank)
1074 vt_emask |= PointerMotionMask; 1028 vt_emask |= PointerMotionMask;
1075 else 1029 else
1076#endif
1077 vt_emask |= Button1MotionMask | Button3MotionMask; 1030 vt_emask |= Button1MotionMask | Button3MotionMask;
1078 1031
1079 XSelectInput (display->display, TermWin.vt, vt_emask); 1032 vt_select_input ();
1033
1080 vt_ev.start (display, TermWin.vt); 1034 vt_ev.start (display, vt);
1081
1082#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1083 if (menuBar_height ())
1084 {
1085 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1086 window_vt_x, 0,
1087 TermWin_TotalWidth (),
1088 menuBar_TotalHeight (),
1089 0,
1090 pix_colors_focused[Color_fg],
1091 pix_colors_focused[Color_scroll]);
1092
1093#ifdef DEBUG_X
1094 XStoreName (display->display, menuBar.win, "menubar");
1095#endif
1096
1097 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1098
1099 XDefineCursor (display->display, menuBar.win,
1100 XCreateFontCursor (display->display, XC_left_ptr));
1101
1102 XSelectInput (display->display, menuBar.win,
1103 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1104 | Button1MotionMask));
1105 menubar_ev.start (display, menuBar.win);
1106 }
1107#endif
1108 1035
1109#ifdef XPM_BACKGROUND 1036#ifdef XPM_BACKGROUND
1110 if (rs[Rs_backgroundPixmap] != NULL 1037 if (rs[Rs_backgroundPixmap] != NULL
1111 && ! (options & Opt_transparent)) 1038 && !OPTION (Opt_transparent))
1112 { 1039 {
1113 const char *p = rs[Rs_backgroundPixmap]; 1040 const char *p = rs[Rs_backgroundPixmap];
1114 1041
1115 if ((p = strchr (p, ';')) != NULL) 1042 if ((p = strchr (p, ';')) != NULL)
1116 { 1043 {
… …
1122 scr_touch (true); 1049 scr_touch (true);
1123 } 1050 }
1124#endif 1051#endif
1125 1052
1126 /* graphics context for the vt window */ 1053 /* graphics context for the vt window */
1127 gcvalue.foreground = pix_colors[Color_fg]; 1054 gcvalue.foreground = pix_colors[Color_fg];
1128 gcvalue.background = pix_colors[Color_bg]; 1055 gcvalue.background = pix_colors[Color_bg];
1129 gcvalue.graphics_exposures = 1; 1056 gcvalue.graphics_exposures = 1;
1130 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1057
1058 gc = XCreateGC (xdisp, vt,
1131 GCForeground | GCBackground | GCGraphicsExposures, 1059 GCForeground | GCBackground | GCGraphicsExposures,
1132 &gcvalue); 1060 &gcvalue);
1133 1061
1134 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1062 drawable = new rxvt_drawable (this, vt);
1135 1063
1136#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1064#ifdef RXVT_SCROLLBAR
1137 gcvalue.foreground = pix_colors[Color_topShadow]; 1065 gcvalue.foreground = pix_colors[Color_topShadow];
1138 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1066 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1139 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1067 gcvalue.foreground = pix_colors[Color_bottomShadow];
1140 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1068 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1141 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1069 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1142 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1070 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1143#endif 1071#endif
1144 1072
1145#ifdef OFF_FOCUS_FADING 1073#ifdef OFF_FOCUS_FADING
1146 // initially we are in unfocused state 1074 // initially we are in unfocused state
1147 if (rs[Rs_fade]) 1075 if (rs[Rs_fade])
1148 pix_colors = pix_colors_unfocused; 1076 pix_colors = pix_colors_unfocused;
1149#endif 1077#endif
1150 1078
1079 pointer_unblank ();
1151 scr_recolour (); 1080 scr_recolour ();
1152} 1081}
1153 1082
1154/* ------------------------------------------------------------------------- * 1083/* ------------------------------------------------------------------------- *
1155 * GET TTY CURRENT STATE * 1084 * GET TTY CURRENT STATE *
… …
1161 /* 1090 /*
1162 * standard System V termios interface 1091 * standard System V termios interface
1163 */ 1092 */
1164 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1093 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1165 { 1094 {
1166 /* return error - use system defaults */ 1095 // return error - use system defaults,
1096 // where possible, and zero elsewhere
1097 memset (tio, 0, sizeof (ttymode_t));
1098
1167 tio->c_cc[VINTR] = CINTR; 1099 tio->c_cc[VINTR] = CINTR;
1168 tio->c_cc[VQUIT] = CQUIT; 1100 tio->c_cc[VQUIT] = CQUIT;
1169 tio->c_cc[VERASE] = CERASE; 1101 tio->c_cc[VERASE] = CERASE;
1102#ifdef VERASE2
1103 tio->c_cc[VERASE2] = CERASE2;
1104#endif
1170 tio->c_cc[VKILL] = CKILL; 1105 tio->c_cc[VKILL] = CKILL;
1171 tio->c_cc[VSTART] = CSTART; 1106 tio->c_cc[VSTART] = CSTART;
1172 tio->c_cc[VSTOP] = CSTOP; 1107 tio->c_cc[VSTOP] = CSTOP;
1173 tio->c_cc[VSUSP] = CSUSP; 1108 tio->c_cc[VSUSP] = CSUSP;
1174# ifdef VDSUSP 1109# ifdef VDSUSP
1175
1176 tio->c_cc[VDSUSP] = CDSUSP; 1110 tio->c_cc[VDSUSP] = CDSUSP;
1177# endif 1111# endif
1178# ifdef VREPRINT 1112# ifdef VREPRINT
1179
1180 tio->c_cc[VREPRINT] = CRPRNT; 1113 tio->c_cc[VREPRINT] = CRPRNT;
1181# endif 1114# endif
1182# ifdef VDISCRD 1115# ifdef VDISCRD
1183
1184 tio->c_cc[VDISCRD] = CFLUSH; 1116 tio->c_cc[VDISCRD] = CFLUSH;
1185# endif 1117# endif
1186# ifdef VWERSE 1118# ifdef VWERSE
1187
1188 tio->c_cc[VWERSE] = CWERASE; 1119 tio->c_cc[VWERSE] = CWERASE;
1189# endif 1120# endif
1190# ifdef VLNEXT 1121# ifdef VLNEXT
1191
1192 tio->c_cc[VLNEXT] = CLNEXT; 1122 tio->c_cc[VLNEXT] = CLNEXT;
1193# endif 1123# endif
1194
1195 } 1124 }
1125
1196 tio->c_cc[VEOF] = CEOF; 1126 tio->c_cc[VEOF] = CEOF;
1197 tio->c_cc[VEOL] = VDISABLE; 1127 tio->c_cc[VEOL] = VDISABLE;
1198# ifdef VEOL2 1128# ifdef VEOL2
1199
1200 tio->c_cc[VEOL2] = VDISABLE; 1129 tio->c_cc[VEOL2] = VDISABLE;
1201# endif 1130# endif
1202# ifdef VSWTC 1131# ifdef VSWTC
1203
1204 tio->c_cc[VSWTC] = VDISABLE; 1132 tio->c_cc[VSWTC] = VDISABLE;
1205# endif 1133# endif
1206# ifdef VSWTCH 1134# ifdef VSWTCH
1207
1208 tio->c_cc[VSWTCH] = VDISABLE; 1135 tio->c_cc[VSWTCH] = VDISABLE;
1209# endif 1136# endif
1210# if VMIN != VEOF 1137# if VMIN != VEOF
1211
1212 tio->c_cc[VMIN] = 1; 1138 tio->c_cc[VMIN] = 1;
1213# endif 1139# endif
1214# if VTIME != VEOL 1140# if VTIME != VEOL
1215
1216 tio->c_cc[VTIME] = 0; 1141 tio->c_cc[VTIME] = 0;
1217# endif 1142# endif
1218 1143
1219 if (erase != -1) 1144 if (erase != -1)
1220 tio->c_cc[VERASE] = (char)erase; 1145 tio->c_cc[VERASE] = (char)erase;
… …
1248 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1173 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1249 { 1174 {
1250 tio->sg.sg_erase = CERASE; /* ^H */ 1175 tio->sg.sg_erase = CERASE; /* ^H */
1251 tio->sg.sg_kill = CKILL; /* ^U */ 1176 tio->sg.sg_kill = CKILL; /* ^U */
1252 } 1177 }
1178
1253 if (erase != -1) 1179 if (erase != -1)
1254 tio->sg.sg_erase = (char)erase; 1180 tio->sg.sg_erase = (char)erase;
1255 1181
1256 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1182 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1257 1183
… …
1263 tio->tc.t_startc = CSTART; /* ^Q */ 1189 tio->tc.t_startc = CSTART; /* ^Q */
1264 tio->tc.t_stopc = CSTOP; /* ^S */ 1190 tio->tc.t_stopc = CSTOP; /* ^S */
1265 tio->tc.t_eofc = CEOF; /* ^D */ 1191 tio->tc.t_eofc = CEOF; /* ^D */
1266 tio->tc.t_brkc = -1; 1192 tio->tc.t_brkc = -1;
1267 } 1193 }
1194
1268 /* get local special chars */ 1195 /* get local special chars */
1269 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1196 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1270 { 1197 {
1271 tio->lc.t_suspc = CSUSP; /* ^Z */ 1198 tio->lc.t_suspc = CSUSP; /* ^Z */
1272 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1199 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1276 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1203 tio->lc.t_lnextc = CLNEXT; /* ^V */
1277 } 1204 }
1278 /* get line discipline */ 1205 /* get line discipline */
1279 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1206 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1280# ifdef NTTYDISC 1207# ifdef NTTYDISC
1281
1282 tio->line = NTTYDISC; 1208 tio->line = NTTYDISC;
1283# endif /* NTTYDISC */ 1209# endif /* NTTYDISC */
1284 1210
1285 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1211 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1286#endif /* HAVE_TERMIOS_H */ 1212#endif /* HAVE_TERMIOS_H */
… …
1309 FOO (IGNCR, "IGNCR"); 1235 FOO (IGNCR, "IGNCR");
1310 FOO (ICRNL, "ICRNL"); 1236 FOO (ICRNL, "ICRNL");
1311 FOO (IXON, "IXON"); 1237 FOO (IXON, "IXON");
1312 FOO (IXOFF, "IXOFF"); 1238 FOO (IXOFF, "IXOFF");
1313# ifdef IUCLC 1239# ifdef IUCLC
1314
1315 FOO (IUCLC, "IUCLC"); 1240 FOO (IUCLC, "IUCLC");
1316# endif 1241# endif
1317# ifdef IXANY 1242# ifdef IXANY
1318
1319 FOO (IXANY, "IXANY"); 1243 FOO (IXANY, "IXANY");
1320# endif 1244# endif
1321# ifdef IMAXBEL 1245# ifdef IMAXBEL
1322
1323 FOO (IMAXBEL, "IMAXBEL"); 1246 FOO (IMAXBEL, "IMAXBEL");
1324# endif 1247# endif
1325 1248
1326 fprintf (stderr, "\n"); 1249 fprintf (stderr, "\n");
1327 1250
… …
1334 FOO (VERASE, "VERASE"); 1257 FOO (VERASE, "VERASE");
1335 FOO (VKILL, "VKILL"); 1258 FOO (VKILL, "VKILL");
1336 FOO (VEOF, "VEOF"); 1259 FOO (VEOF, "VEOF");
1337 FOO (VEOL, "VEOL"); 1260 FOO (VEOL, "VEOL");
1338# ifdef VEOL2 1261# ifdef VEOL2
1339
1340 FOO (VEOL2, "VEOL2"); 1262 FOO (VEOL2, "VEOL2");
1341# endif 1263# endif
1342# ifdef VSWTC 1264# ifdef VSWTC
1343
1344 FOO (VSWTC, "VSWTC"); 1265 FOO (VSWTC, "VSWTC");
1345# endif 1266# endif
1346# ifdef VSWTCH 1267# ifdef VSWTCH
1347
1348 FOO (VSWTCH, "VSWTCH"); 1268 FOO (VSWTCH, "VSWTCH");
1349# endif 1269# endif
1350
1351 FOO (VSTART, "VSTART"); 1270 FOO (VSTART, "VSTART");
1352 FOO (VSTOP, "VSTOP"); 1271 FOO (VSTOP, "VSTOP");
1353 FOO (VSUSP, "VSUSP"); 1272 FOO (VSUSP, "VSUSP");
1354# ifdef VDSUSP 1273# ifdef VDSUSP
1355
1356 FOO (VDSUSP, "VDSUSP"); 1274 FOO (VDSUSP, "VDSUSP");
1357# endif 1275# endif
1358# ifdef VREPRINT 1276# ifdef VREPRINT
1359
1360 FOO (VREPRINT, "VREPRINT"); 1277 FOO (VREPRINT, "VREPRINT");
1361# endif 1278# endif
1362# ifdef VDISCRD 1279# ifdef VDISCRD
1363
1364 FOO (VDISCRD, "VDISCRD"); 1280 FOO (VDISCRD, "VDISCRD");
1365# endif 1281# endif
1366# ifdef VWERSE 1282# ifdef VWERSE
1367
1368 FOO (VWERSE, "VWERSE"); 1283 FOO (VWERSE, "VWERSE");
1369# endif 1284# endif
1370# ifdef VLNEXT 1285# ifdef VLNEXT
1371
1372 FOO (VLNEXT, "VLNEXT"); 1286 FOO (VLNEXT, "VLNEXT");
1373# endif 1287# endif
1374 1288
1375 fprintf (stderr, "\n"); 1289 fprintf (stderr, "\n");
1376# undef FOO 1290# undef FOO
… …
1385 * the slave. 1299 * the slave.
1386 */ 1300 */
1387void 1301void
1388rxvt_term::run_command (const char *const *argv) 1302rxvt_term::run_command (const char *const *argv)
1389{ 1303{
1304#if ENABLE_FRILLS
1305 if (rs[Rs_pty_fd])
1306 {
1307 pty->pty = atoi (rs[Rs_pty_fd]);
1308
1309 if (pty->pty >= 0)
1310 {
1311 if (getfd_hook)
1312 pty->pty = (*getfd_hook) (pty->pty);
1313
1314 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1315 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1316 }
1317 }
1318 else
1319#endif
1390 if (!pty.get ()) 1320 if (!pty->get ())
1391 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1321 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1392 1322
1393 pty.set_utf8_mode (enc_utf8); 1323 pty->set_utf8_mode (enc_utf8);
1394 1324
1395 /* set initial window size */ 1325 /* set initial window size */
1396 tt_winch (); 1326 tt_winch ();
1397 1327
1398 int er; 1328 int er;
… …
1406#endif 1336#endif
1407 er = -1; 1337 er = -1;
1408 1338
1409 rxvt_get_ttymode (&tio, er); 1339 rxvt_get_ttymode (&tio, er);
1410 1340
1411 sw_chld.start (SIGCHLD); 1341#if ENABLE_FRILLS
1342 if (rs[Rs_pty_fd])
1343 return;
1344#endif
1412 1345
1413#ifndef __QNX__
1414 /* spin off the command interpreter */ 1346 /* spin off the command interpreter */
1415 switch (cmd_pid = fork ()) 1347 switch (cmd_pid = fork ())
1416 { 1348 {
1417 case -1: 1349 case -1:
1350 {
1351 cmd_pid = 0;
1418 rxvt_fatal ("can't fork, aborting.\n"); 1352 rxvt_fatal ("can't fork, aborting.\n");
1353 }
1419 case 0: 1354 case 0:
1420 init_env (); 1355 init_env ();
1421 1356
1422 if (!pty.make_controlling_tty ()) 1357 if (!pty->make_controlling_tty ())
1423 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1358 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1424 else 1359 else
1425 { 1360 {
1426 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1361 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1427 dup2 (pty.tty, STDIN_FILENO); 1362 dup2 (pty->tty, STDIN_FILENO);
1428 dup2 (pty.tty, STDOUT_FILENO); 1363 dup2 (pty->tty, STDOUT_FILENO);
1429 dup2 (pty.tty, STDERR_FILENO); 1364 dup2 (pty->tty, STDERR_FILENO);
1430 1365
1431 // close all our file handles that we do no longer need 1366 // close all our file handles that we do no longer need
1432 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1367 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1433 { 1368 {
1434 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1369 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1435 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1370 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1436 } 1371 }
1437 1372
1438 run_child (argv); 1373 run_child (argv);
1439 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1374 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1440 } 1375 }
1441 1376
1442 _exit (EXIT_FAILURE); 1377 _exit (EXIT_FAILURE);
1443 1378
1444 default: 1379 default:
1445 { 1380 if (!OPTION (Opt_utmpInhibit))
1446#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1381 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1447 int fdstdin;
1448 1382
1449 fdstdin = dup (STDIN_FILENO); 1383 pty->close_tty ();
1450 dup2 (pty.tty, STDIN_FILENO);
1451#endif
1452 1384
1453#ifdef UTMP_SUPPORT 1385 child_ev.start (cmd_pid);
1454 privileged_utmp (SAVE);
1455#endif
1456 1386
1457#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1387 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1458
1459 dup2 (fdstdin, STDIN_FILENO);
1460 close (fdstdin);
1461#endif
1462 }
1463
1464 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1465 break; 1388 break;
1466 } 1389 }
1467#else /* __QNX__ uses qnxspawn () */
1468 fchmod (pty.tty, 0622);
1469 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1470 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1471
1472 if (run_child (argv) == -1)
1473 exit (EXIT_FAILURE);
1474#endif
1475} 1390}
1476 1391
1477/* ------------------------------------------------------------------------- * 1392/* ------------------------------------------------------------------------- *
1478 * CHILD PROCESS OPERATIONS * 1393 * CHILD PROCESS OPERATIONS *
1479 * ------------------------------------------------------------------------- */ 1394 * ------------------------------------------------------------------------- */
… …
1486{ 1401{
1487 char *login; 1402 char *login;
1488 1403
1489 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1404 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1490 1405
1491 if (options & Opt_console) 1406 if (OPTION (Opt_console))
1492 { /* be virtual console, fail silently */ 1407 { /* be virtual console, fail silently */
1493#ifdef TIOCCONS 1408#ifdef TIOCCONS
1494 unsigned int on = 1; 1409 unsigned int on = 1;
1495 1410
1496 ioctl (STDIN_FILENO, TIOCCONS, &on); 1411 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1523 // unblock signals (signals are blocked by iom.C 1438 // unblock signals (signals are blocked by iom.C
1524 sigset_t ss; 1439 sigset_t ss;
1525 sigemptyset (&ss); 1440 sigemptyset (&ss);
1526 sigprocmask (SIG_SETMASK, &ss, 0); 1441 sigprocmask (SIG_SETMASK, &ss, 0);
1527 1442
1528#ifndef __QNX__
1529 /* command interpreter path */ 1443 /* command interpreter path */
1530 if (argv != NULL) 1444 if (argv != NULL)
1531 { 1445 {
1532# ifdef DEBUG_CMD 1446# ifdef DEBUG_CMD
1533 int i; 1447 int i;
… …
1539 execvp (argv[0], (char *const *)argv); 1453 execvp (argv[0], (char *const *)argv);
1540 /* no error message: STDERR is closed! */ 1454 /* no error message: STDERR is closed! */
1541 } 1455 }
1542 else 1456 else
1543 { 1457 {
1544 const char *argv0, *shell; 1458 const char *argv0, *shell;
1545 1459
1546 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1460 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1547 shell = "/bin/sh"; 1461 shell = "/bin/sh";
1548 1462
1549 argv0 = (const char *)rxvt_r_basename (shell); 1463 argv0 = (const char *)rxvt_r_basename (shell);
1550 1464
1551 if (options & Opt_loginShell) 1465 if (OPTION (Opt_loginShell))
1552 { 1466 {
1553 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1467 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1554 1468
1555 login[0] = '-'; 1469 login[0] = '-';
1556 strcpy (&login[1], argv0); 1470 strcpy (&login[1], argv0);
1557 argv0 = login; 1471 argv0 = login;
1558 } 1472 }
1473
1559 execlp (shell, argv0, NULL); 1474 execlp (shell, argv0, NULL);
1560 /* no error message: STDERR is closed! */ 1475 /* no error message: STDERR is closed! */
1561 } 1476 }
1562 1477
1563#else /* __QNX__ uses qnxspawn () */
1564
1565 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1566 char *command = NULL, fullcommand[_MAX_PATH];
1567 char **arg_v, *arg_a[2] = { NULL, NULL };
1568
1569 if (argv != NULL)
1570 {
1571 if (access (argv[0], X_OK) == -1)
1572 {
1573 if (strchr (argv[0], '/') == NULL)
1574 {
1575 searchenv (argv[0], "PATH", fullcommand);
1576
1577 if (fullcommand[0] != '\0')
1578 command = fullcommand;
1579 }
1580
1581 if (access (command, X_OK) == -1)
1582 return -1;
1583 }
1584 else
1585 command = argv[0];
1586
1587 arg_v = argv;
1588 }
1589 else
1590 {
1591 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1592 command = "/bin/sh";
1593
1594 arg_a[0] = my_basename (command);
1595
1596 if (options & Opt_loginShell)
1597 {
1598 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1599
1600 login[0] = '-';
1601 strcpy (&login[1], arg_a[0]);
1602 arg_a[0] = login;
1603 }
1604
1605 arg_v = arg_a;
1606 }
1607
1608 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1609 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1610 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1611 command, arg_v, environ, iov_a, 0);
1612 if (login)
1613 free (login);
1614
1615 pty.close_tty ();
1616 return pty.pty;
1617#endif
1618
1619 return -1; 1478 return -1;
1620} 1479}
1621 1480
1622/*----------------------- end-of-file (C source) -----------------------*/ 1481/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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