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.92 by root, Wed Sep 8 17:23:02 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#if 0 562
596#if HAVE_NL_LANGINFO 563#if HAVE_NL_LANGINFO
564 char *codeset = strdup (nl_langinfo (CODESET));
565 // /^UTF.?8/i
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');
597 free (codeset); 570 free (codeset);
598 codeset = strdup (nl_langinfo (CODESET));
599 enc_utf8 = !strcasecmp (codeset, "UTF-8")
600 || !strcasecmp (codeset, "UTF8");
601#else 571#else
602 enc_utf8 = 1; 572 enc_utf8 = 0;
603#endif
604#endif 573#endif
605} 574}
606 575
607void 576void
608rxvt_term::init_xlocale () 577rxvt_term::init_xlocale ()
609{ 578{
579 set_environ (envv);
580
610#ifdef USE_XIM 581#ifdef USE_XIM
611 if (!locale) 582 if (!locale)
612 rxvt_warn ("setting locale failed, working without locale support.\n"); 583 rxvt_warn ("setting locale failed, working without locale support.\n");
613 else 584 else
614 { 585 {
615 Atom wmlocale; 586 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
616
617 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
618 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
619 XA_STRING, 8, PropModeReplace,
620 (unsigned char *)locale, strlen (locale));
621 587
622 if (!XSupportsLocale ()) 588 if (!XSupportsLocale ())
623 { 589 {
624 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");
625 return; 591 return;
… …
639{ 605{
640 /* 606 /*
641 * Initialize the command connection. 607 * Initialize the command connection.
642 * This should be called after the X server connection is established. 608 * This should be called after the X server connection is established.
643 */ 609 */
644 int i;
645
646 for (i = 0; i < NUM_XA; i++)
647 xa[i] = XInternAtom (display->display, xa_names[i], False);
648
649 /* Enable delete window protocol */
650 XSetWMProtocols (display->display, TermWin.parent[0],
651 & (xa[XA_WMDELETEWINDOW]), 1);
652
653#ifdef USING_W11LIB
654 /* enable W11 callbacks */
655 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
656#endif
657 610
658#ifdef META8_OPTION 611#ifdef META8_OPTION
659 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 612 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
660#endif 613#endif
661 614
662 get_ourmods (); 615 get_ourmods ();
663 616
664 if (!(options & Opt_scrollTtyOutput)) 617 if (!OPTION (Opt_scrollTtyOutput))
665 priv_modes |= PrivMode_TtyOutputInh; 618 priv_modes |= PrivMode_TtyOutputInh;
666 if (options & Opt_scrollTtyKeypress) 619 if (OPTION (Opt_scrollTtyKeypress))
667 priv_modes |= PrivMode_Keypress; 620 priv_modes |= PrivMode_Keypress;
668 if (!(options & Opt_jumpScroll)) 621 if (!OPTION (Opt_jumpScroll))
669 priv_modes |= PrivMode_smoothScroll; 622 priv_modes |= PrivMode_smoothScroll;
670 623
671#ifndef NO_BACKSPACE_KEY 624#ifndef NO_BACKSPACE_KEY
672 if (strcmp (key_backspace, "DEC") == 0) 625 if (strcmp (key_backspace, "DEC") == 0)
673 priv_modes |= PrivMode_HaveBackSpace; 626 priv_modes |= PrivMode_HaveBackSpace;
674#endif 627#endif
675 628
676 /* add value for scrollBar */ 629 /* add value for scrollBar */
677 if (scrollbar_visible ()) 630 if (scrollBar.state)
678 { 631 {
679 priv_modes |= PrivMode_scrollBar; 632 priv_modes |= PrivMode_scrollBar;
680 SavedModes |= PrivMode_scrollBar; 633 SavedModes |= PrivMode_scrollBar;
681 } 634 }
682 if (menubar_visible ())
683 {
684 priv_modes |= PrivMode_menuBar;
685 SavedModes |= PrivMode_menuBar;
686 }
687
688#ifdef CURSOR_BLINK
689 if (options & Opt_cursorBlink)
690 (void)gettimeofday (&lastcursorchange, NULL);
691#endif
692 635
693 run_command (argv); 636 run_command (argv);
694} 637}
695 638
696/*----------------------------------------------------------------------*/ 639/*----------------------------------------------------------------------*/
… …
711 continue; 654 continue;
712 655
713 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 656 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
714 { 657 {
715#ifndef XTERM_REVERSE_VIDEO 658#ifndef XTERM_REVERSE_VIDEO
716 if (i < 2 && (options & Opt_reverseVideo)) 659 if (i < 2 && OPTION (Opt_reverseVideo))
717 rs[Rs_color + i] = def_colorName[!i]; 660 rs[Rs_color + i] = def_colorName[!i];
718 else 661 else
719#endif 662#endif
720 rs[Rs_color + i] = def_colorName[i]; 663 rs[Rs_color + i] = def_colorName[i];
721 664
… …
746 } 689 }
747 } 690 }
748 } 691 }
749 692
750 pix_colors[i] = xcol; 693 pix_colors[i] = xcol;
694 SET_PIXCOLOR (i);
695 }
696
751#ifdef OFF_FOCUS_FADING 697#ifdef OFF_FOCUS_FADING
752 if (rs[Rs_fade]) 698 if (rs[Rs_fade])
699 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
753 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]);
754#endif 701#endif
755 SET_PIXCOLOR (i);
756 }
757 702
758 if (display->depth <= 2) 703 if (display->depth <= 2)
759 { 704 {
760 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];
761 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];
762 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];
763 } 708 }
764 709
765 /* 710 /*
766 * get scrollBar/menuBar shadow colors 711 * get scrollBar shadow colors
767 * 712 *
768 * The calculations of topShadow/bottomShadow values are adapted 713 * The calculations of topShadow/bottomShadow values are adapted
769 * from the fvwm window manager. 714 * from the fvwm window manager.
770 */ 715 */
771#ifdef KEEP_SCROLLCOLOR 716#ifdef KEEP_SCROLLCOLOR
772 717
773 if (display->depth <= 2) 718 if (display->depth <= 2)
719 {
774 { /* Monochrome */ 720 /* Monochrome */
775 pix_colors[Color_scroll] = pix_colors[Color_fg]; 721 pix_colors[Color_scroll] = pix_colors[Color_fg];
776 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 722 pix_colors[Color_topShadow] = pix_colors[Color_bg];
777 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 723 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
778 } 724 }
779 else 725 else
… …
815 int i = atoi (rs[Rs_color + idx]); 761 int i = atoi (rs[Rs_color + idx]);
816 762
817 if (i >= 8 && i <= 15) 763 if (i >= 8 && i <= 15)
818 { /* bright colors */ 764 { /* bright colors */
819 i -= 8; 765 i -= 8;
820#ifndef NO_BRIGHTCOLOR
821 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 766 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
822 return; 767 return;
823#endif
824 } 768 }
825 769
826 if (i >= 0 && i <= 7) /* normal colors */ 770 if (i >= 0 && i <= 7) /* normal colors */
827 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 771 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
828 } 772 }
… …
834 * Use resource ``modifier'' to override the Meta modifier 778 * Use resource ``modifier'' to override the Meta modifier
835 */ 779 */
836void 780void
837rxvt_term::get_ourmods () 781rxvt_term::get_ourmods ()
838{ 782{
839 int i, j, k; 783 int i, j, k;
840 int requestedmeta, realmeta, realalt; 784 int requestedmeta, realmeta, realalt;
841 const char *cm, *rsmod; 785 const char *cm, *rsmod;
842 XModifierKeymap *map; 786 XModifierKeymap *map;
843 KeyCode *kc; 787 KeyCode *kc;
844 const unsigned int modmasks[] = 788 const unsigned int modmasks[] =
845 { 789 {
846 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 790 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
847 }; 791 };
848 792
849 requestedmeta = realmeta = realalt = 0; 793 requestedmeta = realmeta = realalt = 0;
850 rsmod = rs[Rs_modifier]; 794 rsmod = rs[Rs_modifier];
795
851 if (rsmod 796 if (rsmod
852 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 797 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
853 requestedmeta = rsmod[3] - '0'; 798 requestedmeta = rsmod[3] - '0';
854 799
855 map = XGetModifierMapping (display->display); 800 map = XGetModifierMapping (display->display);
856 kc = map->modifiermap; 801 kc = map->modifiermap;
802
857 for (i = 1; i < 6; i++) 803 for (i = 1; i < 6; i++)
858 { 804 {
859 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 805 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
806
860 for (j = map->max_keypermod; j--; k++) 807 for (j = map->max_keypermod; j--; k++)
861 { 808 {
862 if (kc[k] == 0) 809 if (kc[k] == 0)
863 break; 810 break;
811
864 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 812 switch (XKeycodeToKeysym (display->display, kc[k], 0))
865 { 813 {
866 case XK_Num_Lock: 814 case XK_Num_Lock:
867 ModNumLockMask = modmasks[i - 1]; 815 ModNumLockMask = modmasks[i - 1];
868 /* FALLTHROUGH */ 816 continue;
869 default: 817
870 continue; /* for (;;) */ 818 case XK_ISO_Level3_Shift:
819 ModLevel3Mask = modmasks[i - 1];
820 continue;
821
871 case XK_Meta_L: 822 case XK_Meta_L:
872 case XK_Meta_R: 823 case XK_Meta_R:
873 cm = "meta"; 824 cm = "meta";
874 realmeta = i; 825 realmeta = i;
875 break; 826 break;
827
876 case XK_Alt_L: 828 case XK_Alt_L:
877 case XK_Alt_R: 829 case XK_Alt_R:
878 cm = "alt"; 830 cm = "alt";
879 realalt = i; 831 realalt = i;
880 break; 832 break;
833
881 case XK_Super_L: 834 case XK_Super_L:
882 case XK_Super_R: 835 case XK_Super_R:
883 cm = "super"; 836 cm = "super";
884 break; 837 break;
838
885 case XK_Hyper_L: 839 case XK_Hyper_L:
886 case XK_Hyper_R: 840 case XK_Hyper_R:
887 cm = "hyper"; 841 cm = "hyper";
888 break; 842 break;
843
844 default:
845 continue;
889 } 846 }
847
890 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 848 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
891 requestedmeta = i; 849 requestedmeta = i;
892 } 850 }
893 } 851 }
852
894 XFreeModifiermap (map); 853 XFreeModifiermap (map);
854
895 i = (requestedmeta ? requestedmeta 855 i = requestedmeta ? requestedmeta
896 : (realmeta ? realmeta 856 : realmeta ? realmeta
897 : (realalt ? realalt : 0))); 857 : realalt ? realalt
858 : 0;
859
898 if (i) 860 if (i)
899 ModMetaMask = modmasks[i - 1]; 861 ModMetaMask = modmasks[i - 1];
900} 862}
901 863
902/*----------------------------------------------------------------------*/ 864/*----------------------------------------------------------------------*/
… …
905rxvt_term::create_windows (int argc, const char *const *argv) 867rxvt_term::create_windows (int argc, const char *const *argv)
906{ 868{
907 XClassHint classHint; 869 XClassHint classHint;
908 XWMHints wmHint; 870 XWMHints wmHint;
909#if ENABLE_FRILLS 871#if ENABLE_FRILLS
910 Atom prop = None;
911 MWMHints mwmhints; 872 MWMHints mwmhints;
912#endif 873#endif
913 XGCValues gcvalue; 874 XGCValues gcvalue;
914 long vt_emask;
915 XSetWindowAttributes attributes; 875 XSetWindowAttributes attributes;
916 XWindowAttributes gattr; 876 Window top, parent;
877 dDisp;
917 878
918 if (options & Opt_transparent) 879 xa = display->xa;
919 { 880
920 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 881 /* grab colors before netscape does */
921 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 882 Get_Colours ();
922 } 883
884 if (!set_fonts ())
885 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
886
887 parent = display->root;
888
889 attributes.override_redirect = !!OPTION (Opt_override_redirect);
923 890
924#if ENABLE_FRILLS 891#if ENABLE_FRILLS
925 if (options & Opt_borderLess) 892 if (OPTION (Opt_borderLess))
926 { 893 {
927 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 894 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None)
928 if (prop == None)
929 { 895 {
930 /* 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");*/
931#ifdef PREFER_24BIT
932 attributes.override_redirect = TRUE; 897 attributes.override_redirect = TRUE;
933#endif
934 mwmhints.flags = 0; 898 mwmhints.flags = 0;
935 } 899 }
936 else 900 else
937 { 901 {
938 mwmhints.flags = MWM_HINTS_DECORATIONS; 902 mwmhints.flags = MWM_HINTS_DECORATIONS;
939 mwmhints.decorations = 0; 903 mwmhints.decorations = 0;
940 } 904 }
941 } 905 }
942 else 906 else
943 {
944 mwmhints.flags = 0; 907 mwmhints.flags = 0;
908#endif
909
910#if ENABLE_XEMBED
911 if (rs[Rs_embed])
945 } 912 {
946#endif 913 XWindowAttributes wattr;
947 914
948 /* grab colors before netscape does */ 915 parent = strtol (rs[Rs_embed], 0, 0);
949 Get_Colours ();
950 916
951 if (!set_fonts ()) 917 if (!XGetWindowAttributes (disp, parent, &wattr))
952 rxvt_fatal ("unable to load base fontset, please specify 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
953 923
954 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
955 old_width = szHint.width; 942 old_width = szHint.width;
956 old_height = szHint.height; 943 old_height = szHint.height;
957 944
958 /* sub-window placement & size in rxvt_resize_subwindows () */
959
960#ifdef PREFER_24BIT
961 attributes.background_pixel = pix_colors_focused[Color_border];
962 attributes.border_pixel = pix_colors_focused[Color_border];
963 attributes.colormap = display->cmap;
964 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
965 szHint.x, szHint.y,
966 szHint.width, szHint.height,
967 TermWin.ext_bwidth,
968 display->depth, InputOutput,
969 display->visual,
970 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
971#else
972 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
973 szHint.x, szHint.y,
974 szHint.width, szHint.height,
975 TermWin.ext_bwidth,
976 pix_colors_focused[Color_border],
977 pix_colors_focused[Color_border]);
978#endif
979
980 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 945 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
981 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 946 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
982 947
983 classHint.res_name = (char *)rs[Rs_name]; 948 classHint.res_name = (char *)rs[Rs_name];
984 classHint.res_class = (char *)RESCLASS; 949 classHint.res_class = (char *)RESCLASS;
985 950
986 wmHint.flags = InputHint | StateHint | WindowGroupHint; 951 wmHint.flags = InputHint | StateHint | WindowGroupHint;
987 wmHint.input = True; 952 wmHint.input = True;
988 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 953 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
989 wmHint.window_group = TermWin.parent[0]; 954 wmHint.window_group = top;
990 955
991 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 956 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
992 (char **)argv, argc, &szHint, &wmHint, &classHint); 957 &szHint, &wmHint, &classHint);
993 958
994#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
995 long pid = getpid (); 980 long pid = getpid ();
996 XChangeProperty (display->display, TermWin.parent[0], 981
982 XChangeProperty (disp, top,
997 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 983 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
998 PropModeReplace, (unsigned char *)&pid, 1); 984 PropModeReplace, (unsigned char *)&pid, 1);
999#endif
1000 985
1001 XSelectInput (display->display, TermWin.parent[0], 986 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
987#endif
988
989 XSelectInput (disp, top,
1002 KeyPressMask 990 KeyPressMask
1003#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 991#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1004 | KeyReleaseMask 992 | KeyReleaseMask
1005#endif 993#endif
1006 | FocusChangeMask | VisibilityChangeMask 994 | FocusChangeMask | VisibilityChangeMask
1007 | ExposureMask
1008 | StructureNotifyMask); 995 | ExposureMask | StructureNotifyMask);
996
1009 termwin_ev.start (display, TermWin.parent[0]); 997 termwin_ev.start (display, top);
1010
1011#if ENABLE_FRILLS
1012 if (mwmhints.flags)
1013 {
1014 prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False);
1015 XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1016 }
1017#endif
1018 998
1019 /* 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 */
1020 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1000 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1021 1001
1022#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1002#ifdef HAVE_SCROLLBARS
1023 /* cursor (menuBar/scrollBar): Black-on-White */ 1003 /* cursor scrollBar: Black-on-White */
1024 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1004 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1025#endif
1026
1027#ifdef POINTER_BLANK
1028 {
1029 XColor blackcolour;
1030 blackcolour.red = 0;
1031 blackcolour.green = 0;
1032 blackcolour.blue = 0;
1033 Font f = XLoadFont (display->display, "fixed");
1034 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1035 &blackcolour, &blackcolour);
1036 XUnloadFont (display->display, f);
1037 }
1038#endif 1005#endif
1039 1006
1040 /* the vt window */ 1007 /* the vt window */
1041 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1008 vt = XCreateSimpleWindow (disp, top,
1042 window_vt_x,
1043 window_vt_y, 1009 window_vt_x, window_vt_y,
1044 TermWin_TotalWidth (), 1010 width, height,
1045 TermWin_TotalHeight (),
1046 0, 1011 0,
1047 pix_colors_focused[Color_fg], 1012 pix_colors_focused[Color_fg],
1048 pix_colors_focused[Color_bg]); 1013 pix_colors_focused[Color_bg]);
1049#ifdef DEBUG_X
1050 XStoreName (display->display, TermWin.vt, "vt window");
1051#endif
1052 1014
1053 attributes.bit_gravity = NorthWestGravity; 1015 attributes.bit_gravity = NorthWestGravity;
1054 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1016 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1055 1017
1056 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1018 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1057 1019
1058 pointer_unblank (); 1020 if (OPTION (Opt_pointerBlank))
1059
1060#ifdef POINTER_BLANK
1061 if (options & Opt_pointerBlank)
1062 vt_emask |= PointerMotionMask; 1021 vt_emask |= PointerMotionMask;
1063 else 1022 else
1064#endif
1065 vt_emask |= Button1MotionMask | Button3MotionMask; 1023 vt_emask |= Button1MotionMask | Button3MotionMask;
1066 1024
1067 XSelectInput (display->display, TermWin.vt, vt_emask); 1025 vt_select_input ();
1026
1068 vt_ev.start (display, TermWin.vt); 1027 vt_ev.start (display, vt);
1069
1070#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1071 if (menuBar_height ())
1072 {
1073 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1074 window_vt_x, 0,
1075 TermWin_TotalWidth (),
1076 menuBar_TotalHeight (),
1077 0,
1078 pix_colors_focused[Color_fg],
1079 pix_colors_focused[Color_scroll]);
1080
1081#ifdef DEBUG_X
1082 XStoreName (display->display, menuBar.win, "menubar");
1083#endif
1084
1085 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1086
1087 XDefineCursor (display->display, menuBar.win,
1088 XCreateFontCursor (display->display, XC_left_ptr));
1089
1090 XSelectInput (display->display, menuBar.win,
1091 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1092 | Button1MotionMask));
1093 menubar_ev.start (display, menuBar.win);
1094 }
1095#endif
1096 1028
1097#ifdef XPM_BACKGROUND 1029#ifdef XPM_BACKGROUND
1098 if (rs[Rs_backgroundPixmap] != NULL 1030 if (rs[Rs_backgroundPixmap] != NULL
1099 && ! (options & Opt_transparent)) 1031 && !OPTION (Opt_transparent))
1100 { 1032 {
1101 const char *p = rs[Rs_backgroundPixmap]; 1033 const char *p = rs[Rs_backgroundPixmap];
1102 1034
1103 if ((p = strchr (p, ';')) != NULL) 1035 if ((p = strchr (p, ';')) != NULL)
1104 { 1036 {
… …
1110 scr_touch (true); 1042 scr_touch (true);
1111 } 1043 }
1112#endif 1044#endif
1113 1045
1114 /* graphics context for the vt window */ 1046 /* graphics context for the vt window */
1115 gcvalue.foreground = pix_colors[Color_fg]; 1047 gcvalue.foreground = pix_colors[Color_fg];
1116 gcvalue.background = pix_colors[Color_bg]; 1048 gcvalue.background = pix_colors[Color_bg];
1117 gcvalue.graphics_exposures = 1; 1049 gcvalue.graphics_exposures = 1;
1118 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1050
1051 gc = XCreateGC (disp, vt,
1119 GCForeground | GCBackground | GCGraphicsExposures, 1052 GCForeground | GCBackground | GCGraphicsExposures,
1120 &gcvalue); 1053 &gcvalue);
1121 1054
1122 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1055 drawable = new rxvt_drawable (display, vt);
1123 1056
1124#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1057#ifdef RXVT_SCROLLBAR
1125 gcvalue.foreground = pix_colors[Color_topShadow]; 1058 gcvalue.foreground = pix_colors[Color_topShadow];
1126 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1059 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1127 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1060 gcvalue.foreground = pix_colors[Color_bottomShadow];
1128 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1061 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1129 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1062 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1130 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1063 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1131#endif 1064#endif
1132 1065
1133#ifdef OFF_FOCUS_FADING 1066#ifdef OFF_FOCUS_FADING
1134 // initially we are in unfocused state 1067 // initially we are in unfocused state
1135 if (rs[Rs_fade]) 1068 if (rs[Rs_fade])
1136 pix_colors = pix_colors_unfocused; 1069 pix_colors = pix_colors_unfocused;
1137#endif 1070#endif
1138 1071
1072 pointer_unblank ();
1139 scr_recolour (); 1073 scr_recolour ();
1140} 1074}
1141 1075
1142/* ------------------------------------------------------------------------- * 1076/* ------------------------------------------------------------------------- *
1143 * GET TTY CURRENT STATE * 1077 * GET TTY CURRENT STATE *
… …
1149 /* 1083 /*
1150 * standard System V termios interface 1084 * standard System V termios interface
1151 */ 1085 */
1152 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1086 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1153 { 1087 {
1154 /* 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
1155 tio->c_cc[VINTR] = CINTR; 1092 tio->c_cc[VINTR] = CINTR;
1156 tio->c_cc[VQUIT] = CQUIT; 1093 tio->c_cc[VQUIT] = CQUIT;
1157 tio->c_cc[VERASE] = CERASE; 1094 tio->c_cc[VERASE] = CERASE;
1095#ifdef VERASE2
1096 tio->c_cc[VERASE2] = CERASE2;
1097#endif
1158 tio->c_cc[VKILL] = CKILL; 1098 tio->c_cc[VKILL] = CKILL;
1159 tio->c_cc[VSTART] = CSTART; 1099 tio->c_cc[VSTART] = CSTART;
1160 tio->c_cc[VSTOP] = CSTOP; 1100 tio->c_cc[VSTOP] = CSTOP;
1161 tio->c_cc[VSUSP] = CSUSP; 1101 tio->c_cc[VSUSP] = CSUSP;
1162# ifdef VDSUSP 1102# ifdef VDSUSP
1163
1164 tio->c_cc[VDSUSP] = CDSUSP; 1103 tio->c_cc[VDSUSP] = CDSUSP;
1165# endif 1104# endif
1166# ifdef VREPRINT 1105# ifdef VREPRINT
1167
1168 tio->c_cc[VREPRINT] = CRPRNT; 1106 tio->c_cc[VREPRINT] = CRPRNT;
1169# endif 1107# endif
1170# ifdef VDISCRD 1108# ifdef VDISCRD
1171
1172 tio->c_cc[VDISCRD] = CFLUSH; 1109 tio->c_cc[VDISCRD] = CFLUSH;
1173# endif 1110# endif
1174# ifdef VWERSE 1111# ifdef VWERSE
1175
1176 tio->c_cc[VWERSE] = CWERASE; 1112 tio->c_cc[VWERSE] = CWERASE;
1177# endif 1113# endif
1178# ifdef VLNEXT 1114# ifdef VLNEXT
1179
1180 tio->c_cc[VLNEXT] = CLNEXT; 1115 tio->c_cc[VLNEXT] = CLNEXT;
1181# endif 1116# endif
1182
1183 } 1117 }
1118
1184 tio->c_cc[VEOF] = CEOF; 1119 tio->c_cc[VEOF] = CEOF;
1185 tio->c_cc[VEOL] = VDISABLE; 1120 tio->c_cc[VEOL] = VDISABLE;
1186# ifdef VEOL2 1121# ifdef VEOL2
1187
1188 tio->c_cc[VEOL2] = VDISABLE; 1122 tio->c_cc[VEOL2] = VDISABLE;
1189# endif 1123# endif
1190# ifdef VSWTC 1124# ifdef VSWTC
1191
1192 tio->c_cc[VSWTC] = VDISABLE; 1125 tio->c_cc[VSWTC] = VDISABLE;
1193# endif 1126# endif
1194# ifdef VSWTCH 1127# ifdef VSWTCH
1195
1196 tio->c_cc[VSWTCH] = VDISABLE; 1128 tio->c_cc[VSWTCH] = VDISABLE;
1197# endif 1129# endif
1198# if VMIN != VEOF 1130# if VMIN != VEOF
1199
1200 tio->c_cc[VMIN] = 1; 1131 tio->c_cc[VMIN] = 1;
1201# endif 1132# endif
1202# if VTIME != VEOL 1133# if VTIME != VEOL
1203
1204 tio->c_cc[VTIME] = 0; 1134 tio->c_cc[VTIME] = 0;
1205# endif 1135# endif
1206 1136
1207 if (erase != -1) 1137 if (erase != -1)
1208 tio->c_cc[VERASE] = (char)erase; 1138 tio->c_cc[VERASE] = (char)erase;
… …
1236 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1166 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1237 { 1167 {
1238 tio->sg.sg_erase = CERASE; /* ^H */ 1168 tio->sg.sg_erase = CERASE; /* ^H */
1239 tio->sg.sg_kill = CKILL; /* ^U */ 1169 tio->sg.sg_kill = CKILL; /* ^U */
1240 } 1170 }
1171
1241 if (erase != -1) 1172 if (erase != -1)
1242 tio->sg.sg_erase = (char)erase; 1173 tio->sg.sg_erase = (char)erase;
1243 1174
1244 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1175 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1245 1176
… …
1251 tio->tc.t_startc = CSTART; /* ^Q */ 1182 tio->tc.t_startc = CSTART; /* ^Q */
1252 tio->tc.t_stopc = CSTOP; /* ^S */ 1183 tio->tc.t_stopc = CSTOP; /* ^S */
1253 tio->tc.t_eofc = CEOF; /* ^D */ 1184 tio->tc.t_eofc = CEOF; /* ^D */
1254 tio->tc.t_brkc = -1; 1185 tio->tc.t_brkc = -1;
1255 } 1186 }
1187
1256 /* get local special chars */ 1188 /* get local special chars */
1257 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1189 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1258 { 1190 {
1259 tio->lc.t_suspc = CSUSP; /* ^Z */ 1191 tio->lc.t_suspc = CSUSP; /* ^Z */
1260 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1192 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1264 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1196 tio->lc.t_lnextc = CLNEXT; /* ^V */
1265 } 1197 }
1266 /* get line discipline */ 1198 /* get line discipline */
1267 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1199 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1268# ifdef NTTYDISC 1200# ifdef NTTYDISC
1269
1270 tio->line = NTTYDISC; 1201 tio->line = NTTYDISC;
1271# endif /* NTTYDISC */ 1202# endif /* NTTYDISC */
1272 1203
1273 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1204 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1274#endif /* HAVE_TERMIOS_H */ 1205#endif /* HAVE_TERMIOS_H */
… …
1297 FOO (IGNCR, "IGNCR"); 1228 FOO (IGNCR, "IGNCR");
1298 FOO (ICRNL, "ICRNL"); 1229 FOO (ICRNL, "ICRNL");
1299 FOO (IXON, "IXON"); 1230 FOO (IXON, "IXON");
1300 FOO (IXOFF, "IXOFF"); 1231 FOO (IXOFF, "IXOFF");
1301# ifdef IUCLC 1232# ifdef IUCLC
1302
1303 FOO (IUCLC, "IUCLC"); 1233 FOO (IUCLC, "IUCLC");
1304# endif 1234# endif
1305# ifdef IXANY 1235# ifdef IXANY
1306
1307 FOO (IXANY, "IXANY"); 1236 FOO (IXANY, "IXANY");
1308# endif 1237# endif
1309# ifdef IMAXBEL 1238# ifdef IMAXBEL
1310
1311 FOO (IMAXBEL, "IMAXBEL"); 1239 FOO (IMAXBEL, "IMAXBEL");
1312# endif 1240# endif
1313 1241
1314 fprintf (stderr, "\n"); 1242 fprintf (stderr, "\n");
1315 1243
… …
1322 FOO (VERASE, "VERASE"); 1250 FOO (VERASE, "VERASE");
1323 FOO (VKILL, "VKILL"); 1251 FOO (VKILL, "VKILL");
1324 FOO (VEOF, "VEOF"); 1252 FOO (VEOF, "VEOF");
1325 FOO (VEOL, "VEOL"); 1253 FOO (VEOL, "VEOL");
1326# ifdef VEOL2 1254# ifdef VEOL2
1327
1328 FOO (VEOL2, "VEOL2"); 1255 FOO (VEOL2, "VEOL2");
1329# endif 1256# endif
1330# ifdef VSWTC 1257# ifdef VSWTC
1331
1332 FOO (VSWTC, "VSWTC"); 1258 FOO (VSWTC, "VSWTC");
1333# endif 1259# endif
1334# ifdef VSWTCH 1260# ifdef VSWTCH
1335
1336 FOO (VSWTCH, "VSWTCH"); 1261 FOO (VSWTCH, "VSWTCH");
1337# endif 1262# endif
1338
1339 FOO (VSTART, "VSTART"); 1263 FOO (VSTART, "VSTART");
1340 FOO (VSTOP, "VSTOP"); 1264 FOO (VSTOP, "VSTOP");
1341 FOO (VSUSP, "VSUSP"); 1265 FOO (VSUSP, "VSUSP");
1342# ifdef VDSUSP 1266# ifdef VDSUSP
1343
1344 FOO (VDSUSP, "VDSUSP"); 1267 FOO (VDSUSP, "VDSUSP");
1345# endif 1268# endif
1346# ifdef VREPRINT 1269# ifdef VREPRINT
1347
1348 FOO (VREPRINT, "VREPRINT"); 1270 FOO (VREPRINT, "VREPRINT");
1349# endif 1271# endif
1350# ifdef VDISCRD 1272# ifdef VDISCRD
1351
1352 FOO (VDISCRD, "VDISCRD"); 1273 FOO (VDISCRD, "VDISCRD");
1353# endif 1274# endif
1354# ifdef VWERSE 1275# ifdef VWERSE
1355
1356 FOO (VWERSE, "VWERSE"); 1276 FOO (VWERSE, "VWERSE");
1357# endif 1277# endif
1358# ifdef VLNEXT 1278# ifdef VLNEXT
1359
1360 FOO (VLNEXT, "VLNEXT"); 1279 FOO (VLNEXT, "VLNEXT");
1361# endif 1280# endif
1362 1281
1363 fprintf (stderr, "\n"); 1282 fprintf (stderr, "\n");
1364# undef FOO 1283# undef FOO
… …
1373 * the slave. 1292 * the slave.
1374 */ 1293 */
1375void 1294void
1376rxvt_term::run_command (const char *const *argv) 1295rxvt_term::run_command (const char *const *argv)
1377{ 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
1378 int er; 1321 int er;
1379
1380 if (!pty.get ())
1381 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1382 1322
1383#ifndef NO_BACKSPACE_KEY 1323#ifndef NO_BACKSPACE_KEY
1384 if (key_backspace[0] && !key_backspace[1]) 1324 if (key_backspace[0] && !key_backspace[1])
1385 er = key_backspace[0]; 1325 er = key_backspace[0];
1386 else if (strcmp (key_backspace, "DEC") == 0) 1326 else if (strcmp (key_backspace, "DEC") == 0)
… …
1389#endif 1329#endif
1390 er = -1; 1330 er = -1;
1391 1331
1392 rxvt_get_ttymode (&tio, er); 1332 rxvt_get_ttymode (&tio, er);
1393 1333
1394 /* set initial window size */ 1334#if ENABLE_FRILLS
1395 tt_winch (); 1335 if (rs[Rs_pty_fd])
1336 return;
1337#endif
1396 1338
1397 sw_chld.start (SIGCHLD);
1398
1399#ifndef __QNX__
1400 /* spin off the command interpreter */ 1339 /* spin off the command interpreter */
1401 switch (cmd_pid = fork ()) 1340 switch (cmd_pid = fork ())
1402 { 1341 {
1403 case -1: 1342 case -1:
1343 {
1344 cmd_pid = 0;
1404 rxvt_fatal ("can't fork, aborting.\n"); 1345 rxvt_fatal ("can't fork, aborting.\n");
1346 }
1405 case 0: 1347 case 0:
1406 init_env (); 1348 init_env ();
1407 1349
1408 if (!pty.make_controlling_tty ()) 1350 if (!pty->make_controlling_tty ())
1409 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1351 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1410 else 1352 else
1411 { 1353 {
1412 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1354 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1413 dup2 (pty.tty, STDIN_FILENO); 1355 dup2 (pty->tty, STDIN_FILENO);
1414 dup2 (pty.tty, STDOUT_FILENO); 1356 dup2 (pty->tty, STDOUT_FILENO);
1415 dup2 (pty.tty, STDERR_FILENO); 1357 dup2 (pty->tty, STDERR_FILENO);
1416 1358
1417 // close all our file handles that we do no longer need 1359 // close all our file handles that we do no longer need
1418 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1360 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1419 { 1361 {
1420 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1362 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1421 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1363 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1422 } 1364 }
1423 1365
1424 run_child (argv); 1366 run_child (argv);
1425 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1367 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1426 } 1368 }
1427 1369
1428 _exit (EXIT_FAILURE); 1370 _exit (EXIT_FAILURE);
1429 1371
1430 default: 1372 default:
1431 { 1373 if (!OPTION (Opt_utmpInhibit))
1432#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1374 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1433 int fdstdin;
1434 1375
1435 fdstdin = dup (STDIN_FILENO); 1376 pty->close_tty ();
1436 dup2 (pty.tty, STDIN_FILENO);
1437#endif
1438 1377
1439#ifdef UTMP_SUPPORT 1378 child_ev.start (cmd_pid);
1440 privileged_utmp (SAVE);
1441#endif
1442 1379
1443#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1380 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1444
1445 dup2 (fdstdin, STDIN_FILENO);
1446 close (fdstdin);
1447#endif
1448 }
1449
1450 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1451 break; 1381 break;
1452 } 1382 }
1453#else /* __QNX__ uses qnxspawn () */
1454 fchmod (pty.tty, 0622);
1455 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1456 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1457
1458 if (run_child (argv) == -1)
1459 exit (EXIT_FAILURE);
1460#endif
1461} 1383}
1462 1384
1463/* ------------------------------------------------------------------------- * 1385/* ------------------------------------------------------------------------- *
1464 * CHILD PROCESS OPERATIONS * 1386 * CHILD PROCESS OPERATIONS *
1465 * ------------------------------------------------------------------------- */ 1387 * ------------------------------------------------------------------------- */
… …
1472{ 1394{
1473 char *login; 1395 char *login;
1474 1396
1475 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1397 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1476 1398
1477 if (options & Opt_console) 1399 if (OPTION (Opt_console))
1478 { /* be virtual console, fail silently */ 1400 { /* be virtual console, fail silently */
1479#ifdef TIOCCONS 1401#ifdef TIOCCONS
1480 unsigned int on = 1; 1402 unsigned int on = 1;
1481 1403
1482 ioctl (STDIN_FILENO, TIOCCONS, &on); 1404 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1509 // unblock signals (signals are blocked by iom.C 1431 // unblock signals (signals are blocked by iom.C
1510 sigset_t ss; 1432 sigset_t ss;
1511 sigemptyset (&ss); 1433 sigemptyset (&ss);
1512 sigprocmask (SIG_SETMASK, &ss, 0); 1434 sigprocmask (SIG_SETMASK, &ss, 0);
1513 1435
1514#ifndef __QNX__
1515 /* command interpreter path */ 1436 /* command interpreter path */
1516 if (argv != NULL) 1437 if (argv != NULL)
1517 { 1438 {
1518# ifdef DEBUG_CMD 1439# ifdef DEBUG_CMD
1519 int i; 1440 int i;
… …
1525 execvp (argv[0], (char *const *)argv); 1446 execvp (argv[0], (char *const *)argv);
1526 /* no error message: STDERR is closed! */ 1447 /* no error message: STDERR is closed! */
1527 } 1448 }
1528 else 1449 else
1529 { 1450 {
1530 const char *argv0, *shell; 1451 const char *argv0, *shell;
1531 1452
1532 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1453 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1533 shell = "/bin/sh"; 1454 shell = "/bin/sh";
1534 1455
1535 argv0 = (const char *)rxvt_r_basename (shell); 1456 argv0 = (const char *)rxvt_r_basename (shell);
1536 1457
1537 if (options & Opt_loginShell) 1458 if (OPTION (Opt_loginShell))
1538 { 1459 {
1539 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1460 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1540 1461
1541 login[0] = '-'; 1462 login[0] = '-';
1542 strcpy (&login[1], argv0); 1463 strcpy (&login[1], argv0);
1543 argv0 = login; 1464 argv0 = login;
1544 } 1465 }
1466
1545 execlp (shell, argv0, NULL); 1467 execlp (shell, argv0, NULL);
1546 /* no error message: STDERR is closed! */ 1468 /* no error message: STDERR is closed! */
1547 } 1469 }
1548 1470
1549#else /* __QNX__ uses qnxspawn () */
1550
1551 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1552 char *command = NULL, fullcommand[_MAX_PATH];
1553 char **arg_v, *arg_a[2] = { NULL, NULL };
1554
1555 if (argv != NULL)
1556 {
1557 if (access (argv[0], X_OK) == -1)
1558 {
1559 if (strchr (argv[0], '/') == NULL)
1560 {
1561 searchenv (argv[0], "PATH", fullcommand);
1562
1563 if (fullcommand[0] != '\0')
1564 command = fullcommand;
1565 }
1566
1567 if (access (command, X_OK) == -1)
1568 return -1;
1569 }
1570 else
1571 command = argv[0];
1572
1573 arg_v = argv;
1574 }
1575 else
1576 {
1577 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1578 command = "/bin/sh";
1579
1580 arg_a[0] = my_basename (command);
1581
1582 if (options & Opt_loginShell)
1583 {
1584 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1585
1586 login[0] = '-';
1587 strcpy (&login[1], arg_a[0]);
1588 arg_a[0] = login;
1589 }
1590
1591 arg_v = arg_a;
1592 }
1593
1594 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1595 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1596 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1597 command, arg_v, environ, iov_a, 0);
1598 if (login)
1599 free (login);
1600
1601 pty.close_tty ();
1602 return pty.pty;
1603#endif
1604
1605 return -1; 1471 return -1;
1606} 1472}
1607 1473
1608/*----------------------- end-of-file (C source) -----------------------*/ 1474/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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