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.167 by root, Tue Jan 31 19:54:39 2006 UTC vs.
Revision 1.212 by sasha, Wed Sep 12 21:06:08 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>
… …
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 48 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 49 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 50 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 56 "rgb:e5/e5/e5", // 7: white (Grey90)
… …
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 "rgb:00/00/00", 175 "rgb:00/00/00",
176#endif 176#endif
… …
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 186#endif
187 187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 188
192 MEvent.time = CurrentTime; 189 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 190 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 191 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 193 ncol = 80;
198 nrow = 24; 194 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 195 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 196 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 197 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 198 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
204 200
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
207 202
208 oldcursor.row = oldcursor.col = -1; 203 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50;
212 bgPixmap.pixmap = None;
213#endif
214
215 last_bot = last_state = -1; 204 last_bot = last_state = -1;
205
206 set_option (Opt_scrollBar);
207 set_option (Opt_scrollTtyOutput);
208 set_option (Opt_jumpScroll);
209 set_option (Opt_skipScroll);
210 set_option (Opt_secondaryScreen);
211 set_option (Opt_secondaryScroll);
212 set_option (Opt_pastableTabs);
213 set_option (Opt_intensityStyles);
214 set_option (Opt_iso14755_52);
216 215
217 return true; 216 return true;
218} 217}
219 218
220void 219void
… …
254/*----------------------------------------------------------------------*/ 253/*----------------------------------------------------------------------*/
255const char ** 254const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 255rxvt_term::init_resources (int argc, const char *const *argv)
257{ 256{
258 int i, r_argc; 257 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 258 const char **cmd_argv, **r_argv;
261 259
262 /* 260 /*
263 * 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
264 */ 262 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 263 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 264 if (!strcmp (argv[r_argc], "-e"))
267 break; 265 break;
268 266
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 267 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 268
271 for (i = 0; i < r_argc; i++) 269 for (i = 0; i < r_argc; i++)
… …
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 281 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284 282
285 cmd_argv[i] = NULL; 283 cmd_argv[i] = NULL;
286 } 284 }
287 285
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 286 rs[Rs_name] = rxvt_basename (argv[0]);
289 287
290 /* 288 /*
291 * Open display, get options/resources and create the window 289 * Open display, get options/resources and create the window
292 */ 290 */
293 291
… …
300 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]);
301 299
302 // using a local pointer decreases code size a lot 300 // using a local pointer decreases code size a lot
303 xa = display->xa; 301 xa = display->xa;
304 302
303 set (display);
304 extract_resources ();
305
305#if XFT 306#if XFT
306 if (rs[Rs_depth]) 307 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0)); 308 select_visual (strtol (rs[Rs_depth], 0, 0));
308 else
309#endif 309#endif
310 set (display);
311 310
312 extract_resources (); 311#ifdef HAVE_AFTERIMAGE
313 312 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
313#endif
314 free (r_argv); 314 free (r_argv);
315 315
316 for (int i = NUM_RESOURCES; i--; ) 316 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 317 if (rs [i] == resval_undef)
318 rs [i] = 0; 318 rs [i] = 0;
… …
334 * set any defaults not already set 334 * set any defaults not already set
335 */ 335 */
336 if (cmd_argv && cmd_argv[0]) 336 if (cmd_argv && cmd_argv[0])
337 { 337 {
338 if (!rs[Rs_title]) 338 if (!rs[Rs_title])
339 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 339 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
340 if (!rs[Rs_iconName]) 340 if (!rs[Rs_iconName])
341 rs[Rs_iconName] = rs[Rs_title]; 341 rs[Rs_iconName] = rs[Rs_title];
342 } 342 }
343 else 343 else
344 { 344 {
… …
382 rs[Rs_cutchars] = CUTCHARS; 382 rs[Rs_cutchars] = CUTCHARS;
383 383
384#ifndef NO_BACKSPACE_KEY 384#ifndef NO_BACKSPACE_KEY
385 if (!rs[Rs_backspace_key]) 385 if (!rs[Rs_backspace_key])
386# ifdef DEFAULT_BACKSPACE 386# ifdef DEFAULT_BACKSPACE
387 key_backspace = DEFAULT_BACKSPACE; 387 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
388# else 388# else
389 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 389 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
390# endif 390# endif
391 else
392 {
393 val = strdup (rs[Rs_backspace_key]);
394 rxvt_Str_trim (val);
395 rxvt_Str_escaped (val);
396 key_backspace = val;
397 }
398#endif 391#endif
399 392
400#ifndef NO_DELETE_KEY 393#ifndef NO_DELETE_KEY
401 if (!rs[Rs_delete_key]) 394 if (!rs[Rs_delete_key])
402# ifdef DEFAULT_DELETE 395# ifdef DEFAULT_DELETE
403 key_delete = DEFAULT_DELETE; 396 rs[Rs_delete_key] = DEFAULT_DELETE;
404# else 397# else
405 key_delete = "\033[3~"; 398 rs[Rs_delete_key] = "\033[3~";
406# endif
407 else
408 {
409 val = strdup (rs[Rs_delete_key]);
410 rxvt_Str_trim (val);
411 rxvt_Str_escaped (val);
412 key_delete = val;
413 }
414#endif 399# endif
415 if (rs[Rs_answerbackstring]) 400#endif
416 {
417 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
418 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
419 }
420 401
421#ifdef HAVE_SCROLLBARS 402#ifdef HAVE_SCROLLBARS
422 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]);
423#endif 404#endif
424 405
425#ifdef XTERM_REVERSE_VIDEO 406#ifdef XTERM_REVERSE_VIDEO
426 /* this is how xterm implements reverseVideo */ 407 /* this is how xterm implements reverseVideo */
427 if (OPTION (Opt_reverseVideo)) 408 if (option (Opt_reverseVideo))
428 { 409 {
429 if (!rs[Rs_color + Color_fg]) 410 if (!rs[Rs_color + Color_fg])
430 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 411 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431 412
432 if (!rs[Rs_color + Color_bg]) 413 if (!rs[Rs_color + Color_bg])
… …
438 if (!rs[Rs_color + i]) 419 if (!rs[Rs_color + i])
439 rs[Rs_color + i] = def_colorName[i]; 420 rs[Rs_color + i] = def_colorName[i];
440 421
441#ifndef XTERM_REVERSE_VIDEO 422#ifndef XTERM_REVERSE_VIDEO
442 /* this is how we implement reverseVideo */ 423 /* this is how we implement reverseVideo */
443 if (OPTION (Opt_reverseVideo)) 424 if (option (Opt_reverseVideo))
444 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 425 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
445#endif 426#endif
446 427
447 /* convenient aliases for setting fg/bg to colors */ 428 /* convenient aliases for setting fg/bg to colors */
448 color_aliases (Color_fg); 429 color_aliases (Color_fg);
… …
469/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
470void 451void
471rxvt_term::init_env () 452rxvt_term::init_env ()
472{ 453{
473 int i; 454 int i;
474 unsigned int u;
475 char *val; 455 char *val;
476 456
477#ifdef DISPLAY_IS_IP 457#ifdef DISPLAY_IS_IP
478 /* Fixup display_name for export over pty to any interested terminal 458 /* Fixup display_name for export over pty to any interested terminal
479 * 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
… …
488 val = rxvt_network_display (rs[Rs_display_name]); 468 val = rxvt_network_display (rs[Rs_display_name]);
489 rs[Rs_display_name] = (const char *)val; 469 rs[Rs_display_name] = (const char *)val;
490 470
491 if (val == NULL) 471 if (val == NULL)
492#endif /* DISPLAY_IS_IP */ 472#endif /* DISPLAY_IS_IP */
493 val = XDisplayString (xdisp); 473 val = XDisplayString (dpy);
494 474
495 if (rs[Rs_display_name] == NULL) 475 if (rs[Rs_display_name] == NULL)
496 rs[Rs_display_name] = val; /* use broken `:0' value */ 476 rs[Rs_display_name] = val; /* use broken `:0' value */
497 477
498 i = strlen (val); 478 i = strlen (val);
499 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 479 env_display = (char *)rxvt_malloc (i + 9);
500 480
501 sprintf (env_display, "DISPLAY=%s", val); 481 sprintf (env_display, "DISPLAY=%s", val);
502 482
503 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 483 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
504 484
… …
525 else 505 else
526 putenv ("COLORTERM=" COLORTERMENVFULL); 506 putenv ("COLORTERM=" COLORTERMENVFULL);
527 507
528 if (rs[Rs_term_name] != NULL) 508 if (rs[Rs_term_name] != NULL)
529 { 509 {
530 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);
531 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 511 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
532 putenv (env_term); 512 putenv (env_term);
533 } 513 }
534 else 514 else
535 putenv ("TERM=" TERMENV); 515 putenv ("TERM=" TERMENV);
… …
622 * Initialize the command connection. 602 * Initialize the command connection.
623 * This should be called after the X server connection is established. 603 * This should be called after the X server connection is established.
624 */ 604 */
625 605
626#ifdef META8_OPTION 606#ifdef META8_OPTION
627 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 607 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
628#endif 608#endif
629 609
630 get_ourmods (); 610 get_ourmods ();
631 611
632 if (!OPTION (Opt_scrollTtyOutput)) 612 if (!option (Opt_scrollTtyOutput))
633 priv_modes |= PrivMode_TtyOutputInh; 613 priv_modes |= PrivMode_TtyOutputInh;
634 if (OPTION (Opt_scrollTtyKeypress)) 614 if (option (Opt_scrollTtyKeypress))
635 priv_modes |= PrivMode_Keypress; 615 priv_modes |= PrivMode_Keypress;
636 if (!OPTION (Opt_jumpScroll)) 616 if (!option (Opt_jumpScroll))
637 priv_modes |= PrivMode_smoothScroll; 617 priv_modes |= PrivMode_smoothScroll;
638 618
639#ifndef NO_BACKSPACE_KEY 619#ifndef NO_BACKSPACE_KEY
640 if (strcmp (key_backspace, "DEC") == 0) 620 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
641 priv_modes |= PrivMode_HaveBackSpace; 621 priv_modes |= PrivMode_HaveBackSpace;
642#endif 622#endif
643 623
644 /* add value for scrollBar */ 624 /* add value for scrollBar */
645 if (scrollBar.state) 625 if (scrollBar.state)
… …
671 rxvt_color xcol; 651 rxvt_color xcol;
672 652
673 if (!set_color (xcol, name)) 653 if (!set_color (xcol, name))
674 { 654 {
675#ifndef XTERM_REVERSE_VIDEO 655#ifndef XTERM_REVERSE_VIDEO
676 if (i < 2 && OPTION (Opt_reverseVideo)) 656 if (i < 2 && option (Opt_reverseVideo))
677 name = def_colorName [1 - i]; 657 name = def_colorName [1 - i];
678 else 658 else
679#endif 659#endif
680 name = def_colorName [i]; 660 name = def_colorName [i];
681 661
… …
694#ifndef NO_CURSORCOLOR 674#ifndef NO_CURSORCOLOR
695 case Color_cursor2: 675 case Color_cursor2:
696#endif 676#endif
697 case Color_pointer_fg: 677 case Color_pointer_fg:
698 name = rs[Rs_color + Color_fg]; 678 name = rs[Rs_color + Color_fg];
699 xcol = pix_colors[Color_fg]; 679 xcol.set (this, name);
700 break; 680 break;
701 default: 681 default:
702 name = rs[Rs_color + Color_bg]; 682 name = rs[Rs_color + Color_bg];
703 xcol = pix_colors[Color_bg]; 683 xcol.set (this, name);
704 break; 684 break;
705 } 685 }
706 } 686 }
707 } 687 }
708 688
709 pix_colors[i] = xcol; 689 pix_colors[i] = xcol;
710 rs[Rs_color + i] = name; 690 rs[Rs_color + i] = name;
711 } 691 }
712 692
713#ifdef OFF_FOCUS_FADING
714 if (rs[Rs_fade])
715 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
716 {
717 rgba c;
718 pix_colors[Color_fade].get (c);
719 pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
720 }
721#endif
722
723 if (depth <= 2) 693 if (depth <= 2)
724 { 694 {
725 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);
726 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);
727 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);
728 } 698 }
729 699
730 /* 700 /*
731 * get scrollBar shadow colors 701 * get scrollBar shadow colors
732 * 702 *
733 * The calculations of topShadow/bottomShadow values are adapted 703 * The calculations of topShadow/bottomShadow values are adapted
734 * from the fvwm window manager. 704 * from the fvwm window manager.
735 */ 705 */
736#ifdef KEEP_SCROLLCOLOR 706#ifdef KEEP_SCROLLCOLOR
737
738 if (depth <= 2) 707 if (depth <= 2)
739 { 708 {
740 /* Monochrome */ 709 /* Monochrome */
741 pix_colors[Color_scroll] = pix_colors[Color_fg]; 710 alias_color (Color_scroll, Color_fg);
742 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 711 alias_color (Color_topShadow, Color_bg);
743 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 712 alias_color (Color_bottomShadow, Color_bg);
744 } 713 }
745 else 714 else
746 { 715 {
747 rxvt_color xcol[2]; 716 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
748 /* xcol[0] == white
749 * xcol[1] == top shadow
750 * xcol[2] == bot shadow */
751 717
752 xcol[1] = pix_colors[Color_scroll];
753 xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
754
755 rgba c0, c1; 718 rgba cscroll;
756 719 pix_colors [Color_scroll].get (cscroll);
757 xcol[0].get (c0);
758 xcol[1].get (c1);
759
760 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
761 720
762 /* topShadowColor */ 721 /* topShadowColor */
763 if (!xcol[1].set (this, 722 if (!pix_colors[Color_topShadow].set (this,
764 rgba ( 723 rgba (
765 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 724 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
766 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 725 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
767 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 726 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
768 c1.a) // pa1 vs. pa0: arbitrary 727 cscroll.a)
769 )); 728 ))
770 xcol[1] = pix_colors[Color_White]; 729 alias_color (Color_topShadow, Color_White);
771
772 pix_colors[Color_topShadow] = xcol[1];
773 } 730 }
774#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
775} 737}
776 738
777/*----------------------------------------------------------------------*/ 739/*----------------------------------------------------------------------*/
778/* color aliases, fg/bg bright-bold */ 740/* color aliases, fg/bg bright-bold */
779void 741void
… …
818 780
819 if (rsmod 781 if (rsmod
820 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 782 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
821 requestedmeta = rsmod[3] - '0'; 783 requestedmeta = rsmod[3] - '0';
822 784
823 map = XGetModifierMapping (xdisp); 785 map = XGetModifierMapping (dpy);
824 kc = map->modifiermap; 786 kc = map->modifiermap;
825 787
826 for (i = 1; i < 6; i++) 788 for (i = 1; i < 6; i++)
827 { 789 {
828 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 790 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
830 for (j = map->max_keypermod; j--; k++) 792 for (j = map->max_keypermod; j--; k++)
831 { 793 {
832 if (kc[k] == 0) 794 if (kc[k] == 0)
833 break; 795 break;
834 796
835 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 797 switch (XKeycodeToKeysym (dpy, kc[k], 0))
836 { 798 {
837 case XK_Num_Lock: 799 case XK_Num_Lock:
838 ModNumLockMask = modmasks[i - 1]; 800 ModNumLockMask = modmasks[i - 1];
839 continue; 801 continue;
840 802
… …
890rxvt_term::create_windows (int argc, const char *const *argv) 852rxvt_term::create_windows (int argc, const char *const *argv)
891{ 853{
892 XClassHint classHint; 854 XClassHint classHint;
893 XWMHints wmHint; 855 XWMHints wmHint;
894#if ENABLE_FRILLS 856#if ENABLE_FRILLS
895 MWMHints mwmhints; 857 MWMHints mwmhints = { };
896#endif 858#endif
897 XGCValues gcvalue; 859 XGCValues gcvalue;
898 XSetWindowAttributes attributes; 860 XSetWindowAttributes attributes;
899 Window top, parent; 861 Window top, parent;
900 862
901 dLocal (Display *, xdisp); 863 dLocal (Display *, dpy);
902 864
903 /* grab colors before netscape does */ 865 /* grab colors before netscape does */
904 Get_Colours (); 866 Get_Colours ();
905 867
906 if (!set_fonts ()) 868 if (!set_fonts ())
907 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 869 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
908 870
909 parent = display->root; 871 parent = display->root;
910 872
911 attributes.override_redirect = !!OPTION (Opt_override_redirect); 873 attributes.override_redirect = !!option (Opt_override_redirect);
912 874
913#if ENABLE_FRILLS 875#if ENABLE_FRILLS
914 if (OPTION (Opt_borderLess)) 876 if (option (Opt_borderLess))
915 { 877 {
916 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 878 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
917 { 879 {
918 /* 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");
919 attributes.override_redirect = true; 881 attributes.override_redirect = true;
920 mwmhints.flags = 0;
921 } 882 }
922 else 883 else
923 { 884 {
924 mwmhints.flags = MWM_HINTS_DECORATIONS; 885 mwmhints.flags = MWM_HINTS_DECORATIONS;
925 mwmhints.decorations = 0;
926 } 886 }
927 } 887 }
928 else
929 mwmhints.flags = 0;
930#endif 888#endif
931 889
932#if ENABLE_XEMBED 890#if ENABLE_XEMBED
933 if (rs[Rs_embed]) 891 if (rs[Rs_embed])
934 { 892 {
935 XWindowAttributes wattr; 893 XWindowAttributes wattr;
936 894
937 parent = strtol (rs[Rs_embed], 0, 0); 895 parent = strtol (rs[Rs_embed], 0, 0);
938 896
939 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 897 if (!XGetWindowAttributes (dpy, parent, &wattr))
940 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 898 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
941 899
942 window_calc (wattr.width, wattr.height); 900 window_calc (wattr.width, wattr.height);
943 } 901 }
944#endif 902#endif
… …
948 /* sub-window placement & size in rxvt_resize_subwindows () */ 906 /* sub-window placement & size in rxvt_resize_subwindows () */
949 attributes.background_pixel = pix_colors_focused [Color_border]; 907 attributes.background_pixel = pix_colors_focused [Color_border];
950 attributes.border_pixel = pix_colors_focused [Color_border]; 908 attributes.border_pixel = pix_colors_focused [Color_border];
951 attributes.colormap = cmap; 909 attributes.colormap = cmap;
952 910
953 top = XCreateWindow (xdisp, parent, 911 top = XCreateWindow (dpy, parent,
954 szHint.x, szHint.y, 912 szHint.x, szHint.y,
955 szHint.width, szHint.height, 913 szHint.width, szHint.height,
956 ext_bwidth, 914 ext_bwidth,
957 depth, InputOutput, visual, 915 depth, InputOutput, visual,
958 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 916 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
969 classHint.res_name = (char *)rs[Rs_name]; 927 classHint.res_name = (char *)rs[Rs_name];
970 classHint.res_class = (char *)RESCLASS; 928 classHint.res_class = (char *)RESCLASS;
971 929
972 wmHint.flags = InputHint | StateHint | WindowGroupHint; 930 wmHint.flags = InputHint | StateHint | WindowGroupHint;
973 wmHint.input = True; 931 wmHint.input = True;
974 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 932 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
975 wmHint.window_group = top; 933 wmHint.window_group = top;
976 934
977 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 935 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
978 &szHint, &wmHint, &classHint); 936 &szHint, &wmHint, &classHint);
979 937
980#if ENABLE_FRILLS 938#if ENABLE_FRILLS
981 if (mwmhints.flags) 939 if (mwmhints.flags)
982 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 940 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
983 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 941 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
984#endif 942#endif
985 943
986 Atom protocols[] = { 944 Atom protocols[] = {
987 xa[XA_WM_DELETE_WINDOW], 945 xa[XA_WM_DELETE_WINDOW],
988#if ENABLE_EWMH 946#if ENABLE_EWMH
989 xa[XA_NET_WM_PING], 947 xa[XA_NET_WM_PING],
990#endif 948#endif
991 }; 949 };
992 950
993 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 951 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
994 952
995#if ENABLE_FRILLS 953#if ENABLE_FRILLS
996 if (rs[Rs_transient_for]) 954 if (rs[Rs_transient_for])
997 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 955 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
998#endif 956#endif
999 957
1000#if ENABLE_EWMH 958#if ENABLE_EWMH
1001 long pid = getpid (); 959 long pid = getpid ();
1002 960
1003 XChangeProperty (xdisp, top, 961 XChangeProperty (dpy, top,
1004 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 962 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1005 PropModeReplace, (unsigned char *)&pid, 1); 963 PropModeReplace, (unsigned char *)&pid, 1);
1006 964
1007 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 965 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1008#endif 966#endif
1009 967
1010 XSelectInput (xdisp, top, 968 XSelectInput (dpy, top,
1011 KeyPressMask 969 KeyPressMask
1012#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 970#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1013 | KeyReleaseMask 971 | KeyReleaseMask
1014#endif 972#endif
1015 | FocusChangeMask | VisibilityChangeMask 973 | FocusChangeMask | VisibilityChangeMask
1016 | ExposureMask | StructureNotifyMask); 974 | ExposureMask | StructureNotifyMask);
1017 975
1018 termwin_ev.start (display, top); 976 termwin_ev.start (display, top);
1019 977
1020 /* 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 */
1021 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 979 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1022 980
1023#ifdef HAVE_SCROLLBARS 981#ifdef HAVE_SCROLLBARS
1024 /* cursor scrollBar: Black-on-White */ 982 /* cursor scrollBar: Black-on-White */
1025 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 983 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1026#endif 984#endif
1027 985
1028 /* the vt window */ 986 /* the vt window */
1029 vt = XCreateSimpleWindow (xdisp, top, 987 vt = XCreateSimpleWindow (dpy, top,
1030 window_vt_x, window_vt_y, 988 window_vt_x, window_vt_y,
1031 width, height, 989 width, height,
1032 0, 990 0,
1033 pix_colors_focused[Color_fg], 991 pix_colors_focused[Color_fg],
1034 pix_colors_focused[Color_bg]); 992 pix_colors_focused[Color_bg]);
1035 993
1036 attributes.bit_gravity = NorthWestGravity; 994 attributes.bit_gravity = NorthWestGravity;
1037 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 995 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1038 996
1039 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 997 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1040 998
1041 if (OPTION (Opt_pointerBlank)) 999 if (option (Opt_pointerBlank))
1042 vt_emask |= PointerMotionMask; 1000 vt_emask |= PointerMotionMask;
1043 else 1001 else
1044 vt_emask |= Button1MotionMask | Button3MotionMask; 1002 vt_emask |= Button1MotionMask | Button3MotionMask;
1045 1003
1046 vt_select_input (); 1004 vt_select_input ();
1047 1005
1048 vt_ev.start (display, vt); 1006 vt_ev.start (display, vt);
1049 1007
1050#ifdef XPM_BACKGROUND
1051 if (rs[Rs_backgroundPixmap] != NULL
1052 && !OPTION (Opt_transparent))
1053 {
1054 const char *p = rs[Rs_backgroundPixmap];
1055
1056 if ((p = strchr (p, ';')) != NULL)
1057 {
1058 p++;
1059 scale_pixmap (p);
1060 }
1061
1062 set_bgPixmap (rs[Rs_backgroundPixmap]);
1063 scr_touch (true);
1064 }
1065#endif
1066
1067 /* graphics context for the vt window */ 1008 /* graphics context for the vt window */
1068 gcvalue.foreground = pix_colors[Color_fg]; 1009 gcvalue.foreground = pix_colors[Color_fg];
1069 gcvalue.background = pix_colors[Color_bg]; 1010 gcvalue.background = pix_colors[Color_bg];
1070 gcvalue.graphics_exposures = 1; 1011 gcvalue.graphics_exposures = 0;
1071 1012
1072 gc = XCreateGC (xdisp, vt, 1013 gc = XCreateGC (dpy, vt,
1073 GCForeground | GCBackground | GCGraphicsExposures, 1014 GCForeground | GCBackground | GCGraphicsExposures,
1074 &gcvalue); 1015 &gcvalue);
1075 1016
1076 drawable = new rxvt_drawable (this, vt); 1017 drawable = new rxvt_drawable (this, vt);
1077 1018
1078#ifdef RXVT_SCROLLBAR 1019#ifdef RXVT_SCROLLBAR
1079 gcvalue.foreground = pix_colors[Color_topShadow]; 1020 gcvalue.foreground = pix_colors[Color_topShadow];
1080 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1021 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1081 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1022 gcvalue.foreground = pix_colors[Color_bottomShadow];
1082 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1023 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1083 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1024 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1084 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1025 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1085#endif 1026#endif
1086 1027
1087#ifdef OFF_FOCUS_FADING 1028#ifdef OFF_FOCUS_FADING
1088 // initially we are in unfocused state 1029 // initially we are in unfocused state
1089 if (rs[Rs_fade]) 1030 if (rs[Rs_fade])
… …
1098 * GET TTY CURRENT STATE * 1039 * GET TTY CURRENT STATE *
1099 * ------------------------------------------------------------------------- */ 1040 * ------------------------------------------------------------------------- */
1100void 1041void
1101rxvt_get_ttymode (ttymode_t *tio, int erase) 1042rxvt_get_ttymode (ttymode_t *tio, int erase)
1102{ 1043{
1103#ifdef HAVE_TERMIOS_H
1104 /* 1044 /*
1105 * standard System V termios interface 1045 * standard System V termios interface
1106 */ 1046 */
1107 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1047 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1108 { 1048 {
… …
1175 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1115 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1176# if defined (ECHOCTL) && defined (ECHOKE) 1116# if defined (ECHOCTL) && defined (ECHOKE)
1177 | ECHOCTL | ECHOKE 1117 | ECHOCTL | ECHOKE
1178# endif 1118# endif
1179 | ECHOE | ECHOK); 1119 | ECHOE | ECHOK);
1180# else /* HAVE_TERMIOS_H */
1181
1182 /*
1183 * sgtty interface
1184 */
1185
1186 /* get parameters -- gtty */
1187 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1188 {
1189 tio->sg.sg_erase = CERASE; /* ^H */
1190 tio->sg.sg_kill = CKILL; /* ^U */
1191 }
1192
1193 if (erase != -1)
1194 tio->sg.sg_erase = (char)erase;
1195
1196 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1197
1198 /* get special characters */
1199 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1200 {
1201 tio->tc.t_intrc = CINTR; /* ^C */
1202 tio->tc.t_quitc = CQUIT; /* ^\ */
1203 tio->tc.t_startc = CSTART; /* ^Q */
1204 tio->tc.t_stopc = CSTOP; /* ^S */
1205 tio->tc.t_eofc = CEOF; /* ^D */
1206 tio->tc.t_brkc = -1;
1207 }
1208
1209 /* get local special chars */
1210 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1211 {
1212 tio->lc.t_suspc = CSUSP; /* ^Z */
1213 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1214 tio->lc.t_rprntc = CRPRNT; /* ^R */
1215 tio->lc.t_flushc = CFLUSH; /* ^O */
1216 tio->lc.t_werasc = CWERASE; /* ^W */
1217 tio->lc.t_lnextc = CLNEXT; /* ^V */
1218 }
1219 /* get line discipline */
1220 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1221# ifdef NTTYDISC
1222 tio->line = NTTYDISC;
1223# endif /* NTTYDISC */
1224
1225 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1226#endif /* HAVE_TERMIOS_H */
1227 1120
1228 /* 1121 /*
1229 * Debugging 1122 * Debugging
1230 */ 1123 */
1231#ifdef DEBUG_TTYMODE 1124#ifdef DEBUG_TTYMODE
… …
1332 else 1225 else
1333#endif 1226#endif
1334 if (!pty->get ()) 1227 if (!pty->get ())
1335 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1228 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1336 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 */
1337 pty->set_utf8_mode (enc_utf8); 1243 pty->set_utf8_mode (enc_utf8);
1338 1244
1339 /* set initial window size */ 1245 /* set initial window size */
1340 tt_winch (); 1246 tt_winch ();
1341
1342 int er;
1343
1344#ifndef NO_BACKSPACE_KEY
1345 if (key_backspace[0] && !key_backspace[1])
1346 er = key_backspace[0];
1347 else if (strcmp (key_backspace, "DEC") == 0)
1348 er = '\177'; /* the initial state anyway */
1349 else
1350#endif
1351 er = -1;
1352
1353 rxvt_get_ttymode (&tio, er);
1354 1247
1355#if ENABLE_FRILLS 1248#if ENABLE_FRILLS
1356 if (rs[Rs_pty_fd]) 1249 if (rs[Rs_pty_fd])
1357 return; 1250 return;
1358#endif 1251#endif
… …
1389 } 1282 }
1390 1283
1391 _exit (EXIT_FAILURE); 1284 _exit (EXIT_FAILURE);
1392 1285
1393 default: 1286 default:
1394 if (!OPTION (Opt_utmpInhibit)) 1287 if (!option (Opt_utmpInhibit))
1395 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1288 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1396 1289
1397 pty->close_tty (); 1290 pty->close_tty ();
1398 1291
1399 child_ev.start (cmd_pid); 1292 child_ev.start (cmd_pid);
1400 1293
… …
1413int 1306int
1414rxvt_term::run_child (const char *const *argv) 1307rxvt_term::run_child (const char *const *argv)
1415{ 1308{
1416 char *login; 1309 char *login;
1417 1310
1418 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1419
1420 if (OPTION (Opt_console)) 1311 if (option (Opt_console))
1421 { /* be virtual console, fail silently */ 1312 { /* be virtual console, fail silently */
1422#ifdef TIOCCONS 1313#ifdef TIOCCONS
1423 unsigned int on = 1; 1314 unsigned int on = 1;
1424 1315
1425 ioctl (STDIN_FILENO, TIOCCONS, &on); 1316 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1472 const char *argv0, *shell; 1363 const char *argv0, *shell;
1473 1364
1474 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1365 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1475 shell = "/bin/sh"; 1366 shell = "/bin/sh";
1476 1367
1477 argv0 = (const char *)rxvt_r_basename (shell); 1368 argv0 = (const char *)rxvt_basename (shell);
1478 1369
1479 if (OPTION (Opt_loginShell)) 1370 if (option (Opt_loginShell))
1480 { 1371 {
1481 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1372 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1482 1373
1483 login[0] = '-'; 1374 login[0] = '-';
1484 strcpy (&login[1], argv0); 1375 strcpy (&login[1], argv0);
1485 argv0 = login; 1376 argv0 = login;
1486 } 1377 }

Diff Legend

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