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

Diff Legend

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