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.177 by root, Mon Jan 16 06:37:52 2006 UTC vs.
Revision 1.184 by root, Tue Jan 17 12:22:59 2006 UTC

… …
89rxvt_pop_locale () 89rxvt_pop_locale ()
90{ 90{
91 rxvt_set_locale (savelocale); 91 rxvt_set_locale (savelocale);
92} 92}
93 93
94void
95rxvt_term::make_current () const
96{
97 SET_R (this);
98 rxvt_set_locale (locale);
99 set_environ (envv);
100}
101
102#if ENABLE_COMBINING 94#if ENABLE_COMBINING
103class rxvt_composite_vec rxvt_composite; 95class rxvt_composite_vec rxvt_composite;
104 96
105text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 97text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
106{ 98{
… …
168#if TRANSPARENT 160#if TRANSPARENT
169 rootwin_ev (this, &rxvt_term::rootwin_cb), 161 rootwin_ev (this, &rxvt_term::rootwin_cb),
170#endif 162#endif
171#ifdef HAVE_SCROLLBARS 163#ifdef HAVE_SCROLLBARS
172 scrollbar_ev (this, &rxvt_term::x_cb), 164 scrollbar_ev (this, &rxvt_term::x_cb),
173#endif
174#ifdef MENUBAR
175 menubar_ev (this, &rxvt_term::x_cb),
176#endif 165#endif
177#ifdef CURSOR_BLINK 166#ifdef CURSOR_BLINK
178 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 167 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
179#endif 168#endif
180#ifdef TEXT_BLINK 169#ifdef TEXT_BLINK
… …
224 213
225#ifdef UTMP_SUPPORT 214#ifdef UTMP_SUPPORT
226 privileged_utmp (RESTORE); 215 privileged_utmp (RESTORE);
227#endif 216#endif
228 217
229 pty.put (); 218 delete pty; pty = 0;
230} 219}
231 220
232rxvt_term::~rxvt_term () 221rxvt_term::~rxvt_term ()
233{ 222{
234 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 223 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
… …
250 239
251 selection_clear (); 240 selection_clear ();
252 241
253#ifdef USE_XIM 242#ifdef USE_XIM
254 im_destroy (); 243 im_destroy ();
255#endif
256#ifdef MENUBAR
257 if (menubarGC) XFreeGC (disp, menubarGC);
258#endif 244#endif
259#ifdef XTERM_SCROLLBAR 245#ifdef XTERM_SCROLLBAR
260 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 246 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
261 if (ShadowGC) XFreeGC (disp, ShadowGC); 247 if (ShadowGC) XFreeGC (disp, ShadowGC);
262#endif 248#endif
… …
273 if (upArrow) XFreePixmap (disp, upArrow); 259 if (upArrow) XFreePixmap (disp, upArrow);
274 if (downArrow) XFreePixmap (disp, downArrow); 260 if (downArrow) XFreePixmap (disp, downArrow);
275 if (upArrowHi) XFreePixmap (disp, upArrowHi); 261 if (upArrowHi) XFreePixmap (disp, upArrowHi);
276 if (downArrowHi) XFreePixmap (disp, downArrowHi); 262 if (downArrowHi) XFreePixmap (disp, downArrowHi);
277#endif 263#endif
278#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 264#ifdef RXVT_SCROLLBAR
279 if (topShadowGC) XFreeGC (disp, topShadowGC); 265 if (topShadowGC) XFreeGC (disp, topShadowGC);
280 if (botShadowGC) XFreeGC (disp, botShadowGC); 266 if (botShadowGC) XFreeGC (disp, botShadowGC);
281 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 267 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
282#endif 268#endif
283 if (gc) XFreeGC (disp, gc); 269 if (gc) XFreeGC (disp, gc);
284 270
285#if defined(MENUBAR) && (MENUBAR_MAX > 1)
286 delete menuBar.drawable;
287 //if (menuBar.win)
288 // XDestroyWindow (disp, menuBar.win);
289#endif
290 delete drawable; 271 delete drawable;
291 // destroy all windows 272 // destroy all windows
292 if (parent[0]) 273 if (parent[0])
293 XDestroyWindow (disp, parent[0]); 274 XDestroyWindow (disp, parent[0]);
294 } 275 }
… …
349#if USE_XIM 330#if USE_XIM
350 im_ev.stop (display); 331 im_ev.stop (display);
351#endif 332#endif
352#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
353 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
354#endif
355#if MENUBAR
356 menubar_ev.stop (display);
357#endif 335#endif
358#if TRANSPARENT 336#if TRANSPARENT
359 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
360#endif 338#endif
361 incr_ev.stop (); 339 incr_ev.stop ();
… …
500 478
501#ifdef KEYSYM_RESOURCE 479#ifdef KEYSYM_RESOURCE
502 keyboard->register_done (); 480 keyboard->register_done ();
503#endif 481#endif
504 482
505#if MENUBAR_MAX
506 menubar_read (rs[Rs_menu]);
507#endif
508#ifdef HAVE_SCROLLBARS 483#ifdef HAVE_SCROLLBARS
509 if (OPTION (Opt_scrollBar)) 484 if (OPTION (Opt_scrollBar))
510 scrollBar.setIdle (); /* set existence for size calculations */ 485 scrollBar.setIdle (); /* set existence for size calculations */
511#endif 486#endif
512 487
… …
529 rs[Rs_perl_lib] = 0; 504 rs[Rs_perl_lib] = 0;
530 rs[Rs_perl_eval] = 0; 505 rs[Rs_perl_eval] = 0;
531 } 506 }
532 } 507 }
533#endif 508#endif
534 rxvt_perl.init (); 509 rxvt_perl.init (this);
535 setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
536 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
537 } 511 }
538#endif 512#endif
513
514 pty = rxvt_new_ptytty ();
539 515
540 create_windows (argc, argv); 516 create_windows (argc, argv);
541 517
542 dDisp; 518 dDisp;
543 519
… …
551 527
552#ifdef HAVE_SCROLLBARS 528#ifdef HAVE_SCROLLBARS
553 if (OPTION (Opt_scrollBar)) 529 if (OPTION (Opt_scrollBar))
554 resize_scrollbar (); /* create and map scrollbar */ 530 resize_scrollbar (); /* create and map scrollbar */
555#endif 531#endif
556#if (MENUBAR_MAX)
557 if (menubar_visible ())
558 XMapWindow (disp, menuBar.win);
559#endif
560#ifdef TRANSPARENT 532#ifdef TRANSPARENT
561 if (OPTION (Opt_transparent)) 533 if (OPTION (Opt_transparent))
562 { 534 {
563 XSelectInput (disp, display->root, PropertyChangeMask); 535 XSelectInput (disp, display->root, PropertyChangeMask);
564 check_our_parents (); 536 check_our_parents ();
… …
573 545
574 init_command (cmd_argv); 546 init_command (cmd_argv);
575 547
576 free (cmd_argv); 548 free (cmd_argv);
577 549
578 if (pty.pty >= 0) 550 if (pty->pty >= 0)
579 pty_ev.start (pty.pty, EVENT_READ); 551 pty_ev.start (pty->pty, EVENT_READ);
580 552
581 check_ev.start (); 553 check_ev.start ();
582 554
583 HOOK_INVOKE ((this, HOOK_START, DT_END)); 555 HOOK_INVOKE ((this, HOOK_START, DT_END));
584 556
… …
747 719
748#ifdef UTMP_SUPPORT 720#ifdef UTMP_SUPPORT
749void 721void
750rxvt_term::privileged_utmp (rxvt_privaction action) 722rxvt_term::privileged_utmp (rxvt_privaction action)
751{ 723{
752 if (OPTION (Opt_utmpInhibit) 724 if (OPTION (Opt_utmpInhibit))
753 || !pty.name || !*pty.name)
754 return; 725 return;
755 726
756 rxvt_privileges (RESTORE); 727 rxvt_privileges (RESTORE);
757 728
758 if (action == SAVE) 729 if (action == SAVE)
759 makeutent (pty.name, rs[Rs_display_name]); 730 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
760 else 731 else
761 cleanutent (); 732 pty->logout ();
762 733
763 rxvt_privileges (IGNORE); 734 rxvt_privileges (IGNORE);
764} 735}
765#endif 736#endif
766 737
… …
771 */ 742 */
772void 743void
773rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 744rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
774{ 745{
775 short recalc_x, recalc_y; 746 short recalc_x, recalc_y;
776 int x, y, sb_w, mb_h, flags; 747 int x, y, sb_w, flags;
777 unsigned int w, h; 748 unsigned int w, h;
778 unsigned int max_width, max_height; 749 unsigned int max_width, max_height;
779 dDisp; 750 dDisp;
780 751
781 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",
… …
842 max_width = MAX_COLS * fwidth; 813 max_width = MAX_COLS * fwidth;
843 max_height = MAX_ROWS * fheight; 814 max_height = MAX_ROWS * fheight;
844 815
845 szHint.base_width = szHint.base_height = 2 * int_bwidth; 816 szHint.base_width = szHint.base_height = 2 * int_bwidth;
846 817
847 sb_w = mb_h = 0; 818 sb_w = 0;
848 window_vt_x = window_vt_y = int_bwidth; 819 window_vt_x = window_vt_y = int_bwidth;
849 820
850 if (scrollbar_visible ()) 821 if (scrollBar.state)
851 { 822 {
852 sb_w = scrollbar_TotalWidth (); 823 sb_w = scrollbar_TotalWidth ();
853 szHint.base_width += sb_w; 824 szHint.base_width += sb_w;
854 if (!OPTION (Opt_scrollBar_right)) 825 if (!OPTION (Opt_scrollBar_right))
855 window_vt_x += sb_w; 826 window_vt_x += sb_w;
856 } 827 }
857 828
858 if (menubar_visible ())
859 {
860 mb_h = menuBar_TotalHeight ();
861 szHint.base_height += mb_h;
862 window_vt_y += mb_h;
863 }
864
865 szHint.width_inc = fwidth; 829 szHint.width_inc = fwidth;
866 szHint.height_inc = fheight; 830 szHint.height_inc = fheight;
867 szHint.min_width = szHint.base_width + szHint.width_inc; 831 szHint.min_width = szHint.base_width + szHint.width_inc;
868 szHint.min_height = szHint.base_height + szHint.height_inc; 832 szHint.min_height = szHint.base_height + szHint.height_inc;
869 833
… …
887 { 851 {
888 min_it (height, max_height); 852 min_it (height, max_height);
889 szHint.height = szHint.base_height + height; 853 szHint.height = szHint.base_height + height;
890 } 854 }
891 855
892 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 856 if (scrollBar.state && OPTION (Opt_scrollBar_right))
893 window_sb_x = szHint.width - sb_w; 857 window_sb_x = szHint.width - sb_w;
894 858
895 if (recalc_x) 859 if (recalc_x)
896 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 860 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
897 if (recalc_y) 861 if (recalc_y)
… …
911 * Called after a window size change. 875 * Called after a window size change.
912 */ 876 */
913void 877void
914rxvt_term::tt_winch () 878rxvt_term::tt_winch ()
915{ 879{
916 if (pty.pty < 0) 880 if (pty->pty < 0)
917 return; 881 return;
918 882
919 struct winsize ws; 883 struct winsize ws;
920 884
921 ws.ws_col = ncol; 885 ws.ws_col = ncol;
922 ws.ws_row = nrow; 886 ws.ws_row = nrow;
923 ws.ws_xpixel = width; 887 ws.ws_xpixel = width;
924 ws.ws_ypixel = height; 888 ws.ws_ypixel = height;
925 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 889 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
926 890
927#if 0 891#if 0
928 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 892 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
929 if (cmd_pid) /* force through to the command */ 893 if (cmd_pid) /* force through to the command */
930 kill (-cmd_pid, SIGWINCH); 894 kill (-cmd_pid, SIGWINCH);
… …
1252 1216
1253 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1217 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1254 1218
1255 if (fix_screen || newwidth != old_width || newheight != old_height) 1219 if (fix_screen || newwidth != old_width || newheight != old_height)
1256 { 1220 {
1257 if (scrollbar_visible ()) 1221 if (scrollBar.state)
1258 { 1222 {
1259 XMoveResizeWindow (disp, scrollBar.win, 1223 XMoveResizeWindow (disp, scrollBar.win,
1260 window_sb_x, 0, 1224 window_sb_x, 0,
1261 scrollbar_TotalWidth (), szHint.height); 1225 scrollbar_TotalWidth (), szHint.height);
1262 resize_scrollbar (); 1226 resize_scrollbar ();
1263 } 1227 }
1264
1265 if (menubar_visible ())
1266 XMoveResizeWindow (disp, menuBar.win,
1267 window_vt_x, 0,
1268 width, menuBar_TotalHeight ());
1269 1228
1270 XMoveResizeWindow (disp, vt, 1229 XMoveResizeWindow (disp, vt,
1271 window_vt_x, window_vt_y, 1230 window_vt_x, window_vt_y,
1272 width, height); 1231 width, height);
1273 1232

Diff Legend

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