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.269 by root, Tue Dec 4 14:50:42 2007 UTC vs.
Revision 1.302 by root, Fri Jan 25 16:04:57 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-2006 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.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 43#include <termios.h>
45#endif
46 44
47#ifdef HAVE_XSETLOCALE 45#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 46# define X_LOCALE
49# include <X11/Xlocale.h> 47# include <X11/Xlocale.h>
50#else 48#else
… …
152 150
153} 151}
154#endif 152#endif
155 153
156rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
157 : 155{
158#if HAVE_BG_PIXMAP 156#if HAVE_BG_PIXMAP
159 update_background_ev(this, &rxvt_term::update_background_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
160#endif 158#endif
161#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
162 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
163#endif 161#endif
164#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
165 text_blink_ev (this, &rxvt_term::text_blink_cb), 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
166#endif 164#endif
167#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
168 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
169#endif 167#endif
170#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
171 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
172#endif 170#endif
173#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
174 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
175#endif 182#endif
176#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
177 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
178#endif 185#endif
179#ifndef NO_BELL 186#ifndef NO_BELL
180 bell_ev (this, &rxvt_term::bell_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
181#endif 188#endif
182 child_ev (this, &rxvt_term::child_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
183 prepare_ev (this, &rxvt_term::prepare_cb), 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
184 flush_ev (this, &rxvt_term::flush_cb), 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
185 destroy_ev (this, &rxvt_term::destroy_cb), 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
186 pty_ev (this, &rxvt_term::pty_cb), 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
187 incr_ev (this, &rxvt_term::incr_cb) 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
188{ 195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
189#if ENABLE_TRANSPARENCY || ENABLE_PERL
190 callback_set (rootwin_ev , this, rxvt_term, rootwin_cb);
191#endif
192#ifdef HAVE_SCROLLBARS
193 callback_set (scrollbar_ev, this, rxvt_term, x_cb);
194#endif
195#ifdef USE_XIM
196 callback_set (im_ev , this, rxvt_term, im_cb);
197#endif
198 callback_set (termwin_ev , this, rxvt_term, x_cb);
199 callback_set (vt_ev , this, rxvt_term, x_cb);
200 196
201 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
202 198
203 termlist.push_back (this); 199 termlist.push_back (this);
204 200
… …
229 for (int i = RS_styleCount; --i; ) 225 for (int i = RS_styleCount; --i; )
230 if (fontset[i] != fontset[0]) 226 if (fontset[i] != fontset[0])
231 delete fontset[i]; 227 delete fontset[i];
232#endif 228#endif
233 delete fontset[0]; 229 delete fontset[0];
230
231#ifdef HAVE_BG_PIXMAP
232 bgPixmap.destroy ();
233#endif
234 234
235 if (display) 235 if (display)
236 { 236 {
237 selection_clear (); 237 selection_clear ();
238 238
… …
278 pix_colors_unfocused [i].free (this); 278 pix_colors_unfocused [i].free (this);
279#endif 279#endif
280 } 280 }
281 281
282 clear (); 282 clear ();
283 }
284 283
285 delete [] pix_colors_focused; 284 display->flush (); /* ideally .put should do this */
286#if OFF_FOCUS_FADING
287 delete [] pix_colors_unfocused;
288#endif
289
290#ifdef HAVE_BG_PIXMAP
291 bgPixmap.destroy ();
292#endif
293 displays.put (display); 285 displays.put (display);
286 }
294 287
295 scr_release (); 288 scr_release ();
296 289
297 /* clear all resources */ 290 /* clear all resources */
298 for (int i = 0; i < allocated.size (); i++) 291 for (int i = 0; i < allocated.size (); i++)
… …
330} 323}
331 324
332void 325void
333rxvt_term::destroy () 326rxvt_term::destroy ()
334{ 327{
335 if (destroy_ev.active) 328 if (destroy_ev.is_active ())
336 return; 329 return;
337 330
338 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 331 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
339 332
340#if ENABLE_OVERLAY 333#if ENABLE_OVERLAY
… …
355 incr_ev.stop (); 348 incr_ev.stop ();
356 termwin_ev.stop (display); 349 termwin_ev.stop (display);
357 vt_ev.stop (display); 350 vt_ev.stop (display);
358 } 351 }
359 352
360 prepare_ev.stop (); 353 flush_ev.stop ();
361 pty_ev.stop (); 354 pty_ev.stop ();
362#ifdef CURSOR_BLINK 355#ifdef CURSOR_BLINK
363 cursor_blink_ev.stop (); 356 cursor_blink_ev.stop ();
364#endif 357#endif
365#ifdef TEXT_BLINK 358#ifdef TEXT_BLINK
… …
475 DisplayString (display)); 468 DisplayString (display));
476 rxvt_emergency_cleanup (); 469 rxvt_emergency_cleanup ();
477 _exit (EXIT_FAILURE); 470 _exit (EXIT_FAILURE);
478} 471}
479 472
480/*----------------------------------------------------------------------*/
481bool
482rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
483{
484 this->envv = envv;
485
486 SET_R (this);
487 set_locale ("");
488 set_environ (envv); // few things in X do not call setlocale :(
489
490 if (!init_vars ())
491 return false;
492
493 init_secondary ();
494
495 const char **cmd_argv = init_resources (argc, argv);
496
497#ifdef KEYSYM_RESOURCE
498 keyboard->register_done ();
499#endif
500
501#ifdef HAVE_SCROLLBARS
502 if (option (Opt_scrollBar))
503 scrollBar.setIdle (); /* set existence for size calculations */
504#endif
505
506 pty = ptytty::create ();
507
508 create_windows (argc, argv);
509
510 init_xlocale ();
511
512 scr_reset (); // initialize screen
513
514#if 0
515 XSynchronize (dpy, True);
516#endif
517
518#ifdef HAVE_SCROLLBARS
519 if (option (Opt_scrollBar))
520 resize_scrollbar (); /* create and map scrollbar */
521#endif
522#ifdef HAVE_BG_PIXMAP
523 {
524 bgPixmap.set_target (this);
525
526#ifdef ENABLE_TRANSPARENCY
527 if (option (Opt_transparent))
528 {
529 bgPixmap.set_transparent ();
530#ifdef HAVE_AFTERIMAGE
531 if (rs [Rs_blurradius])
532 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
533#endif
534 if (ISSET_PIXCOLOR (Color_tint))
535 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
536 if (rs [Rs_shade])
537 bgPixmap.set_shade (rs [Rs_shade]);
538
539 bgPixmap.set_root_pixmap ();
540 XSelectInput (dpy, display->root, PropertyChangeMask);
541 rootwin_ev.start (display, display->root);
542 }
543#endif
544
545#ifdef BG_IMAGE_FROM_FILE
546 if (rs[Rs_backgroundPixmap] != NULL)
547 {
548 const char *p = rs[Rs_backgroundPixmap];
549
550 if ((p = strchr (p, ';')) != NULL)
551 {
552 p++;
553 bgPixmap.set_geometry (p);
554 }
555 else
556 bgPixmap.set_defaultGeometry ();
557
558 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
559 if (!bgPixmap.window_position_sensitive ())
560 update_background ();
561 }
562#endif
563 }
564#endif
565
566#if ENABLE_PERL
567 rootwin_ev.start (display, display->root);
568#endif
569
570 set_colorfgbg ();
571
572 init_command (cmd_argv);
573
574 free (cmd_argv);
575
576 if (pty->pty >= 0)
577 pty_ev.start (pty->pty, ev::READ);
578
579 prepare_ev.start ();
580
581 HOOK_INVOKE ((this, HOOK_START, DT_END));
582
583#if ENABLE_XEMBED
584 if (rs[Rs_embed])
585 {
586 long info[2] = { 0, XEMBED_MAPPED };
587
588 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
589 32, PropModeReplace, (unsigned char *)&info, 2);
590 }
591#endif
592
593 XMapWindow (dpy, vt);
594 XMapWindow (dpy, parent[0]);
595
596 return true;
597}
598
599static struct sig_handlers 473static struct sig_handlers
600{ 474{
601 ev::sig sw_term, sw_int; 475 ev::sig sw_term, sw_int;
602 476
603 /* 477 /*
604 * Catch a fatal signal and tidy up before quitting 478 * Catch a fatal signal and tidy up before quitting
605 */ 479 */
606 void
607 sig_term (ev::sig &w, int revents) 480 void sig_term (ev::sig &w, int revents);
481
482 sig_handlers ()
608 { 483 {
609 rxvt_emergency_cleanup (); 484 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
610 w.stop ();
611 kill (getpid (), w.signum);
612 }
613
614 sig_handlers ()
615 : sw_term (this, &sig_handlers::sig_term),
616 sw_int (this, &sig_handlers::sig_term) 485 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
617 {
618 } 486 }
619} sig_handlers; 487} sig_handlers;
488
489void
490sig_handlers::sig_term (ev::sig &w, int revents)
491{
492 rxvt_emergency_cleanup ();
493 w.stop ();
494 kill (getpid (), w.signum);
495}
620 496
621char **rxvt_environ; // startup environment 497char **rxvt_environ; // startup environment
622 498
623void 499void
624rxvt_init () 500rxvt_init ()
… …
642 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 518 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
643 // TODO: handle this with exceptions and tolerate the memory loss 519 // TODO: handle this with exceptions and tolerate the memory loss
644 XSetIOErrorHandler (rxvt_xioerror_handler); 520 XSetIOErrorHandler (rxvt_xioerror_handler);
645 521
646 XrmInitialize (); 522 XrmInitialize ();
647}
648
649/* ------------------------------------------------------------------------- *
650 * MEMORY ALLOCATION WRAPPERS *
651 * ------------------------------------------------------------------------- */
652void *
653rxvt_malloc (size_t size)
654{
655 void *p = malloc (size);
656
657 if (!p)
658 rxvt_fatal ("memory allocation failure. aborting.\n");
659
660 return p;
661}
662
663void *
664rxvt_calloc (size_t number, size_t size)
665{
666 void *p = calloc (number, size);
667
668 if (!p)
669 rxvt_fatal ("memory allocation failure. aborting.\n");
670
671 return p;
672}
673
674void *
675rxvt_realloc (void *ptr, size_t size)
676{
677 void *p = realloc (ptr, size);
678
679 if (!p)
680 rxvt_fatal ("memory allocation failure. aborting.\n");
681
682 return p;
683} 523}
684 524
685/*----------------------------------------------------------------------*/ 525/*----------------------------------------------------------------------*/
686/* 526/*
687 * window size/position calculations for XSizeHint and other storage. 527 * window size/position calculations for XSizeHint and other storage.
… …
828 ws.ws_xpixel = width; 668 ws.ws_xpixel = width;
829 ws.ws_ypixel = height; 669 ws.ws_ypixel = height;
830 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 670 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
831 671
832#if 0 672#if 0
833 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 673 // TIOCSWINSZ is supposed to do this automatically and correctly
834 if (cmd_pid) /* force through to the command */ 674 if (cmd_pid) /* force through to the command */
835 kill (-cmd_pid, SIGWINCH); 675 kill (-cmd_pid, SIGWINCH);
836#endif 676#endif
837} 677}
838 678
… …
1719void 1559void
1720rxvt_term::get_window_origin (int &x, int &y) 1560rxvt_term::get_window_origin (int &x, int &y)
1721{ 1561{
1722 Window cr; 1562 Window cr;
1723 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1563 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1724/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1564/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1725} 1565}
1726 1566
1727Pixmap 1567Pixmap
1728rxvt_term::get_pixmap_property (int prop_id) 1568rxvt_term::get_pixmap_property (int prop_id)
1729{ 1569{
… …
1736 unsigned char *prop = NULL; 1576 unsigned char *prop = NULL;
1737 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1577 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1738 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1578 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1739 &nitems, &bytes_after, &prop); 1579 &nitems, &bytes_after, &prop);
1740 if (result == Success && prop && atype == XA_PIXMAP) 1580 if (result == Success && prop && atype == XA_PIXMAP)
1741 {
1742 return *(Pixmap *)prop; 1581 return *(Pixmap *)prop;
1743 }
1744 } 1582 }
1583
1745 return None; 1584 return None;
1746} 1585}
1747 1586
1748#ifdef HAVE_BG_PIXMAP 1587#ifdef HAVE_BG_PIXMAP
1749# if TRACE_PIXMAPS 1588# if TRACE_PIXMAPS
1750# undef update_background 1589# undef update_background
1590void
1751int rxvt_term::trace_update_background (const char *file, int line) 1591rxvt_term::trace_update_background (const char *file, int line)
1752{ 1592{
1753 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1593 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754 update_background (); 1594 update_background ();
1755} 1595}
1756# endif 1596# endif
1757 1597
1758int 1598void
1759rxvt_term::update_background () 1599rxvt_term::update_background ()
1760{ 1600{
1601 if (update_background_ev.is_active ())
1602 return;
1603
1761 bgPixmap.invalidate (); 1604 bgPixmap.invalidate ();
1762 1605
1763 /* no chance of real time refresh if we are blurring! */ 1606 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1764 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1607
1608 if (to_wait <= 0.)
1765 bgPixmap.render (); 1609 bgPixmap.render ();
1766 else 1610 else
1767 {
1768 update_background_ev.stop ();
1769
1770 if (!bgPixmap.need_client_side_rendering())
1771 update_background_ev.start (.05); 1611 update_background_ev.start (to_wait);
1772 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1773 update_background_ev.start (.20); /* very slow !!! */
1774 else
1775 update_background_ev.start (.07);
1776 }
1777
1778 return 0;
1779} 1612}
1780 1613
1781void 1614void
1782rxvt_term::update_background_cb (ev::timer &w, int revents) 1615rxvt_term::update_background_cb (ev::timer &w, int revents)
1783{ 1616{
1617 make_current ();
1618
1619 update_background_ev.stop ();
1784 bgPixmap.render (); 1620 bgPixmap.render ();
1621 refresh_check ();
1785} 1622}
1786 1623
1787#endif /* HAVE_BG_PIXMAP */ 1624#endif /* HAVE_BG_PIXMAP */
1788 1625
1789/*----------------------- end-of-file (C source) -----------------------*/ 1626/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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