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.180 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.223 by root, Sat Feb 18 14:14:43 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
… …
182 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
183#endif 171#endif
184#ifdef USE_XIM 172#ifdef USE_XIM
185 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
186#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
187 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
188 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
189 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
190 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
191 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
192 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
193 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
196 188
197 termlist.push_back (this); 189 termlist.push_back (this);
198 190
199#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
200 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
201
202 if (!keyboard)
203 rxvt_fatal ("out of memory, aborting.\n");
204#endif 193#endif
205} 194}
206 195
207// 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.
208// for use before an emergency exit 197// for use before an emergency exit
209void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
210{ 199{
211 if (cmd_pid) 200 if (cmd_pid)
212 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
213 202
214#ifdef UTMP_SUPPORT 203 pty_ev.stop ();
215 privileged_utmp (RESTORE); 204 delete pty; pty = 0;
216#endif
217
218 pty.put ();
219} 205}
220 206
221rxvt_term::~rxvt_term () 207rxvt_term::~rxvt_term ()
222{ 208{
223 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
224
225 termlist.erase (find (termlist.begin (), termlist.end(), this)); 209 termlist.erase (find (termlist.begin (), termlist.end(), this));
226 210
227 emergency_cleanup (); 211 emergency_cleanup ();
228 212
229#if ENABLE_STYLES 213#if ENABLE_STYLES
… …
233#endif 217#endif
234 delete fontset[0]; 218 delete fontset[0];
235 219
236 if (display) 220 if (display)
237 { 221 {
238 dDisp;
239
240 selection_clear (); 222 selection_clear ();
241 223
242#ifdef USE_XIM 224#ifdef USE_XIM
243 im_destroy (); 225 im_destroy ();
244#endif 226#endif
245#ifdef XTERM_SCROLLBAR 227#ifdef XTERM_SCROLLBAR
246 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 228 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
247 if (ShadowGC) XFreeGC (disp, ShadowGC); 229 if (ShadowGC) XFreeGC (dpy, ShadowGC);
248#endif 230#endif
249#ifdef PLAIN_SCROLLBAR 231#ifdef PLAIN_SCROLLBAR
250 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 232 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
251#endif 233#endif
252#ifdef NEXT_SCROLLBAR 234#ifdef NEXT_SCROLLBAR
253 if (blackGC) XFreeGC (disp, blackGC); 235 if (blackGC) XFreeGC (dpy, blackGC);
254 if (whiteGC) XFreeGC (disp, whiteGC); 236 if (whiteGC) XFreeGC (dpy, whiteGC);
255 if (grayGC) XFreeGC (disp, grayGC); 237 if (grayGC) XFreeGC (dpy, grayGC);
256 if (darkGC) XFreeGC (disp, darkGC); 238 if (darkGC) XFreeGC (dpy, darkGC);
257 if (stippleGC) XFreeGC (disp, stippleGC); 239 if (stippleGC) XFreeGC (dpy, stippleGC);
258 if (dimple) XFreePixmap (disp, dimple); 240 if (dimple) XFreePixmap (dpy, dimple);
259 if (upArrow) XFreePixmap (disp, upArrow); 241 if (upArrow) XFreePixmap (dpy, upArrow);
260 if (downArrow) XFreePixmap (disp, downArrow); 242 if (downArrow) XFreePixmap (dpy, downArrow);
261 if (upArrowHi) XFreePixmap (disp, upArrowHi); 243 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
262 if (downArrowHi) XFreePixmap (disp, downArrowHi); 244 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
263#endif 245#endif
264#ifdef RXVT_SCROLLBAR 246#ifdef RXVT_SCROLLBAR
265 if (topShadowGC) XFreeGC (disp, topShadowGC); 247 if (topShadowGC) XFreeGC (dpy, topShadowGC);
266 if (botShadowGC) XFreeGC (disp, botShadowGC); 248 if (botShadowGC) XFreeGC (dpy, botShadowGC);
267 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 249 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
268#endif 250#endif
269 if (gc) XFreeGC (disp, gc); 251 if (gc) XFreeGC (dpy, gc);
270 252
271 delete drawable; 253 delete drawable;
272 // destroy all windows 254 // destroy all windows
273 if (parent[0]) 255 if (parent[0])
274 XDestroyWindow (disp, parent[0]); 256 XDestroyWindow (dpy, parent[0]);
275 }
276 257
277 // TODO: free pixcolours, colours should become part of rxvt_display 258 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i))
260 {
261 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING
263 pix_colors_unfocused [i].free (this);
264#endif
265 }
266
267 clear ();
268 }
269
278 delete pix_colors_focused; 270 delete pix_colors_focused;
279#if OFF_FOCUS_FADING 271#if OFF_FOCUS_FADING
280 delete pix_colors_unfocused; 272 delete pix_colors_unfocused;
281#endif 273#endif
282 274
… …
288 for (int i = 0; i < allocated.size (); i++) 280 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 281 free (allocated [i]);
290 282
291 free (selection.text); 283 free (selection.text);
292 // TODO: manage env vars in child only(!) 284 // TODO: manage env vars in child only(!)
293 free (env_windowid);
294 free (env_display); 285 free (env_display);
295 free (env_term); 286 free (env_term);
296 free (env_colorfgbg);
297 free (locale); 287 free (locale);
298 free (v_buffer); 288 free (v_buffer);
299 free (incr_buf); 289 free (incr_buf);
300 290
301 delete envv; 291 delete envv;
… …
304#ifdef KEYSYM_RESOURCE 294#ifdef KEYSYM_RESOURCE
305 delete keyboard; 295 delete keyboard;
306#endif 296#endif
307} 297}
308 298
299// child has exited, usually destroys
309void 300void
310rxvt_term::child_exit () 301rxvt_term::child_cb (child_watcher &w, int status)
311{ 302{
303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
304
312 cmd_pid = 0; 305 cmd_pid = 0;
313 306
314 if (!OPTION (Opt_hold)) 307 if (!OPTION (Opt_hold))
315 destroy (); 308 destroy ();
316} 309}
… …
318void 311void
319rxvt_term::destroy () 312rxvt_term::destroy ()
320{ 313{
321 if (destroy_ev.active) 314 if (destroy_ev.active)
322 return; 315 return;
316
317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323 318
324#if ENABLE_OVERLAY 319#if ENABLE_OVERLAY
325 scr_overlay_off (); 320 scr_overlay_off ();
326#endif 321#endif
327 322
… …
382{ 377{
383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 378 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
384 (*t)->emergency_cleanup (); 379 (*t)->emergency_cleanup ();
385} 380}
386 381
387#if ENABLE_FRILLS 382#if !ENABLE_MINIMAL
388static void 383static void
389print_x_error (Display *dpy, XErrorEvent *event) 384print_x_error (Display *dpy, XErrorEvent *event)
390{ 385{
391 char buffer[BUFSIZ]; 386 char buffer[BUFSIZ];
392 char mesg[BUFSIZ]; 387 char mesg[BUFSIZ];
… …
440 GET_R->allowedxerror = event->error_code; 435 GET_R->allowedxerror = event->error_code;
441 else 436 else
442 { 437 {
443 // GET_R is most likely not the terminal which caused the error, 438 // GET_R is most likely not the terminal which caused the error,
444 // so just output the error and continue 439 // so just output the error and continue
445#if ENABLE_FRILLS 440#if ENABLE_MINIMAL
441 old_xerror_handler (display, event);
442#else
446 print_x_error (display, event); 443 print_x_error (display, event);
447#else
448 old_xerror_handler (display, event);
449#endif 444#endif
450 } 445 }
451 446
452 return 0; 447 return 0;
453} 448}
… …
461 _exit (EXIT_FAILURE); 456 _exit (EXIT_FAILURE);
462} 457}
463 458
464/*----------------------------------------------------------------------*/ 459/*----------------------------------------------------------------------*/
465bool 460bool
466rxvt_term::init (int argc, const char *const *argv) 461rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
467{ 462{
463 this->envv = envv;
464
468 SET_R (this); 465 SET_R (this);
469 set_locale (""); 466 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :( 467 set_environ (envv); // few things in X do not call setlocale :(
471 468
472 if (!init_vars ()) 469 if (!init_vars ())
… …
483#ifdef HAVE_SCROLLBARS 480#ifdef HAVE_SCROLLBARS
484 if (OPTION (Opt_scrollBar)) 481 if (OPTION (Opt_scrollBar))
485 scrollBar.setIdle (); /* set existence for size calculations */ 482 scrollBar.setIdle (); /* set existence for size calculations */
486#endif 483#endif
487 484
488#if ENABLE_PERL 485 pty = ptytty::create ();
489 if (!rs[Rs_perl_ext_1])
490 rs[Rs_perl_ext_1] = "default";
491
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#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
497 // ignore some perl-related arguments if some bozo installed us set[ug]id
498 if (rxvt_tainted ())
499 {
500 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
501 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
502 {
503 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
504 rs[Rs_perl_lib] = 0;
505 rs[Rs_perl_eval] = 0;
506 }
507 }
508#endif
509 rxvt_perl.init (this);
510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
511 }
512#endif
513 486
514 create_windows (argc, argv); 487 create_windows (argc, argv);
515 488
516 dDisp;
517
518 init_xlocale (); 489 init_xlocale ();
519 490
520 scr_reset (); // initialize screen 491 scr_reset (); // initialize screen
521 492
522#if 0 493#if 0
523 XSynchronize (disp, True); 494 XSynchronize (dpy, True);
524#endif 495#endif
525 496
526#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
527 if (OPTION (Opt_scrollBar)) 498 if (OPTION (Opt_scrollBar))
528 resize_scrollbar (); /* create and map scrollbar */ 499 resize_scrollbar (); /* create and map scrollbar */
529#endif 500#endif
530#ifdef TRANSPARENT 501#ifdef TRANSPARENT
531 if (OPTION (Opt_transparent)) 502 if (OPTION (Opt_transparent))
532 { 503 {
533 XSelectInput (disp, display->root, PropertyChangeMask); 504 XSelectInput (dpy, display->root, PropertyChangeMask);
534 check_our_parents (); 505 check_our_parents ();
535 rootwin_ev.start (display, display->root); 506 rootwin_ev.start (display, display->root);
536 } 507 }
537#endif 508#endif
538 509
539 XMapWindow (disp, vt);
540 XMapWindow (disp, parent[0]);
541
542 set_colorfgbg (); 510 set_colorfgbg ();
543 511
544 init_command (cmd_argv); 512 init_command (cmd_argv);
545 513
546 free (cmd_argv); 514 free (cmd_argv);
547 515
548 if (pty.pty >= 0) 516 if (pty->pty >= 0)
549 pty_ev.start (pty.pty, EVENT_READ); 517 pty_ev.start (pty->pty, EVENT_READ);
550 518
551 check_ev.start (); 519 check_ev.start ();
552 520
553 HOOK_INVOKE ((this, HOOK_START, DT_END)); 521 HOOK_INVOKE ((this, HOOK_START, DT_END));
554 522
523#if ENABLE_XEMBED
524 if (rs[Rs_embed])
525 {
526 long info[2] = { 0, XEMBED_MAPPED };
527
528 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
529 32, PropModeReplace, (unsigned char *)&info, 2);
530 }
531#endif
532
533 XMapWindow (dpy, vt);
534 XMapWindow (dpy, parent[0]);
535
555 return true; 536 return true;
556} 537}
557 538
558static struct sig_handlers 539static struct sig_handlers
559{ 540{
560 sig_watcher sw_chld, sw_term, sw_int; 541 sig_watcher sw_term, sw_int;
561 542
562 void sig_chld (sig_watcher &w)
563 {
564 // we are being called for every SIGCHLD, find the corresponding term
565 int pid;
566
567 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
568 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
569 if (pid == (*t)->cmd_pid)
570 {
571 (*t)->child_exit ();
572 break;
573 }
574 }
575
576 /* 543 /*
577 * Catch a fatal signal and tidy up before quitting 544 * Catch a fatal signal and tidy up before quitting
578 */ 545 */
579 void 546 void
580 sig_term (sig_watcher &w) 547 sig_term (sig_watcher &w)
581 { 548 {
582#ifdef DEBUG_CMD
583 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
584#endif
585 rxvt_emergency_cleanup (); 549 rxvt_emergency_cleanup ();
586 signal (w.signum, SIG_DFL); 550 signal (w.signum, SIG_DFL);
587 kill (getpid (), w.signum); 551 kill (getpid (), w.signum);
588 } 552 }
589 553
590 sig_handlers () 554 sig_handlers ()
591 : sw_chld (this, &sig_handlers::sig_chld),
592 sw_term (this, &sig_handlers::sig_term), 555 : sw_term (this, &sig_handlers::sig_term),
593 sw_int (this, &sig_handlers::sig_term) 556 sw_int (this, &sig_handlers::sig_term)
594 { 557 {
595 } 558 }
596} sig_handlers; 559} sig_handlers;
597 560
598char **rxvt_environ; // startup environment 561char **rxvt_environ; // startup environment
599 562
600void 563void
601rxvt_init () 564rxvt_init ()
602{ 565{
566 ptytty::init ();
567
603 rxvt_environ = environ; 568 rxvt_environ = environ;
604
605 /*
606 * Save and then give up any super-user privileges
607 * If we need privileges in any area then we must specifically request it.
608 * We should only need to be root in these cases:
609 * 1. write utmp entries on some systems
610 * 2. chown tty on some systems
611 */
612 rxvt_privileges (SAVE);
613 rxvt_privileges (IGNORE);
614 569
615 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
616 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
617 572
618 sig_handlers.sw_chld.start (SIGCHLD);
619 sig_handlers.sw_term.start (SIGTERM); 573 sig_handlers.sw_term.start (SIGTERM);
620 sig_handlers.sw_int.start (SIGINT); 574 sig_handlers.sw_int.start (SIGINT);
621 575
622 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 576 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
623 /* signal (SIGURG, SIG_DFL); */ 577 /* signal (SIGURG, SIG_DFL); */
… …
652 rxvt_fatal ("memory allocation failure. aborting.\n"); 606 rxvt_fatal ("memory allocation failure. aborting.\n");
653 607
654 return p; 608 return p;
655} 609}
656 610
657void * 611void *
658rxvt_realloc (void *ptr, size_t size) 612rxvt_realloc (void *ptr, size_t size)
659{ 613{
660 void *p = realloc (ptr, size); 614 void *p = realloc (ptr, size);
661 615
662 if (!p) 616 if (!p)
663 rxvt_fatal ("memory allocation failure. aborting.\n"); 617 rxvt_fatal ("memory allocation failure. aborting.\n");
664 618
665 return p; 619 return p;
666} 620}
667
668/* ------------------------------------------------------------------------- *
669 * PRIVILEGED OPERATIONS *
670 * ------------------------------------------------------------------------- */
671/* take care of suid/sgid super-user (root) privileges */
672void
673rxvt_privileges (rxvt_privaction action)
674{
675#if ! defined(__CYGWIN32__)
676# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
677 /* setreuid () is the poor man's setuid (), seteuid () */
678# define seteuid(a) setreuid(-1, (a))
679# define setegid(a) setregid(-1, (a))
680# define HAVE_SETEUID
681# endif
682# ifdef HAVE_SETEUID
683 switch (action)
684 {
685 case IGNORE:
686 /*
687 * change effective uid/gid - not real uid/gid - so we can switch
688 * back to root later, as required
689 */
690 setegid (getgid ());
691 seteuid (getuid ());
692 break;
693 case SAVE:
694 saved_egid = getegid ();
695 saved_euid = geteuid ();
696 break;
697 case RESTORE:
698 setegid (saved_egid);
699 seteuid (saved_euid);
700 break;
701 }
702# else
703 switch (action)
704 {
705 case IGNORE:
706 setgid (getgid ());
707 setuid (getuid ());
708 /* FALLTHROUGH */
709 case SAVE:
710 /* FALLTHROUGH */
711 case RESTORE:
712 break;
713 }
714# endif
715#endif
716}
717
718#ifdef UTMP_SUPPORT
719void
720rxvt_term::privileged_utmp (rxvt_privaction action)
721{
722 if (OPTION (Opt_utmpInhibit)
723 || !pty.name || !*pty.name)
724 return;
725
726 rxvt_privileges (RESTORE);
727
728 if (action == SAVE)
729 makeutent (pty.name, rs[Rs_display_name]);
730 else
731 cleanutent ();
732
733 rxvt_privileges (IGNORE);
734}
735#endif
736 621
737/*----------------------------------------------------------------------*/ 622/*----------------------------------------------------------------------*/
738/* 623/*
739 * window size/position calculcations for XSizeHint and other storage. 624 * window size/position calculcations for XSizeHint and other storage.
740 * if width/height are non-zero then override calculated width/height 625 * if width/height are non-zero then override calculated width/height
… …
744{ 629{
745 short recalc_x, recalc_y; 630 short recalc_x, recalc_y;
746 int x, y, sb_w, flags; 631 int x, y, sb_w, flags;
747 unsigned int w, h; 632 unsigned int w, h;
748 unsigned int max_width, max_height; 633 unsigned int max_width, max_height;
749 dDisp;
750
751 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
752 ncol, nrow, szHint.width, szHint.height));
753 634
754 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 635 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
755 szHint.win_gravity = NorthWestGravity; 636 szHint.win_gravity = NorthWestGravity;
756 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 637 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
757 638
… …
819 700
820 if (scrollBar.state) 701 if (scrollBar.state)
821 { 702 {
822 sb_w = scrollbar_TotalWidth (); 703 sb_w = scrollbar_TotalWidth ();
823 szHint.base_width += sb_w; 704 szHint.base_width += sb_w;
705
824 if (!OPTION (Opt_scrollBar_right)) 706 if (!OPTION (Opt_scrollBar_right))
825 window_vt_x += sb_w; 707 window_vt_x += sb_w;
826 } 708 }
827 709
828 szHint.width_inc = fwidth; 710 szHint.width_inc = fwidth;
829 szHint.height_inc = fheight; 711 szHint.height_inc = fheight;
830 szHint.min_width = szHint.base_width + szHint.width_inc; 712 szHint.min_width = szHint.base_width + szHint.width_inc;
831 szHint.min_height = szHint.base_height + szHint.height_inc; 713 szHint.min_height = szHint.base_height + szHint.height_inc;
832 714
833 if (newwidth && newwidth - szHint.base_width < max_width) 715 if (newwidth && newwidth - szHint.base_width < max_width)
834 { 716 {
835 szHint.width = newwidth; 717 szHint.width = newwidth;
… …
854 736
855 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 737 if (scrollBar.state && OPTION (Opt_scrollBar_right))
856 window_sb_x = szHint.width - sb_w; 738 window_sb_x = szHint.width - sb_w;
857 739
858 if (recalc_x) 740 if (recalc_x)
859 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742
860 if (recalc_y) 743 if (recalc_y)
861 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 744 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
862 745
863 ncol = width / fwidth; 746 ncol = width / fwidth;
864 nrow = height / fheight; 747 nrow = height / fheight;
865 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
866 ncol, nrow, szHint.width,
867 szHint.height));
868 return;
869} 748}
870 749
871/*----------------------------------------------------------------------*/ 750/*----------------------------------------------------------------------*/
872/* 751/*
873 * Tell the teletype handler what size the window is. 752 * Tell the teletype handler what size the window is.
874 * Called after a window size change. 753 * Called after a window size change.
875 */ 754 */
876void 755void
877rxvt_term::tt_winch () 756rxvt_term::tt_winch ()
878{ 757{
879 if (pty.pty < 0) 758 if (pty->pty < 0)
880 return; 759 return;
881 760
882 struct winsize ws; 761 struct winsize ws;
883 762
884 ws.ws_col = ncol; 763 ws.ws_col = ncol;
885 ws.ws_row = nrow; 764 ws.ws_row = nrow;
886 ws.ws_xpixel = width; 765 ws.ws_xpixel = width;
887 ws.ws_ypixel = height; 766 ws.ws_ypixel = height;
888 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 767 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
889 768
890#if 0 769#if 0
891 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 770 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
892 if (cmd_pid) /* force through to the command */ 771 if (cmd_pid) /* force through to the command */
893 kill (-cmd_pid, SIGWINCH); 772 kill (-cmd_pid, SIGWINCH);
… …
973 return true; 852 return true;
974} 853}
975 854
976void rxvt_term::set_string_property (Atom prop, const char *str, int len) 855void rxvt_term::set_string_property (Atom prop, const char *str, int len)
977{ 856{
978 XChangeProperty (display->display, parent[0], 857 XChangeProperty (dpy, parent[0],
979 prop, XA_STRING, 8, PropModeReplace, 858 prop, XA_STRING, 8, PropModeReplace,
980 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 859 (const unsigned char *)str, len >= 0 ? len : strlen (str));
981} 860}
982 861
983void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 862void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
984{ 863{
985 wchar_t *ws = rxvt_mbstowcs (str, len); 864 wchar_t *ws = rxvt_mbstowcs (str, len);
986 char *s = rxvt_wcstoutf8 (ws); 865 char *s = rxvt_wcstoutf8 (ws);
987 866
988 XChangeProperty (display->display, parent[0], 867 XChangeProperty (dpy, parent[0],
989 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 868 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
990 (const unsigned char *)s, strlen (s)); 869 (const unsigned char *)s, strlen (s));
991 870
992 free (s); 871 free (s);
993 free (ws); 872 free (ws);
… …
1018void 897void
1019rxvt_term::set_window_color (int idx, const char *color) 898rxvt_term::set_window_color (int idx, const char *color)
1020{ 899{
1021 rxvt_color xcol; 900 rxvt_color xcol;
1022 int i; 901 int i;
1023 902
1024 if (color == NULL || *color == '\0') 903 if (color == NULL || *color == '\0')
1025 return; 904 return;
905
906 color = strdup (color);
907 allocated.push_back ((void *)color);
908 rs[Rs_color + idx] = color;
1026 909
1027 /* handle color aliases */ 910 /* handle color aliases */
1028 if (isdigit (*color)) 911 if (isdigit (*color))
1029 { 912 {
1030 i = atoi (color); 913 i = atoi (color);
1031 914
1032 if (i >= 8 && i <= 15) 915 if (i >= 8 && i <= 15)
1033 { /* bright colors */ 916 { /* bright colors */
1034 i -= 8; 917 i -= 8;
1035 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1036 SET_PIXCOLOR (idx);
1037 goto done; 919 goto done;
1038 } 920 }
1039 921
1040 if (i >= 0 && i <= 7) 922 if (i >= 0 && i <= 7)
1041 { /* normal colors */ 923 { /* normal colors */
1042 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 924 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1043 SET_PIXCOLOR (idx);
1044 goto done; 925 goto done;
1045 } 926 }
1046 } 927 }
1047 928
1048 if (!rXParseAllocColor (&xcol, color)) 929 set_color (xcol, color);
1049 return;
1050
1051 /* XStoreColor (display->display, display->cmap, XColor*); */
1052 930
1053 /* 931 /*
1054 * FIXME: should free colors here, but no idea how to do it so instead, 932 * FIXME: should free colors here, but no idea how to do it so instead,
1055 * so just keep gobbling up the colormap 933 * so just keep gobbling up the colormap
1056 */ 934 */
1057# if 0
1058 for (i = Color_Black; i <= Color_White; i++)
1059 if (pix_colors[idx] == pix_colors[i])
1060 break;
1061 if (i > Color_White)
1062 {
1063 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1064 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1065 DisplayPlanes (display->display, display->screen));
1066 }
1067# endif
1068 935
1069 pix_colors_focused[idx] = xcol; 936 pix_colors_focused[idx] = xcol;
1070 SET_PIXCOLOR (idx);
1071 937
1072 /* XSetWindowAttributes attr; */ 938 /* XSetWindowAttributes attr; */
1073 /* Cursor cursor; */ 939 /* Cursor cursor; */
1074done: 940done:
1075 941
1076#if OFF_FOCUS_FADING 942#if OFF_FOCUS_FADING
1077 if (rs[Rs_fade]) 943 if (rs[Rs_fade])
1078 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 944 {
945 rgba c;
946 pix_colors [Color_fade].get (c);
947 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
948 }
1079#endif 949#endif
1080 950
1081 /*TODO: handle Color_BD, scrollbar background, etc. */ 951 /*TODO: handle Color_BD, scrollbar background, etc. */
1082 952
1083 recolour_cursor (); 953 recolour_cursor ();
… …
1089#endif /* XTERM_COLOR_CHANGE */ 959#endif /* XTERM_COLOR_CHANGE */
1090 960
1091void 961void
1092rxvt_term::recolour_cursor () 962rxvt_term::recolour_cursor ()
1093{ 963{
1094 XColor xcol[2]; 964 XColor fg, bg;
1095 965
1096 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 966 (ISSET_PIXCOLOR (Color_pointer_fg)
1097 ? pix_colors_focused[Color_pointer_fg] 967 ? pix_colors_focused[Color_pointer_fg]
1098 : pix_colors_focused[Color_fg]; 968 : pix_colors_focused[Color_fg]).get (fg);
969
1099 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 970 (ISSET_PIXCOLOR (Color_pointer_bg)
1100 ? pix_colors_focused[Color_pointer_bg] 971 ? pix_colors_focused[Color_pointer_bg]
1101 : pix_colors_focused[Color_bg]; 972 : pix_colors_focused[Color_bg]).get (bg);
1102 973
1103 XQueryColors (display->display, display->cmap, xcol, 2); 974 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1104 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1105} 975}
1106 976
1107/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
1108/* 978/*
1109 * find if fg/bg matches any of the normal (low-intensity) colors 979 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1113{ 983{
1114 unsigned int i; 984 unsigned int i;
1115 const char *xpmb = "\0"; 985 const char *xpmb = "\0";
1116 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 986 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1117 987
1118 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1119 strcpy (fstr, "default"); 988 strcpy (fstr, "default");
1120 strcpy (bstr, "default"); 989 strcpy (bstr, "default");
1121 for (i = Color_Black; i <= Color_White; i++) 990 for (i = Color_Black; i <= Color_White; i++)
1122 if (pix_colors[Color_fg] == pix_colors[i]) 991 if (pix_colors[Color_fg] == pix_colors[i])
1123 { 992 {
… …
1138 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1007 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1139} 1008}
1140 1009
1141/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
1142 1011
1143int 1012bool
1144rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1013rxvt_term::set_color (rxvt_color &color, const char *name)
1145{ 1014{
1146 if (!screen_in_out->set (display, colour)) 1015 if (color.set (this, name))
1147 {
1148 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1149 return false;
1150 }
1151
1152 return true; 1016 return true;
1017
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1019 return false;
1020}
1021
1022void
1023rxvt_term::alias_color (int dst, int src)
1024{
1025 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1153} 1026}
1154 1027
1155/* -------------------------------------------------------------------- * 1028/* -------------------------------------------------------------------- *
1156 * - WINDOW RESIZING - * 1029 * - WINDOW RESIZING - *
1157 * -------------------------------------------------------------------- */ 1030 * -------------------------------------------------------------------- */
1158void 1031void
1159rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1160{ 1033{
1161 int fix_screen; 1034 int fix_screen;
1162 int old_width = szHint.width, old_height = szHint.height; 1035 int old_width = szHint.width;
1163 dDisp; 1036 int old_height = szHint.height;
1164 1037
1165 window_calc (newwidth, newheight); 1038 window_calc (newwidth, newheight);
1039
1040 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1166 XSetWMNormalHints (disp, parent[0], &szHint); 1041 XSetWMNormalHints (dpy, parent[0], &szHint);
1167 1042
1168 if (!ignoreparent) 1043 if (!ignoreparent)
1169 { 1044 {
1170#ifdef SMART_RESIZE 1045#ifdef SMART_RESIZE
1171 /* 1046 /*
… …
1175 int x, y, x1, y1; 1050 int x, y, x1, y1;
1176 int dx, dy; 1051 int dx, dy;
1177 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1178 Window unused_cr; 1053 Window unused_cr;
1179 1054
1180 XTranslateCoordinates (disp, parent[0], display->root, 1055 XTranslateCoordinates (dpy, parent[0], display->root,
1181 0, 0, &x, &y, &unused_cr); 1056 0, 0, &x, &y, &unused_cr);
1182 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1057 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1183 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1184 /* 1059 /*
1185 * if display->root isn't the parent window, a WM will probably have offset 1060 * if display->root isn't the parent window, a WM will probably have offset
1186 * our position for handles and decorations. Counter it 1061 * our position for handles and decorations. Counter it
1187 */ 1062 */
… …
1189 { 1064 {
1190 x -= x1; 1065 x -= x1;
1191 y -= y1; 1066 y -= y1;
1192 } 1067 }
1193 1068
1194 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1069 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1195 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1070 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1196 dx = old_width - szHint.width; 1071 dx = old_width - szHint.width;
1197 dy = old_height - szHint.height; 1072 dy = old_height - szHint.height;
1198 1073
1199 /* Check position of the center of the window */ 1074 /* Check position of the center of the window */
1200 if (x < x1) /* left half */ 1075 if (x < x1) /* left half */
1201 dx = 0; 1076 dx = 0;
… …
1204 if (y < y1) /* top half */ 1079 if (y < y1) /* top half */
1205 dy = 0; 1080 dy = 0;
1206 else if (y == y1) /* exact center */ 1081 else if (y == y1) /* exact center */
1207 dy /= 2; 1082 dy /= 2;
1208 1083
1209 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1084 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1210 szHint.width, szHint.height); 1085 szHint.width, szHint.height);
1211#else 1086#else
1212 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1087 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1213#endif 1088#endif
1214 } 1089 }
1215 1090
1216 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1217 1092
1218 if (fix_screen || newwidth != old_width || newheight != old_height) 1093 if (fix_screen || newwidth != old_width || newheight != old_height)
1219 { 1094 {
1220 if (scrollBar.state) 1095 if (scrollBar.state)
1221 { 1096 {
1222 XMoveResizeWindow (disp, scrollBar.win, 1097 XMoveResizeWindow (dpy, scrollBar.win,
1223 window_sb_x, 0, 1098 window_sb_x, 0,
1224 scrollbar_TotalWidth (), szHint.height); 1099 scrollbar_TotalWidth (), szHint.height);
1225 resize_scrollbar (); 1100 resize_scrollbar ();
1226 } 1101 }
1227 1102
1228 XMoveResizeWindow (disp, vt, 1103 XMoveResizeWindow (dpy, vt,
1229 window_vt_x, window_vt_y, 1104 window_vt_x, window_vt_y,
1230 width, height); 1105 width, height);
1231 1106
1232 scr_clear (); 1107 scr_clear ();
1233#ifdef XPM_BACKGROUND 1108#ifdef XPM_BACKGROUND
1234 resize_pixmap (); 1109 resize_pixmap ();
1235#endif 1110#endif
1236 } 1111 }
1237 1112
1238 if (fix_screen || old_height == 0) 1113 if (fix_screen || old_height == 0)
1239 {
1240 int curr_screen = -1;
1241 int old_ncol = prev_ncol;
1242
1243 /* scr_reset only works on the primary screen */
1244 if (old_height) /* this is not the first time through */
1245 {
1246 unsigned int ocol = ncol;
1247 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1248 curr_screen = scr_change_screen (PRIMARY);
1249 ncol = ocol;
1250 }
1251
1252 scr_reset (); 1114 scr_reset ();
1253 1115
1254 if (curr_screen >= 0) /* this is not the first time through */ 1116 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1255 { 1117 //scr_touch (false);
1256 scr_change_screen (curr_screen);
1257 selection_check (old_ncol != ncol ? 4 : 0);
1258 }
1259 }
1260
1261 old_width = szHint.width;
1262 old_height = szHint.height;
1263 1118
1264#ifdef XPM_BACKGROUND 1119#ifdef XPM_BACKGROUND
1265 if (pixmap) 1120 if (pixmap)
1266 scr_touch (false); 1121 scr_touch (false);
1267#endif 1122#endif
1268 1123
1269#ifdef USE_XIM 1124#ifdef USE_XIM
1270 IMSetStatusPosition (); 1125 IMSetPosition ();
1271#endif 1126#endif
1272} 1127}
1273 1128
1274/* 1129/*
1275 * Set the width/height of the vt window in characters. Units are pixels. 1130 * Set the width/height of the vt window in characters. Units are pixels.
… …
1280{ 1135{
1281 XWindowAttributes wattr; 1136 XWindowAttributes wattr;
1282 1137
1283 if (newwidth == 0 || newheight == 0) 1138 if (newwidth == 0 || newheight == 0)
1284 { 1139 {
1285 XGetWindowAttributes (display->display, display->root, &wattr); 1140 XGetWindowAttributes (dpy, display->root, &wattr);
1286 1141
1287 if (newwidth == 0) 1142 if (newwidth == 0)
1288 newwidth = wattr.width - szHint.base_width; 1143 newwidth = wattr.width - szHint.base_width;
1289 if (newheight == 0) 1144 if (newheight == 0)
1290 newheight = wattr.height - szHint.base_height; 1145 newheight = wattr.height - szHint.base_height;
… …
1304#ifdef USE_XIM 1159#ifdef USE_XIM
1305 1160
1306void 1161void
1307rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1162rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1308{ 1163{
1309 fg = pix_colors[Color_fg]; 1164 fg = pix_colors [Color_fg];
1310 bg = pix_colors[Color_bg]; 1165 bg = pix_colors [Color_bg];
1311} 1166}
1312 1167
1313void 1168void
1314rxvt_term::im_set_size (XRectangle &size) 1169rxvt_term::im_set_size (XRectangle &size)
1315{ 1170{
… …
1352 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1207 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1353 1208
1354 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1209 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1355 *p = '\0'; 1210 *p = '\0';
1356 1211
1357 atom = XInternAtom (display->display, server, False); 1212 atom = XInternAtom (dpy, server, False);
1358 win = XGetSelectionOwner (display->display, atom); 1213 win = XGetSelectionOwner (dpy, atom);
1359 1214
1360 if (win != None) 1215 if (win != None)
1361 return True; 1216 return True;
1362 } 1217 }
1363 1218
… …
1370 XPoint nspot; 1225 XPoint nspot;
1371 XVaNestedList preedit_attr; 1226 XVaNestedList preedit_attr;
1372 1227
1373 if (!Input_Context 1228 if (!Input_Context
1374 || !focus 1229 || !focus
1375 || !(input_style & XIMPreeditPosition)) 1230 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1376 return; 1231 return;
1377 1232
1378 im_set_position (nspot); 1233 im_set_position (nspot);
1379 1234
1380 if (nspot.x == spot.x && nspot.y == spot.y) 1235 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1399 input_method = 0; 1254 input_method = 0;
1400 } 1255 }
1401 1256
1402 Input_Context = 0; 1257 Input_Context = 0;
1403} 1258}
1259
1260#ifdef ENABLE_XIM_ONTHESPOT
1261
1262static void
1263xim_preedit_start (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_START, DT_END));
1267}
1268
1269static void
1270xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1271{
1272 ((rxvt_term *)client_data)->make_current ();
1273 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1274}
1275
1276static void
1277xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1278{
1279 rxvt_term *term = (rxvt_term *)client_data;
1280 XIMText *text = call_data->text;
1281
1282 term->make_current ();
1283
1284 if (text)
1285 {
1286 void *str;
1287
1288 if (!text->encoding_is_wchar && text->string.multi_byte)
1289 {
1290 // of course, X makes it ugly again
1291 if (term->rs[Rs_imLocale])
1292 SET_LOCALE (term->rs[Rs_imLocale]);
1293
1294 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1295 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1296
1297 if (term->rs[Rs_imLocale])
1298 SET_LOCALE (term->locale);
1299 }
1300 else
1301 str = (void *)text->string.wide_char;
1302
1303 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1304 DT_INT, call_data->caret,
1305 DT_INT, call_data->chg_first,
1306 DT_INT, call_data->chg_length,
1307 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1308 DT_WCS_LEN, str, str ? (int)text->length : 0,
1309 DT_END));
1310 }
1311 else
1312 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1313 DT_INT, call_data->caret,
1314 DT_INT, call_data->chg_first,
1315 DT_INT, call_data->chg_length,
1316 DT_END));
1317}
1318
1319#if 0
1320static void
1321xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1322{
1323 ((rxvt_term *)client_data)->make_current ();
1324 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1325 DT_INT, call_data->position,
1326 DT_INT, call_data->direction,
1327 DT_INT, call_data->style,
1328 DT_END));
1329}
1330#endif
1331
1332#endif
1404 1333
1405/* 1334/*
1406 * Try to open a XIM with the current modifiers, then see if we can 1335 * Try to open a XIM with the current modifiers, then see if we can
1407 * open a suitable preedit type 1336 * open a suitable preedit type
1408 */ 1337 */
… …
1415 XRectangle rect, status_rect, needed_rect; 1344 XRectangle rect, status_rect, needed_rect;
1416 unsigned long fg, bg; 1345 unsigned long fg, bg;
1417 const char *p; 1346 const char *p;
1418 char **s; 1347 char **s;
1419 XIMStyles *xim_styles; 1348 XIMStyles *xim_styles;
1349#ifdef ENABLE_XIM_ONTHESPOT
1350 XIMCallback xcb[4];
1351#endif
1420 1352
1421 set_environ (envv); 1353 set_environ (envv);
1422 1354
1423 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1355 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1424 return false; 1356 return false;
1425 1357
1426 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1427 input_method = display->get_xim (locale, modifiers); 1358 input_method = display->get_xim (locale, modifiers);
1428 if (input_method == NULL) 1359 if (input_method == NULL)
1429 return false; 1360 return false;
1430 1361
1431 xim = input_method->xim; 1362 xim = input_method->xim;
… …
1451 s = rxvt_splitcommastring (p); 1382 s = rxvt_splitcommastring (p);
1452 1383
1453 for (i = found = 0; !found && s[i]; i++) 1384 for (i = found = 0; !found && s[i]; i++)
1454 { 1385 {
1455 if (!strcmp (s[i], "OverTheSpot")) 1386 if (!strcmp (s[i], "OverTheSpot"))
1456 input_style = (XIMPreeditPosition | XIMStatusNothing); 1387 input_style = XIMPreeditPosition | XIMStatusNothing;
1457 else if (!strcmp (s[i], "OffTheSpot")) 1388 else if (!strcmp (s[i], "OffTheSpot"))
1458 input_style = (XIMPreeditArea | XIMStatusArea); 1389 input_style = XIMPreeditArea | XIMStatusArea;
1459 else if (!strcmp (s[i], "Root")) 1390 else if (!strcmp (s[i], "Root"))
1460 input_style = (XIMPreeditNothing | XIMStatusNothing); 1391 input_style = XIMPreeditNothing | XIMStatusNothing;
1461 else if (!strcmp (s[i], "None")) 1392 else if (!strcmp (s[i], "None"))
1462 input_style = (XIMPreeditNone | XIMStatusNone); 1393 input_style = XIMPreeditNone | XIMStatusNone;
1394#ifdef ENABLE_XIM_ONTHESPOT
1395 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1396 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1397#endif
1398 else
1399 input_style = XIMPreeditNothing | XIMStatusNothing;
1463 1400
1464 for (j = 0; j < xim_styles->count_styles; j++) 1401 for (j = 0; j < xim_styles->count_styles; j++)
1465 if (input_style == xim_styles->supported_styles[j]) 1402 if (input_style == xim_styles->supported_styles[j])
1466 { 1403 {
1467 rxvt_freecommastring (s); 1404 rxvt_freecommastring (s);
… …
1505 "*", 1442 "*",
1506 fheight, 1443 fheight,
1507 fheight + 1, fheight - 1, 1444 fheight + 1, fheight - 1,
1508 fheight - 2, fheight + 2); 1445 fheight - 2, fheight + 2);
1509 1446
1510 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1447 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1511 &missing_charset_list, &missing_charset_count, &def_string); 1448 &missing_charset_list, &missing_charset_count, &def_string);
1512 1449
1513 if (missing_charset_list) 1450 if (missing_charset_list)
1514 XFreeStringList (missing_charset_list); 1451 XFreeStringList (missing_charset_list);
1515 1452
… …
1556 XNBackground, bg, 1493 XNBackground, bg,
1557 XNArea, &status_rect, 1494 XNArea, &status_rect,
1558 XNFontSet, fs, 1495 XNFontSet, fs,
1559 NULL); 1496 NULL);
1560 } 1497 }
1498#if ENABLE_XIM_ONTHESPOT
1499 else if (input_style & XIMPreeditCallbacks)
1500 {
1501 im_set_position (spot);
1502
1503 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1504 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1505 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1506# if 0
1507 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1508# endif
1509
1510 preedit_attr = XVaCreateNestedList (0,
1511 XNSpotLocation, &spot,
1512 XNPreeditStartCallback, &xcb[0],
1513 XNPreeditDoneCallback , &xcb[1],
1514 XNPreeditDrawCallback , &xcb[2],
1515# if 0
1516 XNPreeditCaretCallback, &xcb[3],
1517# endif
1518 NULL);
1519 }
1520#endif
1561 1521
1562 Input_Context = XCreateIC (xim, 1522 Input_Context = XCreateIC (xim,
1563 XNInputStyle, input_style, 1523 XNInputStyle, input_style,
1564 XNClientWindow, vt, 1524 XNClientWindow, vt,
1565 XNFocusWindow, parent[0], 1525 XNFocusWindow, parent[0],
… …
1567 preedit_attr, 1527 preedit_attr,
1568 status_attr ? XNStatusAttributes : NULL, 1528 status_attr ? XNStatusAttributes : NULL,
1569 status_attr, NULL); 1529 status_attr, NULL);
1570 1530
1571 if (preedit_attr) XFree (preedit_attr); 1531 if (preedit_attr) XFree (preedit_attr);
1572 if (status_attr) XFree (status_attr); 1532 if (status_attr) XFree (status_attr);
1573 if (fs) XFreeFontSet (display->display, fs); 1533 if (fs) XFreeFontSet (dpy, fs);
1574 1534
1575 if (Input_Context == NULL) 1535 if (Input_Context == NULL)
1576 { 1536 {
1577 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1537 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1578 im_destroy (); 1538 im_destroy ();
1579 return false; 1539 return false;
1580 } 1540 }
1581 1541
1582 if (input_style & XIMPreeditArea) 1542#if 0
1543 // unfortunately, only the focus window is used by XIM, hard to fix
1544 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1545 vt_select_input ();
1546#endif
1547
1583 IMSetStatusPosition (); 1548 IMSetPosition ();
1584 1549
1585 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1586 return true; 1550 return true;
1587} 1551}
1588 1552
1589void 1553void
1590rxvt_term::im_cb () 1554rxvt_term::im_cb ()
… …
1596 1560
1597 make_current (); 1561 make_current ();
1598 1562
1599 im_destroy (); 1563 im_destroy ();
1600 1564
1601 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1602 if (Input_Context) 1565 if (Input_Context)
1603 return; 1566 return;
1604 1567
1605#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1568#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1606 if (rs[Rs_imLocale]) 1569 if (rs[Rs_imLocale])
… …
1648 SET_LOCALE (locale); 1611 SET_LOCALE (locale);
1649#endif 1612#endif
1650} 1613}
1651 1614
1652void 1615void
1653rxvt_term::IMSetStatusPosition () 1616rxvt_term::IMSetPosition ()
1654{ 1617{
1655 XRectangle preedit_rect, status_rect, *needed_rect; 1618 XRectangle preedit_rect, status_rect, *needed_rect;
1656 XVaNestedList preedit_attr, status_attr; 1619 XVaNestedList preedit_attr, status_attr;
1657 1620
1658 if (!Input_Context 1621 if (!Input_Context
1659 || !focus 1622 || !focus
1660 || !(input_style & XIMPreeditArea) 1623 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1661 || !IMisRunning ()) 1624 || !IMisRunning ())
1662 return; 1625 return;
1663 1626
1627 if (input_style & XIMPreeditPosition)
1628 {
1629 im_set_size (preedit_rect);
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631
1632 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, NULL);
1634 }
1635 else
1636 {
1664 /* Getting the necessary width of preedit area */ 1637 /* Getting the necessary width of preedit area */
1665 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1638 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1666 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1639 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1667 XFree (status_attr); 1640 XFree (status_attr);
1668 1641
1669 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1642 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1670 XFree (needed_rect); 1643 XFree (needed_rect);
1671 1644
1672 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1645 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1673 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1646 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1674 1647
1675 XSetICValues (Input_Context, 1648 XSetICValues (Input_Context,
1676 XNPreeditAttributes, preedit_attr, 1649 XNPreeditAttributes, preedit_attr,
1677 XNStatusAttributes, status_attr, NULL); 1650 XNStatusAttributes, status_attr,
1651 NULL);
1678 1652
1653 XFree (status_attr);
1654 }
1655
1679 XFree (preedit_attr); 1656 XFree (preedit_attr);
1680 XFree (status_attr);
1681} 1657}
1682#endif /* USE_XIM */ 1658#endif /* USE_XIM */
1683 1659
1684/*----------------------------------------------------------------------*/
1685rxvt_t rxvt_current_term;
1686
1687/*----------------------- end-of-file (C source) -----------------------*/ 1660/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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