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.178 by root, Mon Jan 16 08:29:57 2006 UTC vs.
Revision 1.204 by root, Wed Jan 25 02:53:13 2006 UTC

… …
46 46
47#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) 51vector<rxvt_term *> rxvt_term::termlist;
52static uid_t saved_euid; 52
53static gid_t saved_egid; 53// used to tell global functions which terminal instance is "active"
54#endif 54rxvt_t rxvt_current_term;
55
56static char curlocale[128], savelocale[128];
55 57
56bool 58bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
65
66vector<rxvt_term *> rxvt_term::termlist;
67
68static char curlocale[128], savelocale[128];
69
70bool
71rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
72{ 60{
73 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
74 return false; 62 return false;
75 63
76 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
77 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
78 return true; 66 return true;
79} 67}
80 68
81void 69void
82rxvt_push_locale (const char *locale) 70rxvt_push_locale (const char *locale) NOTHROW
83{ 71{
84 strcpy (savelocale, curlocale); 72 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale); 73 rxvt_set_locale (locale);
86} 74}
87 75
88void 76void
89rxvt_pop_locale () 77rxvt_pop_locale () NOTHROW
90{ 78{
91 rxvt_set_locale (savelocale); 79 rxvt_set_locale (savelocale);
92} 80}
93 81
94#if ENABLE_COMBINING 82#if ENABLE_COMBINING
… …
161 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
162#endif 150#endif
163#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
164 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
165#endif 153#endif
166#ifdef MENUBAR
167 menubar_ev (this, &rxvt_term::x_cb),
168#endif
169#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
170 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
171#endif 156#endif
172#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
173 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
185 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
186#endif 171#endif
187#ifdef USE_XIM 172#ifdef USE_XIM
188 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
189#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
190 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
191 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
192 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
193 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
194 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
195 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
196 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
199 188
200 termlist.push_back (this); 189 termlist.push_back (this);
201 190
202#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
203 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
204
205 if (!keyboard)
206 rxvt_fatal ("out of memory, aborting.\n");
207#endif 193#endif
208} 194}
209 195
210// 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.
211// for use before an emergency exit 197// for use before an emergency exit
212void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
213{ 199{
214 if (cmd_pid) 200 if (cmd_pid)
215 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
216 202
217#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
218 privileged_utmp (RESTORE);
219#endif
220
221 pty.put ();
222} 204}
223 205
224rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
225{ 207{
226 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
227
228 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
229 209
230 emergency_cleanup (); 210 emergency_cleanup ();
231 211
232#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
242 222
243 selection_clear (); 223 selection_clear ();
244 224
245#ifdef USE_XIM 225#ifdef USE_XIM
246 im_destroy (); 226 im_destroy ();
247#endif
248#ifdef MENUBAR
249 if (menubarGC) XFreeGC (disp, menubarGC);
250#endif 227#endif
251#ifdef XTERM_SCROLLBAR 228#ifdef XTERM_SCROLLBAR
252 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
253 if (ShadowGC) XFreeGC (disp, ShadowGC); 230 if (ShadowGC) XFreeGC (disp, ShadowGC);
254#endif 231#endif
… …
265 if (upArrow) XFreePixmap (disp, upArrow); 242 if (upArrow) XFreePixmap (disp, upArrow);
266 if (downArrow) XFreePixmap (disp, downArrow); 243 if (downArrow) XFreePixmap (disp, downArrow);
267 if (upArrowHi) XFreePixmap (disp, upArrowHi); 244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
268 if (downArrowHi) XFreePixmap (disp, downArrowHi); 245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
269#endif 246#endif
270#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 247#ifdef RXVT_SCROLLBAR
271 if (topShadowGC) XFreeGC (disp, topShadowGC); 248 if (topShadowGC) XFreeGC (disp, topShadowGC);
272 if (botShadowGC) XFreeGC (disp, botShadowGC); 249 if (botShadowGC) XFreeGC (disp, botShadowGC);
273 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
274#endif 251#endif
275 if (gc) XFreeGC (disp, gc); 252 if (gc) XFreeGC (disp, gc);
276 253
277#if defined(MENUBAR) && (MENUBAR_MAX > 1)
278 delete menuBar.drawable;
279 //if (menuBar.win)
280 // XDestroyWindow (disp, menuBar.win);
281#endif
282 delete drawable; 254 delete drawable;
283 // destroy all windows 255 // destroy all windows
284 if (parent[0]) 256 if (parent[0])
285 XDestroyWindow (disp, parent[0]); 257 XDestroyWindow (disp, parent[0]);
286 } 258 }
… …
299 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
300 free (allocated [i]); 272 free (allocated [i]);
301 273
302 free (selection.text); 274 free (selection.text);
303 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
304 free (env_windowid);
305 free (env_display); 276 free (env_display);
306 free (env_term); 277 free (env_term);
307 free (env_colorfgbg);
308 free (locale); 278 free (locale);
309 free (v_buffer); 279 free (v_buffer);
310 free (incr_buf); 280 free (incr_buf);
311 281
312 delete envv; 282 delete envv;
… …
315#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
316 delete keyboard; 286 delete keyboard;
317#endif 287#endif
318} 288}
319 289
290// child has exited, usually destroys
320void 291void
321rxvt_term::child_exit () 292rxvt_term::child_cb (child_watcher &w, int status)
322{ 293{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295
323 cmd_pid = 0; 296 cmd_pid = 0;
324 297
325 if (!OPTION (Opt_hold)) 298 if (!OPTION (Opt_hold))
326 destroy (); 299 destroy ();
327} 300}
… …
330rxvt_term::destroy () 303rxvt_term::destroy ()
331{ 304{
332 if (destroy_ev.active) 305 if (destroy_ev.active)
333 return; 306 return;
334 307
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309
335#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
336 scr_overlay_off (); 311 scr_overlay_off ();
337#endif 312#endif
338 313
339 if (display) 314 if (display)
… …
341#if USE_XIM 316#if USE_XIM
342 im_ev.stop (display); 317 im_ev.stop (display);
343#endif 318#endif
344#if HAVE_SCROLLBARS 319#if HAVE_SCROLLBARS
345 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
346#endif
347#if MENUBAR
348 menubar_ev.stop (display);
349#endif 321#endif
350#if TRANSPARENT 322#if TRANSPARENT
351 rootwin_ev.stop (display); 323 rootwin_ev.stop (display);
352#endif 324#endif
353 incr_ev.stop (); 325 incr_ev.stop ();
… …
475 _exit (EXIT_FAILURE); 447 _exit (EXIT_FAILURE);
476} 448}
477 449
478/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
479bool 451bool
480rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
481{ 453{
454 this->envv = envv;
455
482 SET_R (this); 456 SET_R (this);
483 set_locale (""); 457 set_locale ("");
484 set_environ (envv); // few things in X do not call setlocale :( 458 set_environ (envv); // few things in X do not call setlocale :(
485 459
486 if (!init_vars ()) 460 if (!init_vars ())
… …
492 466
493#ifdef KEYSYM_RESOURCE 467#ifdef KEYSYM_RESOURCE
494 keyboard->register_done (); 468 keyboard->register_done ();
495#endif 469#endif
496 470
497#if MENUBAR_MAX
498 menubar_read (rs[Rs_menu]);
499#endif
500#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
501 if (OPTION (Opt_scrollBar)) 472 if (OPTION (Opt_scrollBar))
502 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
503#endif 474#endif
504 475
505#if ENABLE_PERL 476 pty = ptytty::create ();
506 if (!rs[Rs_perl_ext_1])
507 rs[Rs_perl_ext_1] = "default";
508
509 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
510 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
511 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
512 {
513#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
514 // ignore some perl-related arguments if some bozo installed us set[ug]id
515 if (rxvt_tainted ())
516 {
517 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
518 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
519 {
520 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
521 rs[Rs_perl_lib] = 0;
522 rs[Rs_perl_eval] = 0;
523 }
524 }
525#endif
526 rxvt_perl.init ();
527 setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
528 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
529 }
530#endif
531 477
532 create_windows (argc, argv); 478 create_windows (argc, argv);
533 479
534 dDisp; 480 dDisp;
535 481
… …
543 489
544#ifdef HAVE_SCROLLBARS 490#ifdef HAVE_SCROLLBARS
545 if (OPTION (Opt_scrollBar)) 491 if (OPTION (Opt_scrollBar))
546 resize_scrollbar (); /* create and map scrollbar */ 492 resize_scrollbar (); /* create and map scrollbar */
547#endif 493#endif
548#if (MENUBAR_MAX)
549 if (menubar_visible ())
550 XMapWindow (disp, menuBar.win);
551#endif
552#ifdef TRANSPARENT 494#ifdef TRANSPARENT
553 if (OPTION (Opt_transparent)) 495 if (OPTION (Opt_transparent))
554 { 496 {
555 XSelectInput (disp, display->root, PropertyChangeMask); 497 XSelectInput (disp, display->root, PropertyChangeMask);
556 check_our_parents (); 498 check_our_parents ();
557 rootwin_ev.start (display, display->root); 499 rootwin_ev.start (display, display->root);
558 } 500 }
559#endif 501#endif
560 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
561 XMapWindow (disp, vt); 526 XMapWindow (disp, vt);
562 XMapWindow (disp, parent[0]); 527 XMapWindow (disp, parent[0]);
563 528
564 set_colorfgbg ();
565
566 init_command (cmd_argv);
567
568 free (cmd_argv);
569
570 if (pty.pty >= 0)
571 pty_ev.start (pty.pty, EVENT_READ);
572
573 check_ev.start ();
574
575 HOOK_INVOKE ((this, HOOK_START, DT_END));
576
577 return true; 529 return true;
578} 530}
579 531
580static struct sig_handlers 532static struct sig_handlers
581{ 533{
582 sig_watcher sw_chld, sw_term, sw_int; 534 sig_watcher sw_term, sw_int;
583 535
584 void sig_chld (sig_watcher &w)
585 {
586 // we are being called for every SIGCHLD, find the corresponding term
587 int pid;
588
589 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
590 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
591 if (pid == (*t)->cmd_pid)
592 {
593 (*t)->child_exit ();
594 break;
595 }
596 }
597
598 /* 536 /*
599 * Catch a fatal signal and tidy up before quitting 537 * Catch a fatal signal and tidy up before quitting
600 */ 538 */
601 void 539 void
602 sig_term (sig_watcher &w) 540 sig_term (sig_watcher &w)
603 { 541 {
604#ifdef DEBUG_CMD
605 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
606#endif
607 rxvt_emergency_cleanup (); 542 rxvt_emergency_cleanup ();
608 signal (w.signum, SIG_DFL); 543 signal (w.signum, SIG_DFL);
609 kill (getpid (), w.signum); 544 kill (getpid (), w.signum);
610 } 545 }
611 546
612 sig_handlers () 547 sig_handlers ()
613 : sw_chld (this, &sig_handlers::sig_chld),
614 sw_term (this, &sig_handlers::sig_term), 548 : sw_term (this, &sig_handlers::sig_term),
615 sw_int (this, &sig_handlers::sig_term) 549 sw_int (this, &sig_handlers::sig_term)
616 { 550 {
617 } 551 }
618} sig_handlers; 552} sig_handlers;
619 553
620char **rxvt_environ; // startup environment 554char **rxvt_environ; // startup environment
621 555
622void 556void
623rxvt_init () 557rxvt_init ()
624{ 558{
559 ptytty::init ();
560
625 rxvt_environ = environ; 561 rxvt_environ = environ;
626
627 /*
628 * Save and then give up any super-user privileges
629 * If we need privileges in any area then we must specifically request it.
630 * We should only need to be root in these cases:
631 * 1. write utmp entries on some systems
632 * 2. chown tty on some systems
633 */
634 rxvt_privileges (SAVE);
635 rxvt_privileges (IGNORE);
636 562
637 signal (SIGHUP, SIG_IGN); 563 signal (SIGHUP, SIG_IGN);
638 signal (SIGPIPE, SIG_IGN); 564 signal (SIGPIPE, SIG_IGN);
639 565
640 sig_handlers.sw_chld.start (SIGCHLD);
641 sig_handlers.sw_term.start (SIGTERM); 566 sig_handlers.sw_term.start (SIGTERM);
642 sig_handlers.sw_int.start (SIGINT); 567 sig_handlers.sw_int.start (SIGINT);
643 568
644 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 569 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
645 /* signal (SIGURG, SIG_DFL); */ 570 /* signal (SIGURG, SIG_DFL); */
… …
674 rxvt_fatal ("memory allocation failure. aborting.\n"); 599 rxvt_fatal ("memory allocation failure. aborting.\n");
675 600
676 return p; 601 return p;
677} 602}
678 603
679void * 604void *
680rxvt_realloc (void *ptr, size_t size) 605rxvt_realloc (void *ptr, size_t size)
681{ 606{
682 void *p = realloc (ptr, size); 607 void *p = realloc (ptr, size);
683 608
684 if (!p) 609 if (!p)
685 rxvt_fatal ("memory allocation failure. aborting.\n"); 610 rxvt_fatal ("memory allocation failure. aborting.\n");
686 611
687 return p; 612 return p;
688} 613}
689
690/* ------------------------------------------------------------------------- *
691 * PRIVILEGED OPERATIONS *
692 * ------------------------------------------------------------------------- */
693/* take care of suid/sgid super-user (root) privileges */
694void
695rxvt_privileges (rxvt_privaction action)
696{
697#if ! defined(__CYGWIN32__)
698# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
699 /* setreuid () is the poor man's setuid (), seteuid () */
700# define seteuid(a) setreuid(-1, (a))
701# define setegid(a) setregid(-1, (a))
702# define HAVE_SETEUID
703# endif
704# ifdef HAVE_SETEUID
705 switch (action)
706 {
707 case IGNORE:
708 /*
709 * change effective uid/gid - not real uid/gid - so we can switch
710 * back to root later, as required
711 */
712 setegid (getgid ());
713 seteuid (getuid ());
714 break;
715 case SAVE:
716 saved_egid = getegid ();
717 saved_euid = geteuid ();
718 break;
719 case RESTORE:
720 setegid (saved_egid);
721 seteuid (saved_euid);
722 break;
723 }
724# else
725 switch (action)
726 {
727 case IGNORE:
728 setgid (getgid ());
729 setuid (getuid ());
730 /* FALLTHROUGH */
731 case SAVE:
732 /* FALLTHROUGH */
733 case RESTORE:
734 break;
735 }
736# endif
737#endif
738}
739
740#ifdef UTMP_SUPPORT
741void
742rxvt_term::privileged_utmp (rxvt_privaction action)
743{
744 if (OPTION (Opt_utmpInhibit)
745 || !pty.name || !*pty.name)
746 return;
747
748 rxvt_privileges (RESTORE);
749
750 if (action == SAVE)
751 makeutent (pty.name, rs[Rs_display_name]);
752 else
753 cleanutent ();
754
755 rxvt_privileges (IGNORE);
756}
757#endif
758 614
759/*----------------------------------------------------------------------*/ 615/*----------------------------------------------------------------------*/
760/* 616/*
761 * window size/position calculcations for XSizeHint and other storage. 617 * window size/position calculcations for XSizeHint and other storage.
762 * if width/height are non-zero then override calculated width/height 618 * if width/height are non-zero then override calculated width/height
763 */ 619 */
764void 620void
765rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 621rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
766{ 622{
767 short recalc_x, recalc_y; 623 short recalc_x, recalc_y;
768 int x, y, sb_w, mb_h, flags; 624 int x, y, sb_w, flags;
769 unsigned int w, h; 625 unsigned int w, h;
770 unsigned int max_width, max_height; 626 unsigned int max_width, max_height;
771 dDisp; 627 dDisp;
772
773 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
774 ncol, nrow, szHint.width, szHint.height));
775 628
776 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
777 szHint.win_gravity = NorthWestGravity; 630 szHint.win_gravity = NorthWestGravity;
778 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
779 632
… …
834 max_width = MAX_COLS * fwidth; 687 max_width = MAX_COLS * fwidth;
835 max_height = MAX_ROWS * fheight; 688 max_height = MAX_ROWS * fheight;
836 689
837 szHint.base_width = szHint.base_height = 2 * int_bwidth; 690 szHint.base_width = szHint.base_height = 2 * int_bwidth;
838 691
839 sb_w = mb_h = 0; 692 sb_w = 0;
840 window_vt_x = window_vt_y = int_bwidth; 693 window_vt_x = window_vt_y = int_bwidth;
841 694
842 if (scrollbar_visible ()) 695 if (scrollBar.state)
843 { 696 {
844 sb_w = scrollbar_TotalWidth (); 697 sb_w = scrollbar_TotalWidth ();
845 szHint.base_width += sb_w; 698 szHint.base_width += sb_w;
846 if (!OPTION (Opt_scrollBar_right)) 699 if (!OPTION (Opt_scrollBar_right))
847 window_vt_x += sb_w; 700 window_vt_x += sb_w;
848 } 701 }
849 702
850 if (menubar_visible ())
851 {
852 mb_h = menuBar_TotalHeight ();
853 szHint.base_height += mb_h;
854 window_vt_y += mb_h;
855 }
856
857 szHint.width_inc = fwidth; 703 szHint.width_inc = fwidth;
858 szHint.height_inc = fheight; 704 szHint.height_inc = fheight;
859 szHint.min_width = szHint.base_width + szHint.width_inc; 705 szHint.min_width = szHint.base_width + szHint.width_inc;
860 szHint.min_height = szHint.base_height + szHint.height_inc; 706 szHint.min_height = szHint.base_height + szHint.height_inc;
861 707
… …
879 { 725 {
880 min_it (height, max_height); 726 min_it (height, max_height);
881 szHint.height = szHint.base_height + height; 727 szHint.height = szHint.base_height + height;
882 } 728 }
883 729
884 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 730 if (scrollBar.state && OPTION (Opt_scrollBar_right))
885 window_sb_x = szHint.width - sb_w; 731 window_sb_x = szHint.width - sb_w;
886 732
887 if (recalc_x) 733 if (recalc_x)
888 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
889 if (recalc_y) 735 if (recalc_y)
890 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
891 737
892 ncol = width / fwidth; 738 ncol = width / fwidth;
893 nrow = height / fheight; 739 nrow = height / fheight;
894 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
895 ncol, nrow, szHint.width,
896 szHint.height));
897 return;
898} 740}
899 741
900/*----------------------------------------------------------------------*/ 742/*----------------------------------------------------------------------*/
901/* 743/*
902 * Tell the teletype handler what size the window is. 744 * Tell the teletype handler what size the window is.
903 * Called after a window size change. 745 * Called after a window size change.
904 */ 746 */
905void 747void
906rxvt_term::tt_winch () 748rxvt_term::tt_winch ()
907{ 749{
908 if (pty.pty < 0) 750 if (pty->pty < 0)
909 return; 751 return;
910 752
911 struct winsize ws; 753 struct winsize ws;
912 754
913 ws.ws_col = ncol; 755 ws.ws_col = ncol;
914 ws.ws_row = nrow; 756 ws.ws_row = nrow;
915 ws.ws_xpixel = width; 757 ws.ws_xpixel = width;
916 ws.ws_ypixel = height; 758 ws.ws_ypixel = height;
917 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 759 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
918 760
919#if 0 761#if 0
920 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 762 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
921 if (cmd_pid) /* force through to the command */ 763 if (cmd_pid) /* force through to the command */
922 kill (-cmd_pid, SIGWINCH); 764 kill (-cmd_pid, SIGWINCH);
… …
1142{ 984{
1143 unsigned int i; 985 unsigned int i;
1144 const char *xpmb = "\0"; 986 const char *xpmb = "\0";
1145 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 987 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1146 988
1147 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1148 strcpy (fstr, "default"); 989 strcpy (fstr, "default");
1149 strcpy (bstr, "default"); 990 strcpy (bstr, "default");
1150 for (i = Color_Black; i <= Color_White; i++) 991 for (i = Color_Black; i <= Color_White; i++)
1151 if (pix_colors[Color_fg] == pix_colors[i]) 992 if (pix_colors[Color_fg] == pix_colors[i])
1152 { 993 {
… …
1186 * -------------------------------------------------------------------- */ 1027 * -------------------------------------------------------------------- */
1187void 1028void
1188rxvt_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)
1189{ 1030{
1190 int fix_screen; 1031 int fix_screen;
1191 int old_width = szHint.width, old_height = szHint.height; 1032 int old_width = szHint.width;
1033 int old_height = szHint.height;
1192 dDisp; 1034 dDisp;
1193 1035
1194 window_calc (newwidth, newheight); 1036 window_calc (newwidth, newheight);
1195 XSetWMNormalHints (disp, parent[0], &szHint); 1037 XSetWMNormalHints (disp, parent[0], &szHint);
1196 1038
… …
1218 { 1060 {
1219 x -= x1; 1061 x -= x1;
1220 y -= y1; 1062 y -= y1;
1221 } 1063 }
1222 1064
1223 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1224 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1225 dx = old_width - szHint.width; 1067 dx = old_width - szHint.width;
1226 dy = old_height - szHint.height; 1068 dy = old_height - szHint.height;
1227 1069
1228 /* Check position of the center of the window */ 1070 /* Check position of the center of the window */
1229 if (x < x1) /* left half */ 1071 if (x < x1) /* left half */
1230 dx = 0; 1072 dx = 0;
… …
1244 1086
1245 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1246 1088
1247 if (fix_screen || newwidth != old_width || newheight != old_height) 1089 if (fix_screen || newwidth != old_width || newheight != old_height)
1248 { 1090 {
1249 if (scrollbar_visible ()) 1091 if (scrollBar.state)
1250 { 1092 {
1251 XMoveResizeWindow (disp, scrollBar.win, 1093 XMoveResizeWindow (disp, scrollBar.win,
1252 window_sb_x, 0, 1094 window_sb_x, 0,
1253 scrollbar_TotalWidth (), szHint.height); 1095 scrollbar_TotalWidth (), szHint.height);
1254 resize_scrollbar (); 1096 resize_scrollbar ();
1255 } 1097 }
1256 1098
1257 if (menubar_visible ())
1258 XMoveResizeWindow (disp, menuBar.win,
1259 window_vt_x, 0,
1260 width, menuBar_TotalHeight ());
1261
1262 XMoveResizeWindow (disp, vt, 1099 XMoveResizeWindow (disp, vt,
1263 window_vt_x, window_vt_y, 1100 window_vt_x, window_vt_y,
1264 width, height); 1101 width, height);
1265 1102
1266 scr_clear (); 1103 scr_clear ();
… …
1268 resize_pixmap (); 1105 resize_pixmap ();
1269#endif 1106#endif
1270 } 1107 }
1271 1108
1272 if (fix_screen || old_height == 0) 1109 if (fix_screen || old_height == 0)
1273 {
1274 int curr_screen = -1;
1275 int old_ncol = prev_ncol;
1276
1277 /* scr_reset only works on the primary screen */
1278 if (old_height) /* this is not the first time through */
1279 {
1280 unsigned int ocol = ncol;
1281 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1282 curr_screen = scr_change_screen (PRIMARY);
1283 ncol = ocol;
1284 }
1285
1286 scr_reset (); 1110 scr_reset ();
1287
1288 if (curr_screen >= 0) /* this is not the first time through */
1289 {
1290 scr_change_screen (curr_screen);
1291 selection_check (old_ncol != ncol ? 4 : 0);
1292 }
1293 }
1294
1295 old_width = szHint.width;
1296 old_height = szHint.height;
1297 1111
1298#ifdef XPM_BACKGROUND 1112#ifdef XPM_BACKGROUND
1299 if (pixmap) 1113 if (pixmap)
1300 scr_touch (false); 1114 scr_touch (false);
1301#endif 1115#endif
… …
1404 XPoint nspot; 1218 XPoint nspot;
1405 XVaNestedList preedit_attr; 1219 XVaNestedList preedit_attr;
1406 1220
1407 if (!Input_Context 1221 if (!Input_Context
1408 || !focus 1222 || !focus
1409 || !(input_style & XIMPreeditPosition)) 1223 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1410 return; 1224 return;
1411 1225
1412 im_set_position (nspot); 1226 im_set_position (nspot);
1413 1227
1414 if (nspot.x == spot.x && nspot.y == spot.y) 1228 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1433 input_method = 0; 1247 input_method = 0;
1434 } 1248 }
1435 1249
1436 Input_Context = 0; 1250 Input_Context = 0;
1437} 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
1438 1326
1439/* 1327/*
1440 * 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
1441 * open a suitable preedit type 1329 * open a suitable preedit type
1442 */ 1330 */
… …
1449 XRectangle rect, status_rect, needed_rect; 1337 XRectangle rect, status_rect, needed_rect;
1450 unsigned long fg, bg; 1338 unsigned long fg, bg;
1451 const char *p; 1339 const char *p;
1452 char **s; 1340 char **s;
1453 XIMStyles *xim_styles; 1341 XIMStyles *xim_styles;
1342#ifdef ENABLE_XIM_ONTHESPOT
1343 XIMCallback xcb[4];
1344#endif
1454 1345
1455 set_environ (envv); 1346 set_environ (envv);
1456 1347
1457 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1348 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1458 return false; 1349 return false;
1459 1350
1460 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1461 input_method = display->get_xim (locale, modifiers); 1351 input_method = display->get_xim (locale, modifiers);
1462 if (input_method == NULL) 1352 if (input_method == NULL)
1463 return false; 1353 return false;
1464 1354
1465 xim = input_method->xim; 1355 xim = input_method->xim;
… …
1485 s = rxvt_splitcommastring (p); 1375 s = rxvt_splitcommastring (p);
1486 1376
1487 for (i = found = 0; !found && s[i]; i++) 1377 for (i = found = 0; !found && s[i]; i++)
1488 { 1378 {
1489 if (!strcmp (s[i], "OverTheSpot")) 1379 if (!strcmp (s[i], "OverTheSpot"))
1490 input_style = (XIMPreeditPosition | XIMStatusNothing); 1380 input_style = XIMPreeditPosition | XIMStatusNothing;
1491 else if (!strcmp (s[i], "OffTheSpot")) 1381 else if (!strcmp (s[i], "OffTheSpot"))
1492 input_style = (XIMPreeditArea | XIMStatusArea); 1382 input_style = XIMPreeditArea | XIMStatusArea;
1493 else if (!strcmp (s[i], "Root")) 1383 else if (!strcmp (s[i], "Root"))
1494 input_style = (XIMPreeditNothing | XIMStatusNothing); 1384 input_style = XIMPreeditNothing | XIMStatusNothing;
1495 else if (!strcmp (s[i], "None")) 1385 else if (!strcmp (s[i], "None"))
1496 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;
1497 1393
1498 for (j = 0; j < xim_styles->count_styles; j++) 1394 for (j = 0; j < xim_styles->count_styles; j++)
1499 if (input_style == xim_styles->supported_styles[j]) 1395 if (input_style == xim_styles->supported_styles[j])
1500 { 1396 {
1501 rxvt_freecommastring (s); 1397 rxvt_freecommastring (s);
… …
1590 XNBackground, bg, 1486 XNBackground, bg,
1591 XNArea, &status_rect, 1487 XNArea, &status_rect,
1592 XNFontSet, fs, 1488 XNFontSet, fs,
1593 NULL); 1489 NULL);
1594 } 1490 }
1491 else if (input_style & XIMPreeditCallbacks)
1492 {
1493 im_set_position (spot);
1494
1495 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1496 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1497 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1498#if 0
1499 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1500#endif
1501
1502 preedit_attr = XVaCreateNestedList (0,
1503 XNSpotLocation, &spot,
1504 XNPreeditStartCallback, &xcb[0],
1505 XNPreeditDoneCallback , &xcb[1],
1506 XNPreeditDrawCallback , &xcb[2],
1507#if 0
1508 XNPreeditCaretCallback, &xcb[3],
1509#endif
1510 NULL);
1511 }
1595 1512
1596 Input_Context = XCreateIC (xim, 1513 Input_Context = XCreateIC (xim,
1597 XNInputStyle, input_style, 1514 XNInputStyle, input_style,
1598 XNClientWindow, vt, 1515 XNClientWindow, vt,
1599 XNFocusWindow, parent[0], 1516 XNFocusWindow, parent[0],
… …
1611 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1528 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1612 im_destroy (); 1529 im_destroy ();
1613 return false; 1530 return false;
1614 } 1531 }
1615 1532
1533#if 0
1534 // unfortunately, only the focus window is used by XIM, hard to fix
1535 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1536 vt_select_input ();
1537#endif
1538
1616 if (input_style & XIMPreeditArea) 1539 if (input_style & XIMPreeditArea)
1617 IMSetStatusPosition (); 1540 IMSetStatusPosition ();
1618 1541
1619 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1620 return true; 1542 return true;
1621} 1543}
1622 1544
1623void 1545void
1624rxvt_term::im_cb () 1546rxvt_term::im_cb ()
… …
1630 1552
1631 make_current (); 1553 make_current ();
1632 1554
1633 im_destroy (); 1555 im_destroy ();
1634 1556
1635 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1636 if (Input_Context) 1557 if (Input_Context)
1637 return; 1558 return;
1638 1559
1639#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1560#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1640 if (rs[Rs_imLocale]) 1561 if (rs[Rs_imLocale])
… …
1713 XFree (preedit_attr); 1634 XFree (preedit_attr);
1714 XFree (status_attr); 1635 XFree (status_attr);
1715} 1636}
1716#endif /* USE_XIM */ 1637#endif /* USE_XIM */
1717 1638
1718/*----------------------------------------------------------------------*/
1719rxvt_t rxvt_current_term;
1720
1721/*----------------------- end-of-file (C source) -----------------------*/ 1639/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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