… | |
… | |
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" |
35 | |
37 | |
36 | #include <limits> |
38 | #include <limits> |
37 | |
39 | |
38 | #include <csignal> |
40 | #include <csignal> |
39 | #include <cstring> |
41 | #include <cstring> |
… | |
… | |
44 | |
46 | |
45 | #ifdef HAVE_TERMIOS_H |
47 | #ifdef HAVE_TERMIOS_H |
46 | # include <termios.h> |
48 | # include <termios.h> |
47 | #endif |
49 | #endif |
48 | |
50 | |
49 | #ifdef KEYSYM_RESOURCE |
51 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
50 | # include "keyboard.h" |
52 | static uid_t saved_euid; |
|
|
53 | static gid_t saved_egid; |
51 | #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 | } |
52 | |
65 | |
53 | vector<rxvt_term *> rxvt_term::termlist; |
66 | vector<rxvt_term *> rxvt_term::termlist; |
54 | |
67 | |
55 | static char curlocale[128]; |
68 | static char curlocale[128], savelocale[128]; |
56 | |
69 | |
57 | bool |
70 | bool |
58 | rxvt_set_locale (const char *locale) |
71 | rxvt_set_locale (const char *locale) |
59 | { |
72 | { |
60 | if (!locale || !strncmp (locale, curlocale, 128)) |
73 | if (!locale || !strncmp (locale, curlocale, 128)) |
61 | return false; |
74 | return false; |
62 | |
75 | |
63 | strncpy (curlocale, locale, 128); |
76 | strncpy (curlocale, locale, 128); |
64 | setlocale (LC_CTYPE, curlocale); |
77 | setlocale (LC_CTYPE, curlocale); |
65 | 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); |
66 | } |
92 | } |
67 | |
93 | |
68 | #if ENABLE_COMBINING |
94 | #if ENABLE_COMBINING |
69 | class rxvt_composite_vec rxvt_composite; |
95 | class rxvt_composite_vec rxvt_composite; |
70 | |
96 | |
… | |
… | |
134 | #if TRANSPARENT |
160 | #if TRANSPARENT |
135 | rootwin_ev (this, &rxvt_term::rootwin_cb), |
161 | rootwin_ev (this, &rxvt_term::rootwin_cb), |
136 | #endif |
162 | #endif |
137 | #ifdef HAVE_SCROLLBARS |
163 | #ifdef HAVE_SCROLLBARS |
138 | scrollbar_ev (this, &rxvt_term::x_cb), |
164 | scrollbar_ev (this, &rxvt_term::x_cb), |
139 | #endif |
|
|
140 | #ifdef MENUBAR |
|
|
141 | menubar_ev (this, &rxvt_term::x_cb), |
|
|
142 | #endif |
165 | #endif |
143 | #ifdef CURSOR_BLINK |
166 | #ifdef CURSOR_BLINK |
144 | cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), |
167 | cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), |
145 | #endif |
168 | #endif |
146 | #ifdef TEXT_BLINK |
169 | #ifdef TEXT_BLINK |
… | |
… | |
195 | pty.put (); |
218 | pty.put (); |
196 | } |
219 | } |
197 | |
220 | |
198 | rxvt_term::~rxvt_term () |
221 | rxvt_term::~rxvt_term () |
199 | { |
222 | { |
|
|
223 | HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); |
|
|
224 | |
200 | termlist.erase (find (termlist.begin (), termlist.end(), this)); |
225 | termlist.erase (find (termlist.begin (), termlist.end(), this)); |
201 | |
226 | |
202 | emergency_cleanup (); |
227 | emergency_cleanup (); |
203 | |
228 | |
204 | #if ENABLE_STYLES |
229 | #if ENABLE_STYLES |
… | |
… | |
214 | |
239 | |
215 | selection_clear (); |
240 | selection_clear (); |
216 | |
241 | |
217 | #ifdef USE_XIM |
242 | #ifdef USE_XIM |
218 | im_destroy (); |
243 | im_destroy (); |
219 | #endif |
|
|
220 | #ifdef MENUBAR |
|
|
221 | if (menubarGC) XFreeGC (disp, menubarGC); |
|
|
222 | #endif |
244 | #endif |
223 | #ifdef XTERM_SCROLLBAR |
245 | #ifdef XTERM_SCROLLBAR |
224 | if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); |
246 | if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); |
225 | if (ShadowGC) XFreeGC (disp, ShadowGC); |
247 | if (ShadowGC) XFreeGC (disp, ShadowGC); |
226 | #endif |
248 | #endif |
… | |
… | |
237 | if (upArrow) XFreePixmap (disp, upArrow); |
259 | if (upArrow) XFreePixmap (disp, upArrow); |
238 | if (downArrow) XFreePixmap (disp, downArrow); |
260 | if (downArrow) XFreePixmap (disp, downArrow); |
239 | if (upArrowHi) XFreePixmap (disp, upArrowHi); |
261 | if (upArrowHi) XFreePixmap (disp, upArrowHi); |
240 | if (downArrowHi) XFreePixmap (disp, downArrowHi); |
262 | if (downArrowHi) XFreePixmap (disp, downArrowHi); |
241 | #endif |
263 | #endif |
242 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
264 | #ifdef RXVT_SCROLLBAR |
243 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
265 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
244 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
266 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
245 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
267 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
246 | #endif |
268 | #endif |
247 | if (gc) XFreeGC (disp, gc); |
269 | if (gc) XFreeGC (disp, gc); |
248 | |
270 | |
249 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
|
|
250 | delete menuBar.drawable; |
|
|
251 | //if (menuBar.win) |
|
|
252 | // XDestroyWindow (disp, menuBar.win); |
|
|
253 | #endif |
|
|
254 | delete drawable; |
271 | delete drawable; |
255 | // destroy all windows |
272 | // destroy all windows |
256 | if (parent[0]) |
273 | if (parent[0]) |
257 | XDestroyWindow (disp, parent[0]); |
274 | XDestroyWindow (disp, parent[0]); |
258 | } |
275 | } |
259 | |
276 | |
260 | // TODO: free pixcolours, colours should become part of rxvt_display |
277 | // TODO: free pixcolours, colours should become part of rxvt_display |
261 | |
|
|
262 | delete pix_colors_focused; |
278 | delete pix_colors_focused; |
263 | #if OFF_FOCUS_FADING |
279 | #if OFF_FOCUS_FADING |
264 | delete pix_colors_unfocused; |
280 | delete pix_colors_unfocused; |
265 | #endif |
281 | #endif |
266 | |
282 | |
… | |
… | |
293 | void |
309 | void |
294 | rxvt_term::child_exit () |
310 | rxvt_term::child_exit () |
295 | { |
311 | { |
296 | cmd_pid = 0; |
312 | cmd_pid = 0; |
297 | |
313 | |
298 | if (!(options & Opt_hold)) |
314 | if (!OPTION (Opt_hold)) |
299 | destroy (); |
315 | destroy (); |
300 | } |
316 | } |
301 | |
317 | |
302 | void |
318 | void |
303 | rxvt_term::destroy () |
319 | rxvt_term::destroy () |
… | |
… | |
314 | #if USE_XIM |
330 | #if USE_XIM |
315 | im_ev.stop (display); |
331 | im_ev.stop (display); |
316 | #endif |
332 | #endif |
317 | #if HAVE_SCROLLBARS |
333 | #if HAVE_SCROLLBARS |
318 | scrollbar_ev.stop (display); |
334 | scrollbar_ev.stop (display); |
319 | #endif |
|
|
320 | #if MENUBAR |
|
|
321 | menubar_ev.stop (display); |
|
|
322 | #endif |
335 | #endif |
323 | #if TRANSPARENT |
336 | #if TRANSPARENT |
324 | rootwin_ev.stop (display); |
337 | rootwin_ev.stop (display); |
325 | #endif |
338 | #endif |
326 | incr_ev.stop (); |
339 | incr_ev.stop (); |
… | |
… | |
350 | } |
363 | } |
351 | |
364 | |
352 | void |
365 | void |
353 | rxvt_term::destroy_cb (time_watcher &w) |
366 | rxvt_term::destroy_cb (time_watcher &w) |
354 | { |
367 | { |
355 | SET_R (this); |
368 | make_current (); |
356 | |
369 | |
357 | delete this; |
370 | delete this; |
358 | } |
371 | } |
359 | |
372 | |
360 | /*----------------------------------------------------------------------*/ |
373 | /*----------------------------------------------------------------------*/ |
… | |
… | |
451 | /*----------------------------------------------------------------------*/ |
464 | /*----------------------------------------------------------------------*/ |
452 | bool |
465 | bool |
453 | rxvt_term::init (int argc, const char *const *argv) |
466 | rxvt_term::init (int argc, const char *const *argv) |
454 | { |
467 | { |
455 | SET_R (this); |
468 | SET_R (this); |
456 | |
|
|
457 | set_locale (""); |
469 | set_locale (""); |
|
|
470 | set_environ (envv); // few things in X do not call setlocale :( |
458 | |
471 | |
459 | if (!init_vars ()) |
472 | if (!init_vars ()) |
460 | return false; |
473 | return false; |
461 | |
474 | |
462 | init_secondary (); |
475 | init_secondary (); |
… | |
… | |
465 | |
478 | |
466 | #ifdef KEYSYM_RESOURCE |
479 | #ifdef KEYSYM_RESOURCE |
467 | keyboard->register_done (); |
480 | keyboard->register_done (); |
468 | #endif |
481 | #endif |
469 | |
482 | |
470 | #if MENUBAR_MAX |
|
|
471 | menubar_read (rs[Rs_menu]); |
|
|
472 | #endif |
|
|
473 | #ifdef HAVE_SCROLLBARS |
483 | #ifdef HAVE_SCROLLBARS |
474 | if (options & Opt_scrollBar) |
484 | if (OPTION (Opt_scrollBar)) |
475 | scrollBar.setIdle (); /* set existence for size calculations */ |
485 | scrollBar.setIdle (); /* set existence for size calculations */ |
476 | #endif |
486 | #endif |
477 | |
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 | |
478 | create_windows (argc, argv); |
514 | create_windows (argc, argv); |
479 | |
515 | |
480 | dDisp; |
516 | dDisp; |
481 | |
517 | |
482 | init_xlocale (); |
518 | init_xlocale (); |
483 | |
519 | |
484 | scr_reset (); /* initialize screen */ |
520 | scr_reset (); // initialize screen |
485 | |
521 | |
486 | #if 0 |
522 | #if 0 |
487 | XSynchronize (disp, True); |
523 | XSynchronize (disp, True); |
488 | #endif |
524 | #endif |
489 | |
525 | |
490 | #ifdef HAVE_SCROLLBARS |
526 | #ifdef HAVE_SCROLLBARS |
491 | if (options & Opt_scrollBar) |
527 | if (OPTION (Opt_scrollBar)) |
492 | resize_scrollbar (); /* create and map scrollbar */ |
528 | resize_scrollbar (); /* create and map scrollbar */ |
493 | #endif |
529 | #endif |
494 | #if (MENUBAR_MAX) |
|
|
495 | if (menubar_visible ()) |
|
|
496 | XMapWindow (disp, menuBar.win); |
|
|
497 | #endif |
|
|
498 | #ifdef TRANSPARENT |
530 | #ifdef TRANSPARENT |
499 | if (options & Opt_transparent) |
531 | if (OPTION (Opt_transparent)) |
500 | { |
532 | { |
501 | XSelectInput (disp, display->root, PropertyChangeMask); |
533 | XSelectInput (disp, display->root, PropertyChangeMask); |
502 | check_our_parents (); |
534 | check_our_parents (); |
503 | rootwin_ev.start (display, display->root); |
535 | rootwin_ev.start (display, display->root); |
504 | } |
536 | } |
… | |
… | |
511 | |
543 | |
512 | init_command (cmd_argv); |
544 | init_command (cmd_argv); |
513 | |
545 | |
514 | free (cmd_argv); |
546 | free (cmd_argv); |
515 | |
547 | |
|
|
548 | if (pty.pty >= 0) |
516 | pty_ev.start (pty.pty, EVENT_READ); |
549 | pty_ev.start (pty.pty, EVENT_READ); |
517 | |
550 | |
518 | check_ev.start (); |
551 | check_ev.start (); |
|
|
552 | |
|
|
553 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
519 | |
554 | |
520 | return true; |
555 | return true; |
521 | } |
556 | } |
522 | |
557 | |
523 | static struct sig_handlers |
558 | static struct sig_handlers |
… | |
… | |
558 | sw_int (this, &sig_handlers::sig_term) |
593 | sw_int (this, &sig_handlers::sig_term) |
559 | { |
594 | { |
560 | } |
595 | } |
561 | } sig_handlers; |
596 | } sig_handlers; |
562 | |
597 | |
|
|
598 | char **rxvt_environ; // startup environment |
|
|
599 | |
563 | void |
600 | void |
564 | rxvt_init () |
601 | rxvt_init () |
565 | { |
602 | { |
|
|
603 | rxvt_environ = environ; |
|
|
604 | |
566 | /* |
605 | /* |
567 | * Save and then give up any super-user privileges |
606 | * Save and then give up any super-user privileges |
568 | * 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. |
569 | * We should only need to be root in these cases: |
608 | * We should only need to be root in these cases: |
570 | * 1. write utmp entries on some systems |
609 | * 1. write utmp entries on some systems |
… | |
… | |
584 | /* signal (SIGURG, SIG_DFL); */ |
623 | /* signal (SIGURG, SIG_DFL); */ |
585 | |
624 | |
586 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
625 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
587 | // TODO: handle this with exceptions and tolerate the memory loss |
626 | // TODO: handle this with exceptions and tolerate the memory loss |
588 | XSetIOErrorHandler (rxvt_xioerror_handler); |
627 | XSetIOErrorHandler (rxvt_xioerror_handler); |
|
|
628 | |
|
|
629 | XrmInitialize (); |
589 | } |
630 | } |
590 | |
631 | |
591 | /* ------------------------------------------------------------------------- * |
632 | /* ------------------------------------------------------------------------- * |
592 | * MEMORY ALLOCATION WRAPPERS * |
633 | * MEMORY ALLOCATION WRAPPERS * |
593 | * ------------------------------------------------------------------------- */ |
634 | * ------------------------------------------------------------------------- */ |
… | |
… | |
629 | * ------------------------------------------------------------------------- */ |
670 | * ------------------------------------------------------------------------- */ |
630 | /* take care of suid/sgid super-user (root) privileges */ |
671 | /* take care of suid/sgid super-user (root) privileges */ |
631 | void |
672 | void |
632 | rxvt_privileges (rxvt_privaction action) |
673 | rxvt_privileges (rxvt_privaction action) |
633 | { |
674 | { |
634 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
|
|
635 | static uid_t euid; |
|
|
636 | static gid_t egid; |
|
|
637 | #endif |
|
|
638 | |
|
|
639 | #if ! defined(__CYGWIN32__) |
675 | #if ! defined(__CYGWIN32__) |
640 | # if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) |
676 | # if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) |
641 | /* setreuid () is the poor man's setuid (), seteuid () */ |
677 | /* setreuid () is the poor man's setuid (), seteuid () */ |
642 | # define seteuid(a) setreuid(-1, (a)) |
678 | # define seteuid(a) setreuid(-1, (a)) |
643 | # define setegid(a) setregid(-1, (a)) |
679 | # define setegid(a) setregid(-1, (a)) |
… | |
… | |
649 | case IGNORE: |
685 | case IGNORE: |
650 | /* |
686 | /* |
651 | * 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 |
652 | * back to root later, as required |
688 | * back to root later, as required |
653 | */ |
689 | */ |
|
|
690 | setegid (getgid ()); |
654 | seteuid (getuid ()); |
691 | seteuid (getuid ()); |
655 | setegid (getgid ()); |
|
|
656 | break; |
692 | break; |
657 | case SAVE: |
693 | case SAVE: |
658 | euid = geteuid (); |
|
|
659 | egid = getegid (); |
694 | saved_egid = getegid (); |
|
|
695 | saved_euid = geteuid (); |
660 | break; |
696 | break; |
661 | case RESTORE: |
697 | case RESTORE: |
662 | seteuid (euid); |
|
|
663 | setegid (egid); |
698 | setegid (saved_egid); |
|
|
699 | seteuid (saved_euid); |
664 | break; |
700 | break; |
665 | } |
701 | } |
666 | # else |
702 | # else |
667 | switch (action) |
703 | switch (action) |
668 | { |
704 | { |
669 | case IGNORE: |
705 | case IGNORE: |
|
|
706 | setgid (getgid ()); |
670 | setuid (getuid ()); |
707 | setuid (getuid ()); |
671 | setgid (getgid ()); |
|
|
672 | /* FALLTHROUGH */ |
708 | /* FALLTHROUGH */ |
673 | case SAVE: |
709 | case SAVE: |
674 | /* FALLTHROUGH */ |
710 | /* FALLTHROUGH */ |
675 | case RESTORE: |
711 | case RESTORE: |
676 | break; |
712 | break; |
… | |
… | |
681 | |
717 | |
682 | #ifdef UTMP_SUPPORT |
718 | #ifdef UTMP_SUPPORT |
683 | void |
719 | void |
684 | rxvt_term::privileged_utmp (rxvt_privaction action) |
720 | rxvt_term::privileged_utmp (rxvt_privaction action) |
685 | { |
721 | { |
686 | if ((options & Opt_utmpInhibit) |
722 | if (OPTION (Opt_utmpInhibit)) |
687 | || !pty.name || !*pty.name) |
|
|
688 | return; |
723 | return; |
689 | |
724 | |
690 | rxvt_privileges (RESTORE); |
725 | rxvt_privileges (RESTORE); |
691 | |
726 | |
692 | if (action == SAVE) |
727 | if (action == SAVE) |
693 | makeutent (pty.name, rs[Rs_display_name]); |
728 | pty.login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); |
694 | else |
729 | else |
695 | cleanutent (); |
730 | pty.logout (); |
696 | |
731 | |
697 | rxvt_privileges (IGNORE); |
732 | rxvt_privileges (IGNORE); |
698 | } |
733 | } |
699 | #endif |
734 | #endif |
700 | |
735 | |
… | |
… | |
705 | */ |
740 | */ |
706 | void |
741 | void |
707 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
742 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
708 | { |
743 | { |
709 | short recalc_x, recalc_y; |
744 | short recalc_x, recalc_y; |
710 | int x, y, sb_w, mb_h, flags; |
745 | int x, y, sb_w, flags; |
711 | unsigned int w, h; |
746 | unsigned int w, h; |
712 | unsigned int max_width, max_height; |
747 | unsigned int max_width, max_height; |
713 | dDisp; |
748 | dDisp; |
714 | |
749 | |
715 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
750 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
… | |
… | |
776 | max_width = MAX_COLS * fwidth; |
811 | max_width = MAX_COLS * fwidth; |
777 | max_height = MAX_ROWS * fheight; |
812 | max_height = MAX_ROWS * fheight; |
778 | |
813 | |
779 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
814 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
780 | |
815 | |
781 | sb_w = mb_h = 0; |
816 | sb_w = 0; |
782 | window_vt_x = window_vt_y = int_bwidth; |
817 | window_vt_x = window_vt_y = int_bwidth; |
783 | |
818 | |
784 | if (scrollbar_visible ()) |
819 | if (scrollBar.state) |
785 | { |
820 | { |
786 | sb_w = scrollbar_TotalWidth (); |
821 | sb_w = scrollbar_TotalWidth (); |
787 | szHint.base_width += sb_w; |
822 | szHint.base_width += sb_w; |
788 | if (!(options & Opt_scrollBar_right)) |
823 | if (!OPTION (Opt_scrollBar_right)) |
789 | window_vt_x += sb_w; |
824 | window_vt_x += sb_w; |
790 | } |
|
|
791 | |
|
|
792 | if (menubar_visible ()) |
|
|
793 | { |
|
|
794 | mb_h = menuBar_TotalHeight (); |
|
|
795 | szHint.base_height += mb_h; |
|
|
796 | window_vt_y += mb_h; |
|
|
797 | } |
825 | } |
798 | |
826 | |
799 | szHint.width_inc = fwidth; |
827 | szHint.width_inc = fwidth; |
800 | szHint.height_inc = fheight; |
828 | szHint.height_inc = fheight; |
801 | szHint.min_width = szHint.base_width + szHint.width_inc; |
829 | szHint.min_width = szHint.base_width + szHint.width_inc; |
… | |
… | |
821 | { |
849 | { |
822 | min_it (height, max_height); |
850 | min_it (height, max_height); |
823 | szHint.height = szHint.base_height + height; |
851 | szHint.height = szHint.base_height + height; |
824 | } |
852 | } |
825 | |
853 | |
826 | if (scrollbar_visible () && (options & Opt_scrollBar_right)) |
854 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
827 | window_sb_x = szHint.width - sb_w; |
855 | window_sb_x = szHint.width - sb_w; |
828 | |
856 | |
829 | if (recalc_x) |
857 | if (recalc_x) |
830 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
858 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
831 | if (recalc_y) |
859 | if (recalc_y) |
… | |
… | |
900 | prop.height += lineSpace; |
928 | prop.height += lineSpace; |
901 | fs->set_prop (prop); |
929 | fs->set_prop (prop); |
902 | |
930 | |
903 | fwidth = prop.width; |
931 | fwidth = prop.width; |
904 | fheight = prop.height; |
932 | fheight = prop.height; |
905 | fbase = (*fs)[1]->ascent; |
933 | fbase = prop.ascent; |
906 | |
934 | |
907 | for (int style = 1; style < 4; style++) |
935 | for (int style = 1; style < 4; style++) |
908 | { |
936 | { |
909 | #if ENABLE_STYLES |
937 | #if ENABLE_STYLES |
910 | const char *res = rs[Rs_font + style]; |
938 | const char *res = rs[Rs_font + style]; |
… | |
… | |
1001 | i = atoi (color); |
1029 | i = atoi (color); |
1002 | |
1030 | |
1003 | if (i >= 8 && i <= 15) |
1031 | if (i >= 8 && i <= 15) |
1004 | { /* bright colors */ |
1032 | { /* bright colors */ |
1005 | i -= 8; |
1033 | i -= 8; |
1006 | # ifndef NO_BRIGHTCOLOR |
|
|
1007 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
1034 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
1008 | SET_PIXCOLOR (idx); |
1035 | SET_PIXCOLOR (idx); |
1009 | goto done; |
1036 | goto done; |
1010 | # endif |
|
|
1011 | } |
1037 | } |
1012 | |
1038 | |
1013 | if (i >= 0 && i <= 7) |
1039 | if (i >= 0 && i <= 7) |
1014 | { /* normal colors */ |
1040 | { /* normal colors */ |
1015 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
1041 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
… | |
… | |
1188 | |
1214 | |
1189 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1215 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1190 | |
1216 | |
1191 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1217 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1192 | { |
1218 | { |
1193 | if (scrollbar_visible ()) |
1219 | if (scrollBar.state) |
1194 | { |
1220 | { |
1195 | XMoveResizeWindow (disp, scrollBar.win, |
1221 | XMoveResizeWindow (disp, scrollBar.win, |
1196 | window_sb_x, 0, |
1222 | window_sb_x, 0, |
1197 | scrollbar_TotalWidth (), szHint.height); |
1223 | scrollbar_TotalWidth (), szHint.height); |
1198 | resize_scrollbar (); |
1224 | resize_scrollbar (); |
1199 | } |
1225 | } |
1200 | |
1226 | |
1201 | if (menubar_visible ()) |
|
|
1202 | XMoveResizeWindow (disp, menuBar.win, |
|
|
1203 | window_vt_x, 0, |
|
|
1204 | TermWin_TotalWidth (), menuBar_TotalHeight ()); |
|
|
1205 | |
|
|
1206 | XMoveResizeWindow (disp, vt, |
1227 | XMoveResizeWindow (disp, vt, |
1207 | window_vt_x, window_vt_y, |
1228 | window_vt_x, window_vt_y, |
1208 | TermWin_TotalWidth (), TermWin_TotalHeight ()); |
1229 | width, height); |
1209 | |
1230 | |
1210 | scr_clear (); |
1231 | scr_clear (); |
1211 | #ifdef XPM_BACKGROUND |
1232 | #ifdef XPM_BACKGROUND |
1212 | resize_pixmap (); |
1233 | resize_pixmap (); |
1213 | #endif |
1234 | #endif |
… | |
… | |
1393 | XRectangle rect, status_rect, needed_rect; |
1414 | XRectangle rect, status_rect, needed_rect; |
1394 | unsigned long fg, bg; |
1415 | unsigned long fg, bg; |
1395 | const char *p; |
1416 | const char *p; |
1396 | char **s; |
1417 | char **s; |
1397 | XIMStyles *xim_styles; |
1418 | XIMStyles *xim_styles; |
|
|
1419 | |
|
|
1420 | set_environ (envv); |
1398 | |
1421 | |
1399 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1422 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1400 | return false; |
1423 | return false; |
1401 | |
1424 | |
1402 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |
1425 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |
… | |
… | |
1568 | int i; |
1591 | int i; |
1569 | const char *p; |
1592 | const char *p; |
1570 | char **s; |
1593 | char **s; |
1571 | char buf[IMBUFSIZ]; |
1594 | char buf[IMBUFSIZ]; |
1572 | |
1595 | |
1573 | SET_R (this); |
1596 | make_current (); |
1574 | |
1597 | |
1575 | im_destroy (); |
1598 | im_destroy (); |
1576 | |
1599 | |
1577 | D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); |
1600 | D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); |
1578 | if (Input_Context) |
1601 | if (Input_Context) |