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.178 by root, Mon Jan 16 08:29:57 2006 UTC vs.
Revision 1.181 by root, Tue Jan 17 06:06:42 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),
… …
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
… …
521 rs[Rs_perl_lib] = 0; 504 rs[Rs_perl_lib] = 0;
522 rs[Rs_perl_eval] = 0; 505 rs[Rs_perl_eval] = 0;
523 } 506 }
524 } 507 }
525#endif 508#endif
526 rxvt_perl.init (); 509 rxvt_perl.init (this);
527 setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
528 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
529 } 511 }
530#endif 512#endif
531 513
532 create_windows (argc, argv); 514 create_windows (argc, argv);
… …
542#endif 524#endif
543 525
544#ifdef HAVE_SCROLLBARS 526#ifdef HAVE_SCROLLBARS
545 if (OPTION (Opt_scrollBar)) 527 if (OPTION (Opt_scrollBar))
546 resize_scrollbar (); /* create and map scrollbar */ 528 resize_scrollbar (); /* create and map scrollbar */
547#endif
548#if (MENUBAR_MAX)
549 if (menubar_visible ())
550 XMapWindow (disp, menuBar.win);
551#endif 529#endif
552#ifdef TRANSPARENT 530#ifdef TRANSPARENT
553 if (OPTION (Opt_transparent)) 531 if (OPTION (Opt_transparent))
554 { 532 {
555 XSelectInput (disp, display->root, PropertyChangeMask); 533 XSelectInput (disp, display->root, PropertyChangeMask);
… …
746 return; 724 return;
747 725
748 rxvt_privileges (RESTORE); 726 rxvt_privileges (RESTORE);
749 727
750 if (action == SAVE) 728 if (action == SAVE)
751 makeutent (pty.name, rs[Rs_display_name]); 729 session.login (pty.name, cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
752 else 730 else
753 cleanutent (); 731 session.logout ();
754 732
755 rxvt_privileges (IGNORE); 733 rxvt_privileges (IGNORE);
756} 734}
757#endif 735#endif
758 736
… …
763 */ 741 */
764void 742void
765rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 743rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
766{ 744{
767 short recalc_x, recalc_y; 745 short recalc_x, recalc_y;
768 int x, y, sb_w, mb_h, flags; 746 int x, y, sb_w, flags;
769 unsigned int w, h; 747 unsigned int w, h;
770 unsigned int max_width, max_height; 748 unsigned int max_width, max_height;
771 dDisp; 749 dDisp;
772 750
773 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 751 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
834 max_width = MAX_COLS * fwidth; 812 max_width = MAX_COLS * fwidth;
835 max_height = MAX_ROWS * fheight; 813 max_height = MAX_ROWS * fheight;
836 814
837 szHint.base_width = szHint.base_height = 2 * int_bwidth; 815 szHint.base_width = szHint.base_height = 2 * int_bwidth;
838 816
839 sb_w = mb_h = 0; 817 sb_w = 0;
840 window_vt_x = window_vt_y = int_bwidth; 818 window_vt_x = window_vt_y = int_bwidth;
841 819
842 if (scrollbar_visible ()) 820 if (scrollBar.state)
843 { 821 {
844 sb_w = scrollbar_TotalWidth (); 822 sb_w = scrollbar_TotalWidth ();
845 szHint.base_width += sb_w; 823 szHint.base_width += sb_w;
846 if (!OPTION (Opt_scrollBar_right)) 824 if (!OPTION (Opt_scrollBar_right))
847 window_vt_x += sb_w; 825 window_vt_x += sb_w;
848 } 826 }
849 827
850 if (menubar_visible ())
851 {
852 mb_h = menuBar_TotalHeight ();
853 szHint.base_height += mb_h;
854 window_vt_y += mb_h;
855 }
856
857 szHint.width_inc = fwidth; 828 szHint.width_inc = fwidth;
858 szHint.height_inc = fheight; 829 szHint.height_inc = fheight;
859 szHint.min_width = szHint.base_width + szHint.width_inc; 830 szHint.min_width = szHint.base_width + szHint.width_inc;
860 szHint.min_height = szHint.base_height + szHint.height_inc; 831 szHint.min_height = szHint.base_height + szHint.height_inc;
861 832
… …
879 { 850 {
880 min_it (height, max_height); 851 min_it (height, max_height);
881 szHint.height = szHint.base_height + height; 852 szHint.height = szHint.base_height + height;
882 } 853 }
883 854
884 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 855 if (scrollBar.state && OPTION (Opt_scrollBar_right))
885 window_sb_x = szHint.width - sb_w; 856 window_sb_x = szHint.width - sb_w;
886 857
887 if (recalc_x) 858 if (recalc_x)
888 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 859 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
889 if (recalc_y) 860 if (recalc_y)
… …
1244 1215
1245 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1216 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1246 1217
1247 if (fix_screen || newwidth != old_width || newheight != old_height) 1218 if (fix_screen || newwidth != old_width || newheight != old_height)
1248 { 1219 {
1249 if (scrollbar_visible ()) 1220 if (scrollBar.state)
1250 { 1221 {
1251 XMoveResizeWindow (disp, scrollBar.win, 1222 XMoveResizeWindow (disp, scrollBar.win,
1252 window_sb_x, 0, 1223 window_sb_x, 0,
1253 scrollbar_TotalWidth (), szHint.height); 1224 scrollbar_TotalWidth (), szHint.height);
1254 resize_scrollbar (); 1225 resize_scrollbar ();
1255 } 1226 }
1256
1257 if (menubar_visible ())
1258 XMoveResizeWindow (disp, menuBar.win,
1259 window_vt_x, 0,
1260 width, menuBar_TotalHeight ());
1261 1227
1262 XMoveResizeWindow (disp, vt, 1228 XMoveResizeWindow (disp, vt,
1263 window_vt_x, window_vt_y, 1229 window_vt_x, window_vt_y,
1264 width, height); 1230 width, height);
1265 1231

Diff Legend

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