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.122 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.158 by root, Sun Jan 29 20:51:28 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) */
… …
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "black",
176#endif 176#endif
177 }; 177 };
178 178
179const char *const xa_names[] =
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif
216 };
217
218bool 179bool
219rxvt_term::init_vars () 180rxvt_term::init_vars ()
220{ 181{
182 pix_colors = //
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 186#endif
225 pix_colors = pix_colors_focused;
226
227 if (pix_colors == NULL)
228 return false;
229 187
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231 pixmap = None; 189 pixmap = None;
232#endif 190#endif
233 191
234 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS; 194 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 195 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 196 priv_modes = SavedModes = PrivMode_Default;
239 focus = 0;
240 ncol = 80; 197 ncol = 80;
241 nrow = 24; 198 nrow = 24;
242 int_bwidth = INTERNALBORDERWIDTH; 199 int_bwidth = INTERNALBORDERWIDTH;
243 ext_bwidth = EXTERNALBORDERWIDTH; 200 ext_bwidth = EXTERNALBORDERWIDTH;
244 lineSpace = LINESPACE; 201 lineSpace = LINESPACE;
245 saveLines = SAVELINES; 202 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS; 203 numpix_colors = TOTAL_COLORS;
247 204
248 refresh_limit = 1; 205 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 206 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 207
252 oldcursor.row = oldcursor.col = -1; 208 oldcursor.row = oldcursor.col = -1;
253#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
254 /* bgPixmap.w = bgPixmap.h = 0; */ 210 /* bgPixmap.w = bgPixmap.h = 0; */
255 bgPixmap.x = bgPixmap.y = 50; 211 bgPixmap.x = bgPixmap.y = 50;
256 bgPixmap.pixmap = None; 212 bgPixmap.pixmap = None;
257#endif 213#endif
258 214
259 last_bot = last_state = -1; 215 last_bot = last_state = -1;
260
261#ifdef MENUBAR
262 menu_readonly = 1;
263# if ! (MENUBAR_MAX > 1)
264 CurrentBar = &BarList;
265# endif /* (MENUBAR_MAX > 1) */
266#endif
267 216
268 return true; 217 return true;
269} 218}
270 219
271void 220void
… …
339 rs[Rs_name] = rxvt_r_basename (argv[0]); 288 rs[Rs_name] = rxvt_r_basename (argv[0]);
340 289
341 /* 290 /*
342 * Open display, get options/resources and create the window 291 * Open display, get options/resources and create the window
343 */ 292 */
293
344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 294 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345 rs[Rs_display_name] = ":0"; 295 rs[Rs_display_name] = ":0";
346 296
347 get_options (r_argc, r_argv); 297 get_options (r_argc, r_argv);
348 298
349 if (!(display = displays.get (rs[Rs_display_name]))) 299 if (!(display = displays.get (rs[Rs_display_name])))
350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
351 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
352 extract_resources (); 311 extract_resources ();
312
353 free (r_argv); 313 free (r_argv);
314
315#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default";
318
319 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
320 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
321 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
322 {
323 rxvt_perl.init (this);
324 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
325 }
326#endif
354 327
355 /* 328 /*
356 * set any defaults not already set 329 * set any defaults not already set
357 */ 330 */
358 if (cmd_argv && cmd_argv[0]) 331 if (cmd_argv && cmd_argv[0])
… …
369 if (!rs[Rs_iconName]) 342 if (!rs[Rs_iconName])
370 rs[Rs_iconName] = rs[Rs_name]; 343 rs[Rs_iconName] = rs[Rs_name];
371 } 344 }
372 345
373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 346 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374 saveLines = BOUND_POSITIVE_INT16 (i); 347 saveLines = min (i, MAX_SAVELINES);
375 348
376#if ENABLE_FRILLS 349#if ENABLE_FRILLS
377 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)
378 int_bwidth = min (i, 100); /* arbitrary limit */ 351 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
352
379 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)
380 ext_bwidth = min (i, 100); /* arbitrary limit */ 354 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
355
381 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 356 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
382 lineSpace = min (i, 100); /* arbitrary limit */ 357 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
383#endif 358#endif
384 359
385#ifdef POINTER_BLANK 360#ifdef POINTER_BLANK
386 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 361 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
387 pointerBlankDelay = i; 362 pointerBlankDelay = i;
… …
389 pointerBlankDelay = 2; 364 pointerBlankDelay = 2;
390#endif 365#endif
391 366
392 /* no point having a scrollbar without having any scrollback! */ 367 /* no point having a scrollbar without having any scrollback! */
393 if (!saveLines) 368 if (!saveLines)
394 options &= ~Opt_scrollBar; 369 set_option (Opt_scrollBar, 0);
395 370
396#ifdef PRINTPIPE 371#ifdef PRINTPIPE
397 if (!rs[Rs_print_pipe]) 372 if (!rs[Rs_print_pipe])
398 rs[Rs_print_pipe] = PRINTPIPE; 373 rs[Rs_print_pipe] = PRINTPIPE;
399#endif 374#endif
… …
442 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]);
443#endif 418#endif
444 419
445#ifdef XTERM_REVERSE_VIDEO 420#ifdef XTERM_REVERSE_VIDEO
446 /* this is how xterm implements reverseVideo */ 421 /* this is how xterm implements reverseVideo */
447 if (options & Opt_reverseVideo) 422 if (OPTION (Opt_reverseVideo))
448 { 423 {
449 if (!rs[Rs_color + Color_fg]) 424 if (!rs[Rs_color + Color_fg])
450 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 425 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
451 if (!rs[Rs_color + Color_bg]) 426 if (!rs[Rs_color + Color_bg])
452 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 427 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
457 if (!rs[Rs_color + i]) 432 if (!rs[Rs_color + i])
458 rs[Rs_color + i] = def_colorName[i]; 433 rs[Rs_color + i] = def_colorName[i];
459 434
460#ifndef XTERM_REVERSE_VIDEO 435#ifndef XTERM_REVERSE_VIDEO
461 /* this is how we implement reverseVideo */ 436 /* this is how we implement reverseVideo */
462 if (options & Opt_reverseVideo) 437 if (OPTION (Opt_reverseVideo))
463 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]);
464#endif 439#endif
465 440
466 /* convenient aliases for setting fg/bg to colors */ 441 /* convenient aliases for setting fg/bg to colors */
467 color_aliases (Color_fg); 442 color_aliases (Color_fg);
468 color_aliases (Color_bg); 443 color_aliases (Color_bg);
… …
507 val = rxvt_network_display (rs[Rs_display_name]); 482 val = rxvt_network_display (rs[Rs_display_name]);
508 rs[Rs_display_name] = (const char *)val; 483 rs[Rs_display_name] = (const char *)val;
509 484
510 if (val == NULL) 485 if (val == NULL)
511#endif /* DISPLAY_IS_IP */ 486#endif /* DISPLAY_IS_IP */
512 val = XDisplayString (display->display); 487 val = XDisplayString (xdisp);
513 488
514 if (rs[Rs_display_name] == NULL) 489 if (rs[Rs_display_name] == NULL)
515 rs[Rs_display_name] = val; /* use broken `:0' value */ 490 rs[Rs_display_name] = val; /* use broken `:0' value */
516 491
517 i = strlen (val); 492 i = strlen (val);
518 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
519 494
520 sprintf (env_display, "DISPLAY=%s", val); 495 sprintf (env_display, "DISPLAY=%s", val);
521 496
522 /* avoiding the math library: 497 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
523 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
524 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
525 ;
526 MAX_IT (i, 1);
527 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
528
529 sprintf (env_windowid, "WINDOWID=%u",
530 (unsigned int)parent[0]);
531 498
532 /* add entries to the environment: 499 /* add entries to the environment:
533 * @ DISPLAY: in case we started with -display 500 * @ DISPLAY: in case we started with -display
534 * @ WINDOWID: X window id number of the window 501 * @ WINDOWID: X window id number of the window
535 * @ COLORTERM: terminal sub-name and also indicates its color 502 * @ COLORTERM: terminal sub-name and also indicates its color
… …
537 * @ TERMINFO: path to terminfo directory 504 * @ TERMINFO: path to terminfo directory
538 * @ COLORFGBG: fg;bg color codes 505 * @ COLORFGBG: fg;bg color codes
539 */ 506 */
540 putenv (env_display); 507 putenv (env_display);
541 putenv (env_windowid); 508 putenv (env_windowid);
509
542 if (env_colorfgbg) 510 if (env_colorfgbg)
543 putenv (env_colorfgbg); 511 putenv (env_colorfgbg);
544 512
545#ifdef RXVT_TERMINFO 513#ifdef RXVT_TERMINFO
546 putenv ("TERMINFO=" RXVT_TERMINFO); 514 putenv ("TERMINFO=" RXVT_TERMINFO);
547#endif 515#endif
548 516
549 if (display->depth <= 2) 517 if (depth <= 2)
550 putenv ("COLORTERM=" COLORTERMENV "-mono"); 518 putenv ("COLORTERM=" COLORTERMENV "-mono");
551 else 519 else
552 putenv ("COLORTERM=" COLORTERMENVFULL); 520 putenv ("COLORTERM=" COLORTERMENVFULL);
553 521
554 if (rs[Rs_term_name] != NULL) 522 if (rs[Rs_term_name] != NULL)
… …
574 * This should support all European type languages. 542 * This should support all European type languages.
575 */ 543 */
576void 544void
577rxvt_term::set_locale (const char *locale) 545rxvt_term::set_locale (const char *locale)
578{ 546{
547 set_environ (envv);
548
579#if HAVE_XSETLOCALE || HAVE_SETLOCALE 549#if HAVE_XSETLOCALE || HAVE_SETLOCALE
580 free (this->locale); 550 free (this->locale);
581 this->locale = setlocale (LC_CTYPE, locale); 551 this->locale = setlocale (LC_CTYPE, locale);
582 552
583 if (!this->locale) 553 if (!this->locale)
584 { 554 {
585 if (*locale) 555 if (*locale)
586 { 556 {
587 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);
588 setlocale (LC_CTYPE, ""); 558 setlocale (LC_CTYPE, "C");
589 } 559 }
590 else 560 else
591 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");
592 562
593 this->locale = ""; 563 this->locale = "C";
594 } 564 }
595 565
596 566
597 this->locale = rxvt_strdup (this->locale); 567 this->locale = rxvt_strdup (this->locale);
598 SET_LOCALE (this->locale); 568 SET_LOCALE (this->locale);
… …
613} 583}
614 584
615void 585void
616rxvt_term::init_xlocale () 586rxvt_term::init_xlocale ()
617{ 587{
588 set_environ (envv);
589
618#ifdef USE_XIM 590#ifdef USE_XIM
619 if (!locale) 591 if (!locale)
620 rxvt_warn ("setting locale failed, working without locale support.\n"); 592 rxvt_warn ("setting locale failed, working without locale support.\n");
621 else 593 else
622 { 594 {
… …
644 * Initialize the command connection. 616 * Initialize the command connection.
645 * This should be called after the X server connection is established. 617 * This should be called after the X server connection is established.
646 */ 618 */
647 619
648#ifdef META8_OPTION 620#ifdef META8_OPTION
649 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
650#endif 622#endif
651 623
652 get_ourmods (); 624 get_ourmods ();
653 625
654 if (!(options & Opt_scrollTtyOutput)) 626 if (!OPTION (Opt_scrollTtyOutput))
655 priv_modes |= PrivMode_TtyOutputInh; 627 priv_modes |= PrivMode_TtyOutputInh;
656 if (options & Opt_scrollTtyKeypress) 628 if (OPTION (Opt_scrollTtyKeypress))
657 priv_modes |= PrivMode_Keypress; 629 priv_modes |= PrivMode_Keypress;
658 if (!(options & Opt_jumpScroll)) 630 if (!OPTION (Opt_jumpScroll))
659 priv_modes |= PrivMode_smoothScroll; 631 priv_modes |= PrivMode_smoothScroll;
660 632
661#ifndef NO_BACKSPACE_KEY 633#ifndef NO_BACKSPACE_KEY
662 if (strcmp (key_backspace, "DEC") == 0) 634 if (strcmp (key_backspace, "DEC") == 0)
663 priv_modes |= PrivMode_HaveBackSpace; 635 priv_modes |= PrivMode_HaveBackSpace;
664#endif 636#endif
665 637
666 /* add value for scrollBar */ 638 /* add value for scrollBar */
667 if (scrollbar_visible ()) 639 if (scrollBar.state)
668 { 640 {
669 priv_modes |= PrivMode_scrollBar; 641 priv_modes |= PrivMode_scrollBar;
670 SavedModes |= PrivMode_scrollBar; 642 SavedModes |= PrivMode_scrollBar;
671 } 643 }
672
673 if (menubar_visible ())
674 {
675 priv_modes |= PrivMode_menuBar;
676 SavedModes |= PrivMode_menuBar;
677 }
678
679#ifdef CURSOR_BLINK
680 if (options & Opt_cursorBlink)
681 (void)gettimeofday (&lastcursorchange, NULL);
682#endif
683 644
684 run_command (argv); 645 run_command (argv);
685} 646}
686 647
687/*----------------------------------------------------------------------*/ 648/*----------------------------------------------------------------------*/
… …
692 653
693#ifdef OFF_FOCUS_FADING 654#ifdef OFF_FOCUS_FADING
694 pix_colors = pix_colors_focused; 655 pix_colors = pix_colors_focused;
695#endif 656#endif
696 657
697 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
698 { 659 {
699 rxvt_color xcol; 660 rxvt_color xcol;
700 661
701 if (!rs[Rs_color + i]) 662 if (!rs[Rs_color + i])
702 continue; 663 continue;
703 664
704 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 665 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
705 { 666 {
706#ifndef XTERM_REVERSE_VIDEO 667#ifndef XTERM_REVERSE_VIDEO
707 if (i < 2 && (options & Opt_reverseVideo)) 668 if (i < 2 && OPTION (Opt_reverseVideo))
708 rs[Rs_color + i] = def_colorName[!i]; 669 rs[Rs_color + i] = def_colorName[!i];
709 else 670 else
710#endif 671#endif
711 rs[Rs_color + i] = def_colorName[i]; 672 rs[Rs_color + i] = def_colorName[i];
712 673
… …
742 SET_PIXCOLOR (i); 703 SET_PIXCOLOR (i);
743 } 704 }
744 705
745#ifdef OFF_FOCUS_FADING 706#ifdef OFF_FOCUS_FADING
746 if (rs[Rs_fade]) 707 if (rs[Rs_fade])
747 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 708 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
748 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 709 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
749#endif 710#endif
750 711
751 if (display->depth <= 2) 712 if (depth <= 2)
752 { 713 {
753 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];
754 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];
755 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];
756 } 717 }
757 718
758 /* 719 /*
759 * get scrollBar/menuBar shadow colors 720 * get scrollBar shadow colors
760 * 721 *
761 * The calculations of topShadow/bottomShadow values are adapted 722 * The calculations of topShadow/bottomShadow values are adapted
762 * from the fvwm window manager. 723 * from the fvwm window manager.
763 */ 724 */
764#ifdef KEEP_SCROLLCOLOR 725#ifdef KEEP_SCROLLCOLOR
765 726
766 if (display->depth <= 2) 727 if (depth <= 2)
767 { 728 {
768 /* Monochrome */ 729 /* Monochrome */
769 pix_colors[Color_scroll] = pix_colors[Color_fg]; 730 pix_colors[Color_scroll] = pix_colors[Color_fg];
770 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 731 pix_colors[Color_topShadow] = pix_colors[Color_bg];
771 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
… …
776 /* xcol[0] == white 737 /* xcol[0] == white
777 * xcol[1] == top shadow 738 * xcol[1] == top shadow
778 * xcol[2] == bot shadow */ 739 * xcol[2] == bot shadow */
779 740
780 xcol[1] = pix_colors[Color_scroll]; 741 xcol[1] = pix_colors[Color_scroll];
781 xcol[0].set (display, 65535, 65535, 65535); 742 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC));
782 743
783 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 744 rxvt_rgba c0, c1;
784 745
785 xcol[0].get (display, pr0, pg0, pb0); 746 xcol[0].get (this, c0);
786 xcol[1].get (display, pr1, pg1, pb1); 747 xcol[1].get (this, c1);
787 748
788 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 749 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
789 750
790 /* topShadowColor */ 751 /* topShadowColor */
791 if (!xcol[1].set (display, 752 if (!xcol[1].set (this,
753 rxvt_rgba (
792 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 754 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5),
793 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 755 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5),
794 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 756 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5),
757 c1.a) // pa1 vs. pa0: arbitrary
758 ));
795 xcol[1] = pix_colors[Color_White]; 759 xcol[1] = pix_colors[Color_White];
796 760
797 pix_colors[Color_topShadow] = xcol[1]; 761 pix_colors[Color_topShadow] = xcol[1];
798 } 762 }
799#endif /* KEEP_SCROLLCOLOR */ 763#endif /* KEEP_SCROLLCOLOR */
… …
809 int i = atoi (rs[Rs_color + idx]); 773 int i = atoi (rs[Rs_color + idx]);
810 774
811 if (i >= 8 && i <= 15) 775 if (i >= 8 && i <= 15)
812 { /* bright colors */ 776 { /* bright colors */
813 i -= 8; 777 i -= 8;
814#ifndef NO_BRIGHTCOLOR
815 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 778 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
816 return; 779 return;
817#endif
818 } 780 }
819 781
820 if (i >= 0 && i <= 7) /* normal colors */ 782 if (i >= 0 && i <= 7) /* normal colors */
821 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 783 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
822 } 784 }
… …
845 807
846 if (rsmod 808 if (rsmod
847 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 809 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
848 requestedmeta = rsmod[3] - '0'; 810 requestedmeta = rsmod[3] - '0';
849 811
850 map = XGetModifierMapping (display->display); 812 map = XGetModifierMapping (xdisp);
851 kc = map->modifiermap; 813 kc = map->modifiermap;
852 814
853 for (i = 1; i < 6; i++) 815 for (i = 1; i < 6; i++)
854 { 816 {
855 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 817 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
857 for (j = map->max_keypermod; j--; k++) 819 for (j = map->max_keypermod; j--; k++)
858 { 820 {
859 if (kc[k] == 0) 821 if (kc[k] == 0)
860 break; 822 break;
861 823
862 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 824 switch (XKeycodeToKeysym (xdisp, kc[k], 0))
863 { 825 {
864 case XK_Num_Lock: 826 case XK_Num_Lock:
865 ModNumLockMask = modmasks[i - 1]; 827 ModNumLockMask = modmasks[i - 1];
866 continue; 828 continue;
867 829
… …
917rxvt_term::create_windows (int argc, const char *const *argv) 879rxvt_term::create_windows (int argc, const char *const *argv)
918{ 880{
919 XClassHint classHint; 881 XClassHint classHint;
920 XWMHints wmHint; 882 XWMHints wmHint;
921#if ENABLE_FRILLS 883#if ENABLE_FRILLS
922 Atom prop = None;
923 MWMHints mwmhints; 884 MWMHints mwmhints;
924#endif 885#endif
925 XGCValues gcvalue; 886 XGCValues gcvalue;
926 long vt_emask;
927 XSetWindowAttributes attributes; 887 XSetWindowAttributes attributes;
928 XWindowAttributes gattr;
929 Window top, parent; 888 Window top, parent;
930 dDisp;
931 889
932#ifdef USING_W11LIB 890 dLocal (Display *, xdisp);
933 /* enable W11 callbacks */
934 W11AddEventHandler (disp, rxvt_W11_process_x_event);
935#endif
936 891
937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 892 /* grab colors before netscape does */
938 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 893 Get_Colours ();
939 894
940 if (options & Opt_transparent) 895 if (!set_fonts ())
941 { 896 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
942 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 897
943 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 898 parent = display->root;
944 } 899
900 attributes.override_redirect = !!OPTION (Opt_override_redirect);
945 901
946#if ENABLE_FRILLS 902#if ENABLE_FRILLS
947 if (options & Opt_borderLess) 903 if (OPTION (Opt_borderLess))
948 { 904 {
949 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 905 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
950
951 if (prop == None)
952 { 906 {
953 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 907 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
954#ifdef PREFER_24BIT
955 attributes.override_redirect = TRUE; 908 attributes.override_redirect = true;
956#endif
957 mwmhints.flags = 0; 909 mwmhints.flags = 0;
958 } 910 }
959 else 911 else
960 { 912 {
961 mwmhints.flags = MWM_HINTS_DECORATIONS; 913 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
964 } 916 }
965 else 917 else
966 mwmhints.flags = 0; 918 mwmhints.flags = 0;
967#endif 919#endif
968 920
969 /* grab colors before netscape does */
970 Get_Colours ();
971
972 if (!set_fonts ())
973 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
974
975 parent = DefaultRootWindow (disp);
976
977#if ENABLE_XEMBED 921#if ENABLE_XEMBED
978 if (rs[Rs_embed]) 922 if (rs[Rs_embed])
979 { 923 {
980 XWindowAttributes wattr; 924 XWindowAttributes wattr;
981 925
982 parent = strtol (rs[Rs_embed], 0, 0); 926 parent = strtol (rs[Rs_embed], 0, 0);
983 927
984 if (!XGetWindowAttributes (disp, parent, &wattr)) 928 if (!XGetWindowAttributes (xdisp, parent, &wattr))
985 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 929 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
986 930
987 window_calc (wattr.width, wattr.height); 931 window_calc (wattr.width, wattr.height);
988 } 932 }
989#endif 933#endif
990 934
991 window_calc (0, 0); 935 window_calc (0, 0);
992 936
993 /* sub-window placement & size in rxvt_resize_subwindows () */ 937 /* sub-window placement & size in rxvt_resize_subwindows () */
994#ifdef PREFER_24BIT
995 attributes.background_pixel = pix_colors_focused[Color_border]; 938 attributes.background_pixel = pix_colors_focused [Color_border];
996 attributes.border_pixel = pix_colors_focused[Color_border]; 939 attributes.border_pixel = pix_colors_focused [Color_border];
997 attributes.colormap = display->cmap; 940 attributes.colormap = cmap;
941
998 top = XCreateWindow (disp, parent, 942 top = XCreateWindow (xdisp, parent,
999 szHint.x, szHint.y, 943 szHint.x, szHint.y,
1000 szHint.width, szHint.height, 944 szHint.width, szHint.height,
1001 ext_bwidth, 945 ext_bwidth,
1002 display->depth, InputOutput, 946 depth, InputOutput, visual,
1003 display->visual,
1004 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 947 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1005#else 948 &attributes);
1006 top = XCreateSimpleWindow (disp, parent,
1007 szHint.x, szHint.y,
1008 szHint.width, szHint.height,
1009 ext_bwidth,
1010 pix_colors_focused[Color_border],
1011 pix_colors_focused[Color_border]);
1012#endif
1013 949
1014 this->parent[0] = top; 950 this->parent[0] = top;
1015 951
1016 old_width = szHint.width; 952 old_width = szHint.width;
1017 old_height = szHint.height; 953 old_height = szHint.height;
1018 954
1019 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 955 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1020 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 956 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1021 957
1022 classHint.res_name = (char *)rs[Rs_name]; 958 classHint.res_name = (char *)rs[Rs_name];
1023 classHint.res_class = (char *)RESCLASS; 959 classHint.res_class = (char *)RESCLASS;
1024 960
1025 wmHint.flags = InputHint | StateHint | WindowGroupHint; 961 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1026 wmHint.input = True; 962 wmHint.input = True;
1027 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 963 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1028 wmHint.window_group = top; 964 wmHint.window_group = top;
1029 965
1030 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 966 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1031 &szHint, &wmHint, &classHint); 967 &szHint, &wmHint, &classHint);
968
969#if ENABLE_FRILLS
970 if (mwmhints.flags)
971 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
972 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
973#endif
1032 974
1033 Atom protocols[] = { 975 Atom protocols[] = {
1034 xa[XA_WM_DELETE_WINDOW], 976 xa[XA_WM_DELETE_WINDOW],
1035#if ENABLE_EWMH 977#if ENABLE_EWMH
1036 xa[XA_NET_WM_PING], 978 xa[XA_NET_WM_PING],
1037#endif 979#endif
1038 }; 980 };
1039 981
1040 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 982 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
983
984#if ENABLE_FRILLS
985 if (rs[Rs_transient_for])
986 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
987#endif
1041 988
1042#if ENABLE_EWMH 989#if ENABLE_EWMH
1043 long pid = getpid (); 990 long pid = getpid ();
1044 991
1045 XChangeProperty (disp, top, 992 XChangeProperty (xdisp, top,
1046 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 993 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1047 PropModeReplace, (unsigned char *)&pid, 1); 994 PropModeReplace, (unsigned char *)&pid, 1);
1048 995
1049 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 996 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1050#endif 997#endif
1051 998
1052 XSelectInput (disp, top, 999 XSelectInput (xdisp, top,
1053 KeyPressMask 1000 KeyPressMask
1054#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1001#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1055 | KeyReleaseMask 1002 | KeyReleaseMask
1056#endif 1003#endif
1057 | FocusChangeMask | VisibilityChangeMask 1004 | FocusChangeMask | VisibilityChangeMask
1058 | ExposureMask | StructureNotifyMask); 1005 | ExposureMask | StructureNotifyMask);
1059 1006
1060 termwin_ev.start (display, top); 1007 termwin_ev.start (display, top);
1061 1008
1062#if ENABLE_FRILLS
1063 if (mwmhints.flags)
1064 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1065 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1066#endif
1067
1068 /* vt cursor: Black-on-White is standard, but this is more popular */ 1009 /* vt cursor: Black-on-White is standard, but this is more popular */
1069 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1010 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1070 1011
1071#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1012#ifdef HAVE_SCROLLBARS
1072 /* cursor (menuBar/scrollBar): Black-on-White */ 1013 /* cursor scrollBar: Black-on-White */
1073 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1014 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1074#endif 1015#endif
1075 1016
1076 /* the vt window */ 1017 /* the vt window */
1077 vt = XCreateSimpleWindow (disp, top, 1018 vt = XCreateSimpleWindow (xdisp, top,
1078 window_vt_x,
1079 window_vt_y, 1019 window_vt_x, window_vt_y,
1080 TermWin_TotalWidth (), 1020 width, height,
1081 TermWin_TotalHeight (),
1082 0, 1021 0,
1083 pix_colors_focused[Color_fg], 1022 pix_colors_focused[Color_fg],
1084 pix_colors_focused[Color_bg]); 1023 pix_colors_focused[Color_bg]);
1085#ifdef DEBUG_X
1086 XStoreName (disp, vt, "vt window");
1087#endif
1088 1024
1089 attributes.bit_gravity = NorthWestGravity; 1025 attributes.bit_gravity = NorthWestGravity;
1090 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1026 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1091 1027
1092 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1028 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1093 1029
1094#ifdef POINTER_BLANK 1030 if (OPTION (Opt_pointerBlank))
1095 if (options & Opt_pointerBlank)
1096 vt_emask |= PointerMotionMask; 1031 vt_emask |= PointerMotionMask;
1097 else 1032 else
1098#endif
1099 vt_emask |= Button1MotionMask | Button3MotionMask; 1033 vt_emask |= Button1MotionMask | Button3MotionMask;
1100 1034
1101 XSelectInput (disp, vt, vt_emask); 1035 vt_select_input ();
1036
1102 vt_ev.start (display, vt); 1037 vt_ev.start (display, vt);
1103
1104#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1105 if (menuBar_height ())
1106 {
1107 menuBar.win = XCreateSimpleWindow (disp, top,
1108 window_vt_x, 0,
1109 TermWin_TotalWidth (),
1110 menuBar_TotalHeight (),
1111 0,
1112 pix_colors_focused[Color_fg],
1113 pix_colors_focused[Color_scroll]);
1114
1115#ifdef DEBUG_X
1116 XStoreName (disp, menuBar.win, "menubar");
1117#endif
1118
1119 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1120
1121 XDefineCursor (disp, menuBar.win,
1122 XCreateFontCursor (disp, XC_left_ptr));
1123
1124 XSelectInput (disp, menuBar.win,
1125 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1126 menubar_ev.start (display, menuBar.win);
1127 }
1128#endif
1129 1038
1130#ifdef XPM_BACKGROUND 1039#ifdef XPM_BACKGROUND
1131 if (rs[Rs_backgroundPixmap] != NULL 1040 if (rs[Rs_backgroundPixmap] != NULL
1132 && ! (options & Opt_transparent)) 1041 && !OPTION (Opt_transparent))
1133 { 1042 {
1134 const char *p = rs[Rs_backgroundPixmap]; 1043 const char *p = rs[Rs_backgroundPixmap];
1135 1044
1136 if ((p = strchr (p, ';')) != NULL) 1045 if ((p = strchr (p, ';')) != NULL)
1137 { 1046 {
… …
1143 scr_touch (true); 1052 scr_touch (true);
1144 } 1053 }
1145#endif 1054#endif
1146 1055
1147 /* graphics context for the vt window */ 1056 /* graphics context for the vt window */
1148 gcvalue.foreground = pix_colors[Color_fg]; 1057 gcvalue.foreground = pix_colors[Color_fg];
1149 gcvalue.background = pix_colors[Color_bg]; 1058 gcvalue.background = pix_colors[Color_bg];
1150 gcvalue.graphics_exposures = 1; 1059 gcvalue.graphics_exposures = 1;
1060
1151 gc = XCreateGC (disp, vt, 1061 gc = XCreateGC (xdisp, vt,
1152 GCForeground | GCBackground | GCGraphicsExposures, 1062 GCForeground | GCBackground | GCGraphicsExposures,
1153 &gcvalue); 1063 &gcvalue);
1154 1064
1155 drawable = new rxvt_drawable (display, vt); 1065 drawable = new rxvt_drawable (this, vt);
1156 1066
1157#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1067#ifdef RXVT_SCROLLBAR
1158 gcvalue.foreground = pix_colors[Color_topShadow]; 1068 gcvalue.foreground = pix_colors[Color_topShadow];
1159 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1069 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1160 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1070 gcvalue.foreground = pix_colors[Color_bottomShadow];
1161 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1071 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1162 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1072 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1163 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1073 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1164#endif 1074#endif
1165 1075
1166#ifdef OFF_FOCUS_FADING 1076#ifdef OFF_FOCUS_FADING
1167 // initially we are in unfocused state 1077 // initially we are in unfocused state
1168 if (rs[Rs_fade]) 1078 if (rs[Rs_fade])
1169 pix_colors = pix_colors_unfocused; 1079 pix_colors = pix_colors_unfocused;
1170#endif 1080#endif
1171 1081
1172 pointer_unblank (); 1082 pointer_unblank ();
1173 scr_recolour (); 1083 scr_recolour ();
1174
1175#if ENABLE_XEMBED
1176 if (rs[Rs_embed])
1177 {
1178 long info[2] = { 0, XEMBED_MAPPED };
1179
1180 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1181 32, PropModeReplace, (unsigned char *)&info, 2);
1182 }
1183#endif
1184} 1084}
1185 1085
1186/* ------------------------------------------------------------------------- * 1086/* ------------------------------------------------------------------------- *
1187 * GET TTY CURRENT STATE * 1087 * GET TTY CURRENT STATE *
1188 * ------------------------------------------------------------------------- */ 1088 * ------------------------------------------------------------------------- */
… …
1193 /* 1093 /*
1194 * standard System V termios interface 1094 * standard System V termios interface
1195 */ 1095 */
1196 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1096 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1197 { 1097 {
1198 /* return error - use system defaults */ 1098 // return error - use system defaults,
1099 // where possible, and zero elsewhere
1100 memset (tio, 0, sizeof (ttymode_t));
1101
1199 tio->c_cc[VINTR] = CINTR; 1102 tio->c_cc[VINTR] = CINTR;
1200 tio->c_cc[VQUIT] = CQUIT; 1103 tio->c_cc[VQUIT] = CQUIT;
1201 tio->c_cc[VERASE] = CERASE; 1104 tio->c_cc[VERASE] = CERASE;
1105#ifdef VERASE2
1106 tio->c_cc[VERASE2] = CERASE2;
1107#endif
1202 tio->c_cc[VKILL] = CKILL; 1108 tio->c_cc[VKILL] = CKILL;
1203 tio->c_cc[VSTART] = CSTART; 1109 tio->c_cc[VSTART] = CSTART;
1204 tio->c_cc[VSTOP] = CSTOP; 1110 tio->c_cc[VSTOP] = CSTOP;
1205 tio->c_cc[VSUSP] = CSUSP; 1111 tio->c_cc[VSUSP] = CSUSP;
1206# ifdef VDSUSP 1112# ifdef VDSUSP
… …
1399rxvt_term::run_command (const char *const *argv) 1305rxvt_term::run_command (const char *const *argv)
1400{ 1306{
1401#if ENABLE_FRILLS 1307#if ENABLE_FRILLS
1402 if (rs[Rs_pty_fd]) 1308 if (rs[Rs_pty_fd])
1403 { 1309 {
1404 pty.pty = atoi (rs[Rs_pty_fd]); 1310 pty->pty = atoi (rs[Rs_pty_fd]);
1405 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1311
1312 if (pty->pty >= 0)
1313 {
1314 if (getfd_hook)
1315 pty->pty = (*getfd_hook) (pty->pty);
1316
1317 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1318 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1319 }
1406 } 1320 }
1407 else 1321 else
1408#endif 1322#endif
1409 if (!pty.get ()) 1323 if (!pty->get ())
1410 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1324 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1411 1325
1412 pty.set_utf8_mode (enc_utf8); 1326 pty->set_utf8_mode (enc_utf8);
1413 1327
1414 /* set initial window size */ 1328 /* set initial window size */
1415 tt_winch (); 1329 tt_winch ();
1416 1330
1417 int er; 1331 int er;
… …
1430#if ENABLE_FRILLS 1344#if ENABLE_FRILLS
1431 if (rs[Rs_pty_fd]) 1345 if (rs[Rs_pty_fd])
1432 return; 1346 return;
1433#endif 1347#endif
1434 1348
1435#ifndef __QNX__
1436 /* spin off the command interpreter */ 1349 /* spin off the command interpreter */
1437 switch (cmd_pid = fork ()) 1350 switch (cmd_pid = fork ())
1438 { 1351 {
1439 case -1: 1352 case -1:
1440 { 1353 {
… …
1442 rxvt_fatal ("can't fork, aborting.\n"); 1355 rxvt_fatal ("can't fork, aborting.\n");
1443 } 1356 }
1444 case 0: 1357 case 0:
1445 init_env (); 1358 init_env ();
1446 1359
1447 if (!pty.make_controlling_tty ()) 1360 if (!pty->make_controlling_tty ())
1448 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1361 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1449 else 1362 else
1450 { 1363 {
1451 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1364 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1452 dup2 (pty.tty, STDIN_FILENO); 1365 dup2 (pty->tty, STDIN_FILENO);
1453 dup2 (pty.tty, STDOUT_FILENO); 1366 dup2 (pty->tty, STDOUT_FILENO);
1454 dup2 (pty.tty, STDERR_FILENO); 1367 dup2 (pty->tty, STDERR_FILENO);
1455 1368
1456 // close all our file handles that we do no longer need 1369 // close all our file handles that we do no longer need
1457 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1370 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1458 { 1371 {
1459 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1372 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1460 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1373 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1461 } 1374 }
1462 1375
1463 run_child (argv); 1376 run_child (argv);
1464 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1377 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1465 } 1378 }
1466 1379
1467 _exit (EXIT_FAILURE); 1380 _exit (EXIT_FAILURE);
1468 1381
1469 default: 1382 default:
1470 { 1383 if (!OPTION (Opt_utmpInhibit))
1471#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1384 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1472 int fdstdin;
1473 1385
1474 fdstdin = dup (STDIN_FILENO); 1386 pty->close_tty ();
1475 dup2 (pty.tty, STDIN_FILENO);
1476#endif
1477 1387
1478#ifdef UTMP_SUPPORT 1388 child_ev.start (cmd_pid);
1479 privileged_utmp (SAVE);
1480#endif
1481 1389
1482#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1390 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1483
1484 dup2 (fdstdin, STDIN_FILENO);
1485 close (fdstdin);
1486#endif
1487 }
1488
1489 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1490 break; 1391 break;
1491 } 1392 }
1492#else /* __QNX__ uses qnxspawn () */
1493 fchmod (pty.tty, 0622);
1494 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1495 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1496
1497 if (run_child (argv) == -1)
1498 exit (EXIT_FAILURE);
1499#endif
1500} 1393}
1501 1394
1502/* ------------------------------------------------------------------------- * 1395/* ------------------------------------------------------------------------- *
1503 * CHILD PROCESS OPERATIONS * 1396 * CHILD PROCESS OPERATIONS *
1504 * ------------------------------------------------------------------------- */ 1397 * ------------------------------------------------------------------------- */
… …
1511{ 1404{
1512 char *login; 1405 char *login;
1513 1406
1514 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1407 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1515 1408
1516 if (options & Opt_console) 1409 if (OPTION (Opt_console))
1517 { /* be virtual console, fail silently */ 1410 { /* be virtual console, fail silently */
1518#ifdef TIOCCONS 1411#ifdef TIOCCONS
1519 unsigned int on = 1; 1412 unsigned int on = 1;
1520 1413
1521 ioctl (STDIN_FILENO, TIOCCONS, &on); 1414 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1548 // unblock signals (signals are blocked by iom.C 1441 // unblock signals (signals are blocked by iom.C
1549 sigset_t ss; 1442 sigset_t ss;
1550 sigemptyset (&ss); 1443 sigemptyset (&ss);
1551 sigprocmask (SIG_SETMASK, &ss, 0); 1444 sigprocmask (SIG_SETMASK, &ss, 0);
1552 1445
1553#ifndef __QNX__
1554 /* command interpreter path */ 1446 /* command interpreter path */
1555 if (argv != NULL) 1447 if (argv != NULL)
1556 { 1448 {
1557# ifdef DEBUG_CMD 1449# ifdef DEBUG_CMD
1558 int i; 1450 int i;
… …
1564 execvp (argv[0], (char *const *)argv); 1456 execvp (argv[0], (char *const *)argv);
1565 /* no error message: STDERR is closed! */ 1457 /* no error message: STDERR is closed! */
1566 } 1458 }
1567 else 1459 else
1568 { 1460 {
1569 const char *argv0, *shell; 1461 const char *argv0, *shell;
1570 1462
1571 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1463 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1572 shell = "/bin/sh"; 1464 shell = "/bin/sh";
1573 1465
1574 argv0 = (const char *)rxvt_r_basename (shell); 1466 argv0 = (const char *)rxvt_r_basename (shell);
1575 1467
1576 if (options & Opt_loginShell) 1468 if (OPTION (Opt_loginShell))
1577 { 1469 {
1578 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1470 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1579 1471
1580 login[0] = '-'; 1472 login[0] = '-';
1581 strcpy (&login[1], argv0); 1473 strcpy (&login[1], argv0);
1582 argv0 = login; 1474 argv0 = login;
1583 } 1475 }
1476
1584 execlp (shell, argv0, NULL); 1477 execlp (shell, argv0, NULL);
1585 /* no error message: STDERR is closed! */ 1478 /* no error message: STDERR is closed! */
1586 } 1479 }
1587 1480
1588#else /* __QNX__ uses qnxspawn () */
1589
1590 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1591 char *command = NULL, fullcommand[_MAX_PATH];
1592 char **arg_v, *arg_a[2] = { NULL, NULL };
1593
1594 if (argv != NULL)
1595 {
1596 if (access (argv[0], X_OK) == -1)
1597 {
1598 if (strchr (argv[0], '/') == NULL)
1599 {
1600 searchenv (argv[0], "PATH", fullcommand);
1601
1602 if (fullcommand[0] != '\0')
1603 command = fullcommand;
1604 }
1605
1606 if (access (command, X_OK) == -1)
1607 return -1;
1608 }
1609 else
1610 command = argv[0];
1611
1612 arg_v = argv;
1613 }
1614 else
1615 {
1616 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1617 command = "/bin/sh";
1618
1619 arg_a[0] = my_basename (command);
1620
1621 if (options & Opt_loginShell)
1622 {
1623 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1624
1625 login[0] = '-';
1626 strcpy (&login[1], arg_a[0]);
1627 arg_a[0] = login;
1628 }
1629
1630 arg_v = arg_a;
1631 }
1632
1633 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1634 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1635 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1636 command, arg_v, environ, iov_a, 0);
1637 if (login)
1638 free (login);
1639
1640 pty.close_tty ();
1641 return pty.pty;
1642#endif
1643
1644 return -1; 1481 return -1;
1645} 1482}
1646 1483
1647/*----------------------- end-of-file (C source) -----------------------*/ 1484/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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