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.168 by root, Sun Jan 8 08:49:20 2006 UTC vs.
Revision 1.185 by root, Tue Jan 17 15:17:39 2006 UTC

… …
76 strncpy (curlocale, locale, 128); 76 strncpy (curlocale, locale, 128);
77 setlocale (LC_CTYPE, curlocale); 77 setlocale (LC_CTYPE, curlocale);
78 return true; 78 return true;
79} 79}
80 80
81bool 81void
82rxvt_push_locale (const char *locale) 82rxvt_push_locale (const char *locale)
83{ 83{
84 strcpy (savelocale, curlocale); 84 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale); 85 rxvt_set_locale (locale);
86} 86}
… …
160#if TRANSPARENT 160#if TRANSPARENT
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
166#ifdef MENUBAR
167 menubar_ev (this, &rxvt_term::x_cb),
168#endif 165#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
… …
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
294#if USE_XGETDEFAULT
295 XrmDestroyDatabase (xrmdatabase);
296#endif 281#endif
297 282
298 displays.put (display); 283 displays.put (display);
299 284
300 scr_release (); 285 scr_release ();
… …
346 im_ev.stop (display); 331 im_ev.stop (display);
347#endif 332#endif
348#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
349 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
350#endif 335#endif
351#if MENUBAR
352 menubar_ev.stop (display);
353#endif
354#if TRANSPARENT 336#if TRANSPARENT
355 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
356#endif 338#endif
357 incr_ev.stop (); 339 incr_ev.stop ();
358 termwin_ev.stop (display); 340 termwin_ev.stop (display);
… …
381} 363}
382 364
383void 365void
384rxvt_term::destroy_cb (time_watcher &w) 366rxvt_term::destroy_cb (time_watcher &w)
385{ 367{
386 SET_R (this); 368 make_current ();
387 369
388 delete this; 370 delete this;
389} 371}
390 372
391/*----------------------------------------------------------------------*/ 373/*----------------------------------------------------------------------*/
… …
482/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
483bool 465bool
484rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv)
485{ 467{
486 SET_R (this); 468 SET_R (this);
487
488 set_locale (""); 469 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :(
489 471
490 if (!init_vars ()) 472 if (!init_vars ())
491 return false; 473 return false;
492 474
493 init_secondary (); 475 init_secondary ();
… …
496 478
497#ifdef KEYSYM_RESOURCE 479#ifdef KEYSYM_RESOURCE
498 keyboard->register_done (); 480 keyboard->register_done ();
499#endif 481#endif
500 482
501#if MENUBAR_MAX
502 menubar_read (rs[Rs_menu]);
503#endif
504#ifdef HAVE_SCROLLBARS 483#ifdef HAVE_SCROLLBARS
505 if (OPTION (Opt_scrollBar)) 484 if (OPTION (Opt_scrollBar))
506 scrollBar.setIdle (); /* set existence for size calculations */ 485 scrollBar.setIdle (); /* set existence for size calculations */
507#endif 486#endif
508 487
… …
525 rs[Rs_perl_lib] = 0; 504 rs[Rs_perl_lib] = 0;
526 rs[Rs_perl_eval] = 0; 505 rs[Rs_perl_eval] = 0;
527 } 506 }
528 } 507 }
529#endif 508#endif
530 rxvt_perl.init (); 509 rxvt_perl.init (this);
531 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
532 } 511 }
533#endif 512#endif
534 513
514 pty = rxvt_new_ptytty ();
515
535 create_windows (argc, argv); 516 create_windows (argc, argv);
536 517
537 dDisp; 518 dDisp;
538 519
539 init_xlocale (); 520 init_xlocale ();
540 521
541 scr_reset (); /* initialize screen */ 522 scr_reset (); // initialize screen
542 523
543#if 0 524#if 0
544 XSynchronize (disp, True); 525 XSynchronize (disp, True);
545#endif 526#endif
546 527
547#ifdef HAVE_SCROLLBARS 528#ifdef HAVE_SCROLLBARS
548 if (OPTION (Opt_scrollBar)) 529 if (OPTION (Opt_scrollBar))
549 resize_scrollbar (); /* create and map scrollbar */ 530 resize_scrollbar (); /* create and map scrollbar */
550#endif 531#endif
551#if (MENUBAR_MAX)
552 if (menubar_visible ())
553 XMapWindow (disp, menuBar.win);
554#endif
555#ifdef TRANSPARENT 532#ifdef TRANSPARENT
556 if (OPTION (Opt_transparent)) 533 if (OPTION (Opt_transparent))
557 { 534 {
558 XSelectInput (disp, display->root, PropertyChangeMask); 535 XSelectInput (disp, display->root, PropertyChangeMask);
559 check_our_parents (); 536 check_our_parents ();
… …
568 545
569 init_command (cmd_argv); 546 init_command (cmd_argv);
570 547
571 free (cmd_argv); 548 free (cmd_argv);
572 549
573 if (pty.pty >= 0) 550 if (pty->pty >= 0)
574 pty_ev.start (pty.pty, EVENT_READ); 551 pty_ev.start (pty->pty, EVENT_READ);
575 552
576 check_ev.start (); 553 check_ev.start ();
577 554
578 HOOK_INVOKE ((this, HOOK_START, DT_END)); 555 HOOK_INVOKE ((this, HOOK_START, DT_END));
579 556
… …
618 sw_int (this, &sig_handlers::sig_term) 595 sw_int (this, &sig_handlers::sig_term)
619 { 596 {
620 } 597 }
621} sig_handlers; 598} sig_handlers;
622 599
600char **rxvt_environ; // startup environment
601
623void 602void
624rxvt_init () 603rxvt_init ()
625{ 604{
605 rxvt_environ = environ;
606
626 /* 607 /*
627 * Save and then give up any super-user privileges 608 * Save and then give up any super-user privileges
628 * 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.
629 * We should only need to be root in these cases: 610 * We should only need to be root in these cases:
630 * 1. write utmp entries on some systems 611 * 1. write utmp entries on some systems
… …
645 626
646 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
647 // TODO: handle this with exceptions and tolerate the memory loss 628 // TODO: handle this with exceptions and tolerate the memory loss
648 XSetIOErrorHandler (rxvt_xioerror_handler); 629 XSetIOErrorHandler (rxvt_xioerror_handler);
649 630
650#ifdef USE_XGETDEFAULT
651 XrmInitialize (); 631 XrmInitialize ();
652#endif
653} 632}
654 633
655/* ------------------------------------------------------------------------- * 634/* ------------------------------------------------------------------------- *
656 * MEMORY ALLOCATION WRAPPERS * 635 * MEMORY ALLOCATION WRAPPERS *
657 * ------------------------------------------------------------------------- */ 636 * ------------------------------------------------------------------------- */
… …
708 case IGNORE: 687 case IGNORE:
709 /* 688 /*
710 * 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
711 * back to root later, as required 690 * back to root later, as required
712 */ 691 */
692 setegid (getgid ());
713 seteuid (getuid ()); 693 seteuid (getuid ());
714 setegid (getgid ());
715 break; 694 break;
716 case SAVE: 695 case SAVE:
696 saved_egid = getegid ();
717 saved_euid = geteuid (); 697 saved_euid = geteuid ();
718 saved_egid = getegid ();
719 break; 698 break;
720 case RESTORE: 699 case RESTORE:
700 setegid (saved_egid);
721 seteuid (saved_euid); 701 seteuid (saved_euid);
722 setegid (saved_egid);
723 break; 702 break;
724 } 703 }
725# else 704# else
726 switch (action) 705 switch (action)
727 { 706 {
728 case IGNORE: 707 case IGNORE:
708 setgid (getgid ());
729 setuid (getuid ()); 709 setuid (getuid ());
730 setgid (getgid ());
731 /* FALLTHROUGH */ 710 /* FALLTHROUGH */
732 case SAVE: 711 case SAVE:
733 /* FALLTHROUGH */ 712 /* FALLTHROUGH */
734 case RESTORE: 713 case RESTORE:
735 break; 714 break;
736 } 715 }
737# endif 716# endif
738#endif 717#endif
739} 718}
740 719
741#ifdef UTMP_SUPPORT
742void
743rxvt_term::privileged_utmp (rxvt_privaction action)
744{
745 if (OPTION (Opt_utmpInhibit)
746 || !pty.name || !*pty.name)
747 return;
748
749 rxvt_privileges (RESTORE);
750
751 if (action == SAVE)
752 makeutent (pty.name, rs[Rs_display_name]);
753 else
754 cleanutent ();
755
756 rxvt_privileges (IGNORE);
757}
758#endif
759
760/*----------------------------------------------------------------------*/ 720/*----------------------------------------------------------------------*/
761/* 721/*
762 * window size/position calculcations for XSizeHint and other storage. 722 * window size/position calculcations for XSizeHint and other storage.
763 * if width/height are non-zero then override calculated width/height 723 * if width/height are non-zero then override calculated width/height
764 */ 724 */
765void 725void
766rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 726rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
767{ 727{
768 short recalc_x, recalc_y; 728 short recalc_x, recalc_y;
769 int x, y, sb_w, mb_h, flags; 729 int x, y, sb_w, flags;
770 unsigned int w, h; 730 unsigned int w, h;
771 unsigned int max_width, max_height; 731 unsigned int max_width, max_height;
772 dDisp; 732 dDisp;
773 733
774 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 734 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
835 max_width = MAX_COLS * fwidth; 795 max_width = MAX_COLS * fwidth;
836 max_height = MAX_ROWS * fheight; 796 max_height = MAX_ROWS * fheight;
837 797
838 szHint.base_width = szHint.base_height = 2 * int_bwidth; 798 szHint.base_width = szHint.base_height = 2 * int_bwidth;
839 799
840 sb_w = mb_h = 0; 800 sb_w = 0;
841 window_vt_x = window_vt_y = int_bwidth; 801 window_vt_x = window_vt_y = int_bwidth;
842 802
843 if (scrollbar_visible ()) 803 if (scrollBar.state)
844 { 804 {
845 sb_w = scrollbar_TotalWidth (); 805 sb_w = scrollbar_TotalWidth ();
846 szHint.base_width += sb_w; 806 szHint.base_width += sb_w;
847 if (!OPTION (Opt_scrollBar_right)) 807 if (!OPTION (Opt_scrollBar_right))
848 window_vt_x += sb_w; 808 window_vt_x += sb_w;
849 } 809 }
850 810
851 if (menubar_visible ())
852 {
853 mb_h = menuBar_TotalHeight ();
854 szHint.base_height += mb_h;
855 window_vt_y += mb_h;
856 }
857
858 szHint.width_inc = fwidth; 811 szHint.width_inc = fwidth;
859 szHint.height_inc = fheight; 812 szHint.height_inc = fheight;
860 szHint.min_width = szHint.base_width + szHint.width_inc; 813 szHint.min_width = szHint.base_width + szHint.width_inc;
861 szHint.min_height = szHint.base_height + szHint.height_inc; 814 szHint.min_height = szHint.base_height + szHint.height_inc;
862 815
… …
880 { 833 {
881 min_it (height, max_height); 834 min_it (height, max_height);
882 szHint.height = szHint.base_height + height; 835 szHint.height = szHint.base_height + height;
883 } 836 }
884 837
885 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 838 if (scrollBar.state && OPTION (Opt_scrollBar_right))
886 window_sb_x = szHint.width - sb_w; 839 window_sb_x = szHint.width - sb_w;
887 840
888 if (recalc_x) 841 if (recalc_x)
889 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 842 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
890 if (recalc_y) 843 if (recalc_y)
… …
904 * Called after a window size change. 857 * Called after a window size change.
905 */ 858 */
906void 859void
907rxvt_term::tt_winch () 860rxvt_term::tt_winch ()
908{ 861{
909 if (pty.pty < 0) 862 if (pty->pty < 0)
910 return; 863 return;
911 864
912 struct winsize ws; 865 struct winsize ws;
913 866
914 ws.ws_col = ncol; 867 ws.ws_col = ncol;
915 ws.ws_row = nrow; 868 ws.ws_row = nrow;
916 ws.ws_xpixel = width; 869 ws.ws_xpixel = width;
917 ws.ws_ypixel = height; 870 ws.ws_ypixel = height;
918 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 871 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
919 872
920#if 0 873#if 0
921 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 874 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
922 if (cmd_pid) /* force through to the command */ 875 if (cmd_pid) /* force through to the command */
923 kill (-cmd_pid, SIGWINCH); 876 kill (-cmd_pid, SIGWINCH);
… …
1245 1198
1246 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1199 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1247 1200
1248 if (fix_screen || newwidth != old_width || newheight != old_height) 1201 if (fix_screen || newwidth != old_width || newheight != old_height)
1249 { 1202 {
1250 if (scrollbar_visible ()) 1203 if (scrollBar.state)
1251 { 1204 {
1252 XMoveResizeWindow (disp, scrollBar.win, 1205 XMoveResizeWindow (disp, scrollBar.win,
1253 window_sb_x, 0, 1206 window_sb_x, 0,
1254 scrollbar_TotalWidth (), szHint.height); 1207 scrollbar_TotalWidth (), szHint.height);
1255 resize_scrollbar (); 1208 resize_scrollbar ();
1256 } 1209 }
1257
1258 if (menubar_visible ())
1259 XMoveResizeWindow (disp, menuBar.win,
1260 window_vt_x, 0,
1261 width, menuBar_TotalHeight ());
1262 1210
1263 XMoveResizeWindow (disp, vt, 1211 XMoveResizeWindow (disp, vt,
1264 window_vt_x, window_vt_y, 1212 window_vt_x, window_vt_y,
1265 width, height); 1213 width, height);
1266 1214
… …
1450 XRectangle rect, status_rect, needed_rect; 1398 XRectangle rect, status_rect, needed_rect;
1451 unsigned long fg, bg; 1399 unsigned long fg, bg;
1452 const char *p; 1400 const char *p;
1453 char **s; 1401 char **s;
1454 XIMStyles *xim_styles; 1402 XIMStyles *xim_styles;
1403
1404 set_environ (envv);
1455 1405
1456 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1406 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1457 return false; 1407 return false;
1458 1408
1459 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1409 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1625 int i; 1575 int i;
1626 const char *p; 1576 const char *p;
1627 char **s; 1577 char **s;
1628 char buf[IMBUFSIZ]; 1578 char buf[IMBUFSIZ];
1629 1579
1630 SET_R (this); 1580 make_current ();
1631 1581
1632 im_destroy (); 1582 im_destroy ();
1633 1583
1634 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1584 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1635 if (Input_Context) 1585 if (Input_Context)

Diff Legend

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