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.187 by root, Tue Jan 17 16:22:41 2006 UTC vs.
Revision 1.219 by root, Sat Feb 11 02:28:19 2006 UTC

… …
48# include <termios.h> 48# include <termios.h>
49#endif 49#endif
50 50
51vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
52 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
53static char curlocale[128], savelocale[128]; 56static char curlocale[128], savelocale[128];
54 57
55bool 58bool
56rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
57{ 60{
58 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
59 return false; 62 return false;
60 63
61 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
62 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
63 return true; 66 return true;
64} 67}
65 68
66void 69void
67rxvt_push_locale (const char *locale) 70rxvt_push_locale (const char *locale) NOTHROW
68{ 71{
69 strcpy (savelocale, curlocale); 72 strcpy (savelocale, curlocale);
70 rxvt_set_locale (locale); 73 rxvt_set_locale (locale);
71} 74}
72 75
73void 76void
74rxvt_pop_locale () 77rxvt_pop_locale () NOTHROW
75{ 78{
76 rxvt_set_locale (savelocale); 79 rxvt_set_locale (savelocale);
77} 80}
78 81
79#if ENABLE_COMBINING 82#if ENABLE_COMBINING
… …
167 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
168#endif 171#endif
169#ifdef USE_XIM 172#ifdef USE_XIM
170 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
171#endif 174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
172 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
173 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
174 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
175 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
176 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
177 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
178 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
181 188
182 termlist.push_back (this); 189 termlist.push_back (this);
183 190
184#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
185 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
186
187 if (!keyboard)
188 rxvt_fatal ("out of memory, aborting.\n");
189#endif 193#endif
190} 194}
191 195
192// 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.
193// for use before an emergency exit 197// for use before an emergency exit
… …
199 delete pty; pty = 0; 203 delete pty; pty = 0;
200} 204}
201 205
202rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
203{ 207{
204 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
205
206 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
207 209
208 emergency_cleanup (); 210 emergency_cleanup ();
209 211
210#if ENABLE_STYLES 212#if ENABLE_STYLES
… …
214#endif 216#endif
215 delete fontset[0]; 217 delete fontset[0];
216 218
217 if (display) 219 if (display)
218 { 220 {
219 dDisp;
220
221 selection_clear (); 221 selection_clear ();
222 222
223#ifdef USE_XIM 223#ifdef USE_XIM
224 im_destroy (); 224 im_destroy ();
225#endif 225#endif
226#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
227 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (dpy, ShadowGC);
229#endif 229#endif
230#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232#endif 232#endif
233#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (dpy, blackGC);
235 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (dpy, whiteGC);
236 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (dpy, grayGC);
237 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (dpy, darkGC);
238 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (dpy, stippleGC);
239 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (dpy, dimple);
240 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (dpy, upArrow);
241 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (dpy, downArrow);
242 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244#endif 244#endif
245#ifdef RXVT_SCROLLBAR 245#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (dpy, topShadowGC);
247 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (dpy, botShadowGC);
248 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249#endif 249#endif
250 if (gc) XFreeGC (disp, gc); 250 if (gc) XFreeGC (dpy, gc);
251 251
252 delete drawable; 252 delete drawable;
253 // destroy all windows 253 // destroy all windows
254 if (parent[0]) 254 if (parent[0])
255 XDestroyWindow (disp, parent[0]); 255 XDestroyWindow (dpy, parent[0]);
256 }
257 256
258 // 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
259 delete pix_colors_focused; 269 delete pix_colors_focused;
260#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
261 delete pix_colors_unfocused; 271 delete pix_colors_unfocused;
262#endif 272#endif
263 273
… …
269 for (int i = 0; i < allocated.size (); i++) 279 for (int i = 0; i < allocated.size (); i++)
270 free (allocated [i]); 280 free (allocated [i]);
271 281
272 free (selection.text); 282 free (selection.text);
273 // TODO: manage env vars in child only(!) 283 // TODO: manage env vars in child only(!)
274 free (env_windowid);
275 free (env_display); 284 free (env_display);
276 free (env_term); 285 free (env_term);
277 free (env_colorfgbg);
278 free (locale); 286 free (locale);
279 free (v_buffer); 287 free (v_buffer);
280 free (incr_buf); 288 free (incr_buf);
281 289
282 delete envv; 290 delete envv;
… …
285#ifdef KEYSYM_RESOURCE 293#ifdef KEYSYM_RESOURCE
286 delete keyboard; 294 delete keyboard;
287#endif 295#endif
288} 296}
289 297
298// child has exited, usually destroys
290void 299void
291rxvt_term::child_exit () 300rxvt_term::child_cb (child_watcher &w, int status)
292{ 301{
302 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303
293 cmd_pid = 0; 304 cmd_pid = 0;
294 305
295 if (!OPTION (Opt_hold)) 306 if (!OPTION (Opt_hold))
296 destroy (); 307 destroy ();
297} 308}
… …
299void 310void
300rxvt_term::destroy () 311rxvt_term::destroy ()
301{ 312{
302 if (destroy_ev.active) 313 if (destroy_ev.active)
303 return; 314 return;
315
316 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
304 317
305#if ENABLE_OVERLAY 318#if ENABLE_OVERLAY
306 scr_overlay_off (); 319 scr_overlay_off ();
307#endif 320#endif
308 321
… …
363{ 376{
364 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++)
365 (*t)->emergency_cleanup (); 378 (*t)->emergency_cleanup ();
366} 379}
367 380
368#if ENABLE_FRILLS 381#if !ENABLE_MINIMAL
369static void 382static void
370print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
371{ 384{
372 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
373 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
… …
421 GET_R->allowedxerror = event->error_code; 434 GET_R->allowedxerror = event->error_code;
422 else 435 else
423 { 436 {
424 // 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,
425 // so just output the error and continue 438 // so just output the error and continue
426#if ENABLE_FRILLS 439#if ENABLE_MINIMAL
440 old_xerror_handler (display, event);
441#else
427 print_x_error (display, event); 442 print_x_error (display, event);
428#else
429 old_xerror_handler (display, event);
430#endif 443#endif
431 } 444 }
432 445
433 return 0; 446 return 0;
434} 447}
… …
442 _exit (EXIT_FAILURE); 455 _exit (EXIT_FAILURE);
443} 456}
444 457
445/*----------------------------------------------------------------------*/ 458/*----------------------------------------------------------------------*/
446bool 459bool
447rxvt_term::init (int argc, const char *const *argv) 460rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
448{ 461{
462 this->envv = envv;
463
449 SET_R (this); 464 SET_R (this);
450 set_locale (""); 465 set_locale ("");
451 set_environ (envv); // few things in X do not call setlocale :( 466 set_environ (envv); // few things in X do not call setlocale :(
452 467
453 if (!init_vars ()) 468 if (!init_vars ())
… …
464#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
465 if (OPTION (Opt_scrollBar)) 480 if (OPTION (Opt_scrollBar))
466 scrollBar.setIdle (); /* set existence for size calculations */ 481 scrollBar.setIdle (); /* set existence for size calculations */
467#endif 482#endif
468 483
469#if ENABLE_PERL 484 pty = ptytty::create ();
470 if (!rs[Rs_perl_ext_1])
471 rs[Rs_perl_ext_1] = "default";
472
473 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
474 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
475 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
476 {
477 rxvt_perl.init (this);
478 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
479 }
480#endif
481
482 pty = rxvt_new_ptytty ();
483 485
484 create_windows (argc, argv); 486 create_windows (argc, argv);
485 487
486 dDisp;
487
488 init_xlocale (); 488 init_xlocale ();
489 489
490 scr_reset (); // initialize screen 490 scr_reset (); // initialize screen
491 491
492#if 0 492#if 0
493 XSynchronize (disp, True); 493 XSynchronize (dpy, True);
494#endif 494#endif
495 495
496#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar)) 497 if (OPTION (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
499#endif 499#endif
500#ifdef TRANSPARENT 500#ifdef TRANSPARENT
501 if (OPTION (Opt_transparent)) 501 if (OPTION (Opt_transparent))
502 { 502 {
503 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (dpy, display->root, PropertyChangeMask);
504 check_our_parents (); 504 check_our_parents ();
505 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
506 } 506 }
507#endif 507#endif
508 508
509 XMapWindow (disp, vt);
510 XMapWindow (disp, parent[0]);
511
512 set_colorfgbg (); 509 set_colorfgbg ();
513 510
514 init_command (cmd_argv); 511 init_command (cmd_argv);
515 512
516 free (cmd_argv); 513 free (cmd_argv);
… …
520 517
521 check_ev.start (); 518 check_ev.start ();
522 519
523 HOOK_INVOKE ((this, HOOK_START, DT_END)); 520 HOOK_INVOKE ((this, HOOK_START, DT_END));
524 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
525 return true; 535 return true;
526} 536}
527 537
528static struct sig_handlers 538static struct sig_handlers
529{ 539{
530 sig_watcher sw_chld, sw_term, sw_int; 540 sig_watcher sw_term, sw_int;
531 541
532 void sig_chld (sig_watcher &w)
533 {
534 // we are being called for every SIGCHLD, find the corresponding term
535 int pid;
536
537 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
538 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
539 if (pid == (*t)->cmd_pid)
540 {
541 (*t)->child_exit ();
542 break;
543 }
544 }
545
546 /* 542 /*
547 * Catch a fatal signal and tidy up before quitting 543 * Catch a fatal signal and tidy up before quitting
548 */ 544 */
549 void 545 void
550 sig_term (sig_watcher &w) 546 sig_term (sig_watcher &w)
551 { 547 {
552#ifdef DEBUG_CMD
553 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
554#endif
555 rxvt_emergency_cleanup (); 548 rxvt_emergency_cleanup ();
556 signal (w.signum, SIG_DFL); 549 signal (w.signum, SIG_DFL);
557 kill (getpid (), w.signum); 550 kill (getpid (), w.signum);
558 } 551 }
559 552
560 sig_handlers () 553 sig_handlers ()
561 : sw_chld (this, &sig_handlers::sig_chld),
562 sw_term (this, &sig_handlers::sig_term), 554 : sw_term (this, &sig_handlers::sig_term),
563 sw_int (this, &sig_handlers::sig_term) 555 sw_int (this, &sig_handlers::sig_term)
564 { 556 {
565 } 557 }
566} sig_handlers; 558} sig_handlers;
567 559
568char **rxvt_environ; // startup environment 560char **rxvt_environ; // startup environment
569 561
570void 562void
571rxvt_init () 563rxvt_init ()
572{ 564{
573 uid_t uid = getuid (); 565 ptytty::init ();
574 gid_t gid = getgid ();
575
576 // before doing anything else, check for setuid/setgid operation,
577 // start the helper process and drop privileges
578 if (uid != geteuid ()
579 || 1 //D
580 || gid != getegid ())
581 {
582#if PTYTTY_HELPER
583 rxvt_ptytty_server ();
584#else
585 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
586#endif
587
588 // drop privileges
589#if HAVE_SETRESUID
590 setresgid (gid, gid, gid);
591 setresuid (uid, uid, uid);
592#elif HAVE_SETREUID
593 setregid (gid, gid);
594 setreuid (uid, uid);
595#elif HAVE_SETUID
596 setgid (gid);
597 setuid (uid);
598#endif
599
600 if (uid != geteuid ()
601 || gid != getegid ())
602 rxvt_fatal ("unable to drop privileges, aborting.\n");
603 }
604 566
605 rxvt_environ = environ; 567 rxvt_environ = environ;
606 568
607 signal (SIGHUP, SIG_IGN); 569 signal (SIGHUP, SIG_IGN);
608 signal (SIGPIPE, SIG_IGN); 570 signal (SIGPIPE, SIG_IGN);
609 571
610 sig_handlers.sw_chld.start (SIGCHLD);
611 sig_handlers.sw_term.start (SIGTERM); 572 sig_handlers.sw_term.start (SIGTERM);
612 sig_handlers.sw_int.start (SIGINT); 573 sig_handlers.sw_int.start (SIGINT);
613 574
614 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 575 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
615 /* signal (SIGURG, SIG_DFL); */ 576 /* signal (SIGURG, SIG_DFL); */
… …
644 rxvt_fatal ("memory allocation failure. aborting.\n"); 605 rxvt_fatal ("memory allocation failure. aborting.\n");
645 606
646 return p; 607 return p;
647} 608}
648 609
649void * 610void *
650rxvt_realloc (void *ptr, size_t size) 611rxvt_realloc (void *ptr, size_t size)
651{ 612{
652 void *p = realloc (ptr, size); 613 void *p = realloc (ptr, size);
653 614
654 if (!p) 615 if (!p)
… …
667{ 628{
668 short recalc_x, recalc_y; 629 short recalc_x, recalc_y;
669 int x, y, sb_w, flags; 630 int x, y, sb_w, flags;
670 unsigned int w, h; 631 unsigned int w, h;
671 unsigned int max_width, max_height; 632 unsigned int max_width, max_height;
672 dDisp;
673
674 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
675 ncol, nrow, szHint.width, szHint.height));
676 633
677 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 634 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
678 szHint.win_gravity = NorthWestGravity; 635 szHint.win_gravity = NorthWestGravity;
679 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 636 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
680 637
… …
742 699
743 if (scrollBar.state) 700 if (scrollBar.state)
744 { 701 {
745 sb_w = scrollbar_TotalWidth (); 702 sb_w = scrollbar_TotalWidth ();
746 szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
704
747 if (!OPTION (Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
748 window_vt_x += sb_w; 706 window_vt_x += sb_w;
749 } 707 }
750 708
751 szHint.width_inc = fwidth; 709 szHint.width_inc = fwidth;
752 szHint.height_inc = fheight; 710 szHint.height_inc = fheight;
753 szHint.min_width = szHint.base_width + szHint.width_inc; 711 szHint.min_width = szHint.base_width + szHint.width_inc;
754 szHint.min_height = szHint.base_height + szHint.height_inc; 712 szHint.min_height = szHint.base_height + szHint.height_inc;
755 713
756 if (newwidth && newwidth - szHint.base_width < max_width) 714 if (newwidth && newwidth - szHint.base_width < max_width)
757 { 715 {
758 szHint.width = newwidth; 716 szHint.width = newwidth;
… …
777 735
778 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
779 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
780 738
781 if (recalc_x) 739 if (recalc_x)
782 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 740 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741
783 if (recalc_y) 742 if (recalc_y)
784 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 743 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
785 744
786 ncol = width / fwidth; 745 ncol = width / fwidth;
787 nrow = height / fheight; 746 nrow = height / fheight;
788 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
789 ncol, nrow, szHint.width,
790 szHint.height));
791 return;
792} 747}
793 748
794/*----------------------------------------------------------------------*/ 749/*----------------------------------------------------------------------*/
795/* 750/*
796 * Tell the teletype handler what size the window is. 751 * Tell the teletype handler what size the window is.
… …
896 return true; 851 return true;
897} 852}
898 853
899void 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)
900{ 855{
901 XChangeProperty (display->display, parent[0], 856 XChangeProperty (dpy, parent[0],
902 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
903 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
904} 859}
905 860
906void 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)
907{ 862{
908 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
909 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
910 865
911 XChangeProperty (display->display, parent[0], 866 XChangeProperty (dpy, parent[0],
912 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
913 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
914 869
915 free (s); 870 free (s);
916 free (ws); 871 free (ws);
… …
941void 896void
942rxvt_term::set_window_color (int idx, const char *color) 897rxvt_term::set_window_color (int idx, const char *color)
943{ 898{
944 rxvt_color xcol; 899 rxvt_color xcol;
945 int i; 900 int i;
946 901
947 if (color == NULL || *color == '\0') 902 if (color == NULL || *color == '\0')
948 return; 903 return;
904
905 color = strdup (color);
906 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color;
949 908
950 /* handle color aliases */ 909 /* handle color aliases */
951 if (isdigit (*color)) 910 if (isdigit (*color))
952 { 911 {
953 i = atoi (color); 912 i = atoi (color);
954 913
955 if (i >= 8 && i <= 15) 914 if (i >= 8 && i <= 15)
956 { /* bright colors */ 915 { /* bright colors */
957 i -= 8; 916 i -= 8;
958 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
959 SET_PIXCOLOR (idx);
960 goto done; 918 goto done;
961 } 919 }
962 920
963 if (i >= 0 && i <= 7) 921 if (i >= 0 && i <= 7)
964 { /* normal colors */ 922 { /* normal colors */
965 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
966 SET_PIXCOLOR (idx);
967 goto done; 924 goto done;
968 } 925 }
969 } 926 }
970 927
971 if (!rXParseAllocColor (&xcol, color)) 928 set_color (xcol, color);
972 return;
973
974 /* XStoreColor (display->display, display->cmap, XColor*); */
975 929
976 /* 930 /*
977 * 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,
978 * so just keep gobbling up the colormap 932 * so just keep gobbling up the colormap
979 */ 933 */
980# if 0
981 for (i = Color_Black; i <= Color_White; i++)
982 if (pix_colors[idx] == pix_colors[i])
983 break;
984 if (i > Color_White)
985 {
986 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
987 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
988 DisplayPlanes (display->display, display->screen));
989 }
990# endif
991 934
992 pix_colors_focused[idx] = xcol; 935 pix_colors_focused[idx] = xcol;
993 SET_PIXCOLOR (idx);
994 936
995 /* XSetWindowAttributes attr; */ 937 /* XSetWindowAttributes attr; */
996 /* Cursor cursor; */ 938 /* Cursor cursor; */
997done: 939done:
998 940
999#if OFF_FOCUS_FADING 941#if OFF_FOCUS_FADING
1000 if (rs[Rs_fade]) 942 if (rs[Rs_fade])
1001 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 }
1002#endif 948#endif
1003 949
1004 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
1005 951
1006 recolour_cursor (); 952 recolour_cursor ();
… …
1012#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
1013 959
1014void 960void
1015rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
1016{ 962{
1017 XColor xcol[2]; 963 XColor fg, bg;
1018 964
1019 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
1020 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
1021 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
1022 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
1023 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
1024 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
1025 972
1026 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1027 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1028} 974}
1029 975
1030/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1031/* 977/*
1032 * 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
… …
1036{ 982{
1037 unsigned int i; 983 unsigned int i;
1038 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1039 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1040 986
1041 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1042 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1043 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1044 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1045 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1046 { 991 {
… …
1061 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1062} 1007}
1063 1008
1064/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1065 1010
1066int 1011bool
1067rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1068{ 1013{
1069 if (!screen_in_out->set (display, colour)) 1014 if (color.set (this, name))
1070 {
1071 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1072 return false;
1073 }
1074
1075 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]);
1076} 1025}
1077 1026
1078/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1079 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1080 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1081void 1030void
1082rxvt_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)
1083{ 1032{
1084 int fix_screen; 1033 int fix_screen;
1085 int old_width = szHint.width, old_height = szHint.height; 1034 int old_width = szHint.width;
1086 dDisp; 1035 int old_height = szHint.height;
1087 1036
1088 window_calc (newwidth, newheight); 1037 window_calc (newwidth, newheight);
1038
1039 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1089 XSetWMNormalHints (disp, parent[0], &szHint); 1040 XSetWMNormalHints (dpy, parent[0], &szHint);
1090 1041
1091 if (!ignoreparent) 1042 if (!ignoreparent)
1092 { 1043 {
1093#ifdef SMART_RESIZE 1044#ifdef SMART_RESIZE
1094 /* 1045 /*
… …
1098 int x, y, x1, y1; 1049 int x, y, x1, y1;
1099 int dx, dy; 1050 int dx, dy;
1100 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1101 Window unused_cr; 1052 Window unused_cr;
1102 1053
1103 XTranslateCoordinates (disp, parent[0], display->root, 1054 XTranslateCoordinates (dpy, parent[0], display->root,
1104 0, 0, &x, &y, &unused_cr); 1055 0, 0, &x, &y, &unused_cr);
1105 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1056 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1106 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1107 /* 1058 /*
1108 * if display->root isn't the parent window, a WM will probably have offset 1059 * if display->root isn't the parent window, a WM will probably have offset
1109 * our position for handles and decorations. Counter it 1060 * our position for handles and decorations. Counter it
1110 */ 1061 */
… …
1112 { 1063 {
1113 x -= x1; 1064 x -= x1;
1114 y -= y1; 1065 y -= y1;
1115 } 1066 }
1116 1067
1117 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1068 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1118 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1069 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1119 dx = old_width - szHint.width; 1070 dx = old_width - szHint.width;
1120 dy = old_height - szHint.height; 1071 dy = old_height - szHint.height;
1121 1072
1122 /* Check position of the center of the window */ 1073 /* Check position of the center of the window */
1123 if (x < x1) /* left half */ 1074 if (x < x1) /* left half */
1124 dx = 0; 1075 dx = 0;
… …
1127 if (y < y1) /* top half */ 1078 if (y < y1) /* top half */
1128 dy = 0; 1079 dy = 0;
1129 else if (y == y1) /* exact center */ 1080 else if (y == y1) /* exact center */
1130 dy /= 2; 1081 dy /= 2;
1131 1082
1132 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1083 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1133 szHint.width, szHint.height); 1084 szHint.width, szHint.height);
1134#else 1085#else
1135 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1086 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1136#endif 1087#endif
1137 } 1088 }
1138 1089
1139 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1140 1091
1141 if (fix_screen || newwidth != old_width || newheight != old_height) 1092 if (fix_screen || newwidth != old_width || newheight != old_height)
1142 { 1093 {
1143 if (scrollBar.state) 1094 if (scrollBar.state)
1144 { 1095 {
1145 XMoveResizeWindow (disp, scrollBar.win, 1096 XMoveResizeWindow (dpy, scrollBar.win,
1146 window_sb_x, 0, 1097 window_sb_x, 0,
1147 scrollbar_TotalWidth (), szHint.height); 1098 scrollbar_TotalWidth (), szHint.height);
1148 resize_scrollbar (); 1099 resize_scrollbar ();
1149 } 1100 }
1150 1101
1151 XMoveResizeWindow (disp, vt, 1102 XMoveResizeWindow (dpy, vt,
1152 window_vt_x, window_vt_y, 1103 window_vt_x, window_vt_y,
1153 width, height); 1104 width, height);
1154 1105
1155 scr_clear (); 1106 scr_clear ();
1156#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
1157 resize_pixmap (); 1108 resize_pixmap ();
1158#endif 1109#endif
1159 } 1110 }
1160 1111
1161 if (fix_screen || old_height == 0) 1112 if (fix_screen || old_height == 0)
1162 {
1163 int curr_screen = -1;
1164 int old_ncol = prev_ncol;
1165
1166 /* scr_reset only works on the primary screen */
1167 if (old_height) /* this is not the first time through */
1168 {
1169 unsigned int ocol = ncol;
1170 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1171 curr_screen = scr_change_screen (PRIMARY);
1172 ncol = ocol;
1173 }
1174
1175 scr_reset (); 1113 scr_reset ();
1176 1114
1177 if (curr_screen >= 0) /* this is not the first time through */ 1115 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1178 { 1116 //scr_touch (false);
1179 scr_change_screen (curr_screen);
1180 selection_check (old_ncol != ncol ? 4 : 0);
1181 }
1182 }
1183
1184 old_width = szHint.width;
1185 old_height = szHint.height;
1186 1117
1187#ifdef XPM_BACKGROUND 1118#ifdef XPM_BACKGROUND
1188 if (pixmap) 1119 if (pixmap)
1189 scr_touch (false); 1120 scr_touch (false);
1190#endif 1121#endif
… …
1203{ 1134{
1204 XWindowAttributes wattr; 1135 XWindowAttributes wattr;
1205 1136
1206 if (newwidth == 0 || newheight == 0) 1137 if (newwidth == 0 || newheight == 0)
1207 { 1138 {
1208 XGetWindowAttributes (display->display, display->root, &wattr); 1139 XGetWindowAttributes (dpy, display->root, &wattr);
1209 1140
1210 if (newwidth == 0) 1141 if (newwidth == 0)
1211 newwidth = wattr.width - szHint.base_width; 1142 newwidth = wattr.width - szHint.base_width;
1212 if (newheight == 0) 1143 if (newheight == 0)
1213 newheight = wattr.height - szHint.base_height; 1144 newheight = wattr.height - szHint.base_height;
… …
1227#ifdef USE_XIM 1158#ifdef USE_XIM
1228 1159
1229void 1160void
1230rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1161rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1231{ 1162{
1232 fg = pix_colors[Color_fg]; 1163 fg = pix_colors [Color_fg];
1233 bg = pix_colors[Color_bg]; 1164 bg = pix_colors [Color_bg];
1234} 1165}
1235 1166
1236void 1167void
1237rxvt_term::im_set_size (XRectangle &size) 1168rxvt_term::im_set_size (XRectangle &size)
1238{ 1169{
… …
1275 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1206 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1276 1207
1277 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1208 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1278 *p = '\0'; 1209 *p = '\0';
1279 1210
1280 atom = XInternAtom (display->display, server, False); 1211 atom = XInternAtom (dpy, server, False);
1281 win = XGetSelectionOwner (display->display, atom); 1212 win = XGetSelectionOwner (dpy, atom);
1282 1213
1283 if (win != None) 1214 if (win != None)
1284 return True; 1215 return True;
1285 } 1216 }
1286 1217
… …
1293 XPoint nspot; 1224 XPoint nspot;
1294 XVaNestedList preedit_attr; 1225 XVaNestedList preedit_attr;
1295 1226
1296 if (!Input_Context 1227 if (!Input_Context
1297 || !focus 1228 || !focus
1298 || !(input_style & XIMPreeditPosition)) 1229 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1299 return; 1230 return;
1300 1231
1301 im_set_position (nspot); 1232 im_set_position (nspot);
1302 1233
1303 if (nspot.x == spot.x && nspot.y == spot.y) 1234 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1322 input_method = 0; 1253 input_method = 0;
1323 } 1254 }
1324 1255
1325 Input_Context = 0; 1256 Input_Context = 0;
1326} 1257}
1258
1259#ifdef ENABLE_XIM_ONTHESPOT
1260
1261static void
1262xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1263{
1264 ((rxvt_term *)client_data)->make_current ();
1265 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1266}
1267
1268static void
1269xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1270{
1271 ((rxvt_term *)client_data)->make_current ();
1272 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1273}
1274
1275static void
1276xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1277{
1278 rxvt_term *term = (rxvt_term *)client_data;
1279 XIMText *text = call_data->text;
1280
1281 term->make_current ();
1282
1283 if (text)
1284 {
1285 void *str;
1286
1287 if (!text->encoding_is_wchar && text->string.multi_byte)
1288 {
1289 // of course, X makes it ugly again
1290 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->rs[Rs_imLocale]);
1292
1293 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1294 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1295
1296 if (term->rs[Rs_imLocale])
1297 SET_LOCALE (term->locale);
1298 }
1299 else
1300 str = (void *)text->string.wide_char;
1301
1302 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1303 DT_INT, call_data->caret,
1304 DT_INT, call_data->chg_first,
1305 DT_INT, call_data->chg_length,
1306 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1307 DT_WCS_LEN, str, str ? (int)text->length : 0,
1308 DT_END));
1309 }
1310 else
1311 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1312 DT_INT, call_data->caret,
1313 DT_INT, call_data->chg_first,
1314 DT_INT, call_data->chg_length,
1315 DT_END));
1316}
1317
1318#if 0
1319static void
1320xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1321{
1322 ((rxvt_term *)client_data)->make_current ();
1323 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1324 DT_INT, call_data->position,
1325 DT_INT, call_data->direction,
1326 DT_INT, call_data->style,
1327 DT_END));
1328}
1329#endif
1330
1331#endif
1327 1332
1328/* 1333/*
1329 * Try to open a XIM with the current modifiers, then see if we can 1334 * Try to open a XIM with the current modifiers, then see if we can
1330 * open a suitable preedit type 1335 * open a suitable preedit type
1331 */ 1336 */
… …
1338 XRectangle rect, status_rect, needed_rect; 1343 XRectangle rect, status_rect, needed_rect;
1339 unsigned long fg, bg; 1344 unsigned long fg, bg;
1340 const char *p; 1345 const char *p;
1341 char **s; 1346 char **s;
1342 XIMStyles *xim_styles; 1347 XIMStyles *xim_styles;
1348#ifdef ENABLE_XIM_ONTHESPOT
1349 XIMCallback xcb[4];
1350#endif
1343 1351
1344 set_environ (envv); 1352 set_environ (envv);
1345 1353
1346 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1354 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1347 return false; 1355 return false;
1348 1356
1349 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1350 input_method = display->get_xim (locale, modifiers); 1357 input_method = display->get_xim (locale, modifiers);
1351 if (input_method == NULL) 1358 if (input_method == NULL)
1352 return false; 1359 return false;
1353 1360
1354 xim = input_method->xim; 1361 xim = input_method->xim;
… …
1374 s = rxvt_splitcommastring (p); 1381 s = rxvt_splitcommastring (p);
1375 1382
1376 for (i = found = 0; !found && s[i]; i++) 1383 for (i = found = 0; !found && s[i]; i++)
1377 { 1384 {
1378 if (!strcmp (s[i], "OverTheSpot")) 1385 if (!strcmp (s[i], "OverTheSpot"))
1379 input_style = (XIMPreeditPosition | XIMStatusNothing); 1386 input_style = XIMPreeditPosition | XIMStatusNothing;
1380 else if (!strcmp (s[i], "OffTheSpot")) 1387 else if (!strcmp (s[i], "OffTheSpot"))
1381 input_style = (XIMPreeditArea | XIMStatusArea); 1388 input_style = XIMPreeditArea | XIMStatusArea;
1382 else if (!strcmp (s[i], "Root")) 1389 else if (!strcmp (s[i], "Root"))
1383 input_style = (XIMPreeditNothing | XIMStatusNothing); 1390 input_style = XIMPreeditNothing | XIMStatusNothing;
1384 else if (!strcmp (s[i], "None")) 1391 else if (!strcmp (s[i], "None"))
1385 input_style = (XIMPreeditNone | XIMStatusNone); 1392 input_style = XIMPreeditNone | XIMStatusNone;
1393#ifdef ENABLE_XIM_ONTHESPOT
1394 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1395 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1396#endif
1397 else
1398 input_style = XIMPreeditNothing | XIMStatusNothing;
1386 1399
1387 for (j = 0; j < xim_styles->count_styles; j++) 1400 for (j = 0; j < xim_styles->count_styles; j++)
1388 if (input_style == xim_styles->supported_styles[j]) 1401 if (input_style == xim_styles->supported_styles[j])
1389 { 1402 {
1390 rxvt_freecommastring (s); 1403 rxvt_freecommastring (s);
… …
1428 "*", 1441 "*",
1429 fheight, 1442 fheight,
1430 fheight + 1, fheight - 1, 1443 fheight + 1, fheight - 1,
1431 fheight - 2, fheight + 2); 1444 fheight - 2, fheight + 2);
1432 1445
1433 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1446 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1434 &missing_charset_list, &missing_charset_count, &def_string); 1447 &missing_charset_list, &missing_charset_count, &def_string);
1435 1448
1436 if (missing_charset_list) 1449 if (missing_charset_list)
1437 XFreeStringList (missing_charset_list); 1450 XFreeStringList (missing_charset_list);
1438 1451
… …
1479 XNBackground, bg, 1492 XNBackground, bg,
1480 XNArea, &status_rect, 1493 XNArea, &status_rect,
1481 XNFontSet, fs, 1494 XNFontSet, fs,
1482 NULL); 1495 NULL);
1483 } 1496 }
1497#if ENABLE_XIM_ONTHESPOT
1498 else if (input_style & XIMPreeditCallbacks)
1499 {
1500 im_set_position (spot);
1501
1502 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1503 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1504 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1505# if 0
1506 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1507# endif
1508
1509 preedit_attr = XVaCreateNestedList (0,
1510 XNSpotLocation, &spot,
1511 XNPreeditStartCallback, &xcb[0],
1512 XNPreeditDoneCallback , &xcb[1],
1513 XNPreeditDrawCallback , &xcb[2],
1514# if 0
1515 XNPreeditCaretCallback, &xcb[3],
1516# endif
1517 NULL);
1518 }
1519#endif
1484 1520
1485 Input_Context = XCreateIC (xim, 1521 Input_Context = XCreateIC (xim,
1486 XNInputStyle, input_style, 1522 XNInputStyle, input_style,
1487 XNClientWindow, vt, 1523 XNClientWindow, vt,
1488 XNFocusWindow, parent[0], 1524 XNFocusWindow, parent[0],
… …
1491 status_attr ? XNStatusAttributes : NULL, 1527 status_attr ? XNStatusAttributes : NULL,
1492 status_attr, NULL); 1528 status_attr, NULL);
1493 1529
1494 if (preedit_attr) XFree (preedit_attr); 1530 if (preedit_attr) XFree (preedit_attr);
1495 if (status_attr) XFree (status_attr); 1531 if (status_attr) XFree (status_attr);
1496 if (fs) XFreeFontSet (display->display, fs); 1532 if (fs) XFreeFontSet (dpy, fs);
1497 1533
1498 if (Input_Context == NULL) 1534 if (Input_Context == NULL)
1499 { 1535 {
1500 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1536 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1501 im_destroy (); 1537 im_destroy ();
1502 return false; 1538 return false;
1503 } 1539 }
1504 1540
1541#if 0
1542 // unfortunately, only the focus window is used by XIM, hard to fix
1543 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1544 vt_select_input ();
1545#endif
1546
1505 if (input_style & XIMPreeditArea) 1547 if (input_style & XIMPreeditArea)
1506 IMSetStatusPosition (); 1548 IMSetStatusPosition ();
1507 1549
1508 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1509 return true; 1550 return true;
1510} 1551}
1511 1552
1512void 1553void
1513rxvt_term::im_cb () 1554rxvt_term::im_cb ()
… …
1519 1560
1520 make_current (); 1561 make_current ();
1521 1562
1522 im_destroy (); 1563 im_destroy ();
1523 1564
1524 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1525 if (Input_Context) 1565 if (Input_Context)
1526 return; 1566 return;
1527 1567
1528#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1568#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1529 if (rs[Rs_imLocale]) 1569 if (rs[Rs_imLocale])
… …
1602 XFree (preedit_attr); 1642 XFree (preedit_attr);
1603 XFree (status_attr); 1643 XFree (status_attr);
1604} 1644}
1605#endif /* USE_XIM */ 1645#endif /* USE_XIM */
1606 1646
1607/*----------------------------------------------------------------------*/
1608rxvt_t rxvt_current_term;
1609
1610/*----------------------- end-of-file (C source) -----------------------*/ 1647/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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