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.184 by root, Tue Jan 17 12:22:59 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);
216#endif
217
218 delete pty; pty = 0; 204 delete pty; pty = 0;
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
514 pty = rxvt_new_ptytty ();
515 486
516 create_windows (argc, argv); 487 create_windows (argc, argv);
517 488
518 dDisp;
519
520 init_xlocale (); 489 init_xlocale ();
521 490
522 scr_reset (); // initialize screen 491 scr_reset (); // initialize screen
523 492
524#if 0 493#if 0
525 XSynchronize (disp, True); 494 XSynchronize (dpy, True);
526#endif 495#endif
527 496
528#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
529 if (OPTION (Opt_scrollBar)) 498 if (OPTION (Opt_scrollBar))
530 resize_scrollbar (); /* create and map scrollbar */ 499 resize_scrollbar (); /* create and map scrollbar */
531#endif 500#endif
532#ifdef TRANSPARENT 501#ifdef TRANSPARENT
533 if (OPTION (Opt_transparent)) 502 if (OPTION (Opt_transparent))
534 { 503 {
535 XSelectInput (disp, display->root, PropertyChangeMask); 504 XSelectInput (dpy, display->root, PropertyChangeMask);
536 check_our_parents (); 505 check_our_parents ();
537 rootwin_ev.start (display, display->root); 506 rootwin_ev.start (display, display->root);
538 } 507 }
539#endif 508#endif
540 509
541 XMapWindow (disp, vt);
542 XMapWindow (disp, parent[0]);
543
544 set_colorfgbg (); 510 set_colorfgbg ();
545 511
546 init_command (cmd_argv); 512 init_command (cmd_argv);
547 513
548 free (cmd_argv); 514 free (cmd_argv);
… …
552 518
553 check_ev.start (); 519 check_ev.start ();
554 520
555 HOOK_INVOKE ((this, HOOK_START, DT_END)); 521 HOOK_INVOKE ((this, HOOK_START, DT_END));
556 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
557 return true; 536 return true;
558} 537}
559 538
560static struct sig_handlers 539static struct sig_handlers
561{ 540{
562 sig_watcher sw_chld, sw_term, sw_int; 541 sig_watcher sw_term, sw_int;
563 542
564 void sig_chld (sig_watcher &w)
565 {
566 // we are being called for every SIGCHLD, find the corresponding term
567 int pid;
568
569 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
570 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
571 if (pid == (*t)->cmd_pid)
572 {
573 (*t)->child_exit ();
574 break;
575 }
576 }
577
578 /* 543 /*
579 * Catch a fatal signal and tidy up before quitting 544 * Catch a fatal signal and tidy up before quitting
580 */ 545 */
581 void 546 void
582 sig_term (sig_watcher &w) 547 sig_term (sig_watcher &w)
583 { 548 {
584#ifdef DEBUG_CMD
585 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
586#endif
587 rxvt_emergency_cleanup (); 549 rxvt_emergency_cleanup ();
588 signal (w.signum, SIG_DFL); 550 signal (w.signum, SIG_DFL);
589 kill (getpid (), w.signum); 551 kill (getpid (), w.signum);
590 } 552 }
591 553
592 sig_handlers () 554 sig_handlers ()
593 : sw_chld (this, &sig_handlers::sig_chld),
594 sw_term (this, &sig_handlers::sig_term), 555 : sw_term (this, &sig_handlers::sig_term),
595 sw_int (this, &sig_handlers::sig_term) 556 sw_int (this, &sig_handlers::sig_term)
596 { 557 {
597 } 558 }
598} sig_handlers; 559} sig_handlers;
599 560
600char **rxvt_environ; // startup environment 561char **rxvt_environ; // startup environment
601 562
602void 563void
603rxvt_init () 564rxvt_init ()
604{ 565{
566 ptytty::init ();
567
605 rxvt_environ = environ; 568 rxvt_environ = environ;
606
607 /*
608 * Save and then give up any super-user privileges
609 * If we need privileges in any area then we must specifically request it.
610 * We should only need to be root in these cases:
611 * 1. write utmp entries on some systems
612 * 2. chown tty on some systems
613 */
614 rxvt_privileges (SAVE);
615 rxvt_privileges (IGNORE);
616 569
617 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
618 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
619 572
620 sig_handlers.sw_chld.start (SIGCHLD);
621 sig_handlers.sw_term.start (SIGTERM); 573 sig_handlers.sw_term.start (SIGTERM);
622 sig_handlers.sw_int.start (SIGINT); 574 sig_handlers.sw_int.start (SIGINT);
623 575
624 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 576 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
625 /* signal (SIGURG, SIG_DFL); */ 577 /* signal (SIGURG, SIG_DFL); */
… …
654 rxvt_fatal ("memory allocation failure. aborting.\n"); 606 rxvt_fatal ("memory allocation failure. aborting.\n");
655 607
656 return p; 608 return p;
657} 609}
658 610
659void * 611void *
660rxvt_realloc (void *ptr, size_t size) 612rxvt_realloc (void *ptr, size_t size)
661{ 613{
662 void *p = realloc (ptr, size); 614 void *p = realloc (ptr, size);
663 615
664 if (!p) 616 if (!p)
665 rxvt_fatal ("memory allocation failure. aborting.\n"); 617 rxvt_fatal ("memory allocation failure. aborting.\n");
666 618
667 return p; 619 return p;
668} 620}
669
670/* ------------------------------------------------------------------------- *
671 * PRIVILEGED OPERATIONS *
672 * ------------------------------------------------------------------------- */
673/* take care of suid/sgid super-user (root) privileges */
674void
675rxvt_privileges (rxvt_privaction action)
676{
677#if ! defined(__CYGWIN32__)
678# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
679 /* setreuid () is the poor man's setuid (), seteuid () */
680# define seteuid(a) setreuid(-1, (a))
681# define setegid(a) setregid(-1, (a))
682# define HAVE_SETEUID
683# endif
684# ifdef HAVE_SETEUID
685 switch (action)
686 {
687 case IGNORE:
688 /*
689 * change effective uid/gid - not real uid/gid - so we can switch
690 * back to root later, as required
691 */
692 setegid (getgid ());
693 seteuid (getuid ());
694 break;
695 case SAVE:
696 saved_egid = getegid ();
697 saved_euid = geteuid ();
698 break;
699 case RESTORE:
700 setegid (saved_egid);
701 seteuid (saved_euid);
702 break;
703 }
704# else
705 switch (action)
706 {
707 case IGNORE:
708 setgid (getgid ());
709 setuid (getuid ());
710 /* FALLTHROUGH */
711 case SAVE:
712 /* FALLTHROUGH */
713 case RESTORE:
714 break;
715 }
716# endif
717#endif
718}
719
720#ifdef UTMP_SUPPORT
721void
722rxvt_term::privileged_utmp (rxvt_privaction action)
723{
724 if (OPTION (Opt_utmpInhibit))
725 return;
726
727 rxvt_privileges (RESTORE);
728
729 if (action == SAVE)
730 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
731 else
732 pty->logout ();
733
734 rxvt_privileges (IGNORE);
735}
736#endif
737 621
738/*----------------------------------------------------------------------*/ 622/*----------------------------------------------------------------------*/
739/* 623/*
740 * window size/position calculcations for XSizeHint and other storage. 624 * window size/position calculcations for XSizeHint and other storage.
741 * if width/height are non-zero then override calculated width/height 625 * if width/height are non-zero then override calculated width/height
… …
745{ 629{
746 short recalc_x, recalc_y; 630 short recalc_x, recalc_y;
747 int x, y, sb_w, flags; 631 int x, y, sb_w, flags;
748 unsigned int w, h; 632 unsigned int w, h;
749 unsigned int max_width, max_height; 633 unsigned int max_width, max_height;
750 dDisp;
751
752 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
753 ncol, nrow, szHint.width, szHint.height));
754 634
755 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 635 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
756 szHint.win_gravity = NorthWestGravity; 636 szHint.win_gravity = NorthWestGravity;
757 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 637 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
758 638
… …
820 700
821 if (scrollBar.state) 701 if (scrollBar.state)
822 { 702 {
823 sb_w = scrollbar_TotalWidth (); 703 sb_w = scrollbar_TotalWidth ();
824 szHint.base_width += sb_w; 704 szHint.base_width += sb_w;
705
825 if (!OPTION (Opt_scrollBar_right)) 706 if (!OPTION (Opt_scrollBar_right))
826 window_vt_x += sb_w; 707 window_vt_x += sb_w;
827 } 708 }
828 709
829 szHint.width_inc = fwidth; 710 szHint.width_inc = fwidth;
830 szHint.height_inc = fheight; 711 szHint.height_inc = fheight;
831 szHint.min_width = szHint.base_width + szHint.width_inc; 712 szHint.min_width = szHint.base_width + szHint.width_inc;
832 szHint.min_height = szHint.base_height + szHint.height_inc; 713 szHint.min_height = szHint.base_height + szHint.height_inc;
833 714
834 if (newwidth && newwidth - szHint.base_width < max_width) 715 if (newwidth && newwidth - szHint.base_width < max_width)
835 { 716 {
836 szHint.width = newwidth; 717 szHint.width = newwidth;
… …
855 736
856 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 737 if (scrollBar.state && OPTION (Opt_scrollBar_right))
857 window_sb_x = szHint.width - sb_w; 738 window_sb_x = szHint.width - sb_w;
858 739
859 if (recalc_x) 740 if (recalc_x)
860 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742
861 if (recalc_y) 743 if (recalc_y)
862 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 744 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
863 745
864 ncol = width / fwidth; 746 ncol = width / fwidth;
865 nrow = height / fheight; 747 nrow = height / fheight;
866 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
867 ncol, nrow, szHint.width,
868 szHint.height));
869 return;
870} 748}
871 749
872/*----------------------------------------------------------------------*/ 750/*----------------------------------------------------------------------*/
873/* 751/*
874 * Tell the teletype handler what size the window is. 752 * Tell the teletype handler what size the window is.
… …
974 return true; 852 return true;
975} 853}
976 854
977void 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)
978{ 856{
979 XChangeProperty (display->display, parent[0], 857 XChangeProperty (dpy, parent[0],
980 prop, XA_STRING, 8, PropModeReplace, 858 prop, XA_STRING, 8, PropModeReplace,
981 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 859 (const unsigned char *)str, len >= 0 ? len : strlen (str));
982} 860}
983 861
984void 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)
985{ 863{
986 wchar_t *ws = rxvt_mbstowcs (str, len); 864 wchar_t *ws = rxvt_mbstowcs (str, len);
987 char *s = rxvt_wcstoutf8 (ws); 865 char *s = rxvt_wcstoutf8 (ws);
988 866
989 XChangeProperty (display->display, parent[0], 867 XChangeProperty (dpy, parent[0],
990 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 868 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
991 (const unsigned char *)s, strlen (s)); 869 (const unsigned char *)s, strlen (s));
992 870
993 free (s); 871 free (s);
994 free (ws); 872 free (ws);
… …
1019void 897void
1020rxvt_term::set_window_color (int idx, const char *color) 898rxvt_term::set_window_color (int idx, const char *color)
1021{ 899{
1022 rxvt_color xcol; 900 rxvt_color xcol;
1023 int i; 901 int i;
1024 902
1025 if (color == NULL || *color == '\0') 903 if (color == NULL || *color == '\0')
1026 return; 904 return;
905
906 color = strdup (color);
907 allocated.push_back ((void *)color);
908 rs[Rs_color + idx] = color;
1027 909
1028 /* handle color aliases */ 910 /* handle color aliases */
1029 if (isdigit (*color)) 911 if (isdigit (*color))
1030 { 912 {
1031 i = atoi (color); 913 i = atoi (color);
1032 914
1033 if (i >= 8 && i <= 15) 915 if (i >= 8 && i <= 15)
1034 { /* bright colors */ 916 { /* bright colors */
1035 i -= 8; 917 i -= 8;
1036 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1037 SET_PIXCOLOR (idx);
1038 goto done; 919 goto done;
1039 } 920 }
1040 921
1041 if (i >= 0 && i <= 7) 922 if (i >= 0 && i <= 7)
1042 { /* normal colors */ 923 { /* normal colors */
1043 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 924 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1044 SET_PIXCOLOR (idx);
1045 goto done; 925 goto done;
1046 } 926 }
1047 } 927 }
1048 928
1049 if (!rXParseAllocColor (&xcol, color)) 929 set_color (xcol, color);
1050 return;
1051
1052 /* XStoreColor (display->display, display->cmap, XColor*); */
1053 930
1054 /* 931 /*
1055 * 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,
1056 * so just keep gobbling up the colormap 933 * so just keep gobbling up the colormap
1057 */ 934 */
1058# if 0
1059 for (i = Color_Black; i <= Color_White; i++)
1060 if (pix_colors[idx] == pix_colors[i])
1061 break;
1062 if (i > Color_White)
1063 {
1064 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1065 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1066 DisplayPlanes (display->display, display->screen));
1067 }
1068# endif
1069 935
1070 pix_colors_focused[idx] = xcol; 936 pix_colors_focused[idx] = xcol;
1071 SET_PIXCOLOR (idx);
1072 937
1073 /* XSetWindowAttributes attr; */ 938 /* XSetWindowAttributes attr; */
1074 /* Cursor cursor; */ 939 /* Cursor cursor; */
1075done: 940done:
1076 941
1077#if OFF_FOCUS_FADING 942#if OFF_FOCUS_FADING
1078 if (rs[Rs_fade]) 943 if (rs[Rs_fade])
1079 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 }
1080#endif 949#endif
1081 950
1082 /*TODO: handle Color_BD, scrollbar background, etc. */ 951 /*TODO: handle Color_BD, scrollbar background, etc. */
1083 952
1084 recolour_cursor (); 953 recolour_cursor ();
… …
1090#endif /* XTERM_COLOR_CHANGE */ 959#endif /* XTERM_COLOR_CHANGE */
1091 960
1092void 961void
1093rxvt_term::recolour_cursor () 962rxvt_term::recolour_cursor ()
1094{ 963{
1095 XColor xcol[2]; 964 XColor fg, bg;
1096 965
1097 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 966 (ISSET_PIXCOLOR (Color_pointer_fg)
1098 ? pix_colors_focused[Color_pointer_fg] 967 ? pix_colors_focused[Color_pointer_fg]
1099 : pix_colors_focused[Color_fg]; 968 : pix_colors_focused[Color_fg]).get (fg);
969
1100 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 970 (ISSET_PIXCOLOR (Color_pointer_bg)
1101 ? pix_colors_focused[Color_pointer_bg] 971 ? pix_colors_focused[Color_pointer_bg]
1102 : pix_colors_focused[Color_bg]; 972 : pix_colors_focused[Color_bg]).get (bg);
1103 973
1104 XQueryColors (display->display, display->cmap, xcol, 2); 974 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1105 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1106} 975}
1107 976
1108/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
1109/* 978/*
1110 * 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
… …
1114{ 983{
1115 unsigned int i; 984 unsigned int i;
1116 const char *xpmb = "\0"; 985 const char *xpmb = "\0";
1117 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 986 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1118 987
1119 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1120 strcpy (fstr, "default"); 988 strcpy (fstr, "default");
1121 strcpy (bstr, "default"); 989 strcpy (bstr, "default");
1122 for (i = Color_Black; i <= Color_White; i++) 990 for (i = Color_Black; i <= Color_White; i++)
1123 if (pix_colors[Color_fg] == pix_colors[i]) 991 if (pix_colors[Color_fg] == pix_colors[i])
1124 { 992 {
… …
1139 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1007 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1140} 1008}
1141 1009
1142/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
1143 1011
1144int 1012bool
1145rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1013rxvt_term::set_color (rxvt_color &color, const char *name)
1146{ 1014{
1147 if (!screen_in_out->set (display, colour)) 1015 if (color.set (this, name))
1148 {
1149 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1150 return false;
1151 }
1152
1153 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]);
1154} 1026}
1155 1027
1156/* -------------------------------------------------------------------- * 1028/* -------------------------------------------------------------------- *
1157 * - WINDOW RESIZING - * 1029 * - WINDOW RESIZING - *
1158 * -------------------------------------------------------------------- */ 1030 * -------------------------------------------------------------------- */
1159void 1031void
1160rxvt_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)
1161{ 1033{
1162 int fix_screen; 1034 int fix_screen;
1163 int old_width = szHint.width, old_height = szHint.height; 1035 int old_width = szHint.width;
1164 dDisp; 1036 int old_height = szHint.height;
1165 1037
1166 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)))
1167 XSetWMNormalHints (disp, parent[0], &szHint); 1041 XSetWMNormalHints (dpy, parent[0], &szHint);
1168 1042
1169 if (!ignoreparent) 1043 if (!ignoreparent)
1170 { 1044 {
1171#ifdef SMART_RESIZE 1045#ifdef SMART_RESIZE
1172 /* 1046 /*
… …
1176 int x, y, x1, y1; 1050 int x, y, x1, y1;
1177 int dx, dy; 1051 int dx, dy;
1178 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1179 Window unused_cr; 1053 Window unused_cr;
1180 1054
1181 XTranslateCoordinates (disp, parent[0], display->root, 1055 XTranslateCoordinates (dpy, parent[0], display->root,
1182 0, 0, &x, &y, &unused_cr); 1056 0, 0, &x, &y, &unused_cr);
1183 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1057 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1184 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1185 /* 1059 /*
1186 * 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
1187 * our position for handles and decorations. Counter it 1061 * our position for handles and decorations. Counter it
1188 */ 1062 */
… …
1190 { 1064 {
1191 x -= x1; 1065 x -= x1;
1192 y -= y1; 1066 y -= y1;
1193 } 1067 }
1194 1068
1195 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1069 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1196 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1070 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1197 dx = old_width - szHint.width; 1071 dx = old_width - szHint.width;
1198 dy = old_height - szHint.height; 1072 dy = old_height - szHint.height;
1199 1073
1200 /* Check position of the center of the window */ 1074 /* Check position of the center of the window */
1201 if (x < x1) /* left half */ 1075 if (x < x1) /* left half */
1202 dx = 0; 1076 dx = 0;
… …
1205 if (y < y1) /* top half */ 1079 if (y < y1) /* top half */
1206 dy = 0; 1080 dy = 0;
1207 else if (y == y1) /* exact center */ 1081 else if (y == y1) /* exact center */
1208 dy /= 2; 1082 dy /= 2;
1209 1083
1210 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1084 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1211 szHint.width, szHint.height); 1085 szHint.width, szHint.height);
1212#else 1086#else
1213 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1087 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1214#endif 1088#endif
1215 } 1089 }
1216 1090
1217 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1218 1092
1219 if (fix_screen || newwidth != old_width || newheight != old_height) 1093 if (fix_screen || newwidth != old_width || newheight != old_height)
1220 { 1094 {
1221 if (scrollBar.state) 1095 if (scrollBar.state)
1222 { 1096 {
1223 XMoveResizeWindow (disp, scrollBar.win, 1097 XMoveResizeWindow (dpy, scrollBar.win,
1224 window_sb_x, 0, 1098 window_sb_x, 0,
1225 scrollbar_TotalWidth (), szHint.height); 1099 scrollbar_TotalWidth (), szHint.height);
1226 resize_scrollbar (); 1100 resize_scrollbar ();
1227 } 1101 }
1228 1102
1229 XMoveResizeWindow (disp, vt, 1103 XMoveResizeWindow (dpy, vt,
1230 window_vt_x, window_vt_y, 1104 window_vt_x, window_vt_y,
1231 width, height); 1105 width, height);
1232 1106
1233 scr_clear (); 1107 scr_clear ();
1234#ifdef XPM_BACKGROUND 1108#ifdef XPM_BACKGROUND
1235 resize_pixmap (); 1109 resize_pixmap ();
1236#endif 1110#endif
1237 } 1111 }
1238 1112
1239 if (fix_screen || old_height == 0) 1113 if (fix_screen || old_height == 0)
1240 {
1241 int curr_screen = -1;
1242 int old_ncol = prev_ncol;
1243
1244 /* scr_reset only works on the primary screen */
1245 if (old_height) /* this is not the first time through */
1246 {
1247 unsigned int ocol = ncol;
1248 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1249 curr_screen = scr_change_screen (PRIMARY);
1250 ncol = ocol;
1251 }
1252
1253 scr_reset (); 1114 scr_reset ();
1254 1115
1255 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
1256 { 1117 //scr_touch (false);
1257 scr_change_screen (curr_screen);
1258 selection_check (old_ncol != ncol ? 4 : 0);
1259 }
1260 }
1261
1262 old_width = szHint.width;
1263 old_height = szHint.height;
1264 1118
1265#ifdef XPM_BACKGROUND 1119#ifdef XPM_BACKGROUND
1266 if (pixmap) 1120 if (pixmap)
1267 scr_touch (false); 1121 scr_touch (false);
1268#endif 1122#endif
1269 1123
1270#ifdef USE_XIM 1124#ifdef USE_XIM
1271 IMSetStatusPosition (); 1125 IMSetPosition ();
1272#endif 1126#endif
1273} 1127}
1274 1128
1275/* 1129/*
1276 * 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.
… …
1281{ 1135{
1282 XWindowAttributes wattr; 1136 XWindowAttributes wattr;
1283 1137
1284 if (newwidth == 0 || newheight == 0) 1138 if (newwidth == 0 || newheight == 0)
1285 { 1139 {
1286 XGetWindowAttributes (display->display, display->root, &wattr); 1140 XGetWindowAttributes (dpy, display->root, &wattr);
1287 1141
1288 if (newwidth == 0) 1142 if (newwidth == 0)
1289 newwidth = wattr.width - szHint.base_width; 1143 newwidth = wattr.width - szHint.base_width;
1290 if (newheight == 0) 1144 if (newheight == 0)
1291 newheight = wattr.height - szHint.base_height; 1145 newheight = wattr.height - szHint.base_height;
… …
1305#ifdef USE_XIM 1159#ifdef USE_XIM
1306 1160
1307void 1161void
1308rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1162rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1309{ 1163{
1310 fg = pix_colors[Color_fg]; 1164 fg = pix_colors [Color_fg];
1311 bg = pix_colors[Color_bg]; 1165 bg = pix_colors [Color_bg];
1312} 1166}
1313 1167
1314void 1168void
1315rxvt_term::im_set_size (XRectangle &size) 1169rxvt_term::im_set_size (XRectangle &size)
1316{ 1170{
… …
1353 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1207 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1354 1208
1355 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1209 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1356 *p = '\0'; 1210 *p = '\0';
1357 1211
1358 atom = XInternAtom (display->display, server, False); 1212 atom = XInternAtom (dpy, server, False);
1359 win = XGetSelectionOwner (display->display, atom); 1213 win = XGetSelectionOwner (dpy, atom);
1360 1214
1361 if (win != None) 1215 if (win != None)
1362 return True; 1216 return True;
1363 } 1217 }
1364 1218
… …
1371 XPoint nspot; 1225 XPoint nspot;
1372 XVaNestedList preedit_attr; 1226 XVaNestedList preedit_attr;
1373 1227
1374 if (!Input_Context 1228 if (!Input_Context
1375 || !focus 1229 || !focus
1376 || !(input_style & XIMPreeditPosition)) 1230 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1377 return; 1231 return;
1378 1232
1379 im_set_position (nspot); 1233 im_set_position (nspot);
1380 1234
1381 if (nspot.x == spot.x && nspot.y == spot.y) 1235 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1400 input_method = 0; 1254 input_method = 0;
1401 } 1255 }
1402 1256
1403 Input_Context = 0; 1257 Input_Context = 0;
1404} 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
1405 1333
1406/* 1334/*
1407 * 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
1408 * open a suitable preedit type 1336 * open a suitable preedit type
1409 */ 1337 */
… …
1416 XRectangle rect, status_rect, needed_rect; 1344 XRectangle rect, status_rect, needed_rect;
1417 unsigned long fg, bg; 1345 unsigned long fg, bg;
1418 const char *p; 1346 const char *p;
1419 char **s; 1347 char **s;
1420 XIMStyles *xim_styles; 1348 XIMStyles *xim_styles;
1349#ifdef ENABLE_XIM_ONTHESPOT
1350 XIMCallback xcb[4];
1351#endif
1421 1352
1422 set_environ (envv); 1353 set_environ (envv);
1423 1354
1424 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1355 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1425 return false; 1356 return false;
1426 1357
1427 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1428 input_method = display->get_xim (locale, modifiers); 1358 input_method = display->get_xim (locale, modifiers);
1429 if (input_method == NULL) 1359 if (input_method == NULL)
1430 return false; 1360 return false;
1431 1361
1432 xim = input_method->xim; 1362 xim = input_method->xim;
… …
1452 s = rxvt_splitcommastring (p); 1382 s = rxvt_splitcommastring (p);
1453 1383
1454 for (i = found = 0; !found && s[i]; i++) 1384 for (i = found = 0; !found && s[i]; i++)
1455 { 1385 {
1456 if (!strcmp (s[i], "OverTheSpot")) 1386 if (!strcmp (s[i], "OverTheSpot"))
1457 input_style = (XIMPreeditPosition | XIMStatusNothing); 1387 input_style = XIMPreeditPosition | XIMStatusNothing;
1458 else if (!strcmp (s[i], "OffTheSpot")) 1388 else if (!strcmp (s[i], "OffTheSpot"))
1459 input_style = (XIMPreeditArea | XIMStatusArea); 1389 input_style = XIMPreeditArea | XIMStatusArea;
1460 else if (!strcmp (s[i], "Root")) 1390 else if (!strcmp (s[i], "Root"))
1461 input_style = (XIMPreeditNothing | XIMStatusNothing); 1391 input_style = XIMPreeditNothing | XIMStatusNothing;
1462 else if (!strcmp (s[i], "None")) 1392 else if (!strcmp (s[i], "None"))
1463 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;
1464 1400
1465 for (j = 0; j < xim_styles->count_styles; j++) 1401 for (j = 0; j < xim_styles->count_styles; j++)
1466 if (input_style == xim_styles->supported_styles[j]) 1402 if (input_style == xim_styles->supported_styles[j])
1467 { 1403 {
1468 rxvt_freecommastring (s); 1404 rxvt_freecommastring (s);
… …
1506 "*", 1442 "*",
1507 fheight, 1443 fheight,
1508 fheight + 1, fheight - 1, 1444 fheight + 1, fheight - 1,
1509 fheight - 2, fheight + 2); 1445 fheight - 2, fheight + 2);
1510 1446
1511 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1447 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1512 &missing_charset_list, &missing_charset_count, &def_string); 1448 &missing_charset_list, &missing_charset_count, &def_string);
1513 1449
1514 if (missing_charset_list) 1450 if (missing_charset_list)
1515 XFreeStringList (missing_charset_list); 1451 XFreeStringList (missing_charset_list);
1516 1452
… …
1557 XNBackground, bg, 1493 XNBackground, bg,
1558 XNArea, &status_rect, 1494 XNArea, &status_rect,
1559 XNFontSet, fs, 1495 XNFontSet, fs,
1560 NULL); 1496 NULL);
1561 } 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
1562 1521
1563 Input_Context = XCreateIC (xim, 1522 Input_Context = XCreateIC (xim,
1564 XNInputStyle, input_style, 1523 XNInputStyle, input_style,
1565 XNClientWindow, vt, 1524 XNClientWindow, vt,
1566 XNFocusWindow, parent[0], 1525 XNFocusWindow, parent[0],
… …
1568 preedit_attr, 1527 preedit_attr,
1569 status_attr ? XNStatusAttributes : NULL, 1528 status_attr ? XNStatusAttributes : NULL,
1570 status_attr, NULL); 1529 status_attr, NULL);
1571 1530
1572 if (preedit_attr) XFree (preedit_attr); 1531 if (preedit_attr) XFree (preedit_attr);
1573 if (status_attr) XFree (status_attr); 1532 if (status_attr) XFree (status_attr);
1574 if (fs) XFreeFontSet (display->display, fs); 1533 if (fs) XFreeFontSet (dpy, fs);
1575 1534
1576 if (Input_Context == NULL) 1535 if (Input_Context == NULL)
1577 { 1536 {
1578 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1537 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1579 im_destroy (); 1538 im_destroy ();
1580 return false; 1539 return false;
1581 } 1540 }
1582 1541
1583 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
1584 IMSetStatusPosition (); 1548 IMSetPosition ();
1585 1549
1586 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1587 return true; 1550 return true;
1588} 1551}
1589 1552
1590void 1553void
1591rxvt_term::im_cb () 1554rxvt_term::im_cb ()
… …
1597 1560
1598 make_current (); 1561 make_current ();
1599 1562
1600 im_destroy (); 1563 im_destroy ();
1601 1564
1602 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1603 if (Input_Context) 1565 if (Input_Context)
1604 return; 1566 return;
1605 1567
1606#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1568#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1607 if (rs[Rs_imLocale]) 1569 if (rs[Rs_imLocale])
… …
1649 SET_LOCALE (locale); 1611 SET_LOCALE (locale);
1650#endif 1612#endif
1651} 1613}
1652 1614
1653void 1615void
1654rxvt_term::IMSetStatusPosition () 1616rxvt_term::IMSetPosition ()
1655{ 1617{
1656 XRectangle preedit_rect, status_rect, *needed_rect; 1618 XRectangle preedit_rect, status_rect, *needed_rect;
1657 XVaNestedList preedit_attr, status_attr; 1619 XVaNestedList preedit_attr, status_attr;
1658 1620
1659 if (!Input_Context 1621 if (!Input_Context
1660 || !focus 1622 || !focus
1661 || !(input_style & XIMPreeditArea) 1623 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1662 || !IMisRunning ()) 1624 || !IMisRunning ())
1663 return; 1625 return;
1664 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 {
1665 /* Getting the necessary width of preedit area */ 1637 /* Getting the necessary width of preedit area */
1666 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1638 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1667 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1639 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1668 XFree (status_attr); 1640 XFree (status_attr);
1669 1641
1670 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1642 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1671 XFree (needed_rect); 1643 XFree (needed_rect);
1672 1644
1673 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1645 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1674 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1646 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1675 1647
1676 XSetICValues (Input_Context, 1648 XSetICValues (Input_Context,
1677 XNPreeditAttributes, preedit_attr, 1649 XNPreeditAttributes, preedit_attr,
1678 XNStatusAttributes, status_attr, NULL); 1650 XNStatusAttributes, status_attr,
1651 NULL);
1679 1652
1653 XFree (status_attr);
1654 }
1655
1680 XFree (preedit_attr); 1656 XFree (preedit_attr);
1681 XFree (status_attr);
1682} 1657}
1683#endif /* USE_XIM */ 1658#endif /* USE_XIM */
1684 1659
1685/*----------------------------------------------------------------------*/
1686rxvt_t rxvt_current_term;
1687
1688/*----------------------- end-of-file (C source) -----------------------*/ 1660/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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