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.177 by root, Mon Jan 16 06:37:52 2006 UTC vs.
Revision 1.186 by root, Tue Jan 17 15:41:33 2006 UTC

… …
89rxvt_pop_locale () 89rxvt_pop_locale ()
90{ 90{
91 rxvt_set_locale (savelocale); 91 rxvt_set_locale (savelocale);
92} 92}
93 93
94void
95rxvt_term::make_current () const
96{
97 SET_R (this);
98 rxvt_set_locale (locale);
99 set_environ (envv);
100}
101
102#if ENABLE_COMBINING 94#if ENABLE_COMBINING
103class rxvt_composite_vec rxvt_composite; 95class rxvt_composite_vec rxvt_composite;
104 96
105text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 97text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
106{ 98{
… …
168#if TRANSPARENT 160#if TRANSPARENT
169 rootwin_ev (this, &rxvt_term::rootwin_cb), 161 rootwin_ev (this, &rxvt_term::rootwin_cb),
170#endif 162#endif
171#ifdef HAVE_SCROLLBARS 163#ifdef HAVE_SCROLLBARS
172 scrollbar_ev (this, &rxvt_term::x_cb), 164 scrollbar_ev (this, &rxvt_term::x_cb),
173#endif
174#ifdef MENUBAR
175 menubar_ev (this, &rxvt_term::x_cb),
176#endif 165#endif
177#ifdef CURSOR_BLINK 166#ifdef CURSOR_BLINK
178 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 167 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
179#endif 168#endif
180#ifdef TEXT_BLINK 169#ifdef TEXT_BLINK
… …
220void rxvt_term::emergency_cleanup () 209void rxvt_term::emergency_cleanup ()
221{ 210{
222 if (cmd_pid) 211 if (cmd_pid)
223 kill (-cmd_pid, SIGHUP); 212 kill (-cmd_pid, SIGHUP);
224 213
225#ifdef UTMP_SUPPORT 214 delete pty; pty = 0;
226 privileged_utmp (RESTORE);
227#endif
228
229 pty.put ();
230} 215}
231 216
232rxvt_term::~rxvt_term () 217rxvt_term::~rxvt_term ()
233{ 218{
234 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 219 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
… …
250 235
251 selection_clear (); 236 selection_clear ();
252 237
253#ifdef USE_XIM 238#ifdef USE_XIM
254 im_destroy (); 239 im_destroy ();
255#endif
256#ifdef MENUBAR
257 if (menubarGC) XFreeGC (disp, menubarGC);
258#endif 240#endif
259#ifdef XTERM_SCROLLBAR 241#ifdef XTERM_SCROLLBAR
260 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 242 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
261 if (ShadowGC) XFreeGC (disp, ShadowGC); 243 if (ShadowGC) XFreeGC (disp, ShadowGC);
262#endif 244#endif
… …
273 if (upArrow) XFreePixmap (disp, upArrow); 255 if (upArrow) XFreePixmap (disp, upArrow);
274 if (downArrow) XFreePixmap (disp, downArrow); 256 if (downArrow) XFreePixmap (disp, downArrow);
275 if (upArrowHi) XFreePixmap (disp, upArrowHi); 257 if (upArrowHi) XFreePixmap (disp, upArrowHi);
276 if (downArrowHi) XFreePixmap (disp, downArrowHi); 258 if (downArrowHi) XFreePixmap (disp, downArrowHi);
277#endif 259#endif
278#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 260#ifdef RXVT_SCROLLBAR
279 if (topShadowGC) XFreeGC (disp, topShadowGC); 261 if (topShadowGC) XFreeGC (disp, topShadowGC);
280 if (botShadowGC) XFreeGC (disp, botShadowGC); 262 if (botShadowGC) XFreeGC (disp, botShadowGC);
281 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 263 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
282#endif 264#endif
283 if (gc) XFreeGC (disp, gc); 265 if (gc) XFreeGC (disp, gc);
284 266
285#if defined(MENUBAR) && (MENUBAR_MAX > 1)
286 delete menuBar.drawable;
287 //if (menuBar.win)
288 // XDestroyWindow (disp, menuBar.win);
289#endif
290 delete drawable; 267 delete drawable;
291 // destroy all windows 268 // destroy all windows
292 if (parent[0]) 269 if (parent[0])
293 XDestroyWindow (disp, parent[0]); 270 XDestroyWindow (disp, parent[0]);
294 } 271 }
… …
349#if USE_XIM 326#if USE_XIM
350 im_ev.stop (display); 327 im_ev.stop (display);
351#endif 328#endif
352#if HAVE_SCROLLBARS 329#if HAVE_SCROLLBARS
353 scrollbar_ev.stop (display); 330 scrollbar_ev.stop (display);
354#endif
355#if MENUBAR
356 menubar_ev.stop (display);
357#endif 331#endif
358#if TRANSPARENT 332#if TRANSPARENT
359 rootwin_ev.stop (display); 333 rootwin_ev.stop (display);
360#endif 334#endif
361 incr_ev.stop (); 335 incr_ev.stop ();
… …
500 474
501#ifdef KEYSYM_RESOURCE 475#ifdef KEYSYM_RESOURCE
502 keyboard->register_done (); 476 keyboard->register_done ();
503#endif 477#endif
504 478
505#if MENUBAR_MAX
506 menubar_read (rs[Rs_menu]);
507#endif
508#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
509 if (OPTION (Opt_scrollBar)) 480 if (OPTION (Opt_scrollBar))
510 scrollBar.setIdle (); /* set existence for size calculations */ 481 scrollBar.setIdle (); /* set existence for size calculations */
511#endif 482#endif
512 483
… …
529 rs[Rs_perl_lib] = 0; 500 rs[Rs_perl_lib] = 0;
530 rs[Rs_perl_eval] = 0; 501 rs[Rs_perl_eval] = 0;
531 } 502 }
532 } 503 }
533#endif 504#endif
534 rxvt_perl.init (); 505 rxvt_perl.init (this);
535 setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
536 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 506 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
537 } 507 }
538#endif 508#endif
509
510 pty = rxvt_new_ptytty ();
539 511
540 create_windows (argc, argv); 512 create_windows (argc, argv);
541 513
542 dDisp; 514 dDisp;
543 515
… …
551 523
552#ifdef HAVE_SCROLLBARS 524#ifdef HAVE_SCROLLBARS
553 if (OPTION (Opt_scrollBar)) 525 if (OPTION (Opt_scrollBar))
554 resize_scrollbar (); /* create and map scrollbar */ 526 resize_scrollbar (); /* create and map scrollbar */
555#endif 527#endif
556#if (MENUBAR_MAX)
557 if (menubar_visible ())
558 XMapWindow (disp, menuBar.win);
559#endif
560#ifdef TRANSPARENT 528#ifdef TRANSPARENT
561 if (OPTION (Opt_transparent)) 529 if (OPTION (Opt_transparent))
562 { 530 {
563 XSelectInput (disp, display->root, PropertyChangeMask); 531 XSelectInput (disp, display->root, PropertyChangeMask);
564 check_our_parents (); 532 check_our_parents ();
… …
573 541
574 init_command (cmd_argv); 542 init_command (cmd_argv);
575 543
576 free (cmd_argv); 544 free (cmd_argv);
577 545
578 if (pty.pty >= 0) 546 if (pty->pty >= 0)
579 pty_ev.start (pty.pty, EVENT_READ); 547 pty_ev.start (pty->pty, EVENT_READ);
580 548
581 check_ev.start (); 549 check_ev.start ();
582 550
583 HOOK_INVOKE ((this, HOOK_START, DT_END)); 551 HOOK_INVOKE ((this, HOOK_START, DT_END));
584 552
… …
628char **rxvt_environ; // startup environment 596char **rxvt_environ; // startup environment
629 597
630void 598void
631rxvt_init () 599rxvt_init ()
632{ 600{
601 uid_t uid = getuid ();
602 gid_t gid = getgid ();
603
604 // before doing anything else, check for setuid/setgid operation,
605 // start the helper process and drop privileges
606 if (uid != geteuid ()
607 || 1 //D
608 || gid != getegid ())
609 {
610#if PTYTTY_HELPER
611 rxvt_ptytty_server ();
612#else
613 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
614#endif
615
616 // drop privileges
617#if HAVE_SETRESUID
618 setresgid (gid, gid, gid);
619 setresuid (uid, uid, uid);
620#elif HAVE_SETREUID
621 setregid (gid, gid);
622 setreuid (uid, uid);
623#elif HAVE_SETUID
624 setgid (gid);
625 setuid (uid);
626#endif
627
628 if (uid != geteuid ()
629 || gid != getegid ())
630 rxvt_fatal ("unable to drop privileges, aborting.\n");
631 }
632
633 rxvt_environ = environ; 633 rxvt_environ = environ;
634 634
635 /* 635 /*
636 * Save and then give up any super-user privileges 636 * Save and then give up any super-user privileges
637 * If we need privileges in any area then we must specifically request it. 637 * If we need privileges in any area then we must specifically request it.
… …
743 } 743 }
744# endif 744# endif
745#endif 745#endif
746} 746}
747 747
748#ifdef UTMP_SUPPORT
749void
750rxvt_term::privileged_utmp (rxvt_privaction action)
751{
752 if (OPTION (Opt_utmpInhibit)
753 || !pty.name || !*pty.name)
754 return;
755
756 rxvt_privileges (RESTORE);
757
758 if (action == SAVE)
759 makeutent (pty.name, rs[Rs_display_name]);
760 else
761 cleanutent ();
762
763 rxvt_privileges (IGNORE);
764}
765#endif
766
767/*----------------------------------------------------------------------*/ 748/*----------------------------------------------------------------------*/
768/* 749/*
769 * window size/position calculcations for XSizeHint and other storage. 750 * window size/position calculcations for XSizeHint and other storage.
770 * if width/height are non-zero then override calculated width/height 751 * if width/height are non-zero then override calculated width/height
771 */ 752 */
772void 753void
773rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 754rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
774{ 755{
775 short recalc_x, recalc_y; 756 short recalc_x, recalc_y;
776 int x, y, sb_w, mb_h, flags; 757 int x, y, sb_w, flags;
777 unsigned int w, h; 758 unsigned int w, h;
778 unsigned int max_width, max_height; 759 unsigned int max_width, max_height;
779 dDisp; 760 dDisp;
780 761
781 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 762 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
842 max_width = MAX_COLS * fwidth; 823 max_width = MAX_COLS * fwidth;
843 max_height = MAX_ROWS * fheight; 824 max_height = MAX_ROWS * fheight;
844 825
845 szHint.base_width = szHint.base_height = 2 * int_bwidth; 826 szHint.base_width = szHint.base_height = 2 * int_bwidth;
846 827
847 sb_w = mb_h = 0; 828 sb_w = 0;
848 window_vt_x = window_vt_y = int_bwidth; 829 window_vt_x = window_vt_y = int_bwidth;
849 830
850 if (scrollbar_visible ()) 831 if (scrollBar.state)
851 { 832 {
852 sb_w = scrollbar_TotalWidth (); 833 sb_w = scrollbar_TotalWidth ();
853 szHint.base_width += sb_w; 834 szHint.base_width += sb_w;
854 if (!OPTION (Opt_scrollBar_right)) 835 if (!OPTION (Opt_scrollBar_right))
855 window_vt_x += sb_w; 836 window_vt_x += sb_w;
856 } 837 }
857 838
858 if (menubar_visible ())
859 {
860 mb_h = menuBar_TotalHeight ();
861 szHint.base_height += mb_h;
862 window_vt_y += mb_h;
863 }
864
865 szHint.width_inc = fwidth; 839 szHint.width_inc = fwidth;
866 szHint.height_inc = fheight; 840 szHint.height_inc = fheight;
867 szHint.min_width = szHint.base_width + szHint.width_inc; 841 szHint.min_width = szHint.base_width + szHint.width_inc;
868 szHint.min_height = szHint.base_height + szHint.height_inc; 842 szHint.min_height = szHint.base_height + szHint.height_inc;
869 843
… …
887 { 861 {
888 min_it (height, max_height); 862 min_it (height, max_height);
889 szHint.height = szHint.base_height + height; 863 szHint.height = szHint.base_height + height;
890 } 864 }
891 865
892 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 866 if (scrollBar.state && OPTION (Opt_scrollBar_right))
893 window_sb_x = szHint.width - sb_w; 867 window_sb_x = szHint.width - sb_w;
894 868
895 if (recalc_x) 869 if (recalc_x)
896 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 870 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
897 if (recalc_y) 871 if (recalc_y)
… …
911 * Called after a window size change. 885 * Called after a window size change.
912 */ 886 */
913void 887void
914rxvt_term::tt_winch () 888rxvt_term::tt_winch ()
915{ 889{
916 if (pty.pty < 0) 890 if (pty->pty < 0)
917 return; 891 return;
918 892
919 struct winsize ws; 893 struct winsize ws;
920 894
921 ws.ws_col = ncol; 895 ws.ws_col = ncol;
922 ws.ws_row = nrow; 896 ws.ws_row = nrow;
923 ws.ws_xpixel = width; 897 ws.ws_xpixel = width;
924 ws.ws_ypixel = height; 898 ws.ws_ypixel = height;
925 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 899 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
926 900
927#if 0 901#if 0
928 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 902 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
929 if (cmd_pid) /* force through to the command */ 903 if (cmd_pid) /* force through to the command */
930 kill (-cmd_pid, SIGWINCH); 904 kill (-cmd_pid, SIGWINCH);
… …
1252 1226
1253 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1227 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1254 1228
1255 if (fix_screen || newwidth != old_width || newheight != old_height) 1229 if (fix_screen || newwidth != old_width || newheight != old_height)
1256 { 1230 {
1257 if (scrollbar_visible ()) 1231 if (scrollBar.state)
1258 { 1232 {
1259 XMoveResizeWindow (disp, scrollBar.win, 1233 XMoveResizeWindow (disp, scrollBar.win,
1260 window_sb_x, 0, 1234 window_sb_x, 0,
1261 scrollbar_TotalWidth (), szHint.height); 1235 scrollbar_TotalWidth (), szHint.height);
1262 resize_scrollbar (); 1236 resize_scrollbar ();
1263 } 1237 }
1264
1265 if (menubar_visible ())
1266 XMoveResizeWindow (disp, menuBar.win,
1267 window_vt_x, 0,
1268 width, menuBar_TotalHeight ());
1269 1238
1270 XMoveResizeWindow (disp, vt, 1239 XMoveResizeWindow (disp, vt,
1271 window_vt_x, window_vt_y, 1240 window_vt_x, window_vt_y,
1272 width, height); 1241 width, height);
1273 1242

Diff Legend

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