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.305 by ayin, Sun Feb 17 11:37:21 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);
… …
225 for (int i = RS_styleCount; --i; ) 223 for (int i = RS_styleCount; --i; )
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];
228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
230 232
231 if (display) 233 if (display)
232 { 234 {
233 selection_clear (); 235 selection_clear ();
234 236
… …
274 pix_colors_unfocused [i].free (this); 276 pix_colors_unfocused [i].free (this);
275#endif 277#endif
276 } 278 }
277 279
278 clear (); 280 clear ();
279 }
280 281
281 delete [] pix_colors_focused; 282 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); 283 displays.put (display);
284 }
290 285
291 scr_release (); 286 scr_release ();
292 287
293 /* clear all resources */ 288 /* clear all resources */
294 for (int i = 0; i < allocated.size (); i++) 289 for (int i = 0; i < allocated.size (); i++)
… …
340 if (display) 335 if (display)
341 { 336 {
342#if USE_XIM 337#if USE_XIM
343 im_ev.stop (display); 338 im_ev.stop (display);
344#endif 339#endif
345#if HAVE_SCROLLBARS
346 scrollbar_ev.stop (display); 340 scrollbar_ev.stop (display);
347#endif
348#if ENABLE_TRANSPARENCY || ENABLE_PERL 341#if ENABLE_TRANSPARENCY || ENABLE_PERL
349 rootwin_ev.stop (display); 342 rootwin_ev.stop (display);
350#endif 343#endif
351 incr_ev.stop (); 344 incr_ev.stop ();
352 termwin_ev.stop (display); 345 termwin_ev.stop (display);
… …
471 DisplayString (display)); 464 DisplayString (display));
472 rxvt_emergency_cleanup (); 465 rxvt_emergency_cleanup ();
473 _exit (EXIT_FAILURE); 466 _exit (EXIT_FAILURE);
474} 467}
475 468
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 469static struct sig_handlers
591{ 470{
592 ev::sig sw_term, sw_int; 471 ev::sig sw_term, sw_int;
593 472
594 /* 473 /*
… …
637 XSetIOErrorHandler (rxvt_xioerror_handler); 516 XSetIOErrorHandler (rxvt_xioerror_handler);
638 517
639 XrmInitialize (); 518 XrmInitialize ();
640} 519}
641 520
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/*----------------------------------------------------------------------*/ 521/*----------------------------------------------------------------------*/
679/* 522/*
680 * window size/position calculations for XSizeHint and other storage. 523 * window size/position calculations for XSizeHint and other storage.
681 * if width/height are non-zero then override calculated width/height 524 * if width/height are non-zero then override calculated width/height
682 */ 525 */
… …
754 sb_w = 0; 597 sb_w = 0;
755 window_vt_x = window_vt_y = int_bwidth; 598 window_vt_x = window_vt_y = int_bwidth;
756 599
757 if (scrollBar.state) 600 if (scrollBar.state)
758 { 601 {
759 sb_w = scrollbar_TotalWidth (); 602 sb_w = scrollBar.total_width ();
760 szHint.base_width += sb_w; 603 szHint.base_width += sb_w;
761 604
762 if (!option (Opt_scrollBar_right)) 605 if (!option (Opt_scrollBar_right))
763 window_vt_x += sb_w; 606 window_vt_x += sb_w;
764 } 607 }
… …
958void 801void
959rxvt_term::set_window_color (int idx, const char *color) 802rxvt_term::set_window_color (int idx, const char *color)
960{ 803{
961#ifdef XTERM_COLOR_CHANGE 804#ifdef XTERM_COLOR_CHANGE
962 rxvt_color xcol; 805 rxvt_color xcol;
963 int i;
964 806
965 if (color == NULL || *color == '\0') 807 if (color == NULL || *color == '\0')
966 return; 808 return;
967 809
968 color = strdup (color); 810 color = strdup (color);
… …
970 rs[Rs_color + idx] = color; 812 rs[Rs_color + idx] = color;
971 813
972 /* handle color aliases */ 814 /* handle color aliases */
973 if (isdigit (*color)) 815 if (isdigit (*color))
974 { 816 {
975 i = atoi (color); 817 int i = atoi (color);
976 818
977 if (i >= 8 && i <= 15) 819 if (i >= 8 && i <= 15)
978 { 820 {
979 /* bright colors */ 821 /* bright colors */
980 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 822 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1143 { 985 {
1144 if (scrollBar.state) 986 if (scrollBar.state)
1145 { 987 {
1146 XMoveResizeWindow (dpy, scrollBar.win, 988 XMoveResizeWindow (dpy, scrollBar.win,
1147 window_sb_x, 0, 989 window_sb_x, 0,
1148 scrollbar_TotalWidth (), szHint.height); 990 scrollBar.total_width (), szHint.height);
1149 resize_scrollbar (); 991 resize_scrollbar ();
1150 } 992 }
1151 993
1152 XMoveResizeWindow (dpy, vt, 994 XMoveResizeWindow (dpy, vt,
1153 window_vt_x, window_vt_y, 995 window_vt_x, window_vt_y,
… …
1712void 1554void
1713rxvt_term::get_window_origin (int &x, int &y) 1555rxvt_term::get_window_origin (int &x, int &y)
1714{ 1556{
1715 Window cr; 1557 Window cr;
1716 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1558 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1717/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1559/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1718} 1560}
1719 1561
1720Pixmap 1562Pixmap
1721rxvt_term::get_pixmap_property (int prop_id) 1563rxvt_term::get_pixmap_property (int prop_id)
1722{ 1564{
… …
1729 unsigned char *prop = NULL; 1571 unsigned char *prop = NULL;
1730 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1572 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1731 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1573 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1732 &nitems, &bytes_after, &prop); 1574 &nitems, &bytes_after, &prop);
1733 if (result == Success && prop && atype == XA_PIXMAP) 1575 if (result == Success && prop && atype == XA_PIXMAP)
1734 {
1735 return *(Pixmap *)prop; 1576 return *(Pixmap *)prop;
1736 }
1737 } 1577 }
1578
1738 return None; 1579 return None;
1739} 1580}
1740 1581
1741#ifdef HAVE_BG_PIXMAP 1582#ifdef HAVE_BG_PIXMAP
1742# if TRACE_PIXMAPS 1583# if TRACE_PIXMAPS
1743# undef update_background 1584# undef update_background
1585void
1744int rxvt_term::trace_update_background (const char *file, int line) 1586rxvt_term::trace_update_background (const char *file, int line)
1745{ 1587{
1746 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1588 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1747 update_background (); 1589 update_background ();
1748} 1590}
1749# endif 1591# endif
1750 1592
1751int 1593void
1752rxvt_term::update_background () 1594rxvt_term::update_background ()
1753{ 1595{
1596 if (update_background_ev.is_active ())
1597 return;
1598
1754 bgPixmap.invalidate (); 1599 bgPixmap.invalidate ();
1755 1600
1756 /* no chance of real time refresh if we are blurring! */ 1601 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)) 1602
1603 if (to_wait <= 0.)
1758 bgPixmap.render (); 1604 bgPixmap.render ();
1759 else 1605 else
1760 {
1761 update_background_ev.stop ();
1762
1763 if (!bgPixmap.need_client_side_rendering())
1764 update_background_ev.start (.05); 1606 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} 1607}
1773 1608
1774void 1609void
1775rxvt_term::update_background_cb (ev::timer &w, int revents) 1610rxvt_term::update_background_cb (ev::timer &w, int revents)
1776{ 1611{
1777 make_current (); 1612 make_current ();
1613
1614 update_background_ev.stop ();
1778 bgPixmap.render (); 1615 bgPixmap.render ();
1779 refresh_check (); 1616 refresh_check ();
1780} 1617}
1781 1618
1782#endif /* HAVE_BG_PIXMAP */ 1619#endif /* HAVE_BG_PIXMAP */

Diff Legend

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