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.278 by ayin, Tue Dec 11 21:52:23 2007 UTC

… …
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 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
193 child_ev (this, &rxvt_term::child_cb), 191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
194 prepare_ev (this, &rxvt_term::prepare_cb), 192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
195 flush_ev (this, &rxvt_term::flush_cb), 193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
196 destroy_ev (this, &rxvt_term::destroy_cb), 194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
197 pty_ev (this, &rxvt_term::pty_cb), 195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198 incr_ev (this, &rxvt_term::incr_cb) 196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
199{ 197
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 199
202 termlist.push_back (this); 200 termlist.push_back (this);
203 201
204#ifdef KEYSYM_RESOURCE 202#ifdef KEYSYM_RESOURCE
… …
284 delete [] pix_colors_focused; 282 delete [] pix_colors_focused;
285#if OFF_FOCUS_FADING 283#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused; 284 delete [] pix_colors_unfocused;
287#endif 285#endif
288 286
287#ifdef HAVE_BG_PIXMAP
288 bgPixmap.destroy ();
289#endif
289 displays.put (display); 290 displays.put (display);
290 291
291 scr_release (); 292 scr_release ();
292 293
293 /* clear all resources */ 294 /* clear all resources */
… …
306 delete argv; 307 delete argv;
307 308
308#ifdef KEYSYM_RESOURCE 309#ifdef KEYSYM_RESOURCE
309 delete keyboard; 310 delete keyboard;
310#endif 311#endif
312#ifndef NO_RESOURCES
313 XrmDestroyDatabase (option_db);
314#endif
311} 315}
312 316
313// child has exited, usually destroys 317// child has exited, usually destroys
314void 318void
315rxvt_term::child_cb (ev::child &w, int status) 319rxvt_term::child_cb (ev::child &w, int status)
… …
323} 327}
324 328
325void 329void
326rxvt_term::destroy () 330rxvt_term::destroy ()
327{ 331{
328 if (destroy_ev.active) 332 if (ev_is_active (&destroy_ev))
329 return; 333 return;
330 334
331 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
332 336
333#if ENABLE_OVERLAY 337#if ENABLE_OVERLAY
… …
370 374
371 destroy_ev.start (); 375 destroy_ev.start ();
372} 376}
373 377
374void 378void
375rxvt_term::destroy_cb (ev::check &w, int revents) 379rxvt_term::destroy_cb (ev::idle &w, int revents)
376{ 380{
377 make_current (); 381 make_current ();
378 382
379 delete this; 383 delete this;
380} 384}
… …
594 ev::sig sw_term, sw_int; 598 ev::sig sw_term, sw_int;
595 599
596 /* 600 /*
597 * Catch a fatal signal and tidy up before quitting 601 * Catch a fatal signal and tidy up before quitting
598 */ 602 */
599 void
600 sig_term (ev::sig &w, int revents) 603 void sig_term (ev::sig &w, int revents);
604
605 sig_handlers ()
601 { 606 {
602 rxvt_emergency_cleanup (); 607 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) 608 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
610 {
611 } 609 }
612} sig_handlers; 610} sig_handlers;
613 611
612void
613sig_handlers::sig_term (ev::sig &w, int revents)
614{
615 rxvt_emergency_cleanup ();
616 w.stop ();
617 kill (getpid (), w.signum);
618}
619
614char **rxvt_environ; // startup environment 620char **rxvt_environ; // startup environment
615 621
616void 622void
617rxvt_init () 623rxvt_init ()
618{ 624{
619 ptytty::init (); 625 ptytty::init ();
620 626
621 if (!ev::ev_default_loop (0)) 627 if (!ev_default_loop (0))
622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
623 629
624 rxvt_environ = environ; 630 rxvt_environ = environ;
625 631
626 signal (SIGHUP, SIG_IGN); 632 signal (SIGHUP, SIG_IGN);
627 signal (SIGPIPE, SIG_IGN); 633 signal (SIGPIPE, SIG_IGN);
628 634
629 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 635 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
630 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 636 sig_handlers.sw_int.start (SIGINT); ev_unref ();
631 637
632 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
633 /* signal (SIGURG, SIG_DFL); */ 639 /* signal (SIGURG, SIG_DFL); */
634 640
635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
821 ws.ws_xpixel = width; 827 ws.ws_xpixel = width;
822 ws.ws_ypixel = height; 828 ws.ws_ypixel = height;
823 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 829 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
824 830
825#if 0 831#if 0
826 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 832 // TIOCSWINSZ is supposed to do this automatically and correctly
827 if (cmd_pid) /* force through to the command */ 833 if (cmd_pid) /* force through to the command */
828 kill (-cmd_pid, SIGWINCH); 834 kill (-cmd_pid, SIGWINCH);
829#endif 835#endif
830} 836}
831 837
… …
973 if (isdigit (*color)) 979 if (isdigit (*color))
974 { 980 {
975 i = atoi (color); 981 i = atoi (color);
976 982
977 if (i >= 8 && i <= 15) 983 if (i >= 8 && i <= 15)
984 {
978 { /* bright colors */ 985 /* bright colors */
979 i -= 8;
980 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
981 goto done; 987 goto done;
982 } 988 }
983 989
984 if (i >= 0 && i <= 7) 990 if (i >= 0 && i <= 7)
991 {
985 { /* normal colors */ 992 /* normal colors */
986 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 993 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
987 goto done; 994 goto done;
988 } 995 }
989 } 996 }
990 997
… …
995 * so just keep gobbling up the colormap 1002 * so just keep gobbling up the colormap
996 */ 1003 */
997 1004
998 pix_colors_focused[idx] = xcol; 1005 pix_colors_focused[idx] = xcol;
999 1006
1000 /* XSetWindowAttributes attr; */
1001 /* Cursor cursor; */
1002done: 1007done:
1003 /*TODO: handle Color_BD, scrollbar background, etc. */ 1008 /*TODO: handle Color_BD, scrollbar background, etc. */
1004 1009
1005 update_fade_color (idx); 1010 update_fade_color (idx);
1006 recolour_cursor (); 1011 recolour_cursor ();
1007 scr_recolour (); 1012 scr_recolour ();
1008#endif /* XTERM_COLOR_CHANGE */ 1013#endif /* XTERM_COLOR_CHANGE */
1009} 1014}
1010 1015
1011void 1016void
1012rxvt_term::recolour_cursor () 1017rxvt_term::recolour_cursor ()
1013{ 1018{
… …
1030 */ 1035 */
1031void 1036void
1032rxvt_term::set_colorfgbg () 1037rxvt_term::set_colorfgbg ()
1033{ 1038{
1034 unsigned int i; 1039 unsigned int i;
1035 const char *xpmb = "\0"; 1040 const char *xpmb = "";
1036 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1041 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1037 1042
1038 strcpy (fstr, "default"); 1043 strcpy (fstr, "default");
1039 strcpy (bstr, "default"); 1044 strcpy (bstr, "default");
1040 for (i = Color_Black; i <= Color_White; i++) 1045 for (i = Color_Black; i <= Color_White; i++)
… …
1706 XFree (status_attr); 1711 XFree (status_attr);
1707 } 1712 }
1708 1713
1709 XFree (preedit_attr); 1714 XFree (preedit_attr);
1710} 1715}
1711#endif /* USE_XIM */ 1716#endif /* USE_XIM */
1712 1717
1713void 1718void
1714rxvt_term::get_window_origin (int &x, int &y) 1719rxvt_term::get_window_origin (int &x, int &y)
1715{ 1720{
1716 Window cr; 1721 Window cr;
… …
1738 } 1743 }
1739 return None; 1744 return None;
1740} 1745}
1741 1746
1742#ifdef HAVE_BG_PIXMAP 1747#ifdef HAVE_BG_PIXMAP
1748# if TRACE_PIXMAPS
1749# undef update_background
1750int rxvt_term::trace_update_background (const char *file, int line)
1751{
1752 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1753 update_background ();
1754}
1755# endif
1756
1743int 1757int
1744rxvt_term::update_background () 1758rxvt_term::update_background ()
1745{ 1759{
1746 bgPixmap.invalidate (); 1760 bgPixmap.invalidate ();
1747 1761

Diff Legend

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