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

Diff Legend

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