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.193 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.231 by root, Sun Aug 27 10:14:47 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
56static char curlocale[128], savelocale[128]; 56static char curlocale[128], savelocale[128];
57 57
58bool 58bool
59rxvt_set_locale (const char *locale) NOTHROW 59rxvt_set_locale (const char *locale) NOTHROW
60{ 60{
61 int size = strlen (locale) + 1;
62
63 if (size > sizeof (curlocale))
64 rxvt_fatal ("locale string too long, aborting.\n");
65
61 if (!locale || !strncmp (locale, curlocale, 128)) 66 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 67 return false;
63 68
64 strncpy (curlocale, locale, 128); 69 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 70 setlocale (LC_CTYPE, curlocale);
66 return true; 71 return true;
67} 72}
68 73
69void 74void
… …
143} 148}
144#endif 149#endif
145 150
146rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
147 : 152 :
148#if TRANSPARENT 153#if TRANSPARENT || ENABLE_PERL
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
150#endif 155#endif
151#ifdef HAVE_SCROLLBARS 156#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 157 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 158#endif
… …
198void rxvt_term::emergency_cleanup () 203void rxvt_term::emergency_cleanup ()
199{ 204{
200 if (cmd_pid) 205 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 206 kill (-cmd_pid, SIGHUP);
202 207
208 pty_ev.stop ();
203 delete pty; pty = 0; 209 delete pty; pty = 0;
204} 210}
205 211
206rxvt_term::~rxvt_term () 212rxvt_term::~rxvt_term ()
207{ 213{
… …
216#endif 222#endif
217 delete fontset[0]; 223 delete fontset[0];
218 224
219 if (display) 225 if (display)
220 { 226 {
221 dDisp;
222
223 selection_clear (); 227 selection_clear ();
224 228
225#ifdef USE_XIM 229#ifdef USE_XIM
226 im_destroy (); 230 im_destroy ();
227#endif 231#endif
228#ifdef XTERM_SCROLLBAR 232#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 233 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 234 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 235#endif
232#ifdef PLAIN_SCROLLBAR 236#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 237 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 238#endif
235#ifdef NEXT_SCROLLBAR 239#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 240 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 241 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 242 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 243 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 244 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 245 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 246 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 247 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 248 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 249 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 250#endif
247#ifdef RXVT_SCROLLBAR 251#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 252 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 253 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 254 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 255#endif
252 if (gc) XFreeGC (disp, gc); 256 if (gc) XFreeGC (dpy, gc);
253 257
254 delete drawable; 258 delete drawable;
255 // destroy all windows 259 // destroy all windows
256 if (parent[0]) 260 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 261 XDestroyWindow (dpy, parent[0]);
258 }
259 262
260 // TODO: free pixcolours, colours should become part of rxvt_display 263 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 264 if (ISSET_PIXCOLOR (i))
265 {
266 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 267#if OFF_FOCUS_FADING
268 pix_colors_unfocused [i].free (this);
269#endif
270 }
271
272 clear ();
273 }
274
275 delete [] pix_colors_focused;
276#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 277 delete [] pix_colors_unfocused;
264#endif 278#endif
265 279
266 displays.put (display); 280 displays.put (display);
267 281
268 scr_release (); 282 scr_release ();
… …
271 for (int i = 0; i < allocated.size (); i++) 285 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 286 free (allocated [i]);
273 287
274 free (selection.text); 288 free (selection.text);
275 // TODO: manage env vars in child only(!) 289 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 290 free (env_display);
278 free (env_term); 291 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 292 free (locale);
281 free (v_buffer); 293 free (v_buffer);
282 free (incr_buf); 294 free (incr_buf);
283 295
284 delete envv; 296 delete envv;
… …
305rxvt_term::destroy () 317rxvt_term::destroy ()
306{ 318{
307 if (destroy_ev.active) 319 if (destroy_ev.active)
308 return; 320 return;
309 321
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 322 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 323
313#if ENABLE_OVERLAY 324#if ENABLE_OVERLAY
314 scr_overlay_off (); 325 scr_overlay_off ();
315#endif 326#endif
316 327
… …
320 im_ev.stop (display); 331 im_ev.stop (display);
321#endif 332#endif
322#if HAVE_SCROLLBARS 333#if HAVE_SCROLLBARS
323 scrollbar_ev.stop (display); 334 scrollbar_ev.stop (display);
324#endif 335#endif
325#if TRANSPARENT 336#if TRANSPARENT || ENABLE_PERL
326 rootwin_ev.stop (display); 337 rootwin_ev.stop (display);
327#endif 338#endif
328 incr_ev.stop (); 339 incr_ev.stop ();
329 termwin_ev.stop (display); 340 termwin_ev.stop (display);
330 vt_ev.stop (display); 341 vt_ev.stop (display);
… …
371{ 382{
372 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
373 (*t)->emergency_cleanup (); 384 (*t)->emergency_cleanup ();
374} 385}
375 386
376#if ENABLE_FRILLS 387#if !ENABLE_MINIMAL
377static void 388static void
378print_x_error (Display *dpy, XErrorEvent *event) 389print_x_error (Display *dpy, XErrorEvent *event)
379{ 390{
380 char buffer[BUFSIZ]; 391 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 392 char mesg[BUFSIZ];
… …
429 GET_R->allowedxerror = event->error_code; 440 GET_R->allowedxerror = event->error_code;
430 else 441 else
431 { 442 {
432 // GET_R is most likely not the terminal which caused the error, 443 // GET_R is most likely not the terminal which caused the error,
433 // so just output the error and continue 444 // so just output the error and continue
434#if ENABLE_FRILLS 445#if ENABLE_MINIMAL
446 old_xerror_handler (display, event);
447#else
435 print_x_error (display, event); 448 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 449#endif
439 } 450 }
440 451
441 return 0; 452 return 0;
442} 453}
… …
450 _exit (EXIT_FAILURE); 461 _exit (EXIT_FAILURE);
451} 462}
452 463
453/*----------------------------------------------------------------------*/ 464/*----------------------------------------------------------------------*/
454bool 465bool
455rxvt_term::init (int argc, const char *const *argv) 466rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
456{ 467{
468 this->envv = envv;
469
457 SET_R (this); 470 SET_R (this);
458 set_locale (""); 471 set_locale ("");
459 set_environ (envv); // few things in X do not call setlocale :( 472 set_environ (envv); // few things in X do not call setlocale :(
460 473
461 if (!init_vars ()) 474 if (!init_vars ())
… …
472#ifdef HAVE_SCROLLBARS 485#ifdef HAVE_SCROLLBARS
473 if (OPTION (Opt_scrollBar)) 486 if (OPTION (Opt_scrollBar))
474 scrollBar.setIdle (); /* set existence for size calculations */ 487 scrollBar.setIdle (); /* set existence for size calculations */
475#endif 488#endif
476 489
477 pty = rxvt_new_ptytty (); 490 pty = ptytty::create ();
478 491
479 create_windows (argc, argv); 492 create_windows (argc, argv);
480 493
481 dDisp;
482
483 init_xlocale (); 494 init_xlocale ();
484 495
485 scr_reset (); // initialize screen 496 scr_reset (); // initialize screen
486 497
487#if 0 498#if 0
488 XSynchronize (disp, True); 499 XSynchronize (dpy, True);
489#endif 500#endif
490 501
491#ifdef HAVE_SCROLLBARS 502#ifdef HAVE_SCROLLBARS
492 if (OPTION (Opt_scrollBar)) 503 if (OPTION (Opt_scrollBar))
493 resize_scrollbar (); /* create and map scrollbar */ 504 resize_scrollbar (); /* create and map scrollbar */
494#endif 505#endif
495#ifdef TRANSPARENT 506#ifdef TRANSPARENT
496 if (OPTION (Opt_transparent)) 507 if (OPTION (Opt_transparent))
497 { 508 {
498 XSelectInput (disp, display->root, PropertyChangeMask); 509 XSelectInput (dpy, display->root, PropertyChangeMask);
499 check_our_parents (); 510 check_our_parents ();
500 rootwin_ev.start (display, display->root); 511 rootwin_ev.start (display, display->root);
501 } 512 }
502#endif 513#endif
514#if ENABLE_PERL
515 rootwin_ev.start (display, display->root);
516#endif
503 517
504 set_colorfgbg (); 518 set_colorfgbg ();
505 519
506 init_command (cmd_argv); 520 init_command (cmd_argv);
507 521
… …
512 526
513 check_ev.start (); 527 check_ev.start ();
514 528
515 HOOK_INVOKE ((this, HOOK_START, DT_END)); 529 HOOK_INVOKE ((this, HOOK_START, DT_END));
516 530
531#if ENABLE_XEMBED
532 if (rs[Rs_embed])
533 {
534 long info[2] = { 0, XEMBED_MAPPED };
535
536 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
537 32, PropModeReplace, (unsigned char *)&info, 2);
538 }
539#endif
540
517 XMapWindow (disp, vt); 541 XMapWindow (dpy, vt);
518 XMapWindow (disp, parent[0]); 542 XMapWindow (dpy, parent[0]);
519 543
520 return true; 544 return true;
521} 545}
522 546
523static struct sig_handlers 547static struct sig_handlers
… …
528 * Catch a fatal signal and tidy up before quitting 552 * Catch a fatal signal and tidy up before quitting
529 */ 553 */
530 void 554 void
531 sig_term (sig_watcher &w) 555 sig_term (sig_watcher &w)
532 { 556 {
533#ifdef DEBUG_CMD
534 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
535#endif
536 rxvt_emergency_cleanup (); 557 rxvt_emergency_cleanup ();
537 signal (w.signum, SIG_DFL); 558 signal (w.signum, SIG_DFL);
538 kill (getpid (), w.signum); 559 kill (getpid (), w.signum);
539 } 560 }
540 561
… …
548char **rxvt_environ; // startup environment 569char **rxvt_environ; // startup environment
549 570
550void 571void
551rxvt_init () 572rxvt_init ()
552{ 573{
553 uid_t uid = getuid (); 574 ptytty::init ();
554 gid_t gid = getgid ();
555
556 // before doing anything else, check for setuid/setgid operation,
557 // start the helper process and drop privileges
558 if (uid != geteuid ()
559 || gid != getegid ())
560 {
561#if PTYTTY_HELPER
562 rxvt_ptytty_server ();
563#else
564 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
565#endif
566
567 // drop privileges
568#if HAVE_SETRESUID
569 setresgid (gid, gid, gid);
570 setresuid (uid, uid, uid);
571#elif HAVE_SETREUID
572 setregid (gid, gid);
573 setreuid (uid, uid);
574#elif HAVE_SETUID
575 setgid (gid);
576 setuid (uid);
577#endif
578
579 if (uid != geteuid ()
580 || gid != getegid ())
581 rxvt_fatal ("unable to drop privileges, aborting.\n");
582 }
583 575
584 rxvt_environ = environ; 576 rxvt_environ = environ;
585 577
586 signal (SIGHUP, SIG_IGN); 578 signal (SIGHUP, SIG_IGN);
587 signal (SIGPIPE, SIG_IGN); 579 signal (SIGPIPE, SIG_IGN);
… …
645{ 637{
646 short recalc_x, recalc_y; 638 short recalc_x, recalc_y;
647 int x, y, sb_w, flags; 639 int x, y, sb_w, flags;
648 unsigned int w, h; 640 unsigned int w, h;
649 unsigned int max_width, max_height; 641 unsigned int max_width, max_height;
650 dDisp;
651
652 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
653 ncol, nrow, szHint.width, szHint.height));
654 642
655 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 643 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
656 szHint.win_gravity = NorthWestGravity; 644 szHint.win_gravity = NorthWestGravity;
657 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 645 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
658 646
… …
720 708
721 if (scrollBar.state) 709 if (scrollBar.state)
722 { 710 {
723 sb_w = scrollbar_TotalWidth (); 711 sb_w = scrollbar_TotalWidth ();
724 szHint.base_width += sb_w; 712 szHint.base_width += sb_w;
713
725 if (!OPTION (Opt_scrollBar_right)) 714 if (!OPTION (Opt_scrollBar_right))
726 window_vt_x += sb_w; 715 window_vt_x += sb_w;
727 } 716 }
728 717
729 szHint.width_inc = fwidth; 718 szHint.width_inc = fwidth;
730 szHint.height_inc = fheight; 719 szHint.height_inc = fheight;
731 szHint.min_width = szHint.base_width + szHint.width_inc; 720 szHint.min_width = szHint.base_width + szHint.width_inc;
732 szHint.min_height = szHint.base_height + szHint.height_inc; 721 szHint.min_height = szHint.base_height + szHint.height_inc;
733 722
734 if (newwidth && newwidth - szHint.base_width < max_width) 723 if (newwidth && newwidth - szHint.base_width < max_width)
735 { 724 {
736 szHint.width = newwidth; 725 szHint.width = newwidth;
… …
755 744
756 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 745 if (scrollBar.state && OPTION (Opt_scrollBar_right))
757 window_sb_x = szHint.width - sb_w; 746 window_sb_x = szHint.width - sb_w;
758 747
759 if (recalc_x) 748 if (recalc_x)
760 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 749 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
750
761 if (recalc_y) 751 if (recalc_y)
762 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 752 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
763 753
764 ncol = width / fwidth; 754 ncol = width / fwidth;
765 nrow = height / fheight; 755 nrow = height / fheight;
766 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
767 ncol, nrow, szHint.width,
768 szHint.height));
769 return;
770} 756}
771 757
772/*----------------------------------------------------------------------*/ 758/*----------------------------------------------------------------------*/
773/* 759/*
774 * Tell the teletype handler what size the window is. 760 * Tell the teletype handler what size the window is.
… …
826 delete fontset[0]; 812 delete fontset[0];
827 fontset[0] = fs; 813 fontset[0] = fs;
828 814
829 prop = (*fs)[1]->properties (); 815 prop = (*fs)[1]->properties ();
830 prop.height += lineSpace; 816 prop.height += lineSpace;
817
831 fs->set_prop (prop); 818 fs->set_prop (prop, false);
832 819
833 fwidth = prop.width; 820 fwidth = prop.width;
834 fheight = prop.height; 821 fheight = prop.height;
835 fbase = prop.ascent; 822 fbase = prop.ascent;
836 823
… …
845 { 832 {
846 fontset[style] = fs = new rxvt_fontset (this); 833 fontset[style] = fs = new rxvt_fontset (this);
847 rxvt_fontprop prop2 = prop; 834 rxvt_fontprop prop2 = prop;
848 835
849 if (res) 836 if (res)
850 prop2.weight = prop2.slant = rxvt_fontprop::unset; 837 {
838 fs->populate (res);
839 fs->set_prop (prop2, false);
840 }
851 else 841 else
852 { 842 {
853 res = fontset[0]->fontdesc; 843 fs->populate (fontset[0]->fontdesc);
854 844
855 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 845 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
856 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 846 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
847
848 fs->set_prop (prop2, true);
857 } 849 }
858 850
859 fs->populate (res);
860 fs->set_prop (prop2);
861 } 851 }
862#else 852#else
863 fontset[style] = fontset[0]; 853 fontset[style] = fontset[0];
864#endif 854#endif
865 } 855 }
… …
874 return true; 864 return true;
875} 865}
876 866
877void rxvt_term::set_string_property (Atom prop, const char *str, int len) 867void rxvt_term::set_string_property (Atom prop, const char *str, int len)
878{ 868{
879 XChangeProperty (display->display, parent[0], 869 XChangeProperty (dpy, parent[0],
880 prop, XA_STRING, 8, PropModeReplace, 870 prop, XA_STRING, 8, PropModeReplace,
881 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 871 (const unsigned char *)str, len >= 0 ? len : strlen (str));
882} 872}
883 873
884void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 874void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
885{ 875{
886 wchar_t *ws = rxvt_mbstowcs (str, len); 876 wchar_t *ws = rxvt_mbstowcs (str, len);
887 char *s = rxvt_wcstoutf8 (ws); 877 char *s = rxvt_wcstoutf8 (ws);
888 878
889 XChangeProperty (display->display, parent[0], 879 XChangeProperty (dpy, parent[0],
890 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 880 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
891 (const unsigned char *)s, strlen (s)); 881 (const unsigned char *)s, strlen (s));
892 882
893 free (s); 883 free (s);
894 free (ws); 884 free (ws);
… …
919void 909void
920rxvt_term::set_window_color (int idx, const char *color) 910rxvt_term::set_window_color (int idx, const char *color)
921{ 911{
922 rxvt_color xcol; 912 rxvt_color xcol;
923 int i; 913 int i;
924 914
925 if (color == NULL || *color == '\0') 915 if (color == NULL || *color == '\0')
926 return; 916 return;
917
918 color = strdup (color);
919 allocated.push_back ((void *)color);
920 rs[Rs_color + idx] = color;
927 921
928 /* handle color aliases */ 922 /* handle color aliases */
929 if (isdigit (*color)) 923 if (isdigit (*color))
930 { 924 {
931 i = atoi (color); 925 i = atoi (color);
932 926
933 if (i >= 8 && i <= 15) 927 if (i >= 8 && i <= 15)
934 { /* bright colors */ 928 { /* bright colors */
935 i -= 8; 929 i -= 8;
936 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 930 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
937 SET_PIXCOLOR (idx);
938 goto done; 931 goto done;
939 } 932 }
940 933
941 if (i >= 0 && i <= 7) 934 if (i >= 0 && i <= 7)
942 { /* normal colors */ 935 { /* normal colors */
943 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 936 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
944 SET_PIXCOLOR (idx);
945 goto done; 937 goto done;
946 } 938 }
947 } 939 }
948 940
949 if (!rXParseAllocColor (&xcol, color)) 941 set_color (xcol, color);
950 return;
951
952 /* XStoreColor (display->display, display->cmap, XColor*); */
953 942
954 /* 943 /*
955 * FIXME: should free colors here, but no idea how to do it so instead, 944 * FIXME: should free colors here, but no idea how to do it so instead,
956 * so just keep gobbling up the colormap 945 * so just keep gobbling up the colormap
957 */ 946 */
958# if 0
959 for (i = Color_Black; i <= Color_White; i++)
960 if (pix_colors[idx] == pix_colors[i])
961 break;
962 if (i > Color_White)
963 {
964 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
965 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
966 DisplayPlanes (display->display, display->screen));
967 }
968# endif
969 947
970 pix_colors_focused[idx] = xcol; 948 pix_colors_focused[idx] = xcol;
971 SET_PIXCOLOR (idx);
972 949
973 /* XSetWindowAttributes attr; */ 950 /* XSetWindowAttributes attr; */
974 /* Cursor cursor; */ 951 /* Cursor cursor; */
975done: 952done:
976
977#if OFF_FOCUS_FADING
978 if (rs[Rs_fade])
979 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
980#endif
981
982 /*TODO: handle Color_BD, scrollbar background, etc. */ 953 /*TODO: handle Color_BD, scrollbar background, etc. */
983 954
955 update_fade_color (idx);
984 recolour_cursor (); 956 recolour_cursor ();
985 scr_recolour (); 957 scr_recolour ();
986} 958}
987 959
988#else 960#else
… …
990#endif /* XTERM_COLOR_CHANGE */ 962#endif /* XTERM_COLOR_CHANGE */
991 963
992void 964void
993rxvt_term::recolour_cursor () 965rxvt_term::recolour_cursor ()
994{ 966{
995 XColor xcol[2]; 967 XColor fg, bg;
996 968
997 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 969 (ISSET_PIXCOLOR (Color_pointer_fg)
998 ? pix_colors_focused[Color_pointer_fg] 970 ? pix_colors_focused[Color_pointer_fg]
999 : pix_colors_focused[Color_fg]; 971 : pix_colors_focused[Color_fg]).get (fg);
972
1000 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 973 (ISSET_PIXCOLOR (Color_pointer_bg)
1001 ? pix_colors_focused[Color_pointer_bg] 974 ? pix_colors_focused[Color_pointer_bg]
1002 : pix_colors_focused[Color_bg]; 975 : pix_colors_focused[Color_bg]).get (bg);
1003 976
1004 XQueryColors (display->display, display->cmap, xcol, 2); 977 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1005 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1006} 978}
1007 979
1008/*----------------------------------------------------------------------*/ 980/*----------------------------------------------------------------------*/
1009/* 981/*
1010 * find if fg/bg matches any of the normal (low-intensity) colors 982 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1014{ 986{
1015 unsigned int i; 987 unsigned int i;
1016 const char *xpmb = "\0"; 988 const char *xpmb = "\0";
1017 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1018 990
1019 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1020 strcpy (fstr, "default"); 991 strcpy (fstr, "default");
1021 strcpy (bstr, "default"); 992 strcpy (bstr, "default");
1022 for (i = Color_Black; i <= Color_White; i++) 993 for (i = Color_Black; i <= Color_White; i++)
1023 if (pix_colors[Color_fg] == pix_colors[i]) 994 if (pix_colors[Color_fg] == pix_colors[i])
1024 { 995 {
… …
1039 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1010 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1040} 1011}
1041 1012
1042/*----------------------------------------------------------------------*/ 1013/*----------------------------------------------------------------------*/
1043 1014
1044int 1015bool
1045rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1016rxvt_term::set_color (rxvt_color &color, const char *name)
1046{ 1017{
1047 if (!screen_in_out->set (display, colour)) 1018 if (color.set (this, name))
1048 {
1049 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1050 return false;
1051 }
1052
1053 return true; 1019 return true;
1020
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1022 return false;
1023}
1024
1025void
1026rxvt_term::alias_color (int dst, int src)
1027{
1028 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1054} 1029}
1055 1030
1056/* -------------------------------------------------------------------- * 1031/* -------------------------------------------------------------------- *
1057 * - WINDOW RESIZING - * 1032 * - WINDOW RESIZING - *
1058 * -------------------------------------------------------------------- */ 1033 * -------------------------------------------------------------------- */
1059void 1034void
1060rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1035rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1061{ 1036{
1062 int fix_screen; 1037 int fix_screen;
1063 int old_width = szHint.width, old_height = szHint.height; 1038 int old_width = szHint.width;
1064 dDisp; 1039 int old_height = szHint.height;
1065 1040
1066 window_calc (newwidth, newheight); 1041 window_calc (newwidth, newheight);
1042
1043 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1067 XSetWMNormalHints (disp, parent[0], &szHint); 1044 XSetWMNormalHints (dpy, parent[0], &szHint);
1068 1045
1069 if (!ignoreparent) 1046 if (!ignoreparent)
1070 { 1047 {
1071#ifdef SMART_RESIZE 1048#ifdef SMART_RESIZE
1072 /* 1049 /*
… …
1076 int x, y, x1, y1; 1053 int x, y, x1, y1;
1077 int dx, dy; 1054 int dx, dy;
1078 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1055 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1079 Window unused_cr; 1056 Window unused_cr;
1080 1057
1081 XTranslateCoordinates (disp, parent[0], display->root, 1058 XTranslateCoordinates (dpy, parent[0], display->root,
1082 0, 0, &x, &y, &unused_cr); 1059 0, 0, &x, &y, &unused_cr);
1083 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1060 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1084 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1061 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1085 /* 1062 /*
1086 * if display->root isn't the parent window, a WM will probably have offset 1063 * if display->root isn't the parent window, a WM will probably have offset
1087 * our position for handles and decorations. Counter it 1064 * our position for handles and decorations. Counter it
1088 */ 1065 */
… …
1090 { 1067 {
1091 x -= x1; 1068 x -= x1;
1092 y -= y1; 1069 y -= y1;
1093 } 1070 }
1094 1071
1095 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1072 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1096 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1073 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1097 dx = old_width - szHint.width; 1074 dx = old_width - szHint.width;
1098 dy = old_height - szHint.height; 1075 dy = old_height - szHint.height;
1099 1076
1100 /* Check position of the center of the window */ 1077 /* Check position of the center of the window */
1101 if (x < x1) /* left half */ 1078 if (x < x1) /* left half */
1102 dx = 0; 1079 dx = 0;
… …
1105 if (y < y1) /* top half */ 1082 if (y < y1) /* top half */
1106 dy = 0; 1083 dy = 0;
1107 else if (y == y1) /* exact center */ 1084 else if (y == y1) /* exact center */
1108 dy /= 2; 1085 dy /= 2;
1109 1086
1110 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1087 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1111 szHint.width, szHint.height); 1088 szHint.width, szHint.height);
1112#else 1089#else
1113 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1090 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1114#endif 1091#endif
1115 } 1092 }
1116 1093
1117 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1094 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1118 1095
1119 if (fix_screen || newwidth != old_width || newheight != old_height) 1096 if (fix_screen || newwidth != old_width || newheight != old_height)
1120 { 1097 {
1121 if (scrollBar.state) 1098 if (scrollBar.state)
1122 { 1099 {
1123 XMoveResizeWindow (disp, scrollBar.win, 1100 XMoveResizeWindow (dpy, scrollBar.win,
1124 window_sb_x, 0, 1101 window_sb_x, 0,
1125 scrollbar_TotalWidth (), szHint.height); 1102 scrollbar_TotalWidth (), szHint.height);
1126 resize_scrollbar (); 1103 resize_scrollbar ();
1127 } 1104 }
1128 1105
1129 XMoveResizeWindow (disp, vt, 1106 XMoveResizeWindow (dpy, vt,
1130 window_vt_x, window_vt_y, 1107 window_vt_x, window_vt_y,
1131 width, height); 1108 width, height);
1132 1109
1133 scr_clear (); 1110 scr_clear ();
1134#ifdef XPM_BACKGROUND 1111#ifdef XPM_BACKGROUND
1135 resize_pixmap (); 1112 resize_pixmap ();
1136#endif 1113#endif
1137 } 1114 }
1138 1115
1139 if (fix_screen || old_height == 0) 1116 if (fix_screen || old_height == 0)
1140 {
1141 int curr_screen = -1;
1142 int old_ncol = prev_ncol;
1143
1144 /* scr_reset only works on the primary screen */
1145 if (old_height) /* this is not the first time through */
1146 {
1147 unsigned int ocol = ncol;
1148 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1149 curr_screen = scr_change_screen (PRIMARY);
1150 ncol = ocol;
1151 }
1152
1153 scr_reset (); 1117 scr_reset ();
1154 1118
1155 if (curr_screen >= 0) /* this is not the first time through */ 1119 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1156 { 1120 //scr_touch (false);
1157 scr_change_screen (curr_screen);
1158 selection_check (old_ncol != ncol ? 4 : 0);
1159 }
1160 }
1161
1162 old_width = szHint.width;
1163 old_height = szHint.height;
1164 1121
1165#ifdef XPM_BACKGROUND 1122#ifdef XPM_BACKGROUND
1166 if (pixmap) 1123 if (pixmap)
1167 scr_touch (false); 1124 scr_touch (false);
1168#endif 1125#endif
1169 1126
1170#ifdef USE_XIM 1127#ifdef USE_XIM
1171 IMSetStatusPosition (); 1128 IMSetPosition ();
1172#endif 1129#endif
1173} 1130}
1174 1131
1175/* 1132/*
1176 * Set the width/height of the vt window in characters. Units are pixels. 1133 * Set the width/height of the vt window in characters. Units are pixels.
… …
1181{ 1138{
1182 XWindowAttributes wattr; 1139 XWindowAttributes wattr;
1183 1140
1184 if (newwidth == 0 || newheight == 0) 1141 if (newwidth == 0 || newheight == 0)
1185 { 1142 {
1186 XGetWindowAttributes (display->display, display->root, &wattr); 1143 XGetWindowAttributes (dpy, display->root, &wattr);
1187 1144
1188 if (newwidth == 0) 1145 if (newwidth == 0)
1189 newwidth = wattr.width - szHint.base_width; 1146 newwidth = wattr.width - szHint.base_width;
1190 if (newheight == 0) 1147 if (newheight == 0)
1191 newheight = wattr.height - szHint.base_height; 1148 newheight = wattr.height - szHint.base_height;
… …
1205#ifdef USE_XIM 1162#ifdef USE_XIM
1206 1163
1207void 1164void
1208rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1165rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1209{ 1166{
1210 fg = pix_colors[Color_fg]; 1167 fg = pix_colors [Color_fg];
1211 bg = pix_colors[Color_bg]; 1168 bg = pix_colors [Color_bg];
1212} 1169}
1213 1170
1214void 1171void
1215rxvt_term::im_set_size (XRectangle &size) 1172rxvt_term::im_set_size (XRectangle &size)
1216{ 1173{
… …
1253 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1210 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1254 1211
1255 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1212 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1256 *p = '\0'; 1213 *p = '\0';
1257 1214
1258 atom = XInternAtom (display->display, server, False); 1215 atom = XInternAtom (dpy, server, False);
1259 win = XGetSelectionOwner (display->display, atom); 1216 win = XGetSelectionOwner (dpy, atom);
1260 1217
1261 if (win != None) 1218 if (win != None)
1262 return True; 1219 return True;
1263 } 1220 }
1264 1221
… …
1271 XPoint nspot; 1228 XPoint nspot;
1272 XVaNestedList preedit_attr; 1229 XVaNestedList preedit_attr;
1273 1230
1274 if (!Input_Context 1231 if (!Input_Context
1275 || !focus 1232 || !focus
1276 || !(input_style & XIMPreeditPosition)) 1233 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1277 return; 1234 return;
1278 1235
1279 im_set_position (nspot); 1236 im_set_position (nspot);
1280 1237
1281 if (nspot.x == spot.x && nspot.y == spot.y) 1238 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1300 input_method = 0; 1257 input_method = 0;
1301 } 1258 }
1302 1259
1303 Input_Context = 0; 1260 Input_Context = 0;
1304} 1261}
1262
1263#ifdef ENABLE_XIM_ONTHESPOT
1264
1265static void
1266xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1267{
1268 ((rxvt_term *)client_data)->make_current ();
1269 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1270}
1271
1272static void
1273xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1274{
1275 ((rxvt_term *)client_data)->make_current ();
1276 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1277}
1278
1279static void
1280xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1281{
1282 rxvt_term *term = (rxvt_term *)client_data;
1283 XIMText *text = call_data->text;
1284
1285 term->make_current ();
1286
1287 if (text)
1288 {
1289 void *str;
1290
1291 if (!text->encoding_is_wchar && text->string.multi_byte)
1292 {
1293 // of course, X makes it ugly again
1294 if (term->rs[Rs_imLocale])
1295 SET_LOCALE (term->rs[Rs_imLocale]);
1296
1297 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1298 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1299
1300 if (term->rs[Rs_imLocale])
1301 SET_LOCALE (term->locale);
1302 }
1303 else
1304 str = (void *)text->string.wide_char;
1305
1306 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1307 DT_INT, call_data->caret,
1308 DT_INT, call_data->chg_first,
1309 DT_INT, call_data->chg_length,
1310 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1311 DT_WCS_LEN, str, str ? (int)text->length : 0,
1312 DT_END));
1313 }
1314 else
1315 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1316 DT_INT, call_data->caret,
1317 DT_INT, call_data->chg_first,
1318 DT_INT, call_data->chg_length,
1319 DT_END));
1320}
1321
1322#if 0
1323static void
1324xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1325{
1326 ((rxvt_term *)client_data)->make_current ();
1327 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1328 DT_INT, call_data->position,
1329 DT_INT, call_data->direction,
1330 DT_INT, call_data->style,
1331 DT_END));
1332}
1333#endif
1334
1335#endif
1305 1336
1306/* 1337/*
1307 * Try to open a XIM with the current modifiers, then see if we can 1338 * Try to open a XIM with the current modifiers, then see if we can
1308 * open a suitable preedit type 1339 * open a suitable preedit type
1309 */ 1340 */
… …
1316 XRectangle rect, status_rect, needed_rect; 1347 XRectangle rect, status_rect, needed_rect;
1317 unsigned long fg, bg; 1348 unsigned long fg, bg;
1318 const char *p; 1349 const char *p;
1319 char **s; 1350 char **s;
1320 XIMStyles *xim_styles; 1351 XIMStyles *xim_styles;
1352#ifdef ENABLE_XIM_ONTHESPOT
1353 XIMCallback xcb[4];
1354#endif
1321 1355
1322 set_environ (envv); 1356 set_environ (envv);
1323 1357
1324 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1358 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1325 return false; 1359 return false;
1326 1360
1327 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1328 input_method = display->get_xim (locale, modifiers); 1361 input_method = display->get_xim (locale, modifiers);
1329 if (input_method == NULL) 1362 if (input_method == NULL)
1330 return false; 1363 return false;
1331 1364
1332 xim = input_method->xim; 1365 xim = input_method->xim;
… …
1352 s = rxvt_splitcommastring (p); 1385 s = rxvt_splitcommastring (p);
1353 1386
1354 for (i = found = 0; !found && s[i]; i++) 1387 for (i = found = 0; !found && s[i]; i++)
1355 { 1388 {
1356 if (!strcmp (s[i], "OverTheSpot")) 1389 if (!strcmp (s[i], "OverTheSpot"))
1357 input_style = (XIMPreeditPosition | XIMStatusNothing); 1390 input_style = XIMPreeditPosition | XIMStatusNothing;
1358 else if (!strcmp (s[i], "OffTheSpot")) 1391 else if (!strcmp (s[i], "OffTheSpot"))
1359 input_style = (XIMPreeditArea | XIMStatusArea); 1392 input_style = XIMPreeditArea | XIMStatusArea;
1360 else if (!strcmp (s[i], "Root")) 1393 else if (!strcmp (s[i], "Root"))
1361 input_style = (XIMPreeditNothing | XIMStatusNothing); 1394 input_style = XIMPreeditNothing | XIMStatusNothing;
1362 else if (!strcmp (s[i], "None")) 1395 else if (!strcmp (s[i], "None"))
1363 input_style = (XIMPreeditNone | XIMStatusNone); 1396 input_style = XIMPreeditNone | XIMStatusNone;
1397#ifdef ENABLE_XIM_ONTHESPOT
1398 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1399 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1400#endif
1401 else
1402 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 1403
1365 for (j = 0; j < xim_styles->count_styles; j++) 1404 for (j = 0; j < xim_styles->count_styles; j++)
1366 if (input_style == xim_styles->supported_styles[j]) 1405 if (input_style == xim_styles->supported_styles[j])
1367 { 1406 {
1368 rxvt_freecommastring (s); 1407 rxvt_freecommastring (s);
… …
1406 "*", 1445 "*",
1407 fheight, 1446 fheight,
1408 fheight + 1, fheight - 1, 1447 fheight + 1, fheight - 1,
1409 fheight - 2, fheight + 2); 1448 fheight - 2, fheight + 2);
1410 1449
1411 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1450 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1412 &missing_charset_list, &missing_charset_count, &def_string); 1451 &missing_charset_list, &missing_charset_count, &def_string);
1413 1452
1414 if (missing_charset_list) 1453 if (missing_charset_list)
1415 XFreeStringList (missing_charset_list); 1454 XFreeStringList (missing_charset_list);
1416 1455
… …
1457 XNBackground, bg, 1496 XNBackground, bg,
1458 XNArea, &status_rect, 1497 XNArea, &status_rect,
1459 XNFontSet, fs, 1498 XNFontSet, fs,
1460 NULL); 1499 NULL);
1461 } 1500 }
1501#if ENABLE_XIM_ONTHESPOT
1502 else if (input_style & XIMPreeditCallbacks)
1503 {
1504 im_set_position (spot);
1505
1506 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1507 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1508 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1509# if 0
1510 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1511# endif
1512
1513 preedit_attr = XVaCreateNestedList (0,
1514 XNSpotLocation, &spot,
1515 XNPreeditStartCallback, &xcb[0],
1516 XNPreeditDoneCallback , &xcb[1],
1517 XNPreeditDrawCallback , &xcb[2],
1518# if 0
1519 XNPreeditCaretCallback, &xcb[3],
1520# endif
1521 NULL);
1522 }
1523#endif
1462 1524
1463 Input_Context = XCreateIC (xim, 1525 Input_Context = XCreateIC (xim,
1464 XNInputStyle, input_style, 1526 XNInputStyle, input_style,
1465 XNClientWindow, vt, 1527 XNClientWindow, vt,
1466 XNFocusWindow, parent[0], 1528 XNFocusWindow, parent[0],
… …
1468 preedit_attr, 1530 preedit_attr,
1469 status_attr ? XNStatusAttributes : NULL, 1531 status_attr ? XNStatusAttributes : NULL,
1470 status_attr, NULL); 1532 status_attr, NULL);
1471 1533
1472 if (preedit_attr) XFree (preedit_attr); 1534 if (preedit_attr) XFree (preedit_attr);
1473 if (status_attr) XFree (status_attr); 1535 if (status_attr) XFree (status_attr);
1474 if (fs) XFreeFontSet (display->display, fs); 1536 if (fs) XFreeFontSet (dpy, fs);
1475 1537
1476 if (Input_Context == NULL) 1538 if (Input_Context == NULL)
1477 { 1539 {
1478 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1540 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1479 im_destroy (); 1541 im_destroy ();
1480 return false; 1542 return false;
1481 } 1543 }
1482 1544
1483 if (input_style & XIMPreeditArea) 1545#if 0
1546 // unfortunately, only the focus window is used by XIM, hard to fix
1547 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1548 vt_select_input ();
1549#endif
1550
1484 IMSetStatusPosition (); 1551 IMSetPosition ();
1485 1552
1486 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1487 return true; 1553 return true;
1488} 1554}
1489 1555
1490void 1556void
1491rxvt_term::im_cb () 1557rxvt_term::im_cb ()
… …
1497 1563
1498 make_current (); 1564 make_current ();
1499 1565
1500 im_destroy (); 1566 im_destroy ();
1501 1567
1502 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1503 if (Input_Context) 1568 if (Input_Context)
1504 return; 1569 return;
1505 1570
1506#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1571#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1507 if (rs[Rs_imLocale]) 1572 if (rs[Rs_imLocale])
… …
1549 SET_LOCALE (locale); 1614 SET_LOCALE (locale);
1550#endif 1615#endif
1551} 1616}
1552 1617
1553void 1618void
1554rxvt_term::IMSetStatusPosition () 1619rxvt_term::IMSetPosition ()
1555{ 1620{
1556 XRectangle preedit_rect, status_rect, *needed_rect; 1621 XRectangle preedit_rect, status_rect, *needed_rect;
1557 XVaNestedList preedit_attr, status_attr; 1622 XVaNestedList preedit_attr, status_attr;
1558 1623
1559 if (!Input_Context 1624 if (!Input_Context
1560 || !focus 1625 || !focus
1561 || !(input_style & XIMPreeditArea) 1626 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1562 || !IMisRunning ()) 1627 || !IMisRunning ())
1563 return; 1628 return;
1564 1629
1630 if (input_style & XIMPreeditPosition)
1631 {
1632 im_set_size (preedit_rect);
1633 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1634
1635 XSetICValues (Input_Context,
1636 XNPreeditAttributes, preedit_attr, NULL);
1637 }
1638 else
1639 {
1565 /* Getting the necessary width of preedit area */ 1640 /* Getting the necessary width of preedit area */
1566 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1641 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1567 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1642 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1568 XFree (status_attr); 1643 XFree (status_attr);
1569 1644
1570 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1645 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1571 XFree (needed_rect); 1646 XFree (needed_rect);
1572 1647
1573 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1648 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1574 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1649 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1575 1650
1576 XSetICValues (Input_Context, 1651 XSetICValues (Input_Context,
1577 XNPreeditAttributes, preedit_attr, 1652 XNPreeditAttributes, preedit_attr,
1578 XNStatusAttributes, status_attr, NULL); 1653 XNStatusAttributes, status_attr,
1654 NULL);
1579 1655
1656 XFree (status_attr);
1657 }
1658
1580 XFree (preedit_attr); 1659 XFree (preedit_attr);
1581 XFree (status_attr);
1582} 1660}
1583#endif /* USE_XIM */ 1661#endif /* USE_XIM */
1584 1662
1585/*----------------------- end-of-file (C source) -----------------------*/ 1663/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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