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.199 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.248 by sasha, Wed Sep 12 19:51:41 2007 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 ENABLE_TRANSPARENCY || ENABLE_PERL
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
155#endif
156#if HAVE_BG_PIXMAP
157 update_background_ev(this, &rxvt_term::update_background_cb),
150#endif 158#endif
151#ifdef HAVE_SCROLLBARS 159#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 160 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 161#endif
154#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
… …
198void rxvt_term::emergency_cleanup () 206void rxvt_term::emergency_cleanup ()
199{ 207{
200 if (cmd_pid) 208 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 209 kill (-cmd_pid, SIGHUP);
202 210
211 pty_ev.stop ();
203 delete pty; pty = 0; 212 delete pty; pty = 0;
204} 213}
205 214
206rxvt_term::~rxvt_term () 215rxvt_term::~rxvt_term ()
207{ 216{
… …
216#endif 225#endif
217 delete fontset[0]; 226 delete fontset[0];
218 227
219 if (display) 228 if (display)
220 { 229 {
221 dDisp;
222
223 selection_clear (); 230 selection_clear ();
224 231
225#ifdef USE_XIM 232#ifdef USE_XIM
226 im_destroy (); 233 im_destroy ();
227#endif 234#endif
228#ifdef XTERM_SCROLLBAR 235#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 237 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 238#endif
232#ifdef PLAIN_SCROLLBAR 239#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 241#endif
235#ifdef NEXT_SCROLLBAR 242#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 243 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 244 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 245 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 246 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 247 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 248 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 249 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 250 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 253#endif
247#ifdef RXVT_SCROLLBAR 254#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 258#endif
252 if (gc) XFreeGC (disp, gc); 259 if (gc) XFreeGC (dpy, gc);
253 260
254 delete drawable; 261 delete drawable;
255 // destroy all windows 262 // destroy all windows
256 if (parent[0]) 263 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 264 XDestroyWindow (dpy, parent[0]);
258 }
259 265
260 // TODO: free pixcolours, colours should become part of rxvt_display 266 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 267 if (ISSET_PIXCOLOR (i))
268 {
269 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
271 pix_colors_unfocused [i].free (this);
272#endif
273 }
274
275 clear ();
276 }
277
278 delete [] pix_colors_focused;
279#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 280 delete [] pix_colors_unfocused;
264#endif 281#endif
265 282
266 displays.put (display); 283 displays.put (display);
267 284
268 scr_release (); 285 scr_release ();
… …
271 for (int i = 0; i < allocated.size (); i++) 288 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 289 free (allocated [i]);
273 290
274 free (selection.text); 291 free (selection.text);
275 // TODO: manage env vars in child only(!) 292 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 293 free (env_display);
278 free (env_term); 294 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 295 free (locale);
281 free (v_buffer); 296 free (v_buffer);
282 free (incr_buf); 297 free (incr_buf);
283 298
284 delete envv; 299 delete envv;
… …
295{ 310{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 312
298 cmd_pid = 0; 313 cmd_pid = 0;
299 314
300 if (!OPTION (Opt_hold)) 315 if (!option (Opt_hold))
301 destroy (); 316 destroy ();
302} 317}
303 318
304void 319void
305rxvt_term::destroy () 320rxvt_term::destroy ()
306{ 321{
307 if (destroy_ev.active) 322 if (destroy_ev.active)
308 return; 323 return;
309 324
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 326
313#if ENABLE_OVERLAY 327#if ENABLE_OVERLAY
314 scr_overlay_off (); 328 scr_overlay_off ();
315#endif 329#endif
316 330
… …
320 im_ev.stop (display); 334 im_ev.stop (display);
321#endif 335#endif
322#if HAVE_SCROLLBARS 336#if HAVE_SCROLLBARS
323 scrollbar_ev.stop (display); 337 scrollbar_ev.stop (display);
324#endif 338#endif
325#if TRANSPARENT 339#if ENABLE_TRANSPARENCY || ENABLE_PERL
326 rootwin_ev.stop (display); 340 rootwin_ev.stop (display);
327#endif 341#endif
328 incr_ev.stop (); 342 incr_ev.stop ();
329 termwin_ev.stop (display); 343 termwin_ev.stop (display);
330 vt_ev.stop (display); 344 vt_ev.stop (display);
… …
371{ 385{
372 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 386 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
373 (*t)->emergency_cleanup (); 387 (*t)->emergency_cleanup ();
374} 388}
375 389
376#if ENABLE_FRILLS 390#if !ENABLE_MINIMAL
377static void 391static void
378print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
379{ 393{
380 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
… …
429 GET_R->allowedxerror = event->error_code; 443 GET_R->allowedxerror = event->error_code;
430 else 444 else
431 { 445 {
432 // GET_R is most likely not the terminal which caused the error, 446 // GET_R is most likely not the terminal which caused the error,
433 // so just output the error and continue 447 // so just output the error and continue
434#if ENABLE_FRILLS 448#if ENABLE_MINIMAL
449 old_xerror_handler (display, event);
450#else
435 print_x_error (display, event); 451 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 452#endif
439 } 453 }
440 454
441 return 0; 455 return 0;
442} 456}
… …
470#ifdef KEYSYM_RESOURCE 484#ifdef KEYSYM_RESOURCE
471 keyboard->register_done (); 485 keyboard->register_done ();
472#endif 486#endif
473 487
474#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar)) 489 if (option (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */ 490 scrollBar.setIdle (); /* set existence for size calculations */
477#endif 491#endif
478 492
479 pty = ptytty::create (); 493 pty = ptytty::create ();
480 494
481 create_windows (argc, argv); 495 create_windows (argc, argv);
482 496
483 dDisp;
484
485 init_xlocale (); 497 init_xlocale ();
486 498
487 scr_reset (); // initialize screen 499 scr_reset (); // initialize screen
488 500
489#if 0 501#if 0
490 XSynchronize (disp, True); 502 XSynchronize (dpy, True);
491#endif 503#endif
492 504
493#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar)) 506 if (option (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */ 507 resize_scrollbar (); /* create and map scrollbar */
496#endif 508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bgPixmap.set_target (this);
512
497#ifdef TRANSPARENT 513#ifdef ENABLE_TRANSPARENCY
498 if (OPTION (Opt_transparent)) 514 if (option (Opt_transparent))
499 { 515 {
516 bgPixmap.set_transparent ();
517#ifdef HAVE_AFTERIMAGE
518 if (rs [Rs_blurradius])
519 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520#endif
521 if (ISSET_PIXCOLOR (Color_tint))
522 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523 if (rs [Rs_shade])
524 bgPixmap.set_shade (rs [Rs_shade]);
525
526 bgPixmap.set_root_pixmap ();
500 XSelectInput (disp, display->root, PropertyChangeMask); 527 XSelectInput (dpy, display->root, PropertyChangeMask);
501 check_our_parents ();
502 rootwin_ev.start (display, display->root); 528 rootwin_ev.start (display, display->root);
503 } 529 }
530#endif
531
532#ifdef XPM_BACKGROUND
533 if (rs[Rs_backgroundPixmap] != NULL)
534 {
535 const char *p = rs[Rs_backgroundPixmap];
536
537 if ((p = strchr (p, ';')) != NULL)
538 {
539 p++;
540 bgPixmap.set_geometry (p);
541 }
542 else
543 bgPixmap.set_defaultGeometry ();
544
545 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
546 if (!bgPixmap.window_position_sensitive ())
547 update_background ();
548 }
549#endif
550 }
551#endif
552
553#if ENABLE_PERL
554 rootwin_ev.start (display, display->root);
504#endif 555#endif
505 556
506 set_colorfgbg (); 557 set_colorfgbg ();
507 558
508 init_command (cmd_argv); 559 init_command (cmd_argv);
… …
514 565
515 check_ev.start (); 566 check_ev.start ();
516 567
517 HOOK_INVOKE ((this, HOOK_START, DT_END)); 568 HOOK_INVOKE ((this, HOOK_START, DT_END));
518 569
570#if ENABLE_XEMBED
571 if (rs[Rs_embed])
572 {
573 long info[2] = { 0, XEMBED_MAPPED };
574
575 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
576 32, PropModeReplace, (unsigned char *)&info, 2);
577 }
578#endif
579
519 XMapWindow (disp, vt); 580 XMapWindow (dpy, vt);
520 XMapWindow (disp, parent[0]); 581 XMapWindow (dpy, parent[0]);
521 582
522 return true; 583 return true;
523} 584}
524 585
525static struct sig_handlers 586static struct sig_handlers
… …
605 return p; 666 return p;
606} 667}
607 668
608/*----------------------------------------------------------------------*/ 669/*----------------------------------------------------------------------*/
609/* 670/*
610 * window size/position calculcations for XSizeHint and other storage. 671 * window size/position calculations for XSizeHint and other storage.
611 * if width/height are non-zero then override calculated width/height 672 * if width/height are non-zero then override calculated width/height
612 */ 673 */
613void 674void
614rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 675rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
615{ 676{
616 short recalc_x, recalc_y; 677 short recalc_x, recalc_y;
617 int x, y, sb_w, flags; 678 int x, y, sb_w, flags;
618 unsigned int w, h; 679 unsigned int w, h;
619 unsigned int max_width, max_height; 680 unsigned int max_width, max_height;
620 dDisp;
621 681
622 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 682 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
623 szHint.win_gravity = NorthWestGravity; 683 szHint.win_gravity = NorthWestGravity;
624 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 684 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
625 685
… …
687 747
688 if (scrollBar.state) 748 if (scrollBar.state)
689 { 749 {
690 sb_w = scrollbar_TotalWidth (); 750 sb_w = scrollbar_TotalWidth ();
691 szHint.base_width += sb_w; 751 szHint.base_width += sb_w;
752
692 if (!OPTION (Opt_scrollBar_right)) 753 if (!option (Opt_scrollBar_right))
693 window_vt_x += sb_w; 754 window_vt_x += sb_w;
694 } 755 }
695 756
696 szHint.width_inc = fwidth; 757 szHint.width_inc = fwidth;
697 szHint.height_inc = fheight; 758 szHint.height_inc = fheight;
698 szHint.min_width = szHint.base_width + szHint.width_inc; 759 szHint.min_width = szHint.base_width + szHint.width_inc;
699 szHint.min_height = szHint.base_height + szHint.height_inc; 760 szHint.min_height = szHint.base_height + szHint.height_inc;
700 761
701 if (newwidth && newwidth - szHint.base_width < max_width) 762 if (newwidth && newwidth - szHint.base_width < max_width)
702 { 763 {
703 szHint.width = newwidth; 764 szHint.width = newwidth;
… …
718 { 779 {
719 min_it (height, max_height); 780 min_it (height, max_height);
720 szHint.height = szHint.base_height + height; 781 szHint.height = szHint.base_height + height;
721 } 782 }
722 783
723 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 784 if (scrollBar.state && option (Opt_scrollBar_right))
724 window_sb_x = szHint.width - sb_w; 785 window_sb_x = szHint.width - sb_w;
725 786
726 if (recalc_x) 787 if (recalc_x)
727 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 788 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
789
728 if (recalc_y) 790 if (recalc_y)
729 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 791 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
730 792
731 ncol = width / fwidth; 793 ncol = width / fwidth;
732 nrow = height / fheight; 794 nrow = height / fheight;
733} 795}
734 796
… …
789 delete fontset[0]; 851 delete fontset[0];
790 fontset[0] = fs; 852 fontset[0] = fs;
791 853
792 prop = (*fs)[1]->properties (); 854 prop = (*fs)[1]->properties ();
793 prop.height += lineSpace; 855 prop.height += lineSpace;
856
794 fs->set_prop (prop); 857 fs->set_prop (prop, false);
795 858
796 fwidth = prop.width; 859 fwidth = prop.width;
797 fheight = prop.height; 860 fheight = prop.height;
798 fbase = prop.ascent; 861 fbase = prop.ascent;
799 862
… …
808 { 871 {
809 fontset[style] = fs = new rxvt_fontset (this); 872 fontset[style] = fs = new rxvt_fontset (this);
810 rxvt_fontprop prop2 = prop; 873 rxvt_fontprop prop2 = prop;
811 874
812 if (res) 875 if (res)
813 prop2.weight = prop2.slant = rxvt_fontprop::unset; 876 {
877 fs->populate (res);
878 fs->set_prop (prop2, false);
879 }
814 else 880 else
815 { 881 {
816 res = fontset[0]->fontdesc; 882 fs->populate (fontset[0]->fontdesc);
817 883
818 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 884 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
819 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 885 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
886
887 fs->set_prop (prop2, true);
820 } 888 }
821 889
822 fs->populate (res);
823 fs->set_prop (prop2);
824 } 890 }
825#else 891#else
826 fontset[style] = fontset[0]; 892 fontset[style] = fontset[0];
827#endif 893#endif
828 } 894 }
… …
837 return true; 903 return true;
838} 904}
839 905
840void rxvt_term::set_string_property (Atom prop, const char *str, int len) 906void rxvt_term::set_string_property (Atom prop, const char *str, int len)
841{ 907{
842 XChangeProperty (display->display, parent[0], 908 XChangeProperty (dpy, parent[0],
843 prop, XA_STRING, 8, PropModeReplace, 909 prop, XA_STRING, 8, PropModeReplace,
844 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 910 (const unsigned char *)str, len >= 0 ? len : strlen (str));
845} 911}
846 912
847void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 913void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
848{ 914{
849 wchar_t *ws = rxvt_mbstowcs (str, len); 915 wchar_t *ws = rxvt_mbstowcs (str, len);
850 char *s = rxvt_wcstoutf8 (ws); 916 char *s = rxvt_wcstoutf8 (ws);
851 917
852 XChangeProperty (display->display, parent[0], 918 XChangeProperty (dpy, parent[0],
853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 919 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
854 (const unsigned char *)s, strlen (s)); 920 (const unsigned char *)s, strlen (s));
855 921
856 free (s); 922 free (s);
857 free (ws); 923 free (ws);
… …
882void 948void
883rxvt_term::set_window_color (int idx, const char *color) 949rxvt_term::set_window_color (int idx, const char *color)
884{ 950{
885 rxvt_color xcol; 951 rxvt_color xcol;
886 int i; 952 int i;
887 953
888 if (color == NULL || *color == '\0') 954 if (color == NULL || *color == '\0')
889 return; 955 return;
956
957 color = strdup (color);
958 allocated.push_back ((void *)color);
959 rs[Rs_color + idx] = color;
890 960
891 /* handle color aliases */ 961 /* handle color aliases */
892 if (isdigit (*color)) 962 if (isdigit (*color))
893 { 963 {
894 i = atoi (color); 964 i = atoi (color);
895 965
896 if (i >= 8 && i <= 15) 966 if (i >= 8 && i <= 15)
897 { /* bright colors */ 967 { /* bright colors */
898 i -= 8; 968 i -= 8;
899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 969 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
900 SET_PIXCOLOR (idx);
901 goto done; 970 goto done;
902 } 971 }
903 972
904 if (i >= 0 && i <= 7) 973 if (i >= 0 && i <= 7)
905 { /* normal colors */ 974 { /* normal colors */
906 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 975 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
907 SET_PIXCOLOR (idx);
908 goto done; 976 goto done;
909 } 977 }
910 } 978 }
911 979
912 if (!rXParseAllocColor (&xcol, color)) 980 set_color (xcol, color);
913 return;
914
915 /* XStoreColor (display->display, display->cmap, XColor*); */
916 981
917 /* 982 /*
918 * FIXME: should free colors here, but no idea how to do it so instead, 983 * FIXME: should free colors here, but no idea how to do it so instead,
919 * so just keep gobbling up the colormap 984 * so just keep gobbling up the colormap
920 */ 985 */
921# if 0
922 for (i = Color_Black; i <= Color_White; i++)
923 if (pix_colors[idx] == pix_colors[i])
924 break;
925 if (i > Color_White)
926 {
927 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
928 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
929 DisplayPlanes (display->display, display->screen));
930 }
931# endif
932 986
933 pix_colors_focused[idx] = xcol; 987 pix_colors_focused[idx] = xcol;
934 SET_PIXCOLOR (idx);
935 988
936 /* XSetWindowAttributes attr; */ 989 /* XSetWindowAttributes attr; */
937 /* Cursor cursor; */ 990 /* Cursor cursor; */
938done: 991done:
939
940#if OFF_FOCUS_FADING
941 if (rs[Rs_fade])
942 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
943#endif
944
945 /*TODO: handle Color_BD, scrollbar background, etc. */ 992 /*TODO: handle Color_BD, scrollbar background, etc. */
946 993
994 update_fade_color (idx);
947 recolour_cursor (); 995 recolour_cursor ();
948 scr_recolour (); 996 scr_recolour ();
949} 997}
950 998
951#else 999#else
… …
953#endif /* XTERM_COLOR_CHANGE */ 1001#endif /* XTERM_COLOR_CHANGE */
954 1002
955void 1003void
956rxvt_term::recolour_cursor () 1004rxvt_term::recolour_cursor ()
957{ 1005{
958 XColor xcol[2]; 1006 XColor fg, bg;
959 1007
960 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1008 (ISSET_PIXCOLOR (Color_pointer_fg)
961 ? pix_colors_focused[Color_pointer_fg] 1009 ? pix_colors_focused[Color_pointer_fg]
962 : pix_colors_focused[Color_fg]; 1010 : pix_colors_focused[Color_fg]).get (fg);
1011
963 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1012 (ISSET_PIXCOLOR (Color_pointer_bg)
964 ? pix_colors_focused[Color_pointer_bg] 1013 ? pix_colors_focused[Color_pointer_bg]
965 : pix_colors_focused[Color_bg]; 1014 : pix_colors_focused[Color_bg]).get (bg);
966 1015
967 XQueryColors (display->display, display->cmap, xcol, 2); 1016 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
968 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
969} 1017}
970 1018
971/*----------------------------------------------------------------------*/ 1019/*----------------------------------------------------------------------*/
972/* 1020/*
973 * find if fg/bg matches any of the normal (low-intensity) colors 1021 * find if fg/bg matches any of the normal (low-intensity) colors
… …
977{ 1025{
978 unsigned int i; 1026 unsigned int i;
979 const char *xpmb = "\0"; 1027 const char *xpmb = "\0";
980 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1028 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
981 1029
982 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
983 strcpy (fstr, "default"); 1030 strcpy (fstr, "default");
984 strcpy (bstr, "default"); 1031 strcpy (bstr, "default");
985 for (i = Color_Black; i <= Color_White; i++) 1032 for (i = Color_Black; i <= Color_White; i++)
986 if (pix_colors[Color_fg] == pix_colors[i]) 1033 if (pix_colors[Color_fg] == pix_colors[i])
987 { 1034 {
… …
1002 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1049 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1003} 1050}
1004 1051
1005/*----------------------------------------------------------------------*/ 1052/*----------------------------------------------------------------------*/
1006 1053
1007int 1054bool
1008rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1055rxvt_term::set_color (rxvt_color &color, const char *name)
1009{ 1056{
1010 if (!screen_in_out->set (display, colour)) 1057 if (color.set (this, name))
1011 {
1012 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1013 return false;
1014 }
1015
1016 return true; 1058 return true;
1059
1060 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1061 return false;
1062}
1063
1064void
1065rxvt_term::alias_color (int dst, int src)
1066{
1067 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1017} 1068}
1018 1069
1019/* -------------------------------------------------------------------- * 1070/* -------------------------------------------------------------------- *
1020 * - WINDOW RESIZING - * 1071 * - WINDOW RESIZING - *
1021 * -------------------------------------------------------------------- */ 1072 * -------------------------------------------------------------------- */
… …
1023rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1074rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1024{ 1075{
1025 int fix_screen; 1076 int fix_screen;
1026 int old_width = szHint.width; 1077 int old_width = szHint.width;
1027 int old_height = szHint.height; 1078 int old_height = szHint.height;
1028 dDisp;
1029 1079
1030 window_calc (newwidth, newheight); 1080 window_calc (newwidth, newheight);
1081
1082 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1031 XSetWMNormalHints (disp, parent[0], &szHint); 1083 XSetWMNormalHints (dpy, parent[0], &szHint);
1032 1084
1033 if (!ignoreparent) 1085 if (!ignoreparent)
1034 { 1086 {
1035#ifdef SMART_RESIZE 1087#ifdef SMART_RESIZE
1036 /* 1088 /*
… …
1040 int x, y, x1, y1; 1092 int x, y, x1, y1;
1041 int dx, dy; 1093 int dx, dy;
1042 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1094 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1043 Window unused_cr; 1095 Window unused_cr;
1044 1096
1045 XTranslateCoordinates (disp, parent[0], display->root, 1097 XTranslateCoordinates (dpy, parent[0], display->root,
1046 0, 0, &x, &y, &unused_cr); 1098 0, 0, &x, &y, &unused_cr);
1047 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1099 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1048 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1100 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1049 /* 1101 /*
1050 * if display->root isn't the parent window, a WM will probably have offset 1102 * if display->root isn't the parent window, a WM will probably have offset
1051 * our position for handles and decorations. Counter it 1103 * our position for handles and decorations. Counter it
1052 */ 1104 */
… …
1054 { 1106 {
1055 x -= x1; 1107 x -= x1;
1056 y -= y1; 1108 y -= y1;
1057 } 1109 }
1058 1110
1059 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1111 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1060 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1112 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1061 dx = old_width - szHint.width; 1113 dx = old_width - szHint.width;
1062 dy = old_height - szHint.height; 1114 dy = old_height - szHint.height;
1063 1115
1064 /* Check position of the center of the window */ 1116 /* Check position of the center of the window */
1065 if (x < x1) /* left half */ 1117 if (x < x1) /* left half */
… …
1069 if (y < y1) /* top half */ 1121 if (y < y1) /* top half */
1070 dy = 0; 1122 dy = 0;
1071 else if (y == y1) /* exact center */ 1123 else if (y == y1) /* exact center */
1072 dy /= 2; 1124 dy /= 2;
1073 1125
1074 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1126 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1075 szHint.width, szHint.height); 1127 szHint.width, szHint.height);
1076#else 1128#else
1077 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1129 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1078#endif 1130#endif
1079 } 1131 }
1080 1132
1081 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1133 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1082 1134
1083 if (fix_screen || newwidth != old_width || newheight != old_height) 1135 if (fix_screen || newwidth != old_width || newheight != old_height)
1084 { 1136 {
1085 if (scrollBar.state) 1137 if (scrollBar.state)
1086 { 1138 {
1087 XMoveResizeWindow (disp, scrollBar.win, 1139 XMoveResizeWindow (dpy, scrollBar.win,
1088 window_sb_x, 0, 1140 window_sb_x, 0,
1089 scrollbar_TotalWidth (), szHint.height); 1141 scrollbar_TotalWidth (), szHint.height);
1090 resize_scrollbar (); 1142 resize_scrollbar ();
1091 } 1143 }
1092 1144
1093 XMoveResizeWindow (disp, vt, 1145 XMoveResizeWindow (dpy, vt,
1094 window_vt_x, window_vt_y, 1146 window_vt_x, window_vt_y,
1095 width, height); 1147 width, height);
1096 1148
1149#ifdef HAVE_BG_PIXMAP
1150 if (bgPixmap.window_size_sensitive ())
1151 update_background ();
1152#endif
1153
1097 scr_clear (); 1154 scr_clear ();
1098#ifdef XPM_BACKGROUND
1099 resize_pixmap ();
1100#endif
1101 } 1155 }
1102 1156
1103 if (fix_screen || old_height == 0) 1157 if (fix_screen || old_height == 0)
1104 scr_reset (); 1158 scr_reset ();
1105 1159
1106#ifdef XPM_BACKGROUND 1160 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1107 if (pixmap) 1161 //scr_touch (false);
1162
1163#ifdef HAVE_BG_PIXMAP
1164// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1165// if (bgPixmap.pixmap)
1108 scr_touch (false); 1166// scr_touch (false);
1109#endif 1167#endif
1110 1168
1111#ifdef USE_XIM 1169#ifdef USE_XIM
1112 IMSetStatusPosition (); 1170 IMSetPosition ();
1113#endif 1171#endif
1114} 1172}
1115 1173
1116/* 1174/*
1117 * Set the width/height of the vt window in characters. Units are pixels. 1175 * Set the width/height of the vt window in characters. Units are pixels.
… …
1122{ 1180{
1123 XWindowAttributes wattr; 1181 XWindowAttributes wattr;
1124 1182
1125 if (newwidth == 0 || newheight == 0) 1183 if (newwidth == 0 || newheight == 0)
1126 { 1184 {
1127 XGetWindowAttributes (display->display, display->root, &wattr); 1185 XGetWindowAttributes (dpy, display->root, &wattr);
1128 1186
1129 if (newwidth == 0) 1187 if (newwidth == 0)
1130 newwidth = wattr.width - szHint.base_width; 1188 newwidth = wattr.width - szHint.base_width;
1131 if (newheight == 0) 1189 if (newheight == 0)
1132 newheight = wattr.height - szHint.base_height; 1190 newheight = wattr.height - szHint.base_height;
… …
1146#ifdef USE_XIM 1204#ifdef USE_XIM
1147 1205
1148void 1206void
1149rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1207rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1150{ 1208{
1151 fg = pix_colors[Color_fg]; 1209 fg = pix_colors [Color_fg];
1152 bg = pix_colors[Color_bg]; 1210 bg = pix_colors [Color_bg];
1153} 1211}
1154 1212
1155void 1213void
1156rxvt_term::im_set_size (XRectangle &size) 1214rxvt_term::im_set_size (XRectangle &size)
1157{ 1215{
… …
1194 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1252 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1195 1253
1196 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1254 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1197 *p = '\0'; 1255 *p = '\0';
1198 1256
1199 atom = XInternAtom (display->display, server, False); 1257 atom = XInternAtom (dpy, server, False);
1200 win = XGetSelectionOwner (display->display, atom); 1258 win = XGetSelectionOwner (dpy, atom);
1201 1259
1202 if (win != None) 1260 if (win != None)
1203 return True; 1261 return True;
1204 } 1262 }
1205 1263
… …
1212 XPoint nspot; 1270 XPoint nspot;
1213 XVaNestedList preedit_attr; 1271 XVaNestedList preedit_attr;
1214 1272
1215 if (!Input_Context 1273 if (!Input_Context
1216 || !focus 1274 || !focus
1217 || !(input_style & XIMPreeditPosition)) 1275 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1218 return; 1276 return;
1219 1277
1220 im_set_position (nspot); 1278 im_set_position (nspot);
1221 1279
1222 if (nspot.x == spot.x && nspot.y == spot.y) 1280 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1241 input_method = 0; 1299 input_method = 0;
1242 } 1300 }
1243 1301
1244 Input_Context = 0; 1302 Input_Context = 0;
1245} 1303}
1304
1305#ifdef ENABLE_XIM_ONTHESPOT
1306
1307static void
1308xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1309{
1310 ((rxvt_term *)client_data)->make_current ();
1311 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1312}
1313
1314static void
1315xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1316{
1317 ((rxvt_term *)client_data)->make_current ();
1318 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1319}
1320
1321static void
1322xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1323{
1324 rxvt_term *term = (rxvt_term *)client_data;
1325 XIMText *text = call_data->text;
1326
1327 term->make_current ();
1328
1329 if (text)
1330 {
1331 void *str;
1332
1333 if (!text->encoding_is_wchar && text->string.multi_byte)
1334 {
1335 // of course, X makes it ugly again
1336 if (term->rs[Rs_imLocale])
1337 SET_LOCALE (term->rs[Rs_imLocale]);
1338
1339 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1340 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1341
1342 if (term->rs[Rs_imLocale])
1343 SET_LOCALE (term->locale);
1344 }
1345 else
1346 str = (void *)text->string.wide_char;
1347
1348 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349 DT_INT, call_data->caret,
1350 DT_INT, call_data->chg_first,
1351 DT_INT, call_data->chg_length,
1352 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1353 DT_WCS_LEN, str, str ? (int)text->length : 0,
1354 DT_END));
1355 }
1356 else
1357 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1358 DT_INT, call_data->caret,
1359 DT_INT, call_data->chg_first,
1360 DT_INT, call_data->chg_length,
1361 DT_END));
1362}
1363
1364#if 0
1365static void
1366xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1367{
1368 ((rxvt_term *)client_data)->make_current ();
1369 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1370 DT_INT, call_data->position,
1371 DT_INT, call_data->direction,
1372 DT_INT, call_data->style,
1373 DT_END));
1374}
1375#endif
1376
1377#endif
1246 1378
1247/* 1379/*
1248 * Try to open a XIM with the current modifiers, then see if we can 1380 * Try to open a XIM with the current modifiers, then see if we can
1249 * open a suitable preedit type 1381 * open a suitable preedit type
1250 */ 1382 */
… …
1257 XRectangle rect, status_rect, needed_rect; 1389 XRectangle rect, status_rect, needed_rect;
1258 unsigned long fg, bg; 1390 unsigned long fg, bg;
1259 const char *p; 1391 const char *p;
1260 char **s; 1392 char **s;
1261 XIMStyles *xim_styles; 1393 XIMStyles *xim_styles;
1394#ifdef ENABLE_XIM_ONTHESPOT
1395 XIMCallback xcb[4];
1396#endif
1262 1397
1263 set_environ (envv); 1398 set_environ (envv);
1264 1399
1265 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1400 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1266 return false; 1401 return false;
… …
1292 s = rxvt_splitcommastring (p); 1427 s = rxvt_splitcommastring (p);
1293 1428
1294 for (i = found = 0; !found && s[i]; i++) 1429 for (i = found = 0; !found && s[i]; i++)
1295 { 1430 {
1296 if (!strcmp (s[i], "OverTheSpot")) 1431 if (!strcmp (s[i], "OverTheSpot"))
1297 input_style = (XIMPreeditPosition | XIMStatusNothing); 1432 input_style = XIMPreeditPosition | XIMStatusNothing;
1298 else if (!strcmp (s[i], "OffTheSpot")) 1433 else if (!strcmp (s[i], "OffTheSpot"))
1299 input_style = (XIMPreeditArea | XIMStatusArea); 1434 input_style = XIMPreeditArea | XIMStatusArea;
1300 else if (!strcmp (s[i], "Root")) 1435 else if (!strcmp (s[i], "Root"))
1301 input_style = (XIMPreeditNothing | XIMStatusNothing); 1436 input_style = XIMPreeditNothing | XIMStatusNothing;
1302 else if (!strcmp (s[i], "None")) 1437 else if (!strcmp (s[i], "None"))
1303 input_style = (XIMPreeditNone | XIMStatusNone); 1438 input_style = XIMPreeditNone | XIMStatusNone;
1439#ifdef ENABLE_XIM_ONTHESPOT
1440 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1441 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1442#endif
1443 else
1444 input_style = XIMPreeditNothing | XIMStatusNothing;
1304 1445
1305 for (j = 0; j < xim_styles->count_styles; j++) 1446 for (j = 0; j < xim_styles->count_styles; j++)
1306 if (input_style == xim_styles->supported_styles[j]) 1447 if (input_style == xim_styles->supported_styles[j])
1307 { 1448 {
1308 rxvt_freecommastring (s); 1449 rxvt_freecommastring (s);
… …
1346 "*", 1487 "*",
1347 fheight, 1488 fheight,
1348 fheight + 1, fheight - 1, 1489 fheight + 1, fheight - 1,
1349 fheight - 2, fheight + 2); 1490 fheight - 2, fheight + 2);
1350 1491
1351 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1492 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1352 &missing_charset_list, &missing_charset_count, &def_string); 1493 &missing_charset_list, &missing_charset_count, &def_string);
1353 1494
1354 if (missing_charset_list) 1495 if (missing_charset_list)
1355 XFreeStringList (missing_charset_list); 1496 XFreeStringList (missing_charset_list);
1356 1497
… …
1397 XNBackground, bg, 1538 XNBackground, bg,
1398 XNArea, &status_rect, 1539 XNArea, &status_rect,
1399 XNFontSet, fs, 1540 XNFontSet, fs,
1400 NULL); 1541 NULL);
1401 } 1542 }
1543#if ENABLE_XIM_ONTHESPOT
1544 else if (input_style & XIMPreeditCallbacks)
1545 {
1546 im_set_position (spot);
1547
1548 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1549 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1550 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1551# if 0
1552 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1553# endif
1554
1555 preedit_attr = XVaCreateNestedList (0,
1556 XNSpotLocation, &spot,
1557 XNPreeditStartCallback, &xcb[0],
1558 XNPreeditDoneCallback , &xcb[1],
1559 XNPreeditDrawCallback , &xcb[2],
1560# if 0
1561 XNPreeditCaretCallback, &xcb[3],
1562# endif
1563 NULL);
1564 }
1565#endif
1402 1566
1403 Input_Context = XCreateIC (xim, 1567 Input_Context = XCreateIC (xim,
1404 XNInputStyle, input_style, 1568 XNInputStyle, input_style,
1405 XNClientWindow, vt, 1569 XNClientWindow, vt,
1406 XNFocusWindow, parent[0], 1570 XNFocusWindow, parent[0],
… …
1408 preedit_attr, 1572 preedit_attr,
1409 status_attr ? XNStatusAttributes : NULL, 1573 status_attr ? XNStatusAttributes : NULL,
1410 status_attr, NULL); 1574 status_attr, NULL);
1411 1575
1412 if (preedit_attr) XFree (preedit_attr); 1576 if (preedit_attr) XFree (preedit_attr);
1413 if (status_attr) XFree (status_attr); 1577 if (status_attr) XFree (status_attr);
1414 if (fs) XFreeFontSet (display->display, fs); 1578 if (fs) XFreeFontSet (dpy, fs);
1415 1579
1416 if (Input_Context == NULL) 1580 if (Input_Context == NULL)
1417 { 1581 {
1418 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1582 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1419 im_destroy (); 1583 im_destroy ();
1420 return false; 1584 return false;
1421 } 1585 }
1422 1586
1587#if 0
1588 // unfortunately, only the focus window is used by XIM, hard to fix
1423 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1589 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1424 vt_select_input (); 1590 vt_select_input ();
1591#endif
1425 1592
1426 if (input_style & XIMPreeditArea)
1427 IMSetStatusPosition (); 1593 IMSetPosition ();
1428 1594
1429 return true; 1595 return true;
1430} 1596}
1431 1597
1432void 1598void
… …
1490 SET_LOCALE (locale); 1656 SET_LOCALE (locale);
1491#endif 1657#endif
1492} 1658}
1493 1659
1494void 1660void
1495rxvt_term::IMSetStatusPosition () 1661rxvt_term::IMSetPosition ()
1496{ 1662{
1497 XRectangle preedit_rect, status_rect, *needed_rect; 1663 XRectangle preedit_rect, status_rect, *needed_rect;
1498 XVaNestedList preedit_attr, status_attr; 1664 XVaNestedList preedit_attr, status_attr;
1499 1665
1500 if (!Input_Context 1666 if (!Input_Context
1501 || !focus 1667 || !focus
1502 || !(input_style & XIMPreeditArea) 1668 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1503 || !IMisRunning ()) 1669 || !IMisRunning ())
1504 return; 1670 return;
1505 1671
1672 if (input_style & XIMPreeditPosition)
1673 {
1674 im_set_size (preedit_rect);
1675 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676
1677 XSetICValues (Input_Context,
1678 XNPreeditAttributes, preedit_attr, NULL);
1679 }
1680 else
1681 {
1506 /* Getting the necessary width of preedit area */ 1682 /* Getting the necessary width of preedit area */
1507 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1683 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1508 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1684 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1509 XFree (status_attr); 1685 XFree (status_attr);
1510 1686
1511 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1687 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1512 XFree (needed_rect); 1688 XFree (needed_rect);
1513 1689
1514 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1690 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1515 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1691 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1516 1692
1517 XSetICValues (Input_Context, 1693 XSetICValues (Input_Context,
1518 XNPreeditAttributes, preedit_attr, 1694 XNPreeditAttributes, preedit_attr,
1519 XNStatusAttributes, status_attr, NULL); 1695 XNStatusAttributes, status_attr,
1696 NULL);
1520 1697
1698 XFree (status_attr);
1699 }
1700
1521 XFree (preedit_attr); 1701 XFree (preedit_attr);
1522 XFree (status_attr);
1523} 1702}
1524#endif /* USE_XIM */ 1703#endif /* USE_XIM */
1525 1704
1526/*----------------------- end-of-file (C source) -----------------------*/ 1705/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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