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.151 by root, Wed Dec 21 19:50:16 2005 UTC vs.
Revision 1.160 by root, Wed Jan 4 05:35:34 2006 UTC

… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "keyboard.h"
36#include "rxvtperl.h"
35 37
36#include <limits> 38#include <limits>
37 39
38#include <csignal> 40#include <csignal>
39#include <cstring> 41#include <cstring>
… …
44 46
45#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
46# include <termios.h> 48# include <termios.h>
47#endif 49#endif
48 50
49#ifdef KEYSYM_RESOURCE
50# include "keyboard.h"
51#endif
52
53vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
54 52
55static char curlocale[128]; 53static char curlocale[128], savelocale[128];
56 54
57bool 55bool
58rxvt_set_locale (const char *locale) 56rxvt_set_locale (const char *locale)
59{ 57{
60 if (!locale || !strncmp (locale, curlocale, 128)) 58 if (!locale || !strncmp (locale, curlocale, 128))
61 return false; 59 return false;
62 60
63 strncpy (curlocale, locale, 128); 61 strncpy (curlocale, locale, 128);
64 setlocale (LC_CTYPE, curlocale); 62 setlocale (LC_CTYPE, curlocale);
65 return true; 63 return true;
64}
65
66bool
67rxvt_push_locale (const char *locale)
68{
69 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale);
71}
72
73void
74rxvt_pop_locale ()
75{
76 rxvt_set_locale (savelocale);
66} 77}
67 78
68#if ENABLE_COMBINING 79#if ENABLE_COMBINING
69class rxvt_composite_vec rxvt_composite; 80class rxvt_composite_vec rxvt_composite;
70 81
… …
195 pty.put (); 206 pty.put ();
196} 207}
197 208
198rxvt_term::~rxvt_term () 209rxvt_term::~rxvt_term ()
199{ 210{
211 PERL_INVOKE ((this, HOOK_DESTROY, DT_END));
212
200 termlist.erase (find (termlist.begin (), termlist.end(), this)); 213 termlist.erase (find (termlist.begin (), termlist.end(), this));
201 214
202 emergency_cleanup (); 215 emergency_cleanup ();
203 216
204#if ENABLE_STYLES 217#if ENABLE_STYLES
… …
286 delete argv; 299 delete argv;
287 300
288#ifdef KEYSYM_RESOURCE 301#ifdef KEYSYM_RESOURCE
289 delete keyboard; 302 delete keyboard;
290#endif 303#endif
304}
305
306void
307rxvt_term::child_exit ()
308{
309 cmd_pid = 0;
310
311 if (!OPTION (Opt_hold))
312 destroy ();
291} 313}
292 314
293void 315void
294rxvt_term::destroy () 316rxvt_term::destroy ()
295{ 317{
… …
460 482
461#if MENUBAR_MAX 483#if MENUBAR_MAX
462 menubar_read (rs[Rs_menu]); 484 menubar_read (rs[Rs_menu]);
463#endif 485#endif
464#ifdef HAVE_SCROLLBARS 486#ifdef HAVE_SCROLLBARS
465 if (options & Opt_scrollBar) 487 if (OPTION (Opt_scrollBar))
466 scrollBar.setIdle (); /* set existence for size calculations */ 488 scrollBar.setIdle (); /* set existence for size calculations */
489#endif
490
491#if ENABLE_PERL
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 {
496 rxvt_perl.init ();
497 PERL_INVOKE ((this, HOOK_INIT, DT_END));
498 }
467#endif 499#endif
468 500
469 create_windows (argc, argv); 501 create_windows (argc, argv);
470 502
471 dDisp; 503 dDisp;
… …
477#if 0 509#if 0
478 XSynchronize (disp, True); 510 XSynchronize (disp, True);
479#endif 511#endif
480 512
481#ifdef HAVE_SCROLLBARS 513#ifdef HAVE_SCROLLBARS
482 if (options & Opt_scrollBar) 514 if (OPTION (Opt_scrollBar))
483 resize_scrollbar (); /* create and map scrollbar */ 515 resize_scrollbar (); /* create and map scrollbar */
484#endif 516#endif
485#if (MENUBAR_MAX) 517#if (MENUBAR_MAX)
486 if (menubar_visible ()) 518 if (menubar_visible ())
487 XMapWindow (disp, menuBar.win); 519 XMapWindow (disp, menuBar.win);
488#endif 520#endif
489#ifdef TRANSPARENT 521#ifdef TRANSPARENT
490 if (options & Opt_transparent) 522 if (OPTION (Opt_transparent))
491 { 523 {
492 XSelectInput (disp, display->root, PropertyChangeMask); 524 XSelectInput (disp, display->root, PropertyChangeMask);
493 check_our_parents (); 525 check_our_parents ();
494 rootwin_ev.start (display, display->root); 526 rootwin_ev.start (display, display->root);
495 } 527 }
… …
505 free (cmd_argv); 537 free (cmd_argv);
506 538
507 pty_ev.start (pty.pty, EVENT_READ); 539 pty_ev.start (pty.pty, EVENT_READ);
508 540
509 check_ev.start (); 541 check_ev.start ();
542
543 PERL_INVOKE ((this, HOOK_START, DT_END));
510 544
511 return true; 545 return true;
512} 546}
513 547
514static struct sig_handlers 548static struct sig_handlers
… …
522 556
523 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 557 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
524 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 558 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
525 if (pid == (*t)->cmd_pid) 559 if (pid == (*t)->cmd_pid)
526 { 560 {
527 (*t)->destroy (); 561 (*t)->child_exit ();
528 break; 562 break;
529 } 563 }
530 } 564 }
531 565
532 /* 566 /*
… …
672 706
673#ifdef UTMP_SUPPORT 707#ifdef UTMP_SUPPORT
674void 708void
675rxvt_term::privileged_utmp (rxvt_privaction action) 709rxvt_term::privileged_utmp (rxvt_privaction action)
676{ 710{
677 if ((options & Opt_utmpInhibit) 711 if (OPTION (Opt_utmpInhibit)
678 || !pty.name || !*pty.name) 712 || !pty.name || !*pty.name)
679 return; 713 return;
680 714
681 rxvt_privileges (RESTORE); 715 rxvt_privileges (RESTORE);
682 716
… …
774 808
775 if (scrollbar_visible ()) 809 if (scrollbar_visible ())
776 { 810 {
777 sb_w = scrollbar_TotalWidth (); 811 sb_w = scrollbar_TotalWidth ();
778 szHint.base_width += sb_w; 812 szHint.base_width += sb_w;
779 if (!(options & Opt_scrollBar_right)) 813 if (!OPTION (Opt_scrollBar_right))
780 window_vt_x += sb_w; 814 window_vt_x += sb_w;
781 } 815 }
782 816
783 if (menubar_visible ()) 817 if (menubar_visible ())
784 { 818 {
… …
812 { 846 {
813 min_it (height, max_height); 847 min_it (height, max_height);
814 szHint.height = szHint.base_height + height; 848 szHint.height = szHint.base_height + height;
815 } 849 }
816 850
817 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 851 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
818 window_sb_x = szHint.width - sb_w; 852 window_sb_x = szHint.width - sb_w;
819 853
820 if (recalc_x) 854 if (recalc_x)
821 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 855 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
822 if (recalc_y) 856 if (recalc_y)
… …
891 prop.height += lineSpace; 925 prop.height += lineSpace;
892 fs->set_prop (prop); 926 fs->set_prop (prop);
893 927
894 fwidth = prop.width; 928 fwidth = prop.width;
895 fheight = prop.height; 929 fheight = prop.height;
896 fbase = (*fs)[1]->ascent; 930 fbase = prop.ascent;
897 931
898 for (int style = 1; style < 4; style++) 932 for (int style = 1; style < 4; style++)
899 { 933 {
900#if ENABLE_STYLES 934#if ENABLE_STYLES
901 const char *res = rs[Rs_font + style]; 935 const char *res = rs[Rs_font + style];
… …
935 return true; 969 return true;
936} 970}
937 971
938void rxvt_term::set_string_property (Atom prop, const char *str, int len) 972void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939{ 973{
940 // TODO: SMART_WINDOW_TITLE
941 XChangeProperty (display->display, parent[0], 974 XChangeProperty (display->display, parent[0],
942 prop, XA_STRING, 8, PropModeReplace, 975 prop, XA_STRING, 8, PropModeReplace,
943 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 976 (const unsigned char *)str, len >= 0 ? len : strlen (str));
944} 977}
945 978
946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 979void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947{ 980{
948 // TODO: SMART_WINDOW_TITLE
949 wchar_t *ws = rxvt_mbstowcs (str, len); 981 wchar_t *ws = rxvt_mbstowcs (str, len);
950 char *s = rxvt_wcstoutf8 (ws); 982 char *s = rxvt_wcstoutf8 (ws);
951 983
952 XChangeProperty (display->display, parent[0], 984 XChangeProperty (display->display, parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 985 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
… …
1192 } 1224 }
1193 1225
1194 if (menubar_visible ()) 1226 if (menubar_visible ())
1195 XMoveResizeWindow (disp, menuBar.win, 1227 XMoveResizeWindow (disp, menuBar.win,
1196 window_vt_x, 0, 1228 window_vt_x, 0,
1197 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1229 width, menuBar_TotalHeight ());
1198 1230
1199 XMoveResizeWindow (disp, vt, 1231 XMoveResizeWindow (disp, vt,
1200 window_vt_x, window_vt_y, 1232 window_vt_x, window_vt_y,
1201 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1233 width, height);
1202 1234
1203 scr_clear (); 1235 scr_clear ();
1204#ifdef XPM_BACKGROUND 1236#ifdef XPM_BACKGROUND
1205 resize_pixmap (); 1237 resize_pixmap ();
1206#endif 1238#endif

Diff Legend

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