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

Diff Legend

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