… | |
… | |
89 | rxvt_pop_locale () |
89 | rxvt_pop_locale () |
90 | { |
90 | { |
91 | rxvt_set_locale (savelocale); |
91 | rxvt_set_locale (savelocale); |
92 | } |
92 | } |
93 | |
93 | |
94 | void |
|
|
95 | rxvt_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 |
103 | class rxvt_composite_vec rxvt_composite; |
95 | class rxvt_composite_vec rxvt_composite; |
104 | |
96 | |
105 | text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) |
97 | text_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 | |
232 | rxvt_term::~rxvt_term () |
221 | rxvt_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 | |
… | |
… | |
743 | } |
715 | } |
744 | # endif |
716 | # endif |
745 | #endif |
717 | #endif |
746 | } |
718 | } |
747 | |
719 | |
748 | #ifdef UTMP_SUPPORT |
|
|
749 | void |
|
|
750 | rxvt_term::privileged_utmp (rxvt_privaction action) |
|
|
751 | { |
|
|
752 | if (OPTION (Opt_utmpInhibit) |
|
|
753 | || !pty.name || !*pty.name) |
|
|
754 | return; |
|
|
755 | |
|
|
756 | rxvt_privileges (RESTORE); |
|
|
757 | |
|
|
758 | if (action == SAVE) |
|
|
759 | makeutent (pty.name, rs[Rs_display_name]); |
|
|
760 | else |
|
|
761 | cleanutent (); |
|
|
762 | |
|
|
763 | rxvt_privileges (IGNORE); |
|
|
764 | } |
|
|
765 | #endif |
|
|
766 | |
|
|
767 | /*----------------------------------------------------------------------*/ |
720 | /*----------------------------------------------------------------------*/ |
768 | /* |
721 | /* |
769 | * window size/position calculcations for XSizeHint and other storage. |
722 | * window size/position calculcations for XSizeHint and other storage. |
770 | * if width/height are non-zero then override calculated width/height |
723 | * if width/height are non-zero then override calculated width/height |
771 | */ |
724 | */ |
772 | void |
725 | void |
773 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
726 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
774 | { |
727 | { |
775 | short recalc_x, recalc_y; |
728 | short recalc_x, recalc_y; |
776 | int x, y, sb_w, mb_h, flags; |
729 | int x, y, sb_w, flags; |
777 | unsigned int w, h; |
730 | unsigned int w, h; |
778 | unsigned int max_width, max_height; |
731 | unsigned int max_width, max_height; |
779 | dDisp; |
732 | dDisp; |
780 | |
733 | |
781 | 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", |
… | |
… | |
842 | max_width = MAX_COLS * fwidth; |
795 | max_width = MAX_COLS * fwidth; |
843 | max_height = MAX_ROWS * fheight; |
796 | max_height = MAX_ROWS * fheight; |
844 | |
797 | |
845 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
798 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
846 | |
799 | |
847 | sb_w = mb_h = 0; |
800 | sb_w = 0; |
848 | window_vt_x = window_vt_y = int_bwidth; |
801 | window_vt_x = window_vt_y = int_bwidth; |
849 | |
802 | |
850 | if (scrollbar_visible ()) |
803 | if (scrollBar.state) |
851 | { |
804 | { |
852 | sb_w = scrollbar_TotalWidth (); |
805 | sb_w = scrollbar_TotalWidth (); |
853 | szHint.base_width += sb_w; |
806 | szHint.base_width += sb_w; |
854 | if (!OPTION (Opt_scrollBar_right)) |
807 | if (!OPTION (Opt_scrollBar_right)) |
855 | window_vt_x += sb_w; |
808 | window_vt_x += sb_w; |
856 | } |
809 | } |
857 | |
810 | |
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; |
811 | szHint.width_inc = fwidth; |
866 | szHint.height_inc = fheight; |
812 | szHint.height_inc = fheight; |
867 | szHint.min_width = szHint.base_width + szHint.width_inc; |
813 | szHint.min_width = szHint.base_width + szHint.width_inc; |
868 | szHint.min_height = szHint.base_height + szHint.height_inc; |
814 | szHint.min_height = szHint.base_height + szHint.height_inc; |
869 | |
815 | |
… | |
… | |
887 | { |
833 | { |
888 | min_it (height, max_height); |
834 | min_it (height, max_height); |
889 | szHint.height = szHint.base_height + height; |
835 | szHint.height = szHint.base_height + height; |
890 | } |
836 | } |
891 | |
837 | |
892 | if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) |
838 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
893 | window_sb_x = szHint.width - sb_w; |
839 | window_sb_x = szHint.width - sb_w; |
894 | |
840 | |
895 | if (recalc_x) |
841 | if (recalc_x) |
896 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
842 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
897 | if (recalc_y) |
843 | if (recalc_y) |
… | |
… | |
911 | * Called after a window size change. |
857 | * Called after a window size change. |
912 | */ |
858 | */ |
913 | void |
859 | void |
914 | rxvt_term::tt_winch () |
860 | rxvt_term::tt_winch () |
915 | { |
861 | { |
916 | if (pty.pty < 0) |
862 | if (pty->pty < 0) |
917 | return; |
863 | return; |
918 | |
864 | |
919 | struct winsize ws; |
865 | struct winsize ws; |
920 | |
866 | |
921 | ws.ws_col = ncol; |
867 | ws.ws_col = ncol; |
922 | ws.ws_row = nrow; |
868 | ws.ws_row = nrow; |
923 | ws.ws_xpixel = width; |
869 | ws.ws_xpixel = width; |
924 | ws.ws_ypixel = height; |
870 | ws.ws_ypixel = height; |
925 | (void)ioctl (pty.pty, TIOCSWINSZ, &ws); |
871 | (void)ioctl (pty->pty, TIOCSWINSZ, &ws); |
926 | |
872 | |
927 | #if 0 |
873 | #if 0 |
928 | // TIOCSWINSZ⎈ is supposed to do this automatically and correctly |
874 | // TIOCSWINSZ⎈ is supposed to do this automatically and correctly |
929 | if (cmd_pid) /* force through to the command */ |
875 | if (cmd_pid) /* force through to the command */ |
930 | kill (-cmd_pid, SIGWINCH); |
876 | kill (-cmd_pid, SIGWINCH); |
… | |
… | |
1252 | |
1198 | |
1253 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1199 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1254 | |
1200 | |
1255 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1201 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1256 | { |
1202 | { |
1257 | if (scrollbar_visible ()) |
1203 | if (scrollBar.state) |
1258 | { |
1204 | { |
1259 | XMoveResizeWindow (disp, scrollBar.win, |
1205 | XMoveResizeWindow (disp, scrollBar.win, |
1260 | window_sb_x, 0, |
1206 | window_sb_x, 0, |
1261 | scrollbar_TotalWidth (), szHint.height); |
1207 | scrollbar_TotalWidth (), szHint.height); |
1262 | resize_scrollbar (); |
1208 | resize_scrollbar (); |
1263 | } |
1209 | } |
1264 | |
|
|
1265 | if (menubar_visible ()) |
|
|
1266 | XMoveResizeWindow (disp, menuBar.win, |
|
|
1267 | window_vt_x, 0, |
|
|
1268 | width, menuBar_TotalHeight ()); |
|
|
1269 | |
1210 | |
1270 | XMoveResizeWindow (disp, vt, |
1211 | XMoveResizeWindow (disp, vt, |
1271 | window_vt_x, window_vt_y, |
1212 | window_vt_x, window_vt_y, |
1272 | width, height); |
1213 | width, height); |
1273 | |
1214 | |