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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines