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.262 by ayin, Wed Nov 21 09:15:33 2007 UTC vs.
Revision 1.291 by root, Mon Dec 24 06:51:37 2007 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-2007 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{
156#if HAVE_BG_PIXMAP
157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif
159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif
168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
158#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if ENABLE_TRANSPARENCY || ENABLE_PERL
159 rootwin_ev (this, &rxvt_term::rootwin_cb), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
160#endif
161#if HAVE_BG_PIXMAP
162 update_background_ev(this, &rxvt_term::update_background_cb),
163#endif 176#endif
164#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
165 scrollbar_ev (this, &rxvt_term::x_cb), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
166#endif 179#endif
167#ifdef CURSOR_BLINK 180#ifdef USE_XIM
168 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
169#endif
170#ifdef TEXT_BLINK
171 text_blink_ev (this, &rxvt_term::text_blink_cb),
172#endif
173#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
174 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
175#endif
176#ifdef SELECTION_SCROLLING
177 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
178#endif
179#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
180 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
181#endif 182#endif
182#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
183 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif
185#ifdef USE_XIM
186 im_ev (this, &rxvt_term::im_cb),
187#endif 185#endif
188#ifndef NO_BELL 186#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 188#endif
191 termwin_ev (this, &rxvt_term::x_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 vt_ev (this, &rxvt_term::x_cb), 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
193 child_ev (this, &rxvt_term::child_cb), 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
194 prepare_ev (this, &rxvt_term::prepare_cb), 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
195 flush_ev (this, &rxvt_term::flush_cb), 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
196 destroy_ev (this, &rxvt_term::destroy_cb), 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 pty_ev (this, &rxvt_term::pty_cb), 195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198 incr_ev (this, &rxvt_term::incr_cb) 196
199{
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 198
202 termlist.push_back (this); 199 termlist.push_back (this);
203 200
204#ifdef KEYSYM_RESOURCE 201#ifdef KEYSYM_RESOURCE
… …
287#endif 284#endif
288 285
289#ifdef HAVE_BG_PIXMAP 286#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy (); 287 bgPixmap.destroy ();
291#endif 288#endif
289 display->flush (); /* ideally .put should do this */
292 displays.put (display); 290 displays.put (display);
293 291
294 scr_release (); 292 scr_release ();
295 293
296 /* clear all resources */ 294 /* clear all resources */
… …
309 delete argv; 307 delete argv;
310 308
311#ifdef KEYSYM_RESOURCE 309#ifdef KEYSYM_RESOURCE
312 delete keyboard; 310 delete keyboard;
313#endif 311#endif
312#ifndef NO_RESOURCES
313 XrmDestroyDatabase (option_db);
314#endif
314} 315}
315 316
316// child has exited, usually destroys 317// child has exited, usually destroys
317void 318void
318rxvt_term::child_cb (ev::child &w, int status) 319rxvt_term::child_cb (ev::child &w, int status)
… …
326} 327}
327 328
328void 329void
329rxvt_term::destroy () 330rxvt_term::destroy ()
330{ 331{
331 if (destroy_ev.active) 332 if (destroy_ev.is_active ())
332 return; 333 return;
333 334
334 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
335 336
336#if ENABLE_OVERLAY 337#if ENABLE_OVERLAY
… …
351 incr_ev.stop (); 352 incr_ev.stop ();
352 termwin_ev.stop (display); 353 termwin_ev.stop (display);
353 vt_ev.stop (display); 354 vt_ev.stop (display);
354 } 355 }
355 356
356 prepare_ev.stop (); 357 flush_ev.stop ();
357 pty_ev.stop (); 358 pty_ev.stop ();
358#ifdef CURSOR_BLINK 359#ifdef CURSOR_BLINK
359 cursor_blink_ev.stop (); 360 cursor_blink_ev.stop ();
360#endif 361#endif
361#ifdef TEXT_BLINK 362#ifdef TEXT_BLINK
… …
472 rxvt_emergency_cleanup (); 473 rxvt_emergency_cleanup ();
473 _exit (EXIT_FAILURE); 474 _exit (EXIT_FAILURE);
474} 475}
475 476
476/*----------------------------------------------------------------------*/ 477/*----------------------------------------------------------------------*/
477bool 478void
478rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
479{ 480{
480 this->envv = envv; 481 this->envv = envv;
481 482
482 SET_R (this); 483 SET_R (this);
483 set_locale (""); 484 set_locale ("");
484 set_environ (envv); // few things in X do not call setlocale :( 485 set_environ (envv); // few things in X do not call setlocale :(
485 486
486 if (!init_vars ()) 487 init_vars ();
487 return false;
488 488
489 init_secondary (); 489 init_secondary ();
490 490
491 const char **cmd_argv = init_resources (argc, argv); 491 const char **cmd_argv = init_resources (argc, argv);
492 492
… …
521 521
522#ifdef ENABLE_TRANSPARENCY 522#ifdef ENABLE_TRANSPARENCY
523 if (option (Opt_transparent)) 523 if (option (Opt_transparent))
524 { 524 {
525 bgPixmap.set_transparent (); 525 bgPixmap.set_transparent ();
526
526#ifdef HAVE_AFTERIMAGE 527#ifdef HAVE_AFTERIMAGE
527 if (rs [Rs_blurradius]) 528 if (rs [Rs_blurradius])
528 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 529 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529#endif 530#endif
530 if (ISSET_PIXCOLOR (Color_tint)) 531 if (ISSET_PIXCOLOR (Color_tint))
531 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 532 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
533
532 if (rs [Rs_shade]) 534 if (rs [Rs_shade])
533 bgPixmap.set_shade (rs [Rs_shade]); 535 bgPixmap.set_shade (rs [Rs_shade]);
534 536
535 bgPixmap.set_root_pixmap (); 537 bgPixmap.set_root_pixmap ();
536 XSelectInput (dpy, display->root, PropertyChangeMask); 538 XSelectInput (dpy, display->root, PropertyChangeMask);
537 rootwin_ev.start (display, display->root); 539 rootwin_ev.start (display, display->root);
538 } 540 }
539#endif 541#endif
540 542
541#ifdef BG_IMAGE_FROM_FILE 543#ifdef BG_IMAGE_FROM_FILE
542 if (rs[Rs_backgroundPixmap] != NULL) 544 if (rs[Rs_backgroundPixmap])
543 { 545 {
544 const char *p = rs[Rs_backgroundPixmap]; 546 const char *p = rs[Rs_backgroundPixmap];
545 547
546 if ((p = strchr (p, ';')) != NULL) 548 if ((p = strchr (p, ';')) != 0)
547 { 549 {
548 p++; 550 p++;
549 bgPixmap.set_geometry (p); 551 bgPixmap.set_geometry (p);
550 } 552 }
551 else 553 else
… …
570 free (cmd_argv); 572 free (cmd_argv);
571 573
572 if (pty->pty >= 0) 574 if (pty->pty >= 0)
573 pty_ev.start (pty->pty, ev::READ); 575 pty_ev.start (pty->pty, ev::READ);
574 576
575 prepare_ev.start ();
576
577 HOOK_INVOKE ((this, HOOK_START, DT_END)); 577 HOOK_INVOKE ((this, HOOK_START, DT_END));
578 578
579#if ENABLE_XEMBED 579#if ENABLE_XEMBED
580 if (rs[Rs_embed]) 580 if (rs[Rs_embed])
581 { 581 {
… …
586 } 586 }
587#endif 587#endif
588 588
589 XMapWindow (dpy, vt); 589 XMapWindow (dpy, vt);
590 XMapWindow (dpy, parent[0]); 590 XMapWindow (dpy, parent[0]);
591
592 return true;
593} 591}
594 592
595static struct sig_handlers 593static struct sig_handlers
596{ 594{
597 ev::sig sw_term, sw_int; 595 ev::sig sw_term, sw_int;
598 596
599 /* 597 /*
600 * Catch a fatal signal and tidy up before quitting 598 * Catch a fatal signal and tidy up before quitting
601 */ 599 */
602 void
603 sig_term (ev::sig &w, int revents) 600 void sig_term (ev::sig &w, int revents);
601
602 sig_handlers ()
604 { 603 {
605 rxvt_emergency_cleanup (); 604 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
606 w.stop ();
607 kill (getpid (), w.signum);
608 }
609
610 sig_handlers ()
611 : sw_term (this, &sig_handlers::sig_term),
612 sw_int (this, &sig_handlers::sig_term) 605 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
613 {
614 } 606 }
615} sig_handlers; 607} sig_handlers;
616 608
609void
610sig_handlers::sig_term (ev::sig &w, int revents)
611{
612 rxvt_emergency_cleanup ();
613 w.stop ();
614 kill (getpid (), w.signum);
615}
616
617char **rxvt_environ; // startup environment 617char **rxvt_environ; // startup environment
618 618
619void 619void
620rxvt_init () 620rxvt_init ()
621{ 621{
622 ptytty::init (); 622 ptytty::init ();
623 623
624 if (!ev::ev_default_loop (0)) 624 if (!ev_default_loop (0))
625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
626 626
627 rxvt_environ = environ; 627 rxvt_environ = environ;
628 628
629 signal (SIGHUP, SIG_IGN); 629 signal (SIGHUP, SIG_IGN);
630 signal (SIGPIPE, SIG_IGN); 630 signal (SIGPIPE, SIG_IGN);
631 631
632 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 632 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
633 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 633 sig_handlers.sw_int.start (SIGINT); ev_unref ();
634 634
635 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 635 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
636 /* signal (SIGURG, SIG_DFL); */ 636 /* signal (SIGURG, SIG_DFL); */
637 637
638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
639 // TODO: handle this with exceptions and tolerate the memory loss 639 // TODO: handle this with exceptions and tolerate the memory loss
640 XSetIOErrorHandler (rxvt_xioerror_handler); 640 XSetIOErrorHandler (rxvt_xioerror_handler);
641 641
642 XrmInitialize (); 642 XrmInitialize ();
643}
644
645/* ------------------------------------------------------------------------- *
646 * MEMORY ALLOCATION WRAPPERS *
647 * ------------------------------------------------------------------------- */
648void *
649rxvt_malloc (size_t size)
650{
651 void *p = malloc (size);
652
653 if (!p)
654 rxvt_fatal ("memory allocation failure. aborting.\n");
655
656 return p;
657}
658
659void *
660rxvt_calloc (size_t number, size_t size)
661{
662 void *p = calloc (number, size);
663
664 if (!p)
665 rxvt_fatal ("memory allocation failure. aborting.\n");
666
667 return p;
668}
669
670void *
671rxvt_realloc (void *ptr, size_t size)
672{
673 void *p = realloc (ptr, size);
674
675 if (!p)
676 rxvt_fatal ("memory allocation failure. aborting.\n");
677
678 return p;
679} 643}
680 644
681/*----------------------------------------------------------------------*/ 645/*----------------------------------------------------------------------*/
682/* 646/*
683 * window size/position calculations for XSizeHint and other storage. 647 * window size/position calculations for XSizeHint and other storage.
… …
824 ws.ws_xpixel = width; 788 ws.ws_xpixel = width;
825 ws.ws_ypixel = height; 789 ws.ws_ypixel = height;
826 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 790 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
827 791
828#if 0 792#if 0
829 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 793 // TIOCSWINSZ is supposed to do this automatically and correctly
830 if (cmd_pid) /* force through to the command */ 794 if (cmd_pid) /* force through to the command */
831 kill (-cmd_pid, SIGWINCH); 795 kill (-cmd_pid, SIGWINCH);
832#endif 796#endif
833} 797}
834 798
… …
976 if (isdigit (*color)) 940 if (isdigit (*color))
977 { 941 {
978 i = atoi (color); 942 i = atoi (color);
979 943
980 if (i >= 8 && i <= 15) 944 if (i >= 8 && i <= 15)
945 {
981 { /* bright colors */ 946 /* bright colors */
982 i -= 8;
983 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 947 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
984 goto done; 948 goto done;
985 } 949 }
986 950
987 if (i >= 0 && i <= 7) 951 if (i >= 0 && i <= 7)
952 {
988 { /* normal colors */ 953 /* normal colors */
989 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 954 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
990 goto done; 955 goto done;
991 } 956 }
992 } 957 }
993 958
… …
998 * so just keep gobbling up the colormap 963 * so just keep gobbling up the colormap
999 */ 964 */
1000 965
1001 pix_colors_focused[idx] = xcol; 966 pix_colors_focused[idx] = xcol;
1002 967
1003 /* XSetWindowAttributes attr; */
1004 /* Cursor cursor; */
1005done: 968done:
1006 /*TODO: handle Color_BD, scrollbar background, etc. */ 969 /*TODO: handle Color_BD, scrollbar background, etc. */
1007 970
1008 update_fade_color (idx); 971 update_fade_color (idx);
1009 recolour_cursor (); 972 recolour_cursor ();
… …
1033 */ 996 */
1034void 997void
1035rxvt_term::set_colorfgbg () 998rxvt_term::set_colorfgbg ()
1036{ 999{
1037 unsigned int i; 1000 unsigned int i;
1038 const char *xpmb = "\0"; 1001 const char *xpmb = "";
1039 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1002 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1040 1003
1041 strcpy (fstr, "default"); 1004 strcpy (fstr, "default");
1042 strcpy (bstr, "default"); 1005 strcpy (bstr, "default");
1043 for (i = Color_Black; i <= Color_White; i++) 1006 for (i = Color_Black; i <= Color_White; i++)
… …
1716void 1679void
1717rxvt_term::get_window_origin (int &x, int &y) 1680rxvt_term::get_window_origin (int &x, int &y)
1718{ 1681{
1719 Window cr; 1682 Window cr;
1720 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1683 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1721/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1684/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1722} 1685}
1723 1686
1724Pixmap 1687Pixmap
1725rxvt_term::get_pixmap_property (int prop_id) 1688rxvt_term::get_pixmap_property (int prop_id)
1726{ 1689{
… …
1743} 1706}
1744 1707
1745#ifdef HAVE_BG_PIXMAP 1708#ifdef HAVE_BG_PIXMAP
1746# if TRACE_PIXMAPS 1709# if TRACE_PIXMAPS
1747# undef update_background 1710# undef update_background
1711void
1748int rxvt_term::trace_update_background (const char* file, int line) 1712rxvt_term::trace_update_background (const char *file, int line)
1749{ 1713{
1750 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1714 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1751 update_background (); 1715 update_background ();
1752} 1716}
1753# endif 1717# endif
1754int 1718
1719void
1755rxvt_term::update_background () 1720rxvt_term::update_background ()
1756{ 1721{
1757 bgPixmap.invalidate (); 1722 bgPixmap.invalidate ();
1758 1723
1759 /* no chance of real time refresh if we are blurring! */ 1724 /* no chance of real time refresh if we are blurring! */
1760 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1725 if (bgPixmap.invalid_since + 0.50 < ev::now ()
1726 && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1727 {
1728 update_background_ev.stop ();
1761 bgPixmap.render (); 1729 bgPixmap.render ();
1730 }
1762 else 1731 else
1763 { 1732 {
1764 update_background_ev.stop (); 1733 ev_tstamp refresh;
1765 1734
1766 if (!bgPixmap.need_client_side_rendering()) 1735 if (!bgPixmap.need_client_side_rendering ())
1767 update_background_ev.start (.05); 1736 refresh = .05;
1768 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1737 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1769 update_background_ev.start (.20); /* very slow !!! */ 1738 refresh = .20; /* very slow !!! */
1770 else 1739 else
1740 refresh = .07;
1741
1771 update_background_ev.start (.07); 1742 update_background_ev.start (refresh);
1772 } 1743 }
1773
1774 return 0;
1775} 1744}
1776 1745
1777void 1746void
1778rxvt_term::update_background_cb (ev::timer &w, int revents) 1747rxvt_term::update_background_cb (ev::timer &w, int revents)
1779{ 1748{
1749 make_current ();
1780 bgPixmap.render (); 1750 bgPixmap.render ();
1751 refresh_check ();
1781} 1752}
1782 1753
1783#endif /* HAVE_BG_PIXMAP */ 1754#endif /* HAVE_BG_PIXMAP */
1784 1755
1785/*----------------------- end-of-file (C source) -----------------------*/ 1756/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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