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.179 by root, Mon Jan 16 08:48:09 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 }
… …
341#if USE_XIM 330#if USE_XIM
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
347#if MENUBAR
348 menubar_ev.stop (display);
349#endif 335#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 ();
… …
492 478
493#ifdef KEYSYM_RESOURCE 479#ifdef KEYSYM_RESOURCE
494 keyboard->register_done (); 480 keyboard->register_done ();
495#endif 481#endif
496 482
497#if MENUBAR_MAX
498 menubar_read (rs[Rs_menu]);
499#endif
500#ifdef HAVE_SCROLLBARS 483#ifdef HAVE_SCROLLBARS
501 if (OPTION (Opt_scrollBar)) 484 if (OPTION (Opt_scrollBar))
502 scrollBar.setIdle (); /* set existence for size calculations */ 485 scrollBar.setIdle (); /* set existence for size calculations */
503#endif 486#endif
504 487
… …
526 rxvt_perl.init (this); 509 rxvt_perl.init (this);
527 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
528 } 511 }
529#endif 512#endif
530 513
514 pty = rxvt_new_ptytty ();
515
531 create_windows (argc, argv); 516 create_windows (argc, argv);
532 517
533 dDisp; 518 dDisp;
534 519
535 init_xlocale (); 520 init_xlocale ();
… …
542 527
543#ifdef HAVE_SCROLLBARS 528#ifdef HAVE_SCROLLBARS
544 if (OPTION (Opt_scrollBar)) 529 if (OPTION (Opt_scrollBar))
545 resize_scrollbar (); /* create and map scrollbar */ 530 resize_scrollbar (); /* create and map scrollbar */
546#endif 531#endif
547#if (MENUBAR_MAX)
548 if (menubar_visible ())
549 XMapWindow (disp, menuBar.win);
550#endif
551#ifdef TRANSPARENT 532#ifdef TRANSPARENT
552 if (OPTION (Opt_transparent)) 533 if (OPTION (Opt_transparent))
553 { 534 {
554 XSelectInput (disp, display->root, PropertyChangeMask); 535 XSelectInput (disp, display->root, PropertyChangeMask);
555 check_our_parents (); 536 check_our_parents ();
… …
564 545
565 init_command (cmd_argv); 546 init_command (cmd_argv);
566 547
567 free (cmd_argv); 548 free (cmd_argv);
568 549
569 if (pty.pty >= 0) 550 if (pty->pty >= 0)
570 pty_ev.start (pty.pty, EVENT_READ); 551 pty_ev.start (pty->pty, EVENT_READ);
571 552
572 check_ev.start (); 553 check_ev.start ();
573 554
574 HOOK_INVOKE ((this, HOOK_START, DT_END)); 555 HOOK_INVOKE ((this, HOOK_START, DT_END));
575 556
… …
738 719
739#ifdef UTMP_SUPPORT 720#ifdef UTMP_SUPPORT
740void 721void
741rxvt_term::privileged_utmp (rxvt_privaction action) 722rxvt_term::privileged_utmp (rxvt_privaction action)
742{ 723{
743 if (OPTION (Opt_utmpInhibit) 724 if (OPTION (Opt_utmpInhibit))
744 || !pty.name || !*pty.name)
745 return; 725 return;
746 726
747 rxvt_privileges (RESTORE); 727 rxvt_privileges (RESTORE);
748 728
749 if (action == SAVE) 729 if (action == SAVE)
750 makeutent (pty.name, rs[Rs_display_name]); 730 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
751 else 731 else
752 cleanutent (); 732 pty->logout ();
753 733
754 rxvt_privileges (IGNORE); 734 rxvt_privileges (IGNORE);
755} 735}
756#endif 736#endif
757 737
… …
762 */ 742 */
763void 743void
764rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 744rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
765{ 745{
766 short recalc_x, recalc_y; 746 short recalc_x, recalc_y;
767 int x, y, sb_w, mb_h, flags; 747 int x, y, sb_w, flags;
768 unsigned int w, h; 748 unsigned int w, h;
769 unsigned int max_width, max_height; 749 unsigned int max_width, max_height;
770 dDisp; 750 dDisp;
771 751
772 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",
… …
833 max_width = MAX_COLS * fwidth; 813 max_width = MAX_COLS * fwidth;
834 max_height = MAX_ROWS * fheight; 814 max_height = MAX_ROWS * fheight;
835 815
836 szHint.base_width = szHint.base_height = 2 * int_bwidth; 816 szHint.base_width = szHint.base_height = 2 * int_bwidth;
837 817
838 sb_w = mb_h = 0; 818 sb_w = 0;
839 window_vt_x = window_vt_y = int_bwidth; 819 window_vt_x = window_vt_y = int_bwidth;
840 820
841 if (scrollbar_visible ()) 821 if (scrollBar.state)
842 { 822 {
843 sb_w = scrollbar_TotalWidth (); 823 sb_w = scrollbar_TotalWidth ();
844 szHint.base_width += sb_w; 824 szHint.base_width += sb_w;
845 if (!OPTION (Opt_scrollBar_right)) 825 if (!OPTION (Opt_scrollBar_right))
846 window_vt_x += sb_w; 826 window_vt_x += sb_w;
847 } 827 }
848 828
849 if (menubar_visible ())
850 {
851 mb_h = menuBar_TotalHeight ();
852 szHint.base_height += mb_h;
853 window_vt_y += mb_h;
854 }
855
856 szHint.width_inc = fwidth; 829 szHint.width_inc = fwidth;
857 szHint.height_inc = fheight; 830 szHint.height_inc = fheight;
858 szHint.min_width = szHint.base_width + szHint.width_inc; 831 szHint.min_width = szHint.base_width + szHint.width_inc;
859 szHint.min_height = szHint.base_height + szHint.height_inc; 832 szHint.min_height = szHint.base_height + szHint.height_inc;
860 833
… …
878 { 851 {
879 min_it (height, max_height); 852 min_it (height, max_height);
880 szHint.height = szHint.base_height + height; 853 szHint.height = szHint.base_height + height;
881 } 854 }
882 855
883 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 856 if (scrollBar.state && OPTION (Opt_scrollBar_right))
884 window_sb_x = szHint.width - sb_w; 857 window_sb_x = szHint.width - sb_w;
885 858
886 if (recalc_x) 859 if (recalc_x)
887 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 860 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
888 if (recalc_y) 861 if (recalc_y)
… …
902 * Called after a window size change. 875 * Called after a window size change.
903 */ 876 */
904void 877void
905rxvt_term::tt_winch () 878rxvt_term::tt_winch ()
906{ 879{
907 if (pty.pty < 0) 880 if (pty->pty < 0)
908 return; 881 return;
909 882
910 struct winsize ws; 883 struct winsize ws;
911 884
912 ws.ws_col = ncol; 885 ws.ws_col = ncol;
913 ws.ws_row = nrow; 886 ws.ws_row = nrow;
914 ws.ws_xpixel = width; 887 ws.ws_xpixel = width;
915 ws.ws_ypixel = height; 888 ws.ws_ypixel = height;
916 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 889 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
917 890
918#if 0 891#if 0
919 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 892 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
920 if (cmd_pid) /* force through to the command */ 893 if (cmd_pid) /* force through to the command */
921 kill (-cmd_pid, SIGWINCH); 894 kill (-cmd_pid, SIGWINCH);
… …
1243 1216
1244 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1217 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1245 1218
1246 if (fix_screen || newwidth != old_width || newheight != old_height) 1219 if (fix_screen || newwidth != old_width || newheight != old_height)
1247 { 1220 {
1248 if (scrollbar_visible ()) 1221 if (scrollBar.state)
1249 { 1222 {
1250 XMoveResizeWindow (disp, scrollBar.win, 1223 XMoveResizeWindow (disp, scrollBar.win,
1251 window_sb_x, 0, 1224 window_sb_x, 0,
1252 scrollbar_TotalWidth (), szHint.height); 1225 scrollbar_TotalWidth (), szHint.height);
1253 resize_scrollbar (); 1226 resize_scrollbar ();
1254 } 1227 }
1255
1256 if (menubar_visible ())
1257 XMoveResizeWindow (disp, menuBar.win,
1258 window_vt_x, 0,
1259 width, menuBar_TotalHeight ());
1260 1228
1261 XMoveResizeWindow (disp, vt, 1229 XMoveResizeWindow (disp, vt,
1262 window_vt_x, window_vt_y, 1230 window_vt_x, window_vt_y,
1263 width, height); 1231 width, height);
1264 1232

Diff Legend

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