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.159 by root, Mon Jan 30 02:21:20 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>
… …
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
… …
297 get_options (r_argc, r_argv); 295 get_options (r_argc, r_argv);
298 296
299 if (!(display = displays.get (rs[Rs_display_name]))) 297 if (!(display = displays.get (rs[Rs_display_name])))
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
300 // using a local pointer decreases code size a lot
302 xa = display->xa; 301 xa = display->xa;
303 302
304#if ENABLE_FRILLS 303 set (display);
304 extract_resources ();
305
306#if XFT
305 if (rs[Rs_depth]) 307 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0)); 308 select_visual (strtol (rs[Rs_depth], 0, 0));
307 else
308#endif 309#endif
309 set (display);
310 310
311 extract_resources (); 311#ifdef HAVE_AFTERIMAGE
312 312 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
313#endif
313 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;
314 319
315#if ENABLE_PERL 320#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1]) 321 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default"; 322 rs[Rs_perl_ext_1] = "default";
318 323
… …
329 * set any defaults not already set 334 * set any defaults not already set
330 */ 335 */
331 if (cmd_argv && cmd_argv[0]) 336 if (cmd_argv && cmd_argv[0])
332 { 337 {
333 if (!rs[Rs_title]) 338 if (!rs[Rs_title])
334 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 339 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
335 if (!rs[Rs_iconName]) 340 if (!rs[Rs_iconName])
336 rs[Rs_iconName] = rs[Rs_title]; 341 rs[Rs_iconName] = rs[Rs_title];
337 } 342 }
338 else 343 else
339 { 344 {
… …
377 rs[Rs_cutchars] = CUTCHARS; 382 rs[Rs_cutchars] = CUTCHARS;
378 383
379#ifndef NO_BACKSPACE_KEY 384#ifndef NO_BACKSPACE_KEY
380 if (!rs[Rs_backspace_key]) 385 if (!rs[Rs_backspace_key])
381# ifdef DEFAULT_BACKSPACE 386# ifdef DEFAULT_BACKSPACE
382 key_backspace = DEFAULT_BACKSPACE; 387 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
383# else 388# else
384 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 389 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
385# endif 390# endif
386 else
387 {
388 val = strdup (rs[Rs_backspace_key]);
389 rxvt_Str_trim (val);
390 rxvt_Str_escaped (val);
391 key_backspace = val;
392 }
393#endif 391#endif
394 392
395#ifndef NO_DELETE_KEY 393#ifndef NO_DELETE_KEY
396 if (!rs[Rs_delete_key]) 394 if (!rs[Rs_delete_key])
397# ifdef DEFAULT_DELETE 395# ifdef DEFAULT_DELETE
398 key_delete = DEFAULT_DELETE; 396 rs[Rs_delete_key] = DEFAULT_DELETE;
399# else 397# else
400 key_delete = "\033[3~"; 398 rs[Rs_delete_key] = "\033[3~";
401# endif
402 else
403 {
404 val = strdup (rs[Rs_delete_key]);
405 rxvt_Str_trim (val);
406 rxvt_Str_escaped (val);
407 key_delete = val;
408 }
409#endif 399# endif
410 if (rs[Rs_answerbackstring]) 400#endif
411 {
412 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
413 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
414 }
415 401
416#ifdef HAVE_SCROLLBARS 402#ifdef HAVE_SCROLLBARS
417 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]);
418#endif 404#endif
419 405
420#ifdef XTERM_REVERSE_VIDEO 406#ifdef XTERM_REVERSE_VIDEO
421 /* this is how xterm implements reverseVideo */ 407 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 408 if (option (Opt_reverseVideo))
423 { 409 {
424 if (!rs[Rs_color + Color_fg]) 410 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 411 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
412
426 if (!rs[Rs_color + Color_bg]) 413 if (!rs[Rs_color + Color_bg])
427 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 414 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428 } 415 }
429#endif 416#endif
430 417
… …
432 if (!rs[Rs_color + i]) 419 if (!rs[Rs_color + i])
433 rs[Rs_color + i] = def_colorName[i]; 420 rs[Rs_color + i] = def_colorName[i];
434 421
435#ifndef XTERM_REVERSE_VIDEO 422#ifndef XTERM_REVERSE_VIDEO
436 /* this is how we implement reverseVideo */ 423 /* this is how we implement reverseVideo */
437 if (OPTION (Opt_reverseVideo)) 424 if (option (Opt_reverseVideo))
438 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 425 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439#endif 426#endif
440 427
441 /* convenient aliases for setting fg/bg to colors */ 428 /* convenient aliases for setting fg/bg to colors */
442 color_aliases (Color_fg); 429 color_aliases (Color_fg);
… …
463/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
464void 451void
465rxvt_term::init_env () 452rxvt_term::init_env ()
466{ 453{
467 int i; 454 int i;
468 unsigned int u;
469 char *val; 455 char *val;
470 456
471#ifdef DISPLAY_IS_IP 457#ifdef DISPLAY_IS_IP
472 /* Fixup display_name for export over pty to any interested terminal 458 /* Fixup display_name for export over pty to any interested terminal
473 * 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
… …
482 val = rxvt_network_display (rs[Rs_display_name]); 468 val = rxvt_network_display (rs[Rs_display_name]);
483 rs[Rs_display_name] = (const char *)val; 469 rs[Rs_display_name] = (const char *)val;
484 470
485 if (val == NULL) 471 if (val == NULL)
486#endif /* DISPLAY_IS_IP */ 472#endif /* DISPLAY_IS_IP */
487 val = XDisplayString (xdisp); 473 val = XDisplayString (dpy);
488 474
489 if (rs[Rs_display_name] == NULL) 475 if (rs[Rs_display_name] == NULL)
490 rs[Rs_display_name] = val; /* use broken `:0' value */ 476 rs[Rs_display_name] = val; /* use broken `:0' value */
491 477
492 i = strlen (val); 478 i = strlen (val);
493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 479 env_display = (char *)rxvt_malloc (i + 9);
494 480
495 sprintf (env_display, "DISPLAY=%s", val); 481 sprintf (env_display, "DISPLAY=%s", val);
496 482
497 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 483 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
498 484
… …
519 else 505 else
520 putenv ("COLORTERM=" COLORTERMENVFULL); 506 putenv ("COLORTERM=" COLORTERMENVFULL);
521 507
522 if (rs[Rs_term_name] != NULL) 508 if (rs[Rs_term_name] != NULL)
523 { 509 {
524 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);
525 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 511 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
526 putenv (env_term); 512 putenv (env_term);
527 } 513 }
528 else 514 else
529 putenv ("TERM=" TERMENV); 515 putenv ("TERM=" TERMENV);
… …
616 * Initialize the command connection. 602 * Initialize the command connection.
617 * This should be called after the X server connection is established. 603 * This should be called after the X server connection is established.
618 */ 604 */
619 605
620#ifdef META8_OPTION 606#ifdef META8_OPTION
621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 607 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622#endif 608#endif
623 609
624 get_ourmods (); 610 get_ourmods ();
625 611
626 if (!OPTION (Opt_scrollTtyOutput)) 612 if (!option (Opt_scrollTtyOutput))
627 priv_modes |= PrivMode_TtyOutputInh; 613 priv_modes |= PrivMode_TtyOutputInh;
628 if (OPTION (Opt_scrollTtyKeypress)) 614 if (option (Opt_scrollTtyKeypress))
629 priv_modes |= PrivMode_Keypress; 615 priv_modes |= PrivMode_Keypress;
630 if (!OPTION (Opt_jumpScroll)) 616 if (!option (Opt_jumpScroll))
631 priv_modes |= PrivMode_smoothScroll; 617 priv_modes |= PrivMode_smoothScroll;
632 618
633#ifndef NO_BACKSPACE_KEY 619#ifndef NO_BACKSPACE_KEY
634 if (strcmp (key_backspace, "DEC") == 0) 620 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
635 priv_modes |= PrivMode_HaveBackSpace; 621 priv_modes |= PrivMode_HaveBackSpace;
636#endif 622#endif
637 623
638 /* add value for scrollBar */ 624 /* add value for scrollBar */
639 if (scrollBar.state) 625 if (scrollBar.state)
… …
655 pix_colors = pix_colors_focused; 641 pix_colors = pix_colors_focused;
656#endif 642#endif
657 643
658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 644 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 645 {
646 const char *name = rs[Rs_color + i];
647
648 if (!name)
649 continue;
650
660 rxvt_color xcol; 651 rxvt_color xcol;
661 652
662 if (!rs[Rs_color + i]) 653 if (!set_color (xcol, name))
663 continue;
664
665 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
666 { 654 {
667#ifndef XTERM_REVERSE_VIDEO 655#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 656 if (i < 2 && option (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 657 name = def_colorName [1 - i];
670 else 658 else
671#endif 659#endif
672 rs[Rs_color + i] = def_colorName[i]; 660 name = def_colorName [i];
673 661
674 if (!rs[Rs_color + i]) 662 if (!name)
675 continue; 663 continue;
676 664
677 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 665 if (!set_color (xcol, name))
678 { 666 {
679 switch (i) 667 switch (i)
680 { 668 {
681 case Color_fg: 669 case Color_fg:
682 case Color_bg: 670 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 671 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
685 /* NOTREACHED */ 672 name = "";
686 break; 673 break;
687#ifndef NO_CURSORCOLOR 674#ifndef NO_CURSORCOLOR
688 case Color_cursor2: 675 case Color_cursor2:
689 xcol = pix_colors[Color_fg]; 676#endif
690 break;
691#endif /* ! NO_CURSORCOLOR */
692 case Color_pointer_fg: 677 case Color_pointer_fg:
693 xcol = pix_colors[Color_fg]; 678 name = rs[Rs_color + Color_fg];
679 xcol.set (this, name);
694 break; 680 break;
695 default: 681 default:
696 xcol = pix_colors[Color_bg]; /* None */ 682 name = rs[Rs_color + Color_bg];
683 xcol.set (this, name);
697 break; 684 break;
698 } 685 }
699 } 686 }
700 } 687 }
701 688
702 pix_colors[i] = xcol; 689 pix_colors[i] = xcol;
703 SET_PIXCOLOR (i); 690 rs[Rs_color + i] = name;
704 } 691 }
705
706#ifdef OFF_FOCUS_FADING
707 if (rs[Rs_fade])
708 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
709 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
710#endif
711 692
712 if (depth <= 2) 693 if (depth <= 2)
713 { 694 {
714 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);
715 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);
716 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);
717 } 698 }
718 699
719 /* 700 /*
720 * get scrollBar shadow colors 701 * get scrollBar shadow colors
721 * 702 *
722 * The calculations of topShadow/bottomShadow values are adapted 703 * The calculations of topShadow/bottomShadow values are adapted
723 * from the fvwm window manager. 704 * from the fvwm window manager.
724 */ 705 */
725#ifdef KEEP_SCROLLCOLOR 706#ifdef KEEP_SCROLLCOLOR
726
727 if (depth <= 2) 707 if (depth <= 2)
728 { 708 {
729 /* Monochrome */ 709 /* Monochrome */
730 pix_colors[Color_scroll] = pix_colors[Color_fg]; 710 alias_color (Color_scroll, Color_fg);
731 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 711 alias_color (Color_topShadow, Color_bg);
732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 712 alias_color (Color_bottomShadow, Color_bg);
733 } 713 }
734 else 714 else
735 { 715 {
736 rxvt_color xcol[2]; 716 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
737 /* xcol[0] == white
738 * xcol[1] == top shadow
739 * xcol[2] == bot shadow */
740 717
741 xcol[1] = pix_colors[Color_scroll]; 718 rgba cscroll;
742 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); 719 pix_colors [Color_scroll].get (cscroll);
743
744 rxvt_rgba c0, c1;
745
746 xcol[0].get (this, c0);
747 xcol[1].get (this, c1);
748
749 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
750 720
751 /* topShadowColor */ 721 /* topShadowColor */
752 if (!xcol[1].set (this, 722 if (!pix_colors[Color_topShadow].set (this,
753 rxvt_rgba ( 723 rgba (
754 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),
755 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),
756 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),
757 c1.a) // pa1 vs. pa0: arbitrary 727 cscroll.a)
758 )); 728 ))
759 xcol[1] = pix_colors[Color_White]; 729 alias_color (Color_topShadow, Color_White);
760
761 pix_colors[Color_topShadow] = xcol[1];
762 } 730 }
763#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
764} 737}
765 738
766/*----------------------------------------------------------------------*/ 739/*----------------------------------------------------------------------*/
767/* color aliases, fg/bg bright-bold */ 740/* color aliases, fg/bg bright-bold */
768void 741void
… …
807 780
808 if (rsmod 781 if (rsmod
809 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 782 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
810 requestedmeta = rsmod[3] - '0'; 783 requestedmeta = rsmod[3] - '0';
811 784
812 map = XGetModifierMapping (xdisp); 785 map = XGetModifierMapping (dpy);
813 kc = map->modifiermap; 786 kc = map->modifiermap;
814 787
815 for (i = 1; i < 6; i++) 788 for (i = 1; i < 6; i++)
816 { 789 {
817 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 790 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
819 for (j = map->max_keypermod; j--; k++) 792 for (j = map->max_keypermod; j--; k++)
820 { 793 {
821 if (kc[k] == 0) 794 if (kc[k] == 0)
822 break; 795 break;
823 796
824 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 797 switch (XKeycodeToKeysym (dpy, kc[k], 0))
825 { 798 {
826 case XK_Num_Lock: 799 case XK_Num_Lock:
827 ModNumLockMask = modmasks[i - 1]; 800 ModNumLockMask = modmasks[i - 1];
828 continue; 801 continue;
829 802
… …
879rxvt_term::create_windows (int argc, const char *const *argv) 852rxvt_term::create_windows (int argc, const char *const *argv)
880{ 853{
881 XClassHint classHint; 854 XClassHint classHint;
882 XWMHints wmHint; 855 XWMHints wmHint;
883#if ENABLE_FRILLS 856#if ENABLE_FRILLS
884 MWMHints mwmhints; 857 MWMHints mwmhints = { };
885#endif 858#endif
886 XGCValues gcvalue; 859 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 860 XSetWindowAttributes attributes;
888 Window top, parent; 861 Window top, parent;
889 862
890 dLocal (Display *, xdisp); 863 dLocal (Display *, dpy);
891 864
892 /* grab colors before netscape does */ 865 /* grab colors before netscape does */
893 Get_Colours (); 866 Get_Colours ();
894 867
895 if (!set_fonts ()) 868 if (!set_fonts ())
896 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");
897 870
898 parent = display->root; 871 parent = display->root;
899 872
900 attributes.override_redirect = !!OPTION (Opt_override_redirect); 873 attributes.override_redirect = !!option (Opt_override_redirect);
901 874
902#if ENABLE_FRILLS 875#if ENABLE_FRILLS
903 if (OPTION (Opt_borderLess)) 876 if (option (Opt_borderLess))
904 { 877 {
905 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 878 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
906 { 879 {
907 /* 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");
908 attributes.override_redirect = true; 881 attributes.override_redirect = true;
909 mwmhints.flags = 0;
910 } 882 }
911 else 883 else
912 { 884 {
913 mwmhints.flags = MWM_HINTS_DECORATIONS; 885 mwmhints.flags = MWM_HINTS_DECORATIONS;
914 mwmhints.decorations = 0;
915 } 886 }
916 } 887 }
917 else
918 mwmhints.flags = 0;
919#endif 888#endif
920 889
921#if ENABLE_XEMBED 890#if ENABLE_XEMBED
922 if (rs[Rs_embed]) 891 if (rs[Rs_embed])
923 { 892 {
924 XWindowAttributes wattr; 893 XWindowAttributes wattr;
925 894
926 parent = strtol (rs[Rs_embed], 0, 0); 895 parent = strtol (rs[Rs_embed], 0, 0);
927 896
928 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 897 if (!XGetWindowAttributes (dpy, parent, &wattr))
929 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 898 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
930 899
931 window_calc (wattr.width, wattr.height); 900 window_calc (wattr.width, wattr.height);
932 } 901 }
933#endif 902#endif
… …
937 /* sub-window placement & size in rxvt_resize_subwindows () */ 906 /* sub-window placement & size in rxvt_resize_subwindows () */
938 attributes.background_pixel = pix_colors_focused [Color_border]; 907 attributes.background_pixel = pix_colors_focused [Color_border];
939 attributes.border_pixel = pix_colors_focused [Color_border]; 908 attributes.border_pixel = pix_colors_focused [Color_border];
940 attributes.colormap = cmap; 909 attributes.colormap = cmap;
941 910
942 top = XCreateWindow (xdisp, parent, 911 top = XCreateWindow (dpy, parent,
943 szHint.x, szHint.y, 912 szHint.x, szHint.y,
944 szHint.width, szHint.height, 913 szHint.width, szHint.height,
945 ext_bwidth, 914 ext_bwidth,
946 depth, InputOutput, visual, 915 depth, InputOutput, visual,
947 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 916 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
958 classHint.res_name = (char *)rs[Rs_name]; 927 classHint.res_name = (char *)rs[Rs_name];
959 classHint.res_class = (char *)RESCLASS; 928 classHint.res_class = (char *)RESCLASS;
960 929
961 wmHint.flags = InputHint | StateHint | WindowGroupHint; 930 wmHint.flags = InputHint | StateHint | WindowGroupHint;
962 wmHint.input = True; 931 wmHint.input = True;
963 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 932 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
964 wmHint.window_group = top; 933 wmHint.window_group = top;
965 934
966 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 935 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
967 &szHint, &wmHint, &classHint); 936 &szHint, &wmHint, &classHint);
968 937
969#if ENABLE_FRILLS 938#if ENABLE_FRILLS
970 if (mwmhints.flags) 939 if (mwmhints.flags)
971 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,
972 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 941 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
973#endif 942#endif
974 943
975 Atom protocols[] = { 944 Atom protocols[] = {
976 xa[XA_WM_DELETE_WINDOW], 945 xa[XA_WM_DELETE_WINDOW],
977#if ENABLE_EWMH 946#if ENABLE_EWMH
978 xa[XA_NET_WM_PING], 947 xa[XA_NET_WM_PING],
979#endif 948#endif
980 }; 949 };
981 950
982 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 951 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
983 952
984#if ENABLE_FRILLS 953#if ENABLE_FRILLS
985 if (rs[Rs_transient_for]) 954 if (rs[Rs_transient_for])
986 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 955 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
987#endif 956#endif
988 957
989#if ENABLE_EWMH 958#if ENABLE_EWMH
990 long pid = getpid (); 959 long pid = getpid ();
991 960
992 XChangeProperty (xdisp, top, 961 XChangeProperty (dpy, top,
993 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 962 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
994 PropModeReplace, (unsigned char *)&pid, 1); 963 PropModeReplace, (unsigned char *)&pid, 1);
995 964
996 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 965 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
997#endif 966#endif
998 967
999 XSelectInput (xdisp, top, 968 XSelectInput (dpy, top,
1000 KeyPressMask 969 KeyPressMask
1001#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 970#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1002 | KeyReleaseMask 971 | KeyReleaseMask
1003#endif 972#endif
1004 | FocusChangeMask | VisibilityChangeMask 973 | FocusChangeMask | VisibilityChangeMask
1005 | ExposureMask | StructureNotifyMask); 974 | ExposureMask | StructureNotifyMask);
1006 975
1007 termwin_ev.start (display, top); 976 termwin_ev.start (display, top);
1008 977
1009 /* 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 */
1010 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 979 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1011 980
1012#ifdef HAVE_SCROLLBARS 981#ifdef HAVE_SCROLLBARS
1013 /* cursor scrollBar: Black-on-White */ 982 /* cursor scrollBar: Black-on-White */
1014 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 983 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1015#endif 984#endif
1016 985
1017 /* the vt window */ 986 /* the vt window */
1018 vt = XCreateSimpleWindow (xdisp, top, 987 vt = XCreateSimpleWindow (dpy, top,
1019 window_vt_x, window_vt_y, 988 window_vt_x, window_vt_y,
1020 width, height, 989 width, height,
1021 0, 990 0,
1022 pix_colors_focused[Color_fg], 991 pix_colors_focused[Color_fg],
1023 pix_colors_focused[Color_bg]); 992 pix_colors_focused[Color_bg]);
1024 993
1025 attributes.bit_gravity = NorthWestGravity; 994 attributes.bit_gravity = NorthWestGravity;
1026 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 995 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1027 996
1028 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 997 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1029 998
1030 if (OPTION (Opt_pointerBlank)) 999 if (option (Opt_pointerBlank))
1031 vt_emask |= PointerMotionMask; 1000 vt_emask |= PointerMotionMask;
1032 else 1001 else
1033 vt_emask |= Button1MotionMask | Button3MotionMask; 1002 vt_emask |= Button1MotionMask | Button3MotionMask;
1034 1003
1035 vt_select_input (); 1004 vt_select_input ();
1036 1005
1037 vt_ev.start (display, vt); 1006 vt_ev.start (display, vt);
1038 1007
1039#ifdef XPM_BACKGROUND
1040 if (rs[Rs_backgroundPixmap] != NULL
1041 && !OPTION (Opt_transparent))
1042 {
1043 const char *p = rs[Rs_backgroundPixmap];
1044
1045 if ((p = strchr (p, ';')) != NULL)
1046 {
1047 p++;
1048 scale_pixmap (p);
1049 }
1050
1051 set_bgPixmap (rs[Rs_backgroundPixmap]);
1052 scr_touch (true);
1053 }
1054#endif
1055
1056 /* graphics context for the vt window */ 1008 /* graphics context for the vt window */
1057 gcvalue.foreground = pix_colors[Color_fg]; 1009 gcvalue.foreground = pix_colors[Color_fg];
1058 gcvalue.background = pix_colors[Color_bg]; 1010 gcvalue.background = pix_colors[Color_bg];
1059 gcvalue.graphics_exposures = 1; 1011 gcvalue.graphics_exposures = 0;
1060 1012
1061 gc = XCreateGC (xdisp, vt, 1013 gc = XCreateGC (dpy, vt,
1062 GCForeground | GCBackground | GCGraphicsExposures, 1014 GCForeground | GCBackground | GCGraphicsExposures,
1063 &gcvalue); 1015 &gcvalue);
1064 1016
1065 drawable = new rxvt_drawable (this, vt); 1017 drawable = new rxvt_drawable (this, vt);
1066 1018
1067#ifdef RXVT_SCROLLBAR 1019#ifdef RXVT_SCROLLBAR
1068 gcvalue.foreground = pix_colors[Color_topShadow]; 1020 gcvalue.foreground = pix_colors[Color_topShadow];
1069 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1021 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1070 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1022 gcvalue.foreground = pix_colors[Color_bottomShadow];
1071 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1023 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1024 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1073 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1025 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074#endif 1026#endif
1075 1027
1076#ifdef OFF_FOCUS_FADING 1028#ifdef OFF_FOCUS_FADING
1077 // initially we are in unfocused state 1029 // initially we are in unfocused state
1078 if (rs[Rs_fade]) 1030 if (rs[Rs_fade])
… …
1087 * GET TTY CURRENT STATE * 1039 * GET TTY CURRENT STATE *
1088 * ------------------------------------------------------------------------- */ 1040 * ------------------------------------------------------------------------- */
1089void 1041void
1090rxvt_get_ttymode (ttymode_t *tio, int erase) 1042rxvt_get_ttymode (ttymode_t *tio, int erase)
1091{ 1043{
1092#ifdef HAVE_TERMIOS_H
1093 /* 1044 /*
1094 * standard System V termios interface 1045 * standard System V termios interface
1095 */ 1046 */
1096 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1047 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1097 { 1048 {
… …
1164 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1115 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1165# if defined (ECHOCTL) && defined (ECHOKE) 1116# if defined (ECHOCTL) && defined (ECHOKE)
1166 | ECHOCTL | ECHOKE 1117 | ECHOCTL | ECHOKE
1167# endif 1118# endif
1168 | ECHOE | ECHOK); 1119 | ECHOE | ECHOK);
1169# else /* HAVE_TERMIOS_H */
1170
1171 /*
1172 * sgtty interface
1173 */
1174
1175 /* get parameters -- gtty */
1176 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1177 {
1178 tio->sg.sg_erase = CERASE; /* ^H */
1179 tio->sg.sg_kill = CKILL; /* ^U */
1180 }
1181
1182 if (erase != -1)
1183 tio->sg.sg_erase = (char)erase;
1184
1185 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1186
1187 /* get special characters */
1188 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1189 {
1190 tio->tc.t_intrc = CINTR; /* ^C */
1191 tio->tc.t_quitc = CQUIT; /* ^\ */
1192 tio->tc.t_startc = CSTART; /* ^Q */
1193 tio->tc.t_stopc = CSTOP; /* ^S */
1194 tio->tc.t_eofc = CEOF; /* ^D */
1195 tio->tc.t_brkc = -1;
1196 }
1197
1198 /* get local special chars */
1199 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1200 {
1201 tio->lc.t_suspc = CSUSP; /* ^Z */
1202 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1203 tio->lc.t_rprntc = CRPRNT; /* ^R */
1204 tio->lc.t_flushc = CFLUSH; /* ^O */
1205 tio->lc.t_werasc = CWERASE; /* ^W */
1206 tio->lc.t_lnextc = CLNEXT; /* ^V */
1207 }
1208 /* get line discipline */
1209 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1210# ifdef NTTYDISC
1211 tio->line = NTTYDISC;
1212# endif /* NTTYDISC */
1213
1214 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1215#endif /* HAVE_TERMIOS_H */
1216 1120
1217 /* 1121 /*
1218 * Debugging 1122 * Debugging
1219 */ 1123 */
1220#ifdef DEBUG_TTYMODE 1124#ifdef DEBUG_TTYMODE
… …
1321 else 1225 else
1322#endif 1226#endif
1323 if (!pty->get ()) 1227 if (!pty->get ())
1324 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1228 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1325 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 */
1326 pty->set_utf8_mode (enc_utf8); 1243 pty->set_utf8_mode (enc_utf8);
1327 1244
1328 /* set initial window size */ 1245 /* set initial window size */
1329 tt_winch (); 1246 tt_winch ();
1330
1331 int er;
1332
1333#ifndef NO_BACKSPACE_KEY
1334 if (key_backspace[0] && !key_backspace[1])
1335 er = key_backspace[0];
1336 else if (strcmp (key_backspace, "DEC") == 0)
1337 er = '\177'; /* the initial state anyway */
1338 else
1339#endif
1340 er = -1;
1341
1342 rxvt_get_ttymode (&tio, er);
1343 1247
1344#if ENABLE_FRILLS 1248#if ENABLE_FRILLS
1345 if (rs[Rs_pty_fd]) 1249 if (rs[Rs_pty_fd])
1346 return; 1250 return;
1347#endif 1251#endif
… …
1378 } 1282 }
1379 1283
1380 _exit (EXIT_FAILURE); 1284 _exit (EXIT_FAILURE);
1381 1285
1382 default: 1286 default:
1383 if (!OPTION (Opt_utmpInhibit)) 1287 if (!option (Opt_utmpInhibit))
1384 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1288 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1385 1289
1386 pty->close_tty (); 1290 pty->close_tty ();
1387 1291
1388 child_ev.start (cmd_pid); 1292 child_ev.start (cmd_pid);
1389 1293
… …
1402int 1306int
1403rxvt_term::run_child (const char *const *argv) 1307rxvt_term::run_child (const char *const *argv)
1404{ 1308{
1405 char *login; 1309 char *login;
1406 1310
1407 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1408
1409 if (OPTION (Opt_console)) 1311 if (option (Opt_console))
1410 { /* be virtual console, fail silently */ 1312 { /* be virtual console, fail silently */
1411#ifdef TIOCCONS 1313#ifdef TIOCCONS
1412 unsigned int on = 1; 1314 unsigned int on = 1;
1413 1315
1414 ioctl (STDIN_FILENO, TIOCCONS, &on); 1316 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1442 sigset_t ss; 1344 sigset_t ss;
1443 sigemptyset (&ss); 1345 sigemptyset (&ss);
1444 sigprocmask (SIG_SETMASK, &ss, 0); 1346 sigprocmask (SIG_SETMASK, &ss, 0);
1445 1347
1446 /* command interpreter path */ 1348 /* command interpreter path */
1447 if (argv != NULL) 1349 if (argv)
1448 { 1350 {
1449# ifdef DEBUG_CMD 1351# ifdef DEBUG_CMD
1450 int i; 1352 int i;
1451 1353
1452 for (i = 0; argv[i]; i++) 1354 for (i = 0; argv[i]; i++)
… …
1461 const char *argv0, *shell; 1363 const char *argv0, *shell;
1462 1364
1463 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1365 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1464 shell = "/bin/sh"; 1366 shell = "/bin/sh";
1465 1367
1466 argv0 = (const char *)rxvt_r_basename (shell); 1368 argv0 = (const char *)rxvt_basename (shell);
1467 1369
1468 if (OPTION (Opt_loginShell)) 1370 if (option (Opt_loginShell))
1469 { 1371 {
1470 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1372 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1471 1373
1472 login[0] = '-'; 1374 login[0] = '-';
1473 strcpy (&login[1], argv0); 1375 strcpy (&login[1], argv0);
1474 argv0 = login; 1376 argv0 = login;
1475 } 1377 }
1476 1378
1477 execlp (shell, argv0, NULL); 1379 execlp (shell, argv0, (char *)0);
1478 /* no error message: STDERR is closed! */ 1380 /* no error message: STDERR is closed! */
1479 } 1381 }
1480 1382
1481 return -1; 1383 return -1;
1482} 1384}

Diff Legend

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