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.160 by root, Wed Jan 4 05:35:34 2006 UTC vs.
Revision 1.204 by root, Wed Jan 25 02:53:13 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.
… …
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
53static char curlocale[128], savelocale[128]; 56static char curlocale[128], savelocale[128];
54 57
55bool 58bool
56rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
57{ 60{
58 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 62 return false;
60 63
61 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
63 return true; 66 return true;
64} 67}
65 68
66bool 69void
67rxvt_push_locale (const char *locale) 70rxvt_push_locale (const char *locale) NOTHROW
68{ 71{
69 strcpy (savelocale, curlocale); 72 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 73 rxvt_set_locale (locale);
71} 74}
72 75
73void 76void
74rxvt_pop_locale () 77rxvt_pop_locale () NOTHROW
75{ 78{
76 rxvt_set_locale (savelocale); 79 rxvt_set_locale (savelocale);
77} 80}
78 81
79#if ENABLE_COMBINING 82#if ENABLE_COMBINING
… …
146 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
147#endif 150#endif
148#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif 153#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif 156#endif
157#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
170 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif 171#endif
172#ifdef USE_XIM 172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
174#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
175 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
176 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
177 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
178 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
179 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
180 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
181 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
184 188
185 termlist.push_back (this); 189 termlist.push_back (this);
186 190
187#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
188 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
189
190 if (!keyboard)
191 rxvt_fatal ("out of memory, aborting.\n");
192#endif 193#endif
193} 194}
194 195
195// 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.
196// for use before an emergency exit 197// for use before an emergency exit
197void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
198{ 199{
199 if (cmd_pid) 200 if (cmd_pid)
200 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
201 202
202#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
203 privileged_utmp (RESTORE);
204#endif
205
206 pty.put ();
207} 204}
208 205
209rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
210{ 207{
211 PERL_INVOKE ((this, HOOK_DESTROY, DT_END));
212
213 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
214 209
215 emergency_cleanup (); 210 emergency_cleanup ();
216 211
217#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
227 222
228 selection_clear (); 223 selection_clear ();
229 224
230#ifdef USE_XIM 225#ifdef USE_XIM
231 im_destroy (); 226 im_destroy ();
232#endif
233#ifdef MENUBAR
234 if (menubarGC) XFreeGC (disp, menubarGC);
235#endif 227#endif
236#ifdef XTERM_SCROLLBAR 228#ifdef XTERM_SCROLLBAR
237 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
238 if (ShadowGC) XFreeGC (disp, ShadowGC); 230 if (ShadowGC) XFreeGC (disp, ShadowGC);
239#endif 231#endif
… …
250 if (upArrow) XFreePixmap (disp, upArrow); 242 if (upArrow) XFreePixmap (disp, upArrow);
251 if (downArrow) XFreePixmap (disp, downArrow); 243 if (downArrow) XFreePixmap (disp, downArrow);
252 if (upArrowHi) XFreePixmap (disp, upArrowHi); 244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
253 if (downArrowHi) XFreePixmap (disp, downArrowHi); 245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
254#endif 246#endif
255#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 247#ifdef RXVT_SCROLLBAR
256 if (topShadowGC) XFreeGC (disp, topShadowGC); 248 if (topShadowGC) XFreeGC (disp, topShadowGC);
257 if (botShadowGC) XFreeGC (disp, botShadowGC); 249 if (botShadowGC) XFreeGC (disp, botShadowGC);
258 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
259#endif 251#endif
260 if (gc) XFreeGC (disp, gc); 252 if (gc) XFreeGC (disp, gc);
261 253
262#if defined(MENUBAR) && (MENUBAR_MAX > 1)
263 delete menuBar.drawable;
264 //if (menuBar.win)
265 // XDestroyWindow (disp, menuBar.win);
266#endif
267 delete drawable; 254 delete drawable;
268 // destroy all windows 255 // destroy all windows
269 if (parent[0]) 256 if (parent[0])
270 XDestroyWindow (disp, parent[0]); 257 XDestroyWindow (disp, parent[0]);
271 } 258 }
272 259
273 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
274
275 delete pix_colors_focused; 261 delete pix_colors_focused;
276#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
277 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
278#endif 264#endif
279 265
… …
285 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
286 free (allocated [i]); 272 free (allocated [i]);
287 273
288 free (selection.text); 274 free (selection.text);
289 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
290 free (env_windowid);
291 free (env_display); 276 free (env_display);
292 free (env_term); 277 free (env_term);
293 free (env_colorfgbg);
294 free (locale); 278 free (locale);
295 free (v_buffer); 279 free (v_buffer);
296 free (incr_buf); 280 free (incr_buf);
297 281
298 delete envv; 282 delete envv;
… …
301#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
302 delete keyboard; 286 delete keyboard;
303#endif 287#endif
304} 288}
305 289
290// child has exited, usually destroys
306void 291void
307rxvt_term::child_exit () 292rxvt_term::child_cb (child_watcher &w, int status)
308{ 293{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295
309 cmd_pid = 0; 296 cmd_pid = 0;
310 297
311 if (!OPTION (Opt_hold)) 298 if (!OPTION (Opt_hold))
312 destroy (); 299 destroy ();
313} 300}
… …
316rxvt_term::destroy () 303rxvt_term::destroy ()
317{ 304{
318 if (destroy_ev.active) 305 if (destroy_ev.active)
319 return; 306 return;
320 307
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309
321#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
322 scr_overlay_off (); 311 scr_overlay_off ();
323#endif 312#endif
324 313
325 if (display) 314 if (display)
… …
327#if USE_XIM 316#if USE_XIM
328 im_ev.stop (display); 317 im_ev.stop (display);
329#endif 318#endif
330#if HAVE_SCROLLBARS 319#if HAVE_SCROLLBARS
331 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
332#endif
333#if MENUBAR
334 menubar_ev.stop (display);
335#endif 321#endif
336#if TRANSPARENT 322#if TRANSPARENT
337 rootwin_ev.stop (display); 323 rootwin_ev.stop (display);
338#endif 324#endif
339 incr_ev.stop (); 325 incr_ev.stop ();
… …
363} 349}
364 350
365void 351void
366rxvt_term::destroy_cb (time_watcher &w) 352rxvt_term::destroy_cb (time_watcher &w)
367{ 353{
368 SET_R (this); 354 make_current ();
369 355
370 delete this; 356 delete this;
371} 357}
372 358
373/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
… …
461 _exit (EXIT_FAILURE); 447 _exit (EXIT_FAILURE);
462} 448}
463 449
464/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
465bool 451bool
466rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
467{ 453{
454 this->envv = envv;
455
468 SET_R (this); 456 SET_R (this);
469
470 set_locale (""); 457 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :(
471 459
472 if (!init_vars ()) 460 if (!init_vars ())
473 return false; 461 return false;
474 462
475 init_secondary (); 463 init_secondary ();
… …
478 466
479#ifdef KEYSYM_RESOURCE 467#ifdef KEYSYM_RESOURCE
480 keyboard->register_done (); 468 keyboard->register_done ();
481#endif 469#endif
482 470
483#if MENUBAR_MAX
484 menubar_read (rs[Rs_menu]);
485#endif
486#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
487 if (OPTION (Opt_scrollBar)) 472 if (OPTION (Opt_scrollBar))
488 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
489#endif 474#endif
490 475
491#if ENABLE_PERL 476 pty = ptytty::create ();
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 {
496 rxvt_perl.init ();
497 PERL_INVOKE ((this, HOOK_INIT, DT_END));
498 }
499#endif
500 477
501 create_windows (argc, argv); 478 create_windows (argc, argv);
502 479
503 dDisp; 480 dDisp;
504 481
505 init_xlocale (); 482 init_xlocale ();
506 483
507 scr_reset (); /* initialize screen */ 484 scr_reset (); // initialize screen
508 485
509#if 0 486#if 0
510 XSynchronize (disp, True); 487 XSynchronize (disp, True);
511#endif 488#endif
512 489
513#ifdef HAVE_SCROLLBARS 490#ifdef HAVE_SCROLLBARS
514 if (OPTION (Opt_scrollBar)) 491 if (OPTION (Opt_scrollBar))
515 resize_scrollbar (); /* create and map scrollbar */ 492 resize_scrollbar (); /* create and map scrollbar */
516#endif 493#endif
517#if (MENUBAR_MAX)
518 if (menubar_visible ())
519 XMapWindow (disp, menuBar.win);
520#endif
521#ifdef TRANSPARENT 494#ifdef TRANSPARENT
522 if (OPTION (Opt_transparent)) 495 if (OPTION (Opt_transparent))
523 { 496 {
524 XSelectInput (disp, display->root, PropertyChangeMask); 497 XSelectInput (disp, display->root, PropertyChangeMask);
525 check_our_parents (); 498 check_our_parents ();
526 rootwin_ev.start (display, display->root); 499 rootwin_ev.start (display, display->root);
527 } 500 }
528#endif 501#endif
529 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
530 XMapWindow (disp, vt); 526 XMapWindow (disp, vt);
531 XMapWindow (disp, parent[0]); 527 XMapWindow (disp, parent[0]);
532 528
533 set_colorfgbg ();
534
535 init_command (cmd_argv);
536
537 free (cmd_argv);
538
539 pty_ev.start (pty.pty, EVENT_READ);
540
541 check_ev.start ();
542
543 PERL_INVOKE ((this, HOOK_START, DT_END));
544
545 return true; 529 return true;
546} 530}
547 531
548static struct sig_handlers 532static struct sig_handlers
549{ 533{
550 sig_watcher sw_chld, sw_term, sw_int; 534 sig_watcher sw_term, sw_int;
551 535
552 void sig_chld (sig_watcher &w)
553 {
554 // we are being called for every SIGCHLD, find the corresponding term
555 int pid;
556
557 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
558 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
559 if (pid == (*t)->cmd_pid)
560 {
561 (*t)->child_exit ();
562 break;
563 }
564 }
565
566 /* 536 /*
567 * Catch a fatal signal and tidy up before quitting 537 * Catch a fatal signal and tidy up before quitting
568 */ 538 */
569 void 539 void
570 sig_term (sig_watcher &w) 540 sig_term (sig_watcher &w)
571 { 541 {
572#ifdef DEBUG_CMD
573 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
574#endif
575 rxvt_emergency_cleanup (); 542 rxvt_emergency_cleanup ();
576 signal (w.signum, SIG_DFL); 543 signal (w.signum, SIG_DFL);
577 kill (getpid (), w.signum); 544 kill (getpid (), w.signum);
578 } 545 }
579 546
580 sig_handlers () 547 sig_handlers ()
581 : sw_chld (this, &sig_handlers::sig_chld),
582 sw_term (this, &sig_handlers::sig_term), 548 : sw_term (this, &sig_handlers::sig_term),
583 sw_int (this, &sig_handlers::sig_term) 549 sw_int (this, &sig_handlers::sig_term)
584 { 550 {
585 } 551 }
586} sig_handlers; 552} sig_handlers;
587 553
554char **rxvt_environ; // startup environment
555
588void 556void
589rxvt_init () 557rxvt_init ()
590{ 558{
591 /* 559 ptytty::init ();
592 * Save and then give up any super-user privileges 560
593 * If we need privileges in any area then we must specifically request it. 561 rxvt_environ = environ;
594 * We should only need to be root in these cases:
595 * 1. write utmp entries on some systems
596 * 2. chown tty on some systems
597 */
598 rxvt_privileges (SAVE);
599 rxvt_privileges (IGNORE);
600 562
601 signal (SIGHUP, SIG_IGN); 563 signal (SIGHUP, SIG_IGN);
602 signal (SIGPIPE, SIG_IGN); 564 signal (SIGPIPE, SIG_IGN);
603 565
604 sig_handlers.sw_chld.start (SIGCHLD);
605 sig_handlers.sw_term.start (SIGTERM); 566 sig_handlers.sw_term.start (SIGTERM);
606 sig_handlers.sw_int.start (SIGINT); 567 sig_handlers.sw_int.start (SIGINT);
607 568
608 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 569 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
609 /* signal (SIGURG, SIG_DFL); */ 570 /* signal (SIGURG, SIG_DFL); */
610 571
611 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 572 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
612 // TODO: handle this with exceptions and tolerate the memory loss 573 // TODO: handle this with exceptions and tolerate the memory loss
613 XSetIOErrorHandler (rxvt_xioerror_handler); 574 XSetIOErrorHandler (rxvt_xioerror_handler);
575
576 XrmInitialize ();
614} 577}
615 578
616/* ------------------------------------------------------------------------- * 579/* ------------------------------------------------------------------------- *
617 * MEMORY ALLOCATION WRAPPERS * 580 * MEMORY ALLOCATION WRAPPERS *
618 * ------------------------------------------------------------------------- */ 581 * ------------------------------------------------------------------------- */
… …
636 rxvt_fatal ("memory allocation failure. aborting.\n"); 599 rxvt_fatal ("memory allocation failure. aborting.\n");
637 600
638 return p; 601 return p;
639} 602}
640 603
641void * 604void *
642rxvt_realloc (void *ptr, size_t size) 605rxvt_realloc (void *ptr, size_t size)
643{ 606{
644 void *p = realloc (ptr, size); 607 void *p = realloc (ptr, size);
645 608
646 if (!p) 609 if (!p)
647 rxvt_fatal ("memory allocation failure. aborting.\n"); 610 rxvt_fatal ("memory allocation failure. aborting.\n");
648 611
649 return p; 612 return p;
650} 613}
651
652/* ------------------------------------------------------------------------- *
653 * PRIVILEGED OPERATIONS *
654 * ------------------------------------------------------------------------- */
655/* take care of suid/sgid super-user (root) privileges */
656void
657rxvt_privileges (rxvt_privaction action)
658{
659#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
660 static uid_t euid;
661 static gid_t egid;
662#endif
663
664#if ! defined(__CYGWIN32__)
665# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
666 /* setreuid () is the poor man's setuid (), seteuid () */
667# define seteuid(a) setreuid(-1, (a))
668# define setegid(a) setregid(-1, (a))
669# define HAVE_SETEUID
670# endif
671# ifdef HAVE_SETEUID
672 switch (action)
673 {
674 case IGNORE:
675 /*
676 * change effective uid/gid - not real uid/gid - so we can switch
677 * back to root later, as required
678 */
679 seteuid (getuid ());
680 setegid (getgid ());
681 break;
682 case SAVE:
683 euid = geteuid ();
684 egid = getegid ();
685 break;
686 case RESTORE:
687 seteuid (euid);
688 setegid (egid);
689 break;
690 }
691# else
692 switch (action)
693 {
694 case IGNORE:
695 setuid (getuid ());
696 setgid (getgid ());
697 /* FALLTHROUGH */
698 case SAVE:
699 /* FALLTHROUGH */
700 case RESTORE:
701 break;
702 }
703# endif
704#endif
705}
706
707#ifdef UTMP_SUPPORT
708void
709rxvt_term::privileged_utmp (rxvt_privaction action)
710{
711 if (OPTION (Opt_utmpInhibit)
712 || !pty.name || !*pty.name)
713 return;
714
715 rxvt_privileges (RESTORE);
716
717 if (action == SAVE)
718 makeutent (pty.name, rs[Rs_display_name]);
719 else
720 cleanutent ();
721
722 rxvt_privileges (IGNORE);
723}
724#endif
725 614
726/*----------------------------------------------------------------------*/ 615/*----------------------------------------------------------------------*/
727/* 616/*
728 * window size/position calculcations for XSizeHint and other storage. 617 * window size/position calculcations for XSizeHint and other storage.
729 * if width/height are non-zero then override calculated width/height 618 * if width/height are non-zero then override calculated width/height
730 */ 619 */
731void 620void
732rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 621rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
733{ 622{
734 short recalc_x, recalc_y; 623 short recalc_x, recalc_y;
735 int x, y, sb_w, mb_h, flags; 624 int x, y, sb_w, flags;
736 unsigned int w, h; 625 unsigned int w, h;
737 unsigned int max_width, max_height; 626 unsigned int max_width, max_height;
738 dDisp; 627 dDisp;
739
740 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
741 ncol, nrow, szHint.width, szHint.height));
742 628
743 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
744 szHint.win_gravity = NorthWestGravity; 630 szHint.win_gravity = NorthWestGravity;
745 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
746 632
… …
801 max_width = MAX_COLS * fwidth; 687 max_width = MAX_COLS * fwidth;
802 max_height = MAX_ROWS * fheight; 688 max_height = MAX_ROWS * fheight;
803 689
804 szHint.base_width = szHint.base_height = 2 * int_bwidth; 690 szHint.base_width = szHint.base_height = 2 * int_bwidth;
805 691
806 sb_w = mb_h = 0; 692 sb_w = 0;
807 window_vt_x = window_vt_y = int_bwidth; 693 window_vt_x = window_vt_y = int_bwidth;
808 694
809 if (scrollbar_visible ()) 695 if (scrollBar.state)
810 { 696 {
811 sb_w = scrollbar_TotalWidth (); 697 sb_w = scrollbar_TotalWidth ();
812 szHint.base_width += sb_w; 698 szHint.base_width += sb_w;
813 if (!OPTION (Opt_scrollBar_right)) 699 if (!OPTION (Opt_scrollBar_right))
814 window_vt_x += sb_w; 700 window_vt_x += sb_w;
815 } 701 }
816 702
817 if (menubar_visible ())
818 {
819 mb_h = menuBar_TotalHeight ();
820 szHint.base_height += mb_h;
821 window_vt_y += mb_h;
822 }
823
824 szHint.width_inc = fwidth; 703 szHint.width_inc = fwidth;
825 szHint.height_inc = fheight; 704 szHint.height_inc = fheight;
826 szHint.min_width = szHint.base_width + szHint.width_inc; 705 szHint.min_width = szHint.base_width + szHint.width_inc;
827 szHint.min_height = szHint.base_height + szHint.height_inc; 706 szHint.min_height = szHint.base_height + szHint.height_inc;
828 707
… …
846 { 725 {
847 min_it (height, max_height); 726 min_it (height, max_height);
848 szHint.height = szHint.base_height + height; 727 szHint.height = szHint.base_height + height;
849 } 728 }
850 729
851 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 730 if (scrollBar.state && OPTION (Opt_scrollBar_right))
852 window_sb_x = szHint.width - sb_w; 731 window_sb_x = szHint.width - sb_w;
853 732
854 if (recalc_x) 733 if (recalc_x)
855 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
856 if (recalc_y) 735 if (recalc_y)
857 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
858 737
859 ncol = width / fwidth; 738 ncol = width / fwidth;
860 nrow = height / fheight; 739 nrow = height / fheight;
861 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
862 ncol, nrow, szHint.width,
863 szHint.height));
864 return;
865} 740}
866 741
867/*----------------------------------------------------------------------*/ 742/*----------------------------------------------------------------------*/
868/* 743/*
869 * Tell the teletype handler what size the window is. 744 * Tell the teletype handler what size the window is.
870 * Called after a window size change. 745 * Called after a window size change.
871 */ 746 */
872void 747void
873rxvt_term::tt_winch () 748rxvt_term::tt_winch ()
874{ 749{
875 if (pty.pty < 0) 750 if (pty->pty < 0)
876 return; 751 return;
877 752
878 struct winsize ws; 753 struct winsize ws;
879 754
880 ws.ws_col = ncol; 755 ws.ws_col = ncol;
881 ws.ws_row = nrow; 756 ws.ws_row = nrow;
882 ws.ws_xpixel = width; 757 ws.ws_xpixel = width;
883 ws.ws_ypixel = height; 758 ws.ws_ypixel = height;
884 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 759 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
885 760
886#if 0 761#if 0
887 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 762 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
888 if (cmd_pid) /* force through to the command */ 763 if (cmd_pid) /* force through to the command */
889 kill (-cmd_pid, SIGWINCH); 764 kill (-cmd_pid, SIGWINCH);
… …
1026 i = atoi (color); 901 i = atoi (color);
1027 902
1028 if (i >= 8 && i <= 15) 903 if (i >= 8 && i <= 15)
1029 { /* bright colors */ 904 { /* bright colors */
1030 i -= 8; 905 i -= 8;
1031# ifndef NO_BRIGHTCOLOR
1032 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1033 SET_PIXCOLOR (idx); 907 SET_PIXCOLOR (idx);
1034 goto done; 908 goto done;
1035# endif
1036 } 909 }
1037 910
1038 if (i >= 0 && i <= 7) 911 if (i >= 0 && i <= 7)
1039 { /* normal colors */ 912 { /* normal colors */
1040 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
… …
1111{ 984{
1112 unsigned int i; 985 unsigned int i;
1113 const char *xpmb = "\0"; 986 const char *xpmb = "\0";
1114 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 987 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1115 988
1116 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1117 strcpy (fstr, "default"); 989 strcpy (fstr, "default");
1118 strcpy (bstr, "default"); 990 strcpy (bstr, "default");
1119 for (i = Color_Black; i <= Color_White; i++) 991 for (i = Color_Black; i <= Color_White; i++)
1120 if (pix_colors[Color_fg] == pix_colors[i]) 992 if (pix_colors[Color_fg] == pix_colors[i])
1121 { 993 {
… …
1155 * -------------------------------------------------------------------- */ 1027 * -------------------------------------------------------------------- */
1156void 1028void
1157rxvt_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)
1158{ 1030{
1159 int fix_screen; 1031 int fix_screen;
1160 int old_width = szHint.width, old_height = szHint.height; 1032 int old_width = szHint.width;
1033 int old_height = szHint.height;
1161 dDisp; 1034 dDisp;
1162 1035
1163 window_calc (newwidth, newheight); 1036 window_calc (newwidth, newheight);
1164 XSetWMNormalHints (disp, parent[0], &szHint); 1037 XSetWMNormalHints (disp, parent[0], &szHint);
1165 1038
… …
1187 { 1060 {
1188 x -= x1; 1061 x -= x1;
1189 y -= y1; 1062 y -= y1;
1190 } 1063 }
1191 1064
1192 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1193 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1194 dx = old_width - szHint.width; 1067 dx = old_width - szHint.width;
1195 dy = old_height - szHint.height; 1068 dy = old_height - szHint.height;
1196 1069
1197 /* Check position of the center of the window */ 1070 /* Check position of the center of the window */
1198 if (x < x1) /* left half */ 1071 if (x < x1) /* left half */
1199 dx = 0; 1072 dx = 0;
… …
1213 1086
1214 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1215 1088
1216 if (fix_screen || newwidth != old_width || newheight != old_height) 1089 if (fix_screen || newwidth != old_width || newheight != old_height)
1217 { 1090 {
1218 if (scrollbar_visible ()) 1091 if (scrollBar.state)
1219 { 1092 {
1220 XMoveResizeWindow (disp, scrollBar.win, 1093 XMoveResizeWindow (disp, scrollBar.win,
1221 window_sb_x, 0, 1094 window_sb_x, 0,
1222 scrollbar_TotalWidth (), szHint.height); 1095 scrollbar_TotalWidth (), szHint.height);
1223 resize_scrollbar (); 1096 resize_scrollbar ();
1224 } 1097 }
1225 1098
1226 if (menubar_visible ())
1227 XMoveResizeWindow (disp, menuBar.win,
1228 window_vt_x, 0,
1229 width, menuBar_TotalHeight ());
1230
1231 XMoveResizeWindow (disp, vt, 1099 XMoveResizeWindow (disp, vt,
1232 window_vt_x, window_vt_y, 1100 window_vt_x, window_vt_y,
1233 width, height); 1101 width, height);
1234 1102
1235 scr_clear (); 1103 scr_clear ();
… …
1237 resize_pixmap (); 1105 resize_pixmap ();
1238#endif 1106#endif
1239 } 1107 }
1240 1108
1241 if (fix_screen || old_height == 0) 1109 if (fix_screen || old_height == 0)
1242 {
1243 int curr_screen = -1;
1244 int old_ncol = prev_ncol;
1245
1246 /* scr_reset only works on the primary screen */
1247 if (old_height) /* this is not the first time through */
1248 {
1249 unsigned int ocol = ncol;
1250 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1251 curr_screen = scr_change_screen (PRIMARY);
1252 ncol = ocol;
1253 }
1254
1255 scr_reset (); 1110 scr_reset ();
1256
1257 if (curr_screen >= 0) /* this is not the first time through */
1258 {
1259 scr_change_screen (curr_screen);
1260 selection_check (old_ncol != ncol ? 4 : 0);
1261 }
1262 }
1263
1264 old_width = szHint.width;
1265 old_height = szHint.height;
1266 1111
1267#ifdef XPM_BACKGROUND 1112#ifdef XPM_BACKGROUND
1268 if (pixmap) 1113 if (pixmap)
1269 scr_touch (false); 1114 scr_touch (false);
1270#endif 1115#endif
… …
1373 XPoint nspot; 1218 XPoint nspot;
1374 XVaNestedList preedit_attr; 1219 XVaNestedList preedit_attr;
1375 1220
1376 if (!Input_Context 1221 if (!Input_Context
1377 || !focus 1222 || !focus
1378 || !(input_style & XIMPreeditPosition)) 1223 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1379 return; 1224 return;
1380 1225
1381 im_set_position (nspot); 1226 im_set_position (nspot);
1382 1227
1383 if (nspot.x == spot.x && nspot.y == spot.y) 1228 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1402 input_method = 0; 1247 input_method = 0;
1403 } 1248 }
1404 1249
1405 Input_Context = 0; 1250 Input_Context = 0;
1406} 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
1407 1326
1408/* 1327/*
1409 * 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
1410 * open a suitable preedit type 1329 * open a suitable preedit type
1411 */ 1330 */
… …
1418 XRectangle rect, status_rect, needed_rect; 1337 XRectangle rect, status_rect, needed_rect;
1419 unsigned long fg, bg; 1338 unsigned long fg, bg;
1420 const char *p; 1339 const char *p;
1421 char **s; 1340 char **s;
1422 XIMStyles *xim_styles; 1341 XIMStyles *xim_styles;
1342#ifdef ENABLE_XIM_ONTHESPOT
1343 XIMCallback xcb[4];
1344#endif
1345
1346 set_environ (envv);
1423 1347
1424 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1348 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1425 return false; 1349 return false;
1426 1350
1427 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1428 input_method = display->get_xim (locale, modifiers); 1351 input_method = display->get_xim (locale, modifiers);
1429 if (input_method == NULL) 1352 if (input_method == NULL)
1430 return false; 1353 return false;
1431 1354
1432 xim = input_method->xim; 1355 xim = input_method->xim;
… …
1452 s = rxvt_splitcommastring (p); 1375 s = rxvt_splitcommastring (p);
1453 1376
1454 for (i = found = 0; !found && s[i]; i++) 1377 for (i = found = 0; !found && s[i]; i++)
1455 { 1378 {
1456 if (!strcmp (s[i], "OverTheSpot")) 1379 if (!strcmp (s[i], "OverTheSpot"))
1457 input_style = (XIMPreeditPosition | XIMStatusNothing); 1380 input_style = XIMPreeditPosition | XIMStatusNothing;
1458 else if (!strcmp (s[i], "OffTheSpot")) 1381 else if (!strcmp (s[i], "OffTheSpot"))
1459 input_style = (XIMPreeditArea | XIMStatusArea); 1382 input_style = XIMPreeditArea | XIMStatusArea;
1460 else if (!strcmp (s[i], "Root")) 1383 else if (!strcmp (s[i], "Root"))
1461 input_style = (XIMPreeditNothing | XIMStatusNothing); 1384 input_style = XIMPreeditNothing | XIMStatusNothing;
1462 else if (!strcmp (s[i], "None")) 1385 else if (!strcmp (s[i], "None"))
1463 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;
1464 1393
1465 for (j = 0; j < xim_styles->count_styles; j++) 1394 for (j = 0; j < xim_styles->count_styles; j++)
1466 if (input_style == xim_styles->supported_styles[j]) 1395 if (input_style == xim_styles->supported_styles[j])
1467 { 1396 {
1468 rxvt_freecommastring (s); 1397 rxvt_freecommastring (s);
… …
1557 XNBackground, bg, 1486 XNBackground, bg,
1558 XNArea, &status_rect, 1487 XNArea, &status_rect,
1559 XNFontSet, fs, 1488 XNFontSet, fs,
1560 NULL); 1489 NULL);
1561 } 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 }
1562 1512
1563 Input_Context = XCreateIC (xim, 1513 Input_Context = XCreateIC (xim,
1564 XNInputStyle, input_style, 1514 XNInputStyle, input_style,
1565 XNClientWindow, vt, 1515 XNClientWindow, vt,
1566 XNFocusWindow, parent[0], 1516 XNFocusWindow, parent[0],
… …
1578 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1528 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1579 im_destroy (); 1529 im_destroy ();
1580 return false; 1530 return false;
1581 } 1531 }
1582 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
1583 if (input_style & XIMPreeditArea) 1539 if (input_style & XIMPreeditArea)
1584 IMSetStatusPosition (); 1540 IMSetStatusPosition ();
1585 1541
1586 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1587 return true; 1542 return true;
1588} 1543}
1589 1544
1590void 1545void
1591rxvt_term::im_cb () 1546rxvt_term::im_cb ()
… …
1593 int i; 1548 int i;
1594 const char *p; 1549 const char *p;
1595 char **s; 1550 char **s;
1596 char buf[IMBUFSIZ]; 1551 char buf[IMBUFSIZ];
1597 1552
1598 SET_R (this); 1553 make_current ();
1599 1554
1600 im_destroy (); 1555 im_destroy ();
1601 1556
1602 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1603 if (Input_Context) 1557 if (Input_Context)
1604 return; 1558 return;
1605 1559
1606#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1560#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1607 if (rs[Rs_imLocale]) 1561 if (rs[Rs_imLocale])
… …
1680 XFree (preedit_attr); 1634 XFree (preedit_attr);
1681 XFree (status_attr); 1635 XFree (status_attr);
1682} 1636}
1683#endif /* USE_XIM */ 1637#endif /* USE_XIM */
1684 1638
1685/*----------------------------------------------------------------------*/
1686rxvt_t rxvt_current_term;
1687
1688/*----------------------- end-of-file (C source) -----------------------*/ 1639/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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