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.173 by root, Wed Jan 11 19:55:34 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 }
… …
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
513
514 pty = rxvt_new_ptytty ();
531 515
532 create_windows (argc, argv); 516 create_windows (argc, argv);
533 517
534 dDisp; 518 dDisp;
535 519
… …
543 527
544#ifdef HAVE_SCROLLBARS 528#ifdef HAVE_SCROLLBARS
545 if (OPTION (Opt_scrollBar)) 529 if (OPTION (Opt_scrollBar))
546 resize_scrollbar (); /* create and map scrollbar */ 530 resize_scrollbar (); /* create and map scrollbar */
547#endif 531#endif
548#if (MENUBAR_MAX)
549 if (menubar_visible ())
550 XMapWindow (disp, menuBar.win);
551#endif
552#ifdef TRANSPARENT 532#ifdef TRANSPARENT
553 if (OPTION (Opt_transparent)) 533 if (OPTION (Opt_transparent))
554 { 534 {
555 XSelectInput (disp, display->root, PropertyChangeMask); 535 XSelectInput (disp, display->root, PropertyChangeMask);
556 check_our_parents (); 536 check_our_parents ();
… …
565 545
566 init_command (cmd_argv); 546 init_command (cmd_argv);
567 547
568 free (cmd_argv); 548 free (cmd_argv);
569 549
570 if (pty.pty >= 0) 550 if (pty->pty >= 0)
571 pty_ev.start (pty.pty, EVENT_READ); 551 pty_ev.start (pty->pty, EVENT_READ);
572 552
573 check_ev.start (); 553 check_ev.start ();
574 554
575 HOOK_INVOKE ((this, HOOK_START, DT_END)); 555 HOOK_INVOKE ((this, HOOK_START, DT_END));
576 556
… …
615 sw_int (this, &sig_handlers::sig_term) 595 sw_int (this, &sig_handlers::sig_term)
616 { 596 {
617 } 597 }
618} sig_handlers; 598} sig_handlers;
619 599
600char **rxvt_environ; // startup environment
601
620void 602void
621rxvt_init () 603rxvt_init ()
622{ 604{
605 rxvt_environ = environ;
606
623 /* 607 /*
624 * Save and then give up any super-user privileges 608 * Save and then give up any super-user privileges
625 * 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.
626 * We should only need to be root in these cases: 610 * We should only need to be root in these cases:
627 * 1. write utmp entries on some systems 611 * 1. write utmp entries on some systems
… …
735 719
736#ifdef UTMP_SUPPORT 720#ifdef UTMP_SUPPORT
737void 721void
738rxvt_term::privileged_utmp (rxvt_privaction action) 722rxvt_term::privileged_utmp (rxvt_privaction action)
739{ 723{
740 if (OPTION (Opt_utmpInhibit) 724 if (OPTION (Opt_utmpInhibit))
741 || !pty.name || !*pty.name)
742 return; 725 return;
743 726
744 rxvt_privileges (RESTORE); 727 rxvt_privileges (RESTORE);
745 728
746 if (action == SAVE) 729 if (action == SAVE)
747 makeutent (pty.name, rs[Rs_display_name]); 730 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
748 else 731 else
749 cleanutent (); 732 pty->logout ();
750 733
751 rxvt_privileges (IGNORE); 734 rxvt_privileges (IGNORE);
752} 735}
753#endif 736#endif
754 737
… …
759 */ 742 */
760void 743void
761rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 744rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
762{ 745{
763 short recalc_x, recalc_y; 746 short recalc_x, recalc_y;
764 int x, y, sb_w, mb_h, flags; 747 int x, y, sb_w, flags;
765 unsigned int w, h; 748 unsigned int w, h;
766 unsigned int max_width, max_height; 749 unsigned int max_width, max_height;
767 dDisp; 750 dDisp;
768 751
769 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",
… …
830 max_width = MAX_COLS * fwidth; 813 max_width = MAX_COLS * fwidth;
831 max_height = MAX_ROWS * fheight; 814 max_height = MAX_ROWS * fheight;
832 815
833 szHint.base_width = szHint.base_height = 2 * int_bwidth; 816 szHint.base_width = szHint.base_height = 2 * int_bwidth;
834 817
835 sb_w = mb_h = 0; 818 sb_w = 0;
836 window_vt_x = window_vt_y = int_bwidth; 819 window_vt_x = window_vt_y = int_bwidth;
837 820
838 if (scrollbar_visible ()) 821 if (scrollBar.state)
839 { 822 {
840 sb_w = scrollbar_TotalWidth (); 823 sb_w = scrollbar_TotalWidth ();
841 szHint.base_width += sb_w; 824 szHint.base_width += sb_w;
842 if (!OPTION (Opt_scrollBar_right)) 825 if (!OPTION (Opt_scrollBar_right))
843 window_vt_x += sb_w; 826 window_vt_x += sb_w;
844 } 827 }
845 828
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; 829 szHint.width_inc = fwidth;
854 szHint.height_inc = fheight; 830 szHint.height_inc = fheight;
855 szHint.min_width = szHint.base_width + szHint.width_inc; 831 szHint.min_width = szHint.base_width + szHint.width_inc;
856 szHint.min_height = szHint.base_height + szHint.height_inc; 832 szHint.min_height = szHint.base_height + szHint.height_inc;
857 833
… …
875 { 851 {
876 min_it (height, max_height); 852 min_it (height, max_height);
877 szHint.height = szHint.base_height + height; 853 szHint.height = szHint.base_height + height;
878 } 854 }
879 855
880 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 856 if (scrollBar.state && OPTION (Opt_scrollBar_right))
881 window_sb_x = szHint.width - sb_w; 857 window_sb_x = szHint.width - sb_w;
882 858
883 if (recalc_x) 859 if (recalc_x)
884 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 860 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
885 if (recalc_y) 861 if (recalc_y)
… …
899 * Called after a window size change. 875 * Called after a window size change.
900 */ 876 */
901void 877void
902rxvt_term::tt_winch () 878rxvt_term::tt_winch ()
903{ 879{
904 if (pty.pty < 0) 880 if (pty->pty < 0)
905 return; 881 return;
906 882
907 struct winsize ws; 883 struct winsize ws;
908 884
909 ws.ws_col = ncol; 885 ws.ws_col = ncol;
910 ws.ws_row = nrow; 886 ws.ws_row = nrow;
911 ws.ws_xpixel = width; 887 ws.ws_xpixel = width;
912 ws.ws_ypixel = height; 888 ws.ws_ypixel = height;
913 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 889 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
914 890
915#if 0 891#if 0
916 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 892 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
917 if (cmd_pid) /* force through to the command */ 893 if (cmd_pid) /* force through to the command */
918 kill (-cmd_pid, SIGWINCH); 894 kill (-cmd_pid, SIGWINCH);
… …
1240 1216
1241 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1217 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1242 1218
1243 if (fix_screen || newwidth != old_width || newheight != old_height) 1219 if (fix_screen || newwidth != old_width || newheight != old_height)
1244 { 1220 {
1245 if (scrollbar_visible ()) 1221 if (scrollBar.state)
1246 { 1222 {
1247 XMoveResizeWindow (disp, scrollBar.win, 1223 XMoveResizeWindow (disp, scrollBar.win,
1248 window_sb_x, 0, 1224 window_sb_x, 0,
1249 scrollbar_TotalWidth (), szHint.height); 1225 scrollbar_TotalWidth (), szHint.height);
1250 resize_scrollbar (); 1226 resize_scrollbar ();
1251 } 1227 }
1252
1253 if (menubar_visible ())
1254 XMoveResizeWindow (disp, menuBar.win,
1255 window_vt_x, 0,
1256 width, menuBar_TotalHeight ());
1257 1228
1258 XMoveResizeWindow (disp, vt, 1229 XMoveResizeWindow (disp, vt,
1259 window_vt_x, window_vt_y, 1230 window_vt_x, window_vt_y,
1260 width, height); 1231 width, height);
1261 1232
… …
1446 unsigned long fg, bg; 1417 unsigned long fg, bg;
1447 const char *p; 1418 const char *p;
1448 char **s; 1419 char **s;
1449 XIMStyles *xim_styles; 1420 XIMStyles *xim_styles;
1450 1421
1451 TEMP_ENV; 1422 set_environ (envv);
1452 1423
1453 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1424 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1454 return false; 1425 return false;
1455 1426
1456 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1427 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1622 int i; 1593 int i;
1623 const char *p; 1594 const char *p;
1624 char **s; 1595 char **s;
1625 char buf[IMBUFSIZ]; 1596 char buf[IMBUFSIZ];
1626 1597
1627 SET_R (this); 1598 make_current ();
1628 1599
1629 im_destroy (); 1600 im_destroy ();
1630 1601
1631 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1602 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1632 if (Input_Context) 1603 if (Input_Context)

Diff Legend

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