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.139 by root, Wed Feb 16 21:37:10 2005 UTC vs.
Revision 1.189 by root, Thu Jan 19 09:47:15 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
48# include "keyboard.h"
49#endif
50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53static char curlocale[128]; 53static char curlocale[128], savelocale[128];
54 54
55bool 55bool
56rxvt_set_locale (const char *locale) 56rxvt_set_locale (const char *locale)
57{ 57{
58 if (!locale || !strncmp (locale, curlocale, 128)) 58 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 59 return false;
60 60
61 strncpy (curlocale, locale, 128); 61 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 62 setlocale (LC_CTYPE, curlocale);
63 return true; 63 return true;
64}
65
66void
67rxvt_push_locale (const char *locale)
68{
69 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale);
71}
72
73void
74rxvt_pop_locale ()
75{
76 rxvt_set_locale (savelocale);
64} 77}
65 78
66#if ENABLE_COMBINING 79#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 80class rxvt_composite_vec rxvt_composite;
68 81
133 rootwin_ev (this, &rxvt_term::rootwin_cb), 146 rootwin_ev (this, &rxvt_term::rootwin_cb),
134#endif 147#endif
135#ifdef HAVE_SCROLLBARS 148#ifdef HAVE_SCROLLBARS
136 scrollbar_ev (this, &rxvt_term::x_cb), 149 scrollbar_ev (this, &rxvt_term::x_cb),
137#endif 150#endif
138#ifdef MENUBAR
139 menubar_ev (this, &rxvt_term::x_cb),
140#endif
141#ifdef CURSOR_BLINK 151#ifdef CURSOR_BLINK
142 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 152 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
143#endif 153#endif
144#ifdef TEXT_BLINK 154#ifdef TEXT_BLINK
145 text_blink_ev (this, &rxvt_term::text_blink_cb), 155 text_blink_ev (this, &rxvt_term::text_blink_cb),
157 pointer_ev (this, &rxvt_term::pointer_cb), 167 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif 168#endif
159#ifdef USE_XIM 169#ifdef USE_XIM
160 im_ev (this, &rxvt_term::im_cb), 170 im_ev (this, &rxvt_term::im_cb),
161#endif 171#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), 172 termwin_ev (this, &rxvt_term::x_cb),
166 vt_ev (this, &rxvt_term::x_cb), 173 vt_ev (this, &rxvt_term::x_cb),
174 child_ev (this, &rxvt_term::child_cb),
167 check_ev (this, &rxvt_term::check_cb), 175 check_ev (this, &rxvt_term::check_cb),
168 flush_ev (this, &rxvt_term::flush_cb), 176 flush_ev (this, &rxvt_term::flush_cb),
169 destroy_ev (this, &rxvt_term::destroy_cb), 177 destroy_ev (this, &rxvt_term::destroy_cb),
170 pty_ev (this, &rxvt_term::pty_cb), 178 pty_ev (this, &rxvt_term::pty_cb),
171 incr_ev (this, &rxvt_term::incr_cb) 179 incr_ev (this, &rxvt_term::incr_cb)
187void rxvt_term::emergency_cleanup () 195void rxvt_term::emergency_cleanup ()
188{ 196{
189 if (cmd_pid) 197 if (cmd_pid)
190 kill (-cmd_pid, SIGHUP); 198 kill (-cmd_pid, SIGHUP);
191 199
192#ifdef UTMP_SUPPORT 200 delete pty; pty = 0;
193 privileged_utmp (RESTORE);
194#endif
195
196 pty.put ();
197} 201}
198 202
199rxvt_term::~rxvt_term () 203rxvt_term::~rxvt_term ()
200{ 204{
205 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
206
201 termlist.erase (find (termlist.begin (), termlist.end(), this)); 207 termlist.erase (find (termlist.begin (), termlist.end(), this));
202 208
203 emergency_cleanup (); 209 emergency_cleanup ();
204 210
205#if ENABLE_STYLES 211#if ENABLE_STYLES
206 for (int i = RS_styleCount; --i; ) 212 for (int i = RS_styleCount; --i; )
207 if (TermWin.fontset[i] != TermWin.fontset[0]) 213 if (fontset[i] != fontset[0])
208 delete TermWin.fontset[i]; 214 delete fontset[i];
209#endif 215#endif
210 delete TermWin.fontset[0]; 216 delete fontset[0];
211 217
212 if (display) 218 if (display)
213 { 219 {
214 dDisp; 220 dDisp;
215 221
216 selection_clear (); 222 selection_clear ();
217 223
218#ifdef USE_XIM 224#ifdef USE_XIM
219 im_destroy (); 225 im_destroy ();
220#endif
221#ifdef MENUBAR
222 if (menubarGC) XFreeGC (disp, menubarGC);
223#endif 226#endif
224#ifdef XTERM_SCROLLBAR 227#ifdef XTERM_SCROLLBAR
225 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 228 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
226 if (ShadowGC) XFreeGC (disp, ShadowGC); 229 if (ShadowGC) XFreeGC (disp, ShadowGC);
227#endif 230#endif
238 if (upArrow) XFreePixmap (disp, upArrow); 241 if (upArrow) XFreePixmap (disp, upArrow);
239 if (downArrow) XFreePixmap (disp, downArrow); 242 if (downArrow) XFreePixmap (disp, downArrow);
240 if (upArrowHi) XFreePixmap (disp, upArrowHi); 243 if (upArrowHi) XFreePixmap (disp, upArrowHi);
241 if (downArrowHi) XFreePixmap (disp, downArrowHi); 244 if (downArrowHi) XFreePixmap (disp, downArrowHi);
242#endif 245#endif
243#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 246#ifdef RXVT_SCROLLBAR
244 if (topShadowGC) XFreeGC (disp, topShadowGC); 247 if (topShadowGC) XFreeGC (disp, topShadowGC);
245 if (botShadowGC) XFreeGC (disp, botShadowGC); 248 if (botShadowGC) XFreeGC (disp, botShadowGC);
246 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 249 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
247#endif 250#endif
248 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 251 if (gc) XFreeGC (disp, gc);
249 252
250#if defined(MENUBAR) && (MENUBAR_MAX > 1)
251 delete menuBar.drawable; 253 delete drawable;
252 //if (menuBar.win)
253 // XDestroyWindow (disp, menuBar.win);
254#endif
255 delete TermWin.drawable;
256 // destroy all windows 254 // destroy all windows
257 if (TermWin.parent[0] 255 if (parent[0])
258#if ENABLE_FRILLS
259 && !rs[Rs_embed]
260#endif
261 )
262 XDestroyWindow (disp, TermWin.parent[0]); 256 XDestroyWindow (disp, parent[0]);
263 } 257 }
264 258
265 // TODO: free pixcolours, colours should become part of rxvt_display 259 // TODO: free pixcolours, colours should become part of rxvt_display
266
267 delete pix_colors_focused; 260 delete pix_colors_focused;
268#ifdef OFF_FOCUS_FADING 261#if OFF_FOCUS_FADING
269 delete pix_colors_unfocused; 262 delete pix_colors_unfocused;
270#endif 263#endif
271 264
272 displays.put (display); 265 displays.put (display);
273 266
293#ifdef KEYSYM_RESOURCE 286#ifdef KEYSYM_RESOURCE
294 delete keyboard; 287 delete keyboard;
295#endif 288#endif
296} 289}
297 290
291// child has exited, usually destroys
292void
293rxvt_term::child_cb (child_watcher &w, int status)
294{
295 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
296
297 cmd_pid = 0;
298
299 if (!OPTION (Opt_hold))
300 destroy ();
301}
302
298void 303void
299rxvt_term::destroy () 304rxvt_term::destroy ()
300{ 305{
301 if (destroy_ev.active) 306 if (destroy_ev.active)
302 return; 307 return;
310#if USE_XIM 315#if USE_XIM
311 im_ev.stop (display); 316 im_ev.stop (display);
312#endif 317#endif
313#if HAVE_SCROLLBARS 318#if HAVE_SCROLLBARS
314 scrollbar_ev.stop (display); 319 scrollbar_ev.stop (display);
315#endif
316#if MENUBAR
317 menubar_ev.stop (display);
318#endif 320#endif
319#if TRANSPARENT 321#if TRANSPARENT
320 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
321#endif 323#endif
322 incr_ev.stop (); 324 incr_ev.stop ();
346} 348}
347 349
348void 350void
349rxvt_term::destroy_cb (time_watcher &w) 351rxvt_term::destroy_cb (time_watcher &w)
350{ 352{
351 SET_R (this); 353 make_current ();
352 354
353 delete this; 355 delete this;
354} 356}
355 357
356/*----------------------------------------------------------------------*/ 358/*----------------------------------------------------------------------*/
421{ 423{
422 if (GET_R->allowedxerror == -1) 424 if (GET_R->allowedxerror == -1)
423 GET_R->allowedxerror = event->error_code; 425 GET_R->allowedxerror = event->error_code;
424 else 426 else
425 { 427 {
426 //TODO: GET_R is most likely not the terminal which caused the error 428 // GET_R is most likely not the terminal which caused the error,
427 //TODO: maybe just output the error and continue? 429 // so just output the error and continue
428#if ENABLE_FRILLS 430#if ENABLE_FRILLS
429 print_x_error (display, event); 431 print_x_error (display, event);
430#else 432#else
431 old_xerror_handler (display, event); 433 old_xerror_handler (display, event);
432#endif 434#endif
442 DisplayString (display)); 444 DisplayString (display));
443 rxvt_emergency_cleanup (); 445 rxvt_emergency_cleanup ();
444 _exit (EXIT_FAILURE); 446 _exit (EXIT_FAILURE);
445} 447}
446 448
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/*----------------------------------------------------------------------*/ 449/*----------------------------------------------------------------------*/
462/* rxvt_init () */
463bool 450bool
464rxvt_term::init (int argc, const char *const *argv) 451rxvt_term::init (int argc, const char *const *argv)
465{ 452{
466 SET_R (this); 453 SET_R (this);
467
468 set_locale (""); 454 set_locale ("");
455 set_environ (envv); // few things in X do not call setlocale :(
469 456
470 if (!init_vars ()) 457 if (!init_vars ())
471 return false; 458 return false;
472 459
473 init_secondary (); 460 init_secondary ();
476 463
477#ifdef KEYSYM_RESOURCE 464#ifdef KEYSYM_RESOURCE
478 keyboard->register_done (); 465 keyboard->register_done ();
479#endif 466#endif
480 467
481#if MENUBAR_MAX
482 menubar_read (rs[Rs_menu]);
483#endif
484#ifdef HAVE_SCROLLBARS 468#ifdef HAVE_SCROLLBARS
485 if (options & Opt_scrollBar) 469 if (OPTION (Opt_scrollBar))
486 scrollBar.setIdle (); /* set existence for size calculations */ 470 scrollBar.setIdle (); /* set existence for size calculations */
487#endif 471#endif
488 472
473#if ENABLE_PERL
474 if (!rs[Rs_perl_ext_1])
475 rs[Rs_perl_ext_1] = "default";
476
477 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
478 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
479 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
480 {
481 rxvt_perl.init (this);
482 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
483 }
484#endif
485
486 pty = rxvt_new_ptytty ();
487
489 create_windows (argc, argv); 488 create_windows (argc, argv);
490 489
491 dDisp; 490 dDisp;
492 491
493 init_xlocale (); 492 init_xlocale ();
494 493
495 scr_reset (); /* initialize screen */ 494 scr_reset (); // initialize screen
496 495
497#if 0 496#if 0
498 XSynchronize (disp, True); 497 XSynchronize (disp, True);
499#endif 498#endif
500 499
501#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
502 if (options & Opt_scrollBar) 501 if (OPTION (Opt_scrollBar))
503 resize_scrollbar (); /* create and map scrollbar */ 502 resize_scrollbar (); /* create and map scrollbar */
504#endif 503#endif
505#if (MENUBAR_MAX)
506 if (menubar_visible ())
507 XMapWindow (disp, menuBar.win);
508#endif
509#ifdef TRANSPARENT 504#ifdef TRANSPARENT
510 if (options & Opt_transparent) 505 if (OPTION (Opt_transparent))
511 { 506 {
512 XSelectInput (disp, display->root, PropertyChangeMask); 507 XSelectInput (disp, display->root, PropertyChangeMask);
513 check_our_parents (); 508 check_our_parents ();
514 rootwin_ev.start (display, display->root); 509 rootwin_ev.start (display, display->root);
515 } 510 }
516#endif 511#endif
517 512
518 XMapWindow (disp, TermWin.vt); 513 XMapWindow (disp, vt);
519 XMapWindow (disp, TermWin.parent[0]); 514 XMapWindow (disp, parent[0]);
520 515
521 set_colorfgbg (); 516 set_colorfgbg ();
522 517
523 init_command (cmd_argv); 518 init_command (cmd_argv);
524 519
525 free (cmd_argv); 520 free (cmd_argv);
526 521
522 if (pty->pty >= 0)
527 pty_ev.start (pty.pty, EVENT_READ); 523 pty_ev.start (pty->pty, EVENT_READ);
528 524
529 check_ev.start (); 525 check_ev.start ();
530 526
527 HOOK_INVOKE ((this, HOOK_START, DT_END));
528
531 return true; 529 return true;
532} 530}
533 531
532static struct sig_handlers
533{
534 sig_watcher sw_term, sw_int;
535
536 /*
537 * Catch a fatal signal and tidy up before quitting
538 */
539 void
540 sig_term (sig_watcher &w)
541 {
542#ifdef DEBUG_CMD
543 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
544#endif
545 rxvt_emergency_cleanup ();
546 signal (w.signum, SIG_DFL);
547 kill (getpid (), w.signum);
548 }
549
550 sig_handlers ()
551 : sw_term (this, &sig_handlers::sig_term),
552 sw_int (this, &sig_handlers::sig_term)
553 {
554 }
555} sig_handlers;
556
557char **rxvt_environ; // startup environment
558
534void 559void
535rxvt_init () 560rxvt_init ()
536{ 561{
537 /* 562 uid_t uid = getuid ();
538 * Save and then give up any super-user privileges 563 gid_t gid = getgid ();
539 * If we need privileges in any area then we must specifically request it. 564
540 * We should only need to be root in these cases: 565 // before doing anything else, check for setuid/setgid operation,
541 * 1. write utmp entries on some systems 566 // start the helper process and drop privileges
542 * 2. chown tty on some systems 567 if (uid != geteuid ()
543 */ 568 || gid != getegid ())
544 rxvt_privileges (SAVE); 569 {
545 rxvt_privileges (IGNORE); 570#if PTYTTY_HELPER
571 rxvt_ptytty_server ();
572#else
573 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
574#endif
575
576 // drop privileges
577#if HAVE_SETRESUID
578 setresgid (gid, gid, gid);
579 setresuid (uid, uid, uid);
580#elif HAVE_SETREUID
581 setregid (gid, gid);
582 setreuid (uid, uid);
583#elif HAVE_SETUID
584 setgid (gid);
585 setuid (uid);
586#endif
587
588 if (uid != geteuid ()
589 || gid != getegid ())
590 rxvt_fatal ("unable to drop privileges, aborting.\n");
591 }
592
593 rxvt_environ = environ;
546 594
547 signal (SIGHUP, SIG_IGN); 595 signal (SIGHUP, SIG_IGN);
548 signal (SIGPIPE, SIG_IGN); 596 signal (SIGPIPE, SIG_IGN);
597
598 sig_handlers.sw_term.start (SIGTERM);
599 sig_handlers.sw_int.start (SIGINT);
549 600
550 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 601 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
551 /* signal (SIGURG, SIG_DFL); */ 602 /* signal (SIGURG, SIG_DFL); */
552 603
553 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 604 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
554 // TODO: handle this with exceptions and tolerate the memory loss 605 // TODO: handle this with exceptions and tolerate the memory loss
555 XSetIOErrorHandler (rxvt_xioerror_handler); 606 XSetIOErrorHandler (rxvt_xioerror_handler);
556}
557 607
558/* ------------------------------------------------------------------------- * 608 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} 609}
579 610
580/* ------------------------------------------------------------------------- * 611/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 612 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 613 * ------------------------------------------------------------------------- */
589 rxvt_fatal ("memory allocation failure. aborting.\n"); 620 rxvt_fatal ("memory allocation failure. aborting.\n");
590 621
591 return p; 622 return p;
592} 623}
593 624
594void * 625void *
595rxvt_calloc (size_t number, size_t size) 626rxvt_calloc (size_t number, size_t size)
596{ 627{
597 void *p = calloc (number, size); 628 void *p = calloc (number, size);
598 629
599 if (!p) 630 if (!p)
610 if (!p) 641 if (!p)
611 rxvt_fatal ("memory allocation failure. aborting.\n"); 642 rxvt_fatal ("memory allocation failure. aborting.\n");
612 643
613 return p; 644 return p;
614} 645}
615
616/* ------------------------------------------------------------------------- *
617 * PRIVILEGED OPERATIONS *
618 * ------------------------------------------------------------------------- */
619/* take care of suid/sgid super-user (root) privileges */
620void
621rxvt_privileges (rxvt_privaction action)
622{
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__)
629# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
630 /* setreuid () is the poor man's setuid (), seteuid () */
631# define seteuid(a) setreuid(-1, (a))
632# define setegid(a) setregid(-1, (a))
633# define HAVE_SETEUID
634# endif
635# ifdef HAVE_SETEUID
636 switch (action)
637 {
638 case IGNORE:
639 /*
640 * change effective uid/gid - not real uid/gid - so we can switch
641 * back to root later, as required
642 */
643 seteuid (getuid ());
644 setegid (getgid ());
645 break;
646 case SAVE:
647 euid = geteuid ();
648 egid = getegid ();
649 break;
650 case RESTORE:
651 seteuid (euid);
652 setegid (egid);
653 break;
654 }
655# else
656 switch (action)
657 {
658 case IGNORE:
659 setuid (getuid ());
660 setgid (getgid ());
661 /* FALLTHROUGH */
662 case SAVE:
663 /* FALLTHROUGH */
664 case RESTORE:
665 break;
666 }
667# endif
668#endif
669}
670
671#ifdef UTMP_SUPPORT
672void
673rxvt_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 646
690/*----------------------------------------------------------------------*/ 647/*----------------------------------------------------------------------*/
691/* 648/*
692 * window size/position calculcations for XSizeHint and other storage. 649 * window size/position calculcations for XSizeHint and other storage.
693 * if width/height are non-zero then override calculated width/height 650 * if width/height are non-zero then override calculated width/height
694 */ 651 */
695void 652void
696rxvt_term::window_calc (unsigned int width, unsigned int height) 653rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697{ 654{
698 short recalc_x, recalc_y; 655 short recalc_x, recalc_y;
699 int x, y, sb_w, mb_h, flags; 656 int x, y, sb_w, flags;
700 unsigned int w, h; 657 unsigned int w, h;
701 unsigned int max_width, max_height; 658 unsigned int max_width, max_height;
702 dDisp; 659 dDisp;
703 660
704 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 661 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
705 TermWin.ncol, TermWin.nrow, szHint.width, 662 ncol, nrow, szHint.width, szHint.height));
706 szHint.height)); 663
707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 664 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
708 szHint.win_gravity = NorthWestGravity; 665 szHint.win_gravity = NorthWestGravity;
709 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 666 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
710 667
711 recalc_x = recalc_y = 0; 668 recalc_x = recalc_y = 0;
712 flags = 0; 669 flags = 0;
670
713 if (!parsed_geometry) 671 if (!parsed_geometry)
714 { 672 {
715 parsed_geometry = 1; 673 parsed_geometry = 1;
674
716 if (rs[Rs_geometry]) 675 if (rs[Rs_geometry])
717 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 676 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
718 677
719 if (flags & WidthValue) 678 if (flags & WidthValue)
720 { 679 {
721 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 680 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
722 szHint.flags |= USSize; 681 szHint.flags |= USSize;
723 } 682 }
724 683
725 if (flags & HeightValue) 684 if (flags & HeightValue)
726 { 685 {
727 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 686 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
728 szHint.flags |= USSize; 687 szHint.flags |= USSize;
729 } 688 }
730 689
731 if (flags & XValue) 690 if (flags & XValue)
732 { 691 {
733 szHint.x = x; 692 szHint.x = x;
734 szHint.flags |= USPosition; 693 szHint.flags |= USPosition;
694
735 if (flags & XNegative) 695 if (flags & XNegative)
736 { 696 {
737 recalc_x = 1; 697 recalc_x = 1;
738 szHint.win_gravity = NorthEastGravity; 698 szHint.win_gravity = NorthEastGravity;
739 } 699 }
741 701
742 if (flags & YValue) 702 if (flags & YValue)
743 { 703 {
744 szHint.y = y; 704 szHint.y = y;
745 szHint.flags |= USPosition; 705 szHint.flags |= USPosition;
706
746 if (flags & YNegative) 707 if (flags & YNegative)
747 { 708 {
748 recalc_y = 1; 709 recalc_y = 1;
710
749 if (szHint.win_gravity == NorthEastGravity) 711 if (szHint.win_gravity == NorthEastGravity)
750 szHint.win_gravity = SouthEastGravity; 712 szHint.win_gravity = SouthEastGravity;
751 else 713 else
752 szHint.win_gravity = SouthWestGravity; 714 szHint.win_gravity = SouthWestGravity;
753 } 715 }
754 } 716 }
755 } 717 }
756 718
757 /* TODO: BOUNDS */ 719 /* TODO: BOUNDS */
758 TermWin.width = TermWin.ncol * TermWin.fwidth; 720 width = ncol * fwidth;
759 TermWin.height = TermWin.nrow * TermWin.fheight; 721 height = nrow * fheight;
760 max_width = MAX_COLS * TermWin.fwidth; 722 max_width = MAX_COLS * fwidth;
761 max_height = MAX_ROWS * TermWin.fheight; 723 max_height = MAX_ROWS * fheight;
762 724
763 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 725 szHint.base_width = szHint.base_height = 2 * int_bwidth;
764 726
765 sb_w = mb_h = 0; 727 sb_w = 0;
766 window_vt_x = window_vt_y = TermWin.int_bwidth; 728 window_vt_x = window_vt_y = int_bwidth;
767 729
768 if (scrollbar_visible ()) 730 if (scrollBar.state)
769 { 731 {
770 sb_w = scrollbar_TotalWidth (); 732 sb_w = scrollbar_TotalWidth ();
771 szHint.base_width += sb_w; 733 szHint.base_width += sb_w;
772 if (!(options & Opt_scrollBar_right)) 734 if (!OPTION (Opt_scrollBar_right))
773 window_vt_x += sb_w; 735 window_vt_x += sb_w;
774 } 736 }
775 737
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; 738 szHint.width_inc = fwidth;
784 szHint.height_inc = TermWin.fheight; 739 szHint.height_inc = fheight;
785 szHint.min_width = szHint.base_width + szHint.width_inc; 740 szHint.min_width = szHint.base_width + szHint.width_inc;
786 szHint.min_height = szHint.base_height + szHint.height_inc; 741 szHint.min_height = szHint.base_height + szHint.height_inc;
787 742
788 if (width && width - szHint.base_width < max_width) 743 if (newwidth && newwidth - szHint.base_width < max_width)
789 { 744 {
790 szHint.width = width; 745 szHint.width = newwidth;
791 TermWin.width = width - szHint.base_width; 746 width = newwidth - szHint.base_width;
792 } 747 }
793 else 748 else
794 { 749 {
795 MIN_IT (TermWin.width, max_width); 750 min_it (width, max_width);
796 szHint.width = szHint.base_width + TermWin.width; 751 szHint.width = szHint.base_width + width;
797 } 752 }
798 753
799 if (height && height - szHint.base_height < max_height) 754 if (newheight && newheight - szHint.base_height < max_height)
800 { 755 {
801 szHint.height = height; 756 szHint.height = newheight;
802 TermWin.height = height - szHint.base_height; 757 height = newheight - szHint.base_height;
803 } 758 }
804 else 759 else
805 { 760 {
806 MIN_IT (TermWin.height, max_height); 761 min_it (height, max_height);
807 szHint.height = szHint.base_height + TermWin.height; 762 szHint.height = szHint.base_height + height;
808 } 763 }
809 764
810 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 765 if (scrollBar.state && OPTION (Opt_scrollBar_right))
811 window_sb_x = szHint.width - sb_w; 766 window_sb_x = szHint.width - sb_w;
812 767
813 if (recalc_x) 768 if (recalc_x)
814 szHint.x += (DisplayWidth (disp, display->screen) 769 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
815 - szHint.width - 2 * TermWin.ext_bwidth);
816 if (recalc_y) 770 if (recalc_y)
817 szHint.y += (DisplayHeight (disp, display->screen) 771 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
818 - szHint.height - 2 * TermWin.ext_bwidth);
819 772
820 TermWin.ncol = TermWin.width / TermWin.fwidth; 773 ncol = width / fwidth;
821 TermWin.nrow = TermWin.height / TermWin.fheight; 774 nrow = height / fheight;
822 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 775 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
823 TermWin.ncol, TermWin.nrow, szHint.width, 776 ncol, nrow, szHint.width,
824 szHint.height)); 777 szHint.height));
825 return; 778 return;
826} 779}
827 780
828/*----------------------------------------------------------------------*/ 781/*----------------------------------------------------------------------*/
831 * Called after a window size change. 784 * Called after a window size change.
832 */ 785 */
833void 786void
834rxvt_term::tt_winch () 787rxvt_term::tt_winch ()
835{ 788{
836 if (pty.pty < 0) 789 if (pty->pty < 0)
837 return; 790 return;
838 791
839 struct winsize ws; 792 struct winsize ws;
840 793
841 ws.ws_col = TermWin.ncol; 794 ws.ws_col = ncol;
842 ws.ws_row = TermWin.nrow; 795 ws.ws_row = nrow;
843 ws.ws_xpixel = TermWin.width; 796 ws.ws_xpixel = width;
844 ws.ws_ypixel = TermWin.height; 797 ws.ws_ypixel = height;
845 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 798 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
846 799
847#if 0 800#if 0
848 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 801 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
849 if (cmd_pid) /* force through to the command */ 802 if (cmd_pid) /* force through to the command */
850 kill (cmd_pid, SIGWINCH); 803 kill (-cmd_pid, SIGWINCH);
851#endif 804#endif
852} 805}
853 806
854/*----------------------------------------------------------------------*/ 807/*----------------------------------------------------------------------*/
855/* set_fonts () - load and set the various fonts 808/* set_fonts () - load and set the various fonts
856/* 809 *
857 * init = 1 - initialize 810 * init = 1 - initialize
858 * 811 *
859 * fontname == FONT_UP - switch to bigger font 812 * fontname == FONT_UP - switch to bigger font
860 * fontname == FONT_DN - switch to smaller font 813 * fontname == FONT_DN - switch to smaller font
861 */ 814 */
873 return false; 826 return false;
874 } 827 }
875 828
876#if ENABLE_STYLES 829#if ENABLE_STYLES
877 for (int i = RS_styleCount; --i; ) 830 for (int i = RS_styleCount; --i; )
878 if (TermWin.fontset[i] != TermWin.fontset[0]) 831 if (fontset[i] != fontset[0])
879 delete TermWin.fontset[i]; 832 delete fontset[i];
880#endif 833#endif
881 834
882 delete TermWin.fontset[0]; 835 delete fontset[0];
883 TermWin.fontset[0] = fs; 836 fontset[0] = fs;
884 837
885 prop = (*fs)[1]->properties (); 838 prop = (*fs)[1]->properties ();
886 prop.height += TermWin.lineSpace; 839 prop.height += lineSpace;
887 fs->set_prop (prop); 840 fs->set_prop (prop);
888 841
889 TermWin.fwidth = prop.width; 842 fwidth = prop.width;
890 TermWin.fheight = prop.height; 843 fheight = prop.height;
891 TermWin.fweight = prop.weight; 844 fbase = prop.ascent;
892 TermWin.fslant = prop.slant;
893 TermWin.fbase = (*fs)[1]->ascent;
894 845
895 for (int style = 1; style < 4; style++) 846 for (int style = 1; style < 4; style++)
896 { 847 {
897#if ENABLE_STYLES 848#if ENABLE_STYLES
898 const char *res = rs[Rs_font + style]; 849 const char *res = rs[Rs_font + style];
899 850
900 if (res && !*res) 851 if (res && !*res)
901 TermWin.fontset[style] = TermWin.fontset[0]; 852 fontset[style] = fontset[0];
902 else 853 else
903 { 854 {
904 TermWin.fontset[style] = fs = new rxvt_fontset (this); 855 fontset[style] = fs = new rxvt_fontset (this);
905 rxvt_fontprop prop2 = prop; 856 rxvt_fontprop prop2 = prop;
906 857
907 if (res) 858 if (res)
908 prop2.weight = prop2.slant = rxvt_fontprop::unset; 859 prop2.weight = prop2.slant = rxvt_fontprop::unset;
909 else 860 else
910 { 861 {
911 res = TermWin.fontset[0]->fontdesc; 862 res = fontset[0]->fontdesc;
912 863
913 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 864 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; 865 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
915 } 866 }
916 867
917 fs->populate (res); 868 fs->populate (res);
918 fs->set_prop (prop2); 869 fs->set_prop (prop2);
919 } 870 }
920#else 871#else
921 TermWin.fontset[style] = TermWin.fontset[0]; 872 fontset[style] = fontset[0];
922#endif 873#endif
923 } 874 }
924 875
925 if (TermWin.parent[0]) 876 if (parent[0])
926 { 877 {
927 resize_all_windows (0, 0, 0); 878 resize_all_windows (0, 0, 0);
928 scr_remap_chars (); 879 scr_remap_chars ();
929 scr_touch (true); 880 scr_touch (true);
930 } 881 }
932 return true; 883 return true;
933} 884}
934 885
935void rxvt_term::set_string_property (Atom prop, const char *str, int len) 886void rxvt_term::set_string_property (Atom prop, const char *str, int len)
936{ 887{
937 // TODO: SMART_WINDOW_TITLE
938 XChangeProperty (display->display, TermWin.parent[0], 888 XChangeProperty (display->display, parent[0],
939 prop, XA_STRING, 8, PropModeReplace, 889 prop, XA_STRING, 8, PropModeReplace,
940 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 890 (const unsigned char *)str, len >= 0 ? len : strlen (str));
941} 891}
942 892
943void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 893void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
944{ 894{
945 // TODO: SMART_WINDOW_TITLE
946 wchar_t *ws = rxvt_mbstowcs (str, len); 895 wchar_t *ws = rxvt_mbstowcs (str, len);
947 char *s = rxvt_wcstoutf8 (ws); 896 char *s = rxvt_wcstoutf8 (ws);
948 897
949 XChangeProperty (display->display, TermWin.parent[0], 898 XChangeProperty (display->display, parent[0],
950 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 899 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
951 (const unsigned char *)s, strlen (s)); 900 (const unsigned char *)s, strlen (s));
952 901
953 free (s); 902 free (s);
954 free (ws); 903 free (ws);
959/* xterm sequences - title, iconName, color (exptl) */ 908/* xterm sequences - title, iconName, color (exptl) */
960void 909void
961rxvt_term::set_title (const char *str) 910rxvt_term::set_title (const char *str)
962{ 911{
963 set_string_property (XA_WM_NAME, str); 912 set_string_property (XA_WM_NAME, str);
964#if ENABLE_FRILLS 913#if ENABLE_EWMH
965 set_utf8_property (xa[XA_NET_WM_NAME], str); 914 set_utf8_property (xa[XA_NET_WM_NAME], str);
966#endif 915#endif
967} 916}
968 917
969void 918void
970rxvt_term::set_icon_name (const char *str) 919rxvt_term::set_icon_name (const char *str)
971{ 920{
972 set_string_property (XA_WM_ICON_NAME, str); 921 set_string_property (XA_WM_ICON_NAME, str);
973#if ENABLE_FRILLS 922#if ENABLE_EWMH
974 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 923 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
975#endif 924#endif
976} 925}
977 926
978#ifdef XTERM_COLOR_CHANGE 927#ifdef XTERM_COLOR_CHANGE
991 i = atoi (color); 940 i = atoi (color);
992 941
993 if (i >= 8 && i <= 15) 942 if (i >= 8 && i <= 15)
994 { /* bright colors */ 943 { /* bright colors */
995 i -= 8; 944 i -= 8;
996# ifndef NO_BRIGHTCOLOR
997 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 945 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
998 SET_PIXCOLOR (idx); 946 SET_PIXCOLOR (idx);
999 goto Done; 947 goto done;
1000# endif
1001 } 948 }
1002 949
1003 if (i >= 0 && i <= 7) 950 if (i >= 0 && i <= 7)
1004 { /* normal colors */ 951 { /* normal colors */
1005 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 952 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1006 SET_PIXCOLOR (idx); 953 SET_PIXCOLOR (idx);
1007 goto Done; 954 goto done;
1008 } 955 }
1009 } 956 }
1010 957
1011 if (!rXParseAllocColor (&xcol, color)) 958 if (!rXParseAllocColor (&xcol, color))
1012 return; 959 return;
1032 pix_colors_focused[idx] = xcol; 979 pix_colors_focused[idx] = xcol;
1033 SET_PIXCOLOR (idx); 980 SET_PIXCOLOR (idx);
1034 981
1035 /* XSetWindowAttributes attr; */ 982 /* XSetWindowAttributes attr; */
1036 /* Cursor cursor; */ 983 /* Cursor cursor; */
1037Done: 984done:
985
1038#ifdef OFF_FOCUS_FADING 986#if OFF_FOCUS_FADING
1039 if (rs[Rs_fade]) 987 if (rs[Rs_fade])
1040 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 988 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1041#endif 989#endif
1042 990
1043 /*TODO: handle Color_BD, scrollbar background, etc. */ 991 /*TODO: handle Color_BD, scrollbar background, etc. */
1044 992
1045 recolour_cursor (); 993 recolour_cursor ();
1116 1064
1117/* -------------------------------------------------------------------- * 1065/* -------------------------------------------------------------------- *
1118 * - WINDOW RESIZING - * 1066 * - WINDOW RESIZING - *
1119 * -------------------------------------------------------------------- */ 1067 * -------------------------------------------------------------------- */
1120void 1068void
1121rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1069rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1122{ 1070{
1123 int fix_screen; 1071 int fix_screen;
1124#ifdef SMART_RESIZE
1125 int old_width = szHint.width, old_height = szHint.height; 1072 int old_width = szHint.width, old_height = szHint.height;
1126#endif
1127 dDisp; 1073 dDisp;
1128 1074
1129 window_calc (width, height); 1075 window_calc (newwidth, newheight);
1130 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1076 XSetWMNormalHints (disp, parent[0], &szHint);
1131 1077
1132 if (!ignoreparent) 1078 if (!ignoreparent)
1133 { 1079 {
1134#ifdef SMART_RESIZE 1080#ifdef SMART_RESIZE
1135 /* 1081 /*
1139 int x, y, x1, y1; 1085 int x, y, x1, y1;
1140 int dx, dy; 1086 int dx, dy;
1141 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1087 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1142 Window unused_cr; 1088 Window unused_cr;
1143 1089
1144 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1090 XTranslateCoordinates (disp, parent[0], display->root,
1145 0, 0, &x, &y, &unused_cr); 1091 0, 0, &x, &y, &unused_cr);
1146 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1092 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1147 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1093 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1148 /* 1094 /*
1149 * if display->root isn't the parent window, a WM will probably have offset 1095 * if display->root isn't the parent window, a WM will probably have offset
1150 * our position for handles and decorations. Counter it 1096 * our position for handles and decorations. Counter it
1151 */ 1097 */
1168 if (y < y1) /* top half */ 1114 if (y < y1) /* top half */
1169 dy = 0; 1115 dy = 0;
1170 else if (y == y1) /* exact center */ 1116 else if (y == y1) /* exact center */
1171 dy /= 2; 1117 dy /= 2;
1172 1118
1173 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1119 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1174 szHint.width, szHint.height); 1120 szHint.width, szHint.height);
1175#else 1121#else
1176 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1122 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1177#endif 1123#endif
1178 } 1124 }
1179 1125
1180 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1126 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1181 1127
1182 if (fix_screen || width != old_width || height != old_height) 1128 if (fix_screen || newwidth != old_width || newheight != old_height)
1183 { 1129 {
1184 if (scrollbar_visible ()) 1130 if (scrollBar.state)
1185 { 1131 {
1186 XMoveResizeWindow (disp, scrollBar.win, 1132 XMoveResizeWindow (disp, scrollBar.win,
1187 window_sb_x, 0, 1133 window_sb_x, 0,
1188 scrollbar_TotalWidth (), szHint.height); 1134 scrollbar_TotalWidth (), szHint.height);
1189 resize_scrollbar (); 1135 resize_scrollbar ();
1190 } 1136 }
1191 1137
1192 if (menubar_visible ())
1193 XMoveResizeWindow (disp, menuBar.win,
1194 window_vt_x, 0,
1195 TermWin_TotalWidth (), menuBar_TotalHeight ());
1196
1197 XMoveResizeWindow (disp, TermWin.vt, 1138 XMoveResizeWindow (disp, vt,
1198 window_vt_x, window_vt_y, 1139 window_vt_x, window_vt_y,
1199 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1140 width, height);
1200 1141
1201 scr_clear (); 1142 scr_clear ();
1202#ifdef XPM_BACKGROUND 1143#ifdef XPM_BACKGROUND
1203 resize_pixmap (); 1144 resize_pixmap ();
1204#endif 1145#endif
1210 int old_ncol = prev_ncol; 1151 int old_ncol = prev_ncol;
1211 1152
1212 /* scr_reset only works on the primary screen */ 1153 /* scr_reset only works on the primary screen */
1213 if (old_height) /* this is not the first time through */ 1154 if (old_height) /* this is not the first time through */
1214 { 1155 {
1215 unsigned int ncol = TermWin.ncol; 1156 unsigned int ocol = ncol;
1216 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1157 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1217 curr_screen = scr_change_screen (PRIMARY); 1158 curr_screen = scr_change_screen (PRIMARY);
1218 TermWin.ncol = ncol; 1159 ncol = ocol;
1219 } 1160 }
1220 1161
1221 scr_reset (); 1162 scr_reset ();
1222 1163
1223 if (curr_screen >= 0) /* this is not the first time through */ 1164 if (curr_screen >= 0) /* this is not the first time through */
1224 { 1165 {
1225 scr_change_screen (curr_screen); 1166 scr_change_screen (curr_screen);
1226 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1167 selection_check (old_ncol != ncol ? 4 : 0);
1227 } 1168 }
1228 } 1169 }
1229 1170
1230 old_width = szHint.width; 1171 old_width = szHint.width;
1231 old_height = szHint.height; 1172 old_height = szHint.height;
1232 1173
1233#ifdef XPM_BACKGROUND 1174#ifdef XPM_BACKGROUND
1234 if (TermWin.pixmap) 1175 if (pixmap)
1235 scr_touch (false); 1176 scr_touch (false);
1236#endif 1177#endif
1237 1178
1238#ifdef USE_XIM 1179#ifdef USE_XIM
1239 IMSetStatusPosition (); 1180 IMSetStatusPosition ();
1243/* 1184/*
1244 * Set the width/height of the vt window in characters. Units are pixels. 1185 * Set the width/height of the vt window in characters. Units are pixels.
1245 * good for toggling 80/132 columns 1186 * good for toggling 80/132 columns
1246 */ 1187 */
1247void 1188void
1248rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1189rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1249{ 1190{
1250 XWindowAttributes wattr; 1191 XWindowAttributes wattr;
1251 1192
1252 if (width == 0 || height == 0) 1193 if (newwidth == 0 || newheight == 0)
1253 { 1194 {
1254 XGetWindowAttributes (display->display, display->root, &wattr); 1195 XGetWindowAttributes (display->display, display->root, &wattr);
1196
1255 if (width == 0) 1197 if (newwidth == 0)
1256 width = wattr.width - szHint.base_width; 1198 newwidth = wattr.width - szHint.base_width;
1257 if (height == 0) 1199 if (newheight == 0)
1258 height = wattr.height - szHint.base_height; 1200 newheight = wattr.height - szHint.base_height;
1259 }
1260
1261 if (width != TermWin.width || height != TermWin.height)
1262 { 1201 }
1202
1203 if (newwidth != width || newheight != height)
1204 {
1263 width += szHint.base_width; 1205 newwidth += szHint.base_width;
1264 height += szHint.base_height; 1206 newheight += szHint.base_height;
1265 resize_all_windows (width, height, 0); 1207 resize_all_windows (newwidth, newheight, 0);
1266 } 1208 }
1267} 1209}
1268 1210
1269/* -------------------------------------------------------------------- * 1211/* -------------------------------------------------------------------- *
1270 * - X INPUT METHOD ROUTINES - * 1212 * - X INPUT METHOD ROUTINES - *
1280 1222
1281void 1223void
1282rxvt_term::im_set_size (XRectangle &size) 1224rxvt_term::im_set_size (XRectangle &size)
1283{ 1225{
1284 // the int_bwidth terms make no sense to me 1226 // the int_bwidth terms make no sense to me
1285 size.x = TermWin.int_bwidth; 1227 size.x = int_bwidth;
1286 size.y = TermWin.int_bwidth; 1228 size.y = int_bwidth;
1287 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1229 size.width = Width2Pixel (ncol) + int_bwidth;
1288 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1230 size.height = Height2Pixel (nrow) + int_bwidth;
1289} 1231}
1290 1232
1291void 1233void
1292rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1234rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1293 XRectangle &status_rect, 1235 XRectangle &status_rect,
1294 const XRectangle &needed_rect) 1236 const XRectangle &needed_rect)
1295{ 1237{
1296 preedit_rect.x = needed_rect.width; 1238 preedit_rect.x = needed_rect.width;
1297 preedit_rect.y = 0; 1239 preedit_rect.y = 0;
1298 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1240 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1299 preedit_rect.height = TermWin.fheight; 1241 preedit_rect.height = fheight;
1300 1242
1301 status_rect.x = 0; 1243 status_rect.x = 0;
1302 status_rect.y = 0; 1244 status_rect.y = 0;
1303 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1245 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1304 status_rect.height = TermWin.fheight; 1246 status_rect.height = fheight;
1305} 1247}
1306 1248
1307/* Checking whether input method is running. */ 1249/* Checking whether input method is running. */
1308bool 1250bool
1309rxvt_term::IMisRunning () 1251rxvt_term::IMisRunning ()
1337{ 1279{
1338 XPoint nspot; 1280 XPoint nspot;
1339 XVaNestedList preedit_attr; 1281 XVaNestedList preedit_attr;
1340 1282
1341 if (!Input_Context 1283 if (!Input_Context
1342 || !TermWin.focus 1284 || !focus
1343 || !(input_style & XIMPreeditPosition)) 1285 || !(input_style & XIMPreeditPosition))
1344 return; 1286 return;
1345 1287
1346 im_set_position (nspot); 1288 im_set_position (nspot);
1347 1289
1383 XRectangle rect, status_rect, needed_rect; 1325 XRectangle rect, status_rect, needed_rect;
1384 unsigned long fg, bg; 1326 unsigned long fg, bg;
1385 const char *p; 1327 const char *p;
1386 char **s; 1328 char **s;
1387 XIMStyles *xim_styles; 1329 XIMStyles *xim_styles;
1330
1331 set_environ (envv);
1388 1332
1389 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1333 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1390 return false; 1334 return false;
1391 1335
1392 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1336 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1411 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1412 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1413 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1414 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1471 "*", 1415 "*",
1472 TermWin.fheight, 1416 fheight,
1473 TermWin.fheight + 1, TermWin.fheight - 1, 1417 fheight + 1, fheight - 1,
1474 TermWin.fheight - 2, TermWin.fheight + 2); 1418 fheight - 2, fheight + 2);
1475 1419
1476 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1420 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1477 &missing_charset_list, &missing_charset_count, &def_string); 1421 &missing_charset_list, &missing_charset_count, &def_string);
1478 1422
1479 if (missing_charset_list) 1423 if (missing_charset_list)
1525 NULL); 1469 NULL);
1526 } 1470 }
1527 1471
1528 Input_Context = XCreateIC (xim, 1472 Input_Context = XCreateIC (xim,
1529 XNInputStyle, input_style, 1473 XNInputStyle, input_style,
1530 XNClientWindow, TermWin.vt, 1474 XNClientWindow, vt,
1531 XNFocusWindow, TermWin.parent[0], 1475 XNFocusWindow, parent[0],
1532 preedit_attr ? XNPreeditAttributes : NULL, 1476 preedit_attr ? XNPreeditAttributes : NULL,
1533 preedit_attr, 1477 preedit_attr,
1534 status_attr ? XNStatusAttributes : NULL, 1478 status_attr ? XNStatusAttributes : NULL,
1535 status_attr, NULL); 1479 status_attr, NULL);
1536 1480
1553} 1497}
1554 1498
1555void 1499void
1556rxvt_term::im_cb () 1500rxvt_term::im_cb ()
1557{ 1501{
1558 int i, found, had_im; 1502 int i;
1559 const char *p; 1503 const char *p;
1560 char **s; 1504 char **s;
1561 char buf[IMBUFSIZ]; 1505 char buf[IMBUFSIZ];
1562 1506
1563 SET_R (this); 1507 make_current ();
1564 1508
1565 im_destroy (); 1509 im_destroy ();
1566 1510
1567 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1511 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1568 if (Input_Context) 1512 if (Input_Context)
1620{ 1564{
1621 XRectangle preedit_rect, status_rect, *needed_rect; 1565 XRectangle preedit_rect, status_rect, *needed_rect;
1622 XVaNestedList preedit_attr, status_attr; 1566 XVaNestedList preedit_attr, status_attr;
1623 1567
1624 if (!Input_Context 1568 if (!Input_Context
1625 || !TermWin.focus 1569 || !focus
1626 || !(input_style & XIMPreeditArea) 1570 || !(input_style & XIMPreeditArea)
1627 || !IMisRunning ()) 1571 || !IMisRunning ())
1628 return; 1572 return;
1629 1573
1630 /* Getting the necessary width of preedit area */ 1574 /* Getting the necessary width of preedit area */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines