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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.292 by root, Mon Dec 24 10:58:09 2007 UTC vs.
Revision 1.314 by root, Wed Nov 5 12:28:15 2008 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 176#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 178#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 180#endif
183#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
… …
226 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
227 delete fontset[i]; 225 delete fontset[i];
228#endif 226#endif
229 delete fontset[0]; 227 delete fontset[0];
230 228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
232#ifdef HAVE_AFTERIMAGE
233 if (asv)
234 destroy_asvisual (asv, 0);
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif
238
231 if (display) 239 if (display)
232 { 240 {
233 selection_clear (); 241 selection_clear ();
234 242
235#ifdef USE_XIM 243#ifdef USE_XIM
236 im_destroy (); 244 im_destroy ();
237#endif 245#endif
238#ifdef XTERM_SCROLLBAR 246 scrollBar.destroy ();
239 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
240 if (ShadowGC) XFreeGC (dpy, ShadowGC);
241#endif
242#ifdef PLAIN_SCROLLBAR
243 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
244#endif
245#ifdef NEXT_SCROLLBAR
246 if (blackGC) XFreeGC (dpy, blackGC);
247 if (whiteGC) XFreeGC (dpy, whiteGC);
248 if (grayGC) XFreeGC (dpy, grayGC);
249 if (darkGC) XFreeGC (dpy, darkGC);
250 if (stippleGC) XFreeGC (dpy, stippleGC);
251 if (dimple) XFreePixmap (dpy, dimple);
252 if (upArrow) XFreePixmap (dpy, upArrow);
253 if (downArrow) XFreePixmap (dpy, downArrow);
254 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
255 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
256#endif
257#ifdef RXVT_SCROLLBAR
258 if (topShadowGC) XFreeGC (dpy, topShadowGC);
259 if (botShadowGC) XFreeGC (dpy, botShadowGC);
260 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
261#endif
262 if (gc) XFreeGC (dpy, gc); 247 if (gc) XFreeGC (dpy, gc);
263 248
264 delete drawable; 249 delete drawable;
265 // destroy all windows 250 // destroy all windows
266 if (parent[0]) 251 if (parent[0])
… …
274 pix_colors_unfocused [i].free (this); 259 pix_colors_unfocused [i].free (this);
275#endif 260#endif
276 } 261 }
277 262
278 clear (); 263 clear ();
279 }
280 264
281 delete [] pix_colors_focused;
282#if OFF_FOCUS_FADING
283 delete [] pix_colors_unfocused;
284#endif
285
286#ifdef HAVE_BG_PIXMAP
287 bgPixmap.destroy ();
288#endif
289 display->flush (); /* ideally .put should do this */ 265 display->flush (); /* ideally .put should do this */
290 displays.put (display); 266 displays.put (display);
267 }
291 268
292 scr_release (); 269 scr_release ();
293 270
294 /* clear all resources */ 271 /* clear all resources */
295 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
… …
341 if (display) 318 if (display)
342 { 319 {
343#if USE_XIM 320#if USE_XIM
344 im_ev.stop (display); 321 im_ev.stop (display);
345#endif 322#endif
346#if HAVE_SCROLLBARS
347 scrollbar_ev.stop (display); 323 scrollbar_ev.stop (display);
348#endif
349#if ENABLE_TRANSPARENCY || ENABLE_PERL 324#if ENABLE_TRANSPARENCY || ENABLE_PERL
350 rootwin_ev.stop (display); 325 rootwin_ev.stop (display);
351#endif 326#endif
352 incr_ev.stop (); 327 incr_ev.stop ();
353 termwin_ev.stop (display); 328 termwin_ev.stop (display);
… …
472 DisplayString (display)); 447 DisplayString (display));
473 rxvt_emergency_cleanup (); 448 rxvt_emergency_cleanup ();
474 _exit (EXIT_FAILURE); 449 _exit (EXIT_FAILURE);
475} 450}
476 451
477/*----------------------------------------------------------------------*/
478void
479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
480{
481 this->envv = envv;
482
483 SET_R (this);
484 set_locale ("");
485 set_environ (envv); // few things in X do not call setlocale :(
486
487 init_vars ();
488
489 init_secondary ();
490
491 const char **cmd_argv = init_resources (argc, argv);
492
493#ifdef KEYSYM_RESOURCE
494 keyboard->register_done ();
495#endif
496
497#ifdef HAVE_SCROLLBARS
498 if (option (Opt_scrollBar))
499 scrollBar.setIdle (); /* set existence for size calculations */
500#endif
501
502 pty = ptytty::create ();
503
504 create_windows (argc, argv);
505
506 init_xlocale ();
507
508 scr_reset (); // initialize screen
509
510#if 0
511 XSynchronize (dpy, True);
512#endif
513
514#ifdef HAVE_SCROLLBARS
515 if (option (Opt_scrollBar))
516 resize_scrollbar (); /* create and map scrollbar */
517#endif
518#ifdef HAVE_BG_PIXMAP
519 {
520 bgPixmap.set_target (this);
521
522#ifdef ENABLE_TRANSPARENCY
523 if (option (Opt_transparent))
524 {
525 bgPixmap.set_transparent ();
526
527#ifdef HAVE_AFTERIMAGE
528 if (rs [Rs_blurradius])
529 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
530#endif
531 if (ISSET_PIXCOLOR (Color_tint))
532 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
533
534 if (rs [Rs_shade])
535 bgPixmap.set_shade (rs [Rs_shade]);
536
537 bgPixmap.set_root_pixmap ();
538 XSelectInput (dpy, display->root, PropertyChangeMask);
539 rootwin_ev.start (display, display->root);
540 }
541#endif
542
543#ifdef BG_IMAGE_FROM_FILE
544 if (rs[Rs_backgroundPixmap])
545 {
546 const char *p = rs[Rs_backgroundPixmap];
547
548 if ((p = strchr (p, ';')) != 0)
549 {
550 p++;
551 bgPixmap.set_geometry (p);
552 }
553 else
554 bgPixmap.set_defaultGeometry ();
555
556 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
557 if (!bgPixmap.window_position_sensitive ())
558 update_background ();
559 }
560#endif
561 }
562#endif
563
564#if ENABLE_PERL
565 rootwin_ev.start (display, display->root);
566#endif
567
568 set_colorfgbg ();
569
570 init_command (cmd_argv);
571
572 free (cmd_argv);
573
574 if (pty->pty >= 0)
575 pty_ev.start (pty->pty, ev::READ);
576
577 HOOK_INVOKE ((this, HOOK_START, DT_END));
578
579#if ENABLE_XEMBED
580 if (rs[Rs_embed])
581 {
582 long info[2] = { 0, XEMBED_MAPPED };
583
584 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
585 32, PropModeReplace, (unsigned char *)&info, 2);
586 }
587#endif
588
589 XMapWindow (dpy, vt);
590 XMapWindow (dpy, parent[0]);
591}
592
593static struct sig_handlers 452static struct sig_handlers
594{ 453{
595 ev::sig sw_term, sw_int; 454 ev::sig sw_term, sw_int;
596 455
597 /* 456 /*
… …
649 */ 508 */
650void 509void
651rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 510rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
652{ 511{
653 short recalc_x, recalc_y; 512 short recalc_x, recalc_y;
654 int x, y, sb_w, flags; 513 int x, y, flags;
655 unsigned int w, h; 514 unsigned int w, h;
656 unsigned int max_width, max_height; 515 unsigned int max_width, max_height;
657 516
658 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 517 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
659 szHint.win_gravity = NorthWestGravity; 518 szHint.win_gravity = NorthWestGravity;
… …
669 if (rs[Rs_geometry]) 528 if (rs[Rs_geometry])
670 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 529 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
671 530
672 if (flags & WidthValue) 531 if (flags & WidthValue)
673 { 532 {
533 if (!w)
534 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
535
674 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 536 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
675 szHint.flags |= USSize; 537 szHint.flags |= USSize;
676 } 538 }
677 539
678 if (flags & HeightValue) 540 if (flags & HeightValue)
679 { 541 {
542 if (!h)
543 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
544
680 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 545 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
681 szHint.flags |= USSize; 546 szHint.flags |= USSize;
682 } 547 }
683 548
684 if (flags & XValue) 549 if (flags & XValue)
685 { 550 {
… …
716 max_width = MAX_COLS * fwidth; 581 max_width = MAX_COLS * fwidth;
717 max_height = MAX_ROWS * fheight; 582 max_height = MAX_ROWS * fheight;
718 583
719 szHint.base_width = szHint.base_height = 2 * int_bwidth; 584 szHint.base_width = szHint.base_height = 2 * int_bwidth;
720 585
721 sb_w = 0;
722 window_vt_x = window_vt_y = int_bwidth; 586 window_vt_x = window_vt_y = int_bwidth;
723 587
724 if (scrollBar.state) 588 if (scrollBar.state)
725 { 589 {
726 sb_w = scrollbar_TotalWidth (); 590 int sb_w = scrollBar.total_width ();
727 szHint.base_width += sb_w; 591 szHint.base_width += sb_w;
728 592
729 if (!option (Opt_scrollBar_right)) 593 if (!option (Opt_scrollBar_right))
730 window_vt_x += sb_w; 594 window_vt_x += sb_w;
731 } 595 }
… …
755 { 619 {
756 min_it (height, max_height); 620 min_it (height, max_height);
757 szHint.height = szHint.base_height + height; 621 szHint.height = szHint.base_height + height;
758 } 622 }
759 623
760 if (scrollBar.state && option (Opt_scrollBar_right))
761 window_sb_x = szHint.width - sb_w;
762
763 if (recalc_x) 624 if (recalc_x)
764 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
765 626
766 if (recalc_y) 627 if (recalc_y)
767 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
768 629
769 ncol = width / fwidth; 630 ncol = width / fwidth;
770 nrow = height / fheight; 631 nrow = height / fheight;
771} 632}
772 633
773/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
774/* 635/*
… …
925void 786void
926rxvt_term::set_window_color (int idx, const char *color) 787rxvt_term::set_window_color (int idx, const char *color)
927{ 788{
928#ifdef XTERM_COLOR_CHANGE 789#ifdef XTERM_COLOR_CHANGE
929 rxvt_color xcol; 790 rxvt_color xcol;
930 int i;
931 791
932 if (color == NULL || *color == '\0') 792 if (color == NULL || *color == '\0')
933 return; 793 return;
934 794
935 color = strdup (color); 795 color = strdup (color);
… …
937 rs[Rs_color + idx] = color; 797 rs[Rs_color + idx] = color;
938 798
939 /* handle color aliases */ 799 /* handle color aliases */
940 if (isdigit (*color)) 800 if (isdigit (*color))
941 { 801 {
942 i = atoi (color); 802 int i = atoi (color);
943 803
944 if (i >= 8 && i <= 15) 804 if (i >= 8 && i <= 15)
945 { 805 {
946 /* bright colors */ 806 /* bright colors */
947 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 807 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1051 int old_width = szHint.width; 911 int old_width = szHint.width;
1052 int old_height = szHint.height; 912 int old_height = szHint.height;
1053 913
1054 window_calc (newwidth, newheight); 914 window_calc (newwidth, newheight);
1055 915
1056 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 916 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
917
918 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
919 if (set_hint)
920 {
921 szHint.flags &= ~(PBaseSize | PResizeInc);
1057 XSetWMNormalHints (dpy, parent[0], &szHint); 922 XSetWMNormalHints (dpy, parent[0], &szHint);
923 szHint.flags |= PBaseSize | PResizeInc;
924 }
1058 925
1059 if (!ignoreparent) 926 if (!ignoreparent)
1060 { 927 {
1061#ifdef SMART_RESIZE 928#ifdef SMART_RESIZE
1062 /* 929 /*
… …
1102#else 969#else
1103 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 970 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1104#endif 971#endif
1105 } 972 }
1106 973
974 if (set_hint)
975 XSetWMNormalHints (dpy, parent[0], &szHint);
976
1107 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 977 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1108 978
1109 if (fix_screen || newwidth != old_width || newheight != old_height) 979 if (fix_screen || newwidth != old_width || newheight != old_height)
1110 { 980 {
1111 if (scrollBar.state) 981 if (scrollBar.state)
1112 { 982 scrollBar.resize ();
1113 XMoveResizeWindow (dpy, scrollBar.win,
1114 window_sb_x, 0,
1115 scrollbar_TotalWidth (), szHint.height);
1116 resize_scrollbar ();
1117 }
1118 983
1119 XMoveResizeWindow (dpy, vt, 984 XMoveResizeWindow (dpy, vt,
1120 window_vt_x, window_vt_y, 985 window_vt_x, window_vt_y,
1121 width, height); 986 width, height);
1122 987
1123#ifdef HAVE_BG_PIXMAP 988#ifdef HAVE_BG_PIXMAP
1124 if (bgPixmap.window_size_sensitive ()) 989 if (bgPixmap.window_size_sensitive ())
1125 update_background (); 990 update_background ();
1126#endif 991#endif
1127
1128 scr_clear ();
1129 } 992 }
1130 993
1131 if (fix_screen || old_height == 0) 994 if (fix_screen || old_height == 0)
995 {
1132 scr_reset (); 996 scr_reset ();
997 }
1133 998
1134 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 999 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1135 //scr_touch (false); 1000 //scr_touch (false);
1136 1001
1137#ifdef HAVE_BG_PIXMAP 1002#ifdef HAVE_BG_PIXMAP
… …
1716# endif 1581# endif
1717 1582
1718void 1583void
1719rxvt_term::update_background () 1584rxvt_term::update_background ()
1720{ 1585{
1586 if (update_background_ev.is_active ())
1587 return;
1588
1721 bgPixmap.invalidate (); 1589 bgPixmap.invalidate ();
1722 1590
1723 /* no chance of real time refresh if we are blurring! */ 1591 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1724 if (bgPixmap.invalid_since + 0.50 < ev::now () 1592
1725 && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1593 if (to_wait <= 0.)
1726 {
1727 update_background_ev.stop ();
1728 bgPixmap.render (); 1594 bgPixmap.render ();
1729 }
1730 else 1595 else
1731 {
1732 ev_tstamp refresh;
1733
1734 if (!bgPixmap.need_client_side_rendering ())
1735 refresh = .05;
1736 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1737 refresh = .20; /* very slow !!! */
1738 else
1739 refresh = .07;
1740
1741 update_background_ev.start (refresh); 1596 update_background_ev.start (to_wait);
1742 }
1743} 1597}
1744 1598
1745void 1599void
1746rxvt_term::update_background_cb (ev::timer &w, int revents) 1600rxvt_term::update_background_cb (ev::timer &w, int revents)
1747{ 1601{
1748 make_current (); 1602 make_current ();
1603
1604 update_background_ev.stop ();
1749 bgPixmap.render (); 1605 bgPixmap.render ();
1750 refresh_check (); 1606 refresh_check ();
1751} 1607}
1752 1608
1753#endif /* HAVE_BG_PIXMAP */ 1609#endif /* HAVE_BG_PIXMAP */

Diff Legend

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