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.284 by root, Fri Dec 14 06:29:28 2007 UTC vs.
Revision 1.309 by root, Wed Feb 27 01:02:33 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.
… …
170#endif 170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
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::x_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
231 if (display) 233 if (display)
232 { 234 {
233 selection_clear (); 235 selection_clear ();
234 236
235#ifdef USE_XIM 237#ifdef USE_XIM
236 im_destroy (); 238 im_destroy ();
237#endif 239#endif
238#ifdef XTERM_SCROLLBAR 240 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); 241 if (gc) XFreeGC (dpy, gc);
263 242
264 delete drawable; 243 delete drawable;
265 // destroy all windows 244 // destroy all windows
266 if (parent[0]) 245 if (parent[0])
… …
274 pix_colors_unfocused [i].free (this); 253 pix_colors_unfocused [i].free (this);
275#endif 254#endif
276 } 255 }
277 256
278 clear (); 257 clear ();
279 }
280 258
281 delete [] pix_colors_focused; 259 display->flush (); /* ideally .put should do this */
282#if OFF_FOCUS_FADING
283 delete [] pix_colors_unfocused;
284#endif
285
286#ifdef HAVE_BG_PIXMAP
287 bgPixmap.destroy ();
288#endif
289 displays.put (display); 260 displays.put (display);
261 }
290 262
291 scr_release (); 263 scr_release ();
292 264
293 /* clear all resources */ 265 /* clear all resources */
294 for (int i = 0; i < allocated.size (); i++) 266 for (int i = 0; i < allocated.size (); i++)
… …
340 if (display) 312 if (display)
341 { 313 {
342#if USE_XIM 314#if USE_XIM
343 im_ev.stop (display); 315 im_ev.stop (display);
344#endif 316#endif
345#if HAVE_SCROLLBARS
346 scrollbar_ev.stop (display); 317 scrollbar_ev.stop (display);
347#endif
348#if ENABLE_TRANSPARENCY || ENABLE_PERL 318#if ENABLE_TRANSPARENCY || ENABLE_PERL
349 rootwin_ev.stop (display); 319 rootwin_ev.stop (display);
350#endif 320#endif
351 incr_ev.stop (); 321 incr_ev.stop ();
352 termwin_ev.stop (display); 322 termwin_ev.stop (display);
… …
471 DisplayString (display)); 441 DisplayString (display));
472 rxvt_emergency_cleanup (); 442 rxvt_emergency_cleanup ();
473 _exit (EXIT_FAILURE); 443 _exit (EXIT_FAILURE);
474} 444}
475 445
476/*----------------------------------------------------------------------*/
477void
478rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
479{
480 this->envv = envv;
481
482 SET_R (this);
483 set_locale ("");
484 set_environ (envv); // few things in X do not call setlocale :(
485
486 init_vars ();
487
488 init_secondary ();
489
490 const char **cmd_argv = init_resources (argc, argv);
491
492#ifdef KEYSYM_RESOURCE
493 keyboard->register_done ();
494#endif
495
496#ifdef HAVE_SCROLLBARS
497 if (option (Opt_scrollBar))
498 scrollBar.setIdle (); /* set existence for size calculations */
499#endif
500
501 pty = ptytty::create ();
502
503 create_windows (argc, argv);
504
505 init_xlocale ();
506
507 scr_reset (); // initialize screen
508
509#if 0
510 XSynchronize (dpy, True);
511#endif
512
513#ifdef HAVE_SCROLLBARS
514 if (option (Opt_scrollBar))
515 resize_scrollbar (); /* create and map scrollbar */
516#endif
517#ifdef HAVE_BG_PIXMAP
518 {
519 bgPixmap.set_target (this);
520
521#ifdef ENABLE_TRANSPARENCY
522 if (option (Opt_transparent))
523 {
524 bgPixmap.set_transparent ();
525#ifdef HAVE_AFTERIMAGE
526 if (rs [Rs_blurradius])
527 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
528#endif
529 if (ISSET_PIXCOLOR (Color_tint))
530 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
531 if (rs [Rs_shade])
532 bgPixmap.set_shade (rs [Rs_shade]);
533
534 bgPixmap.set_root_pixmap ();
535 XSelectInput (dpy, display->root, PropertyChangeMask);
536 rootwin_ev.start (display, display->root);
537 }
538#endif
539
540#ifdef BG_IMAGE_FROM_FILE
541 if (rs[Rs_backgroundPixmap] != NULL)
542 {
543 const char *p = rs[Rs_backgroundPixmap];
544
545 if ((p = strchr (p, ';')) != NULL)
546 {
547 p++;
548 bgPixmap.set_geometry (p);
549 }
550 else
551 bgPixmap.set_defaultGeometry ();
552
553 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
554 if (!bgPixmap.window_position_sensitive ())
555 update_background ();
556 }
557#endif
558 }
559#endif
560
561#if ENABLE_PERL
562 rootwin_ev.start (display, display->root);
563#endif
564
565 set_colorfgbg ();
566
567 init_command (cmd_argv);
568
569 free (cmd_argv);
570
571 if (pty->pty >= 0)
572 pty_ev.start (pty->pty, ev::READ);
573
574 HOOK_INVOKE ((this, HOOK_START, DT_END));
575
576#if ENABLE_XEMBED
577 if (rs[Rs_embed])
578 {
579 long info[2] = { 0, XEMBED_MAPPED };
580
581 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582 32, PropModeReplace, (unsigned char *)&info, 2);
583 }
584#endif
585
586 XMapWindow (dpy, vt);
587 XMapWindow (dpy, parent[0]);
588}
589
590static struct sig_handlers 446static struct sig_handlers
591{ 447{
592 ev::sig sw_term, sw_int; 448 ev::sig sw_term, sw_int;
593 449
594 /* 450 /*
… …
637 XSetIOErrorHandler (rxvt_xioerror_handler); 493 XSetIOErrorHandler (rxvt_xioerror_handler);
638 494
639 XrmInitialize (); 495 XrmInitialize ();
640} 496}
641 497
642/* ------------------------------------------------------------------------- *
643 * MEMORY ALLOCATION WRAPPERS *
644 * ------------------------------------------------------------------------- */
645void *
646rxvt_malloc (size_t size)
647{
648 void *p = malloc (size);
649
650 if (!p)
651 rxvt_fatal ("memory allocation failure. aborting.\n");
652
653 return p;
654}
655
656void *
657rxvt_calloc (size_t number, size_t size)
658{
659 void *p = calloc (number, size);
660
661 if (!p)
662 rxvt_fatal ("memory allocation failure. aborting.\n");
663
664 return p;
665}
666
667void *
668rxvt_realloc (void *ptr, size_t size)
669{
670 void *p = realloc (ptr, size);
671
672 if (!p)
673 rxvt_fatal ("memory allocation failure. aborting.\n");
674
675 return p;
676}
677
678/*----------------------------------------------------------------------*/ 498/*----------------------------------------------------------------------*/
679/* 499/*
680 * window size/position calculations for XSizeHint and other storage. 500 * window size/position calculations for XSizeHint and other storage.
681 * if width/height are non-zero then override calculated width/height 501 * if width/height are non-zero then override calculated width/height
682 */ 502 */
683void 503void
684rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 504rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
685{ 505{
686 short recalc_x, recalc_y; 506 short recalc_x, recalc_y;
687 int x, y, sb_w, flags; 507 int x, y, flags;
688 unsigned int w, h; 508 unsigned int w, h;
689 unsigned int max_width, max_height; 509 unsigned int max_width, max_height;
690 510
691 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 511 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
692 szHint.win_gravity = NorthWestGravity; 512 szHint.win_gravity = NorthWestGravity;
… …
739 szHint.win_gravity = SouthEastGravity; 559 szHint.win_gravity = SouthEastGravity;
740 else 560 else
741 szHint.win_gravity = SouthWestGravity; 561 szHint.win_gravity = SouthWestGravity;
742 } 562 }
743 } 563 }
564
565 if (!szHint.width || !szHint.height)
566 rxvt_fatal ("window width or height must not be zero, aborting.\n");
744 } 567 }
745 568
746 /* TODO: BOUNDS */ 569 /* TODO: BOUNDS */
747 width = ncol * fwidth; 570 width = ncol * fwidth;
748 height = nrow * fheight; 571 height = nrow * fheight;
749 max_width = MAX_COLS * fwidth; 572 max_width = MAX_COLS * fwidth;
750 max_height = MAX_ROWS * fheight; 573 max_height = MAX_ROWS * fheight;
751 574
752 szHint.base_width = szHint.base_height = 2 * int_bwidth; 575 szHint.base_width = szHint.base_height = 2 * int_bwidth;
753 576
754 sb_w = 0;
755 window_vt_x = window_vt_y = int_bwidth; 577 window_vt_x = window_vt_y = int_bwidth;
756 578
757 if (scrollBar.state) 579 if (scrollBar.state)
758 { 580 {
759 sb_w = scrollbar_TotalWidth (); 581 int sb_w = scrollBar.total_width ();
760 szHint.base_width += sb_w; 582 szHint.base_width += sb_w;
761 583
762 if (!option (Opt_scrollBar_right)) 584 if (!option (Opt_scrollBar_right))
763 window_vt_x += sb_w; 585 window_vt_x += sb_w;
764 } 586 }
… …
787 else 609 else
788 { 610 {
789 min_it (height, max_height); 611 min_it (height, max_height);
790 szHint.height = szHint.base_height + height; 612 szHint.height = szHint.base_height + height;
791 } 613 }
792
793 if (scrollBar.state && option (Opt_scrollBar_right))
794 window_sb_x = szHint.width - sb_w;
795 614
796 if (recalc_x) 615 if (recalc_x)
797 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 616 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
798 617
799 if (recalc_y) 618 if (recalc_y)
… …
958void 777void
959rxvt_term::set_window_color (int idx, const char *color) 778rxvt_term::set_window_color (int idx, const char *color)
960{ 779{
961#ifdef XTERM_COLOR_CHANGE 780#ifdef XTERM_COLOR_CHANGE
962 rxvt_color xcol; 781 rxvt_color xcol;
963 int i;
964 782
965 if (color == NULL || *color == '\0') 783 if (color == NULL || *color == '\0')
966 return; 784 return;
967 785
968 color = strdup (color); 786 color = strdup (color);
… …
970 rs[Rs_color + idx] = color; 788 rs[Rs_color + idx] = color;
971 789
972 /* handle color aliases */ 790 /* handle color aliases */
973 if (isdigit (*color)) 791 if (isdigit (*color))
974 { 792 {
975 i = atoi (color); 793 int i = atoi (color);
976 794
977 if (i >= 8 && i <= 15) 795 if (i >= 8 && i <= 15)
978 { 796 {
979 /* bright colors */ 797 /* bright colors */
980 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 798 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1140 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 958 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1141 959
1142 if (fix_screen || newwidth != old_width || newheight != old_height) 960 if (fix_screen || newwidth != old_width || newheight != old_height)
1143 { 961 {
1144 if (scrollBar.state) 962 if (scrollBar.state)
1145 { 963 scrollBar.resize ();
1146 XMoveResizeWindow (dpy, scrollBar.win,
1147 window_sb_x, 0,
1148 scrollbar_TotalWidth (), szHint.height);
1149 resize_scrollbar ();
1150 }
1151 964
1152 XMoveResizeWindow (dpy, vt, 965 XMoveResizeWindow (dpy, vt,
1153 window_vt_x, window_vt_y, 966 window_vt_x, window_vt_y,
1154 width, height); 967 width, height);
1155 968
… …
1712void 1525void
1713rxvt_term::get_window_origin (int &x, int &y) 1526rxvt_term::get_window_origin (int &x, int &y)
1714{ 1527{
1715 Window cr; 1528 Window cr;
1716 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1529 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1717/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1530/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1718} 1531}
1719 1532
1720Pixmap 1533Pixmap
1721rxvt_term::get_pixmap_property (int prop_id) 1534rxvt_term::get_pixmap_property (int prop_id)
1722{ 1535{
… …
1729 unsigned char *prop = NULL; 1542 unsigned char *prop = NULL;
1730 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1543 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1731 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1544 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1732 &nitems, &bytes_after, &prop); 1545 &nitems, &bytes_after, &prop);
1733 if (result == Success && prop && atype == XA_PIXMAP) 1546 if (result == Success && prop && atype == XA_PIXMAP)
1734 {
1735 return *(Pixmap *)prop; 1547 return *(Pixmap *)prop;
1736 }
1737 } 1548 }
1549
1738 return None; 1550 return None;
1739} 1551}
1740 1552
1741#ifdef HAVE_BG_PIXMAP 1553#ifdef HAVE_BG_PIXMAP
1742# if TRACE_PIXMAPS 1554# if TRACE_PIXMAPS
1743# undef update_background 1555# undef update_background
1556void
1744int rxvt_term::trace_update_background (const char *file, int line) 1557rxvt_term::trace_update_background (const char *file, int line)
1745{ 1558{
1746 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1559 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1747 update_background (); 1560 update_background ();
1748} 1561}
1749# endif 1562# endif
1750 1563
1751int 1564void
1752rxvt_term::update_background () 1565rxvt_term::update_background ()
1753{ 1566{
1567 if (update_background_ev.is_active ())
1568 return;
1569
1754 bgPixmap.invalidate (); 1570 bgPixmap.invalidate ();
1755 1571
1756 /* no chance of real time refresh if we are blurring! */ 1572 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1757 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1573
1574 if (to_wait <= 0.)
1758 bgPixmap.render (); 1575 bgPixmap.render ();
1759 else 1576 else
1760 {
1761 update_background_ev.stop ();
1762
1763 if (!bgPixmap.need_client_side_rendering())
1764 update_background_ev.start (.05); 1577 update_background_ev.start (to_wait);
1765 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1766 update_background_ev.start (.20); /* very slow !!! */
1767 else
1768 update_background_ev.start (.07);
1769 }
1770
1771 return 0;
1772} 1578}
1773 1579
1774void 1580void
1775rxvt_term::update_background_cb (ev::timer &w, int revents) 1581rxvt_term::update_background_cb (ev::timer &w, int revents)
1776{ 1582{
1777 make_current (); 1583 make_current ();
1584
1585 update_background_ev.stop ();
1778 bgPixmap.render (); 1586 bgPixmap.render ();
1779 refresh_check (); 1587 refresh_check ();
1780} 1588}
1781 1589
1782#endif /* HAVE_BG_PIXMAP */ 1590#endif /* HAVE_BG_PIXMAP */

Diff Legend

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