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.172 by root, Wed Jan 11 05:14:26 2006 UTC vs.
Revision 1.183 by root, Tue Jan 17 10:19:13 2006 UTC

… …
161 rootwin_ev (this, &rxvt_term::rootwin_cb), 161 rootwin_ev (this, &rxvt_term::rootwin_cb),
162#endif 162#endif
163#ifdef HAVE_SCROLLBARS 163#ifdef HAVE_SCROLLBARS
164 scrollbar_ev (this, &rxvt_term::x_cb), 164 scrollbar_ev (this, &rxvt_term::x_cb),
165#endif 165#endif
166#ifdef MENUBAR
167 menubar_ev (this, &rxvt_term::x_cb),
168#endif
169#ifdef CURSOR_BLINK 166#ifdef CURSOR_BLINK
170 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 167 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
171#endif 168#endif
172#ifdef TEXT_BLINK 169#ifdef TEXT_BLINK
173 text_blink_ev (this, &rxvt_term::text_blink_cb), 170 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
242 239
243 selection_clear (); 240 selection_clear ();
244 241
245#ifdef USE_XIM 242#ifdef USE_XIM
246 im_destroy (); 243 im_destroy ();
247#endif
248#ifdef MENUBAR
249 if (menubarGC) XFreeGC (disp, menubarGC);
250#endif 244#endif
251#ifdef XTERM_SCROLLBAR 245#ifdef XTERM_SCROLLBAR
252 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 246 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
253 if (ShadowGC) XFreeGC (disp, ShadowGC); 247 if (ShadowGC) XFreeGC (disp, ShadowGC);
254#endif 248#endif
… …
265 if (upArrow) XFreePixmap (disp, upArrow); 259 if (upArrow) XFreePixmap (disp, upArrow);
266 if (downArrow) XFreePixmap (disp, downArrow); 260 if (downArrow) XFreePixmap (disp, downArrow);
267 if (upArrowHi) XFreePixmap (disp, upArrowHi); 261 if (upArrowHi) XFreePixmap (disp, upArrowHi);
268 if (downArrowHi) XFreePixmap (disp, downArrowHi); 262 if (downArrowHi) XFreePixmap (disp, downArrowHi);
269#endif 263#endif
270#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 264#ifdef RXVT_SCROLLBAR
271 if (topShadowGC) XFreeGC (disp, topShadowGC); 265 if (topShadowGC) XFreeGC (disp, topShadowGC);
272 if (botShadowGC) XFreeGC (disp, botShadowGC); 266 if (botShadowGC) XFreeGC (disp, botShadowGC);
273 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 267 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
274#endif 268#endif
275 if (gc) XFreeGC (disp, gc); 269 if (gc) XFreeGC (disp, gc);
276 270
277#if defined(MENUBAR) && (MENUBAR_MAX > 1)
278 delete menuBar.drawable;
279 //if (menuBar.win)
280 // XDestroyWindow (disp, menuBar.win);
281#endif
282 delete drawable; 271 delete drawable;
283 // destroy all windows 272 // destroy all windows
284 if (parent[0]) 273 if (parent[0])
285 XDestroyWindow (disp, parent[0]); 274 XDestroyWindow (disp, parent[0]);
286 } 275 }
… …
342 im_ev.stop (display); 331 im_ev.stop (display);
343#endif 332#endif
344#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
345 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
346#endif 335#endif
347#if MENUBAR
348 menubar_ev.stop (display);
349#endif
350#if TRANSPARENT 336#if TRANSPARENT
351 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
352#endif 338#endif
353 incr_ev.stop (); 339 incr_ev.stop ();
354 termwin_ev.stop (display); 340 termwin_ev.stop (display);
… …
377} 363}
378 364
379void 365void
380rxvt_term::destroy_cb (time_watcher &w) 366rxvt_term::destroy_cb (time_watcher &w)
381{ 367{
382 SET_R (this); 368 make_current ();
383 369
384 delete this; 370 delete this;
385} 371}
386 372
387/*----------------------------------------------------------------------*/ 373/*----------------------------------------------------------------------*/
… …
478/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
479bool 465bool
480rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv)
481{ 467{
482 SET_R (this); 468 SET_R (this);
483 TEMP_ENV; // few things in X do not call setlocale :(
484
485 set_locale (""); 469 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :(
486 471
487 if (!init_vars ()) 472 if (!init_vars ())
488 return false; 473 return false;
489 474
490 init_secondary (); 475 init_secondary ();
… …
493 478
494#ifdef KEYSYM_RESOURCE 479#ifdef KEYSYM_RESOURCE
495 keyboard->register_done (); 480 keyboard->register_done ();
496#endif 481#endif
497 482
498#if MENUBAR_MAX
499 menubar_read (rs[Rs_menu]);
500#endif
501#ifdef HAVE_SCROLLBARS 483#ifdef HAVE_SCROLLBARS
502 if (OPTION (Opt_scrollBar)) 484 if (OPTION (Opt_scrollBar))
503 scrollBar.setIdle (); /* set existence for size calculations */ 485 scrollBar.setIdle (); /* set existence for size calculations */
504#endif 486#endif
505 487
… …
522 rs[Rs_perl_lib] = 0; 504 rs[Rs_perl_lib] = 0;
523 rs[Rs_perl_eval] = 0; 505 rs[Rs_perl_eval] = 0;
524 } 506 }
525 } 507 }
526#endif 508#endif
527 rxvt_perl.init (); 509 rxvt_perl.init (this);
528 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
529 } 511 }
530#endif 512#endif
531 513
532 create_windows (argc, argv); 514 create_windows (argc, argv);
… …
542#endif 524#endif
543 525
544#ifdef HAVE_SCROLLBARS 526#ifdef HAVE_SCROLLBARS
545 if (OPTION (Opt_scrollBar)) 527 if (OPTION (Opt_scrollBar))
546 resize_scrollbar (); /* create and map scrollbar */ 528 resize_scrollbar (); /* create and map scrollbar */
547#endif
548#if (MENUBAR_MAX)
549 if (menubar_visible ())
550 XMapWindow (disp, menuBar.win);
551#endif 529#endif
552#ifdef TRANSPARENT 530#ifdef TRANSPARENT
553 if (OPTION (Opt_transparent)) 531 if (OPTION (Opt_transparent))
554 { 532 {
555 XSelectInput (disp, display->root, PropertyChangeMask); 533 XSelectInput (disp, display->root, PropertyChangeMask);
… …
615 sw_int (this, &sig_handlers::sig_term) 593 sw_int (this, &sig_handlers::sig_term)
616 { 594 {
617 } 595 }
618} sig_handlers; 596} sig_handlers;
619 597
598char **rxvt_environ; // startup environment
599
620void 600void
621rxvt_init () 601rxvt_init ()
622{ 602{
603 rxvt_environ = environ;
604
623 /* 605 /*
624 * Save and then give up any super-user privileges 606 * Save and then give up any super-user privileges
625 * If we need privileges in any area then we must specifically request it. 607 * If we need privileges in any area then we must specifically request it.
626 * We should only need to be root in these cases: 608 * We should only need to be root in these cases:
627 * 1. write utmp entries on some systems 609 * 1. write utmp entries on some systems
… …
703 case IGNORE: 685 case IGNORE:
704 /* 686 /*
705 * change effective uid/gid - not real uid/gid - so we can switch 687 * change effective uid/gid - not real uid/gid - so we can switch
706 * back to root later, as required 688 * back to root later, as required
707 */ 689 */
690 setegid (getgid ());
708 seteuid (getuid ()); 691 seteuid (getuid ());
709 setegid (getgid ());
710 break; 692 break;
711 case SAVE: 693 case SAVE:
694 saved_egid = getegid ();
712 saved_euid = geteuid (); 695 saved_euid = geteuid ();
713 saved_egid = getegid ();
714 break; 696 break;
715 case RESTORE: 697 case RESTORE:
698 setegid (saved_egid);
716 seteuid (saved_euid); 699 seteuid (saved_euid);
717 setegid (saved_egid);
718 break; 700 break;
719 } 701 }
720# else 702# else
721 switch (action) 703 switch (action)
722 { 704 {
723 case IGNORE: 705 case IGNORE:
706 setgid (getgid ());
724 setuid (getuid ()); 707 setuid (getuid ());
725 setgid (getgid ());
726 /* FALLTHROUGH */ 708 /* FALLTHROUGH */
727 case SAVE: 709 case SAVE:
728 /* FALLTHROUGH */ 710 /* FALLTHROUGH */
729 case RESTORE: 711 case RESTORE:
730 break; 712 break;
… …
735 717
736#ifdef UTMP_SUPPORT 718#ifdef UTMP_SUPPORT
737void 719void
738rxvt_term::privileged_utmp (rxvt_privaction action) 720rxvt_term::privileged_utmp (rxvt_privaction action)
739{ 721{
740 if (OPTION (Opt_utmpInhibit) 722 if (OPTION (Opt_utmpInhibit))
741 || !pty.name || !*pty.name)
742 return; 723 return;
743 724
744 rxvt_privileges (RESTORE); 725 rxvt_privileges (RESTORE);
745 726
746 if (action == SAVE) 727 if (action == SAVE)
747 makeutent (pty.name, rs[Rs_display_name]); 728 pty.login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
748 else 729 else
749 cleanutent (); 730 pty.logout ();
750 731
751 rxvt_privileges (IGNORE); 732 rxvt_privileges (IGNORE);
752} 733}
753#endif 734#endif
754 735
… …
759 */ 740 */
760void 741void
761rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 742rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
762{ 743{
763 short recalc_x, recalc_y; 744 short recalc_x, recalc_y;
764 int x, y, sb_w, mb_h, flags; 745 int x, y, sb_w, flags;
765 unsigned int w, h; 746 unsigned int w, h;
766 unsigned int max_width, max_height; 747 unsigned int max_width, max_height;
767 dDisp; 748 dDisp;
768 749
769 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 750 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
830 max_width = MAX_COLS * fwidth; 811 max_width = MAX_COLS * fwidth;
831 max_height = MAX_ROWS * fheight; 812 max_height = MAX_ROWS * fheight;
832 813
833 szHint.base_width = szHint.base_height = 2 * int_bwidth; 814 szHint.base_width = szHint.base_height = 2 * int_bwidth;
834 815
835 sb_w = mb_h = 0; 816 sb_w = 0;
836 window_vt_x = window_vt_y = int_bwidth; 817 window_vt_x = window_vt_y = int_bwidth;
837 818
838 if (scrollbar_visible ()) 819 if (scrollBar.state)
839 { 820 {
840 sb_w = scrollbar_TotalWidth (); 821 sb_w = scrollbar_TotalWidth ();
841 szHint.base_width += sb_w; 822 szHint.base_width += sb_w;
842 if (!OPTION (Opt_scrollBar_right)) 823 if (!OPTION (Opt_scrollBar_right))
843 window_vt_x += sb_w; 824 window_vt_x += sb_w;
844 } 825 }
845 826
846 if (menubar_visible ())
847 {
848 mb_h = menuBar_TotalHeight ();
849 szHint.base_height += mb_h;
850 window_vt_y += mb_h;
851 }
852
853 szHint.width_inc = fwidth; 827 szHint.width_inc = fwidth;
854 szHint.height_inc = fheight; 828 szHint.height_inc = fheight;
855 szHint.min_width = szHint.base_width + szHint.width_inc; 829 szHint.min_width = szHint.base_width + szHint.width_inc;
856 szHint.min_height = szHint.base_height + szHint.height_inc; 830 szHint.min_height = szHint.base_height + szHint.height_inc;
857 831
… …
875 { 849 {
876 min_it (height, max_height); 850 min_it (height, max_height);
877 szHint.height = szHint.base_height + height; 851 szHint.height = szHint.base_height + height;
878 } 852 }
879 853
880 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 854 if (scrollBar.state && OPTION (Opt_scrollBar_right))
881 window_sb_x = szHint.width - sb_w; 855 window_sb_x = szHint.width - sb_w;
882 856
883 if (recalc_x) 857 if (recalc_x)
884 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 858 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
885 if (recalc_y) 859 if (recalc_y)
… …
1240 1214
1241 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1215 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1242 1216
1243 if (fix_screen || newwidth != old_width || newheight != old_height) 1217 if (fix_screen || newwidth != old_width || newheight != old_height)
1244 { 1218 {
1245 if (scrollbar_visible ()) 1219 if (scrollBar.state)
1246 { 1220 {
1247 XMoveResizeWindow (disp, scrollBar.win, 1221 XMoveResizeWindow (disp, scrollBar.win,
1248 window_sb_x, 0, 1222 window_sb_x, 0,
1249 scrollbar_TotalWidth (), szHint.height); 1223 scrollbar_TotalWidth (), szHint.height);
1250 resize_scrollbar (); 1224 resize_scrollbar ();
1251 } 1225 }
1252
1253 if (menubar_visible ())
1254 XMoveResizeWindow (disp, menuBar.win,
1255 window_vt_x, 0,
1256 width, menuBar_TotalHeight ());
1257 1226
1258 XMoveResizeWindow (disp, vt, 1227 XMoveResizeWindow (disp, vt,
1259 window_vt_x, window_vt_y, 1228 window_vt_x, window_vt_y,
1260 width, height); 1229 width, height);
1261 1230
… …
1446 unsigned long fg, bg; 1415 unsigned long fg, bg;
1447 const char *p; 1416 const char *p;
1448 char **s; 1417 char **s;
1449 XIMStyles *xim_styles; 1418 XIMStyles *xim_styles;
1450 1419
1451 TEMP_ENV; 1420 set_environ (envv);
1452 1421
1453 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1422 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1454 return false; 1423 return false;
1455 1424
1456 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1425 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1622 int i; 1591 int i;
1623 const char *p; 1592 const char *p;
1624 char **s; 1593 char **s;
1625 char buf[IMBUFSIZ]; 1594 char buf[IMBUFSIZ];
1626 1595
1627 SET_R (this); 1596 make_current ();
1628 1597
1629 im_destroy (); 1598 im_destroy ();
1630 1599
1631 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1600 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1632 if (Input_Context) 1601 if (Input_Context)

Diff Legend

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