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.198 by root, Tue Jan 24 16:57:42 2006 UTC vs.
Revision 1.245 by sasha, Fri Aug 17 22:02:14 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 bgPixmap.set_file (rs[Rs_backgroundPixmap]);
546 }
547 /* do not want to render Pixmap yet if we are size/position dependant -
548 * wait for ConfigureNotify at least
549 * TODO: this does not work for some reason when transparency is disabled !!!!
550 */
551 if (!bgPixmap.window_size_sensitive ())
552 update_background ();
553#endif
554 }
555#endif
556
557#if ENABLE_PERL
558 rootwin_ev.start (display, display->root);
504#endif 559#endif
505 560
506 set_colorfgbg (); 561 set_colorfgbg ();
507 562
508 init_command (cmd_argv); 563 init_command (cmd_argv);
… …
514 569
515 check_ev.start (); 570 check_ev.start ();
516 571
517 HOOK_INVOKE ((this, HOOK_START, DT_END)); 572 HOOK_INVOKE ((this, HOOK_START, DT_END));
518 573
574#if ENABLE_XEMBED
575 if (rs[Rs_embed])
576 {
577 long info[2] = { 0, XEMBED_MAPPED };
578
579 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
580 32, PropModeReplace, (unsigned char *)&info, 2);
581 }
582#endif
583
519 XMapWindow (disp, vt); 584 XMapWindow (dpy, vt);
520 XMapWindow (disp, parent[0]); 585 XMapWindow (dpy, parent[0]);
521 586
522 return true; 587 return true;
523} 588}
524 589
525static struct sig_handlers 590static struct sig_handlers
… …
530 * Catch a fatal signal and tidy up before quitting 595 * Catch a fatal signal and tidy up before quitting
531 */ 596 */
532 void 597 void
533 sig_term (sig_watcher &w) 598 sig_term (sig_watcher &w)
534 { 599 {
535#ifdef DEBUG_CMD
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup (); 600 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL); 601 signal (w.signum, SIG_DFL);
540 kill (getpid (), w.signum); 602 kill (getpid (), w.signum);
541 } 603 }
542 604
… …
608 return p; 670 return p;
609} 671}
610 672
611/*----------------------------------------------------------------------*/ 673/*----------------------------------------------------------------------*/
612/* 674/*
613 * window size/position calculcations for XSizeHint and other storage. 675 * window size/position calculations for XSizeHint and other storage.
614 * if width/height are non-zero then override calculated width/height 676 * if width/height are non-zero then override calculated width/height
615 */ 677 */
616void 678void
617rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 679rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
618{ 680{
619 short recalc_x, recalc_y; 681 short recalc_x, recalc_y;
620 int x, y, sb_w, flags; 682 int x, y, sb_w, flags;
621 unsigned int w, h; 683 unsigned int w, h;
622 unsigned int max_width, max_height; 684 unsigned int max_width, max_height;
623 dDisp;
624
625 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
626 ncol, nrow, szHint.width, szHint.height));
627 685
628 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 686 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
629 szHint.win_gravity = NorthWestGravity; 687 szHint.win_gravity = NorthWestGravity;
630 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 688 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
631 689
… …
693 751
694 if (scrollBar.state) 752 if (scrollBar.state)
695 { 753 {
696 sb_w = scrollbar_TotalWidth (); 754 sb_w = scrollbar_TotalWidth ();
697 szHint.base_width += sb_w; 755 szHint.base_width += sb_w;
756
698 if (!OPTION (Opt_scrollBar_right)) 757 if (!option (Opt_scrollBar_right))
699 window_vt_x += sb_w; 758 window_vt_x += sb_w;
700 } 759 }
701 760
702 szHint.width_inc = fwidth; 761 szHint.width_inc = fwidth;
703 szHint.height_inc = fheight; 762 szHint.height_inc = fheight;
704 szHint.min_width = szHint.base_width + szHint.width_inc; 763 szHint.min_width = szHint.base_width + szHint.width_inc;
705 szHint.min_height = szHint.base_height + szHint.height_inc; 764 szHint.min_height = szHint.base_height + szHint.height_inc;
706 765
707 if (newwidth && newwidth - szHint.base_width < max_width) 766 if (newwidth && newwidth - szHint.base_width < max_width)
708 { 767 {
709 szHint.width = newwidth; 768 szHint.width = newwidth;
… …
724 { 783 {
725 min_it (height, max_height); 784 min_it (height, max_height);
726 szHint.height = szHint.base_height + height; 785 szHint.height = szHint.base_height + height;
727 } 786 }
728 787
729 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 788 if (scrollBar.state && option (Opt_scrollBar_right))
730 window_sb_x = szHint.width - sb_w; 789 window_sb_x = szHint.width - sb_w;
731 790
732 if (recalc_x) 791 if (recalc_x)
733 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 792 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
793
734 if (recalc_y) 794 if (recalc_y)
735 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 795 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
736 796
737 ncol = width / fwidth; 797 ncol = width / fwidth;
738 nrow = height / fheight; 798 nrow = height / fheight;
739 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
740 ncol, nrow, szHint.width,
741 szHint.height));
742 return;
743} 799}
744 800
745/*----------------------------------------------------------------------*/ 801/*----------------------------------------------------------------------*/
746/* 802/*
747 * Tell the teletype handler what size the window is. 803 * Tell the teletype handler what size the window is.
… …
799 delete fontset[0]; 855 delete fontset[0];
800 fontset[0] = fs; 856 fontset[0] = fs;
801 857
802 prop = (*fs)[1]->properties (); 858 prop = (*fs)[1]->properties ();
803 prop.height += lineSpace; 859 prop.height += lineSpace;
860
804 fs->set_prop (prop); 861 fs->set_prop (prop, false);
805 862
806 fwidth = prop.width; 863 fwidth = prop.width;
807 fheight = prop.height; 864 fheight = prop.height;
808 fbase = prop.ascent; 865 fbase = prop.ascent;
809 866
… …
818 { 875 {
819 fontset[style] = fs = new rxvt_fontset (this); 876 fontset[style] = fs = new rxvt_fontset (this);
820 rxvt_fontprop prop2 = prop; 877 rxvt_fontprop prop2 = prop;
821 878
822 if (res) 879 if (res)
823 prop2.weight = prop2.slant = rxvt_fontprop::unset; 880 {
881 fs->populate (res);
882 fs->set_prop (prop2, false);
883 }
824 else 884 else
825 { 885 {
826 res = fontset[0]->fontdesc; 886 fs->populate (fontset[0]->fontdesc);
827 887
828 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 888 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
829 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 889 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
890
891 fs->set_prop (prop2, true);
830 } 892 }
831 893
832 fs->populate (res);
833 fs->set_prop (prop2);
834 } 894 }
835#else 895#else
836 fontset[style] = fontset[0]; 896 fontset[style] = fontset[0];
837#endif 897#endif
838 } 898 }
… …
847 return true; 907 return true;
848} 908}
849 909
850void rxvt_term::set_string_property (Atom prop, const char *str, int len) 910void rxvt_term::set_string_property (Atom prop, const char *str, int len)
851{ 911{
852 XChangeProperty (display->display, parent[0], 912 XChangeProperty (dpy, parent[0],
853 prop, XA_STRING, 8, PropModeReplace, 913 prop, XA_STRING, 8, PropModeReplace,
854 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 914 (const unsigned char *)str, len >= 0 ? len : strlen (str));
855} 915}
856 916
857void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 917void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
858{ 918{
859 wchar_t *ws = rxvt_mbstowcs (str, len); 919 wchar_t *ws = rxvt_mbstowcs (str, len);
860 char *s = rxvt_wcstoutf8 (ws); 920 char *s = rxvt_wcstoutf8 (ws);
861 921
862 XChangeProperty (display->display, parent[0], 922 XChangeProperty (dpy, parent[0],
863 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 923 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
864 (const unsigned char *)s, strlen (s)); 924 (const unsigned char *)s, strlen (s));
865 925
866 free (s); 926 free (s);
867 free (ws); 927 free (ws);
… …
892void 952void
893rxvt_term::set_window_color (int idx, const char *color) 953rxvt_term::set_window_color (int idx, const char *color)
894{ 954{
895 rxvt_color xcol; 955 rxvt_color xcol;
896 int i; 956 int i;
897 957
898 if (color == NULL || *color == '\0') 958 if (color == NULL || *color == '\0')
899 return; 959 return;
960
961 color = strdup (color);
962 allocated.push_back ((void *)color);
963 rs[Rs_color + idx] = color;
900 964
901 /* handle color aliases */ 965 /* handle color aliases */
902 if (isdigit (*color)) 966 if (isdigit (*color))
903 { 967 {
904 i = atoi (color); 968 i = atoi (color);
905 969
906 if (i >= 8 && i <= 15) 970 if (i >= 8 && i <= 15)
907 { /* bright colors */ 971 { /* bright colors */
908 i -= 8; 972 i -= 8;
909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 973 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
910 SET_PIXCOLOR (idx);
911 goto done; 974 goto done;
912 } 975 }
913 976
914 if (i >= 0 && i <= 7) 977 if (i >= 0 && i <= 7)
915 { /* normal colors */ 978 { /* normal colors */
916 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 979 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
917 SET_PIXCOLOR (idx);
918 goto done; 980 goto done;
919 } 981 }
920 } 982 }
921 983
922 if (!rXParseAllocColor (&xcol, color)) 984 set_color (xcol, color);
923 return;
924
925 /* XStoreColor (display->display, display->cmap, XColor*); */
926 985
927 /* 986 /*
928 * FIXME: should free colors here, but no idea how to do it so instead, 987 * FIXME: should free colors here, but no idea how to do it so instead,
929 * so just keep gobbling up the colormap 988 * so just keep gobbling up the colormap
930 */ 989 */
931# if 0
932 for (i = Color_Black; i <= Color_White; i++)
933 if (pix_colors[idx] == pix_colors[i])
934 break;
935 if (i > Color_White)
936 {
937 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
938 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
939 DisplayPlanes (display->display, display->screen));
940 }
941# endif
942 990
943 pix_colors_focused[idx] = xcol; 991 pix_colors_focused[idx] = xcol;
944 SET_PIXCOLOR (idx);
945 992
946 /* XSetWindowAttributes attr; */ 993 /* XSetWindowAttributes attr; */
947 /* Cursor cursor; */ 994 /* Cursor cursor; */
948done: 995done:
949
950#if OFF_FOCUS_FADING
951 if (rs[Rs_fade])
952 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
953#endif
954
955 /*TODO: handle Color_BD, scrollbar background, etc. */ 996 /*TODO: handle Color_BD, scrollbar background, etc. */
956 997
998 update_fade_color (idx);
957 recolour_cursor (); 999 recolour_cursor ();
958 scr_recolour (); 1000 scr_recolour ();
959} 1001}
960 1002
961#else 1003#else
… …
963#endif /* XTERM_COLOR_CHANGE */ 1005#endif /* XTERM_COLOR_CHANGE */
964 1006
965void 1007void
966rxvt_term::recolour_cursor () 1008rxvt_term::recolour_cursor ()
967{ 1009{
968 XColor xcol[2]; 1010 XColor fg, bg;
969 1011
970 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1012 (ISSET_PIXCOLOR (Color_pointer_fg)
971 ? pix_colors_focused[Color_pointer_fg] 1013 ? pix_colors_focused[Color_pointer_fg]
972 : pix_colors_focused[Color_fg]; 1014 : pix_colors_focused[Color_fg]).get (fg);
1015
973 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1016 (ISSET_PIXCOLOR (Color_pointer_bg)
974 ? pix_colors_focused[Color_pointer_bg] 1017 ? pix_colors_focused[Color_pointer_bg]
975 : pix_colors_focused[Color_bg]; 1018 : pix_colors_focused[Color_bg]).get (bg);
976 1019
977 XQueryColors (display->display, display->cmap, xcol, 2); 1020 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
978 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
979} 1021}
980 1022
981/*----------------------------------------------------------------------*/ 1023/*----------------------------------------------------------------------*/
982/* 1024/*
983 * find if fg/bg matches any of the normal (low-intensity) colors 1025 * find if fg/bg matches any of the normal (low-intensity) colors
… …
987{ 1029{
988 unsigned int i; 1030 unsigned int i;
989 const char *xpmb = "\0"; 1031 const char *xpmb = "\0";
990 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1032 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
991 1033
992 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
993 strcpy (fstr, "default"); 1034 strcpy (fstr, "default");
994 strcpy (bstr, "default"); 1035 strcpy (bstr, "default");
995 for (i = Color_Black; i <= Color_White; i++) 1036 for (i = Color_Black; i <= Color_White; i++)
996 if (pix_colors[Color_fg] == pix_colors[i]) 1037 if (pix_colors[Color_fg] == pix_colors[i])
997 { 1038 {
… …
1012 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1053 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1013} 1054}
1014 1055
1015/*----------------------------------------------------------------------*/ 1056/*----------------------------------------------------------------------*/
1016 1057
1017int 1058bool
1018rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1059rxvt_term::set_color (rxvt_color &color, const char *name)
1019{ 1060{
1020 if (!screen_in_out->set (display, colour)) 1061 if (color.set (this, name))
1021 {
1022 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1023 return false;
1024 }
1025
1026 return true; 1062 return true;
1063
1064 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1065 return false;
1066}
1067
1068void
1069rxvt_term::alias_color (int dst, int src)
1070{
1071 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1027} 1072}
1028 1073
1029/* -------------------------------------------------------------------- * 1074/* -------------------------------------------------------------------- *
1030 * - WINDOW RESIZING - * 1075 * - WINDOW RESIZING - *
1031 * -------------------------------------------------------------------- */ 1076 * -------------------------------------------------------------------- */
… …
1033rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1078rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1034{ 1079{
1035 int fix_screen; 1080 int fix_screen;
1036 int old_width = szHint.width; 1081 int old_width = szHint.width;
1037 int old_height = szHint.height; 1082 int old_height = szHint.height;
1038 dDisp;
1039 1083
1040 window_calc (newwidth, newheight); 1084 window_calc (newwidth, newheight);
1085
1086 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1041 XSetWMNormalHints (disp, parent[0], &szHint); 1087 XSetWMNormalHints (dpy, parent[0], &szHint);
1042 1088
1043 if (!ignoreparent) 1089 if (!ignoreparent)
1044 { 1090 {
1045#ifdef SMART_RESIZE 1091#ifdef SMART_RESIZE
1046 /* 1092 /*
… …
1050 int x, y, x1, y1; 1096 int x, y, x1, y1;
1051 int dx, dy; 1097 int dx, dy;
1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1098 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1053 Window unused_cr; 1099 Window unused_cr;
1054 1100
1055 XTranslateCoordinates (disp, parent[0], display->root, 1101 XTranslateCoordinates (dpy, parent[0], display->root,
1056 0, 0, &x, &y, &unused_cr); 1102 0, 0, &x, &y, &unused_cr);
1057 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1103 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1104 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1059 /* 1105 /*
1060 * if display->root isn't the parent window, a WM will probably have offset 1106 * if display->root isn't the parent window, a WM will probably have offset
1061 * our position for handles and decorations. Counter it 1107 * our position for handles and decorations. Counter it
1062 */ 1108 */
… …
1064 { 1110 {
1065 x -= x1; 1111 x -= x1;
1066 y -= y1; 1112 y -= y1;
1067 } 1113 }
1068 1114
1069 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1115 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1070 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1116 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1071 dx = old_width - szHint.width; 1117 dx = old_width - szHint.width;
1072 dy = old_height - szHint.height; 1118 dy = old_height - szHint.height;
1073 1119
1074 /* Check position of the center of the window */ 1120 /* Check position of the center of the window */
1075 if (x < x1) /* left half */ 1121 if (x < x1) /* left half */
… …
1079 if (y < y1) /* top half */ 1125 if (y < y1) /* top half */
1080 dy = 0; 1126 dy = 0;
1081 else if (y == y1) /* exact center */ 1127 else if (y == y1) /* exact center */
1082 dy /= 2; 1128 dy /= 2;
1083 1129
1084 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1130 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1085 szHint.width, szHint.height); 1131 szHint.width, szHint.height);
1086#else 1132#else
1087 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1133 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1088#endif 1134#endif
1089 } 1135 }
1090 1136
1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1137 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1092 1138
1093 if (fix_screen || newwidth != old_width || newheight != old_height) 1139 if (fix_screen || newwidth != old_width || newheight != old_height)
1094 { 1140 {
1095 if (scrollBar.state) 1141 if (scrollBar.state)
1096 { 1142 {
1097 XMoveResizeWindow (disp, scrollBar.win, 1143 XMoveResizeWindow (dpy, scrollBar.win,
1098 window_sb_x, 0, 1144 window_sb_x, 0,
1099 scrollbar_TotalWidth (), szHint.height); 1145 scrollbar_TotalWidth (), szHint.height);
1100 resize_scrollbar (); 1146 resize_scrollbar ();
1101 } 1147 }
1102 1148
1103 XMoveResizeWindow (disp, vt, 1149 XMoveResizeWindow (dpy, vt,
1104 window_vt_x, window_vt_y, 1150 window_vt_x, window_vt_y,
1105 width, height); 1151 width, height);
1106 1152
1153#ifdef XPM_BACKGROUND
1154 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1155 if (bgPixmap.window_size_sensitive ())
1156 update_background ();
1157#endif
1158
1107 scr_clear (); 1159 scr_clear ();
1108#ifdef XPM_BACKGROUND
1109 resize_pixmap ();
1110#endif
1111 } 1160 }
1112 1161
1113 if (fix_screen || old_height == 0) 1162 if (fix_screen || old_height == 0)
1114 scr_reset (); 1163 scr_reset ();
1115 1164
1116#ifdef XPM_BACKGROUND 1165 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1117 if (pixmap) 1166 //scr_touch (false);
1167
1168#ifdef HAVE_BG_PIXMAP
1169// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1170// if (bgPixmap.pixmap)
1118 scr_touch (false); 1171// scr_touch (false);
1119#endif 1172#endif
1120 1173
1121#ifdef USE_XIM 1174#ifdef USE_XIM
1122 IMSetStatusPosition (); 1175 IMSetPosition ();
1123#endif 1176#endif
1124} 1177}
1125 1178
1126/* 1179/*
1127 * Set the width/height of the vt window in characters. Units are pixels. 1180 * Set the width/height of the vt window in characters. Units are pixels.
… …
1132{ 1185{
1133 XWindowAttributes wattr; 1186 XWindowAttributes wattr;
1134 1187
1135 if (newwidth == 0 || newheight == 0) 1188 if (newwidth == 0 || newheight == 0)
1136 { 1189 {
1137 XGetWindowAttributes (display->display, display->root, &wattr); 1190 XGetWindowAttributes (dpy, display->root, &wattr);
1138 1191
1139 if (newwidth == 0) 1192 if (newwidth == 0)
1140 newwidth = wattr.width - szHint.base_width; 1193 newwidth = wattr.width - szHint.base_width;
1141 if (newheight == 0) 1194 if (newheight == 0)
1142 newheight = wattr.height - szHint.base_height; 1195 newheight = wattr.height - szHint.base_height;
… …
1156#ifdef USE_XIM 1209#ifdef USE_XIM
1157 1210
1158void 1211void
1159rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1212rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1160{ 1213{
1161 fg = pix_colors[Color_fg]; 1214 fg = pix_colors [Color_fg];
1162 bg = pix_colors[Color_bg]; 1215 bg = pix_colors [Color_bg];
1163} 1216}
1164 1217
1165void 1218void
1166rxvt_term::im_set_size (XRectangle &size) 1219rxvt_term::im_set_size (XRectangle &size)
1167{ 1220{
… …
1204 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1257 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1205 1258
1206 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1259 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1207 *p = '\0'; 1260 *p = '\0';
1208 1261
1209 atom = XInternAtom (display->display, server, False); 1262 atom = XInternAtom (dpy, server, False);
1210 win = XGetSelectionOwner (display->display, atom); 1263 win = XGetSelectionOwner (dpy, atom);
1211 1264
1212 if (win != None) 1265 if (win != None)
1213 return True; 1266 return True;
1214 } 1267 }
1215 1268
… …
1222 XPoint nspot; 1275 XPoint nspot;
1223 XVaNestedList preedit_attr; 1276 XVaNestedList preedit_attr;
1224 1277
1225 if (!Input_Context 1278 if (!Input_Context
1226 || !focus 1279 || !focus
1227 || !(input_style & XIMPreeditPosition)) 1280 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1228 return; 1281 return;
1229 1282
1230 im_set_position (nspot); 1283 im_set_position (nspot);
1231 1284
1232 if (nspot.x == spot.x && nspot.y == spot.y) 1285 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1251 input_method = 0; 1304 input_method = 0;
1252 } 1305 }
1253 1306
1254 Input_Context = 0; 1307 Input_Context = 0;
1255} 1308}
1309
1310#ifdef ENABLE_XIM_ONTHESPOT
1311
1312static void
1313xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1314{
1315 ((rxvt_term *)client_data)->make_current ();
1316 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1317}
1318
1319static void
1320xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1321{
1322 ((rxvt_term *)client_data)->make_current ();
1323 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1324}
1325
1326static void
1327xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1328{
1329 rxvt_term *term = (rxvt_term *)client_data;
1330 XIMText *text = call_data->text;
1331
1332 term->make_current ();
1333
1334 if (text)
1335 {
1336 void *str;
1337
1338 if (!text->encoding_is_wchar && text->string.multi_byte)
1339 {
1340 // of course, X makes it ugly again
1341 if (term->rs[Rs_imLocale])
1342 SET_LOCALE (term->rs[Rs_imLocale]);
1343
1344 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1345 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1346
1347 if (term->rs[Rs_imLocale])
1348 SET_LOCALE (term->locale);
1349 }
1350 else
1351 str = (void *)text->string.wide_char;
1352
1353 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1354 DT_INT, call_data->caret,
1355 DT_INT, call_data->chg_first,
1356 DT_INT, call_data->chg_length,
1357 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1358 DT_WCS_LEN, str, str ? (int)text->length : 0,
1359 DT_END));
1360 }
1361 else
1362 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1363 DT_INT, call_data->caret,
1364 DT_INT, call_data->chg_first,
1365 DT_INT, call_data->chg_length,
1366 DT_END));
1367}
1368
1369#if 0
1370static void
1371xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1372{
1373 ((rxvt_term *)client_data)->make_current ();
1374 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1375 DT_INT, call_data->position,
1376 DT_INT, call_data->direction,
1377 DT_INT, call_data->style,
1378 DT_END));
1379}
1380#endif
1381
1382#endif
1256 1383
1257/* 1384/*
1258 * Try to open a XIM with the current modifiers, then see if we can 1385 * Try to open a XIM with the current modifiers, then see if we can
1259 * open a suitable preedit type 1386 * open a suitable preedit type
1260 */ 1387 */
… …
1267 XRectangle rect, status_rect, needed_rect; 1394 XRectangle rect, status_rect, needed_rect;
1268 unsigned long fg, bg; 1395 unsigned long fg, bg;
1269 const char *p; 1396 const char *p;
1270 char **s; 1397 char **s;
1271 XIMStyles *xim_styles; 1398 XIMStyles *xim_styles;
1399#ifdef ENABLE_XIM_ONTHESPOT
1400 XIMCallback xcb[4];
1401#endif
1272 1402
1273 set_environ (envv); 1403 set_environ (envv);
1274 1404
1275 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1405 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1276 return false; 1406 return false;
1277 1407
1278 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1279 input_method = display->get_xim (locale, modifiers); 1408 input_method = display->get_xim (locale, modifiers);
1280 if (input_method == NULL) 1409 if (input_method == NULL)
1281 return false; 1410 return false;
1282 1411
1283 xim = input_method->xim; 1412 xim = input_method->xim;
… …
1303 s = rxvt_splitcommastring (p); 1432 s = rxvt_splitcommastring (p);
1304 1433
1305 for (i = found = 0; !found && s[i]; i++) 1434 for (i = found = 0; !found && s[i]; i++)
1306 { 1435 {
1307 if (!strcmp (s[i], "OverTheSpot")) 1436 if (!strcmp (s[i], "OverTheSpot"))
1308 input_style = (XIMPreeditPosition | XIMStatusNothing); 1437 input_style = XIMPreeditPosition | XIMStatusNothing;
1309 else if (!strcmp (s[i], "OffTheSpot")) 1438 else if (!strcmp (s[i], "OffTheSpot"))
1310 input_style = (XIMPreeditArea | XIMStatusArea); 1439 input_style = XIMPreeditArea | XIMStatusArea;
1311 else if (!strcmp (s[i], "Root")) 1440 else if (!strcmp (s[i], "Root"))
1312 input_style = (XIMPreeditNothing | XIMStatusNothing); 1441 input_style = XIMPreeditNothing | XIMStatusNothing;
1313 else if (!strcmp (s[i], "None")) 1442 else if (!strcmp (s[i], "None"))
1314 input_style = (XIMPreeditNone | XIMStatusNone); 1443 input_style = XIMPreeditNone | XIMStatusNone;
1444#ifdef ENABLE_XIM_ONTHESPOT
1445 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1446 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1447#endif
1448 else
1449 input_style = XIMPreeditNothing | XIMStatusNothing;
1315 1450
1316 for (j = 0; j < xim_styles->count_styles; j++) 1451 for (j = 0; j < xim_styles->count_styles; j++)
1317 if (input_style == xim_styles->supported_styles[j]) 1452 if (input_style == xim_styles->supported_styles[j])
1318 { 1453 {
1319 rxvt_freecommastring (s); 1454 rxvt_freecommastring (s);
… …
1357 "*", 1492 "*",
1358 fheight, 1493 fheight,
1359 fheight + 1, fheight - 1, 1494 fheight + 1, fheight - 1,
1360 fheight - 2, fheight + 2); 1495 fheight - 2, fheight + 2);
1361 1496
1362 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1497 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1363 &missing_charset_list, &missing_charset_count, &def_string); 1498 &missing_charset_list, &missing_charset_count, &def_string);
1364 1499
1365 if (missing_charset_list) 1500 if (missing_charset_list)
1366 XFreeStringList (missing_charset_list); 1501 XFreeStringList (missing_charset_list);
1367 1502
… …
1408 XNBackground, bg, 1543 XNBackground, bg,
1409 XNArea, &status_rect, 1544 XNArea, &status_rect,
1410 XNFontSet, fs, 1545 XNFontSet, fs,
1411 NULL); 1546 NULL);
1412 } 1547 }
1548#if ENABLE_XIM_ONTHESPOT
1549 else if (input_style & XIMPreeditCallbacks)
1550 {
1551 im_set_position (spot);
1552
1553 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1554 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1555 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1556# if 0
1557 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1558# endif
1559
1560 preedit_attr = XVaCreateNestedList (0,
1561 XNSpotLocation, &spot,
1562 XNPreeditStartCallback, &xcb[0],
1563 XNPreeditDoneCallback , &xcb[1],
1564 XNPreeditDrawCallback , &xcb[2],
1565# if 0
1566 XNPreeditCaretCallback, &xcb[3],
1567# endif
1568 NULL);
1569 }
1570#endif
1413 1571
1414 Input_Context = XCreateIC (xim, 1572 Input_Context = XCreateIC (xim,
1415 XNInputStyle, input_style, 1573 XNInputStyle, input_style,
1416 XNClientWindow, vt, 1574 XNClientWindow, vt,
1417 XNFocusWindow, parent[0], 1575 XNFocusWindow, parent[0],
… …
1419 preedit_attr, 1577 preedit_attr,
1420 status_attr ? XNStatusAttributes : NULL, 1578 status_attr ? XNStatusAttributes : NULL,
1421 status_attr, NULL); 1579 status_attr, NULL);
1422 1580
1423 if (preedit_attr) XFree (preedit_attr); 1581 if (preedit_attr) XFree (preedit_attr);
1424 if (status_attr) XFree (status_attr); 1582 if (status_attr) XFree (status_attr);
1425 if (fs) XFreeFontSet (display->display, fs); 1583 if (fs) XFreeFontSet (dpy, fs);
1426 1584
1427 if (Input_Context == NULL) 1585 if (Input_Context == NULL)
1428 { 1586 {
1429 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1587 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1430 im_destroy (); 1588 im_destroy ();
1431 return false; 1589 return false;
1432 } 1590 }
1433 1591
1592#if 0
1593 // unfortunately, only the focus window is used by XIM, hard to fix
1434 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1594 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1435 vt_select_input (); 1595 vt_select_input ();
1596#endif
1436 1597
1437 if (input_style & XIMPreeditArea)
1438 IMSetStatusPosition (); 1598 IMSetPosition ();
1439 1599
1440 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1441 return true; 1600 return true;
1442} 1601}
1443 1602
1444void 1603void
1445rxvt_term::im_cb () 1604rxvt_term::im_cb ()
… …
1451 1610
1452 make_current (); 1611 make_current ();
1453 1612
1454 im_destroy (); 1613 im_destroy ();
1455 1614
1456 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1457 if (Input_Context) 1615 if (Input_Context)
1458 return; 1616 return;
1459 1617
1460#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1618#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1461 if (rs[Rs_imLocale]) 1619 if (rs[Rs_imLocale])
… …
1503 SET_LOCALE (locale); 1661 SET_LOCALE (locale);
1504#endif 1662#endif
1505} 1663}
1506 1664
1507void 1665void
1508rxvt_term::IMSetStatusPosition () 1666rxvt_term::IMSetPosition ()
1509{ 1667{
1510 XRectangle preedit_rect, status_rect, *needed_rect; 1668 XRectangle preedit_rect, status_rect, *needed_rect;
1511 XVaNestedList preedit_attr, status_attr; 1669 XVaNestedList preedit_attr, status_attr;
1512 1670
1513 if (!Input_Context 1671 if (!Input_Context
1514 || !focus 1672 || !focus
1515 || !(input_style & XIMPreeditArea) 1673 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1516 || !IMisRunning ()) 1674 || !IMisRunning ())
1517 return; 1675 return;
1518 1676
1677 if (input_style & XIMPreeditPosition)
1678 {
1679 im_set_size (preedit_rect);
1680 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1681
1682 XSetICValues (Input_Context,
1683 XNPreeditAttributes, preedit_attr, NULL);
1684 }
1685 else
1686 {
1519 /* Getting the necessary width of preedit area */ 1687 /* Getting the necessary width of preedit area */
1520 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1688 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1521 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1689 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1522 XFree (status_attr); 1690 XFree (status_attr);
1523 1691
1524 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1692 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1525 XFree (needed_rect); 1693 XFree (needed_rect);
1526 1694
1527 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1695 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1528 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1696 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1529 1697
1530 XSetICValues (Input_Context, 1698 XSetICValues (Input_Context,
1531 XNPreeditAttributes, preedit_attr, 1699 XNPreeditAttributes, preedit_attr,
1532 XNStatusAttributes, status_attr, NULL); 1700 XNStatusAttributes, status_attr,
1701 NULL);
1533 1702
1703 XFree (status_attr);
1704 }
1705
1534 XFree (preedit_attr); 1706 XFree (preedit_attr);
1535 XFree (status_attr);
1536} 1707}
1537#endif /* USE_XIM */ 1708#endif /* USE_XIM */
1538 1709
1539/*----------------------- end-of-file (C source) -----------------------*/ 1710/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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