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.209 by root, Mon Jan 30 20:12:37 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
215 privileged_utmp (RESTORE);
216#endif
217
218 delete pty; pty = 0; 203 delete pty; pty = 0;
219} 204}
220 205
221rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
222{ 207{
223 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
224
225 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
226 209
227 emergency_cleanup (); 210 emergency_cleanup ();
228 211
229#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
233#endif 216#endif
234 delete fontset[0]; 217 delete fontset[0];
235 218
236 if (display) 219 if (display)
237 { 220 {
238 dDisp;
239
240 selection_clear (); 221 selection_clear ();
241 222
242#ifdef USE_XIM 223#ifdef USE_XIM
243 im_destroy (); 224 im_destroy ();
244#endif 225#endif
245#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
246 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
247 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
248#endif 229#endif
249#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
250 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
251#endif 232#endif
252#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
253 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (xdisp, blackGC);
254 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (xdisp, whiteGC);
255 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (xdisp, grayGC);
256 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (xdisp, darkGC);
257 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (xdisp, stippleGC);
258 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (xdisp, dimple);
259 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (xdisp, upArrow);
260 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (xdisp, downArrow);
261 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
262 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
263#endif 244#endif
264#ifdef RXVT_SCROLLBAR 245#ifdef RXVT_SCROLLBAR
265 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
266 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
267 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
268#endif 249#endif
269 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (xdisp, gc);
270 251
271 delete drawable; 252 delete drawable;
272 // destroy all windows 253 // destroy all windows
273 if (parent[0]) 254 if (parent[0])
274 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (xdisp, parent[0]);
256
257 clear ();
275 } 258 }
276 259
277 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
278 delete pix_colors_focused; 261 delete pix_colors_focused;
279#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
… …
288 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 272 free (allocated [i]);
290 273
291 free (selection.text); 274 free (selection.text);
292 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
293 free (env_windowid);
294 free (env_display); 276 free (env_display);
295 free (env_term); 277 free (env_term);
296 free (env_colorfgbg);
297 free (locale); 278 free (locale);
298 free (v_buffer); 279 free (v_buffer);
299 free (incr_buf); 280 free (incr_buf);
300 281
301 delete envv; 282 delete envv;
… …
304#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
305 delete keyboard; 286 delete keyboard;
306#endif 287#endif
307} 288}
308 289
290// child has exited, usually destroys
309void 291void
310rxvt_term::child_exit () 292rxvt_term::child_cb (child_watcher &w, int status)
311{ 293{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295
312 cmd_pid = 0; 296 cmd_pid = 0;
313 297
314 if (!OPTION (Opt_hold)) 298 if (!OPTION (Opt_hold))
315 destroy (); 299 destroy ();
316} 300}
… …
318void 302void
319rxvt_term::destroy () 303rxvt_term::destroy ()
320{ 304{
321 if (destroy_ev.active) 305 if (destroy_ev.active)
322 return; 306 return;
307
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323 309
324#if ENABLE_OVERLAY 310#if ENABLE_OVERLAY
325 scr_overlay_off (); 311 scr_overlay_off ();
326#endif 312#endif
327 313
… …
382{ 368{
383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
384 (*t)->emergency_cleanup (); 370 (*t)->emergency_cleanup ();
385} 371}
386 372
387#if ENABLE_FRILLS 373#if !ENABLE_MINIMAL
388static void 374static void
389print_x_error (Display *dpy, XErrorEvent *event) 375print_x_error (Display *dpy, XErrorEvent *event)
390{ 376{
391 char buffer[BUFSIZ]; 377 char buffer[BUFSIZ];
392 char mesg[BUFSIZ]; 378 char mesg[BUFSIZ];
… …
440 GET_R->allowedxerror = event->error_code; 426 GET_R->allowedxerror = event->error_code;
441 else 427 else
442 { 428 {
443 // GET_R is most likely not the terminal which caused the error, 429 // GET_R is most likely not the terminal which caused the error,
444 // so just output the error and continue 430 // so just output the error and continue
445#if ENABLE_FRILLS 431#if ENABLE_MINIMAL
432 old_xerror_handler (display, event);
433#else
446 print_x_error (display, event); 434 print_x_error (display, event);
447#else
448 old_xerror_handler (display, event);
449#endif 435#endif
450 } 436 }
451 437
452 return 0; 438 return 0;
453} 439}
… …
461 _exit (EXIT_FAILURE); 447 _exit (EXIT_FAILURE);
462} 448}
463 449
464/*----------------------------------------------------------------------*/ 450/*----------------------------------------------------------------------*/
465bool 451bool
466rxvt_term::init (int argc, const char *const *argv) 452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
467{ 453{
454 this->envv = envv;
455
468 SET_R (this); 456 SET_R (this);
469 set_locale (""); 457 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :( 458 set_environ (envv); // few things in X do not call setlocale :(
471 459
472 if (!init_vars ()) 460 if (!init_vars ())
… …
483#ifdef HAVE_SCROLLBARS 471#ifdef HAVE_SCROLLBARS
484 if (OPTION (Opt_scrollBar)) 472 if (OPTION (Opt_scrollBar))
485 scrollBar.setIdle (); /* set existence for size calculations */ 473 scrollBar.setIdle (); /* set existence for size calculations */
486#endif 474#endif
487 475
488#if ENABLE_PERL 476 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 477
516 create_windows (argc, argv); 478 create_windows (argc, argv);
517 479
518 dDisp;
519
520 init_xlocale (); 480 init_xlocale ();
521 481
522 scr_reset (); // initialize screen 482 scr_reset (); // initialize screen
523 483
524#if 0 484#if 0
525 XSynchronize (disp, True); 485 XSynchronize (xdisp, True);
526#endif 486#endif
527 487
528#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
529 if (OPTION (Opt_scrollBar)) 489 if (OPTION (Opt_scrollBar))
530 resize_scrollbar (); /* create and map scrollbar */ 490 resize_scrollbar (); /* create and map scrollbar */
531#endif 491#endif
532#ifdef TRANSPARENT 492#ifdef TRANSPARENT
533 if (OPTION (Opt_transparent)) 493 if (OPTION (Opt_transparent))
534 { 494 {
535 XSelectInput (disp, display->root, PropertyChangeMask); 495 XSelectInput (xdisp, display->root, PropertyChangeMask);
536 check_our_parents (); 496 check_our_parents ();
537 rootwin_ev.start (display, display->root); 497 rootwin_ev.start (display, display->root);
538 } 498 }
539#endif 499#endif
540 500
541 XMapWindow (disp, vt);
542 XMapWindow (disp, parent[0]);
543
544 set_colorfgbg (); 501 set_colorfgbg ();
545 502
546 init_command (cmd_argv); 503 init_command (cmd_argv);
547 504
548 free (cmd_argv); 505 free (cmd_argv);
… …
552 509
553 check_ev.start (); 510 check_ev.start ();
554 511
555 HOOK_INVOKE ((this, HOOK_START, DT_END)); 512 HOOK_INVOKE ((this, HOOK_START, DT_END));
556 513
514#if ENABLE_XEMBED
515 if (rs[Rs_embed])
516 {
517 long info[2] = { 0, XEMBED_MAPPED };
518
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2);
521 }
522#endif
523
524 XMapWindow (xdisp, vt);
525 XMapWindow (xdisp, parent[0]);
526
557 return true; 527 return true;
558} 528}
559 529
560static struct sig_handlers 530static struct sig_handlers
561{ 531{
562 sig_watcher sw_chld, sw_term, sw_int; 532 sig_watcher sw_term, sw_int;
563 533
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 /* 534 /*
579 * Catch a fatal signal and tidy up before quitting 535 * Catch a fatal signal and tidy up before quitting
580 */ 536 */
581 void 537 void
582 sig_term (sig_watcher &w) 538 sig_term (sig_watcher &w)
583 { 539 {
584#ifdef DEBUG_CMD
585 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
586#endif
587 rxvt_emergency_cleanup (); 540 rxvt_emergency_cleanup ();
588 signal (w.signum, SIG_DFL); 541 signal (w.signum, SIG_DFL);
589 kill (getpid (), w.signum); 542 kill (getpid (), w.signum);
590 } 543 }
591 544
592 sig_handlers () 545 sig_handlers ()
593 : sw_chld (this, &sig_handlers::sig_chld),
594 sw_term (this, &sig_handlers::sig_term), 546 : sw_term (this, &sig_handlers::sig_term),
595 sw_int (this, &sig_handlers::sig_term) 547 sw_int (this, &sig_handlers::sig_term)
596 { 548 {
597 } 549 }
598} sig_handlers; 550} sig_handlers;
599 551
600char **rxvt_environ; // startup environment 552char **rxvt_environ; // startup environment
601 553
602void 554void
603rxvt_init () 555rxvt_init ()
604{ 556{
557 ptytty::init ();
558
605 rxvt_environ = environ; 559 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 560
617 signal (SIGHUP, SIG_IGN); 561 signal (SIGHUP, SIG_IGN);
618 signal (SIGPIPE, SIG_IGN); 562 signal (SIGPIPE, SIG_IGN);
619 563
620 sig_handlers.sw_chld.start (SIGCHLD);
621 sig_handlers.sw_term.start (SIGTERM); 564 sig_handlers.sw_term.start (SIGTERM);
622 sig_handlers.sw_int.start (SIGINT); 565 sig_handlers.sw_int.start (SIGINT);
623 566
624 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
625 /* signal (SIGURG, SIG_DFL); */ 568 /* signal (SIGURG, SIG_DFL); */
… …
654 rxvt_fatal ("memory allocation failure. aborting.\n"); 597 rxvt_fatal ("memory allocation failure. aborting.\n");
655 598
656 return p; 599 return p;
657} 600}
658 601
659void * 602void *
660rxvt_realloc (void *ptr, size_t size) 603rxvt_realloc (void *ptr, size_t size)
661{ 604{
662 void *p = realloc (ptr, size); 605 void *p = realloc (ptr, size);
663 606
664 if (!p) 607 if (!p)
665 rxvt_fatal ("memory allocation failure. aborting.\n"); 608 rxvt_fatal ("memory allocation failure. aborting.\n");
666 609
667 return p; 610 return p;
668} 611}
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 612
738/*----------------------------------------------------------------------*/ 613/*----------------------------------------------------------------------*/
739/* 614/*
740 * window size/position calculcations for XSizeHint and other storage. 615 * window size/position calculcations for XSizeHint and other storage.
741 * if width/height are non-zero then override calculated width/height 616 * if width/height are non-zero then override calculated width/height
… …
745{ 620{
746 short recalc_x, recalc_y; 621 short recalc_x, recalc_y;
747 int x, y, sb_w, flags; 622 int x, y, sb_w, flags;
748 unsigned int w, h; 623 unsigned int w, h;
749 unsigned int max_width, max_height; 624 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 625
755 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
756 szHint.win_gravity = NorthWestGravity; 627 szHint.win_gravity = NorthWestGravity;
757 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 628 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
758 629
… …
855 726
856 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
857 window_sb_x = szHint.width - sb_w; 728 window_sb_x = szHint.width - sb_w;
858 729
859 if (recalc_x) 730 if (recalc_x)
860 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
732
861 if (recalc_y) 733 if (recalc_y)
862 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
863 735
864 ncol = width / fwidth; 736 ncol = width / fwidth;
865 nrow = height / fheight; 737 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} 738}
871 739
872/*----------------------------------------------------------------------*/ 740/*----------------------------------------------------------------------*/
873/* 741/*
874 * Tell the teletype handler what size the window is. 742 * Tell the teletype handler what size the window is.
… …
974 return true; 842 return true;
975} 843}
976 844
977void rxvt_term::set_string_property (Atom prop, const char *str, int len) 845void rxvt_term::set_string_property (Atom prop, const char *str, int len)
978{ 846{
979 XChangeProperty (display->display, parent[0], 847 XChangeProperty (xdisp, parent[0],
980 prop, XA_STRING, 8, PropModeReplace, 848 prop, XA_STRING, 8, PropModeReplace,
981 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 849 (const unsigned char *)str, len >= 0 ? len : strlen (str));
982} 850}
983 851
984void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 852void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
985{ 853{
986 wchar_t *ws = rxvt_mbstowcs (str, len); 854 wchar_t *ws = rxvt_mbstowcs (str, len);
987 char *s = rxvt_wcstoutf8 (ws); 855 char *s = rxvt_wcstoutf8 (ws);
988 856
989 XChangeProperty (display->display, parent[0], 857 XChangeProperty (xdisp, parent[0],
990 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
991 (const unsigned char *)s, strlen (s)); 859 (const unsigned char *)s, strlen (s));
992 860
993 free (s); 861 free (s);
994 free (ws); 862 free (ws);
… …
1044 SET_PIXCOLOR (idx); 912 SET_PIXCOLOR (idx);
1045 goto done; 913 goto done;
1046 } 914 }
1047 } 915 }
1048 916
1049 if (!rXParseAllocColor (&xcol, color)) 917 if (!set_color (xcol, color))
1050 return; 918 return;
1051 919
1052 /* XStoreColor (display->display, display->cmap, XColor*); */ 920 /* XStoreColor (xdisp, display->cmap, XColor*); */
1053 921
1054 /* 922 /*
1055 * FIXME: should free colors here, but no idea how to do it so instead, 923 * FIXME: should free colors here, but no idea how to do it so instead,
1056 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
1057 */ 925 */
… …
1060 if (pix_colors[idx] == pix_colors[i]) 928 if (pix_colors[idx] == pix_colors[i])
1061 break; 929 break;
1062 if (i > Color_White) 930 if (i > Color_White)
1063 { 931 {
1064 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */ 932 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1065 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1, 933 XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
1066 DisplayPlanes (display->display, display->screen)); 934 DisplayPlanes (xdisp, display->screen));
1067 } 935 }
1068# endif 936# endif
1069 937
1070 pix_colors_focused[idx] = xcol; 938 pix_colors_focused[idx] = xcol;
1071 SET_PIXCOLOR (idx); 939 SET_PIXCOLOR (idx);
… …
1074 /* Cursor cursor; */ 942 /* Cursor cursor; */
1075done: 943done:
1076 944
1077#if OFF_FOCUS_FADING 945#if OFF_FOCUS_FADING
1078 if (rs[Rs_fade]) 946 if (rs[Rs_fade])
1079 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 947 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1080#endif 948#endif
1081 949
1082 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
1083 951
1084 recolour_cursor (); 952 recolour_cursor ();
… …
1099 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg];
1100 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 968 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1101 ? pix_colors_focused[Color_pointer_bg] 969 ? pix_colors_focused[Color_pointer_bg]
1102 : pix_colors_focused[Color_bg]; 970 : pix_colors_focused[Color_bg];
1103 971
1104 XQueryColors (display->display, display->cmap, xcol, 2); 972 XQueryColors (xdisp, cmap, xcol, 2);
1105 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 973 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1);
1106} 974}
1107 975
1108/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1109/* 977/*
1110 * 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
… …
1114{ 982{
1115 unsigned int i; 983 unsigned int i;
1116 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1117 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1118 986
1119 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1120 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1121 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1122 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1123 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1124 { 991 {
… …
1139 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1140} 1007}
1141 1008
1142/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1143 1010
1144int 1011bool
1145rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1146{ 1013{
1147 if (!screen_in_out->set (display, colour)) 1014 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; 1015 return true;
1016
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false;
1154} 1019}
1155 1020
1156/* -------------------------------------------------------------------- * 1021/* -------------------------------------------------------------------- *
1157 * - WINDOW RESIZING - * 1022 * - WINDOW RESIZING - *
1158 * -------------------------------------------------------------------- */ 1023 * -------------------------------------------------------------------- */
1159void 1024void
1160rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1025rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1161{ 1026{
1162 int fix_screen; 1027 int fix_screen;
1163 int old_width = szHint.width, old_height = szHint.height; 1028 int old_width = szHint.width;
1164 dDisp; 1029 int old_height = szHint.height;
1165 1030
1166 window_calc (newwidth, newheight); 1031 window_calc (newwidth, newheight);
1167 XSetWMNormalHints (disp, parent[0], &szHint); 1032 XSetWMNormalHints (xdisp, parent[0], &szHint);
1168 1033
1169 if (!ignoreparent) 1034 if (!ignoreparent)
1170 { 1035 {
1171#ifdef SMART_RESIZE 1036#ifdef SMART_RESIZE
1172 /* 1037 /*
… …
1176 int x, y, x1, y1; 1041 int x, y, x1, y1;
1177 int dx, dy; 1042 int dx, dy;
1178 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1043 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1179 Window unused_cr; 1044 Window unused_cr;
1180 1045
1181 XTranslateCoordinates (disp, parent[0], display->root, 1046 XTranslateCoordinates (xdisp, parent[0], display->root,
1182 0, 0, &x, &y, &unused_cr); 1047 0, 0, &x, &y, &unused_cr);
1183 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1048 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1184 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1049 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1185 /* 1050 /*
1186 * if display->root isn't the parent window, a WM will probably have offset 1051 * if display->root isn't the parent window, a WM will probably have offset
1187 * our position for handles and decorations. Counter it 1052 * our position for handles and decorations. Counter it
1188 */ 1053 */
… …
1190 { 1055 {
1191 x -= x1; 1056 x -= x1;
1192 y -= y1; 1057 y -= y1;
1193 } 1058 }
1194 1059
1195 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1060 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1196 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1061 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1197 dx = old_width - szHint.width; 1062 dx = old_width - szHint.width;
1198 dy = old_height - szHint.height; 1063 dy = old_height - szHint.height;
1199 1064
1200 /* Check position of the center of the window */ 1065 /* Check position of the center of the window */
1201 if (x < x1) /* left half */ 1066 if (x < x1) /* left half */
1202 dx = 0; 1067 dx = 0;
… …
1205 if (y < y1) /* top half */ 1070 if (y < y1) /* top half */
1206 dy = 0; 1071 dy = 0;
1207 else if (y == y1) /* exact center */ 1072 else if (y == y1) /* exact center */
1208 dy /= 2; 1073 dy /= 2;
1209 1074
1210 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1075 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1211 szHint.width, szHint.height); 1076 szHint.width, szHint.height);
1212#else 1077#else
1213 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1078 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1214#endif 1079#endif
1215 } 1080 }
1216 1081
1217 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1082 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1218 1083
1219 if (fix_screen || newwidth != old_width || newheight != old_height) 1084 if (fix_screen || newwidth != old_width || newheight != old_height)
1220 { 1085 {
1221 if (scrollBar.state) 1086 if (scrollBar.state)
1222 { 1087 {
1223 XMoveResizeWindow (disp, scrollBar.win, 1088 XMoveResizeWindow (xdisp, scrollBar.win,
1224 window_sb_x, 0, 1089 window_sb_x, 0,
1225 scrollbar_TotalWidth (), szHint.height); 1090 scrollbar_TotalWidth (), szHint.height);
1226 resize_scrollbar (); 1091 resize_scrollbar ();
1227 } 1092 }
1228 1093
1229 XMoveResizeWindow (disp, vt, 1094 XMoveResizeWindow (xdisp, vt,
1230 window_vt_x, window_vt_y, 1095 window_vt_x, window_vt_y,
1231 width, height); 1096 width, height);
1232 1097
1233 scr_clear (); 1098 scr_clear ();
1234#ifdef XPM_BACKGROUND 1099#ifdef XPM_BACKGROUND
1235 resize_pixmap (); 1100 resize_pixmap ();
1236#endif 1101#endif
1237 } 1102 }
1238 1103
1239 if (fix_screen || old_height == 0) 1104 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 (); 1105 scr_reset ();
1254
1255 if (curr_screen >= 0) /* this is not the first time through */
1256 {
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 1106
1265#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
1266 if (pixmap) 1108 if (pixmap)
1267 scr_touch (false); 1109 scr_touch (false);
1268#endif 1110#endif
… …
1281{ 1123{
1282 XWindowAttributes wattr; 1124 XWindowAttributes wattr;
1283 1125
1284 if (newwidth == 0 || newheight == 0) 1126 if (newwidth == 0 || newheight == 0)
1285 { 1127 {
1286 XGetWindowAttributes (display->display, display->root, &wattr); 1128 XGetWindowAttributes (xdisp, display->root, &wattr);
1287 1129
1288 if (newwidth == 0) 1130 if (newwidth == 0)
1289 newwidth = wattr.width - szHint.base_width; 1131 newwidth = wattr.width - szHint.base_width;
1290 if (newheight == 0) 1132 if (newheight == 0)
1291 newheight = wattr.height - szHint.base_height; 1133 newheight = wattr.height - szHint.base_height;
… …
1353 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1195 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1354 1196
1355 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1197 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1356 *p = '\0'; 1198 *p = '\0';
1357 1199
1358 atom = XInternAtom (display->display, server, False); 1200 atom = XInternAtom (xdisp, server, False);
1359 win = XGetSelectionOwner (display->display, atom); 1201 win = XGetSelectionOwner (xdisp, atom);
1360 1202
1361 if (win != None) 1203 if (win != None)
1362 return True; 1204 return True;
1363 } 1205 }
1364 1206
… …
1371 XPoint nspot; 1213 XPoint nspot;
1372 XVaNestedList preedit_attr; 1214 XVaNestedList preedit_attr;
1373 1215
1374 if (!Input_Context 1216 if (!Input_Context
1375 || !focus 1217 || !focus
1376 || !(input_style & XIMPreeditPosition)) 1218 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1377 return; 1219 return;
1378 1220
1379 im_set_position (nspot); 1221 im_set_position (nspot);
1380 1222
1381 if (nspot.x == spot.x && nspot.y == spot.y) 1223 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1400 input_method = 0; 1242 input_method = 0;
1401 } 1243 }
1402 1244
1403 Input_Context = 0; 1245 Input_Context = 0;
1404} 1246}
1247
1248#ifdef ENABLE_XIM_ONTHESPOT
1249
1250static void
1251xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1252{
1253 ((rxvt_term *)client_data)->make_current ();
1254 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1255}
1256
1257static void
1258xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1259{
1260 ((rxvt_term *)client_data)->make_current ();
1261 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1262}
1263
1264static void
1265xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1266{
1267 rxvt_term *term = (rxvt_term *)client_data;
1268 XIMText *text = call_data->text;
1269
1270 term->make_current ();
1271
1272 if (text)
1273 {
1274 void *str;
1275
1276 if (!text->encoding_is_wchar && text->string.multi_byte)
1277 {
1278 // of course, X makes it ugly again
1279 if (term->rs[Rs_imLocale])
1280 SET_LOCALE (term->rs[Rs_imLocale]);
1281
1282 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1283 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1284
1285 if (term->rs[Rs_imLocale])
1286 SET_LOCALE (term->locale);
1287 }
1288 else
1289 str = (void *)text->string.wide_char;
1290
1291 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1292 DT_INT, call_data->caret,
1293 DT_INT, call_data->chg_first,
1294 DT_INT, call_data->chg_length,
1295 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1296 DT_WCS_LEN, str, str ? (int)text->length : 0,
1297 DT_END));
1298 }
1299 else
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_END));
1305}
1306
1307#if 0
1308static void
1309xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1310{
1311 ((rxvt_term *)client_data)->make_current ();
1312 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1313 DT_INT, call_data->position,
1314 DT_INT, call_data->direction,
1315 DT_INT, call_data->style,
1316 DT_END));
1317}
1318#endif
1319
1320#endif
1405 1321
1406/* 1322/*
1407 * Try to open a XIM with the current modifiers, then see if we can 1323 * Try to open a XIM with the current modifiers, then see if we can
1408 * open a suitable preedit type 1324 * open a suitable preedit type
1409 */ 1325 */
… …
1416 XRectangle rect, status_rect, needed_rect; 1332 XRectangle rect, status_rect, needed_rect;
1417 unsigned long fg, bg; 1333 unsigned long fg, bg;
1418 const char *p; 1334 const char *p;
1419 char **s; 1335 char **s;
1420 XIMStyles *xim_styles; 1336 XIMStyles *xim_styles;
1337#ifdef ENABLE_XIM_ONTHESPOT
1338 XIMCallback xcb[4];
1339#endif
1421 1340
1422 set_environ (envv); 1341 set_environ (envv);
1423 1342
1424 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1343 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1425 return false; 1344 return false;
1426 1345
1427 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1428 input_method = display->get_xim (locale, modifiers); 1346 input_method = display->get_xim (locale, modifiers);
1429 if (input_method == NULL) 1347 if (input_method == NULL)
1430 return false; 1348 return false;
1431 1349
1432 xim = input_method->xim; 1350 xim = input_method->xim;
… …
1452 s = rxvt_splitcommastring (p); 1370 s = rxvt_splitcommastring (p);
1453 1371
1454 for (i = found = 0; !found && s[i]; i++) 1372 for (i = found = 0; !found && s[i]; i++)
1455 { 1373 {
1456 if (!strcmp (s[i], "OverTheSpot")) 1374 if (!strcmp (s[i], "OverTheSpot"))
1457 input_style = (XIMPreeditPosition | XIMStatusNothing); 1375 input_style = XIMPreeditPosition | XIMStatusNothing;
1458 else if (!strcmp (s[i], "OffTheSpot")) 1376 else if (!strcmp (s[i], "OffTheSpot"))
1459 input_style = (XIMPreeditArea | XIMStatusArea); 1377 input_style = XIMPreeditArea | XIMStatusArea;
1460 else if (!strcmp (s[i], "Root")) 1378 else if (!strcmp (s[i], "Root"))
1461 input_style = (XIMPreeditNothing | XIMStatusNothing); 1379 input_style = XIMPreeditNothing | XIMStatusNothing;
1462 else if (!strcmp (s[i], "None")) 1380 else if (!strcmp (s[i], "None"))
1463 input_style = (XIMPreeditNone | XIMStatusNone); 1381 input_style = XIMPreeditNone | XIMStatusNone;
1382#ifdef ENABLE_XIM_ONTHESPOT
1383 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1384 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1385#endif
1386 else
1387 input_style = XIMPreeditNothing | XIMStatusNothing;
1464 1388
1465 for (j = 0; j < xim_styles->count_styles; j++) 1389 for (j = 0; j < xim_styles->count_styles; j++)
1466 if (input_style == xim_styles->supported_styles[j]) 1390 if (input_style == xim_styles->supported_styles[j])
1467 { 1391 {
1468 rxvt_freecommastring (s); 1392 rxvt_freecommastring (s);
… …
1506 "*", 1430 "*",
1507 fheight, 1431 fheight,
1508 fheight + 1, fheight - 1, 1432 fheight + 1, fheight - 1,
1509 fheight - 2, fheight + 2); 1433 fheight - 2, fheight + 2);
1510 1434
1511 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1435 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1512 &missing_charset_list, &missing_charset_count, &def_string); 1436 &missing_charset_list, &missing_charset_count, &def_string);
1513 1437
1514 if (missing_charset_list) 1438 if (missing_charset_list)
1515 XFreeStringList (missing_charset_list); 1439 XFreeStringList (missing_charset_list);
1516 1440
… …
1557 XNBackground, bg, 1481 XNBackground, bg,
1558 XNArea, &status_rect, 1482 XNArea, &status_rect,
1559 XNFontSet, fs, 1483 XNFontSet, fs,
1560 NULL); 1484 NULL);
1561 } 1485 }
1486#if ENABLE_XIM_ONTHESPOT
1487 else if (input_style & XIMPreeditCallbacks)
1488 {
1489 im_set_position (spot);
1490
1491 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1492 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1493 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1494# if 0
1495 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1496# endif
1497
1498 preedit_attr = XVaCreateNestedList (0,
1499 XNSpotLocation, &spot,
1500 XNPreeditStartCallback, &xcb[0],
1501 XNPreeditDoneCallback , &xcb[1],
1502 XNPreeditDrawCallback , &xcb[2],
1503# if 0
1504 XNPreeditCaretCallback, &xcb[3],
1505# endif
1506 NULL);
1507 }
1508#endif
1562 1509
1563 Input_Context = XCreateIC (xim, 1510 Input_Context = XCreateIC (xim,
1564 XNInputStyle, input_style, 1511 XNInputStyle, input_style,
1565 XNClientWindow, vt, 1512 XNClientWindow, vt,
1566 XNFocusWindow, parent[0], 1513 XNFocusWindow, parent[0],
… …
1569 status_attr ? XNStatusAttributes : NULL, 1516 status_attr ? XNStatusAttributes : NULL,
1570 status_attr, NULL); 1517 status_attr, NULL);
1571 1518
1572 if (preedit_attr) XFree (preedit_attr); 1519 if (preedit_attr) XFree (preedit_attr);
1573 if (status_attr) XFree (status_attr); 1520 if (status_attr) XFree (status_attr);
1574 if (fs) XFreeFontSet (display->display, fs); 1521 if (fs) XFreeFontSet (xdisp, fs);
1575 1522
1576 if (Input_Context == NULL) 1523 if (Input_Context == NULL)
1577 { 1524 {
1578 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1525 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1579 im_destroy (); 1526 im_destroy ();
1580 return false; 1527 return false;
1581 } 1528 }
1582 1529
1530#if 0
1531 // unfortunately, only the focus window is used by XIM, hard to fix
1532 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1533 vt_select_input ();
1534#endif
1535
1583 if (input_style & XIMPreeditArea) 1536 if (input_style & XIMPreeditArea)
1584 IMSetStatusPosition (); 1537 IMSetStatusPosition ();
1585 1538
1586 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1587 return true; 1539 return true;
1588} 1540}
1589 1541
1590void 1542void
1591rxvt_term::im_cb () 1543rxvt_term::im_cb ()
… …
1597 1549
1598 make_current (); 1550 make_current ();
1599 1551
1600 im_destroy (); 1552 im_destroy ();
1601 1553
1602 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1603 if (Input_Context) 1554 if (Input_Context)
1604 return; 1555 return;
1605 1556
1606#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1557#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1607 if (rs[Rs_imLocale]) 1558 if (rs[Rs_imLocale])
… …
1680 XFree (preedit_attr); 1631 XFree (preedit_attr);
1681 XFree (status_attr); 1632 XFree (status_attr);
1682} 1633}
1683#endif /* USE_XIM */ 1634#endif /* USE_XIM */
1684 1635
1685/*----------------------------------------------------------------------*/
1686rxvt_t rxvt_current_term;
1687
1688/*----------------------- end-of-file (C source) -----------------------*/ 1636/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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