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.118 by root, Wed Aug 10 15:10:06 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_PROTOCOLS",
187 "WM_DELETE_WINDOW",
188 "CLIPBOARD",
189#if ENABLE_FRILLS
190 "_MOTIF_WM_HINTS",
191#endif
192#if ENABLE_EWMH
193 "_NET_WM_PID",
194 "_NET_WM_NAME",
195 "_NET_WM_ICON_NAME",
196 "_NET_WM_PING",
197#endif
198#if USE_XIM
199 "WM_LOCALE_NAME",
200#endif
201#ifdef TRANSPARENT
202 "_XROOTPMAP_ID",
203 "ESETROOT_PMAP_ID",
204#endif
205#ifdef OFFIX_DND
206 "DndProtocol",
207 "DndSelection",
208#endif
209#if ENABLE_XEMBED
210 "_XEMBED",
211 "_XEMBED_INFO",
212#endif 176#endif
213 }; 177 };
214 178
215bool 179bool
216rxvt_term::init_vars () 180rxvt_term::init_vars ()
217{ 181{
218 sw_term.start (SIGTERM); 182 pix_colors = //
219 sw_int.start (SIGINT);
220
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 TermWin.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 TermWin.focus = 0;
240 TermWin.ncol = 80; 197 ncol = 80;
241 TermWin.nrow = 24; 198 nrow = 24;
242 TermWin.int_bwidth = INTERNALBORDERWIDTH; 199 int_bwidth = INTERNALBORDERWIDTH;
243 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 200 ext_bwidth = EXTERNALBORDERWIDTH;
244 TermWin.lineSpace = LINESPACE; 201 lineSpace = LINESPACE;
245 TermWin.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 TermWin.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 TermWin.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 TermWin.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 TermWin.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;
388 else 363 else
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 (!TermWin.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)TermWin.parent[0]))) */
524 for (i = 0, u = (unsigned int)TermWin.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)TermWin.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
… …
737 } 698 }
738 } 699 }
739 } 700 }
740 701
741 pix_colors[i] = xcol; 702 pix_colors[i] = xcol;
703 SET_PIXCOLOR (i);
704 }
705
742#ifdef OFF_FOCUS_FADING 706#ifdef OFF_FOCUS_FADING
743 if (rs[Rs_fade]) 707 if (rs[Rs_fade])
744 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]);
745#endif 710#endif
746 SET_PIXCOLOR (i);
747 }
748 711
749 if (display->depth <= 2) 712 if (depth <= 2)
750 { 713 {
751 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];
752 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];
753 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];
754 } 717 }
755 718
756 /* 719 /*
757 * get scrollBar/menuBar shadow colors 720 * get scrollBar shadow colors
758 * 721 *
759 * The calculations of topShadow/bottomShadow values are adapted 722 * The calculations of topShadow/bottomShadow values are adapted
760 * from the fvwm window manager. 723 * from the fvwm window manager.
761 */ 724 */
762#ifdef KEEP_SCROLLCOLOR 725#ifdef KEEP_SCROLLCOLOR
763 726
764 if (display->depth <= 2) 727 if (depth <= 2)
765 { 728 {
766 /* Monochrome */ 729 /* Monochrome */
767 pix_colors[Color_scroll] = pix_colors[Color_fg]; 730 pix_colors[Color_scroll] = pix_colors[Color_fg];
768 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 731 pix_colors[Color_topShadow] = pix_colors[Color_bg];
769 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
… …
774 /* xcol[0] == white 737 /* xcol[0] == white
775 * xcol[1] == top shadow 738 * xcol[1] == top shadow
776 * xcol[2] == bot shadow */ 739 * xcol[2] == bot shadow */
777 740
778 xcol[1] = pix_colors[Color_scroll]; 741 xcol[1] = pix_colors[Color_scroll];
779 xcol[0].set (display, 65535, 65535, 65535); 742 xcol[0].set (this, 65535, 65535, 65535);
780 743
781 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 744 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
782 745
783 xcol[0].get (display, pr0, pg0, pb0); 746 xcol[0].get (this, pr0, pg0, pb0);
784 xcol[1].get (display, pr1, pg1, pb1); 747 xcol[1].get (this, pr1, pg1, pb1);
785 748
786 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); 749 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
787 750
788 /* topShadowColor */ 751 /* topShadowColor */
789 if (!xcol[1].set (display, 752 if (!xcol[1].set (this,
790 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 753 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
791 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 754 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
792 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 755 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
793 xcol[1] = pix_colors[Color_White]; 756 xcol[1] = pix_colors[Color_White];
794 757
… …
807 int i = atoi (rs[Rs_color + idx]); 770 int i = atoi (rs[Rs_color + idx]);
808 771
809 if (i >= 8 && i <= 15) 772 if (i >= 8 && i <= 15)
810 { /* bright colors */ 773 { /* bright colors */
811 i -= 8; 774 i -= 8;
812#ifndef NO_BRIGHTCOLOR
813 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 775 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
814 return; 776 return;
815#endif
816 } 777 }
817 778
818 if (i >= 0 && i <= 7) /* normal colors */ 779 if (i >= 0 && i <= 7) /* normal colors */
819 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 780 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
820 } 781 }
… …
843 804
844 if (rsmod 805 if (rsmod
845 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 806 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
846 requestedmeta = rsmod[3] - '0'; 807 requestedmeta = rsmod[3] - '0';
847 808
848 map = XGetModifierMapping (display->display); 809 map = XGetModifierMapping (xdisp);
849 kc = map->modifiermap; 810 kc = map->modifiermap;
850 811
851 for (i = 1; i < 6; i++) 812 for (i = 1; i < 6; i++)
852 { 813 {
853 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 814 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
855 for (j = map->max_keypermod; j--; k++) 816 for (j = map->max_keypermod; j--; k++)
856 { 817 {
857 if (kc[k] == 0) 818 if (kc[k] == 0)
858 break; 819 break;
859 820
860 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 821 switch (XKeycodeToKeysym (xdisp, kc[k], 0))
861 { 822 {
862 case XK_Num_Lock: 823 case XK_Num_Lock:
863 ModNumLockMask = modmasks[i - 1]; 824 ModNumLockMask = modmasks[i - 1];
864 continue; 825 continue;
865 826
… …
915rxvt_term::create_windows (int argc, const char *const *argv) 876rxvt_term::create_windows (int argc, const char *const *argv)
916{ 877{
917 XClassHint classHint; 878 XClassHint classHint;
918 XWMHints wmHint; 879 XWMHints wmHint;
919#if ENABLE_FRILLS 880#if ENABLE_FRILLS
920 Atom prop = None;
921 MWMHints mwmhints; 881 MWMHints mwmhints;
922#endif 882#endif
923 XGCValues gcvalue; 883 XGCValues gcvalue;
924 long vt_emask;
925 XSetWindowAttributes attributes; 884 XSetWindowAttributes attributes;
926 XWindowAttributes gattr;
927 Window top, parent; 885 Window top, parent;
928 dDisp;
929 886
930#ifdef USING_W11LIB 887 dLocal (Display *, xdisp);
931 /* enable W11 callbacks */
932 W11AddEventHandler (disp, rxvt_W11_process_x_event);
933#endif
934 888
935 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 889 /* grab colors before netscape does */
936 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 890 Get_Colours ();
937 891
938 if (options & Opt_transparent) 892 if (!set_fonts ())
939 { 893 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
940 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 894
941 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 895 parent = display->root;
942 } 896
897 attributes.override_redirect = !!OPTION (Opt_override_redirect);
943 898
944#if ENABLE_FRILLS 899#if ENABLE_FRILLS
945 if (options & Opt_borderLess) 900 if (OPTION (Opt_borderLess))
946 { 901 {
947 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 902 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None)
948
949 if (prop == None)
950 { 903 {
951 /* 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");*/
952#ifdef PREFER_24BIT
953 attributes.override_redirect = TRUE; 905 attributes.override_redirect = TRUE;
954#endif
955 mwmhints.flags = 0; 906 mwmhints.flags = 0;
956 } 907 }
957 else 908 else
958 { 909 {
959 mwmhints.flags = MWM_HINTS_DECORATIONS; 910 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
962 } 913 }
963 else 914 else
964 mwmhints.flags = 0; 915 mwmhints.flags = 0;
965#endif 916#endif
966 917
967 /* grab colors before netscape does */
968 Get_Colours ();
969
970 if (!set_fonts ())
971 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
972
973 parent = DefaultRootWindow (disp);
974
975#if ENABLE_XEMBED 918#if ENABLE_XEMBED
976 if (rs[Rs_embed]) 919 if (rs[Rs_embed])
977 { 920 {
978 XWindowAttributes wattr; 921 XWindowAttributes wattr;
979 922
980 parent = strtol (rs[Rs_embed], 0, 0); 923 parent = strtol (rs[Rs_embed], 0, 0);
981 924
982 if (!XGetWindowAttributes (disp, parent, &wattr)) 925 if (!XGetWindowAttributes (xdisp, parent, &wattr))
983 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 926 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
984 927
985 window_calc (wattr.width, wattr.height); 928 window_calc (wattr.width, wattr.height);
986 } 929 }
987
988#endif 930#endif
931
989 window_calc (0, 0); 932 window_calc (0, 0);
990 933
991 /* sub-window placement & size in rxvt_resize_subwindows () */ 934 /* sub-window placement & size in rxvt_resize_subwindows () */
992#ifdef PREFER_24BIT
993 attributes.background_pixel = pix_colors_focused[Color_border]; 935 attributes.background_pixel = pix_colors_focused [Color_border];
994 attributes.border_pixel = pix_colors_focused[Color_border]; 936 attributes.border_pixel = pix_colors_focused [Color_border];
995 attributes.colormap = display->cmap; 937 attributes.colormap = cmap;
938
996 top = XCreateWindow (disp, parent, 939 top = XCreateWindow (xdisp, parent,
997 szHint.x, szHint.y, 940 szHint.x, szHint.y,
998 szHint.width, szHint.height, 941 szHint.width, szHint.height,
999 TermWin.ext_bwidth, 942 ext_bwidth,
1000 display->depth, InputOutput, 943 depth, InputOutput, visual,
1001 display->visual,
1002 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 944 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1003#else 945 &attributes);
1004 top = XCreateSimpleWindow (disp, parent,
1005 szHint.x, szHint.y,
1006 szHint.width, szHint.height,
1007 TermWin.ext_bwidth,
1008 pix_colors_focused[Color_border],
1009 pix_colors_focused[Color_border]);
1010#endif
1011 946
1012 TermWin.parent[0] = top; 947 this->parent[0] = top;
1013 948
1014 old_width = szHint.width; 949 old_width = szHint.width;
1015 old_height = szHint.height; 950 old_height = szHint.height;
1016 951
1017 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 952 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1018 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 953 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1019 954
1020 classHint.res_name = (char *)rs[Rs_name]; 955 classHint.res_name = (char *)rs[Rs_name];
1021 classHint.res_class = (char *)RESCLASS; 956 classHint.res_class = (char *)RESCLASS;
1022 957
1023 wmHint.flags = InputHint | StateHint | WindowGroupHint; 958 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1024 wmHint.input = True; 959 wmHint.input = True;
1025 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 960 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1026 wmHint.window_group = top; 961 wmHint.window_group = top;
1027 962
1028 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 963 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc,
1029 &szHint, &wmHint, &classHint); 964 &szHint, &wmHint, &classHint);
965
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
1030 971
1031 Atom protocols[] = { 972 Atom protocols[] = {
1032 xa[XA_WM_DELETE_WINDOW], 973 xa[XA_WM_DELETE_WINDOW],
1033#if ENABLE_EWMH 974#if ENABLE_EWMH
1034 xa[XA_NET_WM_PING], 975 xa[XA_NET_WM_PING],
1035#endif 976#endif
1036 }; 977 };
1037 978
1038 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 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
1039 985
1040#if ENABLE_EWMH 986#if ENABLE_EWMH
1041 long pid = getpid (); 987 long pid = getpid ();
1042 988
1043 XChangeProperty (disp, top, 989 XChangeProperty (xdisp, top,
1044 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 990 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1045 PropModeReplace, (unsigned char *)&pid, 1); 991 PropModeReplace, (unsigned char *)&pid, 1);
1046 992
1047 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 993 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1048#endif 994#endif
1049 995
1050 XSelectInput (disp, top, 996 XSelectInput (xdisp, top,
1051 KeyPressMask 997 KeyPressMask
1052#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 998#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1053 | KeyReleaseMask 999 | KeyReleaseMask
1054#endif 1000#endif
1055 | FocusChangeMask | VisibilityChangeMask 1001 | FocusChangeMask | VisibilityChangeMask
1056 | ExposureMask | StructureNotifyMask); 1002 | ExposureMask | StructureNotifyMask);
1057 1003
1058 termwin_ev.start (display, top); 1004 termwin_ev.start (display, top);
1059 1005
1060#if ENABLE_FRILLS
1061 if (mwmhints.flags)
1062 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1063 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1064#endif
1065
1066 /* 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 */
1067 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1007 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm);
1068 1008
1069#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1009#ifdef HAVE_SCROLLBARS
1070 /* cursor (menuBar/scrollBar): Black-on-White */ 1010 /* cursor scrollBar: Black-on-White */
1071 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1011 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1072#endif 1012#endif
1073 1013
1074 /* the vt window */ 1014 /* the vt window */
1075 TermWin.vt = XCreateSimpleWindow (disp, top, 1015 vt = XCreateSimpleWindow (xdisp, top,
1076 window_vt_x,
1077 window_vt_y, 1016 window_vt_x, window_vt_y,
1078 TermWin_TotalWidth (), 1017 width, height,
1079 TermWin_TotalHeight (),
1080 0, 1018 0,
1081 pix_colors_focused[Color_fg], 1019 pix_colors_focused[Color_fg],
1082 pix_colors_focused[Color_bg]); 1020 pix_colors_focused[Color_bg]);
1083#ifdef DEBUG_X
1084 XStoreName (disp, TermWin.vt, "vt window");
1085#endif
1086 1021
1087 attributes.bit_gravity = NorthWestGravity; 1022 attributes.bit_gravity = NorthWestGravity;
1088 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1023 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes);
1089 1024
1090 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1025 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1091 1026
1092#ifdef POINTER_BLANK 1027 if (OPTION (Opt_pointerBlank))
1093 if (options & Opt_pointerBlank)
1094 vt_emask |= PointerMotionMask; 1028 vt_emask |= PointerMotionMask;
1095 else 1029 else
1096#endif
1097 vt_emask |= Button1MotionMask | Button3MotionMask; 1030 vt_emask |= Button1MotionMask | Button3MotionMask;
1098 1031
1099 XSelectInput (disp, TermWin.vt, vt_emask); 1032 vt_select_input ();
1033
1100 vt_ev.start (display, TermWin.vt); 1034 vt_ev.start (display, vt);
1101
1102#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1103 if (menuBar_height ())
1104 {
1105 menuBar.win = XCreateSimpleWindow (disp, top,
1106 window_vt_x, 0,
1107 TermWin_TotalWidth (),
1108 menuBar_TotalHeight (),
1109 0,
1110 pix_colors_focused[Color_fg],
1111 pix_colors_focused[Color_scroll]);
1112
1113#ifdef DEBUG_X
1114 XStoreName (disp, menuBar.win, "menubar");
1115#endif
1116
1117 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1118
1119 XDefineCursor (disp, menuBar.win,
1120 XCreateFontCursor (disp, XC_left_ptr));
1121
1122 XSelectInput (disp, menuBar.win,
1123 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1124 menubar_ev.start (display, menuBar.win);
1125 }
1126#endif
1127 1035
1128#ifdef XPM_BACKGROUND 1036#ifdef XPM_BACKGROUND
1129 if (rs[Rs_backgroundPixmap] != NULL 1037 if (rs[Rs_backgroundPixmap] != NULL
1130 && ! (options & Opt_transparent)) 1038 && !OPTION (Opt_transparent))
1131 { 1039 {
1132 const char *p = rs[Rs_backgroundPixmap]; 1040 const char *p = rs[Rs_backgroundPixmap];
1133 1041
1134 if ((p = strchr (p, ';')) != NULL) 1042 if ((p = strchr (p, ';')) != NULL)
1135 { 1043 {
… …
1141 scr_touch (true); 1049 scr_touch (true);
1142 } 1050 }
1143#endif 1051#endif
1144 1052
1145 /* graphics context for the vt window */ 1053 /* graphics context for the vt window */
1146 gcvalue.foreground = pix_colors[Color_fg]; 1054 gcvalue.foreground = pix_colors[Color_fg];
1147 gcvalue.background = pix_colors[Color_bg]; 1055 gcvalue.background = pix_colors[Color_bg];
1148 gcvalue.graphics_exposures = 1; 1056 gcvalue.graphics_exposures = 1;
1057
1149 TermWin.gc = XCreateGC (disp, TermWin.vt, 1058 gc = XCreateGC (xdisp, vt,
1150 GCForeground | GCBackground | GCGraphicsExposures, 1059 GCForeground | GCBackground | GCGraphicsExposures,
1151 &gcvalue); 1060 &gcvalue);
1152 1061
1153 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1062 drawable = new rxvt_drawable (this, vt);
1154 1063
1155#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1064#ifdef RXVT_SCROLLBAR
1156 gcvalue.foreground = pix_colors[Color_topShadow]; 1065 gcvalue.foreground = pix_colors[Color_topShadow];
1157 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1066 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1158 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1067 gcvalue.foreground = pix_colors[Color_bottomShadow];
1159 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1068 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1160 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1069 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1161 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1070 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1162#endif 1071#endif
1163 1072
1164#ifdef OFF_FOCUS_FADING 1073#ifdef OFF_FOCUS_FADING
1165 // initially we are in unfocused state 1074 // initially we are in unfocused state
1166 if (rs[Rs_fade]) 1075 if (rs[Rs_fade])
1167 pix_colors = pix_colors_unfocused; 1076 pix_colors = pix_colors_unfocused;
1168#endif 1077#endif
1169 1078
1170 pointer_unblank (); 1079 pointer_unblank ();
1171 scr_recolour (); 1080 scr_recolour ();
1172
1173#if ENABLE_XEMBED
1174 if (rs[Rs_embed])
1175 {
1176 long info[2] = { 0, XEMBED_MAPPED };
1177
1178 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1179 32, PropModeReplace, (unsigned char *)&info, 2);
1180 }
1181#endif
1182} 1081}
1183 1082
1184/* ------------------------------------------------------------------------- * 1083/* ------------------------------------------------------------------------- *
1185 * GET TTY CURRENT STATE * 1084 * GET TTY CURRENT STATE *
1186 * ------------------------------------------------------------------------- */ 1085 * ------------------------------------------------------------------------- */
… …
1191 /* 1090 /*
1192 * standard System V termios interface 1091 * standard System V termios interface
1193 */ 1092 */
1194 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1093 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1195 { 1094 {
1196 /* 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
1197 tio->c_cc[VINTR] = CINTR; 1099 tio->c_cc[VINTR] = CINTR;
1198 tio->c_cc[VQUIT] = CQUIT; 1100 tio->c_cc[VQUIT] = CQUIT;
1199 tio->c_cc[VERASE] = CERASE; 1101 tio->c_cc[VERASE] = CERASE;
1102#ifdef VERASE2
1103 tio->c_cc[VERASE2] = CERASE2;
1104#endif
1200 tio->c_cc[VKILL] = CKILL; 1105 tio->c_cc[VKILL] = CKILL;
1201 tio->c_cc[VSTART] = CSTART; 1106 tio->c_cc[VSTART] = CSTART;
1202 tio->c_cc[VSTOP] = CSTOP; 1107 tio->c_cc[VSTOP] = CSTOP;
1203 tio->c_cc[VSUSP] = CSUSP; 1108 tio->c_cc[VSUSP] = CSUSP;
1204# ifdef VDSUSP 1109# ifdef VDSUSP
1205
1206 tio->c_cc[VDSUSP] = CDSUSP; 1110 tio->c_cc[VDSUSP] = CDSUSP;
1207# endif 1111# endif
1208# ifdef VREPRINT 1112# ifdef VREPRINT
1209
1210 tio->c_cc[VREPRINT] = CRPRNT; 1113 tio->c_cc[VREPRINT] = CRPRNT;
1211# endif 1114# endif
1212# ifdef VDISCRD 1115# ifdef VDISCRD
1213
1214 tio->c_cc[VDISCRD] = CFLUSH; 1116 tio->c_cc[VDISCRD] = CFLUSH;
1215# endif 1117# endif
1216# ifdef VWERSE 1118# ifdef VWERSE
1217
1218 tio->c_cc[VWERSE] = CWERASE; 1119 tio->c_cc[VWERSE] = CWERASE;
1219# endif 1120# endif
1220# ifdef VLNEXT 1121# ifdef VLNEXT
1221
1222 tio->c_cc[VLNEXT] = CLNEXT; 1122 tio->c_cc[VLNEXT] = CLNEXT;
1223# endif 1123# endif
1224
1225 } 1124 }
1125
1226 tio->c_cc[VEOF] = CEOF; 1126 tio->c_cc[VEOF] = CEOF;
1227 tio->c_cc[VEOL] = VDISABLE; 1127 tio->c_cc[VEOL] = VDISABLE;
1228# ifdef VEOL2 1128# ifdef VEOL2
1229
1230 tio->c_cc[VEOL2] = VDISABLE; 1129 tio->c_cc[VEOL2] = VDISABLE;
1231# endif 1130# endif
1232# ifdef VSWTC 1131# ifdef VSWTC
1233
1234 tio->c_cc[VSWTC] = VDISABLE; 1132 tio->c_cc[VSWTC] = VDISABLE;
1235# endif 1133# endif
1236# ifdef VSWTCH 1134# ifdef VSWTCH
1237
1238 tio->c_cc[VSWTCH] = VDISABLE; 1135 tio->c_cc[VSWTCH] = VDISABLE;
1239# endif 1136# endif
1240# if VMIN != VEOF 1137# if VMIN != VEOF
1241
1242 tio->c_cc[VMIN] = 1; 1138 tio->c_cc[VMIN] = 1;
1243# endif 1139# endif
1244# if VTIME != VEOL 1140# if VTIME != VEOL
1245
1246 tio->c_cc[VTIME] = 0; 1141 tio->c_cc[VTIME] = 0;
1247# endif 1142# endif
1248 1143
1249 if (erase != -1) 1144 if (erase != -1)
1250 tio->c_cc[VERASE] = (char)erase; 1145 tio->c_cc[VERASE] = (char)erase;
… …
1278 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1173 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1279 { 1174 {
1280 tio->sg.sg_erase = CERASE; /* ^H */ 1175 tio->sg.sg_erase = CERASE; /* ^H */
1281 tio->sg.sg_kill = CKILL; /* ^U */ 1176 tio->sg.sg_kill = CKILL; /* ^U */
1282 } 1177 }
1178
1283 if (erase != -1) 1179 if (erase != -1)
1284 tio->sg.sg_erase = (char)erase; 1180 tio->sg.sg_erase = (char)erase;
1285 1181
1286 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1182 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1287 1183
… …
1293 tio->tc.t_startc = CSTART; /* ^Q */ 1189 tio->tc.t_startc = CSTART; /* ^Q */
1294 tio->tc.t_stopc = CSTOP; /* ^S */ 1190 tio->tc.t_stopc = CSTOP; /* ^S */
1295 tio->tc.t_eofc = CEOF; /* ^D */ 1191 tio->tc.t_eofc = CEOF; /* ^D */
1296 tio->tc.t_brkc = -1; 1192 tio->tc.t_brkc = -1;
1297 } 1193 }
1194
1298 /* get local special chars */ 1195 /* get local special chars */
1299 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1196 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1300 { 1197 {
1301 tio->lc.t_suspc = CSUSP; /* ^Z */ 1198 tio->lc.t_suspc = CSUSP; /* ^Z */
1302 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1199 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1306 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1203 tio->lc.t_lnextc = CLNEXT; /* ^V */
1307 } 1204 }
1308 /* get line discipline */ 1205 /* get line discipline */
1309 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1206 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1310# ifdef NTTYDISC 1207# ifdef NTTYDISC
1311
1312 tio->line = NTTYDISC; 1208 tio->line = NTTYDISC;
1313# endif /* NTTYDISC */ 1209# endif /* NTTYDISC */
1314 1210
1315 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1211 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1316#endif /* HAVE_TERMIOS_H */ 1212#endif /* HAVE_TERMIOS_H */
… …
1339 FOO (IGNCR, "IGNCR"); 1235 FOO (IGNCR, "IGNCR");
1340 FOO (ICRNL, "ICRNL"); 1236 FOO (ICRNL, "ICRNL");
1341 FOO (IXON, "IXON"); 1237 FOO (IXON, "IXON");
1342 FOO (IXOFF, "IXOFF"); 1238 FOO (IXOFF, "IXOFF");
1343# ifdef IUCLC 1239# ifdef IUCLC
1344
1345 FOO (IUCLC, "IUCLC"); 1240 FOO (IUCLC, "IUCLC");
1346# endif 1241# endif
1347# ifdef IXANY 1242# ifdef IXANY
1348
1349 FOO (IXANY, "IXANY"); 1243 FOO (IXANY, "IXANY");
1350# endif 1244# endif
1351# ifdef IMAXBEL 1245# ifdef IMAXBEL
1352
1353 FOO (IMAXBEL, "IMAXBEL"); 1246 FOO (IMAXBEL, "IMAXBEL");
1354# endif 1247# endif
1355 1248
1356 fprintf (stderr, "\n"); 1249 fprintf (stderr, "\n");
1357 1250
… …
1364 FOO (VERASE, "VERASE"); 1257 FOO (VERASE, "VERASE");
1365 FOO (VKILL, "VKILL"); 1258 FOO (VKILL, "VKILL");
1366 FOO (VEOF, "VEOF"); 1259 FOO (VEOF, "VEOF");
1367 FOO (VEOL, "VEOL"); 1260 FOO (VEOL, "VEOL");
1368# ifdef VEOL2 1261# ifdef VEOL2
1369
1370 FOO (VEOL2, "VEOL2"); 1262 FOO (VEOL2, "VEOL2");
1371# endif 1263# endif
1372# ifdef VSWTC 1264# ifdef VSWTC
1373
1374 FOO (VSWTC, "VSWTC"); 1265 FOO (VSWTC, "VSWTC");
1375# endif 1266# endif
1376# ifdef VSWTCH 1267# ifdef VSWTCH
1377
1378 FOO (VSWTCH, "VSWTCH"); 1268 FOO (VSWTCH, "VSWTCH");
1379# endif 1269# endif
1380
1381 FOO (VSTART, "VSTART"); 1270 FOO (VSTART, "VSTART");
1382 FOO (VSTOP, "VSTOP"); 1271 FOO (VSTOP, "VSTOP");
1383 FOO (VSUSP, "VSUSP"); 1272 FOO (VSUSP, "VSUSP");
1384# ifdef VDSUSP 1273# ifdef VDSUSP
1385
1386 FOO (VDSUSP, "VDSUSP"); 1274 FOO (VDSUSP, "VDSUSP");
1387# endif 1275# endif
1388# ifdef VREPRINT 1276# ifdef VREPRINT
1389
1390 FOO (VREPRINT, "VREPRINT"); 1277 FOO (VREPRINT, "VREPRINT");
1391# endif 1278# endif
1392# ifdef VDISCRD 1279# ifdef VDISCRD
1393
1394 FOO (VDISCRD, "VDISCRD"); 1280 FOO (VDISCRD, "VDISCRD");
1395# endif 1281# endif
1396# ifdef VWERSE 1282# ifdef VWERSE
1397
1398 FOO (VWERSE, "VWERSE"); 1283 FOO (VWERSE, "VWERSE");
1399# endif 1284# endif
1400# ifdef VLNEXT 1285# ifdef VLNEXT
1401
1402 FOO (VLNEXT, "VLNEXT"); 1286 FOO (VLNEXT, "VLNEXT");
1403# endif 1287# endif
1404 1288
1405 fprintf (stderr, "\n"); 1289 fprintf (stderr, "\n");
1406# undef FOO 1290# undef FOO
… …
1418rxvt_term::run_command (const char *const *argv) 1302rxvt_term::run_command (const char *const *argv)
1419{ 1303{
1420#if ENABLE_FRILLS 1304#if ENABLE_FRILLS
1421 if (rs[Rs_pty_fd]) 1305 if (rs[Rs_pty_fd])
1422 { 1306 {
1423 pty.pty = atoi (rs[Rs_pty_fd]); 1307 pty->pty = atoi (rs[Rs_pty_fd]);
1424 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 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 }
1425 } 1317 }
1426 else 1318 else
1427#endif 1319#endif
1428 if (!pty.get ()) 1320 if (!pty->get ())
1429 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1321 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1430 1322
1431 pty.set_utf8_mode (enc_utf8); 1323 pty->set_utf8_mode (enc_utf8);
1432 1324
1433 /* set initial window size */ 1325 /* set initial window size */
1434 tt_winch (); 1326 tt_winch ();
1435 1327
1436 int er; 1328 int er;
… …
1449#if ENABLE_FRILLS 1341#if ENABLE_FRILLS
1450 if (rs[Rs_pty_fd]) 1342 if (rs[Rs_pty_fd])
1451 return; 1343 return;
1452#endif 1344#endif
1453 1345
1454 sw_chld.start (SIGCHLD);
1455
1456#ifndef __QNX__
1457 /* spin off the command interpreter */ 1346 /* spin off the command interpreter */
1458 switch (cmd_pid = fork ()) 1347 switch (cmd_pid = fork ())
1459 { 1348 {
1460 case -1: 1349 case -1:
1461 { 1350 {
… …
1463 rxvt_fatal ("can't fork, aborting.\n"); 1352 rxvt_fatal ("can't fork, aborting.\n");
1464 } 1353 }
1465 case 0: 1354 case 0:
1466 init_env (); 1355 init_env ();
1467 1356
1468 if (!pty.make_controlling_tty ()) 1357 if (!pty->make_controlling_tty ())
1469 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1358 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1470 else 1359 else
1471 { 1360 {
1472 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1361 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1473 dup2 (pty.tty, STDIN_FILENO); 1362 dup2 (pty->tty, STDIN_FILENO);
1474 dup2 (pty.tty, STDOUT_FILENO); 1363 dup2 (pty->tty, STDOUT_FILENO);
1475 dup2 (pty.tty, STDERR_FILENO); 1364 dup2 (pty->tty, STDERR_FILENO);
1476 1365
1477 // close all our file handles that we do no longer need 1366 // close all our file handles that we do no longer need
1478 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1367 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1479 { 1368 {
1480 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1369 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1481 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1370 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1482 } 1371 }
1483 1372
1484 run_child (argv); 1373 run_child (argv);
1485 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1374 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1486 } 1375 }
1487 1376
1488 _exit (EXIT_FAILURE); 1377 _exit (EXIT_FAILURE);
1489 1378
1490 default: 1379 default:
1491 { 1380 if (!OPTION (Opt_utmpInhibit))
1492#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1381 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1493 int fdstdin;
1494 1382
1495 fdstdin = dup (STDIN_FILENO); 1383 pty->close_tty ();
1496 dup2 (pty.tty, STDIN_FILENO);
1497#endif
1498 1384
1499#ifdef UTMP_SUPPORT 1385 child_ev.start (cmd_pid);
1500 privileged_utmp (SAVE);
1501#endif
1502 1386
1503#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1387 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1504
1505 dup2 (fdstdin, STDIN_FILENO);
1506 close (fdstdin);
1507#endif
1508 }
1509
1510 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1511 break; 1388 break;
1512 } 1389 }
1513#else /* __QNX__ uses qnxspawn () */
1514 fchmod (pty.tty, 0622);
1515 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1516 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1517
1518 if (run_child (argv) == -1)
1519 exit (EXIT_FAILURE);
1520#endif
1521} 1390}
1522 1391
1523/* ------------------------------------------------------------------------- * 1392/* ------------------------------------------------------------------------- *
1524 * CHILD PROCESS OPERATIONS * 1393 * CHILD PROCESS OPERATIONS *
1525 * ------------------------------------------------------------------------- */ 1394 * ------------------------------------------------------------------------- */
… …
1532{ 1401{
1533 char *login; 1402 char *login;
1534 1403
1535 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1404 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1536 1405
1537 if (options & Opt_console) 1406 if (OPTION (Opt_console))
1538 { /* be virtual console, fail silently */ 1407 { /* be virtual console, fail silently */
1539#ifdef TIOCCONS 1408#ifdef TIOCCONS
1540 unsigned int on = 1; 1409 unsigned int on = 1;
1541 1410
1542 ioctl (STDIN_FILENO, TIOCCONS, &on); 1411 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1569 // unblock signals (signals are blocked by iom.C 1438 // unblock signals (signals are blocked by iom.C
1570 sigset_t ss; 1439 sigset_t ss;
1571 sigemptyset (&ss); 1440 sigemptyset (&ss);
1572 sigprocmask (SIG_SETMASK, &ss, 0); 1441 sigprocmask (SIG_SETMASK, &ss, 0);
1573 1442
1574#ifndef __QNX__
1575 /* command interpreter path */ 1443 /* command interpreter path */
1576 if (argv != NULL) 1444 if (argv != NULL)
1577 { 1445 {
1578# ifdef DEBUG_CMD 1446# ifdef DEBUG_CMD
1579 int i; 1447 int i;
… …
1585 execvp (argv[0], (char *const *)argv); 1453 execvp (argv[0], (char *const *)argv);
1586 /* no error message: STDERR is closed! */ 1454 /* no error message: STDERR is closed! */
1587 } 1455 }
1588 else 1456 else
1589 { 1457 {
1590 const char *argv0, *shell; 1458 const char *argv0, *shell;
1591 1459
1592 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1460 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1593 shell = "/bin/sh"; 1461 shell = "/bin/sh";
1594 1462
1595 argv0 = (const char *)rxvt_r_basename (shell); 1463 argv0 = (const char *)rxvt_r_basename (shell);
1596 1464
1597 if (options & Opt_loginShell) 1465 if (OPTION (Opt_loginShell))
1598 { 1466 {
1599 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1467 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1600 1468
1601 login[0] = '-'; 1469 login[0] = '-';
1602 strcpy (&login[1], argv0); 1470 strcpy (&login[1], argv0);
1603 argv0 = login; 1471 argv0 = login;
1604 } 1472 }
1473
1605 execlp (shell, argv0, NULL); 1474 execlp (shell, argv0, NULL);
1606 /* no error message: STDERR is closed! */ 1475 /* no error message: STDERR is closed! */
1607 } 1476 }
1608 1477
1609#else /* __QNX__ uses qnxspawn () */
1610
1611 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1612 char *command = NULL, fullcommand[_MAX_PATH];
1613 char **arg_v, *arg_a[2] = { NULL, NULL };
1614
1615 if (argv != NULL)
1616 {
1617 if (access (argv[0], X_OK) == -1)
1618 {
1619 if (strchr (argv[0], '/') == NULL)
1620 {
1621 searchenv (argv[0], "PATH", fullcommand);
1622
1623 if (fullcommand[0] != '\0')
1624 command = fullcommand;
1625 }
1626
1627 if (access (command, X_OK) == -1)
1628 return -1;
1629 }
1630 else
1631 command = argv[0];
1632
1633 arg_v = argv;
1634 }
1635 else
1636 {
1637 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1638 command = "/bin/sh";
1639
1640 arg_a[0] = my_basename (command);
1641
1642 if (options & Opt_loginShell)
1643 {
1644 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1645
1646 login[0] = '-';
1647 strcpy (&login[1], arg_a[0]);
1648 arg_a[0] = login;
1649 }
1650
1651 arg_v = arg_a;
1652 }
1653
1654 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1655 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1656 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1657 command, arg_v, environ, iov_a, 0);
1658 if (login)
1659 free (login);
1660
1661 pty.close_tty ();
1662 return pty.pty;
1663#endif
1664
1665 return -1; 1478 return -1;
1666} 1479}
1667 1480
1668/*----------------------- end-of-file (C source) -----------------------*/ 1481/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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