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.174 by root, Thu Jan 12 00:11:13 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
484 const char **cmd_argv;
485
486 {
487 TEMP_ENV; // few things in X do not call setlocale :(
488
489 set_locale (""); 469 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :(
490 471
491 if (!init_vars ()) 472 if (!init_vars ())
492 return false; 473 return false;
493 474
494 init_secondary (); 475 init_secondary ();
495 476
496 cmd_argv = init_resources (argc, argv); 477 const char **cmd_argv = init_resources (argc, argv);
497 478
498#ifdef KEYSYM_RESOURCE 479#ifdef KEYSYM_RESOURCE
499 keyboard->register_done (); 480 keyboard->register_done ();
500#endif 481#endif
501 482
502#if MENUBAR_MAX
503 menubar_read (rs[Rs_menu]);
504#endif
505#ifdef HAVE_SCROLLBARS 483#ifdef HAVE_SCROLLBARS
506 if (OPTION (Opt_scrollBar)) 484 if (OPTION (Opt_scrollBar))
507 scrollBar.setIdle (); /* set existence for size calculations */ 485 scrollBar.setIdle (); /* set existence for size calculations */
508#endif 486#endif
509 }
510 487
511#if ENABLE_PERL 488#if ENABLE_PERL
512 if (!rs[Rs_perl_ext_1]) 489 if (!rs[Rs_perl_ext_1])
513 rs[Rs_perl_ext_1] = "default"; 490 rs[Rs_perl_ext_1] = "default";
514 491
… …
527 rs[Rs_perl_lib] = 0; 504 rs[Rs_perl_lib] = 0;
528 rs[Rs_perl_eval] = 0; 505 rs[Rs_perl_eval] = 0;
529 } 506 }
530 } 507 }
531#endif 508#endif
532 rxvt_perl.init (); 509 rxvt_perl.init (this);
533 setlocale (LC_CTYPE, curlocale); // perl destroys this info
534 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
535 } 511 }
536#endif 512#endif
537 513
538 { 514 pty = rxvt_new_ptytty ();
539 TEMP_ENV;
540 515
541 create_windows (argc, argv); 516 create_windows (argc, argv);
542 517
543 dDisp; 518 dDisp;
544 519
545 init_xlocale (); 520 init_xlocale ();
546 521
547 scr_reset (); // initialize screen 522 scr_reset (); // initialize screen
548 523
549#if 0 524#if 0
550 XSynchronize (disp, True); 525 XSynchronize (disp, True);
551#endif 526#endif
552 527
553#ifdef HAVE_SCROLLBARS 528#ifdef HAVE_SCROLLBARS
554 if (OPTION (Opt_scrollBar)) 529 if (OPTION (Opt_scrollBar))
555 resize_scrollbar (); /* create and map scrollbar */ 530 resize_scrollbar (); /* create and map scrollbar */
556#endif
557#if (MENUBAR_MAX)
558 if (menubar_visible ())
559 XMapWindow (disp, menuBar.win);
560#endif 531#endif
561#ifdef TRANSPARENT 532#ifdef TRANSPARENT
562 if (OPTION (Opt_transparent)) 533 if (OPTION (Opt_transparent))
563 { 534 {
564 XSelectInput (disp, display->root, PropertyChangeMask); 535 XSelectInput (disp, display->root, PropertyChangeMask);
565 check_our_parents (); 536 check_our_parents ();
566 rootwin_ev.start (display, display->root); 537 rootwin_ev.start (display, display->root);
567 } 538 }
568#endif 539#endif
569 540
570 XMapWindow (disp, vt); 541 XMapWindow (disp, vt);
571 XMapWindow (disp, parent[0]); 542 XMapWindow (disp, parent[0]);
572 543
573 set_colorfgbg (); 544 set_colorfgbg ();
574 545
575 init_command (cmd_argv); 546 init_command (cmd_argv);
576 547
577 free (cmd_argv); 548 free (cmd_argv);
578 549
579 if (pty.pty >= 0) 550 if (pty->pty >= 0)
580 pty_ev.start (pty.pty, EVENT_READ); 551 pty_ev.start (pty->pty, EVENT_READ);
581 552
582 check_ev.start (); 553 check_ev.start ();
583 554
584 HOOK_INVOKE ((this, HOOK_START, DT_END)); 555 HOOK_INVOKE ((this, HOOK_START, DT_END));
585 }
586 556
587 return true; 557 return true;
588} 558}
589 559
590static struct sig_handlers 560static struct sig_handlers
… …
625 sw_int (this, &sig_handlers::sig_term) 595 sw_int (this, &sig_handlers::sig_term)
626 { 596 {
627 } 597 }
628} sig_handlers; 598} sig_handlers;
629 599
600char **rxvt_environ; // startup environment
601
630void 602void
631rxvt_init () 603rxvt_init ()
632{ 604{
605 rxvt_environ = environ;
606
633 /* 607 /*
634 * Save and then give up any super-user privileges 608 * Save and then give up any super-user privileges
635 * 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.
636 * We should only need to be root in these cases: 610 * We should only need to be root in these cases:
637 * 1. write utmp entries on some systems 611 * 1. write utmp entries on some systems
… …
745 719
746#ifdef UTMP_SUPPORT 720#ifdef UTMP_SUPPORT
747void 721void
748rxvt_term::privileged_utmp (rxvt_privaction action) 722rxvt_term::privileged_utmp (rxvt_privaction action)
749{ 723{
750 if (OPTION (Opt_utmpInhibit) 724 if (OPTION (Opt_utmpInhibit))
751 || !pty.name || !*pty.name)
752 return; 725 return;
753 726
754 rxvt_privileges (RESTORE); 727 rxvt_privileges (RESTORE);
755 728
756 if (action == SAVE) 729 if (action == SAVE)
757 makeutent (pty.name, rs[Rs_display_name]); 730 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
758 else 731 else
759 cleanutent (); 732 pty->logout ();
760 733
761 rxvt_privileges (IGNORE); 734 rxvt_privileges (IGNORE);
762} 735}
763#endif 736#endif
764 737
… …
769 */ 742 */
770void 743void
771rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 744rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
772{ 745{
773 short recalc_x, recalc_y; 746 short recalc_x, recalc_y;
774 int x, y, sb_w, mb_h, flags; 747 int x, y, sb_w, flags;
775 unsigned int w, h; 748 unsigned int w, h;
776 unsigned int max_width, max_height; 749 unsigned int max_width, max_height;
777 dDisp; 750 dDisp;
778 751
779 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",
… …
840 max_width = MAX_COLS * fwidth; 813 max_width = MAX_COLS * fwidth;
841 max_height = MAX_ROWS * fheight; 814 max_height = MAX_ROWS * fheight;
842 815
843 szHint.base_width = szHint.base_height = 2 * int_bwidth; 816 szHint.base_width = szHint.base_height = 2 * int_bwidth;
844 817
845 sb_w = mb_h = 0; 818 sb_w = 0;
846 window_vt_x = window_vt_y = int_bwidth; 819 window_vt_x = window_vt_y = int_bwidth;
847 820
848 if (scrollbar_visible ()) 821 if (scrollBar.state)
849 { 822 {
850 sb_w = scrollbar_TotalWidth (); 823 sb_w = scrollbar_TotalWidth ();
851 szHint.base_width += sb_w; 824 szHint.base_width += sb_w;
852 if (!OPTION (Opt_scrollBar_right)) 825 if (!OPTION (Opt_scrollBar_right))
853 window_vt_x += sb_w; 826 window_vt_x += sb_w;
854 } 827 }
855 828
856 if (menubar_visible ())
857 {
858 mb_h = menuBar_TotalHeight ();
859 szHint.base_height += mb_h;
860 window_vt_y += mb_h;
861 }
862
863 szHint.width_inc = fwidth; 829 szHint.width_inc = fwidth;
864 szHint.height_inc = fheight; 830 szHint.height_inc = fheight;
865 szHint.min_width = szHint.base_width + szHint.width_inc; 831 szHint.min_width = szHint.base_width + szHint.width_inc;
866 szHint.min_height = szHint.base_height + szHint.height_inc; 832 szHint.min_height = szHint.base_height + szHint.height_inc;
867 833
… …
885 { 851 {
886 min_it (height, max_height); 852 min_it (height, max_height);
887 szHint.height = szHint.base_height + height; 853 szHint.height = szHint.base_height + height;
888 } 854 }
889 855
890 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 856 if (scrollBar.state && OPTION (Opt_scrollBar_right))
891 window_sb_x = szHint.width - sb_w; 857 window_sb_x = szHint.width - sb_w;
892 858
893 if (recalc_x) 859 if (recalc_x)
894 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 860 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
895 if (recalc_y) 861 if (recalc_y)
… …
909 * Called after a window size change. 875 * Called after a window size change.
910 */ 876 */
911void 877void
912rxvt_term::tt_winch () 878rxvt_term::tt_winch ()
913{ 879{
914 if (pty.pty < 0) 880 if (pty->pty < 0)
915 return; 881 return;
916 882
917 struct winsize ws; 883 struct winsize ws;
918 884
919 ws.ws_col = ncol; 885 ws.ws_col = ncol;
920 ws.ws_row = nrow; 886 ws.ws_row = nrow;
921 ws.ws_xpixel = width; 887 ws.ws_xpixel = width;
922 ws.ws_ypixel = height; 888 ws.ws_ypixel = height;
923 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 889 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
924 890
925#if 0 891#if 0
926 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 892 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
927 if (cmd_pid) /* force through to the command */ 893 if (cmd_pid) /* force through to the command */
928 kill (-cmd_pid, SIGWINCH); 894 kill (-cmd_pid, SIGWINCH);
… …
1250 1216
1251 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1217 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1252 1218
1253 if (fix_screen || newwidth != old_width || newheight != old_height) 1219 if (fix_screen || newwidth != old_width || newheight != old_height)
1254 { 1220 {
1255 if (scrollbar_visible ()) 1221 if (scrollBar.state)
1256 { 1222 {
1257 XMoveResizeWindow (disp, scrollBar.win, 1223 XMoveResizeWindow (disp, scrollBar.win,
1258 window_sb_x, 0, 1224 window_sb_x, 0,
1259 scrollbar_TotalWidth (), szHint.height); 1225 scrollbar_TotalWidth (), szHint.height);
1260 resize_scrollbar (); 1226 resize_scrollbar ();
1261 } 1227 }
1262
1263 if (menubar_visible ())
1264 XMoveResizeWindow (disp, menuBar.win,
1265 window_vt_x, 0,
1266 width, menuBar_TotalHeight ());
1267 1228
1268 XMoveResizeWindow (disp, vt, 1229 XMoveResizeWindow (disp, vt,
1269 window_vt_x, window_vt_y, 1230 window_vt_x, window_vt_y,
1270 width, height); 1231 width, height);
1271 1232
… …
1456 unsigned long fg, bg; 1417 unsigned long fg, bg;
1457 const char *p; 1418 const char *p;
1458 char **s; 1419 char **s;
1459 XIMStyles *xim_styles; 1420 XIMStyles *xim_styles;
1460 1421
1461 TEMP_ENV; 1422 set_environ (envv);
1462 1423
1463 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1424 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1464 return false; 1425 return false;
1465 1426
1466 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1427 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1632 int i; 1593 int i;
1633 const char *p; 1594 const char *p;
1634 char **s; 1595 char **s;
1635 char buf[IMBUFSIZ]; 1596 char buf[IMBUFSIZ];
1636 1597
1637 SET_R (this); 1598 make_current ();
1638 1599
1639 im_destroy (); 1600 im_destroy ();
1640 1601
1641 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1602 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1642 if (Input_Context) 1603 if (Input_Context)

Diff Legend

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