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

Diff Legend

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