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.171 by root, Wed Jan 11 03:13:26 2006 UTC vs.
Revision 1.184 by root, Tue Jan 17 12:22:59 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),
… …
216 213
217#ifdef UTMP_SUPPORT 214#ifdef UTMP_SUPPORT
218 privileged_utmp (RESTORE); 215 privileged_utmp (RESTORE);
219#endif 216#endif
220 217
221 pty.put (); 218 delete pty; pty = 0;
222} 219}
223 220
224rxvt_term::~rxvt_term () 221rxvt_term::~rxvt_term ()
225{ 222{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 223 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
… …
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 }
287 276
288 // TODO: free pixcolours, colours should become part of rxvt_display 277 // TODO: free pixcolours, colours should become part of rxvt_display
289
290 delete pix_colors_focused; 278 delete pix_colors_focused;
291#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
292 delete pix_colors_unfocused; 280 delete pix_colors_unfocused;
293#endif 281#endif
294 282
… …
343 im_ev.stop (display); 331 im_ev.stop (display);
344#endif 332#endif
345#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
346 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
347#endif 335#endif
348#if MENUBAR
349 menubar_ev.stop (display);
350#endif
351#if TRANSPARENT 336#if TRANSPARENT
352 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
353#endif 338#endif
354 incr_ev.stop (); 339 incr_ev.stop ();
355 termwin_ev.stop (display); 340 termwin_ev.stop (display);
… …
378} 363}
379 364
380void 365void
381rxvt_term::destroy_cb (time_watcher &w) 366rxvt_term::destroy_cb (time_watcher &w)
382{ 367{
383 SET_R (this); 368 make_current ();
384 369
385 delete this; 370 delete this;
386} 371}
387 372
388/*----------------------------------------------------------------------*/ 373/*----------------------------------------------------------------------*/
… …
479/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
480bool 465bool
481rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv)
482{ 467{
483 SET_R (this); 468 SET_R (this);
484 TEMP_ENV; // few things in X do not call setlocale :(
485
486 set_locale (""); 469 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :(
487 471
488 if (!init_vars ()) 472 if (!init_vars ())
489 return false; 473 return false;
490 474
491 init_secondary (); 475 init_secondary ();
… …
494 478
495#ifdef KEYSYM_RESOURCE 479#ifdef KEYSYM_RESOURCE
496 keyboard->register_done (); 480 keyboard->register_done ();
497#endif 481#endif
498 482
499#if MENUBAR_MAX
500 menubar_read (rs[Rs_menu]);
501#endif
502#ifdef HAVE_SCROLLBARS 483#ifdef HAVE_SCROLLBARS
503 if (OPTION (Opt_scrollBar)) 484 if (OPTION (Opt_scrollBar))
504 scrollBar.setIdle (); /* set existence for size calculations */ 485 scrollBar.setIdle (); /* set existence for size calculations */
505#endif 486#endif
506 487
… …
523 rs[Rs_perl_lib] = 0; 504 rs[Rs_perl_lib] = 0;
524 rs[Rs_perl_eval] = 0; 505 rs[Rs_perl_eval] = 0;
525 } 506 }
526 } 507 }
527#endif 508#endif
528 rxvt_perl.init (); 509 rxvt_perl.init (this);
529 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
530 } 511 }
531#endif 512#endif
513
514 pty = rxvt_new_ptytty ();
532 515
533 create_windows (argc, argv); 516 create_windows (argc, argv);
534 517
535 dDisp; 518 dDisp;
536 519
… …
544 527
545#ifdef HAVE_SCROLLBARS 528#ifdef HAVE_SCROLLBARS
546 if (OPTION (Opt_scrollBar)) 529 if (OPTION (Opt_scrollBar))
547 resize_scrollbar (); /* create and map scrollbar */ 530 resize_scrollbar (); /* create and map scrollbar */
548#endif 531#endif
549#if (MENUBAR_MAX)
550 if (menubar_visible ())
551 XMapWindow (disp, menuBar.win);
552#endif
553#ifdef TRANSPARENT 532#ifdef TRANSPARENT
554 if (OPTION (Opt_transparent)) 533 if (OPTION (Opt_transparent))
555 { 534 {
556 XSelectInput (disp, display->root, PropertyChangeMask); 535 XSelectInput (disp, display->root, PropertyChangeMask);
557 check_our_parents (); 536 check_our_parents ();
… …
566 545
567 init_command (cmd_argv); 546 init_command (cmd_argv);
568 547
569 free (cmd_argv); 548 free (cmd_argv);
570 549
571 if (pty.pty >= 0) 550 if (pty->pty >= 0)
572 pty_ev.start (pty.pty, EVENT_READ); 551 pty_ev.start (pty->pty, EVENT_READ);
573 552
574 check_ev.start (); 553 check_ev.start ();
575 554
576 HOOK_INVOKE ((this, HOOK_START, DT_END)); 555 HOOK_INVOKE ((this, HOOK_START, DT_END));
577 556
… …
616 sw_int (this, &sig_handlers::sig_term) 595 sw_int (this, &sig_handlers::sig_term)
617 { 596 {
618 } 597 }
619} sig_handlers; 598} sig_handlers;
620 599
600char **rxvt_environ; // startup environment
601
621void 602void
622rxvt_init () 603rxvt_init ()
623{ 604{
605 rxvt_environ = environ;
606
624 /* 607 /*
625 * Save and then give up any super-user privileges 608 * Save and then give up any super-user privileges
626 * If we need privileges in any area then we must specifically request it. 609 * If we need privileges in any area then we must specifically request it.
627 * We should only need to be root in these cases: 610 * We should only need to be root in these cases:
628 * 1. write utmp entries on some systems 611 * 1. write utmp entries on some systems
… …
704 case IGNORE: 687 case IGNORE:
705 /* 688 /*
706 * change effective uid/gid - not real uid/gid - so we can switch 689 * change effective uid/gid - not real uid/gid - so we can switch
707 * back to root later, as required 690 * back to root later, as required
708 */ 691 */
692 setegid (getgid ());
709 seteuid (getuid ()); 693 seteuid (getuid ());
710 setegid (getgid ());
711 break; 694 break;
712 case SAVE: 695 case SAVE:
696 saved_egid = getegid ();
713 saved_euid = geteuid (); 697 saved_euid = geteuid ();
714 saved_egid = getegid ();
715 break; 698 break;
716 case RESTORE: 699 case RESTORE:
700 setegid (saved_egid);
717 seteuid (saved_euid); 701 seteuid (saved_euid);
718 setegid (saved_egid);
719 break; 702 break;
720 } 703 }
721# else 704# else
722 switch (action) 705 switch (action)
723 { 706 {
724 case IGNORE: 707 case IGNORE:
708 setgid (getgid ());
725 setuid (getuid ()); 709 setuid (getuid ());
726 setgid (getgid ());
727 /* FALLTHROUGH */ 710 /* FALLTHROUGH */
728 case SAVE: 711 case SAVE:
729 /* FALLTHROUGH */ 712 /* FALLTHROUGH */
730 case RESTORE: 713 case RESTORE:
731 break; 714 break;
… …
736 719
737#ifdef UTMP_SUPPORT 720#ifdef UTMP_SUPPORT
738void 721void
739rxvt_term::privileged_utmp (rxvt_privaction action) 722rxvt_term::privileged_utmp (rxvt_privaction action)
740{ 723{
741 if (OPTION (Opt_utmpInhibit) 724 if (OPTION (Opt_utmpInhibit))
742 || !pty.name || !*pty.name)
743 return; 725 return;
744 726
745 rxvt_privileges (RESTORE); 727 rxvt_privileges (RESTORE);
746 728
747 if (action == SAVE) 729 if (action == SAVE)
748 makeutent (pty.name, rs[Rs_display_name]); 730 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
749 else 731 else
750 cleanutent (); 732 pty->logout ();
751 733
752 rxvt_privileges (IGNORE); 734 rxvt_privileges (IGNORE);
753} 735}
754#endif 736#endif
755 737
… …
760 */ 742 */
761void 743void
762rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 744rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
763{ 745{
764 short recalc_x, recalc_y; 746 short recalc_x, recalc_y;
765 int x, y, sb_w, mb_h, flags; 747 int x, y, sb_w, flags;
766 unsigned int w, h; 748 unsigned int w, h;
767 unsigned int max_width, max_height; 749 unsigned int max_width, max_height;
768 dDisp; 750 dDisp;
769 751
770 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 752 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
831 max_width = MAX_COLS * fwidth; 813 max_width = MAX_COLS * fwidth;
832 max_height = MAX_ROWS * fheight; 814 max_height = MAX_ROWS * fheight;
833 815
834 szHint.base_width = szHint.base_height = 2 * int_bwidth; 816 szHint.base_width = szHint.base_height = 2 * int_bwidth;
835 817
836 sb_w = mb_h = 0; 818 sb_w = 0;
837 window_vt_x = window_vt_y = int_bwidth; 819 window_vt_x = window_vt_y = int_bwidth;
838 820
839 if (scrollbar_visible ()) 821 if (scrollBar.state)
840 { 822 {
841 sb_w = scrollbar_TotalWidth (); 823 sb_w = scrollbar_TotalWidth ();
842 szHint.base_width += sb_w; 824 szHint.base_width += sb_w;
843 if (!OPTION (Opt_scrollBar_right)) 825 if (!OPTION (Opt_scrollBar_right))
844 window_vt_x += sb_w; 826 window_vt_x += sb_w;
845 } 827 }
846 828
847 if (menubar_visible ())
848 {
849 mb_h = menuBar_TotalHeight ();
850 szHint.base_height += mb_h;
851 window_vt_y += mb_h;
852 }
853
854 szHint.width_inc = fwidth; 829 szHint.width_inc = fwidth;
855 szHint.height_inc = fheight; 830 szHint.height_inc = fheight;
856 szHint.min_width = szHint.base_width + szHint.width_inc; 831 szHint.min_width = szHint.base_width + szHint.width_inc;
857 szHint.min_height = szHint.base_height + szHint.height_inc; 832 szHint.min_height = szHint.base_height + szHint.height_inc;
858 833
… …
876 { 851 {
877 min_it (height, max_height); 852 min_it (height, max_height);
878 szHint.height = szHint.base_height + height; 853 szHint.height = szHint.base_height + height;
879 } 854 }
880 855
881 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 856 if (scrollBar.state && OPTION (Opt_scrollBar_right))
882 window_sb_x = szHint.width - sb_w; 857 window_sb_x = szHint.width - sb_w;
883 858
884 if (recalc_x) 859 if (recalc_x)
885 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 860 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
886 if (recalc_y) 861 if (recalc_y)
… …
900 * Called after a window size change. 875 * Called after a window size change.
901 */ 876 */
902void 877void
903rxvt_term::tt_winch () 878rxvt_term::tt_winch ()
904{ 879{
905 if (pty.pty < 0) 880 if (pty->pty < 0)
906 return; 881 return;
907 882
908 struct winsize ws; 883 struct winsize ws;
909 884
910 ws.ws_col = ncol; 885 ws.ws_col = ncol;
911 ws.ws_row = nrow; 886 ws.ws_row = nrow;
912 ws.ws_xpixel = width; 887 ws.ws_xpixel = width;
913 ws.ws_ypixel = height; 888 ws.ws_ypixel = height;
914 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 889 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
915 890
916#if 0 891#if 0
917 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 892 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
918 if (cmd_pid) /* force through to the command */ 893 if (cmd_pid) /* force through to the command */
919 kill (-cmd_pid, SIGWINCH); 894 kill (-cmd_pid, SIGWINCH);
… …
1241 1216
1242 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1217 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1243 1218
1244 if (fix_screen || newwidth != old_width || newheight != old_height) 1219 if (fix_screen || newwidth != old_width || newheight != old_height)
1245 { 1220 {
1246 if (scrollbar_visible ()) 1221 if (scrollBar.state)
1247 { 1222 {
1248 XMoveResizeWindow (disp, scrollBar.win, 1223 XMoveResizeWindow (disp, scrollBar.win,
1249 window_sb_x, 0, 1224 window_sb_x, 0,
1250 scrollbar_TotalWidth (), szHint.height); 1225 scrollbar_TotalWidth (), szHint.height);
1251 resize_scrollbar (); 1226 resize_scrollbar ();
1252 } 1227 }
1253
1254 if (menubar_visible ())
1255 XMoveResizeWindow (disp, menuBar.win,
1256 window_vt_x, 0,
1257 width, menuBar_TotalHeight ());
1258 1228
1259 XMoveResizeWindow (disp, vt, 1229 XMoveResizeWindow (disp, vt,
1260 window_vt_x, window_vt_y, 1230 window_vt_x, window_vt_y,
1261 width, height); 1231 width, height);
1262 1232
… …
1447 unsigned long fg, bg; 1417 unsigned long fg, bg;
1448 const char *p; 1418 const char *p;
1449 char **s; 1419 char **s;
1450 XIMStyles *xim_styles; 1420 XIMStyles *xim_styles;
1451 1421
1452 TEMP_ENV; 1422 set_environ (envv);
1453 1423
1454 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1424 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1455 return false; 1425 return false;
1456 1426
1457 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1427 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1623 int i; 1593 int i;
1624 const char *p; 1594 const char *p;
1625 char **s; 1595 char **s;
1626 char buf[IMBUFSIZ]; 1596 char buf[IMBUFSIZ];
1627 1597
1628 SET_R (this); 1598 make_current ();
1629 1599
1630 im_destroy (); 1600 im_destroy ();
1631 1601
1632 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1602 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1633 if (Input_Context) 1603 if (Input_Context)

Diff Legend

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