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.257 by root, Sun Nov 11 17:10:45 2007 UTC vs.
Revision 1.285 by root, Fri Dec 14 06:32:38 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::x_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
… …
284 delete [] pix_colors_focused; 281 delete [] pix_colors_focused;
285#if OFF_FOCUS_FADING 282#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused; 283 delete [] pix_colors_unfocused;
287#endif 284#endif
288 285
286#ifdef HAVE_BG_PIXMAP
287 bgPixmap.destroy ();
288#endif
289 displays.put (display); 289 displays.put (display);
290 290
291 scr_release (); 291 scr_release ();
292 292
293 /* clear all resources */ 293 /* clear all resources */
… …
306 delete argv; 306 delete argv;
307 307
308#ifdef KEYSYM_RESOURCE 308#ifdef KEYSYM_RESOURCE
309 delete keyboard; 309 delete keyboard;
310#endif 310#endif
311#ifndef NO_RESOURCES
312 XrmDestroyDatabase (option_db);
313#endif
311} 314}
312 315
313// child has exited, usually destroys 316// child has exited, usually destroys
314void 317void
315rxvt_term::child_cb (ev::child &w, int status) 318rxvt_term::child_cb (ev::child &w, int status)
… …
323} 326}
324 327
325void 328void
326rxvt_term::destroy () 329rxvt_term::destroy ()
327{ 330{
328 if (destroy_ev.active) 331 if (destroy_ev.is_active ())
329 return; 332 return;
330 333
331 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 334 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
332 335
333#if ENABLE_OVERLAY 336#if ENABLE_OVERLAY
… …
348 incr_ev.stop (); 351 incr_ev.stop ();
349 termwin_ev.stop (display); 352 termwin_ev.stop (display);
350 vt_ev.stop (display); 353 vt_ev.stop (display);
351 } 354 }
352 355
353 prepare_ev.stop (); 356 flush_ev.stop ();
354 pty_ev.stop (); 357 pty_ev.stop ();
355#ifdef CURSOR_BLINK 358#ifdef CURSOR_BLINK
356 cursor_blink_ev.stop (); 359 cursor_blink_ev.stop ();
357#endif 360#endif
358#ifdef TEXT_BLINK 361#ifdef TEXT_BLINK
… …
370 373
371 destroy_ev.start (); 374 destroy_ev.start ();
372} 375}
373 376
374void 377void
375rxvt_term::destroy_cb (ev::check &w, int revents) 378rxvt_term::destroy_cb (ev::idle &w, int revents)
376{ 379{
377 make_current (); 380 make_current ();
378 381
379 delete this; 382 delete this;
380} 383}
… …
469 rxvt_emergency_cleanup (); 472 rxvt_emergency_cleanup ();
470 _exit (EXIT_FAILURE); 473 _exit (EXIT_FAILURE);
471} 474}
472 475
473/*----------------------------------------------------------------------*/ 476/*----------------------------------------------------------------------*/
474bool 477void
475rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 478rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
476{ 479{
477 this->envv = envv; 480 this->envv = envv;
478 481
479 SET_R (this); 482 SET_R (this);
480 set_locale (""); 483 set_locale ("");
481 set_environ (envv); // few things in X do not call setlocale :( 484 set_environ (envv); // few things in X do not call setlocale :(
482 485
483 if (!init_vars ()) 486 init_vars ();
484 return false;
485 487
486 init_secondary (); 488 init_secondary ();
487 489
488 const char **cmd_argv = init_resources (argc, argv); 490 const char **cmd_argv = init_resources (argc, argv);
489 491
… …
567 free (cmd_argv); 569 free (cmd_argv);
568 570
569 if (pty->pty >= 0) 571 if (pty->pty >= 0)
570 pty_ev.start (pty->pty, ev::READ); 572 pty_ev.start (pty->pty, ev::READ);
571 573
572 prepare_ev.start ();
573
574 HOOK_INVOKE ((this, HOOK_START, DT_END)); 574 HOOK_INVOKE ((this, HOOK_START, DT_END));
575 575
576#if ENABLE_XEMBED 576#if ENABLE_XEMBED
577 if (rs[Rs_embed]) 577 if (rs[Rs_embed])
578 { 578 {
… …
583 } 583 }
584#endif 584#endif
585 585
586 XMapWindow (dpy, vt); 586 XMapWindow (dpy, vt);
587 XMapWindow (dpy, parent[0]); 587 XMapWindow (dpy, parent[0]);
588
589 return true;
590} 588}
591 589
592static struct sig_handlers 590static struct sig_handlers
593{ 591{
594 ev::sig sw_term, sw_int; 592 ev::sig sw_term, sw_int;
595 593
596 /* 594 /*
597 * Catch a fatal signal and tidy up before quitting 595 * Catch a fatal signal and tidy up before quitting
598 */ 596 */
599 void
600 sig_term (ev::sig &w, int revents) 597 void sig_term (ev::sig &w, int revents);
598
599 sig_handlers ()
601 { 600 {
602 rxvt_emergency_cleanup (); 601 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
603 w.stop ();
604 kill (getpid (), w.signum);
605 }
606
607 sig_handlers ()
608 : sw_term (this, &sig_handlers::sig_term),
609 sw_int (this, &sig_handlers::sig_term) 602 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
610 {
611 } 603 }
612} sig_handlers; 604} sig_handlers;
613 605
606void
607sig_handlers::sig_term (ev::sig &w, int revents)
608{
609 rxvt_emergency_cleanup ();
610 w.stop ();
611 kill (getpid (), w.signum);
612}
613
614char **rxvt_environ; // startup environment 614char **rxvt_environ; // startup environment
615 615
616void 616void
617rxvt_init () 617rxvt_init ()
618{ 618{
619 ptytty::init (); 619 ptytty::init ();
620 620
621 if (!ev::ev_default_loop (0)) 621 if (!ev_default_loop (0))
622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
623 623
624 rxvt_environ = environ; 624 rxvt_environ = environ;
625 625
626 signal (SIGHUP, SIG_IGN); 626 signal (SIGHUP, SIG_IGN);
627 signal (SIGPIPE, SIG_IGN); 627 signal (SIGPIPE, SIG_IGN);
628 628
629 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 629 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
630 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 630 sig_handlers.sw_int.start (SIGINT); ev_unref ();
631 631
632 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 632 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
633 /* signal (SIGURG, SIG_DFL); */ 633 /* signal (SIGURG, SIG_DFL); */
634 634
635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
821 ws.ws_xpixel = width; 821 ws.ws_xpixel = width;
822 ws.ws_ypixel = height; 822 ws.ws_ypixel = height;
823 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 823 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
824 824
825#if 0 825#if 0
826 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 826 // TIOCSWINSZ is supposed to do this automatically and correctly
827 if (cmd_pid) /* force through to the command */ 827 if (cmd_pid) /* force through to the command */
828 kill (-cmd_pid, SIGWINCH); 828 kill (-cmd_pid, SIGWINCH);
829#endif 829#endif
830} 830}
831 831
… …
973 if (isdigit (*color)) 973 if (isdigit (*color))
974 { 974 {
975 i = atoi (color); 975 i = atoi (color);
976 976
977 if (i >= 8 && i <= 15) 977 if (i >= 8 && i <= 15)
978 {
978 { /* bright colors */ 979 /* bright colors */
979 i -= 8;
980 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 980 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
981 goto done; 981 goto done;
982 } 982 }
983 983
984 if (i >= 0 && i <= 7) 984 if (i >= 0 && i <= 7)
985 {
985 { /* normal colors */ 986 /* normal colors */
986 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 987 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
987 goto done; 988 goto done;
988 } 989 }
989 } 990 }
990 991
… …
995 * so just keep gobbling up the colormap 996 * so just keep gobbling up the colormap
996 */ 997 */
997 998
998 pix_colors_focused[idx] = xcol; 999 pix_colors_focused[idx] = xcol;
999 1000
1000 /* XSetWindowAttributes attr; */
1001 /* Cursor cursor; */
1002done: 1001done:
1003 /*TODO: handle Color_BD, scrollbar background, etc. */ 1002 /*TODO: handle Color_BD, scrollbar background, etc. */
1004 1003
1005 update_fade_color (idx); 1004 update_fade_color (idx);
1006 recolour_cursor (); 1005 recolour_cursor ();
1007 scr_recolour (); 1006 scr_recolour ();
1008#endif /* XTERM_COLOR_CHANGE */ 1007#endif /* XTERM_COLOR_CHANGE */
1009} 1008}
1010 1009
1011void 1010void
1012rxvt_term::recolour_cursor () 1011rxvt_term::recolour_cursor ()
1013{ 1012{
… …
1030 */ 1029 */
1031void 1030void
1032rxvt_term::set_colorfgbg () 1031rxvt_term::set_colorfgbg ()
1033{ 1032{
1034 unsigned int i; 1033 unsigned int i;
1035 const char *xpmb = "\0"; 1034 const char *xpmb = "";
1036 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1035 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1037 1036
1038 strcpy (fstr, "default"); 1037 strcpy (fstr, "default");
1039 strcpy (bstr, "default"); 1038 strcpy (bstr, "default");
1040 for (i = Color_Black; i <= Color_White; i++) 1039 for (i = Color_Black; i <= Color_White; i++)
… …
1706 XFree (status_attr); 1705 XFree (status_attr);
1707 } 1706 }
1708 1707
1709 XFree (preedit_attr); 1708 XFree (preedit_attr);
1710} 1709}
1711#endif /* USE_XIM */ 1710#endif /* USE_XIM */
1712 1711
1713void 1712void
1714rxvt_term::get_window_origin (int &x, int &y) 1713rxvt_term::get_window_origin (int &x, int &y)
1715{ 1714{
1716 Window cr; 1715 Window cr;
… …
1738 } 1737 }
1739 return None; 1738 return None;
1740} 1739}
1741 1740
1742#ifdef HAVE_BG_PIXMAP 1741#ifdef HAVE_BG_PIXMAP
1742# if TRACE_PIXMAPS
1743# undef update_background
1744int rxvt_term::trace_update_background (const char *file, int line)
1745{
1746 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1747 update_background ();
1748}
1749# endif
1750
1743int 1751int
1744rxvt_term::update_background () 1752rxvt_term::update_background ()
1745{ 1753{
1746 bgPixmap.invalidate (); 1754 bgPixmap.invalidate ();
1747 1755
… …
1750 bgPixmap.render (); 1758 bgPixmap.render ();
1751 else 1759 else
1752 { 1760 {
1753 update_background_ev.stop (); 1761 update_background_ev.stop ();
1754 1762
1755 if (!bgPixmap.need_client_side_rendering()) 1763 if (!bgPixmap.need_client_side_rendering ())
1756 update_background_ev.start (.05); 1764 update_background_ev.start (.05);
1757 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1765 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1758 update_background_ev.start (.20); /* very slow !!! */ 1766 update_background_ev.start (.20); /* very slow !!! */
1759 else 1767 else
1760 update_background_ev.start (.07); 1768 update_background_ev.start (.07);
… …
1764} 1772}
1765 1773
1766void 1774void
1767rxvt_term::update_background_cb (ev::timer &w, int revents) 1775rxvt_term::update_background_cb (ev::timer &w, int revents)
1768{ 1776{
1777 make_current ();
1769 bgPixmap.render (); 1778 bgPixmap.render ();
1779 refresh_check ();
1770} 1780}
1771 1781
1772#endif /* HAVE_BG_PIXMAP */ 1782#endif /* HAVE_BG_PIXMAP */
1773 1783
1774/*----------------------- end-of-file (C source) -----------------------*/ 1784/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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