ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.138 by root, Wed Feb 16 20:32:05 2005 UTC vs.
Revision 1.179 by root, Mon Jan 16 08:48:09 2006 UTC

… …
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" 52static uid_t saved_euid;
53static gid_t saved_egid;
49#endif 54#endif
55
56bool
57rxvt_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
51vector<rxvt_term *> rxvt_term::termlist; 66vector<rxvt_term *> rxvt_term::termlist;
52 67
53static char curlocale[128]; 68static char curlocale[128], savelocale[128];
54 69
55bool 70bool
56rxvt_set_locale (const char *locale) 71rxvt_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
81void
82rxvt_push_locale (const char *locale)
83{
84 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale);
86}
87
88void
89rxvt_pop_locale ()
90{
91 rxvt_set_locale (savelocale);
64} 92}
65 93
66#if ENABLE_COMBINING 94#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 95class rxvt_composite_vec rxvt_composite;
68 96
… …
157 pointer_ev (this, &rxvt_term::pointer_cb), 185 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif 186#endif
159#ifdef USE_XIM 187#ifdef USE_XIM
160 im_ev (this, &rxvt_term::im_cb), 188 im_ev (this, &rxvt_term::im_cb),
161#endif 189#endif
162 sw_term (this, &rxvt_term::sig_term),
163 sw_int (this, &rxvt_term::sig_term),
164 sw_chld (this, &rxvt_term::sig_chld),
165 termwin_ev (this, &rxvt_term::x_cb), 190 termwin_ev (this, &rxvt_term::x_cb),
166 vt_ev (this, &rxvt_term::x_cb), 191 vt_ev (this, &rxvt_term::x_cb),
167 check_ev (this, &rxvt_term::check_cb), 192 check_ev (this, &rxvt_term::check_cb),
168 flush_ev (this, &rxvt_term::flush_cb), 193 flush_ev (this, &rxvt_term::flush_cb),
169 destroy_ev (this, &rxvt_term::destroy_cb), 194 destroy_ev (this, &rxvt_term::destroy_cb),
… …
196 pty.put (); 221 pty.put ();
197} 222}
198 223
199rxvt_term::~rxvt_term () 224rxvt_term::~rxvt_term ()
200{ 225{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
227
201 termlist.erase (find (termlist.begin (), termlist.end(), this)); 228 termlist.erase (find (termlist.begin (), termlist.end(), this));
202 229
203 emergency_cleanup (); 230 emergency_cleanup ();
204 231
205#if ENABLE_STYLES 232#if ENABLE_STYLES
206 for (int i = RS_styleCount; --i; ) 233 for (int i = RS_styleCount; --i; )
207 if (TermWin.fontset[i] != TermWin.fontset[0]) 234 if (fontset[i] != fontset[0])
208 delete TermWin.fontset[i]; 235 delete fontset[i];
209#endif 236#endif
210 delete TermWin.fontset[0]; 237 delete fontset[0];
211 238
212 if (display) 239 if (display)
213 { 240 {
214 dDisp; 241 dDisp;
215 242
… …
243#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 270#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
244 if (topShadowGC) XFreeGC (disp, topShadowGC); 271 if (topShadowGC) XFreeGC (disp, topShadowGC);
245 if (botShadowGC) XFreeGC (disp, botShadowGC); 272 if (botShadowGC) XFreeGC (disp, botShadowGC);
246 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 273 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
247#endif 274#endif
248 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 275 if (gc) XFreeGC (disp, gc);
249 276
250#if defined(MENUBAR) && (MENUBAR_MAX > 1) 277#if defined(MENUBAR) && (MENUBAR_MAX > 1)
251 delete menuBar.drawable; 278 delete menuBar.drawable;
252 //if (menuBar.win) 279 //if (menuBar.win)
253 // XDestroyWindow (disp, menuBar.win); 280 // XDestroyWindow (disp, menuBar.win);
254#endif 281#endif
255 delete TermWin.drawable; 282 delete drawable;
256 // destroy all windows 283 // destroy all windows
257 if (TermWin.parent[0] 284 if (parent[0])
258#if ENABLE_FRILLS
259 && !rs[Rs_embed]
260#endif
261 )
262 XDestroyWindow (disp, TermWin.parent[0]); 285 XDestroyWindow (disp, parent[0]);
263 } 286 }
264 287
265 // TODO: free pixcolours, colours should become part of rxvt_display 288 // TODO: free pixcolours, colours should become part of rxvt_display
266
267 delete pix_colors_focused; 289 delete pix_colors_focused;
268#ifdef OFF_FOCUS_FADING 290#if OFF_FOCUS_FADING
269 delete pix_colors_unfocused; 291 delete pix_colors_unfocused;
270#endif 292#endif
271 293
272 displays.put (display); 294 displays.put (display);
273 295
… …
294 delete keyboard; 316 delete keyboard;
295#endif 317#endif
296} 318}
297 319
298void 320void
321rxvt_term::child_exit ()
322{
323 cmd_pid = 0;
324
325 if (!OPTION (Opt_hold))
326 destroy ();
327}
328
329void
299rxvt_term::destroy () 330rxvt_term::destroy ()
300{ 331{
301 if (destroy_ev.active) 332 if (destroy_ev.active)
302 return; 333 return;
303 334
… …
346} 377}
347 378
348void 379void
349rxvt_term::destroy_cb (time_watcher &w) 380rxvt_term::destroy_cb (time_watcher &w)
350{ 381{
351 SET_R (this); 382 make_current ();
352 383
353 delete this; 384 delete this;
354} 385}
355 386
356/*----------------------------------------------------------------------*/ 387/*----------------------------------------------------------------------*/
… …
421{ 452{
422 if (GET_R->allowedxerror == -1) 453 if (GET_R->allowedxerror == -1)
423 GET_R->allowedxerror = event->error_code; 454 GET_R->allowedxerror = event->error_code;
424 else 455 else
425 { 456 {
426 //TODO: GET_R is most likely not the terminal which caused the error 457 // GET_R is most likely not the terminal which caused the error,
427 //TODO: maybe just output the error and continue? 458 // so just output the error and continue
428#if ENABLE_FRILLS 459#if ENABLE_FRILLS
429 print_x_error (display, event); 460 print_x_error (display, event);
430#else 461#else
431 old_xerror_handler (display, event); 462 old_xerror_handler (display, event);
432#endif 463#endif
… …
442 DisplayString (display)); 473 DisplayString (display));
443 rxvt_emergency_cleanup (); 474 rxvt_emergency_cleanup ();
444 _exit (EXIT_FAILURE); 475 _exit (EXIT_FAILURE);
445} 476}
446 477
447/*
448 * Catch a fatal signal and tidy up before quitting
449 */
450void
451rxvt_term::sig_term (sig_watcher &w)
452{
453#ifdef DEBUG_CMD
454 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
455#endif
456 rxvt_emergency_cleanup ();
457 signal (w.signum, SIG_DFL);
458 kill (getpid (), w.signum);
459}
460
461/*----------------------------------------------------------------------*/ 478/*----------------------------------------------------------------------*/
462/* rxvt_init () */
463bool 479bool
464rxvt_term::init (int argc, const char *const *argv) 480rxvt_term::init (int argc, const char *const *argv)
465{ 481{
466 SET_R (this); 482 SET_R (this);
467
468 set_locale (""); 483 set_locale ("");
484 set_environ (envv); // few things in X do not call setlocale :(
469 485
470 if (!init_vars ()) 486 if (!init_vars ())
471 return false; 487 return false;
472 488
473 init_secondary (); 489 init_secondary ();
… …
480 496
481#if MENUBAR_MAX 497#if MENUBAR_MAX
482 menubar_read (rs[Rs_menu]); 498 menubar_read (rs[Rs_menu]);
483#endif 499#endif
484#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
485 if (options & Opt_scrollBar) 501 if (OPTION (Opt_scrollBar))
486 scrollBar.setIdle (); /* set existence for size calculations */ 502 scrollBar.setIdle (); /* set existence for size calculations */
487#endif 503#endif
488 504
505#if ENABLE_PERL
506 if (!rs[Rs_perl_ext_1])
507 rs[Rs_perl_ext_1] = "default";
508
509 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
510 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
511 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
512 {
513#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
514 // ignore some perl-related arguments if some bozo installed us set[ug]id
515 if (rxvt_tainted ())
516 {
517 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
518 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
519 {
520 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
521 rs[Rs_perl_lib] = 0;
522 rs[Rs_perl_eval] = 0;
523 }
524 }
525#endif
526 rxvt_perl.init (this);
527 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
528 }
529#endif
530
489 create_windows (argc, argv); 531 create_windows (argc, argv);
490 532
491 dDisp; 533 dDisp;
492 534
493 init_xlocale (); 535 init_xlocale ();
494 536
495 scr_reset (); /* initialize screen */ 537 scr_reset (); // initialize screen
496 538
497#if 0 539#if 0
498 XSynchronize (disp, True); 540 XSynchronize (disp, True);
499#endif 541#endif
500 542
501#ifdef HAVE_SCROLLBARS 543#ifdef HAVE_SCROLLBARS
502 if (options & Opt_scrollBar) 544 if (OPTION (Opt_scrollBar))
503 resize_scrollbar (); /* create and map scrollbar */ 545 resize_scrollbar (); /* create and map scrollbar */
504#endif 546#endif
505#if (MENUBAR_MAX) 547#if (MENUBAR_MAX)
506 if (menubar_visible ()) 548 if (menubar_visible ())
507 XMapWindow (disp, menuBar.win); 549 XMapWindow (disp, menuBar.win);
508#endif 550#endif
509#ifdef TRANSPARENT 551#ifdef TRANSPARENT
510 if (options & Opt_transparent) 552 if (OPTION (Opt_transparent))
511 { 553 {
512 XSelectInput (disp, display->root, PropertyChangeMask); 554 XSelectInput (disp, display->root, PropertyChangeMask);
513 check_our_parents (); 555 check_our_parents ();
514 rootwin_ev.start (display, display->root); 556 rootwin_ev.start (display, display->root);
515 } 557 }
516#endif 558#endif
517 559
518 XMapWindow (disp, TermWin.vt); 560 XMapWindow (disp, vt);
519 XMapWindow (disp, TermWin.parent[0]); 561 XMapWindow (disp, parent[0]);
520 562
521 set_colorfgbg (); 563 set_colorfgbg ();
522 564
523 init_command (cmd_argv); 565 init_command (cmd_argv);
524 566
525 free (cmd_argv); 567 free (cmd_argv);
526 568
569 if (pty.pty >= 0)
527 pty_ev.start (pty.pty, EVENT_READ); 570 pty_ev.start (pty.pty, EVENT_READ);
528 571
529 check_ev.start (); 572 check_ev.start ();
530 573
574 HOOK_INVOKE ((this, HOOK_START, DT_END));
575
531 return true; 576 return true;
532} 577}
533 578
579static struct sig_handlers
580{
581 sig_watcher sw_chld, sw_term, sw_int;
582
583 void sig_chld (sig_watcher &w)
584 {
585 // we are being called for every SIGCHLD, find the corresponding term
586 int pid;
587
588 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
589 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
590 if (pid == (*t)->cmd_pid)
591 {
592 (*t)->child_exit ();
593 break;
594 }
595 }
596
597 /*
598 * Catch a fatal signal and tidy up before quitting
599 */
600 void
601 sig_term (sig_watcher &w)
602 {
603#ifdef DEBUG_CMD
604 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
605#endif
606 rxvt_emergency_cleanup ();
607 signal (w.signum, SIG_DFL);
608 kill (getpid (), w.signum);
609 }
610
611 sig_handlers ()
612 : sw_chld (this, &sig_handlers::sig_chld),
613 sw_term (this, &sig_handlers::sig_term),
614 sw_int (this, &sig_handlers::sig_term)
615 {
616 }
617} sig_handlers;
618
619char **rxvt_environ; // startup environment
620
534void 621void
535rxvt_init () 622rxvt_init ()
536{ 623{
624 rxvt_environ = environ;
625
537 /* 626 /*
538 * Save and then give up any super-user privileges 627 * Save and then give up any super-user privileges
539 * If we need privileges in any area then we must specifically request it. 628 * If we need privileges in any area then we must specifically request it.
540 * We should only need to be root in these cases: 629 * We should only need to be root in these cases:
541 * 1. write utmp entries on some systems 630 * 1. write utmp entries on some systems
… …
545 rxvt_privileges (IGNORE); 634 rxvt_privileges (IGNORE);
546 635
547 signal (SIGHUP, SIG_IGN); 636 signal (SIGHUP, SIG_IGN);
548 signal (SIGPIPE, SIG_IGN); 637 signal (SIGPIPE, SIG_IGN);
549 638
639 sig_handlers.sw_chld.start (SIGCHLD);
640 sig_handlers.sw_term.start (SIGTERM);
641 sig_handlers.sw_int.start (SIGINT);
642
550 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 643 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
551 /* signal (SIGURG, SIG_DFL); */ 644 /* signal (SIGURG, SIG_DFL); */
552 645
553 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 646 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
554 // TODO: handle this with exceptions and tolerate the memory loss 647 // TODO: handle this with exceptions and tolerate the memory loss
555 XSetIOErrorHandler (rxvt_xioerror_handler); 648 XSetIOErrorHandler (rxvt_xioerror_handler);
556}
557 649
558/* ------------------------------------------------------------------------- * 650 XrmInitialize ();
559 * SIGNAL HANDLING & EXIT HANDLER *
560 * ------------------------------------------------------------------------- */
561/*
562 * Catch a SIGCHLD signal and exit if the direct child has died
563 */
564
565void
566rxvt_term::sig_chld (sig_watcher &w)
567{
568 // we are being called for every SIGCHLD, not just ours
569 int pid;
570
571 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
572 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
573 if (pid == (*t)->cmd_pid)
574 {
575 (*t)->destroy ();
576 break;
577 }
578} 651}
579 652
580/* ------------------------------------------------------------------------- * 653/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 654 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 655 * ------------------------------------------------------------------------- */
… …
589 rxvt_fatal ("memory allocation failure. aborting.\n"); 662 rxvt_fatal ("memory allocation failure. aborting.\n");
590 663
591 return p; 664 return p;
592} 665}
593 666
594/* INTPROTO */ 667void *
595void *
596rxvt_calloc (size_t number, size_t size) 668rxvt_calloc (size_t number, size_t size)
597{ 669{
598 void *p = calloc (number, size); 670 void *p = calloc (number, size);
599 671
600 if (!p) 672 if (!p)
601 rxvt_fatal ("memory allocation failure. aborting.\n"); 673 rxvt_fatal ("memory allocation failure. aborting.\n");
602 674
603 return p; 675 return p;
604} 676}
605 677
606/* INTPROTO */
607void * 678void *
608rxvt_realloc (void *ptr, size_t size) 679rxvt_realloc (void *ptr, size_t size)
609{ 680{
610 void *p = realloc (ptr, size); 681 void *p = realloc (ptr, size);
611 682
… …
620 * ------------------------------------------------------------------------- */ 691 * ------------------------------------------------------------------------- */
621/* take care of suid/sgid super-user (root) privileges */ 692/* take care of suid/sgid super-user (root) privileges */
622void 693void
623rxvt_privileges (rxvt_privaction action) 694rxvt_privileges (rxvt_privaction action)
624{ 695{
625#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
626 static uid_t euid;
627 static gid_t egid;
628#endif
629
630#if ! defined(__CYGWIN32__) 696#if ! defined(__CYGWIN32__)
631# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 697# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
632 /* setreuid () is the poor man's setuid (), seteuid () */ 698 /* setreuid () is the poor man's setuid (), seteuid () */
633# define seteuid(a) setreuid(-1, (a)) 699# define seteuid(a) setreuid(-1, (a))
634# define setegid(a) setregid(-1, (a)) 700# define setegid(a) setregid(-1, (a))
… …
640 case IGNORE: 706 case IGNORE:
641 /* 707 /*
642 * change effective uid/gid - not real uid/gid - so we can switch 708 * change effective uid/gid - not real uid/gid - so we can switch
643 * back to root later, as required 709 * back to root later, as required
644 */ 710 */
711 setegid (getgid ());
645 seteuid (getuid ()); 712 seteuid (getuid ());
646 setegid (getgid ());
647 break; 713 break;
648 case SAVE: 714 case SAVE:
649 euid = geteuid ();
650 egid = getegid (); 715 saved_egid = getegid ();
716 saved_euid = geteuid ();
651 break; 717 break;
652 case RESTORE: 718 case RESTORE:
653 seteuid (euid);
654 setegid (egid); 719 setegid (saved_egid);
720 seteuid (saved_euid);
655 break; 721 break;
656 } 722 }
657# else 723# else
658 switch (action) 724 switch (action)
659 { 725 {
660 case IGNORE: 726 case IGNORE:
727 setgid (getgid ());
661 setuid (getuid ()); 728 setuid (getuid ());
662 setgid (getgid ());
663 /* FALLTHROUGH */ 729 /* FALLTHROUGH */
664 case SAVE: 730 case SAVE:
665 /* FALLTHROUGH */ 731 /* FALLTHROUGH */
666 case RESTORE: 732 case RESTORE:
667 break; 733 break;
… …
672 738
673#ifdef UTMP_SUPPORT 739#ifdef UTMP_SUPPORT
674void 740void
675rxvt_term::privileged_utmp (rxvt_privaction action) 741rxvt_term::privileged_utmp (rxvt_privaction action)
676{ 742{
677 if ((options & Opt_utmpInhibit) 743 if (OPTION (Opt_utmpInhibit)
678 || !pty.name || !*pty.name) 744 || !pty.name || !*pty.name)
679 return; 745 return;
680 746
681 rxvt_privileges (RESTORE); 747 rxvt_privileges (RESTORE);
682 748
… …
693/* 759/*
694 * window size/position calculcations for XSizeHint and other storage. 760 * window size/position calculcations for XSizeHint and other storage.
695 * if width/height are non-zero then override calculated width/height 761 * if width/height are non-zero then override calculated width/height
696 */ 762 */
697void 763void
698rxvt_term::window_calc (unsigned int width, unsigned int height) 764rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
699{ 765{
700 short recalc_x, recalc_y; 766 short recalc_x, recalc_y;
701 int x, y, sb_w, mb_h, flags; 767 int x, y, sb_w, mb_h, flags;
702 unsigned int w, h; 768 unsigned int w, h;
703 unsigned int max_width, max_height; 769 unsigned int max_width, max_height;
704 dDisp; 770 dDisp;
705 771
706 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 772 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
707 TermWin.ncol, TermWin.nrow, szHint.width, 773 ncol, nrow, szHint.width, szHint.height));
708 szHint.height)); 774
709 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 775 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
710 szHint.win_gravity = NorthWestGravity; 776 szHint.win_gravity = NorthWestGravity;
711 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 777 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
712 778
713 recalc_x = recalc_y = 0; 779 recalc_x = recalc_y = 0;
714 flags = 0; 780 flags = 0;
781
715 if (!parsed_geometry) 782 if (!parsed_geometry)
716 { 783 {
717 parsed_geometry = 1; 784 parsed_geometry = 1;
785
718 if (rs[Rs_geometry]) 786 if (rs[Rs_geometry])
719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 787 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720 788
721 if (flags & WidthValue) 789 if (flags & WidthValue)
722 { 790 {
723 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 791 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 792 szHint.flags |= USSize;
725 } 793 }
726 794
727 if (flags & HeightValue) 795 if (flags & HeightValue)
728 { 796 {
729 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 797 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
730 szHint.flags |= USSize; 798 szHint.flags |= USSize;
731 } 799 }
732 800
733 if (flags & XValue) 801 if (flags & XValue)
734 { 802 {
735 szHint.x = x; 803 szHint.x = x;
736 szHint.flags |= USPosition; 804 szHint.flags |= USPosition;
805
737 if (flags & XNegative) 806 if (flags & XNegative)
738 { 807 {
739 recalc_x = 1; 808 recalc_x = 1;
740 szHint.win_gravity = NorthEastGravity; 809 szHint.win_gravity = NorthEastGravity;
741 } 810 }
… …
743 812
744 if (flags & YValue) 813 if (flags & YValue)
745 { 814 {
746 szHint.y = y; 815 szHint.y = y;
747 szHint.flags |= USPosition; 816 szHint.flags |= USPosition;
817
748 if (flags & YNegative) 818 if (flags & YNegative)
749 { 819 {
750 recalc_y = 1; 820 recalc_y = 1;
821
751 if (szHint.win_gravity == NorthEastGravity) 822 if (szHint.win_gravity == NorthEastGravity)
752 szHint.win_gravity = SouthEastGravity; 823 szHint.win_gravity = SouthEastGravity;
753 else 824 else
754 szHint.win_gravity = SouthWestGravity; 825 szHint.win_gravity = SouthWestGravity;
755 } 826 }
756 } 827 }
757 } 828 }
758 829
759 /* TODO: BOUNDS */ 830 /* TODO: BOUNDS */
760 TermWin.width = TermWin.ncol * TermWin.fwidth; 831 width = ncol * fwidth;
761 TermWin.height = TermWin.nrow * TermWin.fheight; 832 height = nrow * fheight;
762 max_width = MAX_COLS * TermWin.fwidth; 833 max_width = MAX_COLS * fwidth;
763 max_height = MAX_ROWS * TermWin.fheight; 834 max_height = MAX_ROWS * fheight;
764 835
765 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 836 szHint.base_width = szHint.base_height = 2 * int_bwidth;
766 837
767 sb_w = mb_h = 0; 838 sb_w = mb_h = 0;
768 window_vt_x = window_vt_y = TermWin.int_bwidth; 839 window_vt_x = window_vt_y = int_bwidth;
769 840
770 if (scrollbar_visible ()) 841 if (scrollbar_visible ())
771 { 842 {
772 sb_w = scrollbar_TotalWidth (); 843 sb_w = scrollbar_TotalWidth ();
773 szHint.base_width += sb_w; 844 szHint.base_width += sb_w;
774 if (!(options & Opt_scrollBar_right)) 845 if (!OPTION (Opt_scrollBar_right))
775 window_vt_x += sb_w; 846 window_vt_x += sb_w;
776 } 847 }
777 848
778 if (menubar_visible ()) 849 if (menubar_visible ())
779 { 850 {
780 mb_h = menuBar_TotalHeight (); 851 mb_h = menuBar_TotalHeight ();
781 szHint.base_height += mb_h; 852 szHint.base_height += mb_h;
782 window_vt_y += mb_h; 853 window_vt_y += mb_h;
783 } 854 }
784 855
785 szHint.width_inc = TermWin.fwidth; 856 szHint.width_inc = fwidth;
786 szHint.height_inc = TermWin.fheight; 857 szHint.height_inc = fheight;
787 szHint.min_width = szHint.base_width + szHint.width_inc; 858 szHint.min_width = szHint.base_width + szHint.width_inc;
788 szHint.min_height = szHint.base_height + szHint.height_inc; 859 szHint.min_height = szHint.base_height + szHint.height_inc;
789 860
790 if (width && width - szHint.base_width < max_width) 861 if (newwidth && newwidth - szHint.base_width < max_width)
791 { 862 {
792 szHint.width = width; 863 szHint.width = newwidth;
793 TermWin.width = width - szHint.base_width; 864 width = newwidth - szHint.base_width;
794 } 865 }
795 else 866 else
796 { 867 {
797 MIN_IT (TermWin.width, max_width); 868 min_it (width, max_width);
798 szHint.width = szHint.base_width + TermWin.width; 869 szHint.width = szHint.base_width + width;
799 } 870 }
800 871
801 if (height && height - szHint.base_height < max_height) 872 if (newheight && newheight - szHint.base_height < max_height)
802 { 873 {
803 szHint.height = height; 874 szHint.height = newheight;
804 TermWin.height = height - szHint.base_height; 875 height = newheight - szHint.base_height;
805 } 876 }
806 else 877 else
807 { 878 {
808 MIN_IT (TermWin.height, max_height); 879 min_it (height, max_height);
809 szHint.height = szHint.base_height + TermWin.height; 880 szHint.height = szHint.base_height + height;
810 } 881 }
811 882
812 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 883 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
813 window_sb_x = szHint.width - sb_w; 884 window_sb_x = szHint.width - sb_w;
814 885
815 if (recalc_x) 886 if (recalc_x)
816 szHint.x += (DisplayWidth (disp, display->screen) 887 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
817 - szHint.width - 2 * TermWin.ext_bwidth);
818 if (recalc_y) 888 if (recalc_y)
819 szHint.y += (DisplayHeight (disp, display->screen) 889 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
820 - szHint.height - 2 * TermWin.ext_bwidth);
821 890
822 TermWin.ncol = TermWin.width / TermWin.fwidth; 891 ncol = width / fwidth;
823 TermWin.nrow = TermWin.height / TermWin.fheight; 892 nrow = height / fheight;
824 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 893 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
825 TermWin.ncol, TermWin.nrow, szHint.width, 894 ncol, nrow, szHint.width,
826 szHint.height)); 895 szHint.height));
827 return; 896 return;
828} 897}
829 898
830/*----------------------------------------------------------------------*/ 899/*----------------------------------------------------------------------*/
… …
838 if (pty.pty < 0) 907 if (pty.pty < 0)
839 return; 908 return;
840 909
841 struct winsize ws; 910 struct winsize ws;
842 911
843 ws.ws_col = TermWin.ncol; 912 ws.ws_col = ncol;
844 ws.ws_row = TermWin.nrow; 913 ws.ws_row = nrow;
845 ws.ws_xpixel = TermWin.width; 914 ws.ws_xpixel = width;
846 ws.ws_ypixel = TermWin.height; 915 ws.ws_ypixel = height;
847 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 916 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
848 917
849#if 0 918#if 0
850 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 919 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
851 if (cmd_pid) /* force through to the command */ 920 if (cmd_pid) /* force through to the command */
852 kill (cmd_pid, SIGWINCH); 921 kill (-cmd_pid, SIGWINCH);
853#endif 922#endif
854} 923}
855 924
856/*----------------------------------------------------------------------*/ 925/*----------------------------------------------------------------------*/
857/* set_fonts () - load and set the various fonts 926/* set_fonts () - load and set the various fonts
858/* 927 *
859 * init = 1 - initialize 928 * init = 1 - initialize
860 * 929 *
861 * fontname == FONT_UP - switch to bigger font 930 * fontname == FONT_UP - switch to bigger font
862 * fontname == FONT_DN - switch to smaller font 931 * fontname == FONT_DN - switch to smaller font
863 */ 932 */
… …
875 return false; 944 return false;
876 } 945 }
877 946
878#if ENABLE_STYLES 947#if ENABLE_STYLES
879 for (int i = RS_styleCount; --i; ) 948 for (int i = RS_styleCount; --i; )
880 if (TermWin.fontset[i] != TermWin.fontset[0]) 949 if (fontset[i] != fontset[0])
881 delete TermWin.fontset[i]; 950 delete fontset[i];
882#endif 951#endif
883 952
884 delete TermWin.fontset[0]; 953 delete fontset[0];
885 TermWin.fontset[0] = fs; 954 fontset[0] = fs;
886 955
887 prop = (*fs)[1]->properties (); 956 prop = (*fs)[1]->properties ();
888 prop.height += TermWin.lineSpace; 957 prop.height += lineSpace;
889 fs->set_prop (prop); 958 fs->set_prop (prop);
890 959
891 TermWin.fwidth = prop.width; 960 fwidth = prop.width;
892 TermWin.fheight = prop.height; 961 fheight = prop.height;
893 TermWin.fweight = prop.weight; 962 fbase = prop.ascent;
894 TermWin.fslant = prop.slant;
895 TermWin.fbase = (*fs)[1]->ascent;
896 963
897 for (int style = 1; style < 4; style++) 964 for (int style = 1; style < 4; style++)
898 { 965 {
899#if ENABLE_STYLES 966#if ENABLE_STYLES
900 const char *res = rs[Rs_font + style]; 967 const char *res = rs[Rs_font + style];
901 968
902 if (res && !*res) 969 if (res && !*res)
903 TermWin.fontset[style] = TermWin.fontset[0]; 970 fontset[style] = fontset[0];
904 else 971 else
905 { 972 {
906 TermWin.fontset[style] = fs = new rxvt_fontset (this); 973 fontset[style] = fs = new rxvt_fontset (this);
907 rxvt_fontprop prop2 = prop; 974 rxvt_fontprop prop2 = prop;
908 975
909 if (res) 976 if (res)
910 prop2.weight = prop2.slant = rxvt_fontprop::unset; 977 prop2.weight = prop2.slant = rxvt_fontprop::unset;
911 else 978 else
912 { 979 {
913 res = TermWin.fontset[0]->fontdesc; 980 res = fontset[0]->fontdesc;
914 981
915 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 982 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
916 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 983 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
917 } 984 }
918 985
919 fs->populate (res); 986 fs->populate (res);
920 fs->set_prop (prop2); 987 fs->set_prop (prop2);
921 } 988 }
922#else 989#else
923 TermWin.fontset[style] = TermWin.fontset[0]; 990 fontset[style] = fontset[0];
924#endif 991#endif
925 } 992 }
926 993
927 if (TermWin.parent[0]) 994 if (parent[0])
928 { 995 {
929 resize_all_windows (0, 0, 0); 996 resize_all_windows (0, 0, 0);
930 scr_remap_chars (); 997 scr_remap_chars ();
931 scr_touch (true); 998 scr_touch (true);
932 } 999 }
… …
934 return true; 1001 return true;
935} 1002}
936 1003
937void rxvt_term::set_string_property (Atom prop, const char *str, int len) 1004void rxvt_term::set_string_property (Atom prop, const char *str, int len)
938{ 1005{
939 // TODO: SMART_WINDOW_TITLE
940 XChangeProperty (display->display, TermWin.parent[0], 1006 XChangeProperty (display->display, parent[0],
941 prop, XA_STRING, 8, PropModeReplace, 1007 prop, XA_STRING, 8, PropModeReplace,
942 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 1008 (const unsigned char *)str, len >= 0 ? len : strlen (str));
943} 1009}
944 1010
945void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 1011void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
946{ 1012{
947 // TODO: SMART_WINDOW_TITLE
948 wchar_t *ws = rxvt_mbstowcs (str, len); 1013 wchar_t *ws = rxvt_mbstowcs (str, len);
949 char *s = rxvt_wcstoutf8 (ws); 1014 char *s = rxvt_wcstoutf8 (ws);
950 1015
951 XChangeProperty (display->display, TermWin.parent[0], 1016 XChangeProperty (display->display, parent[0],
952 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 1017 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
953 (const unsigned char *)s, strlen (s)); 1018 (const unsigned char *)s, strlen (s));
954 1019
955 free (s); 1020 free (s);
956 free (ws); 1021 free (ws);
… …
961/* xterm sequences - title, iconName, color (exptl) */ 1026/* xterm sequences - title, iconName, color (exptl) */
962void 1027void
963rxvt_term::set_title (const char *str) 1028rxvt_term::set_title (const char *str)
964{ 1029{
965 set_string_property (XA_WM_NAME, str); 1030 set_string_property (XA_WM_NAME, str);
966#if ENABLE_FRILLS 1031#if ENABLE_EWMH
967 set_utf8_property (xa[XA_NET_WM_NAME], str); 1032 set_utf8_property (xa[XA_NET_WM_NAME], str);
968#endif 1033#endif
969} 1034}
970 1035
971void 1036void
972rxvt_term::set_icon_name (const char *str) 1037rxvt_term::set_icon_name (const char *str)
973{ 1038{
974 set_string_property (XA_WM_ICON_NAME, str); 1039 set_string_property (XA_WM_ICON_NAME, str);
975#if ENABLE_FRILLS 1040#if ENABLE_EWMH
976 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 1041 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
977#endif 1042#endif
978} 1043}
979 1044
980#ifdef XTERM_COLOR_CHANGE 1045#ifdef XTERM_COLOR_CHANGE
… …
993 i = atoi (color); 1058 i = atoi (color);
994 1059
995 if (i >= 8 && i <= 15) 1060 if (i >= 8 && i <= 15)
996 { /* bright colors */ 1061 { /* bright colors */
997 i -= 8; 1062 i -= 8;
998# ifndef NO_BRIGHTCOLOR
999 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1063 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1000 SET_PIXCOLOR (idx); 1064 SET_PIXCOLOR (idx);
1001 goto Done; 1065 goto done;
1002# endif
1003 } 1066 }
1004 1067
1005 if (i >= 0 && i <= 7) 1068 if (i >= 0 && i <= 7)
1006 { /* normal colors */ 1069 { /* normal colors */
1007 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1070 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1008 SET_PIXCOLOR (idx); 1071 SET_PIXCOLOR (idx);
1009 goto Done; 1072 goto done;
1010 } 1073 }
1011 } 1074 }
1012 1075
1013 if (!rXParseAllocColor (&xcol, color)) 1076 if (!rXParseAllocColor (&xcol, color))
1014 return; 1077 return;
… …
1034 pix_colors_focused[idx] = xcol; 1097 pix_colors_focused[idx] = xcol;
1035 SET_PIXCOLOR (idx); 1098 SET_PIXCOLOR (idx);
1036 1099
1037 /* XSetWindowAttributes attr; */ 1100 /* XSetWindowAttributes attr; */
1038 /* Cursor cursor; */ 1101 /* Cursor cursor; */
1039Done: 1102done:
1103
1040#ifdef OFF_FOCUS_FADING 1104#if OFF_FOCUS_FADING
1041 if (rs[Rs_fade]) 1105 if (rs[Rs_fade])
1042 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1106 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1043#endif 1107#endif
1044 1108
1045 /*TODO: handle Color_BD, scrollbar background, etc. */ 1109 /*TODO: handle Color_BD, scrollbar background, etc. */
1046 1110
1047 recolour_cursor (); 1111 recolour_cursor ();
… …
1118 1182
1119/* -------------------------------------------------------------------- * 1183/* -------------------------------------------------------------------- *
1120 * - WINDOW RESIZING - * 1184 * - WINDOW RESIZING - *
1121 * -------------------------------------------------------------------- */ 1185 * -------------------------------------------------------------------- */
1122void 1186void
1123rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1187rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1124{ 1188{
1125 int fix_screen; 1189 int fix_screen;
1126#ifdef SMART_RESIZE
1127 int old_width = szHint.width, old_height = szHint.height; 1190 int old_width = szHint.width, old_height = szHint.height;
1128#endif
1129 dDisp; 1191 dDisp;
1130 1192
1131 window_calc (width, height); 1193 window_calc (newwidth, newheight);
1132 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1194 XSetWMNormalHints (disp, parent[0], &szHint);
1133 1195
1134 if (!ignoreparent) 1196 if (!ignoreparent)
1135 { 1197 {
1136#ifdef SMART_RESIZE 1198#ifdef SMART_RESIZE
1137 /* 1199 /*
… …
1141 int x, y, x1, y1; 1203 int x, y, x1, y1;
1142 int dx, dy; 1204 int dx, dy;
1143 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1205 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1144 Window unused_cr; 1206 Window unused_cr;
1145 1207
1146 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1208 XTranslateCoordinates (disp, parent[0], display->root,
1147 0, 0, &x, &y, &unused_cr); 1209 0, 0, &x, &y, &unused_cr);
1148 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1210 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1149 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1211 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1150 /* 1212 /*
1151 * if display->root isn't the parent window, a WM will probably have offset 1213 * if display->root isn't the parent window, a WM will probably have offset
1152 * our position for handles and decorations. Counter it 1214 * our position for handles and decorations. Counter it
1153 */ 1215 */
… …
1170 if (y < y1) /* top half */ 1232 if (y < y1) /* top half */
1171 dy = 0; 1233 dy = 0;
1172 else if (y == y1) /* exact center */ 1234 else if (y == y1) /* exact center */
1173 dy /= 2; 1235 dy /= 2;
1174 1236
1175 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1237 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1176 szHint.width, szHint.height); 1238 szHint.width, szHint.height);
1177#else 1239#else
1178 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1240 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1179#endif 1241#endif
1180 } 1242 }
1181 1243
1182 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1244 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1183 1245
1184 if (fix_screen || width != old_width || height != old_height) 1246 if (fix_screen || newwidth != old_width || newheight != old_height)
1185 { 1247 {
1186 if (scrollbar_visible ()) 1248 if (scrollbar_visible ())
1187 { 1249 {
1188 XMoveResizeWindow (disp, scrollBar.win, 1250 XMoveResizeWindow (disp, scrollBar.win,
1189 window_sb_x, 0, 1251 window_sb_x, 0,
… …
1192 } 1254 }
1193 1255
1194 if (menubar_visible ()) 1256 if (menubar_visible ())
1195 XMoveResizeWindow (disp, menuBar.win, 1257 XMoveResizeWindow (disp, menuBar.win,
1196 window_vt_x, 0, 1258 window_vt_x, 0,
1197 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1259 width, menuBar_TotalHeight ());
1198 1260
1199 XMoveResizeWindow (disp, TermWin.vt, 1261 XMoveResizeWindow (disp, vt,
1200 window_vt_x, window_vt_y, 1262 window_vt_x, window_vt_y,
1201 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1263 width, height);
1202 1264
1203 scr_clear (); 1265 scr_clear ();
1204#ifdef XPM_BACKGROUND 1266#ifdef XPM_BACKGROUND
1205 resize_pixmap (); 1267 resize_pixmap ();
1206#endif 1268#endif
… …
1212 int old_ncol = prev_ncol; 1274 int old_ncol = prev_ncol;
1213 1275
1214 /* scr_reset only works on the primary screen */ 1276 /* scr_reset only works on the primary screen */
1215 if (old_height) /* this is not the first time through */ 1277 if (old_height) /* this is not the first time through */
1216 { 1278 {
1217 unsigned int ncol = TermWin.ncol; 1279 unsigned int ocol = ncol;
1218 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1280 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1219 curr_screen = scr_change_screen (PRIMARY); 1281 curr_screen = scr_change_screen (PRIMARY);
1220 TermWin.ncol = ncol; 1282 ncol = ocol;
1221 } 1283 }
1222 1284
1223 scr_reset (); 1285 scr_reset ();
1224 1286
1225 if (curr_screen >= 0) /* this is not the first time through */ 1287 if (curr_screen >= 0) /* this is not the first time through */
1226 { 1288 {
1227 scr_change_screen (curr_screen); 1289 scr_change_screen (curr_screen);
1228 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1290 selection_check (old_ncol != ncol ? 4 : 0);
1229 } 1291 }
1230 } 1292 }
1231 1293
1232 old_width = szHint.width; 1294 old_width = szHint.width;
1233 old_height = szHint.height; 1295 old_height = szHint.height;
1234 1296
1235#ifdef XPM_BACKGROUND 1297#ifdef XPM_BACKGROUND
1236 if (TermWin.pixmap) 1298 if (pixmap)
1237 scr_touch (false); 1299 scr_touch (false);
1238#endif 1300#endif
1239 1301
1240#ifdef USE_XIM 1302#ifdef USE_XIM
1241 IMSetStatusPosition (); 1303 IMSetStatusPosition ();
… …
1245/* 1307/*
1246 * Set the width/height of the vt window in characters. Units are pixels. 1308 * Set the width/height of the vt window in characters. Units are pixels.
1247 * good for toggling 80/132 columns 1309 * good for toggling 80/132 columns
1248 */ 1310 */
1249void 1311void
1250rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1312rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1251{ 1313{
1252 XWindowAttributes wattr; 1314 XWindowAttributes wattr;
1253 1315
1254 if (width == 0 || height == 0) 1316 if (newwidth == 0 || newheight == 0)
1255 { 1317 {
1256 XGetWindowAttributes (display->display, display->root, &wattr); 1318 XGetWindowAttributes (display->display, display->root, &wattr);
1319
1257 if (width == 0) 1320 if (newwidth == 0)
1258 width = wattr.width - szHint.base_width; 1321 newwidth = wattr.width - szHint.base_width;
1259 if (height == 0) 1322 if (newheight == 0)
1260 height = wattr.height - szHint.base_height; 1323 newheight = wattr.height - szHint.base_height;
1261 }
1262
1263 if (width != TermWin.width || height != TermWin.height)
1264 { 1324 }
1325
1326 if (newwidth != width || newheight != height)
1327 {
1265 width += szHint.base_width; 1328 newwidth += szHint.base_width;
1266 height += szHint.base_height; 1329 newheight += szHint.base_height;
1267 resize_all_windows (width, height, 0); 1330 resize_all_windows (newwidth, newheight, 0);
1268 } 1331 }
1269} 1332}
1270 1333
1271/* -------------------------------------------------------------------- * 1334/* -------------------------------------------------------------------- *
1272 * - X INPUT METHOD ROUTINES - * 1335 * - X INPUT METHOD ROUTINES - *
… …
1282 1345
1283void 1346void
1284rxvt_term::im_set_size (XRectangle &size) 1347rxvt_term::im_set_size (XRectangle &size)
1285{ 1348{
1286 // the int_bwidth terms make no sense to me 1349 // the int_bwidth terms make no sense to me
1287 size.x = TermWin.int_bwidth; 1350 size.x = int_bwidth;
1288 size.y = TermWin.int_bwidth; 1351 size.y = int_bwidth;
1289 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1352 size.width = Width2Pixel (ncol) + int_bwidth;
1290 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1353 size.height = Height2Pixel (nrow) + int_bwidth;
1291} 1354}
1292 1355
1293void 1356void
1294rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1357rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1295 XRectangle &status_rect, 1358 XRectangle &status_rect,
1296 const XRectangle &needed_rect) 1359 const XRectangle &needed_rect)
1297{ 1360{
1298 preedit_rect.x = needed_rect.width; 1361 preedit_rect.x = needed_rect.width;
1299 preedit_rect.y = 0; 1362 preedit_rect.y = 0;
1300 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1363 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1301 preedit_rect.height = TermWin.fheight; 1364 preedit_rect.height = fheight;
1302 1365
1303 status_rect.x = 0; 1366 status_rect.x = 0;
1304 status_rect.y = 0; 1367 status_rect.y = 0;
1305 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1368 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1306 status_rect.height = TermWin.fheight; 1369 status_rect.height = fheight;
1307} 1370}
1308 1371
1309/* Checking whether input method is running. */ 1372/* Checking whether input method is running. */
1310bool 1373bool
1311rxvt_term::IMisRunning () 1374rxvt_term::IMisRunning ()
… …
1339{ 1402{
1340 XPoint nspot; 1403 XPoint nspot;
1341 XVaNestedList preedit_attr; 1404 XVaNestedList preedit_attr;
1342 1405
1343 if (!Input_Context 1406 if (!Input_Context
1344 || !TermWin.focus 1407 || !focus
1345 || !(input_style & XIMPreeditPosition)) 1408 || !(input_style & XIMPreeditPosition))
1346 return; 1409 return;
1347 1410
1348 im_set_position (nspot); 1411 im_set_position (nspot);
1349 1412
… …
1385 XRectangle rect, status_rect, needed_rect; 1448 XRectangle rect, status_rect, needed_rect;
1386 unsigned long fg, bg; 1449 unsigned long fg, bg;
1387 const char *p; 1450 const char *p;
1388 char **s; 1451 char **s;
1389 XIMStyles *xim_styles; 1452 XIMStyles *xim_styles;
1453
1454 set_environ (envv);
1390 1455
1391 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1456 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1392 return false; 1457 return false;
1393 1458
1394 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1459 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
… …
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1534 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1535 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1536 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1537 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1473 "*", 1538 "*",
1474 TermWin.fheight, 1539 fheight,
1475 TermWin.fheight + 1, TermWin.fheight - 1, 1540 fheight + 1, fheight - 1,
1476 TermWin.fheight - 2, TermWin.fheight + 2); 1541 fheight - 2, fheight + 2);
1477 1542
1478 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1543 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1479 &missing_charset_list, &missing_charset_count, &def_string); 1544 &missing_charset_list, &missing_charset_count, &def_string);
1480 1545
1481 if (missing_charset_list) 1546 if (missing_charset_list)
… …
1527 NULL); 1592 NULL);
1528 } 1593 }
1529 1594
1530 Input_Context = XCreateIC (xim, 1595 Input_Context = XCreateIC (xim,
1531 XNInputStyle, input_style, 1596 XNInputStyle, input_style,
1532 XNClientWindow, TermWin.vt, 1597 XNClientWindow, vt,
1533 XNFocusWindow, TermWin.parent[0], 1598 XNFocusWindow, parent[0],
1534 preedit_attr ? XNPreeditAttributes : NULL, 1599 preedit_attr ? XNPreeditAttributes : NULL,
1535 preedit_attr, 1600 preedit_attr,
1536 status_attr ? XNStatusAttributes : NULL, 1601 status_attr ? XNStatusAttributes : NULL,
1537 status_attr, NULL); 1602 status_attr, NULL);
1538 1603
… …
1555} 1620}
1556 1621
1557void 1622void
1558rxvt_term::im_cb () 1623rxvt_term::im_cb ()
1559{ 1624{
1560 int i, found, had_im; 1625 int i;
1561 const char *p; 1626 const char *p;
1562 char **s; 1627 char **s;
1563 char buf[IMBUFSIZ]; 1628 char buf[IMBUFSIZ];
1564 1629
1565 SET_R (this); 1630 make_current ();
1566 1631
1567 im_destroy (); 1632 im_destroy ();
1568 1633
1569 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1634 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1570 if (Input_Context) 1635 if (Input_Context)
… …
1622{ 1687{
1623 XRectangle preedit_rect, status_rect, *needed_rect; 1688 XRectangle preedit_rect, status_rect, *needed_rect;
1624 XVaNestedList preedit_attr, status_attr; 1689 XVaNestedList preedit_attr, status_attr;
1625 1690
1626 if (!Input_Context 1691 if (!Input_Context
1627 || !TermWin.focus 1692 || !focus
1628 || !(input_style & XIMPreeditArea) 1693 || !(input_style & XIMPreeditArea)
1629 || !IMisRunning ()) 1694 || !IMisRunning ())
1630 return; 1695 return;
1631 1696
1632 /* Getting the necessary width of preedit area */ 1697 /* Getting the necessary width of preedit area */

Diff Legend

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