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.253 by ayin, Mon Oct 15 07:33:48 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
… …
193#endif 201#endif
194} 202}
195 203
196// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 205// for use before an emergency exit
206void
198void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
199{ 208{
200 if (cmd_pid) 209 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
202 211
212 pty_ev.stop ();
203 delete pty; pty = 0; 213 delete pty; pty = 0;
204} 214}
205 215
206rxvt_term::~rxvt_term () 216rxvt_term::~rxvt_term ()
207{ 217{
… …
216#endif 226#endif
217 delete fontset[0]; 227 delete fontset[0];
218 228
219 if (display) 229 if (display)
220 { 230 {
221 dDisp;
222
223 selection_clear (); 231 selection_clear ();
224 232
225#ifdef USE_XIM 233#ifdef USE_XIM
226 im_destroy (); 234 im_destroy ();
227#endif 235#endif
228#ifdef XTERM_SCROLLBAR 236#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 237 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 238 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 239#endif
232#ifdef PLAIN_SCROLLBAR 240#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 241 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 242#endif
235#ifdef NEXT_SCROLLBAR 243#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 244 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 245 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 246 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 247 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 248 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 249 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 250 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 251 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 252 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 253 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 254#endif
247#ifdef RXVT_SCROLLBAR 255#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 256 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 257 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 258 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 259#endif
252 if (gc) XFreeGC (disp, gc); 260 if (gc) XFreeGC (dpy, gc);
253 261
254 delete drawable; 262 delete drawable;
255 // destroy all windows 263 // destroy all windows
256 if (parent[0]) 264 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 265 XDestroyWindow (dpy, parent[0]);
258 }
259 266
260 // TODO: free pixcolours, colours should become part of rxvt_display 267 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 268 if (ISSET_PIXCOLOR (i))
269 {
270 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 271#if OFF_FOCUS_FADING
272 pix_colors_unfocused [i].free (this);
273#endif
274 }
275
276 clear ();
277 }
278
279 delete [] pix_colors_focused;
280#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 281 delete [] pix_colors_unfocused;
264#endif 282#endif
265 283
266 displays.put (display); 284 displays.put (display);
267 285
268 scr_release (); 286 scr_release ();
… …
271 for (int i = 0; i < allocated.size (); i++) 289 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 290 free (allocated [i]);
273 291
274 free (selection.text); 292 free (selection.text);
275 // TODO: manage env vars in child only(!) 293 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 294 free (env_display);
278 free (env_term); 295 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 296 free (locale);
281 free (v_buffer); 297 free (v_buffer);
282 free (incr_buf); 298 free (incr_buf);
283 299
284 delete envv; 300 delete envv;
… …
295{ 311{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 312 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 313
298 cmd_pid = 0; 314 cmd_pid = 0;
299 315
300 if (!OPTION (Opt_hold)) 316 if (!option (Opt_hold))
301 destroy (); 317 destroy ();
302} 318}
303 319
304void 320void
305rxvt_term::destroy () 321rxvt_term::destroy ()
306{ 322{
307 if (destroy_ev.active) 323 if (destroy_ev.active)
308 return; 324 return;
309 325
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 326 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 327
313#if ENABLE_OVERLAY 328#if ENABLE_OVERLAY
314 scr_overlay_off (); 329 scr_overlay_off ();
315#endif 330#endif
316 331
… …
320 im_ev.stop (display); 335 im_ev.stop (display);
321#endif 336#endif
322#if HAVE_SCROLLBARS 337#if HAVE_SCROLLBARS
323 scrollbar_ev.stop (display); 338 scrollbar_ev.stop (display);
324#endif 339#endif
325#if TRANSPARENT 340#if ENABLE_TRANSPARENCY || ENABLE_PERL
326 rootwin_ev.stop (display); 341 rootwin_ev.stop (display);
327#endif 342#endif
328 incr_ev.stop (); 343 incr_ev.stop ();
329 termwin_ev.stop (display); 344 termwin_ev.stop (display);
330 vt_ev.stop (display); 345 vt_ev.stop (display);
… …
371{ 386{
372 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 387 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
373 (*t)->emergency_cleanup (); 388 (*t)->emergency_cleanup ();
374} 389}
375 390
376#if ENABLE_FRILLS 391#if !ENABLE_MINIMAL
377static void 392static void
378print_x_error (Display *dpy, XErrorEvent *event) 393print_x_error (Display *dpy, XErrorEvent *event)
379{ 394{
380 char buffer[BUFSIZ]; 395 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 396 char mesg[BUFSIZ];
… …
429 GET_R->allowedxerror = event->error_code; 444 GET_R->allowedxerror = event->error_code;
430 else 445 else
431 { 446 {
432 // GET_R is most likely not the terminal which caused the error, 447 // GET_R is most likely not the terminal which caused the error,
433 // so just output the error and continue 448 // so just output the error and continue
434#if ENABLE_FRILLS 449#if ENABLE_MINIMAL
450 old_xerror_handler (display, event);
451#else
435 print_x_error (display, event); 452 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 453#endif
439 } 454 }
440 455
441 return 0; 456 return 0;
442} 457}
… …
470#ifdef KEYSYM_RESOURCE 485#ifdef KEYSYM_RESOURCE
471 keyboard->register_done (); 486 keyboard->register_done ();
472#endif 487#endif
473 488
474#ifdef HAVE_SCROLLBARS 489#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar)) 490 if (option (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */ 491 scrollBar.setIdle (); /* set existence for size calculations */
477#endif 492#endif
478 493
479 pty = ptytty::create (); 494 pty = ptytty::create ();
480 495
481 create_windows (argc, argv); 496 create_windows (argc, argv);
482 497
483 dDisp;
484
485 init_xlocale (); 498 init_xlocale ();
486 499
487 scr_reset (); // initialize screen 500 scr_reset (); // initialize screen
488 501
489#if 0 502#if 0
490 XSynchronize (disp, True); 503 XSynchronize (dpy, True);
491#endif 504#endif
492 505
493#ifdef HAVE_SCROLLBARS 506#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar)) 507 if (option (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */ 508 resize_scrollbar (); /* create and map scrollbar */
496#endif 509#endif
510#ifdef HAVE_BG_PIXMAP
511 {
512 bgPixmap.set_target (this);
513
497#ifdef TRANSPARENT 514#ifdef ENABLE_TRANSPARENCY
498 if (OPTION (Opt_transparent)) 515 if (option (Opt_transparent))
499 { 516 {
517 bgPixmap.set_transparent ();
518#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif
522 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]);
526
527 bgPixmap.set_root_pixmap ();
500 XSelectInput (disp, display->root, PropertyChangeMask); 528 XSelectInput (dpy, display->root, PropertyChangeMask);
501 check_our_parents ();
502 rootwin_ev.start (display, display->root); 529 rootwin_ev.start (display, display->root);
503 } 530 }
531#endif
532
533#ifdef BG_IMAGE_FROM_FILE
534 if (rs[Rs_backgroundPixmap] != NULL)
535 {
536 const char *p = rs[Rs_backgroundPixmap];
537
538 if ((p = strchr (p, ';')) != NULL)
539 {
540 p++;
541 bgPixmap.set_geometry (p);
542 }
543 else
544 bgPixmap.set_defaultGeometry ();
545
546 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
547 if (!bgPixmap.window_position_sensitive ())
548 update_background ();
549 }
550#endif
551 }
552#endif
553
554#if ENABLE_PERL
555 rootwin_ev.start (display, display->root);
504#endif 556#endif
505 557
506 set_colorfgbg (); 558 set_colorfgbg ();
507 559
508 init_command (cmd_argv); 560 init_command (cmd_argv);
… …
514 566
515 check_ev.start (); 567 check_ev.start ();
516 568
517 HOOK_INVOKE ((this, HOOK_START, DT_END)); 569 HOOK_INVOKE ((this, HOOK_START, DT_END));
518 570
571#if ENABLE_XEMBED
572 if (rs[Rs_embed])
573 {
574 long info[2] = { 0, XEMBED_MAPPED };
575
576 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
577 32, PropModeReplace, (unsigned char *)&info, 2);
578 }
579#endif
580
519 XMapWindow (disp, vt); 581 XMapWindow (dpy, vt);
520 XMapWindow (disp, parent[0]); 582 XMapWindow (dpy, parent[0]);
521 583
522 return true; 584 return true;
523} 585}
524 586
525static struct sig_handlers 587static struct sig_handlers
… …
530 * Catch a fatal signal and tidy up before quitting 592 * Catch a fatal signal and tidy up before quitting
531 */ 593 */
532 void 594 void
533 sig_term (sig_watcher &w) 595 sig_term (sig_watcher &w)
534 { 596 {
535#ifdef DEBUG_CMD
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup (); 597 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL); 598 signal (w.signum, SIG_DFL);
540 kill (getpid (), w.signum); 599 kill (getpid (), w.signum);
541 } 600 }
542 601
… …
608 return p; 667 return p;
609} 668}
610 669
611/*----------------------------------------------------------------------*/ 670/*----------------------------------------------------------------------*/
612/* 671/*
613 * window size/position calculcations for XSizeHint and other storage. 672 * window size/position calculations for XSizeHint and other storage.
614 * if width/height are non-zero then override calculated width/height 673 * if width/height are non-zero then override calculated width/height
615 */ 674 */
616void 675void
617rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 676rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
618{ 677{
619 short recalc_x, recalc_y; 678 short recalc_x, recalc_y;
620 int x, y, sb_w, flags; 679 int x, y, sb_w, flags;
621 unsigned int w, h; 680 unsigned int w, h;
622 unsigned int max_width, max_height; 681 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 682
628 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 683 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
629 szHint.win_gravity = NorthWestGravity; 684 szHint.win_gravity = NorthWestGravity;
630 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 685 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
631 686
… …
693 748
694 if (scrollBar.state) 749 if (scrollBar.state)
695 { 750 {
696 sb_w = scrollbar_TotalWidth (); 751 sb_w = scrollbar_TotalWidth ();
697 szHint.base_width += sb_w; 752 szHint.base_width += sb_w;
753
698 if (!OPTION (Opt_scrollBar_right)) 754 if (!option (Opt_scrollBar_right))
699 window_vt_x += sb_w; 755 window_vt_x += sb_w;
700 } 756 }
701 757
702 szHint.width_inc = fwidth; 758 szHint.width_inc = fwidth;
703 szHint.height_inc = fheight; 759 szHint.height_inc = fheight;
704 szHint.min_width = szHint.base_width + szHint.width_inc; 760 szHint.min_width = szHint.base_width + szHint.width_inc;
705 szHint.min_height = szHint.base_height + szHint.height_inc; 761 szHint.min_height = szHint.base_height + szHint.height_inc;
706 762
707 if (newwidth && newwidth - szHint.base_width < max_width) 763 if (newwidth && newwidth - szHint.base_width < max_width)
708 { 764 {
709 szHint.width = newwidth; 765 szHint.width = newwidth;
… …
724 { 780 {
725 min_it (height, max_height); 781 min_it (height, max_height);
726 szHint.height = szHint.base_height + height; 782 szHint.height = szHint.base_height + height;
727 } 783 }
728 784
729 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 785 if (scrollBar.state && option (Opt_scrollBar_right))
730 window_sb_x = szHint.width - sb_w; 786 window_sb_x = szHint.width - sb_w;
731 787
732 if (recalc_x) 788 if (recalc_x)
733 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 789 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
790
734 if (recalc_y) 791 if (recalc_y)
735 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 792 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
736 793
737 ncol = width / fwidth; 794 ncol = width / fwidth;
738 nrow = height / fheight; 795 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} 796}
744 797
745/*----------------------------------------------------------------------*/ 798/*----------------------------------------------------------------------*/
746/* 799/*
747 * Tell the teletype handler what size the window is. 800 * Tell the teletype handler what size the window is.
… …
799 delete fontset[0]; 852 delete fontset[0];
800 fontset[0] = fs; 853 fontset[0] = fs;
801 854
802 prop = (*fs)[1]->properties (); 855 prop = (*fs)[1]->properties ();
803 prop.height += lineSpace; 856 prop.height += lineSpace;
857
804 fs->set_prop (prop); 858 fs->set_prop (prop, false);
805 859
806 fwidth = prop.width; 860 fwidth = prop.width;
807 fheight = prop.height; 861 fheight = prop.height;
808 fbase = prop.ascent; 862 fbase = prop.ascent;
809 863
… …
818 { 872 {
819 fontset[style] = fs = new rxvt_fontset (this); 873 fontset[style] = fs = new rxvt_fontset (this);
820 rxvt_fontprop prop2 = prop; 874 rxvt_fontprop prop2 = prop;
821 875
822 if (res) 876 if (res)
823 prop2.weight = prop2.slant = rxvt_fontprop::unset; 877 {
878 fs->populate (res);
879 fs->set_prop (prop2, false);
880 }
824 else 881 else
825 { 882 {
826 res = fontset[0]->fontdesc; 883 fs->populate (fontset[0]->fontdesc);
827 884
828 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 885 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; 886 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
887
888 fs->set_prop (prop2, true);
830 } 889 }
831 890
832 fs->populate (res);
833 fs->set_prop (prop2);
834 } 891 }
835#else 892#else
836 fontset[style] = fontset[0]; 893 fontset[style] = fontset[0];
837#endif 894#endif
838 } 895 }
… …
845 } 902 }
846 903
847 return true; 904 return true;
848} 905}
849 906
907void
850void rxvt_term::set_string_property (Atom prop, const char *str, int len) 908rxvt_term::set_string_property (Atom prop, const char *str, int len)
851{ 909{
852 XChangeProperty (display->display, parent[0], 910 XChangeProperty (dpy, parent[0],
853 prop, XA_STRING, 8, PropModeReplace, 911 prop, XA_STRING, 8, PropModeReplace,
854 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 912 (const unsigned char *)str, len >= 0 ? len : strlen (str));
855} 913}
856 914
915void
857void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 916rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
858{ 917{
859 wchar_t *ws = rxvt_mbstowcs (str, len); 918 wchar_t *ws = rxvt_mbstowcs (str, len);
860 char *s = rxvt_wcstoutf8 (ws); 919 char *s = rxvt_wcstoutf8 (ws);
861 920
862 XChangeProperty (display->display, parent[0], 921 XChangeProperty (dpy, parent[0],
863 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 922 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
864 (const unsigned char *)s, strlen (s)); 923 (const unsigned char *)s, strlen (s));
865 924
866 free (s); 925 free (s);
867 free (ws); 926 free (ws);
… …
886#if ENABLE_EWMH 945#if ENABLE_EWMH
887 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 946 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
888#endif 947#endif
889} 948}
890 949
950void
951rxvt_term::set_window_color (int idx, const char *color)
952{
891#ifdef XTERM_COLOR_CHANGE 953#ifdef XTERM_COLOR_CHANGE
892void
893rxvt_term::set_window_color (int idx, const char *color)
894{
895 rxvt_color xcol; 954 rxvt_color xcol;
896 int i; 955 int i;
897 956
898 if (color == NULL || *color == '\0') 957 if (color == NULL || *color == '\0')
899 return; 958 return;
959
960 color = strdup (color);
961 allocated.push_back ((void *)color);
962 rs[Rs_color + idx] = color;
900 963
901 /* handle color aliases */ 964 /* handle color aliases */
902 if (isdigit (*color)) 965 if (isdigit (*color))
903 { 966 {
904 i = atoi (color); 967 i = atoi (color);
905 968
906 if (i >= 8 && i <= 15) 969 if (i >= 8 && i <= 15)
907 { /* bright colors */ 970 { /* bright colors */
908 i -= 8; 971 i -= 8;
909 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 972 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
910 SET_PIXCOLOR (idx);
911 goto done; 973 goto done;
912 } 974 }
913 975
914 if (i >= 0 && i <= 7) 976 if (i >= 0 && i <= 7)
915 { /* normal colors */ 977 { /* normal colors */
916 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 978 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
917 SET_PIXCOLOR (idx);
918 goto done; 979 goto done;
919 } 980 }
920 } 981 }
921 982
922 if (!rXParseAllocColor (&xcol, color)) 983 set_color (xcol, color);
923 return;
924
925 /* XStoreColor (display->display, display->cmap, XColor*); */
926 984
927 /* 985 /*
928 * FIXME: should free colors here, but no idea how to do it so instead, 986 * FIXME: should free colors here, but no idea how to do it so instead,
929 * so just keep gobbling up the colormap 987 * so just keep gobbling up the colormap
930 */ 988 */
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 989
943 pix_colors_focused[idx] = xcol; 990 pix_colors_focused[idx] = xcol;
944 SET_PIXCOLOR (idx);
945 991
946 /* XSetWindowAttributes attr; */ 992 /* XSetWindowAttributes attr; */
947 /* Cursor cursor; */ 993 /* Cursor cursor; */
948done: 994done:
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. */ 995 /*TODO: handle Color_BD, scrollbar background, etc. */
956 996
997 update_fade_color (idx);
957 recolour_cursor (); 998 recolour_cursor ();
958 scr_recolour (); 999 scr_recolour ();
959}
960
961#else
962# define set_window_color (idx,color) ((void)0)
963#endif /* XTERM_COLOR_CHANGE */ 1000#endif /* XTERM_COLOR_CHANGE */
1001}
964 1002
965void 1003void
966rxvt_term::recolour_cursor () 1004rxvt_term::recolour_cursor ()
967{ 1005{
968 XColor xcol[2]; 1006 XColor fg, bg;
969 1007
970 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1008 (ISSET_PIXCOLOR (Color_pointer_fg)
971 ? pix_colors_focused[Color_pointer_fg] 1009 ? pix_colors_focused[Color_pointer_fg]
972 : pix_colors_focused[Color_fg]; 1010 : pix_colors_focused[Color_fg]).get (fg);
1011
973 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1012 (ISSET_PIXCOLOR (Color_pointer_bg)
974 ? pix_colors_focused[Color_pointer_bg] 1013 ? pix_colors_focused[Color_pointer_bg]
975 : pix_colors_focused[Color_bg]; 1014 : pix_colors_focused[Color_bg]).get (bg);
976 1015
977 XQueryColors (display->display, display->cmap, xcol, 2); 1016 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
978 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
979} 1017}
980 1018
981/*----------------------------------------------------------------------*/ 1019/*----------------------------------------------------------------------*/
982/* 1020/*
983 * 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
… …
987{ 1025{
988 unsigned int i; 1026 unsigned int i;
989 const char *xpmb = "\0"; 1027 const char *xpmb = "\0";
990 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1028 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
991 1029
992 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
993 strcpy (fstr, "default"); 1030 strcpy (fstr, "default");
994 strcpy (bstr, "default"); 1031 strcpy (bstr, "default");
995 for (i = Color_Black; i <= Color_White; i++) 1032 for (i = Color_Black; i <= Color_White; i++)
996 if (pix_colors[Color_fg] == pix_colors[i]) 1033 if (pix_colors[Color_fg] == pix_colors[i])
997 { 1034 {
… …
1001 1038
1002 for (i = Color_Black; i <= Color_White; i++) 1039 for (i = Color_Black; i <= Color_White; i++)
1003 if (pix_colors[Color_bg] == pix_colors[i]) 1040 if (pix_colors[Color_bg] == pix_colors[i])
1004 { 1041 {
1005 sprintf (bstr, "%d", (i - Color_Black)); 1042 sprintf (bstr, "%d", (i - Color_Black));
1006#ifdef XPM_BACKGROUND 1043#ifdef BG_IMAGE_FROM_FILE
1007 xpmb = "default;"; 1044 xpmb = "default;";
1008#endif 1045#endif
1009 break; 1046 break;
1010 } 1047 }
1011 1048
1012 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1049 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1013} 1050}
1014 1051
1015/*----------------------------------------------------------------------*/ 1052/*----------------------------------------------------------------------*/
1016 1053
1017int 1054bool
1018rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1055rxvt_term::set_color (rxvt_color &color, const char *name)
1019{ 1056{
1020 if (!screen_in_out->set (display, colour)) 1057 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; 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]);
1027} 1068}
1028 1069
1029/* -------------------------------------------------------------------- * 1070/* -------------------------------------------------------------------- *
1030 * - WINDOW RESIZING - * 1071 * - WINDOW RESIZING - *
1031 * -------------------------------------------------------------------- */ 1072 * -------------------------------------------------------------------- */
… …
1033rxvt_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)
1034{ 1075{
1035 int fix_screen; 1076 int fix_screen;
1036 int old_width = szHint.width; 1077 int old_width = szHint.width;
1037 int old_height = szHint.height; 1078 int old_height = szHint.height;
1038 dDisp;
1039 1079
1040 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)))
1041 XSetWMNormalHints (disp, parent[0], &szHint); 1083 XSetWMNormalHints (dpy, parent[0], &szHint);
1042 1084
1043 if (!ignoreparent) 1085 if (!ignoreparent)
1044 { 1086 {
1045#ifdef SMART_RESIZE 1087#ifdef SMART_RESIZE
1046 /* 1088 /*
… …
1050 int x, y, x1, y1; 1092 int x, y, x1, y1;
1051 int dx, dy; 1093 int dx, dy;
1052 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1094 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1053 Window unused_cr; 1095 Window unused_cr;
1054 1096
1055 XTranslateCoordinates (disp, parent[0], display->root, 1097 XTranslateCoordinates (dpy, parent[0], display->root,
1056 0, 0, &x, &y, &unused_cr); 1098 0, 0, &x, &y, &unused_cr);
1057 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1099 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1058 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1100 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1059 /* 1101 /*
1060 * 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
1061 * our position for handles and decorations. Counter it 1103 * our position for handles and decorations. Counter it
1062 */ 1104 */
… …
1064 { 1106 {
1065 x -= x1; 1107 x -= x1;
1066 y -= y1; 1108 y -= y1;
1067 } 1109 }
1068 1110
1069 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1111 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1070 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1112 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1071 dx = old_width - szHint.width; 1113 dx = old_width - szHint.width;
1072 dy = old_height - szHint.height; 1114 dy = old_height - szHint.height;
1073 1115
1074 /* Check position of the center of the window */ 1116 /* Check position of the center of the window */
1075 if (x < x1) /* left half */ 1117 if (x < x1) /* left half */
… …
1079 if (y < y1) /* top half */ 1121 if (y < y1) /* top half */
1080 dy = 0; 1122 dy = 0;
1081 else if (y == y1) /* exact center */ 1123 else if (y == y1) /* exact center */
1082 dy /= 2; 1124 dy /= 2;
1083 1125
1084 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1126 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1085 szHint.width, szHint.height); 1127 szHint.width, szHint.height);
1086#else 1128#else
1087 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1129 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1088#endif 1130#endif
1089 } 1131 }
1090 1132
1091 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1133 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1092 1134
1093 if (fix_screen || newwidth != old_width || newheight != old_height) 1135 if (fix_screen || newwidth != old_width || newheight != old_height)
1094 { 1136 {
1095 if (scrollBar.state) 1137 if (scrollBar.state)
1096 { 1138 {
1097 XMoveResizeWindow (disp, scrollBar.win, 1139 XMoveResizeWindow (dpy, scrollBar.win,
1098 window_sb_x, 0, 1140 window_sb_x, 0,
1099 scrollbar_TotalWidth (), szHint.height); 1141 scrollbar_TotalWidth (), szHint.height);
1100 resize_scrollbar (); 1142 resize_scrollbar ();
1101 } 1143 }
1102 1144
1103 XMoveResizeWindow (disp, vt, 1145 XMoveResizeWindow (dpy, vt,
1104 window_vt_x, window_vt_y, 1146 window_vt_x, window_vt_y,
1105 width, height); 1147 width, height);
1106 1148
1149#ifdef HAVE_BG_PIXMAP
1150 if (bgPixmap.window_size_sensitive ())
1151 update_background ();
1152#endif
1153
1107 scr_clear (); 1154 scr_clear ();
1108#ifdef XPM_BACKGROUND
1109 resize_pixmap ();
1110#endif
1111 } 1155 }
1112 1156
1113 if (fix_screen || old_height == 0) 1157 if (fix_screen || old_height == 0)
1114 scr_reset (); 1158 scr_reset ();
1115 1159
1116#ifdef XPM_BACKGROUND 1160 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1117 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)
1118 scr_touch (false); 1166// scr_touch (false);
1119#endif 1167#endif
1120 1168
1121#ifdef USE_XIM 1169#ifdef USE_XIM
1122 IMSetStatusPosition (); 1170 IMSetPosition ();
1123#endif 1171#endif
1124} 1172}
1125 1173
1126/* 1174/*
1127 * 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.
… …
1132{ 1180{
1133 XWindowAttributes wattr; 1181 XWindowAttributes wattr;
1134 1182
1135 if (newwidth == 0 || newheight == 0) 1183 if (newwidth == 0 || newheight == 0)
1136 { 1184 {
1137 XGetWindowAttributes (display->display, display->root, &wattr); 1185 XGetWindowAttributes (dpy, display->root, &wattr);
1138 1186
1139 if (newwidth == 0) 1187 if (newwidth == 0)
1140 newwidth = wattr.width - szHint.base_width; 1188 newwidth = wattr.width - szHint.base_width;
1141 if (newheight == 0) 1189 if (newheight == 0)
1142 newheight = wattr.height - szHint.base_height; 1190 newheight = wattr.height - szHint.base_height;
… …
1156#ifdef USE_XIM 1204#ifdef USE_XIM
1157 1205
1158void 1206void
1159rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1207rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1160{ 1208{
1161 fg = pix_colors[Color_fg]; 1209 fg = pix_colors [Color_fg];
1162 bg = pix_colors[Color_bg]; 1210 bg = pix_colors [Color_bg];
1163} 1211}
1164 1212
1165void 1213void
1166rxvt_term::im_set_size (XRectangle &size) 1214rxvt_term::im_set_size (XRectangle &size)
1167{ 1215{
… …
1204 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1252 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1205 1253
1206 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1254 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1207 *p = '\0'; 1255 *p = '\0';
1208 1256
1209 atom = XInternAtom (display->display, server, False); 1257 atom = XInternAtom (dpy, server, False);
1210 win = XGetSelectionOwner (display->display, atom); 1258 win = XGetSelectionOwner (dpy, atom);
1211 1259
1212 if (win != None) 1260 if (win != None)
1213 return True; 1261 return True;
1214 } 1262 }
1215 1263
… …
1222 XPoint nspot; 1270 XPoint nspot;
1223 XVaNestedList preedit_attr; 1271 XVaNestedList preedit_attr;
1224 1272
1225 if (!Input_Context 1273 if (!Input_Context
1226 || !focus 1274 || !focus
1227 || !(input_style & XIMPreeditPosition)) 1275 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1228 return; 1276 return;
1229 1277
1230 im_set_position (nspot); 1278 im_set_position (nspot);
1231 1279
1232 if (nspot.x == spot.x && nspot.y == spot.y) 1280 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1251 input_method = 0; 1299 input_method = 0;
1252 } 1300 }
1253 1301
1254 Input_Context = 0; 1302 Input_Context = 0;
1255} 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
1256 1378
1257/* 1379/*
1258 * 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
1259 * open a suitable preedit type 1381 * open a suitable preedit type
1260 */ 1382 */
… …
1267 XRectangle rect, status_rect, needed_rect; 1389 XRectangle rect, status_rect, needed_rect;
1268 unsigned long fg, bg; 1390 unsigned long fg, bg;
1269 const char *p; 1391 const char *p;
1270 char **s; 1392 char **s;
1271 XIMStyles *xim_styles; 1393 XIMStyles *xim_styles;
1394#ifdef ENABLE_XIM_ONTHESPOT
1395 XIMCallback xcb[4];
1396#endif
1272 1397
1273 set_environ (envv); 1398 set_environ (envv);
1274 1399
1275 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1400 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1276 return false; 1401 return false;
1277 1402
1278 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1279 input_method = display->get_xim (locale, modifiers); 1403 input_method = display->get_xim (locale, modifiers);
1280 if (input_method == NULL) 1404 if (input_method == NULL)
1281 return false; 1405 return false;
1282 1406
1283 xim = input_method->xim; 1407 xim = input_method->xim;
… …
1303 s = rxvt_splitcommastring (p); 1427 s = rxvt_splitcommastring (p);
1304 1428
1305 for (i = found = 0; !found && s[i]; i++) 1429 for (i = found = 0; !found && s[i]; i++)
1306 { 1430 {
1307 if (!strcmp (s[i], "OverTheSpot")) 1431 if (!strcmp (s[i], "OverTheSpot"))
1308 input_style = (XIMPreeditPosition | XIMStatusNothing); 1432 input_style = XIMPreeditPosition | XIMStatusNothing;
1309 else if (!strcmp (s[i], "OffTheSpot")) 1433 else if (!strcmp (s[i], "OffTheSpot"))
1310 input_style = (XIMPreeditArea | XIMStatusArea); 1434 input_style = XIMPreeditArea | XIMStatusArea;
1311 else if (!strcmp (s[i], "Root")) 1435 else if (!strcmp (s[i], "Root"))
1312 input_style = (XIMPreeditNothing | XIMStatusNothing); 1436 input_style = XIMPreeditNothing | XIMStatusNothing;
1313 else if (!strcmp (s[i], "None")) 1437 else if (!strcmp (s[i], "None"))
1314 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;
1315 1445
1316 for (j = 0; j < xim_styles->count_styles; j++) 1446 for (j = 0; j < xim_styles->count_styles; j++)
1317 if (input_style == xim_styles->supported_styles[j]) 1447 if (input_style == xim_styles->supported_styles[j])
1318 { 1448 {
1319 rxvt_freecommastring (s); 1449 rxvt_freecommastring (s);
… …
1357 "*", 1487 "*",
1358 fheight, 1488 fheight,
1359 fheight + 1, fheight - 1, 1489 fheight + 1, fheight - 1,
1360 fheight - 2, fheight + 2); 1490 fheight - 2, fheight + 2);
1361 1491
1362 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1492 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1363 &missing_charset_list, &missing_charset_count, &def_string); 1493 &missing_charset_list, &missing_charset_count, &def_string);
1364 1494
1365 if (missing_charset_list) 1495 if (missing_charset_list)
1366 XFreeStringList (missing_charset_list); 1496 XFreeStringList (missing_charset_list);
1367 1497
… …
1408 XNBackground, bg, 1538 XNBackground, bg,
1409 XNArea, &status_rect, 1539 XNArea, &status_rect,
1410 XNFontSet, fs, 1540 XNFontSet, fs,
1411 NULL); 1541 NULL);
1412 } 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
1413 1566
1414 Input_Context = XCreateIC (xim, 1567 Input_Context = XCreateIC (xim,
1415 XNInputStyle, input_style, 1568 XNInputStyle, input_style,
1416 XNClientWindow, vt, 1569 XNClientWindow, vt,
1417 XNFocusWindow, parent[0], 1570 XNFocusWindow, parent[0],
… …
1419 preedit_attr, 1572 preedit_attr,
1420 status_attr ? XNStatusAttributes : NULL, 1573 status_attr ? XNStatusAttributes : NULL,
1421 status_attr, NULL); 1574 status_attr, NULL);
1422 1575
1423 if (preedit_attr) XFree (preedit_attr); 1576 if (preedit_attr) XFree (preedit_attr);
1424 if (status_attr) XFree (status_attr); 1577 if (status_attr) XFree (status_attr);
1425 if (fs) XFreeFontSet (display->display, fs); 1578 if (fs) XFreeFontSet (dpy, fs);
1426 1579
1427 if (Input_Context == NULL) 1580 if (Input_Context == NULL)
1428 { 1581 {
1429 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1582 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1430 im_destroy (); 1583 im_destroy ();
1431 return false; 1584 return false;
1432 } 1585 }
1433 1586
1587#if 0
1588 // unfortunately, only the focus window is used by XIM, hard to fix
1434 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1589 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1435 vt_select_input (); 1590 vt_select_input ();
1591#endif
1436 1592
1437 if (input_style & XIMPreeditArea)
1438 IMSetStatusPosition (); 1593 IMSetPosition ();
1439 1594
1440 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1441 return true; 1595 return true;
1442} 1596}
1443 1597
1444void 1598void
1445rxvt_term::im_cb () 1599rxvt_term::im_cb ()
… …
1451 1605
1452 make_current (); 1606 make_current ();
1453 1607
1454 im_destroy (); 1608 im_destroy ();
1455 1609
1456 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1457 if (Input_Context) 1610 if (Input_Context)
1458 return; 1611 return;
1459 1612
1460#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1613#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1461 if (rs[Rs_imLocale]) 1614 if (rs[Rs_imLocale])
… …
1503 SET_LOCALE (locale); 1656 SET_LOCALE (locale);
1504#endif 1657#endif
1505} 1658}
1506 1659
1507void 1660void
1508rxvt_term::IMSetStatusPosition () 1661rxvt_term::IMSetPosition ()
1509{ 1662{
1510 XRectangle preedit_rect, status_rect, *needed_rect; 1663 XRectangle preedit_rect, status_rect, *needed_rect;
1511 XVaNestedList preedit_attr, status_attr; 1664 XVaNestedList preedit_attr, status_attr;
1512 1665
1513 if (!Input_Context 1666 if (!Input_Context
1514 || !focus 1667 || !focus
1515 || !(input_style & XIMPreeditArea) 1668 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1516 || !IMisRunning ()) 1669 || !IMisRunning ())
1517 return; 1670 return;
1518 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 {
1519 /* Getting the necessary width of preedit area */ 1682 /* Getting the necessary width of preedit area */
1520 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1683 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1521 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1684 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1522 XFree (status_attr); 1685 XFree (status_attr);
1523 1686
1524 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1687 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1525 XFree (needed_rect); 1688 XFree (needed_rect);
1526 1689
1527 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1690 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1528 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1691 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1529 1692
1530 XSetICValues (Input_Context, 1693 XSetICValues (Input_Context,
1531 XNPreeditAttributes, preedit_attr, 1694 XNPreeditAttributes, preedit_attr,
1532 XNStatusAttributes, status_attr, NULL); 1695 XNStatusAttributes, status_attr,
1696 NULL);
1533 1697
1698 XFree (status_attr);
1699 }
1700
1534 XFree (preedit_attr); 1701 XFree (preedit_attr);
1535 XFree (status_attr);
1536} 1702}
1537#endif /* USE_XIM */ 1703#endif /* USE_XIM */
1538 1704
1705void
1706rxvt_term::get_window_origin (int &x, int &y)
1707{
1708 Window cr;
1709 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1710/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1711}
1712
1713Pixmap
1714rxvt_term::get_pixmap_property (int prop_id)
1715{
1716 if (prop_id > 0 && prop_id < NUM_XA)
1717 if (xa[prop_id])
1718 {
1719 int aformat;
1720 unsigned long nitems, bytes_after;
1721 Atom atype;
1722 unsigned char *prop = NULL;
1723 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1724 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1725 &nitems, &bytes_after, &prop);
1726 if (result == Success && prop && atype == XA_PIXMAP)
1727 {
1728 return *(Pixmap *)prop;
1729 }
1730 }
1731 return None;
1732}
1733
1734#ifdef HAVE_BG_PIXMAP
1735int
1736rxvt_term::update_background ()
1737{
1738 bgPixmap.invalidate ();
1739
1740 /* no chance of real time refresh if we are blurring ! */
1741 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1742 bgPixmap.render ();
1743 else
1744 {
1745 update_background_ev.stop ();
1746 if (!bgPixmap.need_client_side_rendering())
1747 update_background_ev.start (NOW + .05);
1748 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1749 update_background_ev.start (NOW + .2); /* very slow !!! */
1750 else
1751 update_background_ev.start (NOW + .07);
1752 }
1753 return 0;
1754}
1755
1756void
1757rxvt_term::update_background_cb (time_watcher &w)
1758{
1759 bgPixmap.render ();
1760}
1761
1762#endif /* HAVE_BG_PIXMAP */
1763
1539/*----------------------- end-of-file (C source) -----------------------*/ 1764/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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