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.166 by root, Tue Jan 31 19:53:30 2006 UTC vs.
Revision 1.211 by ayin, Sun Sep 9 10:14:40 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;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
209#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50; 210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
212 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
213#endif 215#endif
214
215 last_bot = last_state = -1; 216 last_bot = last_state = -1;
217
218 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll);
221 set_option (Opt_skipScroll);
222 set_option (Opt_secondaryScreen);
223 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles);
226 set_option (Opt_iso14755_52);
216 227
217 return true; 228 return true;
218} 229}
219 230
220void 231void
… …
254/*----------------------------------------------------------------------*/ 265/*----------------------------------------------------------------------*/
255const char ** 266const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 267rxvt_term::init_resources (int argc, const char *const *argv)
257{ 268{
258 int i, r_argc; 269 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 270 const char **cmd_argv, **r_argv;
261 271
262 /* 272 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 273 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 274 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 275 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 276 if (!strcmp (argv[r_argc], "-e"))
267 break; 277 break;
268 278
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 279 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 280
271 for (i = 0; i < r_argc; i++) 281 for (i = 0; i < r_argc; i++)
… …
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 293 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284 294
285 cmd_argv[i] = NULL; 295 cmd_argv[i] = NULL;
286 } 296 }
287 297
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 298 rs[Rs_name] = rxvt_basename (argv[0]);
289 299
290 /* 300 /*
291 * Open display, get options/resources and create the window 301 * Open display, get options/resources and create the window
292 */ 302 */
293 303
… …
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 310 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 311
302 // using a local pointer decreases code size a lot 312 // using a local pointer decreases code size a lot
303 xa = display->xa; 313 xa = display->xa;
304 314
315 set (display);
316 extract_resources ();
317
305#if XFT 318#if XFT
306 if (rs[Rs_depth]) 319 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0)); 320 select_visual (strtol (rs[Rs_depth], 0, 0));
308 else
309#endif 321#endif
310 set (display);
311 322
312 extract_resources (); 323#ifdef HAVE_AFTERIMAGE
324 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
325#endif
326 free (r_argv);
313 327
314 for (int i = NUM_RESOURCES; i--; ) 328 for (int i = NUM_RESOURCES; i--; )
315 if (rs [i] == resval_undef) 329 if (rs [i] == resval_undef)
316 rs [i] = 0; 330 rs [i] = 0;
317
318 free (r_argv);
319 331
320#if ENABLE_PERL 332#if ENABLE_PERL
321 if (!rs[Rs_perl_ext_1]) 333 if (!rs[Rs_perl_ext_1])
322 rs[Rs_perl_ext_1] = "default"; 334 rs[Rs_perl_ext_1] = "default";
323 335
… …
334 * set any defaults not already set 346 * set any defaults not already set
335 */ 347 */
336 if (cmd_argv && cmd_argv[0]) 348 if (cmd_argv && cmd_argv[0])
337 { 349 {
338 if (!rs[Rs_title]) 350 if (!rs[Rs_title])
339 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 351 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
340 if (!rs[Rs_iconName]) 352 if (!rs[Rs_iconName])
341 rs[Rs_iconName] = rs[Rs_title]; 353 rs[Rs_iconName] = rs[Rs_title];
342 } 354 }
343 else 355 else
344 { 356 {
… …
382 rs[Rs_cutchars] = CUTCHARS; 394 rs[Rs_cutchars] = CUTCHARS;
383 395
384#ifndef NO_BACKSPACE_KEY 396#ifndef NO_BACKSPACE_KEY
385 if (!rs[Rs_backspace_key]) 397 if (!rs[Rs_backspace_key])
386# ifdef DEFAULT_BACKSPACE 398# ifdef DEFAULT_BACKSPACE
387 key_backspace = DEFAULT_BACKSPACE; 399 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
388# else 400# else
389 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 401 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
390# endif 402# 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 403#endif
399 404
400#ifndef NO_DELETE_KEY 405#ifndef NO_DELETE_KEY
401 if (!rs[Rs_delete_key]) 406 if (!rs[Rs_delete_key])
402# ifdef DEFAULT_DELETE 407# ifdef DEFAULT_DELETE
403 key_delete = DEFAULT_DELETE; 408 rs[Rs_delete_key] = DEFAULT_DELETE;
404# else 409# else
405 key_delete = "\033[3~"; 410 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 411# endif
415 if (rs[Rs_answerbackstring]) 412#endif
416 {
417 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
418 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
419 }
420 413
421#ifdef HAVE_SCROLLBARS 414#ifdef HAVE_SCROLLBARS
422 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 415 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
423#endif 416#endif
424 417
425#ifdef XTERM_REVERSE_VIDEO 418#ifdef XTERM_REVERSE_VIDEO
426 /* this is how xterm implements reverseVideo */ 419 /* this is how xterm implements reverseVideo */
427 if (OPTION (Opt_reverseVideo)) 420 if (option (Opt_reverseVideo))
428 { 421 {
429 if (!rs[Rs_color + Color_fg]) 422 if (!rs[Rs_color + Color_fg])
430 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 423 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431 424
432 if (!rs[Rs_color + Color_bg]) 425 if (!rs[Rs_color + Color_bg])
… …
438 if (!rs[Rs_color + i]) 431 if (!rs[Rs_color + i])
439 rs[Rs_color + i] = def_colorName[i]; 432 rs[Rs_color + i] = def_colorName[i];
440 433
441#ifndef XTERM_REVERSE_VIDEO 434#ifndef XTERM_REVERSE_VIDEO
442 /* this is how we implement reverseVideo */ 435 /* this is how we implement reverseVideo */
443 if (OPTION (Opt_reverseVideo)) 436 if (option (Opt_reverseVideo))
444 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 437 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
445#endif 438#endif
446 439
447 /* convenient aliases for setting fg/bg to colors */ 440 /* convenient aliases for setting fg/bg to colors */
448 color_aliases (Color_fg); 441 color_aliases (Color_fg);
… …
469/*----------------------------------------------------------------------*/ 462/*----------------------------------------------------------------------*/
470void 463void
471rxvt_term::init_env () 464rxvt_term::init_env ()
472{ 465{
473 int i; 466 int i;
474 unsigned int u;
475 char *val; 467 char *val;
476 468
477#ifdef DISPLAY_IS_IP 469#ifdef DISPLAY_IS_IP
478 /* Fixup display_name for export over pty to any interested terminal 470 /* 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 471 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
488 val = rxvt_network_display (rs[Rs_display_name]); 480 val = rxvt_network_display (rs[Rs_display_name]);
489 rs[Rs_display_name] = (const char *)val; 481 rs[Rs_display_name] = (const char *)val;
490 482
491 if (val == NULL) 483 if (val == NULL)
492#endif /* DISPLAY_IS_IP */ 484#endif /* DISPLAY_IS_IP */
493 val = XDisplayString (xdisp); 485 val = XDisplayString (dpy);
494 486
495 if (rs[Rs_display_name] == NULL) 487 if (rs[Rs_display_name] == NULL)
496 rs[Rs_display_name] = val; /* use broken `:0' value */ 488 rs[Rs_display_name] = val; /* use broken `:0' value */
497 489
498 i = strlen (val); 490 i = strlen (val);
499 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 491 env_display = (char *)rxvt_malloc (i + 9);
500 492
501 sprintf (env_display, "DISPLAY=%s", val); 493 sprintf (env_display, "DISPLAY=%s", val);
502 494
503 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 495 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
504 496
… …
525 else 517 else
526 putenv ("COLORTERM=" COLORTERMENVFULL); 518 putenv ("COLORTERM=" COLORTERMENVFULL);
527 519
528 if (rs[Rs_term_name] != NULL) 520 if (rs[Rs_term_name] != NULL)
529 { 521 {
530 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 522 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
531 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 523 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
532 putenv (env_term); 524 putenv (env_term);
533 } 525 }
534 else 526 else
535 putenv ("TERM=" TERMENV); 527 putenv ("TERM=" TERMENV);
… …
622 * Initialize the command connection. 614 * Initialize the command connection.
623 * This should be called after the X server connection is established. 615 * This should be called after the X server connection is established.
624 */ 616 */
625 617
626#ifdef META8_OPTION 618#ifdef META8_OPTION
627 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 619 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
628#endif 620#endif
629 621
630 get_ourmods (); 622 get_ourmods ();
631 623
632 if (!OPTION (Opt_scrollTtyOutput)) 624 if (!option (Opt_scrollTtyOutput))
633 priv_modes |= PrivMode_TtyOutputInh; 625 priv_modes |= PrivMode_TtyOutputInh;
634 if (OPTION (Opt_scrollTtyKeypress)) 626 if (option (Opt_scrollTtyKeypress))
635 priv_modes |= PrivMode_Keypress; 627 priv_modes |= PrivMode_Keypress;
636 if (!OPTION (Opt_jumpScroll)) 628 if (!option (Opt_jumpScroll))
637 priv_modes |= PrivMode_smoothScroll; 629 priv_modes |= PrivMode_smoothScroll;
638 630
639#ifndef NO_BACKSPACE_KEY 631#ifndef NO_BACKSPACE_KEY
640 if (strcmp (key_backspace, "DEC") == 0) 632 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
641 priv_modes |= PrivMode_HaveBackSpace; 633 priv_modes |= PrivMode_HaveBackSpace;
642#endif 634#endif
643 635
644 /* add value for scrollBar */ 636 /* add value for scrollBar */
645 if (scrollBar.state) 637 if (scrollBar.state)
… …
671 rxvt_color xcol; 663 rxvt_color xcol;
672 664
673 if (!set_color (xcol, name)) 665 if (!set_color (xcol, name))
674 { 666 {
675#ifndef XTERM_REVERSE_VIDEO 667#ifndef XTERM_REVERSE_VIDEO
676 if (i < 2 && OPTION (Opt_reverseVideo)) 668 if (i < 2 && option (Opt_reverseVideo))
677 name = def_colorName [1 - i]; 669 name = def_colorName [1 - i];
678 else 670 else
679#endif 671#endif
680 name = def_colorName [i]; 672 name = def_colorName [i];
681 673
… …
694#ifndef NO_CURSORCOLOR 686#ifndef NO_CURSORCOLOR
695 case Color_cursor2: 687 case Color_cursor2:
696#endif 688#endif
697 case Color_pointer_fg: 689 case Color_pointer_fg:
698 name = rs[Rs_color + Color_fg]; 690 name = rs[Rs_color + Color_fg];
699 xcol = pix_colors[Color_fg]; 691 xcol.set (this, name);
700 break; 692 break;
701 default: 693 default:
702 name = rs[Rs_color + Color_bg]; 694 name = rs[Rs_color + Color_bg];
703 xcol = pix_colors[Color_bg]; 695 xcol.set (this, name);
704 break; 696 break;
705 } 697 }
706 } 698 }
707 } 699 }
708 700
709 pix_colors[i] = xcol; 701 pix_colors[i] = xcol;
710 rs[Rs_color + i] = name; 702 rs[Rs_color + i] = name;
711 } 703 }
712 704
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) 705 if (depth <= 2)
724 { 706 {
725 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 707 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]; 708 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]; 709 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
728 } 710 }
729 711
730 /* 712 /*
731 * get scrollBar shadow colors 713 * get scrollBar shadow colors
732 * 714 *
733 * The calculations of topShadow/bottomShadow values are adapted 715 * The calculations of topShadow/bottomShadow values are adapted
734 * from the fvwm window manager. 716 * from the fvwm window manager.
735 */ 717 */
736#ifdef KEEP_SCROLLCOLOR 718#ifdef KEEP_SCROLLCOLOR
737
738 if (depth <= 2) 719 if (depth <= 2)
739 { 720 {
740 /* Monochrome */ 721 /* Monochrome */
741 pix_colors[Color_scroll] = pix_colors[Color_fg]; 722 alias_color (Color_scroll, Color_fg);
742 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 723 alias_color (Color_topShadow, Color_bg);
743 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 724 alias_color (Color_bottomShadow, Color_bg);
744 } 725 }
745 else 726 else
746 { 727 {
747 rxvt_color xcol[2]; 728 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 729
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; 730 rgba cscroll;
756 731 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 732
762 /* topShadowColor */ 733 /* topShadowColor */
763 if (!xcol[1].set (this, 734 if (!pix_colors[Color_topShadow].set (this,
764 rgba ( 735 rgba (
765 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 736 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), 737 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), 738 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
768 c1.a) // pa1 vs. pa0: arbitrary 739 cscroll.a)
769 )); 740 ))
770 xcol[1] = pix_colors[Color_White]; 741 alias_color (Color_topShadow, Color_White);
771
772 pix_colors[Color_topShadow] = xcol[1];
773 } 742 }
774#endif /* KEEP_SCROLLCOLOR */ 743#endif /* KEEP_SCROLLCOLOR */
744
745#ifdef OFF_FOCUS_FADING
746 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
747 update_fade_color (i);
748#endif
775} 749}
776 750
777/*----------------------------------------------------------------------*/ 751/*----------------------------------------------------------------------*/
778/* color aliases, fg/bg bright-bold */ 752/* color aliases, fg/bg bright-bold */
779void 753void
… …
818 792
819 if (rsmod 793 if (rsmod
820 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 794 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
821 requestedmeta = rsmod[3] - '0'; 795 requestedmeta = rsmod[3] - '0';
822 796
823 map = XGetModifierMapping (xdisp); 797 map = XGetModifierMapping (dpy);
824 kc = map->modifiermap; 798 kc = map->modifiermap;
825 799
826 for (i = 1; i < 6; i++) 800 for (i = 1; i < 6; i++)
827 { 801 {
828 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 802 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
830 for (j = map->max_keypermod; j--; k++) 804 for (j = map->max_keypermod; j--; k++)
831 { 805 {
832 if (kc[k] == 0) 806 if (kc[k] == 0)
833 break; 807 break;
834 808
835 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 809 switch (XKeycodeToKeysym (dpy, kc[k], 0))
836 { 810 {
837 case XK_Num_Lock: 811 case XK_Num_Lock:
838 ModNumLockMask = modmasks[i - 1]; 812 ModNumLockMask = modmasks[i - 1];
839 continue; 813 continue;
840 814
… …
890rxvt_term::create_windows (int argc, const char *const *argv) 864rxvt_term::create_windows (int argc, const char *const *argv)
891{ 865{
892 XClassHint classHint; 866 XClassHint classHint;
893 XWMHints wmHint; 867 XWMHints wmHint;
894#if ENABLE_FRILLS 868#if ENABLE_FRILLS
895 MWMHints mwmhints; 869 MWMHints mwmhints = { };
896#endif 870#endif
897 XGCValues gcvalue; 871 XGCValues gcvalue;
898 XSetWindowAttributes attributes; 872 XSetWindowAttributes attributes;
899 Window top, parent; 873 Window top, parent;
900 874
901 dLocal (Display *, xdisp); 875 dLocal (Display *, dpy);
902 876
903 /* grab colors before netscape does */ 877 /* grab colors before netscape does */
904 Get_Colours (); 878 Get_Colours ();
905 879
906 if (!set_fonts ()) 880 if (!set_fonts ())
907 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 881 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
908 882
909 parent = display->root; 883 parent = display->root;
910 884
911 attributes.override_redirect = !!OPTION (Opt_override_redirect); 885 attributes.override_redirect = !!option (Opt_override_redirect);
912 886
913#if ENABLE_FRILLS 887#if ENABLE_FRILLS
914 if (OPTION (Opt_borderLess)) 888 if (option (Opt_borderLess))
915 { 889 {
916 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 890 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
917 { 891 {
918 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 892 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
919 attributes.override_redirect = true; 893 attributes.override_redirect = true;
920 mwmhints.flags = 0;
921 } 894 }
922 else 895 else
923 { 896 {
924 mwmhints.flags = MWM_HINTS_DECORATIONS; 897 mwmhints.flags = MWM_HINTS_DECORATIONS;
925 mwmhints.decorations = 0;
926 } 898 }
927 } 899 }
928 else
929 mwmhints.flags = 0;
930#endif 900#endif
931 901
932#if ENABLE_XEMBED 902#if ENABLE_XEMBED
933 if (rs[Rs_embed]) 903 if (rs[Rs_embed])
934 { 904 {
935 XWindowAttributes wattr; 905 XWindowAttributes wattr;
936 906
937 parent = strtol (rs[Rs_embed], 0, 0); 907 parent = strtol (rs[Rs_embed], 0, 0);
938 908
939 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 909 if (!XGetWindowAttributes (dpy, parent, &wattr))
940 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 910 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
941 911
942 window_calc (wattr.width, wattr.height); 912 window_calc (wattr.width, wattr.height);
943 } 913 }
944#endif 914#endif
… …
948 /* sub-window placement & size in rxvt_resize_subwindows () */ 918 /* sub-window placement & size in rxvt_resize_subwindows () */
949 attributes.background_pixel = pix_colors_focused [Color_border]; 919 attributes.background_pixel = pix_colors_focused [Color_border];
950 attributes.border_pixel = pix_colors_focused [Color_border]; 920 attributes.border_pixel = pix_colors_focused [Color_border];
951 attributes.colormap = cmap; 921 attributes.colormap = cmap;
952 922
953 top = XCreateWindow (xdisp, parent, 923 top = XCreateWindow (dpy, parent,
954 szHint.x, szHint.y, 924 szHint.x, szHint.y,
955 szHint.width, szHint.height, 925 szHint.width, szHint.height,
956 ext_bwidth, 926 ext_bwidth,
957 depth, InputOutput, visual, 927 depth, InputOutput, visual,
958 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 928 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
969 classHint.res_name = (char *)rs[Rs_name]; 939 classHint.res_name = (char *)rs[Rs_name];
970 classHint.res_class = (char *)RESCLASS; 940 classHint.res_class = (char *)RESCLASS;
971 941
972 wmHint.flags = InputHint | StateHint | WindowGroupHint; 942 wmHint.flags = InputHint | StateHint | WindowGroupHint;
973 wmHint.input = True; 943 wmHint.input = True;
974 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 944 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
975 wmHint.window_group = top; 945 wmHint.window_group = top;
976 946
977 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 947 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
978 &szHint, &wmHint, &classHint); 948 &szHint, &wmHint, &classHint);
979 949
980#if ENABLE_FRILLS 950#if ENABLE_FRILLS
981 if (mwmhints.flags) 951 if (mwmhints.flags)
982 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 952 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
983 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 953 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
984#endif 954#endif
985 955
986 Atom protocols[] = { 956 Atom protocols[] = {
987 xa[XA_WM_DELETE_WINDOW], 957 xa[XA_WM_DELETE_WINDOW],
988#if ENABLE_EWMH 958#if ENABLE_EWMH
989 xa[XA_NET_WM_PING], 959 xa[XA_NET_WM_PING],
990#endif 960#endif
991 }; 961 };
992 962
993 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 963 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
994 964
995#if ENABLE_FRILLS 965#if ENABLE_FRILLS
996 if (rs[Rs_transient_for]) 966 if (rs[Rs_transient_for])
997 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 967 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
998#endif 968#endif
999 969
1000#if ENABLE_EWMH 970#if ENABLE_EWMH
1001 long pid = getpid (); 971 long pid = getpid ();
1002 972
1003 XChangeProperty (xdisp, top, 973 XChangeProperty (dpy, top,
1004 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 974 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1005 PropModeReplace, (unsigned char *)&pid, 1); 975 PropModeReplace, (unsigned char *)&pid, 1);
1006 976
1007 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 977 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1008#endif 978#endif
1009 979
1010 XSelectInput (xdisp, top, 980 XSelectInput (dpy, top,
1011 KeyPressMask 981 KeyPressMask
1012#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 982#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1013 | KeyReleaseMask 983 | KeyReleaseMask
1014#endif 984#endif
1015 | FocusChangeMask | VisibilityChangeMask 985 | FocusChangeMask | VisibilityChangeMask
1016 | ExposureMask | StructureNotifyMask); 986 | ExposureMask | StructureNotifyMask);
1017 987
1018 termwin_ev.start (display, top); 988 termwin_ev.start (display, top);
1019 989
1020 /* vt cursor: Black-on-White is standard, but this is more popular */ 990 /* vt cursor: Black-on-White is standard, but this is more popular */
1021 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 991 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1022 992
1023#ifdef HAVE_SCROLLBARS 993#ifdef HAVE_SCROLLBARS
1024 /* cursor scrollBar: Black-on-White */ 994 /* cursor scrollBar: Black-on-White */
1025 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 995 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1026#endif 996#endif
1027 997
1028 /* the vt window */ 998 /* the vt window */
1029 vt = XCreateSimpleWindow (xdisp, top, 999 vt = XCreateSimpleWindow (dpy, top,
1030 window_vt_x, window_vt_y, 1000 window_vt_x, window_vt_y,
1031 width, height, 1001 width, height,
1032 0, 1002 0,
1033 pix_colors_focused[Color_fg], 1003 pix_colors_focused[Color_fg],
1034 pix_colors_focused[Color_bg]); 1004 pix_colors_focused[Color_bg]);
1035 1005
1036 attributes.bit_gravity = NorthWestGravity; 1006 attributes.bit_gravity = NorthWestGravity;
1037 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1007 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1038 1008
1039 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1009 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1040 1010
1041 if (OPTION (Opt_pointerBlank)) 1011 if (option (Opt_pointerBlank))
1042 vt_emask |= PointerMotionMask; 1012 vt_emask |= PointerMotionMask;
1043 else 1013 else
1044 vt_emask |= Button1MotionMask | Button3MotionMask; 1014 vt_emask |= Button1MotionMask | Button3MotionMask;
1045 1015
1046 vt_select_input (); 1016 vt_select_input ();
1047 1017
1048 vt_ev.start (display, vt); 1018 vt_ev.start (display, vt);
1049 1019
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 */ 1020 /* graphics context for the vt window */
1068 gcvalue.foreground = pix_colors[Color_fg]; 1021 gcvalue.foreground = pix_colors[Color_fg];
1069 gcvalue.background = pix_colors[Color_bg]; 1022 gcvalue.background = pix_colors[Color_bg];
1070 gcvalue.graphics_exposures = 1; 1023 gcvalue.graphics_exposures = 0;
1071 1024
1072 gc = XCreateGC (xdisp, vt, 1025 gc = XCreateGC (dpy, vt,
1073 GCForeground | GCBackground | GCGraphicsExposures, 1026 GCForeground | GCBackground | GCGraphicsExposures,
1074 &gcvalue); 1027 &gcvalue);
1075 1028
1076 drawable = new rxvt_drawable (this, vt); 1029 drawable = new rxvt_drawable (this, vt);
1077 1030
1078#ifdef RXVT_SCROLLBAR 1031#ifdef RXVT_SCROLLBAR
1079 gcvalue.foreground = pix_colors[Color_topShadow]; 1032 gcvalue.foreground = pix_colors[Color_topShadow];
1080 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1033 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1081 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1034 gcvalue.foreground = pix_colors[Color_bottomShadow];
1082 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1035 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1083 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1036 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1084 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1037 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1085#endif 1038#endif
1086 1039
1087#ifdef OFF_FOCUS_FADING 1040#ifdef OFF_FOCUS_FADING
1088 // initially we are in unfocused state 1041 // initially we are in unfocused state
1089 if (rs[Rs_fade]) 1042 if (rs[Rs_fade])
… …
1098 * GET TTY CURRENT STATE * 1051 * GET TTY CURRENT STATE *
1099 * ------------------------------------------------------------------------- */ 1052 * ------------------------------------------------------------------------- */
1100void 1053void
1101rxvt_get_ttymode (ttymode_t *tio, int erase) 1054rxvt_get_ttymode (ttymode_t *tio, int erase)
1102{ 1055{
1103#ifdef HAVE_TERMIOS_H
1104 /* 1056 /*
1105 * standard System V termios interface 1057 * standard System V termios interface
1106 */ 1058 */
1107 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1059 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1108 { 1060 {
… …
1175 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1127 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1176# if defined (ECHOCTL) && defined (ECHOKE) 1128# if defined (ECHOCTL) && defined (ECHOKE)
1177 | ECHOCTL | ECHOKE 1129 | ECHOCTL | ECHOKE
1178# endif 1130# endif
1179 | ECHOE | ECHOK); 1131 | 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 1132
1228 /* 1133 /*
1229 * Debugging 1134 * Debugging
1230 */ 1135 */
1231#ifdef DEBUG_TTYMODE 1136#ifdef DEBUG_TTYMODE
… …
1332 else 1237 else
1333#endif 1238#endif
1334 if (!pty->get ()) 1239 if (!pty->get ())
1335 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1240 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1336 1241
1242 int er;
1243
1244#ifndef NO_BACKSPACE_KEY
1245 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1246 er = rs[Rs_backspace_key][0];
1247 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1248 er = '\177'; /* the initial state anyway */
1249 else
1250#endif
1251 er = -1;
1252
1253 rxvt_get_ttymode (&tio, er);
1254 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1337 pty->set_utf8_mode (enc_utf8); 1255 pty->set_utf8_mode (enc_utf8);
1338 1256
1339 /* set initial window size */ 1257 /* set initial window size */
1340 tt_winch (); 1258 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 1259
1355#if ENABLE_FRILLS 1260#if ENABLE_FRILLS
1356 if (rs[Rs_pty_fd]) 1261 if (rs[Rs_pty_fd])
1357 return; 1262 return;
1358#endif 1263#endif
… …
1389 } 1294 }
1390 1295
1391 _exit (EXIT_FAILURE); 1296 _exit (EXIT_FAILURE);
1392 1297
1393 default: 1298 default:
1394 if (!OPTION (Opt_utmpInhibit)) 1299 if (!option (Opt_utmpInhibit))
1395 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1300 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1396 1301
1397 pty->close_tty (); 1302 pty->close_tty ();
1398 1303
1399 child_ev.start (cmd_pid); 1304 child_ev.start (cmd_pid);
1400 1305
… …
1413int 1318int
1414rxvt_term::run_child (const char *const *argv) 1319rxvt_term::run_child (const char *const *argv)
1415{ 1320{
1416 char *login; 1321 char *login;
1417 1322
1418 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1419
1420 if (OPTION (Opt_console)) 1323 if (option (Opt_console))
1421 { /* be virtual console, fail silently */ 1324 { /* be virtual console, fail silently */
1422#ifdef TIOCCONS 1325#ifdef TIOCCONS
1423 unsigned int on = 1; 1326 unsigned int on = 1;
1424 1327
1425 ioctl (STDIN_FILENO, TIOCCONS, &on); 1328 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1472 const char *argv0, *shell; 1375 const char *argv0, *shell;
1473 1376
1474 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1377 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1475 shell = "/bin/sh"; 1378 shell = "/bin/sh";
1476 1379
1477 argv0 = (const char *)rxvt_r_basename (shell); 1380 argv0 = (const char *)rxvt_basename (shell);
1478 1381
1479 if (OPTION (Opt_loginShell)) 1382 if (option (Opt_loginShell))
1480 { 1383 {
1481 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1384 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1482 1385
1483 login[0] = '-'; 1386 login[0] = '-';
1484 strcpy (&login[1], argv0); 1387 strcpy (&login[1], argv0);
1485 argv0 = login; 1388 argv0 = login;
1486 } 1389 }

Diff Legend

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