… | |
… | |
11 | * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> |
11 | * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> |
12 | * - extensive modifications |
12 | * - extensive modifications |
13 | * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> |
13 | * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> |
14 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
14 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
15 | * - extensive modifications |
15 | * - extensive modifications |
16 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
16 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
17 | * |
17 | * |
18 | * This program is free software; you can redistribute it and/or modify |
18 | * This program is free software; you can redistribute it and/or modify |
19 | * it under the terms of the GNU General Public License as published by |
19 | * it under the terms of the GNU General Public License as published by |
20 | * the Free Software Foundation; either version 2 of the License, or |
20 | * the Free Software Foundation; either version 2 of the License, or |
21 | * (at your option) any later version. |
21 | * (at your option) any later version. |
… | |
… | |
30 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
30 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
31 | *---------------------------------------------------------------------*/ |
31 | *---------------------------------------------------------------------*/ |
32 | |
32 | |
33 | #include "../config.h" /* NECESSARY */ |
33 | #include "../config.h" /* NECESSARY */ |
34 | #include "rxvt.h" /* NECESSARY */ |
34 | #include "rxvt.h" /* NECESSARY */ |
|
|
35 | #include "keyboard.h" |
|
|
36 | #include "rxvtperl.h" |
|
|
37 | |
|
|
38 | #include <limits> |
35 | |
39 | |
36 | #include <csignal> |
40 | #include <csignal> |
37 | #include <cstring> |
41 | #include <cstring> |
38 | |
42 | |
39 | #ifdef TTY_GID_SUPPORT |
43 | #ifdef TTY_GID_SUPPORT |
… | |
… | |
42 | |
46 | |
43 | #ifdef HAVE_TERMIOS_H |
47 | #ifdef HAVE_TERMIOS_H |
44 | # include <termios.h> |
48 | # include <termios.h> |
45 | #endif |
49 | #endif |
46 | |
50 | |
47 | #ifdef KEYSYM_RESOURCE |
51 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
48 | # include "keyboard.h" |
52 | static uid_t saved_euid; |
|
|
53 | static gid_t saved_egid; |
49 | #endif |
54 | #endif |
|
|
55 | |
|
|
56 | bool |
|
|
57 | rxvt_tainted () |
|
|
58 | { |
|
|
59 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
|
|
60 | return getuid () != saved_euid || getgid () != saved_egid; |
|
|
61 | #else |
|
|
62 | return false; |
|
|
63 | #endif |
|
|
64 | } |
50 | |
65 | |
51 | vector<rxvt_term *> rxvt_term::termlist; |
66 | vector<rxvt_term *> rxvt_term::termlist; |
52 | |
67 | |
53 | static char curlocale[128]; |
68 | static char curlocale[128], savelocale[128]; |
54 | |
69 | |
55 | bool |
70 | bool |
56 | rxvt_set_locale (const char *locale) |
71 | rxvt_set_locale (const char *locale) |
57 | { |
72 | { |
58 | if (!locale || !strncmp (locale, curlocale, 128)) |
73 | if (!locale || !strncmp (locale, curlocale, 128)) |
59 | return false; |
74 | return false; |
60 | |
75 | |
61 | strncpy (curlocale, locale, 128); |
76 | strncpy (curlocale, locale, 128); |
62 | setlocale (LC_CTYPE, curlocale); |
77 | setlocale (LC_CTYPE, curlocale); |
63 | return true; |
78 | return true; |
|
|
79 | } |
|
|
80 | |
|
|
81 | void |
|
|
82 | rxvt_push_locale (const char *locale) |
|
|
83 | { |
|
|
84 | strcpy (savelocale, curlocale); |
|
|
85 | rxvt_set_locale (locale); |
|
|
86 | } |
|
|
87 | |
|
|
88 | void |
|
|
89 | rxvt_pop_locale () |
|
|
90 | { |
|
|
91 | rxvt_set_locale (savelocale); |
64 | } |
92 | } |
65 | |
93 | |
66 | #if ENABLE_COMBINING |
94 | #if ENABLE_COMBINING |
67 | class rxvt_composite_vec rxvt_composite; |
95 | class rxvt_composite_vec rxvt_composite; |
68 | |
96 | |
… | |
… | |
132 | #if TRANSPARENT |
160 | #if TRANSPARENT |
133 | rootwin_ev (this, &rxvt_term::rootwin_cb), |
161 | rootwin_ev (this, &rxvt_term::rootwin_cb), |
134 | #endif |
162 | #endif |
135 | #ifdef HAVE_SCROLLBARS |
163 | #ifdef HAVE_SCROLLBARS |
136 | scrollbar_ev (this, &rxvt_term::x_cb), |
164 | scrollbar_ev (this, &rxvt_term::x_cb), |
137 | #endif |
|
|
138 | #ifdef MENUBAR |
|
|
139 | menubar_ev (this, &rxvt_term::x_cb), |
|
|
140 | #endif |
165 | #endif |
141 | #ifdef CURSOR_BLINK |
166 | #ifdef CURSOR_BLINK |
142 | cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), |
167 | cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), |
143 | #endif |
168 | #endif |
144 | #ifdef TEXT_BLINK |
169 | #ifdef TEXT_BLINK |
… | |
… | |
193 | pty.put (); |
218 | pty.put (); |
194 | } |
219 | } |
195 | |
220 | |
196 | rxvt_term::~rxvt_term () |
221 | rxvt_term::~rxvt_term () |
197 | { |
222 | { |
|
|
223 | HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); |
|
|
224 | |
198 | termlist.erase (find (termlist.begin (), termlist.end(), this)); |
225 | termlist.erase (find (termlist.begin (), termlist.end(), this)); |
199 | |
226 | |
200 | emergency_cleanup (); |
227 | emergency_cleanup (); |
201 | |
228 | |
202 | #if ENABLE_STYLES |
229 | #if ENABLE_STYLES |
… | |
… | |
212 | |
239 | |
213 | selection_clear (); |
240 | selection_clear (); |
214 | |
241 | |
215 | #ifdef USE_XIM |
242 | #ifdef USE_XIM |
216 | im_destroy (); |
243 | im_destroy (); |
217 | #endif |
|
|
218 | #ifdef MENUBAR |
|
|
219 | if (menubarGC) XFreeGC (disp, menubarGC); |
|
|
220 | #endif |
244 | #endif |
221 | #ifdef XTERM_SCROLLBAR |
245 | #ifdef XTERM_SCROLLBAR |
222 | if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); |
246 | if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); |
223 | if (ShadowGC) XFreeGC (disp, ShadowGC); |
247 | if (ShadowGC) XFreeGC (disp, ShadowGC); |
224 | #endif |
248 | #endif |
… | |
… | |
235 | if (upArrow) XFreePixmap (disp, upArrow); |
259 | if (upArrow) XFreePixmap (disp, upArrow); |
236 | if (downArrow) XFreePixmap (disp, downArrow); |
260 | if (downArrow) XFreePixmap (disp, downArrow); |
237 | if (upArrowHi) XFreePixmap (disp, upArrowHi); |
261 | if (upArrowHi) XFreePixmap (disp, upArrowHi); |
238 | if (downArrowHi) XFreePixmap (disp, downArrowHi); |
262 | if (downArrowHi) XFreePixmap (disp, downArrowHi); |
239 | #endif |
263 | #endif |
240 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
264 | #ifdef RXVT_SCROLLBAR |
241 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
265 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
242 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
266 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
243 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
267 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
244 | #endif |
268 | #endif |
245 | if (gc) XFreeGC (disp, gc); |
269 | if (gc) XFreeGC (disp, gc); |
246 | |
270 | |
247 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
|
|
248 | delete menuBar.drawable; |
|
|
249 | //if (menuBar.win) |
|
|
250 | // XDestroyWindow (disp, menuBar.win); |
|
|
251 | #endif |
|
|
252 | delete drawable; |
271 | delete drawable; |
253 | // destroy all windows |
272 | // destroy all windows |
254 | if (parent[0]) |
273 | if (parent[0]) |
255 | XDestroyWindow (disp, parent[0]); |
274 | XDestroyWindow (disp, parent[0]); |
256 | } |
275 | } |
257 | |
276 | |
258 | // TODO: free pixcolours, colours should become part of rxvt_display |
277 | // TODO: free pixcolours, colours should become part of rxvt_display |
259 | |
|
|
260 | delete pix_colors_focused; |
278 | delete pix_colors_focused; |
261 | #if OFF_FOCUS_FADING |
279 | #if OFF_FOCUS_FADING |
262 | delete pix_colors_unfocused; |
280 | delete pix_colors_unfocused; |
263 | #endif |
281 | #endif |
264 | |
282 | |
… | |
… | |
287 | delete keyboard; |
305 | delete keyboard; |
288 | #endif |
306 | #endif |
289 | } |
307 | } |
290 | |
308 | |
291 | void |
309 | void |
|
|
310 | rxvt_term::child_exit () |
|
|
311 | { |
|
|
312 | cmd_pid = 0; |
|
|
313 | |
|
|
314 | if (!OPTION (Opt_hold)) |
|
|
315 | destroy (); |
|
|
316 | } |
|
|
317 | |
|
|
318 | void |
292 | rxvt_term::destroy () |
319 | rxvt_term::destroy () |
293 | { |
320 | { |
294 | if (destroy_ev.active) |
321 | if (destroy_ev.active) |
295 | return; |
322 | return; |
296 | |
323 | |
… | |
… | |
303 | #if USE_XIM |
330 | #if USE_XIM |
304 | im_ev.stop (display); |
331 | im_ev.stop (display); |
305 | #endif |
332 | #endif |
306 | #if HAVE_SCROLLBARS |
333 | #if HAVE_SCROLLBARS |
307 | scrollbar_ev.stop (display); |
334 | scrollbar_ev.stop (display); |
308 | #endif |
|
|
309 | #if MENUBAR |
|
|
310 | menubar_ev.stop (display); |
|
|
311 | #endif |
335 | #endif |
312 | #if TRANSPARENT |
336 | #if TRANSPARENT |
313 | rootwin_ev.stop (display); |
337 | rootwin_ev.stop (display); |
314 | #endif |
338 | #endif |
315 | incr_ev.stop (); |
339 | incr_ev.stop (); |
… | |
… | |
339 | } |
363 | } |
340 | |
364 | |
341 | void |
365 | void |
342 | rxvt_term::destroy_cb (time_watcher &w) |
366 | rxvt_term::destroy_cb (time_watcher &w) |
343 | { |
367 | { |
344 | SET_R (this); |
368 | make_current (); |
345 | |
369 | |
346 | delete this; |
370 | delete this; |
347 | } |
371 | } |
348 | |
372 | |
349 | /*----------------------------------------------------------------------*/ |
373 | /*----------------------------------------------------------------------*/ |
… | |
… | |
440 | /*----------------------------------------------------------------------*/ |
464 | /*----------------------------------------------------------------------*/ |
441 | bool |
465 | bool |
442 | rxvt_term::init (int argc, const char *const *argv) |
466 | rxvt_term::init (int argc, const char *const *argv) |
443 | { |
467 | { |
444 | SET_R (this); |
468 | SET_R (this); |
445 | |
|
|
446 | set_locale (""); |
469 | set_locale (""); |
|
|
470 | set_environ (envv); // few things in X do not call setlocale :( |
447 | |
471 | |
448 | if (!init_vars ()) |
472 | if (!init_vars ()) |
449 | return false; |
473 | return false; |
450 | |
474 | |
451 | init_secondary (); |
475 | init_secondary (); |
… | |
… | |
454 | |
478 | |
455 | #ifdef KEYSYM_RESOURCE |
479 | #ifdef KEYSYM_RESOURCE |
456 | keyboard->register_done (); |
480 | keyboard->register_done (); |
457 | #endif |
481 | #endif |
458 | |
482 | |
459 | #if MENUBAR_MAX |
|
|
460 | menubar_read (rs[Rs_menu]); |
|
|
461 | #endif |
|
|
462 | #ifdef HAVE_SCROLLBARS |
483 | #ifdef HAVE_SCROLLBARS |
463 | if (options & Opt_scrollBar) |
484 | if (OPTION (Opt_scrollBar)) |
464 | scrollBar.setIdle (); /* set existence for size calculations */ |
485 | scrollBar.setIdle (); /* set existence for size calculations */ |
465 | #endif |
486 | #endif |
466 | |
487 | |
|
|
488 | #if ENABLE_PERL |
|
|
489 | if (!rs[Rs_perl_ext_1]) |
|
|
490 | rs[Rs_perl_ext_1] = "default"; |
|
|
491 | |
|
|
492 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
|
|
493 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
|
|
494 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
|
|
495 | { |
|
|
496 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
|
|
497 | // ignore some perl-related arguments if some bozo installed us set[ug]id |
|
|
498 | if (rxvt_tainted ()) |
|
|
499 | { |
|
|
500 | if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib]) |
|
|
501 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
|
|
502 | { |
|
|
503 | rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n"); |
|
|
504 | rs[Rs_perl_lib] = 0; |
|
|
505 | rs[Rs_perl_eval] = 0; |
|
|
506 | } |
|
|
507 | } |
|
|
508 | #endif |
|
|
509 | rxvt_perl.init (this); |
|
|
510 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
|
|
511 | } |
|
|
512 | #endif |
|
|
513 | |
467 | create_windows (argc, argv); |
514 | create_windows (argc, argv); |
468 | |
515 | |
469 | dDisp; |
516 | dDisp; |
470 | |
517 | |
471 | init_xlocale (); |
518 | init_xlocale (); |
472 | |
519 | |
473 | scr_reset (); /* initialize screen */ |
520 | scr_reset (); // initialize screen |
474 | |
521 | |
475 | #if 0 |
522 | #if 0 |
476 | XSynchronize (disp, True); |
523 | XSynchronize (disp, True); |
477 | #endif |
524 | #endif |
478 | |
525 | |
479 | #ifdef HAVE_SCROLLBARS |
526 | #ifdef HAVE_SCROLLBARS |
480 | if (options & Opt_scrollBar) |
527 | if (OPTION (Opt_scrollBar)) |
481 | resize_scrollbar (); /* create and map scrollbar */ |
528 | resize_scrollbar (); /* create and map scrollbar */ |
482 | #endif |
529 | #endif |
483 | #if (MENUBAR_MAX) |
|
|
484 | if (menubar_visible ()) |
|
|
485 | XMapWindow (disp, menuBar.win); |
|
|
486 | #endif |
|
|
487 | #ifdef TRANSPARENT |
530 | #ifdef TRANSPARENT |
488 | if (options & Opt_transparent) |
531 | if (OPTION (Opt_transparent)) |
489 | { |
532 | { |
490 | XSelectInput (disp, display->root, PropertyChangeMask); |
533 | XSelectInput (disp, display->root, PropertyChangeMask); |
491 | check_our_parents (); |
534 | check_our_parents (); |
492 | rootwin_ev.start (display, display->root); |
535 | rootwin_ev.start (display, display->root); |
493 | } |
536 | } |
… | |
… | |
500 | |
543 | |
501 | init_command (cmd_argv); |
544 | init_command (cmd_argv); |
502 | |
545 | |
503 | free (cmd_argv); |
546 | free (cmd_argv); |
504 | |
547 | |
|
|
548 | if (pty.pty >= 0) |
505 | pty_ev.start (pty.pty, EVENT_READ); |
549 | pty_ev.start (pty.pty, EVENT_READ); |
506 | |
550 | |
507 | check_ev.start (); |
551 | check_ev.start (); |
|
|
552 | |
|
|
553 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
508 | |
554 | |
509 | return true; |
555 | return true; |
510 | } |
556 | } |
511 | |
557 | |
512 | static struct sig_handlers |
558 | static struct sig_handlers |
… | |
… | |
520 | |
566 | |
521 | while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) |
567 | while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) |
522 | for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) |
568 | for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) |
523 | if (pid == (*t)->cmd_pid) |
569 | if (pid == (*t)->cmd_pid) |
524 | { |
570 | { |
525 | (*t)->destroy (); |
571 | (*t)->child_exit (); |
526 | break; |
572 | break; |
527 | } |
573 | } |
528 | } |
574 | } |
529 | |
575 | |
530 | /* |
576 | /* |
… | |
… | |
547 | sw_int (this, &sig_handlers::sig_term) |
593 | sw_int (this, &sig_handlers::sig_term) |
548 | { |
594 | { |
549 | } |
595 | } |
550 | } sig_handlers; |
596 | } sig_handlers; |
551 | |
597 | |
|
|
598 | char **rxvt_environ; // startup environment |
|
|
599 | |
552 | void |
600 | void |
553 | rxvt_init () |
601 | rxvt_init () |
554 | { |
602 | { |
|
|
603 | rxvt_environ = environ; |
|
|
604 | |
555 | /* |
605 | /* |
556 | * Save and then give up any super-user privileges |
606 | * Save and then give up any super-user privileges |
557 | * If we need privileges in any area then we must specifically request it. |
607 | * If we need privileges in any area then we must specifically request it. |
558 | * We should only need to be root in these cases: |
608 | * We should only need to be root in these cases: |
559 | * 1. write utmp entries on some systems |
609 | * 1. write utmp entries on some systems |
… | |
… | |
573 | /* signal (SIGURG, SIG_DFL); */ |
623 | /* signal (SIGURG, SIG_DFL); */ |
574 | |
624 | |
575 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
625 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
576 | // TODO: handle this with exceptions and tolerate the memory loss |
626 | // TODO: handle this with exceptions and tolerate the memory loss |
577 | XSetIOErrorHandler (rxvt_xioerror_handler); |
627 | XSetIOErrorHandler (rxvt_xioerror_handler); |
|
|
628 | |
|
|
629 | XrmInitialize (); |
578 | } |
630 | } |
579 | |
631 | |
580 | /* ------------------------------------------------------------------------- * |
632 | /* ------------------------------------------------------------------------- * |
581 | * MEMORY ALLOCATION WRAPPERS * |
633 | * MEMORY ALLOCATION WRAPPERS * |
582 | * ------------------------------------------------------------------------- */ |
634 | * ------------------------------------------------------------------------- */ |
… | |
… | |
618 | * ------------------------------------------------------------------------- */ |
670 | * ------------------------------------------------------------------------- */ |
619 | /* take care of suid/sgid super-user (root) privileges */ |
671 | /* take care of suid/sgid super-user (root) privileges */ |
620 | void |
672 | void |
621 | rxvt_privileges (rxvt_privaction action) |
673 | rxvt_privileges (rxvt_privaction action) |
622 | { |
674 | { |
623 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
|
|
624 | static uid_t euid; |
|
|
625 | static gid_t egid; |
|
|
626 | #endif |
|
|
627 | |
|
|
628 | #if ! defined(__CYGWIN32__) |
675 | #if ! defined(__CYGWIN32__) |
629 | # if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) |
676 | # if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) |
630 | /* setreuid () is the poor man's setuid (), seteuid () */ |
677 | /* setreuid () is the poor man's setuid (), seteuid () */ |
631 | # define seteuid(a) setreuid(-1, (a)) |
678 | # define seteuid(a) setreuid(-1, (a)) |
632 | # define setegid(a) setregid(-1, (a)) |
679 | # define setegid(a) setregid(-1, (a)) |
… | |
… | |
638 | case IGNORE: |
685 | case IGNORE: |
639 | /* |
686 | /* |
640 | * change effective uid/gid - not real uid/gid - so we can switch |
687 | * change effective uid/gid - not real uid/gid - so we can switch |
641 | * back to root later, as required |
688 | * back to root later, as required |
642 | */ |
689 | */ |
|
|
690 | setegid (getgid ()); |
643 | seteuid (getuid ()); |
691 | seteuid (getuid ()); |
644 | setegid (getgid ()); |
|
|
645 | break; |
692 | break; |
646 | case SAVE: |
693 | case SAVE: |
647 | euid = geteuid (); |
|
|
648 | egid = getegid (); |
694 | saved_egid = getegid (); |
|
|
695 | saved_euid = geteuid (); |
649 | break; |
696 | break; |
650 | case RESTORE: |
697 | case RESTORE: |
651 | seteuid (euid); |
|
|
652 | setegid (egid); |
698 | setegid (saved_egid); |
|
|
699 | seteuid (saved_euid); |
653 | break; |
700 | break; |
654 | } |
701 | } |
655 | # else |
702 | # else |
656 | switch (action) |
703 | switch (action) |
657 | { |
704 | { |
658 | case IGNORE: |
705 | case IGNORE: |
|
|
706 | setgid (getgid ()); |
659 | setuid (getuid ()); |
707 | setuid (getuid ()); |
660 | setgid (getgid ()); |
|
|
661 | /* FALLTHROUGH */ |
708 | /* FALLTHROUGH */ |
662 | case SAVE: |
709 | case SAVE: |
663 | /* FALLTHROUGH */ |
710 | /* FALLTHROUGH */ |
664 | case RESTORE: |
711 | case RESTORE: |
665 | break; |
712 | break; |
… | |
… | |
670 | |
717 | |
671 | #ifdef UTMP_SUPPORT |
718 | #ifdef UTMP_SUPPORT |
672 | void |
719 | void |
673 | rxvt_term::privileged_utmp (rxvt_privaction action) |
720 | rxvt_term::privileged_utmp (rxvt_privaction action) |
674 | { |
721 | { |
675 | if ((options & Opt_utmpInhibit) |
722 | if (OPTION (Opt_utmpInhibit) |
676 | || !pty.name || !*pty.name) |
723 | || !pty.name || !*pty.name) |
677 | return; |
724 | return; |
678 | |
725 | |
679 | rxvt_privileges (RESTORE); |
726 | rxvt_privileges (RESTORE); |
680 | |
727 | |
681 | if (action == SAVE) |
728 | if (action == SAVE) |
682 | makeutent (pty.name, rs[Rs_display_name]); |
729 | session.login (pty.name, cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); |
683 | else |
730 | else |
684 | cleanutent (); |
731 | session.logout (); |
685 | |
732 | |
686 | rxvt_privileges (IGNORE); |
733 | rxvt_privileges (IGNORE); |
687 | } |
734 | } |
688 | #endif |
735 | #endif |
689 | |
736 | |
… | |
… | |
694 | */ |
741 | */ |
695 | void |
742 | void |
696 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
743 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
697 | { |
744 | { |
698 | short recalc_x, recalc_y; |
745 | short recalc_x, recalc_y; |
699 | int x, y, sb_w, mb_h, flags; |
746 | int x, y, sb_w, flags; |
700 | unsigned int w, h; |
747 | unsigned int w, h; |
701 | unsigned int max_width, max_height; |
748 | unsigned int max_width, max_height; |
702 | dDisp; |
749 | dDisp; |
703 | |
750 | |
704 | 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", |
… | |
… | |
718 | if (rs[Rs_geometry]) |
765 | if (rs[Rs_geometry]) |
719 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
766 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
720 | |
767 | |
721 | if (flags & WidthValue) |
768 | if (flags & WidthValue) |
722 | { |
769 | { |
723 | ncol = BOUND_POSITIVE_INT16 (w); |
770 | ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); |
724 | szHint.flags |= USSize; |
771 | szHint.flags |= USSize; |
725 | } |
772 | } |
726 | |
773 | |
727 | if (flags & HeightValue) |
774 | if (flags & HeightValue) |
728 | { |
775 | { |
729 | nrow = BOUND_POSITIVE_INT16 (h); |
776 | nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); |
730 | szHint.flags |= USSize; |
777 | szHint.flags |= USSize; |
731 | } |
778 | } |
732 | |
779 | |
733 | if (flags & XValue) |
780 | if (flags & XValue) |
734 | { |
781 | { |
… | |
… | |
765 | max_width = MAX_COLS * fwidth; |
812 | max_width = MAX_COLS * fwidth; |
766 | max_height = MAX_ROWS * fheight; |
813 | max_height = MAX_ROWS * fheight; |
767 | |
814 | |
768 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
815 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
769 | |
816 | |
770 | sb_w = mb_h = 0; |
817 | sb_w = 0; |
771 | window_vt_x = window_vt_y = int_bwidth; |
818 | window_vt_x = window_vt_y = int_bwidth; |
772 | |
819 | |
773 | if (scrollbar_visible ()) |
820 | if (scrollBar.state) |
774 | { |
821 | { |
775 | sb_w = scrollbar_TotalWidth (); |
822 | sb_w = scrollbar_TotalWidth (); |
776 | szHint.base_width += sb_w; |
823 | szHint.base_width += sb_w; |
777 | if (!(options & Opt_scrollBar_right)) |
824 | if (!OPTION (Opt_scrollBar_right)) |
778 | window_vt_x += sb_w; |
825 | window_vt_x += sb_w; |
779 | } |
|
|
780 | |
|
|
781 | if (menubar_visible ()) |
|
|
782 | { |
|
|
783 | mb_h = menuBar_TotalHeight (); |
|
|
784 | szHint.base_height += mb_h; |
|
|
785 | window_vt_y += mb_h; |
|
|
786 | } |
826 | } |
787 | |
827 | |
788 | szHint.width_inc = fwidth; |
828 | szHint.width_inc = fwidth; |
789 | szHint.height_inc = fheight; |
829 | szHint.height_inc = fheight; |
790 | szHint.min_width = szHint.base_width + szHint.width_inc; |
830 | szHint.min_width = szHint.base_width + szHint.width_inc; |
… | |
… | |
795 | szHint.width = newwidth; |
835 | szHint.width = newwidth; |
796 | width = newwidth - szHint.base_width; |
836 | width = newwidth - szHint.base_width; |
797 | } |
837 | } |
798 | else |
838 | else |
799 | { |
839 | { |
800 | MIN_IT (width, max_width); |
840 | min_it (width, max_width); |
801 | szHint.width = szHint.base_width + width; |
841 | szHint.width = szHint.base_width + width; |
802 | } |
842 | } |
803 | |
843 | |
804 | if (newheight && newheight - szHint.base_height < max_height) |
844 | if (newheight && newheight - szHint.base_height < max_height) |
805 | { |
845 | { |
806 | szHint.height = newheight; |
846 | szHint.height = newheight; |
807 | height = newheight - szHint.base_height; |
847 | height = newheight - szHint.base_height; |
808 | } |
848 | } |
809 | else |
849 | else |
810 | { |
850 | { |
811 | MIN_IT (height, max_height); |
851 | min_it (height, max_height); |
812 | szHint.height = szHint.base_height + height; |
852 | szHint.height = szHint.base_height + height; |
813 | } |
853 | } |
814 | |
854 | |
815 | if (scrollbar_visible () && (options & Opt_scrollBar_right)) |
855 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
816 | window_sb_x = szHint.width - sb_w; |
856 | window_sb_x = szHint.width - sb_w; |
817 | |
857 | |
818 | if (recalc_x) |
858 | if (recalc_x) |
819 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
859 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
820 | if (recalc_y) |
860 | if (recalc_y) |
… | |
… | |
889 | prop.height += lineSpace; |
929 | prop.height += lineSpace; |
890 | fs->set_prop (prop); |
930 | fs->set_prop (prop); |
891 | |
931 | |
892 | fwidth = prop.width; |
932 | fwidth = prop.width; |
893 | fheight = prop.height; |
933 | fheight = prop.height; |
894 | fweight = prop.weight; |
934 | fbase = prop.ascent; |
895 | fslant = prop.slant; |
|
|
896 | fbase = (*fs)[1]->ascent; |
|
|
897 | |
935 | |
898 | for (int style = 1; style < 4; style++) |
936 | for (int style = 1; style < 4; style++) |
899 | { |
937 | { |
900 | #if ENABLE_STYLES |
938 | #if ENABLE_STYLES |
901 | const char *res = rs[Rs_font + style]; |
939 | const char *res = rs[Rs_font + style]; |
… | |
… | |
935 | return true; |
973 | return true; |
936 | } |
974 | } |
937 | |
975 | |
938 | void rxvt_term::set_string_property (Atom prop, const char *str, int len) |
976 | void rxvt_term::set_string_property (Atom prop, const char *str, int len) |
939 | { |
977 | { |
940 | // TODO: SMART_WINDOW_TITLE |
|
|
941 | XChangeProperty (display->display, parent[0], |
978 | XChangeProperty (display->display, parent[0], |
942 | prop, XA_STRING, 8, PropModeReplace, |
979 | prop, XA_STRING, 8, PropModeReplace, |
943 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
980 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
944 | } |
981 | } |
945 | |
982 | |
946 | void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
983 | void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
947 | { |
984 | { |
948 | // TODO: SMART_WINDOW_TITLE |
|
|
949 | wchar_t *ws = rxvt_mbstowcs (str, len); |
985 | wchar_t *ws = rxvt_mbstowcs (str, len); |
950 | char *s = rxvt_wcstoutf8 (ws); |
986 | char *s = rxvt_wcstoutf8 (ws); |
951 | |
987 | |
952 | XChangeProperty (display->display, parent[0], |
988 | XChangeProperty (display->display, parent[0], |
953 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
989 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
… | |
… | |
994 | i = atoi (color); |
1030 | i = atoi (color); |
995 | |
1031 | |
996 | if (i >= 8 && i <= 15) |
1032 | if (i >= 8 && i <= 15) |
997 | { /* bright colors */ |
1033 | { /* bright colors */ |
998 | i -= 8; |
1034 | i -= 8; |
999 | # ifndef NO_BRIGHTCOLOR |
|
|
1000 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
1035 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
1001 | SET_PIXCOLOR (idx); |
1036 | SET_PIXCOLOR (idx); |
1002 | goto done; |
1037 | goto done; |
1003 | # endif |
|
|
1004 | } |
1038 | } |
1005 | |
1039 | |
1006 | if (i >= 0 && i <= 7) |
1040 | if (i >= 0 && i <= 7) |
1007 | { /* normal colors */ |
1041 | { /* normal colors */ |
1008 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
1042 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
… | |
… | |
1181 | |
1215 | |
1182 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1216 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1183 | |
1217 | |
1184 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1218 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1185 | { |
1219 | { |
1186 | if (scrollbar_visible ()) |
1220 | if (scrollBar.state) |
1187 | { |
1221 | { |
1188 | XMoveResizeWindow (disp, scrollBar.win, |
1222 | XMoveResizeWindow (disp, scrollBar.win, |
1189 | window_sb_x, 0, |
1223 | window_sb_x, 0, |
1190 | scrollbar_TotalWidth (), szHint.height); |
1224 | scrollbar_TotalWidth (), szHint.height); |
1191 | resize_scrollbar (); |
1225 | resize_scrollbar (); |
1192 | } |
1226 | } |
1193 | |
1227 | |
1194 | if (menubar_visible ()) |
|
|
1195 | XMoveResizeWindow (disp, menuBar.win, |
|
|
1196 | window_vt_x, 0, |
|
|
1197 | TermWin_TotalWidth (), menuBar_TotalHeight ()); |
|
|
1198 | |
|
|
1199 | XMoveResizeWindow (disp, vt, |
1228 | XMoveResizeWindow (disp, vt, |
1200 | window_vt_x, window_vt_y, |
1229 | window_vt_x, window_vt_y, |
1201 | TermWin_TotalWidth (), TermWin_TotalHeight ()); |
1230 | width, height); |
1202 | |
1231 | |
1203 | scr_clear (); |
1232 | scr_clear (); |
1204 | #ifdef XPM_BACKGROUND |
1233 | #ifdef XPM_BACKGROUND |
1205 | resize_pixmap (); |
1234 | resize_pixmap (); |
1206 | #endif |
1235 | #endif |
… | |
… | |
1386 | XRectangle rect, status_rect, needed_rect; |
1415 | XRectangle rect, status_rect, needed_rect; |
1387 | unsigned long fg, bg; |
1416 | unsigned long fg, bg; |
1388 | const char *p; |
1417 | const char *p; |
1389 | char **s; |
1418 | char **s; |
1390 | XIMStyles *xim_styles; |
1419 | XIMStyles *xim_styles; |
|
|
1420 | |
|
|
1421 | set_environ (envv); |
1391 | |
1422 | |
1392 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1423 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1393 | return false; |
1424 | return false; |
1394 | |
1425 | |
1395 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |
1426 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |
… | |
… | |
1561 | int i; |
1592 | int i; |
1562 | const char *p; |
1593 | const char *p; |
1563 | char **s; |
1594 | char **s; |
1564 | char buf[IMBUFSIZ]; |
1595 | char buf[IMBUFSIZ]; |
1565 | |
1596 | |
1566 | SET_R (this); |
1597 | make_current (); |
1567 | |
1598 | |
1568 | im_destroy (); |
1599 | im_destroy (); |
1569 | |
1600 | |
1570 | D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); |
1601 | D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); |
1571 | if (Input_Context) |
1602 | if (Input_Context) |