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.189 by root, Thu Jan 19 09:47:15 2006 UTC vs.
Revision 1.223 by root, Sat Feb 18 14:14:43 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
… …
166#ifdef POINTER_BLANK 169#ifdef POINTER_BLANK
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),
174#endif
175#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb),
171#endif 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),
174 child_ev (this, &rxvt_term::child_cb), 180 child_ev (this, &rxvt_term::child_cb),
175 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
… …
182 188
183 termlist.push_back (this); 189 termlist.push_back (this);
184 190
185#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
186 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
187
188 if (!keyboard)
189 rxvt_fatal ("out of memory, aborting.\n");
190#endif 193#endif
191} 194}
192 195
193// 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.
194// for use before an emergency exit 197// for use before an emergency exit
195void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
196{ 199{
197 if (cmd_pid) 200 if (cmd_pid)
198 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
199 202
203 pty_ev.stop ();
200 delete pty; pty = 0; 204 delete pty; pty = 0;
201} 205}
202 206
203rxvt_term::~rxvt_term () 207rxvt_term::~rxvt_term ()
204{ 208{
205 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
206
207 termlist.erase (find (termlist.begin (), termlist.end(), this)); 209 termlist.erase (find (termlist.begin (), termlist.end(), this));
208 210
209 emergency_cleanup (); 211 emergency_cleanup ();
210 212
211#if ENABLE_STYLES 213#if ENABLE_STYLES
… …
215#endif 217#endif
216 delete fontset[0]; 218 delete fontset[0];
217 219
218 if (display) 220 if (display)
219 { 221 {
220 dDisp;
221
222 selection_clear (); 222 selection_clear ();
223 223
224#ifdef USE_XIM 224#ifdef USE_XIM
225 im_destroy (); 225 im_destroy ();
226#endif 226#endif
227#ifdef XTERM_SCROLLBAR 227#ifdef XTERM_SCROLLBAR
228 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 228 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
229 if (ShadowGC) XFreeGC (disp, ShadowGC); 229 if (ShadowGC) XFreeGC (dpy, ShadowGC);
230#endif 230#endif
231#ifdef PLAIN_SCROLLBAR 231#ifdef PLAIN_SCROLLBAR
232 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 232 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
233#endif 233#endif
234#ifdef NEXT_SCROLLBAR 234#ifdef NEXT_SCROLLBAR
235 if (blackGC) XFreeGC (disp, blackGC); 235 if (blackGC) XFreeGC (dpy, blackGC);
236 if (whiteGC) XFreeGC (disp, whiteGC); 236 if (whiteGC) XFreeGC (dpy, whiteGC);
237 if (grayGC) XFreeGC (disp, grayGC); 237 if (grayGC) XFreeGC (dpy, grayGC);
238 if (darkGC) XFreeGC (disp, darkGC); 238 if (darkGC) XFreeGC (dpy, darkGC);
239 if (stippleGC) XFreeGC (disp, stippleGC); 239 if (stippleGC) XFreeGC (dpy, stippleGC);
240 if (dimple) XFreePixmap (disp, dimple); 240 if (dimple) XFreePixmap (dpy, dimple);
241 if (upArrow) XFreePixmap (disp, upArrow); 241 if (upArrow) XFreePixmap (dpy, upArrow);
242 if (downArrow) XFreePixmap (disp, downArrow); 242 if (downArrow) XFreePixmap (dpy, downArrow);
243 if (upArrowHi) XFreePixmap (disp, upArrowHi); 243 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
244 if (downArrowHi) XFreePixmap (disp, downArrowHi); 244 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
245#endif 245#endif
246#ifdef RXVT_SCROLLBAR 246#ifdef RXVT_SCROLLBAR
247 if (topShadowGC) XFreeGC (disp, topShadowGC); 247 if (topShadowGC) XFreeGC (dpy, topShadowGC);
248 if (botShadowGC) XFreeGC (disp, botShadowGC); 248 if (botShadowGC) XFreeGC (dpy, botShadowGC);
249 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 249 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
250#endif 250#endif
251 if (gc) XFreeGC (disp, gc); 251 if (gc) XFreeGC (dpy, gc);
252 252
253 delete drawable; 253 delete drawable;
254 // destroy all windows 254 // destroy all windows
255 if (parent[0]) 255 if (parent[0])
256 XDestroyWindow (disp, parent[0]); 256 XDestroyWindow (dpy, parent[0]);
257 }
258 257
259 // TODO: free pixcolours, colours should become part of rxvt_display 258 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i))
260 {
261 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING
263 pix_colors_unfocused [i].free (this);
264#endif
265 }
266
267 clear ();
268 }
269
260 delete pix_colors_focused; 270 delete pix_colors_focused;
261#if OFF_FOCUS_FADING 271#if OFF_FOCUS_FADING
262 delete pix_colors_unfocused; 272 delete pix_colors_unfocused;
263#endif 273#endif
264 274
… …
270 for (int i = 0; i < allocated.size (); i++) 280 for (int i = 0; i < allocated.size (); i++)
271 free (allocated [i]); 281 free (allocated [i]);
272 282
273 free (selection.text); 283 free (selection.text);
274 // TODO: manage env vars in child only(!) 284 // TODO: manage env vars in child only(!)
275 free (env_windowid);
276 free (env_display); 285 free (env_display);
277 free (env_term); 286 free (env_term);
278 free (env_colorfgbg);
279 free (locale); 287 free (locale);
280 free (v_buffer); 288 free (v_buffer);
281 free (incr_buf); 289 free (incr_buf);
282 290
283 delete envv; 291 delete envv;
… …
303void 311void
304rxvt_term::destroy () 312rxvt_term::destroy ()
305{ 313{
306 if (destroy_ev.active) 314 if (destroy_ev.active)
307 return; 315 return;
316
317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
308 318
309#if ENABLE_OVERLAY 319#if ENABLE_OVERLAY
310 scr_overlay_off (); 320 scr_overlay_off ();
311#endif 321#endif
312 322
… …
367{ 377{
368 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 378 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
369 (*t)->emergency_cleanup (); 379 (*t)->emergency_cleanup ();
370} 380}
371 381
372#if ENABLE_FRILLS 382#if !ENABLE_MINIMAL
373static void 383static void
374print_x_error (Display *dpy, XErrorEvent *event) 384print_x_error (Display *dpy, XErrorEvent *event)
375{ 385{
376 char buffer[BUFSIZ]; 386 char buffer[BUFSIZ];
377 char mesg[BUFSIZ]; 387 char mesg[BUFSIZ];
… …
425 GET_R->allowedxerror = event->error_code; 435 GET_R->allowedxerror = event->error_code;
426 else 436 else
427 { 437 {
428 // GET_R is most likely not the terminal which caused the error, 438 // GET_R is most likely not the terminal which caused the error,
429 // so just output the error and continue 439 // so just output the error and continue
430#if ENABLE_FRILLS 440#if ENABLE_MINIMAL
441 old_xerror_handler (display, event);
442#else
431 print_x_error (display, event); 443 print_x_error (display, event);
432#else
433 old_xerror_handler (display, event);
434#endif 444#endif
435 } 445 }
436 446
437 return 0; 447 return 0;
438} 448}
… …
446 _exit (EXIT_FAILURE); 456 _exit (EXIT_FAILURE);
447} 457}
448 458
449/*----------------------------------------------------------------------*/ 459/*----------------------------------------------------------------------*/
450bool 460bool
451rxvt_term::init (int argc, const char *const *argv) 461rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
452{ 462{
463 this->envv = envv;
464
453 SET_R (this); 465 SET_R (this);
454 set_locale (""); 466 set_locale ("");
455 set_environ (envv); // few things in X do not call setlocale :( 467 set_environ (envv); // few things in X do not call setlocale :(
456 468
457 if (!init_vars ()) 469 if (!init_vars ())
… …
468#ifdef HAVE_SCROLLBARS 480#ifdef HAVE_SCROLLBARS
469 if (OPTION (Opt_scrollBar)) 481 if (OPTION (Opt_scrollBar))
470 scrollBar.setIdle (); /* set existence for size calculations */ 482 scrollBar.setIdle (); /* set existence for size calculations */
471#endif 483#endif
472 484
473#if ENABLE_PERL 485 pty = ptytty::create ();
474 if (!rs[Rs_perl_ext_1])
475 rs[Rs_perl_ext_1] = "default";
476
477 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
478 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
479 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
480 {
481 rxvt_perl.init (this);
482 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
483 }
484#endif
485
486 pty = rxvt_new_ptytty ();
487 486
488 create_windows (argc, argv); 487 create_windows (argc, argv);
489 488
490 dDisp;
491
492 init_xlocale (); 489 init_xlocale ();
493 490
494 scr_reset (); // initialize screen 491 scr_reset (); // initialize screen
495 492
496#if 0 493#if 0
497 XSynchronize (disp, True); 494 XSynchronize (dpy, True);
498#endif 495#endif
499 496
500#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
501 if (OPTION (Opt_scrollBar)) 498 if (OPTION (Opt_scrollBar))
502 resize_scrollbar (); /* create and map scrollbar */ 499 resize_scrollbar (); /* create and map scrollbar */
503#endif 500#endif
504#ifdef TRANSPARENT 501#ifdef TRANSPARENT
505 if (OPTION (Opt_transparent)) 502 if (OPTION (Opt_transparent))
506 { 503 {
507 XSelectInput (disp, display->root, PropertyChangeMask); 504 XSelectInput (dpy, display->root, PropertyChangeMask);
508 check_our_parents (); 505 check_our_parents ();
509 rootwin_ev.start (display, display->root); 506 rootwin_ev.start (display, display->root);
510 } 507 }
511#endif 508#endif
512 509
513 XMapWindow (disp, vt);
514 XMapWindow (disp, parent[0]);
515
516 set_colorfgbg (); 510 set_colorfgbg ();
517 511
518 init_command (cmd_argv); 512 init_command (cmd_argv);
519 513
520 free (cmd_argv); 514 free (cmd_argv);
… …
523 pty_ev.start (pty->pty, EVENT_READ); 517 pty_ev.start (pty->pty, EVENT_READ);
524 518
525 check_ev.start (); 519 check_ev.start ();
526 520
527 HOOK_INVOKE ((this, HOOK_START, DT_END)); 521 HOOK_INVOKE ((this, HOOK_START, DT_END));
522
523#if ENABLE_XEMBED
524 if (rs[Rs_embed])
525 {
526 long info[2] = { 0, XEMBED_MAPPED };
527
528 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
529 32, PropModeReplace, (unsigned char *)&info, 2);
530 }
531#endif
532
533 XMapWindow (dpy, vt);
534 XMapWindow (dpy, parent[0]);
528 535
529 return true; 536 return true;
530} 537}
531 538
532static struct sig_handlers 539static struct sig_handlers
… …
537 * Catch a fatal signal and tidy up before quitting 544 * Catch a fatal signal and tidy up before quitting
538 */ 545 */
539 void 546 void
540 sig_term (sig_watcher &w) 547 sig_term (sig_watcher &w)
541 { 548 {
542#ifdef DEBUG_CMD
543 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
544#endif
545 rxvt_emergency_cleanup (); 549 rxvt_emergency_cleanup ();
546 signal (w.signum, SIG_DFL); 550 signal (w.signum, SIG_DFL);
547 kill (getpid (), w.signum); 551 kill (getpid (), w.signum);
548 } 552 }
549 553
… …
557char **rxvt_environ; // startup environment 561char **rxvt_environ; // startup environment
558 562
559void 563void
560rxvt_init () 564rxvt_init ()
561{ 565{
562 uid_t uid = getuid (); 566 ptytty::init ();
563 gid_t gid = getgid ();
564
565 // before doing anything else, check for setuid/setgid operation,
566 // start the helper process and drop privileges
567 if (uid != geteuid ()
568 || gid != getegid ())
569 {
570#if PTYTTY_HELPER
571 rxvt_ptytty_server ();
572#else
573 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
574#endif
575
576 // drop privileges
577#if HAVE_SETRESUID
578 setresgid (gid, gid, gid);
579 setresuid (uid, uid, uid);
580#elif HAVE_SETREUID
581 setregid (gid, gid);
582 setreuid (uid, uid);
583#elif HAVE_SETUID
584 setgid (gid);
585 setuid (uid);
586#endif
587
588 if (uid != geteuid ()
589 || gid != getegid ())
590 rxvt_fatal ("unable to drop privileges, aborting.\n");
591 }
592 567
593 rxvt_environ = environ; 568 rxvt_environ = environ;
594 569
595 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
596 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
… …
631 rxvt_fatal ("memory allocation failure. aborting.\n"); 606 rxvt_fatal ("memory allocation failure. aborting.\n");
632 607
633 return p; 608 return p;
634} 609}
635 610
636void * 611void *
637rxvt_realloc (void *ptr, size_t size) 612rxvt_realloc (void *ptr, size_t size)
638{ 613{
639 void *p = realloc (ptr, size); 614 void *p = realloc (ptr, size);
640 615
641 if (!p) 616 if (!p)
… …
654{ 629{
655 short recalc_x, recalc_y; 630 short recalc_x, recalc_y;
656 int x, y, sb_w, flags; 631 int x, y, sb_w, flags;
657 unsigned int w, h; 632 unsigned int w, h;
658 unsigned int max_width, max_height; 633 unsigned int max_width, max_height;
659 dDisp;
660
661 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
662 ncol, nrow, szHint.width, szHint.height));
663 634
664 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 635 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
665 szHint.win_gravity = NorthWestGravity; 636 szHint.win_gravity = NorthWestGravity;
666 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 637 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
667 638
… …
729 700
730 if (scrollBar.state) 701 if (scrollBar.state)
731 { 702 {
732 sb_w = scrollbar_TotalWidth (); 703 sb_w = scrollbar_TotalWidth ();
733 szHint.base_width += sb_w; 704 szHint.base_width += sb_w;
705
734 if (!OPTION (Opt_scrollBar_right)) 706 if (!OPTION (Opt_scrollBar_right))
735 window_vt_x += sb_w; 707 window_vt_x += sb_w;
736 } 708 }
737 709
738 szHint.width_inc = fwidth; 710 szHint.width_inc = fwidth;
739 szHint.height_inc = fheight; 711 szHint.height_inc = fheight;
740 szHint.min_width = szHint.base_width + szHint.width_inc; 712 szHint.min_width = szHint.base_width + szHint.width_inc;
741 szHint.min_height = szHint.base_height + szHint.height_inc; 713 szHint.min_height = szHint.base_height + szHint.height_inc;
742 714
743 if (newwidth && newwidth - szHint.base_width < max_width) 715 if (newwidth && newwidth - szHint.base_width < max_width)
744 { 716 {
745 szHint.width = newwidth; 717 szHint.width = newwidth;
… …
764 736
765 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 737 if (scrollBar.state && OPTION (Opt_scrollBar_right))
766 window_sb_x = szHint.width - sb_w; 738 window_sb_x = szHint.width - sb_w;
767 739
768 if (recalc_x) 740 if (recalc_x)
769 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 741 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
742
770 if (recalc_y) 743 if (recalc_y)
771 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 744 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
772 745
773 ncol = width / fwidth; 746 ncol = width / fwidth;
774 nrow = height / fheight; 747 nrow = height / fheight;
775 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
776 ncol, nrow, szHint.width,
777 szHint.height));
778 return;
779} 748}
780 749
781/*----------------------------------------------------------------------*/ 750/*----------------------------------------------------------------------*/
782/* 751/*
783 * Tell the teletype handler what size the window is. 752 * Tell the teletype handler what size the window is.
… …
883 return true; 852 return true;
884} 853}
885 854
886void rxvt_term::set_string_property (Atom prop, const char *str, int len) 855void rxvt_term::set_string_property (Atom prop, const char *str, int len)
887{ 856{
888 XChangeProperty (display->display, parent[0], 857 XChangeProperty (dpy, parent[0],
889 prop, XA_STRING, 8, PropModeReplace, 858 prop, XA_STRING, 8, PropModeReplace,
890 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 859 (const unsigned char *)str, len >= 0 ? len : strlen (str));
891} 860}
892 861
893void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 862void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
894{ 863{
895 wchar_t *ws = rxvt_mbstowcs (str, len); 864 wchar_t *ws = rxvt_mbstowcs (str, len);
896 char *s = rxvt_wcstoutf8 (ws); 865 char *s = rxvt_wcstoutf8 (ws);
897 866
898 XChangeProperty (display->display, parent[0], 867 XChangeProperty (dpy, parent[0],
899 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 868 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
900 (const unsigned char *)s, strlen (s)); 869 (const unsigned char *)s, strlen (s));
901 870
902 free (s); 871 free (s);
903 free (ws); 872 free (ws);
… …
928void 897void
929rxvt_term::set_window_color (int idx, const char *color) 898rxvt_term::set_window_color (int idx, const char *color)
930{ 899{
931 rxvt_color xcol; 900 rxvt_color xcol;
932 int i; 901 int i;
933 902
934 if (color == NULL || *color == '\0') 903 if (color == NULL || *color == '\0')
935 return; 904 return;
905
906 color = strdup (color);
907 allocated.push_back ((void *)color);
908 rs[Rs_color + idx] = color;
936 909
937 /* handle color aliases */ 910 /* handle color aliases */
938 if (isdigit (*color)) 911 if (isdigit (*color))
939 { 912 {
940 i = atoi (color); 913 i = atoi (color);
941 914
942 if (i >= 8 && i <= 15) 915 if (i >= 8 && i <= 15)
943 { /* bright colors */ 916 { /* bright colors */
944 i -= 8; 917 i -= 8;
945 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
946 SET_PIXCOLOR (idx);
947 goto done; 919 goto done;
948 } 920 }
949 921
950 if (i >= 0 && i <= 7) 922 if (i >= 0 && i <= 7)
951 { /* normal colors */ 923 { /* normal colors */
952 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 924 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
953 SET_PIXCOLOR (idx);
954 goto done; 925 goto done;
955 } 926 }
956 } 927 }
957 928
958 if (!rXParseAllocColor (&xcol, color)) 929 set_color (xcol, color);
959 return;
960
961 /* XStoreColor (display->display, display->cmap, XColor*); */
962 930
963 /* 931 /*
964 * FIXME: should free colors here, but no idea how to do it so instead, 932 * FIXME: should free colors here, but no idea how to do it so instead,
965 * so just keep gobbling up the colormap 933 * so just keep gobbling up the colormap
966 */ 934 */
967# if 0
968 for (i = Color_Black; i <= Color_White; i++)
969 if (pix_colors[idx] == pix_colors[i])
970 break;
971 if (i > Color_White)
972 {
973 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
974 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
975 DisplayPlanes (display->display, display->screen));
976 }
977# endif
978 935
979 pix_colors_focused[idx] = xcol; 936 pix_colors_focused[idx] = xcol;
980 SET_PIXCOLOR (idx);
981 937
982 /* XSetWindowAttributes attr; */ 938 /* XSetWindowAttributes attr; */
983 /* Cursor cursor; */ 939 /* Cursor cursor; */
984done: 940done:
985 941
986#if OFF_FOCUS_FADING 942#if OFF_FOCUS_FADING
987 if (rs[Rs_fade]) 943 if (rs[Rs_fade])
988 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); 944 {
945 rgba c;
946 pix_colors [Color_fade].get (c);
947 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
948 }
989#endif 949#endif
990 950
991 /*TODO: handle Color_BD, scrollbar background, etc. */ 951 /*TODO: handle Color_BD, scrollbar background, etc. */
992 952
993 recolour_cursor (); 953 recolour_cursor ();
… …
999#endif /* XTERM_COLOR_CHANGE */ 959#endif /* XTERM_COLOR_CHANGE */
1000 960
1001void 961void
1002rxvt_term::recolour_cursor () 962rxvt_term::recolour_cursor ()
1003{ 963{
1004 XColor xcol[2]; 964 XColor fg, bg;
1005 965
1006 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 966 (ISSET_PIXCOLOR (Color_pointer_fg)
1007 ? pix_colors_focused[Color_pointer_fg] 967 ? pix_colors_focused[Color_pointer_fg]
1008 : pix_colors_focused[Color_fg]; 968 : pix_colors_focused[Color_fg]).get (fg);
969
1009 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 970 (ISSET_PIXCOLOR (Color_pointer_bg)
1010 ? pix_colors_focused[Color_pointer_bg] 971 ? pix_colors_focused[Color_pointer_bg]
1011 : pix_colors_focused[Color_bg]; 972 : pix_colors_focused[Color_bg]).get (bg);
1012 973
1013 XQueryColors (display->display, display->cmap, xcol, 2); 974 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1014 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1015} 975}
1016 976
1017/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
1018/* 978/*
1019 * find if fg/bg matches any of the normal (low-intensity) colors 979 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1023{ 983{
1024 unsigned int i; 984 unsigned int i;
1025 const char *xpmb = "\0"; 985 const char *xpmb = "\0";
1026 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 986 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1027 987
1028 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1029 strcpy (fstr, "default"); 988 strcpy (fstr, "default");
1030 strcpy (bstr, "default"); 989 strcpy (bstr, "default");
1031 for (i = Color_Black; i <= Color_White; i++) 990 for (i = Color_Black; i <= Color_White; i++)
1032 if (pix_colors[Color_fg] == pix_colors[i]) 991 if (pix_colors[Color_fg] == pix_colors[i])
1033 { 992 {
… …
1048 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1007 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1049} 1008}
1050 1009
1051/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
1052 1011
1053int 1012bool
1054rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1013rxvt_term::set_color (rxvt_color &color, const char *name)
1055{ 1014{
1056 if (!screen_in_out->set (display, colour)) 1015 if (color.set (this, name))
1057 {
1058 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1059 return false;
1060 }
1061
1062 return true; 1016 return true;
1017
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1019 return false;
1020}
1021
1022void
1023rxvt_term::alias_color (int dst, int src)
1024{
1025 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1063} 1026}
1064 1027
1065/* -------------------------------------------------------------------- * 1028/* -------------------------------------------------------------------- *
1066 * - WINDOW RESIZING - * 1029 * - WINDOW RESIZING - *
1067 * -------------------------------------------------------------------- */ 1030 * -------------------------------------------------------------------- */
1068void 1031void
1069rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1070{ 1033{
1071 int fix_screen; 1034 int fix_screen;
1072 int old_width = szHint.width, old_height = szHint.height; 1035 int old_width = szHint.width;
1073 dDisp; 1036 int old_height = szHint.height;
1074 1037
1075 window_calc (newwidth, newheight); 1038 window_calc (newwidth, newheight);
1039
1040 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1076 XSetWMNormalHints (disp, parent[0], &szHint); 1041 XSetWMNormalHints (dpy, parent[0], &szHint);
1077 1042
1078 if (!ignoreparent) 1043 if (!ignoreparent)
1079 { 1044 {
1080#ifdef SMART_RESIZE 1045#ifdef SMART_RESIZE
1081 /* 1046 /*
… …
1085 int x, y, x1, y1; 1050 int x, y, x1, y1;
1086 int dx, dy; 1051 int dx, dy;
1087 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1088 Window unused_cr; 1053 Window unused_cr;
1089 1054
1090 XTranslateCoordinates (disp, parent[0], display->root, 1055 XTranslateCoordinates (dpy, parent[0], display->root,
1091 0, 0, &x, &y, &unused_cr); 1056 0, 0, &x, &y, &unused_cr);
1092 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1057 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1093 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1094 /* 1059 /*
1095 * if display->root isn't the parent window, a WM will probably have offset 1060 * if display->root isn't the parent window, a WM will probably have offset
1096 * our position for handles and decorations. Counter it 1061 * our position for handles and decorations. Counter it
1097 */ 1062 */
… …
1099 { 1064 {
1100 x -= x1; 1065 x -= x1;
1101 y -= y1; 1066 y -= y1;
1102 } 1067 }
1103 1068
1104 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1069 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1105 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1070 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1106 dx = old_width - szHint.width; 1071 dx = old_width - szHint.width;
1107 dy = old_height - szHint.height; 1072 dy = old_height - szHint.height;
1108 1073
1109 /* Check position of the center of the window */ 1074 /* Check position of the center of the window */
1110 if (x < x1) /* left half */ 1075 if (x < x1) /* left half */
1111 dx = 0; 1076 dx = 0;
… …
1114 if (y < y1) /* top half */ 1079 if (y < y1) /* top half */
1115 dy = 0; 1080 dy = 0;
1116 else if (y == y1) /* exact center */ 1081 else if (y == y1) /* exact center */
1117 dy /= 2; 1082 dy /= 2;
1118 1083
1119 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1084 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1120 szHint.width, szHint.height); 1085 szHint.width, szHint.height);
1121#else 1086#else
1122 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1087 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1123#endif 1088#endif
1124 } 1089 }
1125 1090
1126 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1127 1092
1128 if (fix_screen || newwidth != old_width || newheight != old_height) 1093 if (fix_screen || newwidth != old_width || newheight != old_height)
1129 { 1094 {
1130 if (scrollBar.state) 1095 if (scrollBar.state)
1131 { 1096 {
1132 XMoveResizeWindow (disp, scrollBar.win, 1097 XMoveResizeWindow (dpy, scrollBar.win,
1133 window_sb_x, 0, 1098 window_sb_x, 0,
1134 scrollbar_TotalWidth (), szHint.height); 1099 scrollbar_TotalWidth (), szHint.height);
1135 resize_scrollbar (); 1100 resize_scrollbar ();
1136 } 1101 }
1137 1102
1138 XMoveResizeWindow (disp, vt, 1103 XMoveResizeWindow (dpy, vt,
1139 window_vt_x, window_vt_y, 1104 window_vt_x, window_vt_y,
1140 width, height); 1105 width, height);
1141 1106
1142 scr_clear (); 1107 scr_clear ();
1143#ifdef XPM_BACKGROUND 1108#ifdef XPM_BACKGROUND
1144 resize_pixmap (); 1109 resize_pixmap ();
1145#endif 1110#endif
1146 } 1111 }
1147 1112
1148 if (fix_screen || old_height == 0) 1113 if (fix_screen || old_height == 0)
1149 {
1150 int curr_screen = -1;
1151 int old_ncol = prev_ncol;
1152
1153 /* scr_reset only works on the primary screen */
1154 if (old_height) /* this is not the first time through */
1155 {
1156 unsigned int ocol = ncol;
1157 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1158 curr_screen = scr_change_screen (PRIMARY);
1159 ncol = ocol;
1160 }
1161
1162 scr_reset (); 1114 scr_reset ();
1163 1115
1164 if (curr_screen >= 0) /* this is not the first time through */ 1116 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1165 { 1117 //scr_touch (false);
1166 scr_change_screen (curr_screen);
1167 selection_check (old_ncol != ncol ? 4 : 0);
1168 }
1169 }
1170
1171 old_width = szHint.width;
1172 old_height = szHint.height;
1173 1118
1174#ifdef XPM_BACKGROUND 1119#ifdef XPM_BACKGROUND
1175 if (pixmap) 1120 if (pixmap)
1176 scr_touch (false); 1121 scr_touch (false);
1177#endif 1122#endif
1178 1123
1179#ifdef USE_XIM 1124#ifdef USE_XIM
1180 IMSetStatusPosition (); 1125 IMSetPosition ();
1181#endif 1126#endif
1182} 1127}
1183 1128
1184/* 1129/*
1185 * Set the width/height of the vt window in characters. Units are pixels. 1130 * Set the width/height of the vt window in characters. Units are pixels.
… …
1190{ 1135{
1191 XWindowAttributes wattr; 1136 XWindowAttributes wattr;
1192 1137
1193 if (newwidth == 0 || newheight == 0) 1138 if (newwidth == 0 || newheight == 0)
1194 { 1139 {
1195 XGetWindowAttributes (display->display, display->root, &wattr); 1140 XGetWindowAttributes (dpy, display->root, &wattr);
1196 1141
1197 if (newwidth == 0) 1142 if (newwidth == 0)
1198 newwidth = wattr.width - szHint.base_width; 1143 newwidth = wattr.width - szHint.base_width;
1199 if (newheight == 0) 1144 if (newheight == 0)
1200 newheight = wattr.height - szHint.base_height; 1145 newheight = wattr.height - szHint.base_height;
… …
1214#ifdef USE_XIM 1159#ifdef USE_XIM
1215 1160
1216void 1161void
1217rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1162rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1218{ 1163{
1219 fg = pix_colors[Color_fg]; 1164 fg = pix_colors [Color_fg];
1220 bg = pix_colors[Color_bg]; 1165 bg = pix_colors [Color_bg];
1221} 1166}
1222 1167
1223void 1168void
1224rxvt_term::im_set_size (XRectangle &size) 1169rxvt_term::im_set_size (XRectangle &size)
1225{ 1170{
… …
1262 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1207 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1263 1208
1264 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1209 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1265 *p = '\0'; 1210 *p = '\0';
1266 1211
1267 atom = XInternAtom (display->display, server, False); 1212 atom = XInternAtom (dpy, server, False);
1268 win = XGetSelectionOwner (display->display, atom); 1213 win = XGetSelectionOwner (dpy, atom);
1269 1214
1270 if (win != None) 1215 if (win != None)
1271 return True; 1216 return True;
1272 } 1217 }
1273 1218
… …
1280 XPoint nspot; 1225 XPoint nspot;
1281 XVaNestedList preedit_attr; 1226 XVaNestedList preedit_attr;
1282 1227
1283 if (!Input_Context 1228 if (!Input_Context
1284 || !focus 1229 || !focus
1285 || !(input_style & XIMPreeditPosition)) 1230 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1286 return; 1231 return;
1287 1232
1288 im_set_position (nspot); 1233 im_set_position (nspot);
1289 1234
1290 if (nspot.x == spot.x && nspot.y == spot.y) 1235 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1309 input_method = 0; 1254 input_method = 0;
1310 } 1255 }
1311 1256
1312 Input_Context = 0; 1257 Input_Context = 0;
1313} 1258}
1259
1260#ifdef ENABLE_XIM_ONTHESPOT
1261
1262static void
1263xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1264{
1265 ((rxvt_term *)client_data)->make_current ();
1266 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1267}
1268
1269static void
1270xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1271{
1272 ((rxvt_term *)client_data)->make_current ();
1273 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1274}
1275
1276static void
1277xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1278{
1279 rxvt_term *term = (rxvt_term *)client_data;
1280 XIMText *text = call_data->text;
1281
1282 term->make_current ();
1283
1284 if (text)
1285 {
1286 void *str;
1287
1288 if (!text->encoding_is_wchar && text->string.multi_byte)
1289 {
1290 // of course, X makes it ugly again
1291 if (term->rs[Rs_imLocale])
1292 SET_LOCALE (term->rs[Rs_imLocale]);
1293
1294 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1295 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1296
1297 if (term->rs[Rs_imLocale])
1298 SET_LOCALE (term->locale);
1299 }
1300 else
1301 str = (void *)text->string.wide_char;
1302
1303 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1304 DT_INT, call_data->caret,
1305 DT_INT, call_data->chg_first,
1306 DT_INT, call_data->chg_length,
1307 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1308 DT_WCS_LEN, str, str ? (int)text->length : 0,
1309 DT_END));
1310 }
1311 else
1312 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1313 DT_INT, call_data->caret,
1314 DT_INT, call_data->chg_first,
1315 DT_INT, call_data->chg_length,
1316 DT_END));
1317}
1318
1319#if 0
1320static void
1321xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1322{
1323 ((rxvt_term *)client_data)->make_current ();
1324 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1325 DT_INT, call_data->position,
1326 DT_INT, call_data->direction,
1327 DT_INT, call_data->style,
1328 DT_END));
1329}
1330#endif
1331
1332#endif
1314 1333
1315/* 1334/*
1316 * Try to open a XIM with the current modifiers, then see if we can 1335 * Try to open a XIM with the current modifiers, then see if we can
1317 * open a suitable preedit type 1336 * open a suitable preedit type
1318 */ 1337 */
… …
1325 XRectangle rect, status_rect, needed_rect; 1344 XRectangle rect, status_rect, needed_rect;
1326 unsigned long fg, bg; 1345 unsigned long fg, bg;
1327 const char *p; 1346 const char *p;
1328 char **s; 1347 char **s;
1329 XIMStyles *xim_styles; 1348 XIMStyles *xim_styles;
1349#ifdef ENABLE_XIM_ONTHESPOT
1350 XIMCallback xcb[4];
1351#endif
1330 1352
1331 set_environ (envv); 1353 set_environ (envv);
1332 1354
1333 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1355 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1334 return false; 1356 return false;
1335 1357
1336 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1337 input_method = display->get_xim (locale, modifiers); 1358 input_method = display->get_xim (locale, modifiers);
1338 if (input_method == NULL) 1359 if (input_method == NULL)
1339 return false; 1360 return false;
1340 1361
1341 xim = input_method->xim; 1362 xim = input_method->xim;
… …
1361 s = rxvt_splitcommastring (p); 1382 s = rxvt_splitcommastring (p);
1362 1383
1363 for (i = found = 0; !found && s[i]; i++) 1384 for (i = found = 0; !found && s[i]; i++)
1364 { 1385 {
1365 if (!strcmp (s[i], "OverTheSpot")) 1386 if (!strcmp (s[i], "OverTheSpot"))
1366 input_style = (XIMPreeditPosition | XIMStatusNothing); 1387 input_style = XIMPreeditPosition | XIMStatusNothing;
1367 else if (!strcmp (s[i], "OffTheSpot")) 1388 else if (!strcmp (s[i], "OffTheSpot"))
1368 input_style = (XIMPreeditArea | XIMStatusArea); 1389 input_style = XIMPreeditArea | XIMStatusArea;
1369 else if (!strcmp (s[i], "Root")) 1390 else if (!strcmp (s[i], "Root"))
1370 input_style = (XIMPreeditNothing | XIMStatusNothing); 1391 input_style = XIMPreeditNothing | XIMStatusNothing;
1371 else if (!strcmp (s[i], "None")) 1392 else if (!strcmp (s[i], "None"))
1372 input_style = (XIMPreeditNone | XIMStatusNone); 1393 input_style = XIMPreeditNone | XIMStatusNone;
1394#ifdef ENABLE_XIM_ONTHESPOT
1395 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1396 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1397#endif
1398 else
1399 input_style = XIMPreeditNothing | XIMStatusNothing;
1373 1400
1374 for (j = 0; j < xim_styles->count_styles; j++) 1401 for (j = 0; j < xim_styles->count_styles; j++)
1375 if (input_style == xim_styles->supported_styles[j]) 1402 if (input_style == xim_styles->supported_styles[j])
1376 { 1403 {
1377 rxvt_freecommastring (s); 1404 rxvt_freecommastring (s);
… …
1415 "*", 1442 "*",
1416 fheight, 1443 fheight,
1417 fheight + 1, fheight - 1, 1444 fheight + 1, fheight - 1,
1418 fheight - 2, fheight + 2); 1445 fheight - 2, fheight + 2);
1419 1446
1420 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1447 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1421 &missing_charset_list, &missing_charset_count, &def_string); 1448 &missing_charset_list, &missing_charset_count, &def_string);
1422 1449
1423 if (missing_charset_list) 1450 if (missing_charset_list)
1424 XFreeStringList (missing_charset_list); 1451 XFreeStringList (missing_charset_list);
1425 1452
… …
1466 XNBackground, bg, 1493 XNBackground, bg,
1467 XNArea, &status_rect, 1494 XNArea, &status_rect,
1468 XNFontSet, fs, 1495 XNFontSet, fs,
1469 NULL); 1496 NULL);
1470 } 1497 }
1498#if ENABLE_XIM_ONTHESPOT
1499 else if (input_style & XIMPreeditCallbacks)
1500 {
1501 im_set_position (spot);
1502
1503 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1504 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1505 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1506# if 0
1507 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1508# endif
1509
1510 preedit_attr = XVaCreateNestedList (0,
1511 XNSpotLocation, &spot,
1512 XNPreeditStartCallback, &xcb[0],
1513 XNPreeditDoneCallback , &xcb[1],
1514 XNPreeditDrawCallback , &xcb[2],
1515# if 0
1516 XNPreeditCaretCallback, &xcb[3],
1517# endif
1518 NULL);
1519 }
1520#endif
1471 1521
1472 Input_Context = XCreateIC (xim, 1522 Input_Context = XCreateIC (xim,
1473 XNInputStyle, input_style, 1523 XNInputStyle, input_style,
1474 XNClientWindow, vt, 1524 XNClientWindow, vt,
1475 XNFocusWindow, parent[0], 1525 XNFocusWindow, parent[0],
… …
1477 preedit_attr, 1527 preedit_attr,
1478 status_attr ? XNStatusAttributes : NULL, 1528 status_attr ? XNStatusAttributes : NULL,
1479 status_attr, NULL); 1529 status_attr, NULL);
1480 1530
1481 if (preedit_attr) XFree (preedit_attr); 1531 if (preedit_attr) XFree (preedit_attr);
1482 if (status_attr) XFree (status_attr); 1532 if (status_attr) XFree (status_attr);
1483 if (fs) XFreeFontSet (display->display, fs); 1533 if (fs) XFreeFontSet (dpy, fs);
1484 1534
1485 if (Input_Context == NULL) 1535 if (Input_Context == NULL)
1486 { 1536 {
1487 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1537 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1488 im_destroy (); 1538 im_destroy ();
1489 return false; 1539 return false;
1490 } 1540 }
1491 1541
1492 if (input_style & XIMPreeditArea) 1542#if 0
1543 // unfortunately, only the focus window is used by XIM, hard to fix
1544 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1545 vt_select_input ();
1546#endif
1547
1493 IMSetStatusPosition (); 1548 IMSetPosition ();
1494 1549
1495 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1496 return true; 1550 return true;
1497} 1551}
1498 1552
1499void 1553void
1500rxvt_term::im_cb () 1554rxvt_term::im_cb ()
… …
1506 1560
1507 make_current (); 1561 make_current ();
1508 1562
1509 im_destroy (); 1563 im_destroy ();
1510 1564
1511 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1512 if (Input_Context) 1565 if (Input_Context)
1513 return; 1566 return;
1514 1567
1515#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1568#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1516 if (rs[Rs_imLocale]) 1569 if (rs[Rs_imLocale])
… …
1558 SET_LOCALE (locale); 1611 SET_LOCALE (locale);
1559#endif 1612#endif
1560} 1613}
1561 1614
1562void 1615void
1563rxvt_term::IMSetStatusPosition () 1616rxvt_term::IMSetPosition ()
1564{ 1617{
1565 XRectangle preedit_rect, status_rect, *needed_rect; 1618 XRectangle preedit_rect, status_rect, *needed_rect;
1566 XVaNestedList preedit_attr, status_attr; 1619 XVaNestedList preedit_attr, status_attr;
1567 1620
1568 if (!Input_Context 1621 if (!Input_Context
1569 || !focus 1622 || !focus
1570 || !(input_style & XIMPreeditArea) 1623 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1571 || !IMisRunning ()) 1624 || !IMisRunning ())
1572 return; 1625 return;
1573 1626
1627 if (input_style & XIMPreeditPosition)
1628 {
1629 im_set_size (preedit_rect);
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631
1632 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, NULL);
1634 }
1635 else
1636 {
1574 /* Getting the necessary width of preedit area */ 1637 /* Getting the necessary width of preedit area */
1575 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1638 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1576 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1639 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1577 XFree (status_attr); 1640 XFree (status_attr);
1578 1641
1579 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1642 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1580 XFree (needed_rect); 1643 XFree (needed_rect);
1581 1644
1582 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1645 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1583 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1646 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1584 1647
1585 XSetICValues (Input_Context, 1648 XSetICValues (Input_Context,
1586 XNPreeditAttributes, preedit_attr, 1649 XNPreeditAttributes, preedit_attr,
1587 XNStatusAttributes, status_attr, NULL); 1650 XNStatusAttributes, status_attr,
1651 NULL);
1588 1652
1653 XFree (status_attr);
1654 }
1655
1589 XFree (preedit_attr); 1656 XFree (preedit_attr);
1590 XFree (status_attr);
1591} 1657}
1592#endif /* USE_XIM */ 1658#endif /* USE_XIM */
1593 1659
1594/*----------------------------------------------------------------------*/
1595rxvt_t rxvt_current_term;
1596
1597/*----------------------- end-of-file (C source) -----------------------*/ 1660/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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