ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.120 by root, Mon Nov 28 18:37:42 2005 UTC vs.
Revision 1.187 by root, Mon Jun 18 12:53:26 2007 UTC

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

Diff Legend

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