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.139 by root, Wed Jan 11 03:13:26 2006 UTC vs.
Revision 1.213 by root, Fri Sep 14 10:15:41 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>
… …
43const char *const def_colorName[] = 43const char *const def_colorName[] =
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 49 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 50 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 56 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 57# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 59# endif
60 /* high-intensity colors */ 60 /* high-intensity colors */
61# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 63# else
64 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 65# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
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",
… …
166#endif 166#endif
167#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if ENABLE_TRANSPARENCY
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "rgb:00/00/00",
176#endif
177 };
178
179const char *const xa_names[] =
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif 176#endif
216 }; 177 };
217 178
218bool 179bool
219rxvt_term::init_vars () 180rxvt_term::init_vars ()
220{ 181{
182 pix_colors = //
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 186#endif
225 pix_colors = pix_colors_focused;
226 187
227 if (pix_colors == NULL)
228 return false;
229
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231 pixmap = None;
232#endif
233 188
234 MEvent.time = CurrentTime; 189 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 190 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 191 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
239 focus = 0;
240 ncol = 80; 193 ncol = 80;
241 nrow = 24; 194 nrow = 24;
242 int_bwidth = INTERNALBORDERWIDTH; 195 int_bwidth = INTERNALBORDERWIDTH;
243 ext_bwidth = EXTERNALBORDERWIDTH; 196 ext_bwidth = EXTERNALBORDERWIDTH;
244 lineSpace = LINESPACE; 197 lineSpace = LINESPACE;
245 saveLines = SAVELINES; 198 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
247 200
248 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 202
252 oldcursor.row = oldcursor.col = -1; 203 oldcursor.row = oldcursor.col = -1;
253#ifdef XPM_BACKGROUND
254 /* bgPixmap.w = bgPixmap.h = 0; */
255 bgPixmap.x = bgPixmap.y = 50;
256 bgPixmap.pixmap = None;
257#endif
258
259 last_bot = last_state = -1; 204 last_bot = last_state = -1;
260 205
261#ifdef MENUBAR 206 set_option (Opt_scrollBar);
262 menu_readonly = 1; 207 set_option (Opt_scrollTtyOutput);
263# if ! (MENUBAR_MAX > 1) 208 set_option (Opt_jumpScroll);
264 CurrentBar = &BarList; 209 set_option (Opt_skipScroll);
265# endif /* (MENUBAR_MAX > 1) */ 210 set_option (Opt_secondaryScreen);
266#endif 211 set_option (Opt_secondaryScroll);
212 set_option (Opt_pastableTabs);
213 set_option (Opt_intensityStyles);
214 set_option (Opt_iso14755_52);
267 215
268 return true; 216 return true;
269} 217}
270 218
271void 219void
… …
305/*----------------------------------------------------------------------*/ 253/*----------------------------------------------------------------------*/
306const char ** 254const char **
307rxvt_term::init_resources (int argc, const char *const *argv) 255rxvt_term::init_resources (int argc, const char *const *argv)
308{ 256{
309 int i, r_argc; 257 int i, r_argc;
310 char *val;
311 const char **cmd_argv, **r_argv; 258 const char **cmd_argv, **r_argv;
312 259
313 /* 260 /*
314 * Look for -exec option. Find => split and make cmd_argv[] of command args 261 * Look for -e option. Find => split and make cmd_argv[] of command args
315 */ 262 */
316 for (r_argc = 0; r_argc < argc; r_argc++) 263 for (r_argc = 0; r_argc < argc; r_argc++)
317 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 264 if (!strcmp (argv[r_argc], "-e"))
318 break; 265 break;
319 266
320 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 267 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
321 268
322 for (i = 0; i < r_argc; i++) 269 for (i = 0; i < r_argc; i++)
… …
334 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 281 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
335 282
336 cmd_argv[i] = NULL; 283 cmd_argv[i] = NULL;
337 } 284 }
338 285
339 rs[Rs_name] = rxvt_r_basename (argv[0]); 286 rs[Rs_name] = rxvt_basename (argv[0]);
340 287
341 /* 288 /*
342 * Open display, get options/resources and create the window 289 * Open display, get options/resources and create the window
343 */ 290 */
344 {
345 TEMP_ENV;
346 291
347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 292 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
348 rs[Rs_display_name] = ":0"; 293 rs[Rs_display_name] = ":0";
349 294
350 get_options (r_argc, r_argv); 295 get_options (r_argc, r_argv);
351 296
352 if (!(display = displays.get (rs[Rs_display_name]))) 297 if (!(display = displays.get (rs[Rs_display_name])))
353 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 298 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
354 299
300 // using a local pointer decreases code size a lot
301 xa = display->xa;
302
303 set (display);
355 extract_resources (); 304 extract_resources ();
356 }
357 305
306#if XFT
307 if (rs[Rs_depth])
308 select_visual (strtol (rs[Rs_depth], 0, 0));
309#endif
310
311#ifdef HAVE_AFTERIMAGE
312 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
313#endif
358 free (r_argv); 314 free (r_argv);
315
316 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef)
318 rs [i] = 0;
319
320#if ENABLE_PERL
321 if (!rs[Rs_perl_ext_1])
322 rs[Rs_perl_ext_1] = "default";
323
324 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
325 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
326 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
327 {
328 rxvt_perl.init (this);
329 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
330 }
331#endif
359 332
360 /* 333 /*
361 * set any defaults not already set 334 * set any defaults not already set
362 */ 335 */
363 if (cmd_argv && cmd_argv[0]) 336 if (cmd_argv && cmd_argv[0])
364 { 337 {
365 if (!rs[Rs_title]) 338 if (!rs[Rs_title])
366 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 339 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
367 if (!rs[Rs_iconName]) 340 if (!rs[Rs_iconName])
368 rs[Rs_iconName] = rs[Rs_title]; 341 rs[Rs_iconName] = rs[Rs_title];
369 } 342 }
370 else 343 else
371 { 344 {
… …
409 rs[Rs_cutchars] = CUTCHARS; 382 rs[Rs_cutchars] = CUTCHARS;
410 383
411#ifndef NO_BACKSPACE_KEY 384#ifndef NO_BACKSPACE_KEY
412 if (!rs[Rs_backspace_key]) 385 if (!rs[Rs_backspace_key])
413# ifdef DEFAULT_BACKSPACE 386# ifdef DEFAULT_BACKSPACE
414 key_backspace = DEFAULT_BACKSPACE; 387 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
415# else 388# else
416 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 389 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
417# endif 390# endif
418 else
419 {
420 val = strdup (rs[Rs_backspace_key]);
421 rxvt_Str_trim (val);
422 rxvt_Str_escaped (val);
423 key_backspace = val;
424 }
425#endif 391#endif
426 392
427#ifndef NO_DELETE_KEY 393#ifndef NO_DELETE_KEY
428 if (!rs[Rs_delete_key]) 394 if (!rs[Rs_delete_key])
429# ifdef DEFAULT_DELETE 395# ifdef DEFAULT_DELETE
430 key_delete = DEFAULT_DELETE; 396 rs[Rs_delete_key] = DEFAULT_DELETE;
431# else 397# else
432 key_delete = "\033[3~"; 398 rs[Rs_delete_key] = "\033[3~";
433# endif
434 else
435 {
436 val = strdup (rs[Rs_delete_key]);
437 rxvt_Str_trim (val);
438 rxvt_Str_escaped (val);
439 key_delete = val;
440 }
441#endif 399# endif
442 if (rs[Rs_answerbackstring]) 400#endif
443 {
444 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
445 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
446 }
447 401
448#ifdef HAVE_SCROLLBARS 402#ifdef HAVE_SCROLLBARS
449 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 403 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
450#endif 404#endif
451 405
452#ifdef XTERM_REVERSE_VIDEO 406#ifdef XTERM_REVERSE_VIDEO
453 /* this is how xterm implements reverseVideo */ 407 /* this is how xterm implements reverseVideo */
454 if (OPTION (Opt_reverseVideo)) 408 if (option (Opt_reverseVideo))
455 { 409 {
456 if (!rs[Rs_color + Color_fg]) 410 if (!rs[Rs_color + Color_fg])
457 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 411 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
412
458 if (!rs[Rs_color + Color_bg]) 413 if (!rs[Rs_color + Color_bg])
459 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 414 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
460 } 415 }
461#endif 416#endif
462 417
… …
464 if (!rs[Rs_color + i]) 419 if (!rs[Rs_color + i])
465 rs[Rs_color + i] = def_colorName[i]; 420 rs[Rs_color + i] = def_colorName[i];
466 421
467#ifndef XTERM_REVERSE_VIDEO 422#ifndef XTERM_REVERSE_VIDEO
468 /* this is how we implement reverseVideo */ 423 /* this is how we implement reverseVideo */
469 if (OPTION (Opt_reverseVideo)) 424 if (option (Opt_reverseVideo))
470 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 425 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
471#endif 426#endif
472 427
473 /* convenient aliases for setting fg/bg to colors */ 428 /* convenient aliases for setting fg/bg to colors */
474 color_aliases (Color_fg); 429 color_aliases (Color_fg);
… …
495/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
496void 451void
497rxvt_term::init_env () 452rxvt_term::init_env ()
498{ 453{
499 int i; 454 int i;
500 unsigned int u;
501 char *val; 455 char *val;
502 456
503#ifdef DISPLAY_IS_IP 457#ifdef DISPLAY_IS_IP
504 /* Fixup display_name for export over pty to any interested terminal 458 /* Fixup display_name for export over pty to any interested terminal
505 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 459 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
514 val = rxvt_network_display (rs[Rs_display_name]); 468 val = rxvt_network_display (rs[Rs_display_name]);
515 rs[Rs_display_name] = (const char *)val; 469 rs[Rs_display_name] = (const char *)val;
516 470
517 if (val == NULL) 471 if (val == NULL)
518#endif /* DISPLAY_IS_IP */ 472#endif /* DISPLAY_IS_IP */
519 val = XDisplayString (display->display); 473 val = XDisplayString (dpy);
520 474
521 if (rs[Rs_display_name] == NULL) 475 if (rs[Rs_display_name] == NULL)
522 rs[Rs_display_name] = val; /* use broken `:0' value */ 476 rs[Rs_display_name] = val; /* use broken `:0' value */
523 477
524 i = strlen (val); 478 i = strlen (val);
525 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 479 env_display = (char *)rxvt_malloc (i + 9);
526 480
527 sprintf (env_display, "DISPLAY=%s", val); 481 sprintf (env_display, "DISPLAY=%s", val);
528 482
529 /* avoiding the math library: 483 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
530 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
531 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
532 ;
533 max_it (i, 1);
534 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
535
536 sprintf (env_windowid, "WINDOWID=%u",
537 (unsigned int)parent[0]);
538 484
539 /* add entries to the environment: 485 /* add entries to the environment:
540 * @ DISPLAY: in case we started with -display 486 * @ DISPLAY: in case we started with -display
541 * @ WINDOWID: X window id number of the window 487 * @ WINDOWID: X window id number of the window
542 * @ COLORTERM: terminal sub-name and also indicates its color 488 * @ COLORTERM: terminal sub-name and also indicates its color
… …
544 * @ TERMINFO: path to terminfo directory 490 * @ TERMINFO: path to terminfo directory
545 * @ COLORFGBG: fg;bg color codes 491 * @ COLORFGBG: fg;bg color codes
546 */ 492 */
547 putenv (env_display); 493 putenv (env_display);
548 putenv (env_windowid); 494 putenv (env_windowid);
495
549 if (env_colorfgbg) 496 if (env_colorfgbg)
550 putenv (env_colorfgbg); 497 putenv (env_colorfgbg);
551 498
552#ifdef RXVT_TERMINFO 499#ifdef RXVT_TERMINFO
553 putenv ("TERMINFO=" RXVT_TERMINFO); 500 putenv ("TERMINFO=" RXVT_TERMINFO);
554#endif 501#endif
555 502
556 if (display->depth <= 2) 503 if (depth <= 2)
557 putenv ("COLORTERM=" COLORTERMENV "-mono"); 504 putenv ("COLORTERM=" COLORTERMENV "-mono");
558 else 505 else
559 putenv ("COLORTERM=" COLORTERMENVFULL); 506 putenv ("COLORTERM=" COLORTERMENVFULL);
560 507
561 if (rs[Rs_term_name] != NULL) 508 if (rs[Rs_term_name] != NULL)
562 { 509 {
563 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 510 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
564 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 511 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
565 putenv (env_term); 512 putenv (env_term);
566 } 513 }
567 else 514 else
568 putenv ("TERM=" TERMENV); 515 putenv ("TERM=" TERMENV);
… …
581 * This should support all European type languages. 528 * This should support all European type languages.
582 */ 529 */
583void 530void
584rxvt_term::set_locale (const char *locale) 531rxvt_term::set_locale (const char *locale)
585{ 532{
586 TEMP_ENV; 533 set_environ (envv);
587 534
588#if HAVE_XSETLOCALE || HAVE_SETLOCALE 535#if HAVE_XSETLOCALE || HAVE_SETLOCALE
589 free (this->locale); 536 free (this->locale);
590 this->locale = setlocale (LC_CTYPE, locale); 537 this->locale = setlocale (LC_CTYPE, locale);
591 538
… …
622} 569}
623 570
624void 571void
625rxvt_term::init_xlocale () 572rxvt_term::init_xlocale ()
626{ 573{
627 TEMP_ENV; 574 set_environ (envv);
628 575
629#ifdef USE_XIM 576#ifdef USE_XIM
630 if (!locale) 577 if (!locale)
631 rxvt_warn ("setting locale failed, working without locale support.\n"); 578 rxvt_warn ("setting locale failed, working without locale support.\n");
632 else 579 else
… …
655 * Initialize the command connection. 602 * Initialize the command connection.
656 * This should be called after the X server connection is established. 603 * This should be called after the X server connection is established.
657 */ 604 */
658 605
659#ifdef META8_OPTION 606#ifdef META8_OPTION
660 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 607 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
661#endif 608#endif
662 609
663 get_ourmods (); 610 get_ourmods ();
664 611
665 if (!OPTION (Opt_scrollTtyOutput)) 612 if (!option (Opt_scrollTtyOutput))
666 priv_modes |= PrivMode_TtyOutputInh; 613 priv_modes |= PrivMode_TtyOutputInh;
667 if (OPTION (Opt_scrollTtyKeypress)) 614 if (option (Opt_scrollTtyKeypress))
668 priv_modes |= PrivMode_Keypress; 615 priv_modes |= PrivMode_Keypress;
669 if (!OPTION (Opt_jumpScroll)) 616 if (!option (Opt_jumpScroll))
670 priv_modes |= PrivMode_smoothScroll; 617 priv_modes |= PrivMode_smoothScroll;
671 618
672#ifndef NO_BACKSPACE_KEY 619#ifndef NO_BACKSPACE_KEY
673 if (strcmp (key_backspace, "DEC") == 0) 620 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
674 priv_modes |= PrivMode_HaveBackSpace; 621 priv_modes |= PrivMode_HaveBackSpace;
675#endif 622#endif
676 623
677 /* add value for scrollBar */ 624 /* add value for scrollBar */
678 if (scrollbar_visible ()) 625 if (scrollBar.state)
679 { 626 {
680 priv_modes |= PrivMode_scrollBar; 627 priv_modes |= PrivMode_scrollBar;
681 SavedModes |= PrivMode_scrollBar; 628 SavedModes |= PrivMode_scrollBar;
682 }
683
684 if (menubar_visible ())
685 {
686 priv_modes |= PrivMode_menuBar;
687 SavedModes |= PrivMode_menuBar;
688 } 629 }
689 630
690 run_command (argv); 631 run_command (argv);
691} 632}
692 633
… …
698 639
699#ifdef OFF_FOCUS_FADING 640#ifdef OFF_FOCUS_FADING
700 pix_colors = pix_colors_focused; 641 pix_colors = pix_colors_focused;
701#endif 642#endif
702 643
703 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 644 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
704 { 645 {
646 const char *name = rs[Rs_color + i];
647
648 if (!name)
649 continue;
650
705 rxvt_color xcol; 651 rxvt_color xcol;
706 652
707 if (!rs[Rs_color + i]) 653 if (!set_color (xcol, name))
708 continue;
709
710 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
711 { 654 {
712#ifndef XTERM_REVERSE_VIDEO 655#ifndef XTERM_REVERSE_VIDEO
713 if (i < 2 && OPTION (Opt_reverseVideo)) 656 if (i < 2 && option (Opt_reverseVideo))
714 rs[Rs_color + i] = def_colorName[!i]; 657 name = def_colorName [1 - i];
715 else 658 else
716#endif 659#endif
717 rs[Rs_color + i] = def_colorName[i]; 660 name = def_colorName [i];
718 661
719 if (!rs[Rs_color + i]) 662 if (!name)
720 continue; 663 continue;
721 664
722 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 665 if (!set_color (xcol, name))
723 { 666 {
724 switch (i) 667 switch (i)
725 { 668 {
726 case Color_fg: 669 case Color_fg:
727 case Color_bg: 670 case Color_bg:
728 /* fatal: need bg/fg color */
729 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 671 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
730 /* NOTREACHED */ 672 name = "";
731 break; 673 break;
732#ifndef NO_CURSORCOLOR 674#ifndef NO_CURSORCOLOR
733 case Color_cursor2: 675 case Color_cursor2:
734 xcol = pix_colors[Color_fg]; 676#endif
735 break;
736#endif /* ! NO_CURSORCOLOR */
737 case Color_pointer_fg: 677 case Color_pointer_fg:
738 xcol = pix_colors[Color_fg]; 678 name = rs[Rs_color + Color_fg];
679 xcol.set (this, name);
739 break; 680 break;
740 default: 681 default:
741 xcol = pix_colors[Color_bg]; /* None */ 682 name = rs[Rs_color + Color_bg];
683 xcol.set (this, name);
742 break; 684 break;
743 } 685 }
744 } 686 }
745 } 687 }
746 688
747 pix_colors[i] = xcol; 689 pix_colors[i] = xcol;
748 SET_PIXCOLOR (i); 690 rs[Rs_color + i] = name;
749 }
750
751#ifdef OFF_FOCUS_FADING
752 if (rs[Rs_fade])
753 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
754 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
755#endif
756
757 if (display->depth <= 2)
758 { 691 }
692
693 if (depth <= 2)
694 {
759 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 695 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
760 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 696 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
761 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 697 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
762 } 698 }
763 699
764 /* 700 /*
765 * get scrollBar/menuBar shadow colors 701 * get scrollBar shadow colors
766 * 702 *
767 * The calculations of topShadow/bottomShadow values are adapted 703 * The calculations of topShadow/bottomShadow values are adapted
768 * from the fvwm window manager. 704 * from the fvwm window manager.
769 */ 705 */
770#ifdef KEEP_SCROLLCOLOR 706#ifdef KEEP_SCROLLCOLOR
771
772 if (display->depth <= 2) 707 if (depth <= 2)
773 { 708 {
774 /* Monochrome */ 709 /* Monochrome */
775 pix_colors[Color_scroll] = pix_colors[Color_fg]; 710 alias_color (Color_scroll, Color_fg);
776 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 711 alias_color (Color_topShadow, Color_bg);
777 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 712 alias_color (Color_bottomShadow, Color_bg);
778 } 713 }
779 else 714 else
780 { 715 {
781 rxvt_color xcol[2]; 716 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
782 /* xcol[0] == white
783 * xcol[1] == top shadow
784 * xcol[2] == bot shadow */
785 717
786 xcol[1] = pix_colors[Color_scroll]; 718 rgba cscroll;
787 xcol[0].set (display, 65535, 65535, 65535); 719 pix_colors [Color_scroll].get (cscroll);
788
789 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
790
791 xcol[0].get (display, pr0, pg0, pb0);
792 xcol[1].get (display, pr1, pg1, pb1);
793
794 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
795 720
796 /* topShadowColor */ 721 /* topShadowColor */
797 if (!xcol[1].set (display, 722 if (!pix_colors[Color_topShadow].set (this,
798 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 723 rgba (
799 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 724 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
800 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 725 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
801 xcol[1] = pix_colors[Color_White]; 726 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
802 727 cscroll.a)
803 pix_colors[Color_topShadow] = xcol[1]; 728 ))
729 alias_color (Color_topShadow, Color_White);
804 } 730 }
805#endif /* KEEP_SCROLLCOLOR */ 731#endif /* KEEP_SCROLLCOLOR */
732
733#ifdef OFF_FOCUS_FADING
734 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
735 update_fade_color (i);
736#endif
806} 737}
807 738
808/*----------------------------------------------------------------------*/ 739/*----------------------------------------------------------------------*/
809/* color aliases, fg/bg bright-bold */ 740/* color aliases, fg/bg bright-bold */
810void 741void
… …
849 780
850 if (rsmod 781 if (rsmod
851 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 782 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
852 requestedmeta = rsmod[3] - '0'; 783 requestedmeta = rsmod[3] - '0';
853 784
854 map = XGetModifierMapping (display->display); 785 map = XGetModifierMapping (dpy);
855 kc = map->modifiermap; 786 kc = map->modifiermap;
856 787
857 for (i = 1; i < 6; i++) 788 for (i = 1; i < 6; i++)
858 { 789 {
859 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 790 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
861 for (j = map->max_keypermod; j--; k++) 792 for (j = map->max_keypermod; j--; k++)
862 { 793 {
863 if (kc[k] == 0) 794 if (kc[k] == 0)
864 break; 795 break;
865 796
866 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 797 switch (XKeycodeToKeysym (dpy, kc[k], 0))
867 { 798 {
868 case XK_Num_Lock: 799 case XK_Num_Lock:
869 ModNumLockMask = modmasks[i - 1]; 800 ModNumLockMask = modmasks[i - 1];
870 continue; 801 continue;
871 802
… …
921rxvt_term::create_windows (int argc, const char *const *argv) 852rxvt_term::create_windows (int argc, const char *const *argv)
922{ 853{
923 XClassHint classHint; 854 XClassHint classHint;
924 XWMHints wmHint; 855 XWMHints wmHint;
925#if ENABLE_FRILLS 856#if ENABLE_FRILLS
926 Atom prop = None;
927 MWMHints mwmhints; 857 MWMHints mwmhints = { };
928#endif 858#endif
929 XGCValues gcvalue; 859 XGCValues gcvalue;
930 long vt_emask;
931 XSetWindowAttributes attributes; 860 XSetWindowAttributes attributes;
932 XWindowAttributes gattr;
933 Window top, parent; 861 Window top, parent;
934 dDisp;
935 862
936#ifdef USING_W11LIB 863 dLocal (Display *, dpy);
937 /* enable W11 callbacks */
938 W11AddEventHandler (disp, rxvt_W11_process_x_event);
939#endif
940 864
941 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 865 /* grab colors before netscape does */
942 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 866 Get_Colours ();
943 867
944 if (OPTION (Opt_transparent)) 868 if (!set_fonts ())
945 { 869 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
946 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 870
947 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 871 parent = display->root;
948 } 872
873 attributes.override_redirect = !!option (Opt_override_redirect);
949 874
950#if ENABLE_FRILLS 875#if ENABLE_FRILLS
951 if (OPTION (Opt_borderLess)) 876 if (option (Opt_borderLess))
952 { 877 {
953 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 878 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
954
955 if (prop == None)
956 { 879 {
957 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 880 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
958#ifdef PREFER_24BIT
959 attributes.override_redirect = TRUE; 881 attributes.override_redirect = true;
960#endif
961 mwmhints.flags = 0;
962 } 882 }
963 else 883 else
964 { 884 {
965 mwmhints.flags = MWM_HINTS_DECORATIONS; 885 mwmhints.flags = MWM_HINTS_DECORATIONS;
966 mwmhints.decorations = 0;
967 } 886 }
968 } 887 }
969 else
970 mwmhints.flags = 0;
971#endif 888#endif
972
973 /* grab colors before netscape does */
974 Get_Colours ();
975
976 if (!set_fonts ())
977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
978
979 parent = DefaultRootWindow (disp);
980 889
981#if ENABLE_XEMBED 890#if ENABLE_XEMBED
982 if (rs[Rs_embed]) 891 if (rs[Rs_embed])
983 { 892 {
984 XWindowAttributes wattr; 893 XWindowAttributes wattr;
985 894
986 parent = strtol (rs[Rs_embed], 0, 0); 895 parent = strtol (rs[Rs_embed], 0, 0);
987 896
988 if (!XGetWindowAttributes (disp, parent, &wattr)) 897 if (!XGetWindowAttributes (dpy, parent, &wattr))
989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 898 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
990 899
991 window_calc (wattr.width, wattr.height); 900 window_calc (wattr.width, wattr.height);
992 } 901 }
993#endif 902#endif
994 903
995 window_calc (0, 0); 904 window_calc (0, 0);
996 905
997 /* sub-window placement & size in rxvt_resize_subwindows () */ 906 /* sub-window placement & size in rxvt_resize_subwindows () */
998#ifdef PREFER_24BIT
999 attributes.background_pixel = pix_colors_focused[Color_border]; 907 attributes.background_pixel = pix_colors_focused [Color_border];
1000 attributes.border_pixel = pix_colors_focused[Color_border]; 908 attributes.border_pixel = pix_colors_focused [Color_border];
1001 attributes.colormap = display->cmap; 909 attributes.colormap = cmap;
910
1002 top = XCreateWindow (disp, parent, 911 top = XCreateWindow (dpy, parent,
1003 szHint.x, szHint.y, 912 szHint.x, szHint.y,
1004 szHint.width, szHint.height, 913 szHint.width, szHint.height,
1005 ext_bwidth, 914 ext_bwidth,
1006 display->depth, InputOutput, 915 depth, InputOutput, visual,
1007 display->visual,
1008 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 916 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1009#else 917 &attributes);
1010 top = XCreateSimpleWindow (disp, parent,
1011 szHint.x, szHint.y,
1012 szHint.width, szHint.height,
1013 ext_bwidth,
1014 pix_colors_focused[Color_border],
1015 pix_colors_focused[Color_border]);
1016#endif
1017 918
1018 this->parent[0] = top; 919 this->parent[0] = top;
1019 920
1020 old_width = szHint.width; 921 old_width = szHint.width;
1021 old_height = szHint.height; 922 old_height = szHint.height;
1022 923
1023 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 924 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1024 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 925 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1025 926
1026 classHint.res_name = (char *)rs[Rs_name]; 927 classHint.res_name = (char *)rs[Rs_name];
1027 classHint.res_class = (char *)RESCLASS; 928 classHint.res_class = (char *)RESCLASS;
1028 929
1029 wmHint.flags = InputHint | StateHint | WindowGroupHint; 930 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1030 wmHint.input = True; 931 wmHint.input = True;
1031 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 932 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1032 wmHint.window_group = top; 933 wmHint.window_group = top;
1033 934
1034 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 935 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1035 &szHint, &wmHint, &classHint); 936 &szHint, &wmHint, &classHint);
937
938#if ENABLE_FRILLS
939 if (mwmhints.flags)
940 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
941 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
942#endif
1036 943
1037 Atom protocols[] = { 944 Atom protocols[] = {
1038 xa[XA_WM_DELETE_WINDOW], 945 xa[XA_WM_DELETE_WINDOW],
1039#if ENABLE_EWMH 946#if ENABLE_EWMH
1040 xa[XA_NET_WM_PING], 947 xa[XA_NET_WM_PING],
1041#endif 948#endif
1042 }; 949 };
1043 950
1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 951 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1045 952
1046#if ENABLE_FRILLS 953#if ENABLE_FRILLS
1047 if (rs[Rs_transient_for]) 954 if (rs[Rs_transient_for])
1048 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 955 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1049#endif 956#endif
1050 957
1051#if ENABLE_EWMH 958#if ENABLE_EWMH
1052 long pid = getpid (); 959 long pid = getpid ();
1053 960
1054 XChangeProperty (disp, top, 961 XChangeProperty (dpy, top,
1055 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 962 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1056 PropModeReplace, (unsigned char *)&pid, 1); 963 PropModeReplace, (unsigned char *)&pid, 1);
1057 964
1058 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 965 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1059#endif 966#endif
1060 967
1061 XSelectInput (disp, top, 968 XSelectInput (dpy, top,
1062 KeyPressMask 969 KeyPressMask
1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 970#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1064 | KeyReleaseMask 971 | KeyReleaseMask
1065#endif 972#endif
1066 | FocusChangeMask | VisibilityChangeMask 973 | FocusChangeMask | VisibilityChangeMask
1067 | ExposureMask | StructureNotifyMask); 974 | ExposureMask | StructureNotifyMask);
1068 975
1069 termwin_ev.start (display, top); 976 termwin_ev.start (display, top);
1070 977
1071#if ENABLE_FRILLS
1072 if (mwmhints.flags)
1073 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1074 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1075#endif
1076
1077 /* vt cursor: Black-on-White is standard, but this is more popular */ 978 /* vt cursor: Black-on-White is standard, but this is more popular */
1078 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 979 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1079 980
1080#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 981#ifdef HAVE_SCROLLBARS
1081 /* cursor (menuBar/scrollBar): Black-on-White */ 982 /* cursor scrollBar: Black-on-White */
1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 983 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1083#endif 984#endif
1084 985
1085 /* the vt window */ 986 /* the vt window */
1086 vt = XCreateSimpleWindow (disp, top, 987 vt = XCreateSimpleWindow (dpy, top,
1087 window_vt_x,
1088 window_vt_y, 988 window_vt_x, window_vt_y,
1089 width,
1090 height, 989 width, height,
1091 0, 990 0,
1092 pix_colors_focused[Color_fg], 991 pix_colors_focused[Color_fg],
1093 pix_colors_focused[Color_bg]); 992 pix_colors_focused[Color_bg]);
1094#ifdef DEBUG_X
1095 XStoreName (disp, vt, "vt window");
1096#endif
1097 993
1098 attributes.bit_gravity = NorthWestGravity; 994 attributes.bit_gravity = NorthWestGravity;
1099 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 995 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1100 996
1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 997 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1102 998
1103 if (OPTION (Opt_pointerBlank) 999 if (option (Opt_pointerBlank))
1104#ifdef ENABLE_PERL
1105 || perl.self
1106#endif
1107 )
1108 vt_emask |= PointerMotionMask; 1000 vt_emask |= PointerMotionMask;
1109 else 1001 else
1110 vt_emask |= Button1MotionMask | Button3MotionMask; 1002 vt_emask |= Button1MotionMask | Button3MotionMask;
1111 1003
1112 XSelectInput (disp, vt, vt_emask); 1004 vt_select_input ();
1005
1113 vt_ev.start (display, vt); 1006 vt_ev.start (display, vt);
1114 1007
1115#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1116 if (menuBar_height ())
1117 {
1118 menuBar.win = XCreateSimpleWindow (disp, top,
1119 window_vt_x, 0,
1120 width,
1121 menuBar_TotalHeight (),
1122 0,
1123 pix_colors_focused[Color_fg],
1124 pix_colors_focused[Color_scroll]);
1125
1126#ifdef DEBUG_X
1127 XStoreName (disp, menuBar.win, "menubar");
1128#endif
1129
1130 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1131
1132 XDefineCursor (disp, menuBar.win,
1133 XCreateFontCursor (disp, XC_left_ptr));
1134
1135 XSelectInput (disp, menuBar.win,
1136 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1137 menubar_ev.start (display, menuBar.win);
1138 }
1139#endif
1140
1141#ifdef XPM_BACKGROUND
1142 if (rs[Rs_backgroundPixmap] != NULL
1143 && ! OPTION (Opt_transparent))
1144 {
1145 const char *p = rs[Rs_backgroundPixmap];
1146
1147 if ((p = strchr (p, ';')) != NULL)
1148 {
1149 p++;
1150 scale_pixmap (p);
1151 }
1152
1153 set_bgPixmap (rs[Rs_backgroundPixmap]);
1154 scr_touch (true);
1155 }
1156#endif
1157
1158 /* graphics context for the vt window */ 1008 /* graphics context for the vt window */
1159 gcvalue.foreground = pix_colors[Color_fg]; 1009 gcvalue.foreground = pix_colors[Color_fg];
1160 gcvalue.background = pix_colors[Color_bg]; 1010 gcvalue.background = pix_colors[Color_bg];
1161 gcvalue.graphics_exposures = 1; 1011 gcvalue.graphics_exposures = 0;
1012
1162 gc = XCreateGC (disp, vt, 1013 gc = XCreateGC (dpy, vt,
1163 GCForeground | GCBackground | GCGraphicsExposures, 1014 GCForeground | GCBackground | GCGraphicsExposures,
1164 &gcvalue); 1015 &gcvalue);
1165 1016
1166 drawable = new rxvt_drawable (display, vt); 1017 drawable = new rxvt_drawable (this, vt);
1167 1018
1168#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1019#ifdef RXVT_SCROLLBAR
1169 gcvalue.foreground = pix_colors[Color_topShadow]; 1020 gcvalue.foreground = pix_colors[Color_topShadow];
1170 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1021 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1171 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1022 gcvalue.foreground = pix_colors[Color_bottomShadow];
1172 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1023 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1173 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1024 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1174 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1025 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1175#endif 1026#endif
1176 1027
1177#ifdef OFF_FOCUS_FADING 1028#ifdef OFF_FOCUS_FADING
1178 // initially we are in unfocused state 1029 // initially we are in unfocused state
1179 if (rs[Rs_fade]) 1030 if (rs[Rs_fade])
1180 pix_colors = pix_colors_unfocused; 1031 pix_colors = pix_colors_unfocused;
1181#endif 1032#endif
1182 1033
1183 pointer_unblank (); 1034 pointer_unblank ();
1184 scr_recolour (); 1035 scr_recolour ();
1185
1186#if ENABLE_XEMBED
1187 if (rs[Rs_embed])
1188 {
1189 long info[2] = { 0, XEMBED_MAPPED };
1190
1191 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1192 32, PropModeReplace, (unsigned char *)&info, 2);
1193 }
1194#endif
1195} 1036}
1196 1037
1197/* ------------------------------------------------------------------------- * 1038/* ------------------------------------------------------------------------- *
1198 * GET TTY CURRENT STATE * 1039 * GET TTY CURRENT STATE *
1199 * ------------------------------------------------------------------------- */ 1040 * ------------------------------------------------------------------------- */
1200void 1041void
1201rxvt_get_ttymode (ttymode_t *tio, int erase) 1042rxvt_get_ttymode (ttymode_t *tio, int erase)
1202{ 1043{
1203#ifdef HAVE_TERMIOS_H
1204 /* 1044 /*
1205 * standard System V termios interface 1045 * standard System V termios interface
1206 */ 1046 */
1207 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1047 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1208 { 1048 {
… …
1275 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1115 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1276# if defined (ECHOCTL) && defined (ECHOKE) 1116# if defined (ECHOCTL) && defined (ECHOKE)
1277 | ECHOCTL | ECHOKE 1117 | ECHOCTL | ECHOKE
1278# endif 1118# endif
1279 | ECHOE | ECHOK); 1119 | ECHOE | ECHOK);
1280# else /* HAVE_TERMIOS_H */
1281
1282 /*
1283 * sgtty interface
1284 */
1285
1286 /* get parameters -- gtty */
1287 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1288 {
1289 tio->sg.sg_erase = CERASE; /* ^H */
1290 tio->sg.sg_kill = CKILL; /* ^U */
1291 }
1292
1293 if (erase != -1)
1294 tio->sg.sg_erase = (char)erase;
1295
1296 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1297
1298 /* get special characters */
1299 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1300 {
1301 tio->tc.t_intrc = CINTR; /* ^C */
1302 tio->tc.t_quitc = CQUIT; /* ^\ */
1303 tio->tc.t_startc = CSTART; /* ^Q */
1304 tio->tc.t_stopc = CSTOP; /* ^S */
1305 tio->tc.t_eofc = CEOF; /* ^D */
1306 tio->tc.t_brkc = -1;
1307 }
1308
1309 /* get local special chars */
1310 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1311 {
1312 tio->lc.t_suspc = CSUSP; /* ^Z */
1313 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1314 tio->lc.t_rprntc = CRPRNT; /* ^R */
1315 tio->lc.t_flushc = CFLUSH; /* ^O */
1316 tio->lc.t_werasc = CWERASE; /* ^W */
1317 tio->lc.t_lnextc = CLNEXT; /* ^V */
1318 }
1319 /* get line discipline */
1320 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1321# ifdef NTTYDISC
1322 tio->line = NTTYDISC;
1323# endif /* NTTYDISC */
1324
1325 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1326#endif /* HAVE_TERMIOS_H */
1327 1120
1328 /* 1121 /*
1329 * Debugging 1122 * Debugging
1330 */ 1123 */
1331#ifdef DEBUG_TTYMODE 1124#ifdef DEBUG_TTYMODE
… …
1413 * the slave. 1206 * the slave.
1414 */ 1207 */
1415void 1208void
1416rxvt_term::run_command (const char *const *argv) 1209rxvt_term::run_command (const char *const *argv)
1417{ 1210{
1418 TEMP_ENV; // not very temporary...
1419
1420#if ENABLE_FRILLS 1211#if ENABLE_FRILLS
1421 if (rs[Rs_pty_fd]) 1212 if (rs[Rs_pty_fd])
1422 { 1213 {
1423 pty.pty = atoi (rs[Rs_pty_fd]); 1214 pty->pty = atoi (rs[Rs_pty_fd]);
1424 1215
1425 if (pty.pty >= 0) 1216 if (pty->pty >= 0)
1426 { 1217 {
1427 if (getfd_hook) 1218 if (getfd_hook)
1428 pty.pty = (*getfd_hook) (pty.pty); 1219 pty->pty = (*getfd_hook) (pty->pty);
1429 1220
1430 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1221 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1431 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1222 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1432 } 1223 }
1433 } 1224 }
1434 else 1225 else
1435#endif 1226#endif
1436 if (!pty.get ()) 1227 if (!pty->get ())
1437 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1228 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1438 1229
1230 int er;
1231
1232#ifndef NO_BACKSPACE_KEY
1233 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1234 er = rs[Rs_backspace_key][0];
1235 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1236 er = '\177'; /* the initial state anyway */
1237 else
1238#endif
1239 er = -1;
1240
1241 rxvt_get_ttymode (&tio, er);
1242 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1439 pty.set_utf8_mode (enc_utf8); 1243 pty->set_utf8_mode (enc_utf8);
1440 1244
1441 /* set initial window size */ 1245 /* set initial window size */
1442 tt_winch (); 1246 tt_winch ();
1443
1444 int er;
1445
1446#ifndef NO_BACKSPACE_KEY
1447 if (key_backspace[0] && !key_backspace[1])
1448 er = key_backspace[0];
1449 else if (strcmp (key_backspace, "DEC") == 0)
1450 er = '\177'; /* the initial state anyway */
1451 else
1452#endif
1453 er = -1;
1454
1455 rxvt_get_ttymode (&tio, er);
1456 1247
1457#if ENABLE_FRILLS 1248#if ENABLE_FRILLS
1458 if (rs[Rs_pty_fd]) 1249 if (rs[Rs_pty_fd])
1459 return; 1250 return;
1460#endif 1251#endif
1461 1252
1462#ifndef __QNX__
1463 /* spin off the command interpreter */ 1253 /* spin off the command interpreter */
1464 switch (cmd_pid = fork ()) 1254 switch (cmd_pid = fork ())
1465 { 1255 {
1466 case -1: 1256 case -1:
1467 { 1257 {
… …
1469 rxvt_fatal ("can't fork, aborting.\n"); 1259 rxvt_fatal ("can't fork, aborting.\n");
1470 } 1260 }
1471 case 0: 1261 case 0:
1472 init_env (); 1262 init_env ();
1473 1263
1474 if (!pty.make_controlling_tty ()) 1264 if (!pty->make_controlling_tty ())
1475 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1265 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1476 else 1266 else
1477 { 1267 {
1478 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1268 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1479 dup2 (pty.tty, STDIN_FILENO); 1269 dup2 (pty->tty, STDIN_FILENO);
1480 dup2 (pty.tty, STDOUT_FILENO); 1270 dup2 (pty->tty, STDOUT_FILENO);
1481 dup2 (pty.tty, STDERR_FILENO); 1271 dup2 (pty->tty, STDERR_FILENO);
1482 1272
1483 // close all our file handles that we do no longer need 1273 // close all our file handles that we do no longer need
1484 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1274 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1485 { 1275 {
1486 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1276 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1487 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1277 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1488 } 1278 }
1489 1279
1490 run_child (argv); 1280 run_child (argv);
1491 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1281 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1492 } 1282 }
1493 1283
1494 _exit (EXIT_FAILURE); 1284 _exit (EXIT_FAILURE);
1495 1285
1496 default: 1286 default:
1497 { 1287 if (!option (Opt_utmpInhibit))
1498#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1288 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1499 int fdstdin;
1500 1289
1501 fdstdin = dup (STDIN_FILENO); 1290 pty->close_tty ();
1502 dup2 (pty.tty, STDIN_FILENO);
1503#endif
1504 1291
1505#ifdef UTMP_SUPPORT 1292 child_ev.start (cmd_pid);
1506 privileged_utmp (SAVE);
1507#endif
1508 1293
1509#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1294 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1510
1511 dup2 (fdstdin, STDIN_FILENO);
1512 close (fdstdin);
1513#endif
1514 }
1515
1516 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1517 break; 1295 break;
1518 } 1296 }
1519#else /* __QNX__ uses qnxspawn () */
1520 fchmod (pty.tty, 0622);
1521 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1522 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1523
1524 if (run_child (argv) == -1)
1525 exit (EXIT_FAILURE);
1526#endif
1527} 1297}
1528 1298
1529/* ------------------------------------------------------------------------- * 1299/* ------------------------------------------------------------------------- *
1530 * CHILD PROCESS OPERATIONS * 1300 * CHILD PROCESS OPERATIONS *
1531 * ------------------------------------------------------------------------- */ 1301 * ------------------------------------------------------------------------- */
… …
1536int 1306int
1537rxvt_term::run_child (const char *const *argv) 1307rxvt_term::run_child (const char *const *argv)
1538{ 1308{
1539 char *login; 1309 char *login;
1540 1310
1541 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1542
1543 if (OPTION (Opt_console)) 1311 if (option (Opt_console))
1544 { /* be virtual console, fail silently */ 1312 { /* be virtual console, fail silently */
1545#ifdef TIOCCONS 1313#ifdef TIOCCONS
1546 unsigned int on = 1; 1314 unsigned int on = 1;
1547 1315
1548 ioctl (STDIN_FILENO, TIOCCONS, &on); 1316 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1575 // unblock signals (signals are blocked by iom.C 1343 // unblock signals (signals are blocked by iom.C
1576 sigset_t ss; 1344 sigset_t ss;
1577 sigemptyset (&ss); 1345 sigemptyset (&ss);
1578 sigprocmask (SIG_SETMASK, &ss, 0); 1346 sigprocmask (SIG_SETMASK, &ss, 0);
1579 1347
1580#ifndef __QNX__
1581 /* command interpreter path */ 1348 /* command interpreter path */
1582 if (argv != NULL) 1349 if (argv)
1583 { 1350 {
1584# ifdef DEBUG_CMD 1351# ifdef DEBUG_CMD
1585 int i; 1352 int i;
1586 1353
1587 for (i = 0; argv[i]; i++) 1354 for (i = 0; argv[i]; i++)
… …
1596 const char *argv0, *shell; 1363 const char *argv0, *shell;
1597 1364
1598 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1365 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1599 shell = "/bin/sh"; 1366 shell = "/bin/sh";
1600 1367
1601 argv0 = (const char *)rxvt_r_basename (shell); 1368 argv0 = (const char *)rxvt_basename (shell);
1602 1369
1603 if (OPTION (Opt_loginShell)) 1370 if (option (Opt_loginShell))
1604 { 1371 {
1605 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1372 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1606 1373
1607 login[0] = '-'; 1374 login[0] = '-';
1608 strcpy (&login[1], argv0); 1375 strcpy (&login[1], argv0);
1609 argv0 = login; 1376 argv0 = login;
1610 } 1377 }
1611 1378
1612 execlp (shell, argv0, NULL); 1379 execlp (shell, argv0, (char *)0);
1613 /* no error message: STDERR is closed! */ 1380 /* no error message: STDERR is closed! */
1614 } 1381 }
1615
1616#else /* __QNX__ uses qnxspawn () */
1617
1618 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1619 char *command = NULL, fullcommand[_MAX_PATH];
1620 char **arg_v, *arg_a[2] = { NULL, NULL };
1621
1622 if (argv != NULL)
1623 {
1624 if (access (argv[0], X_OK) == -1)
1625 {
1626 if (strchr (argv[0], '/') == NULL)
1627 {
1628 searchenv (argv[0], "PATH", fullcommand);
1629
1630 if (fullcommand[0] != '\0')
1631 command = fullcommand;
1632 }
1633
1634 if (access (command, X_OK) == -1)
1635 return -1;
1636 }
1637 else
1638 command = argv[0];
1639
1640 arg_v = argv;
1641 }
1642 else
1643 {
1644 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1645 command = "/bin/sh";
1646
1647 arg_a[0] = my_basename (command);
1648
1649 if (OPTION (Opt_loginShell))
1650 {
1651 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1652
1653 login[0] = '-';
1654 strcpy (&login[1], arg_a[0]);
1655 arg_a[0] = login;
1656 }
1657
1658 arg_v = arg_a;
1659 }
1660
1661 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1662 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1663 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1664 command, arg_v, environ, iov_a, 0);
1665 if (login)
1666 free (login);
1667
1668 pty.close_tty ();
1669 return pty.pty;
1670#endif
1671 1382
1672 return -1; 1383 return -1;
1673} 1384}
1674 1385
1675/*----------------------- end-of-file (C source) -----------------------*/ 1386/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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