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

Diff Legend

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