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.175 by root, Thu Jan 12 00:35:39 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 }
… …
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 setlocale (LC_CTYPE, curlocale); // perl init destroys this info
529 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
530 } 511 }
531#endif 512#endif
532 513
533 create_windows (argc, argv); 514 create_windows (argc, argv);
… …
543#endif 524#endif
544 525
545#ifdef HAVE_SCROLLBARS 526#ifdef HAVE_SCROLLBARS
546 if (OPTION (Opt_scrollBar)) 527 if (OPTION (Opt_scrollBar))
547 resize_scrollbar (); /* create and map scrollbar */ 528 resize_scrollbar (); /* create and map scrollbar */
548#endif
549#if (MENUBAR_MAX)
550 if (menubar_visible ())
551 XMapWindow (disp, menuBar.win);
552#endif 529#endif
553#ifdef TRANSPARENT 530#ifdef TRANSPARENT
554 if (OPTION (Opt_transparent)) 531 if (OPTION (Opt_transparent))
555 { 532 {
556 XSelectInput (disp, display->root, PropertyChangeMask); 533 XSelectInput (disp, display->root, PropertyChangeMask);
… …
747 return; 724 return;
748 725
749 rxvt_privileges (RESTORE); 726 rxvt_privileges (RESTORE);
750 727
751 if (action == SAVE) 728 if (action == SAVE)
752 makeutent (pty.name, rs[Rs_display_name]); 729 session.login (pty.name, cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
753 else 730 else
754 cleanutent (); 731 session.logout ();
755 732
756 rxvt_privileges (IGNORE); 733 rxvt_privileges (IGNORE);
757} 734}
758#endif 735#endif
759 736
… …
764 */ 741 */
765void 742void
766rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 743rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
767{ 744{
768 short recalc_x, recalc_y; 745 short recalc_x, recalc_y;
769 int x, y, sb_w, mb_h, flags; 746 int x, y, sb_w, flags;
770 unsigned int w, h; 747 unsigned int w, h;
771 unsigned int max_width, max_height; 748 unsigned int max_width, max_height;
772 dDisp; 749 dDisp;
773 750
774 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",
… …
835 max_width = MAX_COLS * fwidth; 812 max_width = MAX_COLS * fwidth;
836 max_height = MAX_ROWS * fheight; 813 max_height = MAX_ROWS * fheight;
837 814
838 szHint.base_width = szHint.base_height = 2 * int_bwidth; 815 szHint.base_width = szHint.base_height = 2 * int_bwidth;
839 816
840 sb_w = mb_h = 0; 817 sb_w = 0;
841 window_vt_x = window_vt_y = int_bwidth; 818 window_vt_x = window_vt_y = int_bwidth;
842 819
843 if (scrollbar_visible ()) 820 if (scrollBar.state)
844 { 821 {
845 sb_w = scrollbar_TotalWidth (); 822 sb_w = scrollbar_TotalWidth ();
846 szHint.base_width += sb_w; 823 szHint.base_width += sb_w;
847 if (!OPTION (Opt_scrollBar_right)) 824 if (!OPTION (Opt_scrollBar_right))
848 window_vt_x += sb_w; 825 window_vt_x += sb_w;
849 } 826 }
850 827
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; 828 szHint.width_inc = fwidth;
859 szHint.height_inc = fheight; 829 szHint.height_inc = fheight;
860 szHint.min_width = szHint.base_width + szHint.width_inc; 830 szHint.min_width = szHint.base_width + szHint.width_inc;
861 szHint.min_height = szHint.base_height + szHint.height_inc; 831 szHint.min_height = szHint.base_height + szHint.height_inc;
862 832
… …
880 { 850 {
881 min_it (height, max_height); 851 min_it (height, max_height);
882 szHint.height = szHint.base_height + height; 852 szHint.height = szHint.base_height + height;
883 } 853 }
884 854
885 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 855 if (scrollBar.state && OPTION (Opt_scrollBar_right))
886 window_sb_x = szHint.width - sb_w; 856 window_sb_x = szHint.width - sb_w;
887 857
888 if (recalc_x) 858 if (recalc_x)
889 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 859 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
890 if (recalc_y) 860 if (recalc_y)
… …
1245 1215
1246 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1216 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1247 1217
1248 if (fix_screen || newwidth != old_width || newheight != old_height) 1218 if (fix_screen || newwidth != old_width || newheight != old_height)
1249 { 1219 {
1250 if (scrollbar_visible ()) 1220 if (scrollBar.state)
1251 { 1221 {
1252 XMoveResizeWindow (disp, scrollBar.win, 1222 XMoveResizeWindow (disp, scrollBar.win,
1253 window_sb_x, 0, 1223 window_sb_x, 0,
1254 scrollbar_TotalWidth (), szHint.height); 1224 scrollbar_TotalWidth (), szHint.height);
1255 resize_scrollbar (); 1225 resize_scrollbar ();
1256 } 1226 }
1257
1258 if (menubar_visible ())
1259 XMoveResizeWindow (disp, menuBar.win,
1260 window_vt_x, 0,
1261 width, menuBar_TotalHeight ());
1262 1227
1263 XMoveResizeWindow (disp, vt, 1228 XMoveResizeWindow (disp, vt,
1264 window_vt_x, window_vt_y, 1229 window_vt_x, window_vt_y,
1265 width, height); 1230 width, height);
1266 1231
… …
1451 unsigned long fg, bg; 1416 unsigned long fg, bg;
1452 const char *p; 1417 const char *p;
1453 char **s; 1418 char **s;
1454 XIMStyles *xim_styles; 1419 XIMStyles *xim_styles;
1455 1420
1456 TEMP_ENV; 1421 set_environ (envv);
1457 1422
1458 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1423 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1459 return false; 1424 return false;
1460 1425
1461 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1426 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1627 int i; 1592 int i;
1628 const char *p; 1593 const char *p;
1629 char **s; 1594 char **s;
1630 char buf[IMBUFSIZ]; 1595 char buf[IMBUFSIZ];
1631 1596
1632 SET_R (this); 1597 make_current ();
1633 1598
1634 im_destroy (); 1599 im_destroy ();
1635 1600
1636 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1601 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1637 if (Input_Context) 1602 if (Input_Context)

Diff Legend

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