… | |
… | |
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 |
… | |
… | |
184 | void rxvt_term::emergency_cleanup () |
209 | void rxvt_term::emergency_cleanup () |
185 | { |
210 | { |
186 | if (cmd_pid) |
211 | if (cmd_pid) |
187 | kill (-cmd_pid, SIGHUP); |
212 | kill (-cmd_pid, SIGHUP); |
188 | |
213 | |
189 | #ifdef UTMP_SUPPORT |
214 | delete pty; pty = 0; |
190 | privileged_utmp (RESTORE); |
|
|
191 | #endif |
|
|
192 | |
|
|
193 | pty.put (); |
|
|
194 | } |
215 | } |
195 | |
216 | |
196 | rxvt_term::~rxvt_term () |
217 | rxvt_term::~rxvt_term () |
197 | { |
218 | { |
|
|
219 | HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); |
|
|
220 | |
198 | termlist.erase (find (termlist.begin (), termlist.end(), this)); |
221 | termlist.erase (find (termlist.begin (), termlist.end(), this)); |
199 | |
222 | |
200 | emergency_cleanup (); |
223 | emergency_cleanup (); |
201 | |
224 | |
202 | #if ENABLE_STYLES |
225 | #if ENABLE_STYLES |
203 | for (int i = RS_styleCount; --i; ) |
226 | for (int i = RS_styleCount; --i; ) |
204 | if (TermWin.fontset[i] != TermWin.fontset[0]) |
227 | if (fontset[i] != fontset[0]) |
205 | delete TermWin.fontset[i]; |
228 | delete fontset[i]; |
206 | #endif |
229 | #endif |
207 | delete TermWin.fontset[0]; |
230 | delete fontset[0]; |
208 | |
231 | |
209 | if (display) |
232 | if (display) |
210 | { |
233 | { |
211 | dDisp; |
234 | dDisp; |
212 | |
235 | |
213 | selection_clear (); |
236 | selection_clear (); |
214 | |
237 | |
215 | #ifdef USE_XIM |
238 | #ifdef USE_XIM |
216 | im_destroy (); |
239 | im_destroy (); |
217 | #endif |
|
|
218 | #ifdef MENUBAR |
|
|
219 | if (menubarGC) XFreeGC (disp, menubarGC); |
|
|
220 | #endif |
240 | #endif |
221 | #ifdef XTERM_SCROLLBAR |
241 | #ifdef XTERM_SCROLLBAR |
222 | if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); |
242 | if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); |
223 | if (ShadowGC) XFreeGC (disp, ShadowGC); |
243 | if (ShadowGC) XFreeGC (disp, ShadowGC); |
224 | #endif |
244 | #endif |
… | |
… | |
235 | if (upArrow) XFreePixmap (disp, upArrow); |
255 | if (upArrow) XFreePixmap (disp, upArrow); |
236 | if (downArrow) XFreePixmap (disp, downArrow); |
256 | if (downArrow) XFreePixmap (disp, downArrow); |
237 | if (upArrowHi) XFreePixmap (disp, upArrowHi); |
257 | if (upArrowHi) XFreePixmap (disp, upArrowHi); |
238 | if (downArrowHi) XFreePixmap (disp, downArrowHi); |
258 | if (downArrowHi) XFreePixmap (disp, downArrowHi); |
239 | #endif |
259 | #endif |
240 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
260 | #ifdef RXVT_SCROLLBAR |
241 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
261 | if (topShadowGC) XFreeGC (disp, topShadowGC); |
242 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
262 | if (botShadowGC) XFreeGC (disp, botShadowGC); |
243 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
263 | if (scrollbarGC) XFreeGC (disp, scrollbarGC); |
244 | #endif |
264 | #endif |
245 | if (TermWin.gc) XFreeGC (disp, TermWin.gc); |
265 | if (gc) XFreeGC (disp, gc); |
246 | |
266 | |
247 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
|
|
248 | delete menuBar.drawable; |
267 | delete drawable; |
249 | //if (menuBar.win) |
|
|
250 | // XDestroyWindow (disp, menuBar.win); |
|
|
251 | #endif |
|
|
252 | delete TermWin.drawable; |
|
|
253 | // destroy all windows |
268 | // destroy all windows |
254 | if (TermWin.parent[0]) |
269 | if (parent[0]) |
255 | XDestroyWindow (disp, TermWin.parent[0]); |
270 | XDestroyWindow (disp, parent[0]); |
256 | } |
271 | } |
257 | |
272 | |
258 | // TODO: free pixcolours, colours should become part of rxvt_display |
273 | // TODO: free pixcolours, colours should become part of rxvt_display |
259 | |
|
|
260 | delete pix_colors_focused; |
274 | delete pix_colors_focused; |
261 | #if OFF_FOCUS_FADING |
275 | #if OFF_FOCUS_FADING |
262 | delete pix_colors_unfocused; |
276 | delete pix_colors_unfocused; |
263 | #endif |
277 | #endif |
264 | |
278 | |
… | |
… | |
287 | delete keyboard; |
301 | delete keyboard; |
288 | #endif |
302 | #endif |
289 | } |
303 | } |
290 | |
304 | |
291 | void |
305 | void |
|
|
306 | rxvt_term::child_exit () |
|
|
307 | { |
|
|
308 | cmd_pid = 0; |
|
|
309 | |
|
|
310 | if (!OPTION (Opt_hold)) |
|
|
311 | destroy (); |
|
|
312 | } |
|
|
313 | |
|
|
314 | void |
292 | rxvt_term::destroy () |
315 | rxvt_term::destroy () |
293 | { |
316 | { |
294 | if (destroy_ev.active) |
317 | if (destroy_ev.active) |
295 | return; |
318 | return; |
296 | |
319 | |
… | |
… | |
303 | #if USE_XIM |
326 | #if USE_XIM |
304 | im_ev.stop (display); |
327 | im_ev.stop (display); |
305 | #endif |
328 | #endif |
306 | #if HAVE_SCROLLBARS |
329 | #if HAVE_SCROLLBARS |
307 | scrollbar_ev.stop (display); |
330 | scrollbar_ev.stop (display); |
308 | #endif |
|
|
309 | #if MENUBAR |
|
|
310 | menubar_ev.stop (display); |
|
|
311 | #endif |
331 | #endif |
312 | #if TRANSPARENT |
332 | #if TRANSPARENT |
313 | rootwin_ev.stop (display); |
333 | rootwin_ev.stop (display); |
314 | #endif |
334 | #endif |
315 | incr_ev.stop (); |
335 | incr_ev.stop (); |
… | |
… | |
339 | } |
359 | } |
340 | |
360 | |
341 | void |
361 | void |
342 | rxvt_term::destroy_cb (time_watcher &w) |
362 | rxvt_term::destroy_cb (time_watcher &w) |
343 | { |
363 | { |
344 | SET_R (this); |
364 | make_current (); |
345 | |
365 | |
346 | delete this; |
366 | delete this; |
347 | } |
367 | } |
348 | |
368 | |
349 | /*----------------------------------------------------------------------*/ |
369 | /*----------------------------------------------------------------------*/ |
… | |
… | |
440 | /*----------------------------------------------------------------------*/ |
460 | /*----------------------------------------------------------------------*/ |
441 | bool |
461 | bool |
442 | rxvt_term::init (int argc, const char *const *argv) |
462 | rxvt_term::init (int argc, const char *const *argv) |
443 | { |
463 | { |
444 | SET_R (this); |
464 | SET_R (this); |
445 | |
|
|
446 | set_locale (""); |
465 | set_locale (""); |
|
|
466 | set_environ (envv); // few things in X do not call setlocale :( |
447 | |
467 | |
448 | if (!init_vars ()) |
468 | if (!init_vars ()) |
449 | return false; |
469 | return false; |
450 | |
470 | |
451 | init_secondary (); |
471 | init_secondary (); |
… | |
… | |
454 | |
474 | |
455 | #ifdef KEYSYM_RESOURCE |
475 | #ifdef KEYSYM_RESOURCE |
456 | keyboard->register_done (); |
476 | keyboard->register_done (); |
457 | #endif |
477 | #endif |
458 | |
478 | |
459 | #if MENUBAR_MAX |
|
|
460 | menubar_read (rs[Rs_menu]); |
|
|
461 | #endif |
|
|
462 | #ifdef HAVE_SCROLLBARS |
479 | #ifdef HAVE_SCROLLBARS |
463 | if (options & Opt_scrollBar) |
480 | if (OPTION (Opt_scrollBar)) |
464 | scrollBar.setIdle (); /* set existence for size calculations */ |
481 | scrollBar.setIdle (); /* set existence for size calculations */ |
465 | #endif |
482 | #endif |
466 | |
483 | |
|
|
484 | #if ENABLE_PERL |
|
|
485 | if (!rs[Rs_perl_ext_1]) |
|
|
486 | rs[Rs_perl_ext_1] = "default"; |
|
|
487 | |
|
|
488 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
|
|
489 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
|
|
490 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
|
|
491 | { |
|
|
492 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
|
|
493 | // ignore some perl-related arguments if some bozo installed us set[ug]id |
|
|
494 | if (rxvt_tainted ()) |
|
|
495 | { |
|
|
496 | if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib]) |
|
|
497 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
|
|
498 | { |
|
|
499 | rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n"); |
|
|
500 | rs[Rs_perl_lib] = 0; |
|
|
501 | rs[Rs_perl_eval] = 0; |
|
|
502 | } |
|
|
503 | } |
|
|
504 | #endif |
|
|
505 | rxvt_perl.init (this); |
|
|
506 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
|
|
507 | } |
|
|
508 | #endif |
|
|
509 | |
|
|
510 | pty = rxvt_new_ptytty (); |
|
|
511 | |
467 | create_windows (argc, argv); |
512 | create_windows (argc, argv); |
468 | |
513 | |
469 | dDisp; |
514 | dDisp; |
470 | |
515 | |
471 | init_xlocale (); |
516 | init_xlocale (); |
472 | |
517 | |
473 | scr_reset (); /* initialize screen */ |
518 | scr_reset (); // initialize screen |
474 | |
519 | |
475 | #if 0 |
520 | #if 0 |
476 | XSynchronize (disp, True); |
521 | XSynchronize (disp, True); |
477 | #endif |
522 | #endif |
478 | |
523 | |
479 | #ifdef HAVE_SCROLLBARS |
524 | #ifdef HAVE_SCROLLBARS |
480 | if (options & Opt_scrollBar) |
525 | if (OPTION (Opt_scrollBar)) |
481 | resize_scrollbar (); /* create and map scrollbar */ |
526 | resize_scrollbar (); /* create and map scrollbar */ |
482 | #endif |
527 | #endif |
483 | #if (MENUBAR_MAX) |
|
|
484 | if (menubar_visible ()) |
|
|
485 | XMapWindow (disp, menuBar.win); |
|
|
486 | #endif |
|
|
487 | #ifdef TRANSPARENT |
528 | #ifdef TRANSPARENT |
488 | if (options & Opt_transparent) |
529 | if (OPTION (Opt_transparent)) |
489 | { |
530 | { |
490 | XSelectInput (disp, display->root, PropertyChangeMask); |
531 | XSelectInput (disp, display->root, PropertyChangeMask); |
491 | check_our_parents (); |
532 | check_our_parents (); |
492 | rootwin_ev.start (display, display->root); |
533 | rootwin_ev.start (display, display->root); |
493 | } |
534 | } |
494 | #endif |
535 | #endif |
495 | |
536 | |
496 | XMapWindow (disp, TermWin.vt); |
537 | XMapWindow (disp, vt); |
497 | XMapWindow (disp, TermWin.parent[0]); |
538 | XMapWindow (disp, parent[0]); |
498 | |
539 | |
499 | set_colorfgbg (); |
540 | set_colorfgbg (); |
500 | |
541 | |
501 | init_command (cmd_argv); |
542 | init_command (cmd_argv); |
502 | |
543 | |
503 | free (cmd_argv); |
544 | free (cmd_argv); |
504 | |
545 | |
|
|
546 | if (pty->pty >= 0) |
505 | pty_ev.start (pty.pty, EVENT_READ); |
547 | pty_ev.start (pty->pty, EVENT_READ); |
506 | |
548 | |
507 | check_ev.start (); |
549 | check_ev.start (); |
|
|
550 | |
|
|
551 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
508 | |
552 | |
509 | return true; |
553 | return true; |
510 | } |
554 | } |
511 | |
555 | |
512 | static struct sig_handlers |
556 | static struct sig_handlers |
… | |
… | |
520 | |
564 | |
521 | while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) |
565 | while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) |
522 | for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) |
566 | for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) |
523 | if (pid == (*t)->cmd_pid) |
567 | if (pid == (*t)->cmd_pid) |
524 | { |
568 | { |
525 | (*t)->destroy (); |
569 | (*t)->child_exit (); |
526 | break; |
570 | break; |
527 | } |
571 | } |
528 | } |
572 | } |
529 | |
573 | |
530 | /* |
574 | /* |
… | |
… | |
547 | sw_int (this, &sig_handlers::sig_term) |
591 | sw_int (this, &sig_handlers::sig_term) |
548 | { |
592 | { |
549 | } |
593 | } |
550 | } sig_handlers; |
594 | } sig_handlers; |
551 | |
595 | |
|
|
596 | char **rxvt_environ; // startup environment |
|
|
597 | |
552 | void |
598 | void |
553 | rxvt_init () |
599 | rxvt_init () |
554 | { |
600 | { |
|
|
601 | uid_t uid = getuid (); |
|
|
602 | gid_t gid = getgid (); |
|
|
603 | |
|
|
604 | // before doing anything else, check for setuid/setgid operation, |
|
|
605 | // start the helper process and drop privileges |
|
|
606 | if (uid != geteuid () |
|
|
607 | || 1 //D |
|
|
608 | || gid != getegid ()) |
|
|
609 | { |
|
|
610 | #if PTYTTY_HELPER |
|
|
611 | rxvt_ptytty_server (); |
|
|
612 | #else |
|
|
613 | rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n"); |
|
|
614 | #endif |
|
|
615 | |
|
|
616 | // drop privileges |
|
|
617 | #if HAVE_SETRESUID |
|
|
618 | setresgid (gid, gid, gid); |
|
|
619 | setresuid (uid, uid, uid); |
|
|
620 | #elif HAVE_SETREUID |
|
|
621 | setregid (gid, gid); |
|
|
622 | setreuid (uid, uid); |
|
|
623 | #elif HAVE_SETUID |
|
|
624 | setgid (gid); |
|
|
625 | setuid (uid); |
|
|
626 | #endif |
|
|
627 | |
|
|
628 | if (uid != geteuid () |
|
|
629 | || gid != getegid ()) |
|
|
630 | rxvt_fatal ("unable to drop privileges, aborting.\n"); |
|
|
631 | } |
|
|
632 | |
|
|
633 | rxvt_environ = environ; |
|
|
634 | |
555 | /* |
635 | /* |
556 | * Save and then give up any super-user privileges |
636 | * Save and then give up any super-user privileges |
557 | * If we need privileges in any area then we must specifically request it. |
637 | * If we need privileges in any area then we must specifically request it. |
558 | * We should only need to be root in these cases: |
638 | * We should only need to be root in these cases: |
559 | * 1. write utmp entries on some systems |
639 | * 1. write utmp entries on some systems |
… | |
… | |
573 | /* signal (SIGURG, SIG_DFL); */ |
653 | /* signal (SIGURG, SIG_DFL); */ |
574 | |
654 | |
575 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
655 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
576 | // TODO: handle this with exceptions and tolerate the memory loss |
656 | // TODO: handle this with exceptions and tolerate the memory loss |
577 | XSetIOErrorHandler (rxvt_xioerror_handler); |
657 | XSetIOErrorHandler (rxvt_xioerror_handler); |
|
|
658 | |
|
|
659 | XrmInitialize (); |
578 | } |
660 | } |
579 | |
661 | |
580 | /* ------------------------------------------------------------------------- * |
662 | /* ------------------------------------------------------------------------- * |
581 | * MEMORY ALLOCATION WRAPPERS * |
663 | * MEMORY ALLOCATION WRAPPERS * |
582 | * ------------------------------------------------------------------------- */ |
664 | * ------------------------------------------------------------------------- */ |
… | |
… | |
618 | * ------------------------------------------------------------------------- */ |
700 | * ------------------------------------------------------------------------- */ |
619 | /* take care of suid/sgid super-user (root) privileges */ |
701 | /* take care of suid/sgid super-user (root) privileges */ |
620 | void |
702 | void |
621 | rxvt_privileges (rxvt_privaction action) |
703 | rxvt_privileges (rxvt_privaction action) |
622 | { |
704 | { |
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__) |
705 | #if ! defined(__CYGWIN32__) |
629 | # if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) |
706 | # if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) |
630 | /* setreuid () is the poor man's setuid (), seteuid () */ |
707 | /* setreuid () is the poor man's setuid (), seteuid () */ |
631 | # define seteuid(a) setreuid(-1, (a)) |
708 | # define seteuid(a) setreuid(-1, (a)) |
632 | # define setegid(a) setregid(-1, (a)) |
709 | # define setegid(a) setregid(-1, (a)) |
… | |
… | |
638 | case IGNORE: |
715 | case IGNORE: |
639 | /* |
716 | /* |
640 | * change effective uid/gid - not real uid/gid - so we can switch |
717 | * change effective uid/gid - not real uid/gid - so we can switch |
641 | * back to root later, as required |
718 | * back to root later, as required |
642 | */ |
719 | */ |
|
|
720 | setegid (getgid ()); |
643 | seteuid (getuid ()); |
721 | seteuid (getuid ()); |
644 | setegid (getgid ()); |
|
|
645 | break; |
722 | break; |
646 | case SAVE: |
723 | case SAVE: |
647 | euid = geteuid (); |
|
|
648 | egid = getegid (); |
724 | saved_egid = getegid (); |
|
|
725 | saved_euid = geteuid (); |
649 | break; |
726 | break; |
650 | case RESTORE: |
727 | case RESTORE: |
651 | seteuid (euid); |
|
|
652 | setegid (egid); |
728 | setegid (saved_egid); |
|
|
729 | seteuid (saved_euid); |
653 | break; |
730 | break; |
654 | } |
731 | } |
655 | # else |
732 | # else |
656 | switch (action) |
733 | switch (action) |
657 | { |
734 | { |
658 | case IGNORE: |
735 | case IGNORE: |
|
|
736 | setgid (getgid ()); |
659 | setuid (getuid ()); |
737 | setuid (getuid ()); |
660 | setgid (getgid ()); |
|
|
661 | /* FALLTHROUGH */ |
738 | /* FALLTHROUGH */ |
662 | case SAVE: |
739 | case SAVE: |
663 | /* FALLTHROUGH */ |
740 | /* FALLTHROUGH */ |
664 | case RESTORE: |
741 | case RESTORE: |
665 | break; |
742 | break; |
666 | } |
743 | } |
667 | # endif |
744 | # endif |
668 | #endif |
745 | #endif |
669 | } |
746 | } |
670 | |
747 | |
671 | #ifdef UTMP_SUPPORT |
|
|
672 | void |
|
|
673 | rxvt_term::privileged_utmp (rxvt_privaction action) |
|
|
674 | { |
|
|
675 | if ((options & Opt_utmpInhibit) |
|
|
676 | || !pty.name || !*pty.name) |
|
|
677 | return; |
|
|
678 | |
|
|
679 | rxvt_privileges (RESTORE); |
|
|
680 | |
|
|
681 | if (action == SAVE) |
|
|
682 | makeutent (pty.name, rs[Rs_display_name]); |
|
|
683 | else |
|
|
684 | cleanutent (); |
|
|
685 | |
|
|
686 | rxvt_privileges (IGNORE); |
|
|
687 | } |
|
|
688 | #endif |
|
|
689 | |
|
|
690 | /*----------------------------------------------------------------------*/ |
748 | /*----------------------------------------------------------------------*/ |
691 | /* |
749 | /* |
692 | * window size/position calculcations for XSizeHint and other storage. |
750 | * window size/position calculcations for XSizeHint and other storage. |
693 | * if width/height are non-zero then override calculated width/height |
751 | * if width/height are non-zero then override calculated width/height |
694 | */ |
752 | */ |
695 | void |
753 | void |
696 | rxvt_term::window_calc (unsigned int width, unsigned int height) |
754 | rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) |
697 | { |
755 | { |
698 | short recalc_x, recalc_y; |
756 | short recalc_x, recalc_y; |
699 | int x, y, sb_w, mb_h, flags; |
757 | int x, y, sb_w, flags; |
700 | unsigned int w, h; |
758 | unsigned int w, h; |
701 | unsigned int max_width, max_height; |
759 | unsigned int max_width, max_height; |
702 | dDisp; |
760 | dDisp; |
703 | |
761 | |
704 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
762 | D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
705 | TermWin.ncol, TermWin.nrow, szHint.width, |
763 | ncol, nrow, szHint.width, szHint.height)); |
706 | szHint.height)); |
764 | |
707 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
765 | szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; |
708 | szHint.win_gravity = NorthWestGravity; |
766 | szHint.win_gravity = NorthWestGravity; |
709 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
767 | /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ |
710 | |
768 | |
711 | recalc_x = recalc_y = 0; |
769 | recalc_x = recalc_y = 0; |
712 | flags = 0; |
770 | flags = 0; |
|
|
771 | |
713 | if (!parsed_geometry) |
772 | if (!parsed_geometry) |
714 | { |
773 | { |
715 | parsed_geometry = 1; |
774 | parsed_geometry = 1; |
|
|
775 | |
716 | if (rs[Rs_geometry]) |
776 | if (rs[Rs_geometry]) |
717 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
777 | flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); |
718 | |
778 | |
719 | if (flags & WidthValue) |
779 | if (flags & WidthValue) |
720 | { |
780 | { |
721 | TermWin.ncol = BOUND_POSITIVE_INT16 (w); |
781 | ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); |
722 | szHint.flags |= USSize; |
782 | szHint.flags |= USSize; |
723 | } |
783 | } |
724 | |
784 | |
725 | if (flags & HeightValue) |
785 | if (flags & HeightValue) |
726 | { |
786 | { |
727 | TermWin.nrow = BOUND_POSITIVE_INT16 (h); |
787 | nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); |
728 | szHint.flags |= USSize; |
788 | szHint.flags |= USSize; |
729 | } |
789 | } |
730 | |
790 | |
731 | if (flags & XValue) |
791 | if (flags & XValue) |
732 | { |
792 | { |
733 | szHint.x = x; |
793 | szHint.x = x; |
734 | szHint.flags |= USPosition; |
794 | szHint.flags |= USPosition; |
|
|
795 | |
735 | if (flags & XNegative) |
796 | if (flags & XNegative) |
736 | { |
797 | { |
737 | recalc_x = 1; |
798 | recalc_x = 1; |
738 | szHint.win_gravity = NorthEastGravity; |
799 | szHint.win_gravity = NorthEastGravity; |
739 | } |
800 | } |
… | |
… | |
741 | |
802 | |
742 | if (flags & YValue) |
803 | if (flags & YValue) |
743 | { |
804 | { |
744 | szHint.y = y; |
805 | szHint.y = y; |
745 | szHint.flags |= USPosition; |
806 | szHint.flags |= USPosition; |
|
|
807 | |
746 | if (flags & YNegative) |
808 | if (flags & YNegative) |
747 | { |
809 | { |
748 | recalc_y = 1; |
810 | recalc_y = 1; |
|
|
811 | |
749 | if (szHint.win_gravity == NorthEastGravity) |
812 | if (szHint.win_gravity == NorthEastGravity) |
750 | szHint.win_gravity = SouthEastGravity; |
813 | szHint.win_gravity = SouthEastGravity; |
751 | else |
814 | else |
752 | szHint.win_gravity = SouthWestGravity; |
815 | szHint.win_gravity = SouthWestGravity; |
753 | } |
816 | } |
754 | } |
817 | } |
755 | } |
818 | } |
756 | |
819 | |
757 | /* TODO: BOUNDS */ |
820 | /* TODO: BOUNDS */ |
758 | TermWin.width = TermWin.ncol * TermWin.fwidth; |
821 | width = ncol * fwidth; |
759 | TermWin.height = TermWin.nrow * TermWin.fheight; |
822 | height = nrow * fheight; |
760 | max_width = MAX_COLS * TermWin.fwidth; |
823 | max_width = MAX_COLS * fwidth; |
761 | max_height = MAX_ROWS * TermWin.fheight; |
824 | max_height = MAX_ROWS * fheight; |
762 | |
825 | |
763 | szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; |
826 | szHint.base_width = szHint.base_height = 2 * int_bwidth; |
764 | |
827 | |
765 | sb_w = mb_h = 0; |
828 | sb_w = 0; |
766 | window_vt_x = window_vt_y = TermWin.int_bwidth; |
829 | window_vt_x = window_vt_y = int_bwidth; |
767 | |
830 | |
768 | if (scrollbar_visible ()) |
831 | if (scrollBar.state) |
769 | { |
832 | { |
770 | sb_w = scrollbar_TotalWidth (); |
833 | sb_w = scrollbar_TotalWidth (); |
771 | szHint.base_width += sb_w; |
834 | szHint.base_width += sb_w; |
772 | if (!(options & Opt_scrollBar_right)) |
835 | if (!OPTION (Opt_scrollBar_right)) |
773 | window_vt_x += sb_w; |
836 | window_vt_x += sb_w; |
774 | } |
837 | } |
775 | |
838 | |
776 | if (menubar_visible ()) |
|
|
777 | { |
|
|
778 | mb_h = menuBar_TotalHeight (); |
|
|
779 | szHint.base_height += mb_h; |
|
|
780 | window_vt_y += mb_h; |
|
|
781 | } |
|
|
782 | |
|
|
783 | szHint.width_inc = TermWin.fwidth; |
839 | szHint.width_inc = fwidth; |
784 | szHint.height_inc = TermWin.fheight; |
840 | szHint.height_inc = fheight; |
785 | szHint.min_width = szHint.base_width + szHint.width_inc; |
841 | szHint.min_width = szHint.base_width + szHint.width_inc; |
786 | szHint.min_height = szHint.base_height + szHint.height_inc; |
842 | szHint.min_height = szHint.base_height + szHint.height_inc; |
787 | |
843 | |
788 | if (width && width - szHint.base_width < max_width) |
844 | if (newwidth && newwidth - szHint.base_width < max_width) |
789 | { |
845 | { |
790 | szHint.width = width; |
846 | szHint.width = newwidth; |
791 | TermWin.width = width - szHint.base_width; |
847 | width = newwidth - szHint.base_width; |
792 | } |
848 | } |
793 | else |
849 | else |
794 | { |
850 | { |
795 | MIN_IT (TermWin.width, max_width); |
851 | min_it (width, max_width); |
796 | szHint.width = szHint.base_width + TermWin.width; |
852 | szHint.width = szHint.base_width + width; |
797 | } |
853 | } |
798 | |
854 | |
799 | if (height && height - szHint.base_height < max_height) |
855 | if (newheight && newheight - szHint.base_height < max_height) |
800 | { |
856 | { |
801 | szHint.height = height; |
857 | szHint.height = newheight; |
802 | TermWin.height = height - szHint.base_height; |
858 | height = newheight - szHint.base_height; |
803 | } |
859 | } |
804 | else |
860 | else |
805 | { |
861 | { |
806 | MIN_IT (TermWin.height, max_height); |
862 | min_it (height, max_height); |
807 | szHint.height = szHint.base_height + TermWin.height; |
863 | szHint.height = szHint.base_height + height; |
808 | } |
864 | } |
809 | |
865 | |
810 | if (scrollbar_visible () && (options & Opt_scrollBar_right)) |
866 | if (scrollBar.state && OPTION (Opt_scrollBar_right)) |
811 | window_sb_x = szHint.width - sb_w; |
867 | window_sb_x = szHint.width - sb_w; |
812 | |
868 | |
813 | if (recalc_x) |
869 | if (recalc_x) |
814 | szHint.x += (DisplayWidth (disp, display->screen) |
870 | szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; |
815 | - szHint.width - 2 * TermWin.ext_bwidth); |
|
|
816 | if (recalc_y) |
871 | if (recalc_y) |
817 | szHint.y += (DisplayHeight (disp, display->screen) |
872 | szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; |
818 | - szHint.height - 2 * TermWin.ext_bwidth); |
|
|
819 | |
873 | |
820 | TermWin.ncol = TermWin.width / TermWin.fwidth; |
874 | ncol = width / fwidth; |
821 | TermWin.nrow = TermWin.height / TermWin.fheight; |
875 | nrow = height / fheight; |
822 | D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
876 | D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", |
823 | TermWin.ncol, TermWin.nrow, szHint.width, |
877 | ncol, nrow, szHint.width, |
824 | szHint.height)); |
878 | szHint.height)); |
825 | return; |
879 | return; |
826 | } |
880 | } |
827 | |
881 | |
828 | /*----------------------------------------------------------------------*/ |
882 | /*----------------------------------------------------------------------*/ |
… | |
… | |
831 | * Called after a window size change. |
885 | * Called after a window size change. |
832 | */ |
886 | */ |
833 | void |
887 | void |
834 | rxvt_term::tt_winch () |
888 | rxvt_term::tt_winch () |
835 | { |
889 | { |
836 | if (pty.pty < 0) |
890 | if (pty->pty < 0) |
837 | return; |
891 | return; |
838 | |
892 | |
839 | struct winsize ws; |
893 | struct winsize ws; |
840 | |
894 | |
841 | ws.ws_col = TermWin.ncol; |
895 | ws.ws_col = ncol; |
842 | ws.ws_row = TermWin.nrow; |
896 | ws.ws_row = nrow; |
843 | ws.ws_xpixel = TermWin.width; |
897 | ws.ws_xpixel = width; |
844 | ws.ws_ypixel = TermWin.height; |
898 | ws.ws_ypixel = height; |
845 | (void)ioctl (pty.pty, TIOCSWINSZ, &ws); |
899 | (void)ioctl (pty->pty, TIOCSWINSZ, &ws); |
846 | |
900 | |
847 | #if 0 |
901 | #if 0 |
848 | // TIOCSWINSZ⎈ is supposed to do this automatically and correctly |
902 | // TIOCSWINSZ⎈ is supposed to do this automatically and correctly |
849 | if (cmd_pid) /* force through to the command */ |
903 | if (cmd_pid) /* force through to the command */ |
850 | kill (-cmd_pid, SIGWINCH); |
904 | kill (-cmd_pid, SIGWINCH); |
… | |
… | |
873 | return false; |
927 | return false; |
874 | } |
928 | } |
875 | |
929 | |
876 | #if ENABLE_STYLES |
930 | #if ENABLE_STYLES |
877 | for (int i = RS_styleCount; --i; ) |
931 | for (int i = RS_styleCount; --i; ) |
878 | if (TermWin.fontset[i] != TermWin.fontset[0]) |
932 | if (fontset[i] != fontset[0]) |
879 | delete TermWin.fontset[i]; |
933 | delete fontset[i]; |
880 | #endif |
934 | #endif |
881 | |
935 | |
882 | delete TermWin.fontset[0]; |
936 | delete fontset[0]; |
883 | TermWin.fontset[0] = fs; |
937 | fontset[0] = fs; |
884 | |
938 | |
885 | prop = (*fs)[1]->properties (); |
939 | prop = (*fs)[1]->properties (); |
886 | prop.height += TermWin.lineSpace; |
940 | prop.height += lineSpace; |
887 | fs->set_prop (prop); |
941 | fs->set_prop (prop); |
888 | |
942 | |
889 | TermWin.fwidth = prop.width; |
943 | fwidth = prop.width; |
890 | TermWin.fheight = prop.height; |
944 | fheight = prop.height; |
891 | TermWin.fweight = prop.weight; |
945 | fbase = prop.ascent; |
892 | TermWin.fslant = prop.slant; |
|
|
893 | TermWin.fbase = (*fs)[1]->ascent; |
|
|
894 | |
946 | |
895 | for (int style = 1; style < 4; style++) |
947 | for (int style = 1; style < 4; style++) |
896 | { |
948 | { |
897 | #if ENABLE_STYLES |
949 | #if ENABLE_STYLES |
898 | const char *res = rs[Rs_font + style]; |
950 | const char *res = rs[Rs_font + style]; |
899 | |
951 | |
900 | if (res && !*res) |
952 | if (res && !*res) |
901 | TermWin.fontset[style] = TermWin.fontset[0]; |
953 | fontset[style] = fontset[0]; |
902 | else |
954 | else |
903 | { |
955 | { |
904 | TermWin.fontset[style] = fs = new rxvt_fontset (this); |
956 | fontset[style] = fs = new rxvt_fontset (this); |
905 | rxvt_fontprop prop2 = prop; |
957 | rxvt_fontprop prop2 = prop; |
906 | |
958 | |
907 | if (res) |
959 | if (res) |
908 | prop2.weight = prop2.slant = rxvt_fontprop::unset; |
960 | prop2.weight = prop2.slant = rxvt_fontprop::unset; |
909 | else |
961 | else |
910 | { |
962 | { |
911 | res = TermWin.fontset[0]->fontdesc; |
963 | res = fontset[0]->fontdesc; |
912 | |
964 | |
913 | if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; |
965 | if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; |
914 | if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; |
966 | if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; |
915 | } |
967 | } |
916 | |
968 | |
917 | fs->populate (res); |
969 | fs->populate (res); |
918 | fs->set_prop (prop2); |
970 | fs->set_prop (prop2); |
919 | } |
971 | } |
920 | #else |
972 | #else |
921 | TermWin.fontset[style] = TermWin.fontset[0]; |
973 | fontset[style] = fontset[0]; |
922 | #endif |
974 | #endif |
923 | } |
975 | } |
924 | |
976 | |
925 | if (TermWin.parent[0]) |
977 | if (parent[0]) |
926 | { |
978 | { |
927 | resize_all_windows (0, 0, 0); |
979 | resize_all_windows (0, 0, 0); |
928 | scr_remap_chars (); |
980 | scr_remap_chars (); |
929 | scr_touch (true); |
981 | scr_touch (true); |
930 | } |
982 | } |
… | |
… | |
932 | return true; |
984 | return true; |
933 | } |
985 | } |
934 | |
986 | |
935 | void rxvt_term::set_string_property (Atom prop, const char *str, int len) |
987 | void rxvt_term::set_string_property (Atom prop, const char *str, int len) |
936 | { |
988 | { |
937 | // TODO: SMART_WINDOW_TITLE |
|
|
938 | XChangeProperty (display->display, TermWin.parent[0], |
989 | XChangeProperty (display->display, parent[0], |
939 | prop, XA_STRING, 8, PropModeReplace, |
990 | prop, XA_STRING, 8, PropModeReplace, |
940 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
991 | (const unsigned char *)str, len >= 0 ? len : strlen (str)); |
941 | } |
992 | } |
942 | |
993 | |
943 | void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
994 | void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) |
944 | { |
995 | { |
945 | // TODO: SMART_WINDOW_TITLE |
|
|
946 | wchar_t *ws = rxvt_mbstowcs (str, len); |
996 | wchar_t *ws = rxvt_mbstowcs (str, len); |
947 | char *s = rxvt_wcstoutf8 (ws); |
997 | char *s = rxvt_wcstoutf8 (ws); |
948 | |
998 | |
949 | XChangeProperty (display->display, TermWin.parent[0], |
999 | XChangeProperty (display->display, parent[0], |
950 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
1000 | prop, xa[XA_UTF8_STRING], 8, PropModeReplace, |
951 | (const unsigned char *)s, strlen (s)); |
1001 | (const unsigned char *)s, strlen (s)); |
952 | |
1002 | |
953 | free (s); |
1003 | free (s); |
954 | free (ws); |
1004 | free (ws); |
… | |
… | |
991 | i = atoi (color); |
1041 | i = atoi (color); |
992 | |
1042 | |
993 | if (i >= 8 && i <= 15) |
1043 | if (i >= 8 && i <= 15) |
994 | { /* bright colors */ |
1044 | { /* bright colors */ |
995 | i -= 8; |
1045 | i -= 8; |
996 | # ifndef NO_BRIGHTCOLOR |
|
|
997 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
1046 | pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; |
998 | SET_PIXCOLOR (idx); |
1047 | SET_PIXCOLOR (idx); |
999 | goto done; |
1048 | goto done; |
1000 | # endif |
|
|
1001 | } |
1049 | } |
1002 | |
1050 | |
1003 | if (i >= 0 && i <= 7) |
1051 | if (i >= 0 && i <= 7) |
1004 | { /* normal colors */ |
1052 | { /* normal colors */ |
1005 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
1053 | pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; |
… | |
… | |
1117 | |
1165 | |
1118 | /* -------------------------------------------------------------------- * |
1166 | /* -------------------------------------------------------------------- * |
1119 | * - WINDOW RESIZING - * |
1167 | * - WINDOW RESIZING - * |
1120 | * -------------------------------------------------------------------- */ |
1168 | * -------------------------------------------------------------------- */ |
1121 | void |
1169 | void |
1122 | rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) |
1170 | rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) |
1123 | { |
1171 | { |
1124 | int fix_screen; |
1172 | int fix_screen; |
1125 | #ifdef SMART_RESIZE |
|
|
1126 | int old_width = szHint.width, old_height = szHint.height; |
1173 | int old_width = szHint.width, old_height = szHint.height; |
1127 | #endif |
|
|
1128 | dDisp; |
1174 | dDisp; |
1129 | |
1175 | |
1130 | window_calc (width, height); |
1176 | window_calc (newwidth, newheight); |
1131 | XSetWMNormalHints (disp, TermWin.parent[0], &szHint); |
1177 | XSetWMNormalHints (disp, parent[0], &szHint); |
1132 | |
1178 | |
1133 | if (!ignoreparent) |
1179 | if (!ignoreparent) |
1134 | { |
1180 | { |
1135 | #ifdef SMART_RESIZE |
1181 | #ifdef SMART_RESIZE |
1136 | /* |
1182 | /* |
… | |
… | |
1140 | int x, y, x1, y1; |
1186 | int x, y, x1, y1; |
1141 | int dx, dy; |
1187 | int dx, dy; |
1142 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1188 | unsigned int unused_w1, unused_h1, unused_b1, unused_d1; |
1143 | Window unused_cr; |
1189 | Window unused_cr; |
1144 | |
1190 | |
1145 | XTranslateCoordinates (disp, TermWin.parent[0], display->root, |
1191 | XTranslateCoordinates (disp, parent[0], display->root, |
1146 | 0, 0, &x, &y, &unused_cr); |
1192 | 0, 0, &x, &y, &unused_cr); |
1147 | XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, |
1193 | XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, |
1148 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1194 | &unused_w1, &unused_h1, &unused_b1, &unused_d1); |
1149 | /* |
1195 | /* |
1150 | * if display->root isn't the parent window, a WM will probably have offset |
1196 | * if display->root isn't the parent window, a WM will probably have offset |
1151 | * our position for handles and decorations. Counter it |
1197 | * our position for handles and decorations. Counter it |
1152 | */ |
1198 | */ |
… | |
… | |
1169 | if (y < y1) /* top half */ |
1215 | if (y < y1) /* top half */ |
1170 | dy = 0; |
1216 | dy = 0; |
1171 | else if (y == y1) /* exact center */ |
1217 | else if (y == y1) /* exact center */ |
1172 | dy /= 2; |
1218 | dy /= 2; |
1173 | |
1219 | |
1174 | XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, |
1220 | XMoveResizeWindow (disp, parent[0], x + dx, y + dy, |
1175 | szHint.width, szHint.height); |
1221 | szHint.width, szHint.height); |
1176 | #else |
1222 | #else |
1177 | XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); |
1223 | XResizeWindow (disp, parent[0], szHint.width, szHint.height); |
1178 | #endif |
1224 | #endif |
1179 | } |
1225 | } |
1180 | |
1226 | |
1181 | fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; |
1227 | fix_screen = ncol != prev_ncol || nrow != prev_nrow; |
1182 | |
1228 | |
1183 | if (fix_screen || width != old_width || height != old_height) |
1229 | if (fix_screen || newwidth != old_width || newheight != old_height) |
1184 | { |
1230 | { |
1185 | if (scrollbar_visible ()) |
1231 | if (scrollBar.state) |
1186 | { |
1232 | { |
1187 | XMoveResizeWindow (disp, scrollBar.win, |
1233 | XMoveResizeWindow (disp, scrollBar.win, |
1188 | window_sb_x, 0, |
1234 | window_sb_x, 0, |
1189 | scrollbar_TotalWidth (), szHint.height); |
1235 | scrollbar_TotalWidth (), szHint.height); |
1190 | resize_scrollbar (); |
1236 | resize_scrollbar (); |
1191 | } |
1237 | } |
1192 | |
1238 | |
1193 | if (menubar_visible ()) |
|
|
1194 | XMoveResizeWindow (disp, menuBar.win, |
|
|
1195 | window_vt_x, 0, |
|
|
1196 | TermWin_TotalWidth (), menuBar_TotalHeight ()); |
|
|
1197 | |
|
|
1198 | XMoveResizeWindow (disp, TermWin.vt, |
1239 | XMoveResizeWindow (disp, vt, |
1199 | window_vt_x, window_vt_y, |
1240 | window_vt_x, window_vt_y, |
1200 | TermWin_TotalWidth (), TermWin_TotalHeight ()); |
1241 | width, height); |
1201 | |
1242 | |
1202 | scr_clear (); |
1243 | scr_clear (); |
1203 | #ifdef XPM_BACKGROUND |
1244 | #ifdef XPM_BACKGROUND |
1204 | resize_pixmap (); |
1245 | resize_pixmap (); |
1205 | #endif |
1246 | #endif |
… | |
… | |
1211 | int old_ncol = prev_ncol; |
1252 | int old_ncol = prev_ncol; |
1212 | |
1253 | |
1213 | /* scr_reset only works on the primary screen */ |
1254 | /* scr_reset only works on the primary screen */ |
1214 | if (old_height) /* this is not the first time through */ |
1255 | if (old_height) /* this is not the first time through */ |
1215 | { |
1256 | { |
1216 | unsigned int ncol = TermWin.ncol; |
1257 | unsigned int ocol = ncol; |
1217 | TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
1258 | ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
1218 | curr_screen = scr_change_screen (PRIMARY); |
1259 | curr_screen = scr_change_screen (PRIMARY); |
1219 | TermWin.ncol = ncol; |
1260 | ncol = ocol; |
1220 | } |
1261 | } |
1221 | |
1262 | |
1222 | scr_reset (); |
1263 | scr_reset (); |
1223 | |
1264 | |
1224 | if (curr_screen >= 0) /* this is not the first time through */ |
1265 | if (curr_screen >= 0) /* this is not the first time through */ |
1225 | { |
1266 | { |
1226 | scr_change_screen (curr_screen); |
1267 | scr_change_screen (curr_screen); |
1227 | selection_check (old_ncol != TermWin.ncol ? 4 : 0); |
1268 | selection_check (old_ncol != ncol ? 4 : 0); |
1228 | } |
1269 | } |
1229 | } |
1270 | } |
1230 | |
1271 | |
1231 | old_width = szHint.width; |
1272 | old_width = szHint.width; |
1232 | old_height = szHint.height; |
1273 | old_height = szHint.height; |
1233 | |
1274 | |
1234 | #ifdef XPM_BACKGROUND |
1275 | #ifdef XPM_BACKGROUND |
1235 | if (TermWin.pixmap) |
1276 | if (pixmap) |
1236 | scr_touch (false); |
1277 | scr_touch (false); |
1237 | #endif |
1278 | #endif |
1238 | |
1279 | |
1239 | #ifdef USE_XIM |
1280 | #ifdef USE_XIM |
1240 | IMSetStatusPosition (); |
1281 | IMSetStatusPosition (); |
… | |
… | |
1244 | /* |
1285 | /* |
1245 | * Set the width/height of the vt window in characters. Units are pixels. |
1286 | * Set the width/height of the vt window in characters. Units are pixels. |
1246 | * good for toggling 80/132 columns |
1287 | * good for toggling 80/132 columns |
1247 | */ |
1288 | */ |
1248 | void |
1289 | void |
1249 | rxvt_term::set_widthheight (unsigned int width, unsigned int height) |
1290 | rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight) |
1250 | { |
1291 | { |
1251 | XWindowAttributes wattr; |
1292 | XWindowAttributes wattr; |
1252 | |
1293 | |
1253 | if (width == 0 || height == 0) |
1294 | if (newwidth == 0 || newheight == 0) |
1254 | { |
1295 | { |
1255 | XGetWindowAttributes (display->display, display->root, &wattr); |
1296 | XGetWindowAttributes (display->display, display->root, &wattr); |
1256 | |
1297 | |
1257 | if (width == 0) |
1298 | if (newwidth == 0) |
1258 | width = wattr.width - szHint.base_width; |
1299 | newwidth = wattr.width - szHint.base_width; |
1259 | if (height == 0) |
1300 | if (newheight == 0) |
1260 | height = wattr.height - szHint.base_height; |
1301 | newheight = wattr.height - szHint.base_height; |
1261 | } |
|
|
1262 | |
|
|
1263 | if (width != TermWin.width || height != TermWin.height) |
|
|
1264 | { |
1302 | } |
|
|
1303 | |
|
|
1304 | if (newwidth != width || newheight != height) |
|
|
1305 | { |
1265 | width += szHint.base_width; |
1306 | newwidth += szHint.base_width; |
1266 | height += szHint.base_height; |
1307 | newheight += szHint.base_height; |
1267 | resize_all_windows (width, height, 0); |
1308 | resize_all_windows (newwidth, newheight, 0); |
1268 | } |
1309 | } |
1269 | } |
1310 | } |
1270 | |
1311 | |
1271 | /* -------------------------------------------------------------------- * |
1312 | /* -------------------------------------------------------------------- * |
1272 | * - X INPUT METHOD ROUTINES - * |
1313 | * - X INPUT METHOD ROUTINES - * |
… | |
… | |
1282 | |
1323 | |
1283 | void |
1324 | void |
1284 | rxvt_term::im_set_size (XRectangle &size) |
1325 | rxvt_term::im_set_size (XRectangle &size) |
1285 | { |
1326 | { |
1286 | // the int_bwidth terms make no sense to me |
1327 | // the int_bwidth terms make no sense to me |
1287 | size.x = TermWin.int_bwidth; |
1328 | size.x = int_bwidth; |
1288 | size.y = TermWin.int_bwidth; |
1329 | size.y = int_bwidth; |
1289 | size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; |
1330 | size.width = Width2Pixel (ncol) + int_bwidth; |
1290 | size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; |
1331 | size.height = Height2Pixel (nrow) + int_bwidth; |
1291 | } |
1332 | } |
1292 | |
1333 | |
1293 | void |
1334 | void |
1294 | rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, |
1335 | rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, |
1295 | XRectangle &status_rect, |
1336 | XRectangle &status_rect, |
1296 | const XRectangle &needed_rect) |
1337 | const XRectangle &needed_rect) |
1297 | { |
1338 | { |
1298 | preedit_rect.x = needed_rect.width; |
1339 | preedit_rect.x = needed_rect.width; |
1299 | preedit_rect.y = 0; |
1340 | preedit_rect.y = 0; |
1300 | preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; |
1341 | preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1; |
1301 | preedit_rect.height = TermWin.fheight; |
1342 | preedit_rect.height = fheight; |
1302 | |
1343 | |
1303 | status_rect.x = 0; |
1344 | status_rect.x = 0; |
1304 | status_rect.y = 0; |
1345 | status_rect.y = 0; |
1305 | status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; |
1346 | status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1; |
1306 | status_rect.height = TermWin.fheight; |
1347 | status_rect.height = fheight; |
1307 | } |
1348 | } |
1308 | |
1349 | |
1309 | /* Checking whether input method is running. */ |
1350 | /* Checking whether input method is running. */ |
1310 | bool |
1351 | bool |
1311 | rxvt_term::IMisRunning () |
1352 | rxvt_term::IMisRunning () |
… | |
… | |
1339 | { |
1380 | { |
1340 | XPoint nspot; |
1381 | XPoint nspot; |
1341 | XVaNestedList preedit_attr; |
1382 | XVaNestedList preedit_attr; |
1342 | |
1383 | |
1343 | if (!Input_Context |
1384 | if (!Input_Context |
1344 | || !TermWin.focus |
1385 | || !focus |
1345 | || !(input_style & XIMPreeditPosition)) |
1386 | || !(input_style & XIMPreeditPosition)) |
1346 | return; |
1387 | return; |
1347 | |
1388 | |
1348 | im_set_position (nspot); |
1389 | im_set_position (nspot); |
1349 | |
1390 | |
… | |
… | |
1385 | XRectangle rect, status_rect, needed_rect; |
1426 | XRectangle rect, status_rect, needed_rect; |
1386 | unsigned long fg, bg; |
1427 | unsigned long fg, bg; |
1387 | const char *p; |
1428 | const char *p; |
1388 | char **s; |
1429 | char **s; |
1389 | XIMStyles *xim_styles; |
1430 | XIMStyles *xim_styles; |
|
|
1431 | |
|
|
1432 | set_environ (envv); |
1390 | |
1433 | |
1391 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1434 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1392 | return false; |
1435 | return false; |
1393 | |
1436 | |
1394 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |
1437 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |
… | |
… | |
1469 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
1512 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
1470 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
1513 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
1471 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
1514 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
1472 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
1515 | "-*-*-*-R-*-*-%d-*-*-*-*-*-*," |
1473 | "*", |
1516 | "*", |
1474 | TermWin.fheight, |
1517 | fheight, |
1475 | TermWin.fheight + 1, TermWin.fheight - 1, |
1518 | fheight + 1, fheight - 1, |
1476 | TermWin.fheight - 2, TermWin.fheight + 2); |
1519 | fheight - 2, fheight + 2); |
1477 | |
1520 | |
1478 | fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, |
1521 | fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, |
1479 | &missing_charset_list, &missing_charset_count, &def_string); |
1522 | &missing_charset_list, &missing_charset_count, &def_string); |
1480 | |
1523 | |
1481 | if (missing_charset_list) |
1524 | if (missing_charset_list) |
… | |
… | |
1527 | NULL); |
1570 | NULL); |
1528 | } |
1571 | } |
1529 | |
1572 | |
1530 | Input_Context = XCreateIC (xim, |
1573 | Input_Context = XCreateIC (xim, |
1531 | XNInputStyle, input_style, |
1574 | XNInputStyle, input_style, |
1532 | XNClientWindow, TermWin.vt, |
1575 | XNClientWindow, vt, |
1533 | XNFocusWindow, TermWin.parent[0], |
1576 | XNFocusWindow, parent[0], |
1534 | preedit_attr ? XNPreeditAttributes : NULL, |
1577 | preedit_attr ? XNPreeditAttributes : NULL, |
1535 | preedit_attr, |
1578 | preedit_attr, |
1536 | status_attr ? XNStatusAttributes : NULL, |
1579 | status_attr ? XNStatusAttributes : NULL, |
1537 | status_attr, NULL); |
1580 | status_attr, NULL); |
1538 | |
1581 | |
… | |
… | |
1560 | int i; |
1603 | int i; |
1561 | const char *p; |
1604 | const char *p; |
1562 | char **s; |
1605 | char **s; |
1563 | char buf[IMBUFSIZ]; |
1606 | char buf[IMBUFSIZ]; |
1564 | |
1607 | |
1565 | SET_R (this); |
1608 | make_current (); |
1566 | |
1609 | |
1567 | im_destroy (); |
1610 | im_destroy (); |
1568 | |
1611 | |
1569 | D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); |
1612 | D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); |
1570 | if (Input_Context) |
1613 | if (Input_Context) |
… | |
… | |
1622 | { |
1665 | { |
1623 | XRectangle preedit_rect, status_rect, *needed_rect; |
1666 | XRectangle preedit_rect, status_rect, *needed_rect; |
1624 | XVaNestedList preedit_attr, status_attr; |
1667 | XVaNestedList preedit_attr, status_attr; |
1625 | |
1668 | |
1626 | if (!Input_Context |
1669 | if (!Input_Context |
1627 | || !TermWin.focus |
1670 | || !focus |
1628 | || !(input_style & XIMPreeditArea) |
1671 | || !(input_style & XIMPreeditArea) |
1629 | || !IMisRunning ()) |
1672 | || !IMisRunning ()) |
1630 | return; |
1673 | return; |
1631 | |
1674 | |
1632 | /* Getting the necessary width of preedit area */ |
1675 | /* Getting the necessary width of preedit area */ |