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.153 by root, Tue Dec 27 12:23:37 2005 UTC vs.
Revision 1.205 by root, Wed Jan 25 13:24:45 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"
35 37
36#include <limits> 38#include <limits>
37 39
38#include <csignal> 40#include <csignal>
39#include <cstring> 41#include <cstring>
44 46
45#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
46# include <termios.h> 48# include <termios.h>
47#endif 49#endif
48 50
49#ifdef KEYSYM_RESOURCE
50# include "keyboard.h"
51#endif
52
53vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
54 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
55static char curlocale[128]; 56static char curlocale[128], savelocale[128];
56 57
57bool 58bool
58rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
59{ 60{
60 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
61 return false; 62 return false;
62 63
63 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
64 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
65 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);
66} 80}
67 81
68#if ENABLE_COMBINING 82#if ENABLE_COMBINING
69class rxvt_composite_vec rxvt_composite; 83class rxvt_composite_vec rxvt_composite;
70 84
135 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
136#endif 150#endif
137#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
138 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
139#endif 153#endif
140#ifdef MENUBAR
141 menubar_ev (this, &rxvt_term::x_cb),
142#endif
143#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
144 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
145#endif 156#endif
146#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
147 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
160#endif 171#endif
161#ifdef USE_XIM 172#ifdef USE_XIM
162 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
163#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
164 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
165 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
166 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
167 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
168 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
169 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
170 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
173 188
174 termlist.push_back (this); 189 termlist.push_back (this);
175 190
176#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
177 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
178
179 if (!keyboard)
180 rxvt_fatal ("out of memory, aborting.\n");
181#endif 193#endif
182} 194}
183 195
184// 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.
185// for use before an emergency exit 197// for use before an emergency exit
186void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
187{ 199{
188 if (cmd_pid) 200 if (cmd_pid)
189 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
190 202
191#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
192 privileged_utmp (RESTORE);
193#endif
194
195 pty.put ();
196} 204}
197 205
198rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
199{ 207{
200 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
214 222
215 selection_clear (); 223 selection_clear ();
216 224
217#ifdef USE_XIM 225#ifdef USE_XIM
218 im_destroy (); 226 im_destroy ();
219#endif
220#ifdef MENUBAR
221 if (menubarGC) XFreeGC (disp, menubarGC);
222#endif 227#endif
223#ifdef XTERM_SCROLLBAR 228#ifdef XTERM_SCROLLBAR
224 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
225 if (ShadowGC) XFreeGC (disp, ShadowGC); 230 if (ShadowGC) XFreeGC (disp, ShadowGC);
226#endif 231#endif
237 if (upArrow) XFreePixmap (disp, upArrow); 242 if (upArrow) XFreePixmap (disp, upArrow);
238 if (downArrow) XFreePixmap (disp, downArrow); 243 if (downArrow) XFreePixmap (disp, downArrow);
239 if (upArrowHi) XFreePixmap (disp, upArrowHi); 244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
240 if (downArrowHi) XFreePixmap (disp, downArrowHi); 245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
241#endif 246#endif
242#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 247#ifdef RXVT_SCROLLBAR
243 if (topShadowGC) XFreeGC (disp, topShadowGC); 248 if (topShadowGC) XFreeGC (disp, topShadowGC);
244 if (botShadowGC) XFreeGC (disp, botShadowGC); 249 if (botShadowGC) XFreeGC (disp, botShadowGC);
245 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
246#endif 251#endif
247 if (gc) XFreeGC (disp, gc); 252 if (gc) XFreeGC (disp, gc);
248 253
249#if defined(MENUBAR) && (MENUBAR_MAX > 1)
250 delete menuBar.drawable;
251 //if (menuBar.win)
252 // XDestroyWindow (disp, menuBar.win);
253#endif
254 delete drawable; 254 delete drawable;
255 // destroy all windows 255 // destroy all windows
256 if (parent[0]) 256 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 257 XDestroyWindow (disp, parent[0]);
258 } 258 }
259 259
260 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
261
262 delete pix_colors_focused; 261 delete pix_colors_focused;
263#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
264 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
265#endif 264#endif
266 265
272 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
273 free (allocated [i]); 272 free (allocated [i]);
274 273
275 free (selection.text); 274 free (selection.text);
276 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
277 free (env_windowid);
278 free (env_display); 276 free (env_display);
279 free (env_term); 277 free (env_term);
280 free (env_colorfgbg);
281 free (locale); 278 free (locale);
282 free (v_buffer); 279 free (v_buffer);
283 free (incr_buf); 280 free (incr_buf);
284 281
285 delete envv; 282 delete envv;
288#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
289 delete keyboard; 286 delete keyboard;
290#endif 287#endif
291} 288}
292 289
290// child has exited, usually destroys
293void 291void
294rxvt_term::child_exit () 292rxvt_term::child_cb (child_watcher &w, int status)
295{ 293{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295
296 cmd_pid = 0; 296 cmd_pid = 0;
297 297
298 if (!(options & Opt_hold)) 298 if (!OPTION (Opt_hold))
299 destroy (); 299 destroy ();
300} 300}
301 301
302void 302void
303rxvt_term::destroy () 303rxvt_term::destroy ()
304{ 304{
305 if (destroy_ev.active) 305 if (destroy_ev.active)
306 return; 306 return;
307 307
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309
308#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
309 scr_overlay_off (); 311 scr_overlay_off ();
310#endif 312#endif
311 313
312 if (display) 314 if (display)
314#if USE_XIM 316#if USE_XIM
315 im_ev.stop (display); 317 im_ev.stop (display);
316#endif 318#endif
317#if HAVE_SCROLLBARS 319#if HAVE_SCROLLBARS
318 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
319#endif
320#if MENUBAR
321 menubar_ev.stop (display);
322#endif 321#endif
323#if TRANSPARENT 322#if TRANSPARENT
324 rootwin_ev.stop (display); 323 rootwin_ev.stop (display);
325#endif 324#endif
326 incr_ev.stop (); 325 incr_ev.stop ();
350} 349}
351 350
352void 351void
353rxvt_term::destroy_cb (time_watcher &w) 352rxvt_term::destroy_cb (time_watcher &w)
354{ 353{
355 SET_R (this); 354 make_current ();
356 355
357 delete this; 356 delete this;
358} 357}
359 358
360/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
448 _exit (EXIT_FAILURE); 447 _exit (EXIT_FAILURE);
449} 448}
450 449
451/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
452bool 451bool
453rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
454{ 453{
454 this->envv = envv;
455
455 SET_R (this); 456 SET_R (this);
456
457 set_locale (""); 457 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :(
458 459
459 if (!init_vars ()) 460 if (!init_vars ())
460 return false; 461 return false;
461 462
462 init_secondary (); 463 init_secondary ();
465 466
466#ifdef KEYSYM_RESOURCE 467#ifdef KEYSYM_RESOURCE
467 keyboard->register_done (); 468 keyboard->register_done ();
468#endif 469#endif
469 470
470#if MENUBAR_MAX
471 menubar_read (rs[Rs_menu]);
472#endif
473#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
474 if (options & Opt_scrollBar) 472 if (OPTION (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 474#endif
477 475
476 pty = ptytty::create ();
477
478 create_windows (argc, argv); 478 create_windows (argc, argv);
479 479
480 dDisp; 480 dDisp;
481 481
482 init_xlocale (); 482 init_xlocale ();
483 483
484 scr_reset (); /* initialize screen */ 484 scr_reset (); // initialize screen
485 485
486#if 0 486#if 0
487 XSynchronize (disp, True); 487 XSynchronize (disp, True);
488#endif 488#endif
489 489
490#ifdef HAVE_SCROLLBARS 490#ifdef HAVE_SCROLLBARS
491 if (options & Opt_scrollBar) 491 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 492 resize_scrollbar (); /* create and map scrollbar */
493#endif 493#endif
494#if (MENUBAR_MAX)
495 if (menubar_visible ())
496 XMapWindow (disp, menuBar.win);
497#endif
498#ifdef TRANSPARENT 494#ifdef TRANSPARENT
499 if (options & Opt_transparent) 495 if (OPTION (Opt_transparent))
500 { 496 {
501 XSelectInput (disp, display->root, PropertyChangeMask); 497 XSelectInput (disp, display->root, PropertyChangeMask);
502 check_our_parents (); 498 check_our_parents ();
503 rootwin_ev.start (display, display->root); 499 rootwin_ev.start (display, display->root);
504 } 500 }
505#endif 501#endif
506 502
503 set_colorfgbg ();
504
505 init_command (cmd_argv);
506
507 free (cmd_argv);
508
509 if (pty->pty >= 0)
510 pty_ev.start (pty->pty, EVENT_READ);
511
512 check_ev.start ();
513
514 HOOK_INVOKE ((this, HOOK_START, DT_END));
515
516#if ENABLE_XEMBED
517 if (rs[Rs_embed])
518 {
519 long info[2] = { 0, XEMBED_MAPPED };
520
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2);
523 }
524#endif
525
507 XMapWindow (disp, vt); 526 XMapWindow (disp, vt);
508 XMapWindow (disp, parent[0]); 527 XMapWindow (disp, parent[0]);
509 528
510 set_colorfgbg ();
511
512 init_command (cmd_argv);
513
514 free (cmd_argv);
515
516 pty_ev.start (pty.pty, EVENT_READ);
517
518 check_ev.start ();
519
520 return true; 529 return true;
521} 530}
522 531
523static struct sig_handlers 532static struct sig_handlers
524{ 533{
525 sig_watcher sw_chld, sw_term, sw_int; 534 sig_watcher sw_term, sw_int;
526 535
527 void sig_chld (sig_watcher &w)
528 {
529 // we are being called for every SIGCHLD, find the corresponding term
530 int pid;
531
532 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
533 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
534 if (pid == (*t)->cmd_pid)
535 {
536 (*t)->child_exit ();
537 break;
538 }
539 }
540
541 /* 536 /*
542 * Catch a fatal signal and tidy up before quitting 537 * Catch a fatal signal and tidy up before quitting
543 */ 538 */
544 void 539 void
545 sig_term (sig_watcher &w) 540 sig_term (sig_watcher &w)
546 { 541 {
547#ifdef DEBUG_CMD
548 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
549#endif
550 rxvt_emergency_cleanup (); 542 rxvt_emergency_cleanup ();
551 signal (w.signum, SIG_DFL); 543 signal (w.signum, SIG_DFL);
552 kill (getpid (), w.signum); 544 kill (getpid (), w.signum);
553 } 545 }
554 546
555 sig_handlers () 547 sig_handlers ()
556 : sw_chld (this, &sig_handlers::sig_chld),
557 sw_term (this, &sig_handlers::sig_term), 548 : sw_term (this, &sig_handlers::sig_term),
558 sw_int (this, &sig_handlers::sig_term) 549 sw_int (this, &sig_handlers::sig_term)
559 { 550 {
560 } 551 }
561} sig_handlers; 552} sig_handlers;
562 553
554char **rxvt_environ; // startup environment
555
563void 556void
564rxvt_init () 557rxvt_init ()
565{ 558{
566 /* 559 ptytty::init ();
567 * Save and then give up any super-user privileges 560
568 * If we need privileges in any area then we must specifically request it. 561 rxvt_environ = environ;
569 * We should only need to be root in these cases:
570 * 1. write utmp entries on some systems
571 * 2. chown tty on some systems
572 */
573 rxvt_privileges (SAVE);
574 rxvt_privileges (IGNORE);
575 562
576 signal (SIGHUP, SIG_IGN); 563 signal (SIGHUP, SIG_IGN);
577 signal (SIGPIPE, SIG_IGN); 564 signal (SIGPIPE, SIG_IGN);
578 565
579 sig_handlers.sw_chld.start (SIGCHLD);
580 sig_handlers.sw_term.start (SIGTERM); 566 sig_handlers.sw_term.start (SIGTERM);
581 sig_handlers.sw_int.start (SIGINT); 567 sig_handlers.sw_int.start (SIGINT);
582 568
583 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 569 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
584 /* signal (SIGURG, SIG_DFL); */ 570 /* signal (SIGURG, SIG_DFL); */
585 571
586 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 572 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
587 // TODO: handle this with exceptions and tolerate the memory loss 573 // TODO: handle this with exceptions and tolerate the memory loss
588 XSetIOErrorHandler (rxvt_xioerror_handler); 574 XSetIOErrorHandler (rxvt_xioerror_handler);
575
576 XrmInitialize ();
589} 577}
590 578
591/* ------------------------------------------------------------------------- * 579/* ------------------------------------------------------------------------- *
592 * MEMORY ALLOCATION WRAPPERS * 580 * MEMORY ALLOCATION WRAPPERS *
593 * ------------------------------------------------------------------------- */ 581 * ------------------------------------------------------------------------- */
611 rxvt_fatal ("memory allocation failure. aborting.\n"); 599 rxvt_fatal ("memory allocation failure. aborting.\n");
612 600
613 return p; 601 return p;
614} 602}
615 603
616void * 604void *
617rxvt_realloc (void *ptr, size_t size) 605rxvt_realloc (void *ptr, size_t size)
618{ 606{
619 void *p = realloc (ptr, size); 607 void *p = realloc (ptr, size);
620 608
621 if (!p) 609 if (!p)
622 rxvt_fatal ("memory allocation failure. aborting.\n"); 610 rxvt_fatal ("memory allocation failure. aborting.\n");
623 611
624 return p; 612 return p;
625} 613}
626
627/* ------------------------------------------------------------------------- *
628 * PRIVILEGED OPERATIONS *
629 * ------------------------------------------------------------------------- */
630/* take care of suid/sgid super-user (root) privileges */
631void
632rxvt_privileges (rxvt_privaction action)
633{
634#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
635 static uid_t euid;
636 static gid_t egid;
637#endif
638
639#if ! defined(__CYGWIN32__)
640# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
641 /* setreuid () is the poor man's setuid (), seteuid () */
642# define seteuid(a) setreuid(-1, (a))
643# define setegid(a) setregid(-1, (a))
644# define HAVE_SETEUID
645# endif
646# ifdef HAVE_SETEUID
647 switch (action)
648 {
649 case IGNORE:
650 /*
651 * change effective uid/gid - not real uid/gid - so we can switch
652 * back to root later, as required
653 */
654 seteuid (getuid ());
655 setegid (getgid ());
656 break;
657 case SAVE:
658 euid = geteuid ();
659 egid = getegid ();
660 break;
661 case RESTORE:
662 seteuid (euid);
663 setegid (egid);
664 break;
665 }
666# else
667 switch (action)
668 {
669 case IGNORE:
670 setuid (getuid ());
671 setgid (getgid ());
672 /* FALLTHROUGH */
673 case SAVE:
674 /* FALLTHROUGH */
675 case RESTORE:
676 break;
677 }
678# endif
679#endif
680}
681
682#ifdef UTMP_SUPPORT
683void
684rxvt_term::privileged_utmp (rxvt_privaction action)
685{
686 if ((options & Opt_utmpInhibit)
687 || !pty.name || !*pty.name)
688 return;
689
690 rxvt_privileges (RESTORE);
691
692 if (action == SAVE)
693 makeutent (pty.name, rs[Rs_display_name]);
694 else
695 cleanutent ();
696
697 rxvt_privileges (IGNORE);
698}
699#endif
700 614
701/*----------------------------------------------------------------------*/ 615/*----------------------------------------------------------------------*/
702/* 616/*
703 * window size/position calculcations for XSizeHint and other storage. 617 * window size/position calculcations for XSizeHint and other storage.
704 * if width/height are non-zero then override calculated width/height 618 * if width/height are non-zero then override calculated width/height
705 */ 619 */
706void 620void
707rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 621rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
708{ 622{
709 short recalc_x, recalc_y; 623 short recalc_x, recalc_y;
710 int x, y, sb_w, mb_h, flags; 624 int x, y, sb_w, flags;
711 unsigned int w, h; 625 unsigned int w, h;
712 unsigned int max_width, max_height; 626 unsigned int max_width, max_height;
713 dDisp; 627 dDisp;
714
715 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
716 ncol, nrow, szHint.width, szHint.height));
717 628
718 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
719 szHint.win_gravity = NorthWestGravity; 630 szHint.win_gravity = NorthWestGravity;
720 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
721 632
776 max_width = MAX_COLS * fwidth; 687 max_width = MAX_COLS * fwidth;
777 max_height = MAX_ROWS * fheight; 688 max_height = MAX_ROWS * fheight;
778 689
779 szHint.base_width = szHint.base_height = 2 * int_bwidth; 690 szHint.base_width = szHint.base_height = 2 * int_bwidth;
780 691
781 sb_w = mb_h = 0; 692 sb_w = 0;
782 window_vt_x = window_vt_y = int_bwidth; 693 window_vt_x = window_vt_y = int_bwidth;
783 694
784 if (scrollbar_visible ()) 695 if (scrollBar.state)
785 { 696 {
786 sb_w = scrollbar_TotalWidth (); 697 sb_w = scrollbar_TotalWidth ();
787 szHint.base_width += sb_w; 698 szHint.base_width += sb_w;
788 if (!(options & Opt_scrollBar_right)) 699 if (!OPTION (Opt_scrollBar_right))
789 window_vt_x += sb_w; 700 window_vt_x += sb_w;
790 }
791
792 if (menubar_visible ())
793 {
794 mb_h = menuBar_TotalHeight ();
795 szHint.base_height += mb_h;
796 window_vt_y += mb_h;
797 } 701 }
798 702
799 szHint.width_inc = fwidth; 703 szHint.width_inc = fwidth;
800 szHint.height_inc = fheight; 704 szHint.height_inc = fheight;
801 szHint.min_width = szHint.base_width + szHint.width_inc; 705 szHint.min_width = szHint.base_width + szHint.width_inc;
821 { 725 {
822 min_it (height, max_height); 726 min_it (height, max_height);
823 szHint.height = szHint.base_height + height; 727 szHint.height = szHint.base_height + height;
824 } 728 }
825 729
826 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 730 if (scrollBar.state && OPTION (Opt_scrollBar_right))
827 window_sb_x = szHint.width - sb_w; 731 window_sb_x = szHint.width - sb_w;
828 732
829 if (recalc_x) 733 if (recalc_x)
830 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
831 if (recalc_y) 735 if (recalc_y)
832 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
833 737
834 ncol = width / fwidth; 738 ncol = width / fwidth;
835 nrow = height / fheight; 739 nrow = height / fheight;
836 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
837 ncol, nrow, szHint.width,
838 szHint.height));
839 return;
840} 740}
841 741
842/*----------------------------------------------------------------------*/ 742/*----------------------------------------------------------------------*/
843/* 743/*
844 * Tell the teletype handler what size the window is. 744 * Tell the teletype handler what size the window is.
845 * Called after a window size change. 745 * Called after a window size change.
846 */ 746 */
847void 747void
848rxvt_term::tt_winch () 748rxvt_term::tt_winch ()
849{ 749{
850 if (pty.pty < 0) 750 if (pty->pty < 0)
851 return; 751 return;
852 752
853 struct winsize ws; 753 struct winsize ws;
854 754
855 ws.ws_col = ncol; 755 ws.ws_col = ncol;
856 ws.ws_row = nrow; 756 ws.ws_row = nrow;
857 ws.ws_xpixel = width; 757 ws.ws_xpixel = width;
858 ws.ws_ypixel = height; 758 ws.ws_ypixel = height;
859 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 759 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
860 760
861#if 0 761#if 0
862 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 762 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
863 if (cmd_pid) /* force through to the command */ 763 if (cmd_pid) /* force through to the command */
864 kill (-cmd_pid, SIGWINCH); 764 kill (-cmd_pid, SIGWINCH);
900 prop.height += lineSpace; 800 prop.height += lineSpace;
901 fs->set_prop (prop); 801 fs->set_prop (prop);
902 802
903 fwidth = prop.width; 803 fwidth = prop.width;
904 fheight = prop.height; 804 fheight = prop.height;
905 fbase = (*fs)[1]->ascent; 805 fbase = prop.ascent;
906 806
907 for (int style = 1; style < 4; style++) 807 for (int style = 1; style < 4; style++)
908 { 808 {
909#if ENABLE_STYLES 809#if ENABLE_STYLES
910 const char *res = rs[Rs_font + style]; 810 const char *res = rs[Rs_font + style];
1001 i = atoi (color); 901 i = atoi (color);
1002 902
1003 if (i >= 8 && i <= 15) 903 if (i >= 8 && i <= 15)
1004 { /* bright colors */ 904 { /* bright colors */
1005 i -= 8; 905 i -= 8;
1006# ifndef NO_BRIGHTCOLOR
1007 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1008 SET_PIXCOLOR (idx); 907 SET_PIXCOLOR (idx);
1009 goto done; 908 goto done;
1010# endif
1011 } 909 }
1012 910
1013 if (i >= 0 && i <= 7) 911 if (i >= 0 && i <= 7)
1014 { /* normal colors */ 912 { /* normal colors */
1015 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1086{ 984{
1087 unsigned int i; 985 unsigned int i;
1088 const char *xpmb = "\0"; 986 const char *xpmb = "\0";
1089 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 987 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1090 988
1091 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1092 strcpy (fstr, "default"); 989 strcpy (fstr, "default");
1093 strcpy (bstr, "default"); 990 strcpy (bstr, "default");
1094 for (i = Color_Black; i <= Color_White; i++) 991 for (i = Color_Black; i <= Color_White; i++)
1095 if (pix_colors[Color_fg] == pix_colors[i]) 992 if (pix_colors[Color_fg] == pix_colors[i])
1096 { 993 {
1130 * -------------------------------------------------------------------- */ 1027 * -------------------------------------------------------------------- */
1131void 1028void
1132rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1133{ 1030{
1134 int fix_screen; 1031 int fix_screen;
1135 int old_width = szHint.width, old_height = szHint.height; 1032 int old_width = szHint.width;
1033 int old_height = szHint.height;
1136 dDisp; 1034 dDisp;
1137 1035
1138 window_calc (newwidth, newheight); 1036 window_calc (newwidth, newheight);
1139 XSetWMNormalHints (disp, parent[0], &szHint); 1037 XSetWMNormalHints (disp, parent[0], &szHint);
1140 1038
1162 { 1060 {
1163 x -= x1; 1061 x -= x1;
1164 y -= y1; 1062 y -= y1;
1165 } 1063 }
1166 1064
1167 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1168 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1169 dx = old_width - szHint.width; 1067 dx = old_width - szHint.width;
1170 dy = old_height - szHint.height; 1068 dy = old_height - szHint.height;
1171 1069
1172 /* Check position of the center of the window */ 1070 /* Check position of the center of the window */
1173 if (x < x1) /* left half */ 1071 if (x < x1) /* left half */
1174 dx = 0; 1072 dx = 0;
1188 1086
1189 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1190 1088
1191 if (fix_screen || newwidth != old_width || newheight != old_height) 1089 if (fix_screen || newwidth != old_width || newheight != old_height)
1192 { 1090 {
1193 if (scrollbar_visible ()) 1091 if (scrollBar.state)
1194 { 1092 {
1195 XMoveResizeWindow (disp, scrollBar.win, 1093 XMoveResizeWindow (disp, scrollBar.win,
1196 window_sb_x, 0, 1094 window_sb_x, 0,
1197 scrollbar_TotalWidth (), szHint.height); 1095 scrollbar_TotalWidth (), szHint.height);
1198 resize_scrollbar (); 1096 resize_scrollbar ();
1199 } 1097 }
1200 1098
1201 if (menubar_visible ())
1202 XMoveResizeWindow (disp, menuBar.win,
1203 window_vt_x, 0,
1204 TermWin_TotalWidth (), menuBar_TotalHeight ());
1205
1206 XMoveResizeWindow (disp, vt, 1099 XMoveResizeWindow (disp, vt,
1207 window_vt_x, window_vt_y, 1100 window_vt_x, window_vt_y,
1208 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1101 width, height);
1209 1102
1210 scr_clear (); 1103 scr_clear ();
1211#ifdef XPM_BACKGROUND 1104#ifdef XPM_BACKGROUND
1212 resize_pixmap (); 1105 resize_pixmap ();
1213#endif 1106#endif
1214 } 1107 }
1215 1108
1216 if (fix_screen || old_height == 0) 1109 if (fix_screen || old_height == 0)
1217 {
1218 int curr_screen = -1;
1219 int old_ncol = prev_ncol;
1220
1221 /* scr_reset only works on the primary screen */
1222 if (old_height) /* this is not the first time through */
1223 {
1224 unsigned int ocol = ncol;
1225 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1226 curr_screen = scr_change_screen (PRIMARY);
1227 ncol = ocol;
1228 }
1229
1230 scr_reset (); 1110 scr_reset ();
1231
1232 if (curr_screen >= 0) /* this is not the first time through */
1233 {
1234 scr_change_screen (curr_screen);
1235 selection_check (old_ncol != ncol ? 4 : 0);
1236 }
1237 }
1238
1239 old_width = szHint.width;
1240 old_height = szHint.height;
1241 1111
1242#ifdef XPM_BACKGROUND 1112#ifdef XPM_BACKGROUND
1243 if (pixmap) 1113 if (pixmap)
1244 scr_touch (false); 1114 scr_touch (false);
1245#endif 1115#endif
1348 XPoint nspot; 1218 XPoint nspot;
1349 XVaNestedList preedit_attr; 1219 XVaNestedList preedit_attr;
1350 1220
1351 if (!Input_Context 1221 if (!Input_Context
1352 || !focus 1222 || !focus
1353 || !(input_style & XIMPreeditPosition)) 1223 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1354 return; 1224 return;
1355 1225
1356 im_set_position (nspot); 1226 im_set_position (nspot);
1357 1227
1358 if (nspot.x == spot.x && nspot.y == spot.y) 1228 if (nspot.x == spot.x && nspot.y == spot.y)
1377 input_method = 0; 1247 input_method = 0;
1378 } 1248 }
1379 1249
1380 Input_Context = 0; 1250 Input_Context = 0;
1381} 1251}
1252
1253#ifdef ENABLE_XIM_ONTHESPOT
1254
1255static void
1256xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1257{
1258 ((rxvt_term *)client_data)->make_current ();
1259 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1260}
1261
1262static void
1263xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1264{
1265 ((rxvt_term *)client_data)->make_current ();
1266 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1267}
1268
1269static void
1270xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1271{
1272 rxvt_term *term = (rxvt_term *)client_data;
1273 XIMText *text = call_data->text;
1274
1275 term->make_current ();
1276
1277 if (text)
1278 {
1279 void *str;
1280
1281 if (!text->encoding_is_wchar && text->string.multi_byte)
1282 {
1283 // of course, X makes it ugly again
1284 if (term->rs[Rs_imLocale])
1285 SET_LOCALE (term->rs[Rs_imLocale]);
1286
1287 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1288 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1289
1290 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->locale);
1292 }
1293 else
1294 str = (void *)text->string.wide_char;
1295
1296 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1297 DT_INT, call_data->caret,
1298 DT_INT, call_data->chg_first,
1299 DT_INT, call_data->chg_length,
1300 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1301 DT_WCS_LEN, str, str ? (int)text->length : 0,
1302 DT_END));
1303 }
1304 else
1305 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1306 DT_INT, call_data->caret,
1307 DT_INT, call_data->chg_first,
1308 DT_INT, call_data->chg_length,
1309 DT_END));
1310}
1311
1312#if 0
1313static void
1314xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1315{
1316 ((rxvt_term *)client_data)->make_current ();
1317 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1318 DT_INT, call_data->position,
1319 DT_INT, call_data->direction,
1320 DT_INT, call_data->style,
1321 DT_END));
1322}
1323#endif
1324
1325#endif
1382 1326
1383/* 1327/*
1384 * Try to open a XIM with the current modifiers, then see if we can 1328 * Try to open a XIM with the current modifiers, then see if we can
1385 * open a suitable preedit type 1329 * open a suitable preedit type
1386 */ 1330 */
1393 XRectangle rect, status_rect, needed_rect; 1337 XRectangle rect, status_rect, needed_rect;
1394 unsigned long fg, bg; 1338 unsigned long fg, bg;
1395 const char *p; 1339 const char *p;
1396 char **s; 1340 char **s;
1397 XIMStyles *xim_styles; 1341 XIMStyles *xim_styles;
1342#ifdef ENABLE_XIM_ONTHESPOT
1343 XIMCallback xcb[4];
1344#endif
1345
1346 set_environ (envv);
1398 1347
1399 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1348 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1400 return false; 1349 return false;
1401 1350
1402 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1403 input_method = display->get_xim (locale, modifiers); 1351 input_method = display->get_xim (locale, modifiers);
1404 if (input_method == NULL) 1352 if (input_method == NULL)
1405 return false; 1353 return false;
1406 1354
1407 xim = input_method->xim; 1355 xim = input_method->xim;
1427 s = rxvt_splitcommastring (p); 1375 s = rxvt_splitcommastring (p);
1428 1376
1429 for (i = found = 0; !found && s[i]; i++) 1377 for (i = found = 0; !found && s[i]; i++)
1430 { 1378 {
1431 if (!strcmp (s[i], "OverTheSpot")) 1379 if (!strcmp (s[i], "OverTheSpot"))
1432 input_style = (XIMPreeditPosition | XIMStatusNothing); 1380 input_style = XIMPreeditPosition | XIMStatusNothing;
1433 else if (!strcmp (s[i], "OffTheSpot")) 1381 else if (!strcmp (s[i], "OffTheSpot"))
1434 input_style = (XIMPreeditArea | XIMStatusArea); 1382 input_style = XIMPreeditArea | XIMStatusArea;
1435 else if (!strcmp (s[i], "Root")) 1383 else if (!strcmp (s[i], "Root"))
1436 input_style = (XIMPreeditNothing | XIMStatusNothing); 1384 input_style = XIMPreeditNothing | XIMStatusNothing;
1437 else if (!strcmp (s[i], "None")) 1385 else if (!strcmp (s[i], "None"))
1438 input_style = (XIMPreeditNone | XIMStatusNone); 1386 input_style = XIMPreeditNone | XIMStatusNone;
1387#ifdef ENABLE_XIM_ONTHESPOT
1388 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1389 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1390#endif
1391 else
1392 input_style = XIMPreeditNothing | XIMStatusNothing;
1439 1393
1440 for (j = 0; j < xim_styles->count_styles; j++) 1394 for (j = 0; j < xim_styles->count_styles; j++)
1441 if (input_style == xim_styles->supported_styles[j]) 1395 if (input_style == xim_styles->supported_styles[j])
1442 { 1396 {
1443 rxvt_freecommastring (s); 1397 rxvt_freecommastring (s);
1532 XNBackground, bg, 1486 XNBackground, bg,
1533 XNArea, &status_rect, 1487 XNArea, &status_rect,
1534 XNFontSet, fs, 1488 XNFontSet, fs,
1535 NULL); 1489 NULL);
1536 } 1490 }
1491#if ENABLE_XIM_ONTHESPOT
1492 else if (input_style & XIMPreeditCallbacks)
1493 {
1494 im_set_position (spot);
1495
1496 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1497 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1498 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1499# if 0
1500 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1501# endif
1502
1503 preedit_attr = XVaCreateNestedList (0,
1504 XNSpotLocation, &spot,
1505 XNPreeditStartCallback, &xcb[0],
1506 XNPreeditDoneCallback , &xcb[1],
1507 XNPreeditDrawCallback , &xcb[2],
1508# if 0
1509 XNPreeditCaretCallback, &xcb[3],
1510# endif
1511 NULL);
1512 }
1513#endif
1537 1514
1538 Input_Context = XCreateIC (xim, 1515 Input_Context = XCreateIC (xim,
1539 XNInputStyle, input_style, 1516 XNInputStyle, input_style,
1540 XNClientWindow, vt, 1517 XNClientWindow, vt,
1541 XNFocusWindow, parent[0], 1518 XNFocusWindow, parent[0],
1553 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1530 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1554 im_destroy (); 1531 im_destroy ();
1555 return false; 1532 return false;
1556 } 1533 }
1557 1534
1535#if 0
1536 // unfortunately, only the focus window is used by XIM, hard to fix
1537 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1538 vt_select_input ();
1539#endif
1540
1558 if (input_style & XIMPreeditArea) 1541 if (input_style & XIMPreeditArea)
1559 IMSetStatusPosition (); 1542 IMSetStatusPosition ();
1560 1543
1561 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1562 return true; 1544 return true;
1563} 1545}
1564 1546
1565void 1547void
1566rxvt_term::im_cb () 1548rxvt_term::im_cb ()
1568 int i; 1550 int i;
1569 const char *p; 1551 const char *p;
1570 char **s; 1552 char **s;
1571 char buf[IMBUFSIZ]; 1553 char buf[IMBUFSIZ];
1572 1554
1573 SET_R (this); 1555 make_current ();
1574 1556
1575 im_destroy (); 1557 im_destroy ();
1576 1558
1577 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1578 if (Input_Context) 1559 if (Input_Context)
1579 return; 1560 return;
1580 1561
1581#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1562#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1582 if (rs[Rs_imLocale]) 1563 if (rs[Rs_imLocale])
1655 XFree (preedit_attr); 1636 XFree (preedit_attr);
1656 XFree (status_attr); 1637 XFree (status_attr);
1657} 1638}
1658#endif /* USE_XIM */ 1639#endif /* USE_XIM */
1659 1640
1660/*----------------------------------------------------------------------*/
1661rxvt_t rxvt_current_term;
1662
1663/*----------------------- end-of-file (C source) -----------------------*/ 1641/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines