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.254 by ayin, Thu Oct 18 09:11:42 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>
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
48# include <termios.h> 44# include <termios.h>
49#endif 45#endif
50 46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
51vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
52 57
53// used to tell global functions which terminal instance is "active" 58// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term; 59rxvt_t rxvt_current_term;
55 60
56static char curlocale[128], savelocale[128]; 61static char curlocale[128], savelocale[128];
57 62
58bool 63bool
59rxvt_set_locale (const char *locale) NOTHROW 64rxvt_set_locale (const char *locale) NOTHROW
60{ 65{
66 int size = strlen (locale) + 1;
67
68 if (size > sizeof (curlocale))
69 rxvt_fatal ("locale string too long, aborting.\n");
70
61 if (!locale || !strncmp (locale, curlocale, 128)) 71 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 72 return false;
63 73
64 strncpy (curlocale, locale, 128); 74 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 75 setlocale (LC_CTYPE, curlocale);
66 return true; 76 return true;
67} 77}
68 78
69void 79void
… …
143} 153}
144#endif 154#endif
145 155
146rxvt_term::rxvt_term () 156rxvt_term::rxvt_term ()
147 : 157 :
148#if TRANSPARENT 158#if ENABLE_TRANSPARENCY || ENABLE_PERL
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 159 rootwin_ev (this, &rxvt_term::rootwin_cb),
160#endif
161#if HAVE_BG_PIXMAP
162 update_background_ev(this, &rxvt_term::update_background_cb),
150#endif 163#endif
151#ifdef HAVE_SCROLLBARS 164#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 165 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 166#endif
154#ifdef CURSOR_BLINK 167#ifdef CURSOR_BLINK
… …
193#endif 206#endif
194} 207}
195 208
196// clean up the most important stuff, do *not* call x or free mem etc. 209// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 210// for use before an emergency exit
211void
198void rxvt_term::emergency_cleanup () 212rxvt_term::emergency_cleanup ()
199{ 213{
200 if (cmd_pid) 214 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 215 kill (-cmd_pid, SIGHUP);
202 216
217 pty_ev.stop ();
203 delete pty; pty = 0; 218 delete pty; pty = 0;
204} 219}
205 220
206rxvt_term::~rxvt_term () 221rxvt_term::~rxvt_term ()
207{ 222{
… …
216#endif 231#endif
217 delete fontset[0]; 232 delete fontset[0];
218 233
219 if (display) 234 if (display)
220 { 235 {
221 dDisp;
222
223 selection_clear (); 236 selection_clear ();
224 237
225#ifdef USE_XIM 238#ifdef USE_XIM
226 im_destroy (); 239 im_destroy ();
227#endif 240#endif
228#ifdef XTERM_SCROLLBAR 241#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 244#endif
232#ifdef PLAIN_SCROLLBAR 245#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 247#endif
235#ifdef NEXT_SCROLLBAR 248#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 249 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 250 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 251 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 252 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 253 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 254 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 255 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 256 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 259#endif
247#ifdef RXVT_SCROLLBAR 260#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 264#endif
252 if (gc) XFreeGC (disp, gc); 265 if (gc) XFreeGC (dpy, gc);
253 266
254 delete drawable; 267 delete drawable;
255 // destroy all windows 268 // destroy all windows
256 if (parent[0]) 269 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 270 XDestroyWindow (dpy, parent[0]);
258 }
259 271
260 // TODO: free pixcolours, colours should become part of rxvt_display 272 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 273 if (ISSET_PIXCOLOR (i))
274 {
275 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 276#if OFF_FOCUS_FADING
277 pix_colors_unfocused [i].free (this);
278#endif
279 }
280
281 clear ();
282 }
283
284 delete [] pix_colors_focused;
285#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
264#endif 287#endif
265 288
266 displays.put (display); 289 displays.put (display);
267 290
268 scr_release (); 291 scr_release ();
… …
271 for (int i = 0; i < allocated.size (); i++) 294 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 295 free (allocated [i]);
273 296
274 free (selection.text); 297 free (selection.text);
275 // TODO: manage env vars in child only(!) 298 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 299 free (env_display);
278 free (env_term); 300 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 301 free (locale);
281 free (v_buffer); 302 free (v_buffer);
282 free (incr_buf); 303 free (incr_buf);
283 304
284 delete envv; 305 delete envv;
… …
295{ 316{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 317 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 318
298 cmd_pid = 0; 319 cmd_pid = 0;
299 320
300 if (!OPTION (Opt_hold)) 321 if (!option (Opt_hold))
301 destroy (); 322 destroy ();
302} 323}
303 324
304void 325void
305rxvt_term::destroy () 326rxvt_term::destroy ()
306{ 327{
307 if (destroy_ev.active) 328 if (destroy_ev.active)
308 return; 329 return;
309 330
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 331 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 332
313#if ENABLE_OVERLAY 333#if ENABLE_OVERLAY
314 scr_overlay_off (); 334 scr_overlay_off ();
315#endif 335#endif
316 336
… …
320 im_ev.stop (display); 340 im_ev.stop (display);
321#endif 341#endif
322#if HAVE_SCROLLBARS 342#if HAVE_SCROLLBARS
323 scrollbar_ev.stop (display); 343 scrollbar_ev.stop (display);
324#endif 344#endif
325#if TRANSPARENT 345#if ENABLE_TRANSPARENCY || ENABLE_PERL
326 rootwin_ev.stop (display); 346 rootwin_ev.stop (display);
327#endif 347#endif
328 incr_ev.stop (); 348 incr_ev.stop ();
329 termwin_ev.stop (display); 349 termwin_ev.stop (display);
330 vt_ev.stop (display); 350 vt_ev.stop (display);
… …
371{ 391{
372 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 392 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
373 (*t)->emergency_cleanup (); 393 (*t)->emergency_cleanup ();
374} 394}
375 395
376#if ENABLE_FRILLS 396#if !ENABLE_MINIMAL
377static void 397static void
378print_x_error (Display *dpy, XErrorEvent *event) 398print_x_error (Display *dpy, XErrorEvent *event)
379{ 399{
380 char buffer[BUFSIZ]; 400 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 401 char mesg[BUFSIZ];
… …
429 GET_R->allowedxerror = event->error_code; 449 GET_R->allowedxerror = event->error_code;
430 else 450 else
431 { 451 {
432 // GET_R is most likely not the terminal which caused the error, 452 // GET_R is most likely not the terminal which caused the error,
433 // so just output the error and continue 453 // so just output the error and continue
434#if ENABLE_FRILLS 454#if ENABLE_MINIMAL
455 old_xerror_handler (display, event);
456#else
435 print_x_error (display, event); 457 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 458#endif
439 } 459 }
440 460
441 return 0; 461 return 0;
442} 462}
… …
470#ifdef KEYSYM_RESOURCE 490#ifdef KEYSYM_RESOURCE
471 keyboard->register_done (); 491 keyboard->register_done ();
472#endif 492#endif
473 493
474#ifdef HAVE_SCROLLBARS 494#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar)) 495 if (option (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */ 496 scrollBar.setIdle (); /* set existence for size calculations */
477#endif 497#endif
478 498
479 pty = ptytty::create (); 499 pty = ptytty::create ();
480 500
481 create_windows (argc, argv); 501 create_windows (argc, argv);
482 502
483 dDisp;
484
485 init_xlocale (); 503 init_xlocale ();
486 504
487 scr_reset (); // initialize screen 505 scr_reset (); // initialize screen
488 506
489#if 0 507#if 0
490 XSynchronize (disp, True); 508 XSynchronize (dpy, True);
491#endif 509#endif
492 510
493#ifdef HAVE_SCROLLBARS 511#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar)) 512 if (option (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */ 513 resize_scrollbar (); /* create and map scrollbar */
496#endif 514#endif
515#ifdef HAVE_BG_PIXMAP
516 {
517 bgPixmap.set_target (this);
518
497#ifdef TRANSPARENT 519#ifdef ENABLE_TRANSPARENCY
498 if (OPTION (Opt_transparent)) 520 if (option (Opt_transparent))
499 { 521 {
522 bgPixmap.set_transparent ();
523#ifdef HAVE_AFTERIMAGE
524 if (rs [Rs_blurradius])
525 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
526#endif
527 if (ISSET_PIXCOLOR (Color_tint))
528 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
529 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]);
531
532 bgPixmap.set_root_pixmap ();
500 XSelectInput (disp, display->root, PropertyChangeMask); 533 XSelectInput (dpy, display->root, PropertyChangeMask);
501 check_our_parents ();
502 rootwin_ev.start (display, display->root); 534 rootwin_ev.start (display, display->root);
503 } 535 }
536#endif
537
538#ifdef BG_IMAGE_FROM_FILE
539 if (rs[Rs_backgroundPixmap] != NULL)
540 {
541 const char *p = rs[Rs_backgroundPixmap];
542
543 if ((p = strchr (p, ';')) != NULL)
544 {
545 p++;
546 bgPixmap.set_geometry (p);
547 }
548 else
549 bgPixmap.set_defaultGeometry ();
550
551 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552 if (!bgPixmap.window_position_sensitive ())
553 update_background ();
554 }
555#endif
556 }
557#endif
558
559#if ENABLE_PERL
560 rootwin_ev.start (display, display->root);
504#endif 561#endif
505 562
506 set_colorfgbg (); 563 set_colorfgbg ();
507 564
508 init_command (cmd_argv); 565 init_command (cmd_argv);
… …
514 571
515 check_ev.start (); 572 check_ev.start ();
516 573
517 HOOK_INVOKE ((this, HOOK_START, DT_END)); 574 HOOK_INVOKE ((this, HOOK_START, DT_END));
518 575
576#if ENABLE_XEMBED
577 if (rs[Rs_embed])
578 {
579 long info[2] = { 0, XEMBED_MAPPED };
580
581 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582 32, PropModeReplace, (unsigned char *)&info, 2);
583 }
584#endif
585
519 XMapWindow (disp, vt); 586 XMapWindow (dpy, vt);
520 XMapWindow (disp, parent[0]); 587 XMapWindow (dpy, parent[0]);
521 588
522 return true; 589 return true;
523} 590}
524 591
525static struct sig_handlers 592static struct sig_handlers
… …
605 return p; 672 return p;
606} 673}
607 674
608/*----------------------------------------------------------------------*/ 675/*----------------------------------------------------------------------*/
609/* 676/*
610 * window size/position calculcations for XSizeHint and other storage. 677 * window size/position calculations for XSizeHint and other storage.
611 * if width/height are non-zero then override calculated width/height 678 * if width/height are non-zero then override calculated width/height
612 */ 679 */
613void 680void
614rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 681rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
615{ 682{
616 short recalc_x, recalc_y; 683 short recalc_x, recalc_y;
617 int x, y, sb_w, flags; 684 int x, y, sb_w, flags;
618 unsigned int w, h; 685 unsigned int w, h;
619 unsigned int max_width, max_height; 686 unsigned int max_width, max_height;
620 dDisp;
621 687
622 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 688 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
623 szHint.win_gravity = NorthWestGravity; 689 szHint.win_gravity = NorthWestGravity;
624 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 690 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
625 691
… …
687 753
688 if (scrollBar.state) 754 if (scrollBar.state)
689 { 755 {
690 sb_w = scrollbar_TotalWidth (); 756 sb_w = scrollbar_TotalWidth ();
691 szHint.base_width += sb_w; 757 szHint.base_width += sb_w;
758
692 if (!OPTION (Opt_scrollBar_right)) 759 if (!option (Opt_scrollBar_right))
693 window_vt_x += sb_w; 760 window_vt_x += sb_w;
694 } 761 }
695 762
696 szHint.width_inc = fwidth; 763 szHint.width_inc = fwidth;
697 szHint.height_inc = fheight; 764 szHint.height_inc = fheight;
698 szHint.min_width = szHint.base_width + szHint.width_inc; 765 szHint.min_width = szHint.base_width + szHint.width_inc;
699 szHint.min_height = szHint.base_height + szHint.height_inc; 766 szHint.min_height = szHint.base_height + szHint.height_inc;
700 767
701 if (newwidth && newwidth - szHint.base_width < max_width) 768 if (newwidth && newwidth - szHint.base_width < max_width)
702 { 769 {
703 szHint.width = newwidth; 770 szHint.width = newwidth;
… …
718 { 785 {
719 min_it (height, max_height); 786 min_it (height, max_height);
720 szHint.height = szHint.base_height + height; 787 szHint.height = szHint.base_height + height;
721 } 788 }
722 789
723 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 790 if (scrollBar.state && option (Opt_scrollBar_right))
724 window_sb_x = szHint.width - sb_w; 791 window_sb_x = szHint.width - sb_w;
725 792
726 if (recalc_x) 793 if (recalc_x)
727 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 794 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
795
728 if (recalc_y) 796 if (recalc_y)
729 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 797 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
730 798
731 ncol = width / fwidth; 799 ncol = width / fwidth;
732 nrow = height / fheight; 800 nrow = height / fheight;
733} 801}
734 802
… …
789 delete fontset[0]; 857 delete fontset[0];
790 fontset[0] = fs; 858 fontset[0] = fs;
791 859
792 prop = (*fs)[1]->properties (); 860 prop = (*fs)[1]->properties ();
793 prop.height += lineSpace; 861 prop.height += lineSpace;
862
794 fs->set_prop (prop); 863 fs->set_prop (prop, false);
795 864
796 fwidth = prop.width; 865 fwidth = prop.width;
797 fheight = prop.height; 866 fheight = prop.height;
798 fbase = prop.ascent; 867 fbase = prop.ascent;
799 868
… …
808 { 877 {
809 fontset[style] = fs = new rxvt_fontset (this); 878 fontset[style] = fs = new rxvt_fontset (this);
810 rxvt_fontprop prop2 = prop; 879 rxvt_fontprop prop2 = prop;
811 880
812 if (res) 881 if (res)
813 prop2.weight = prop2.slant = rxvt_fontprop::unset; 882 {
883 fs->populate (res);
884 fs->set_prop (prop2, false);
885 }
814 else 886 else
815 { 887 {
816 res = fontset[0]->fontdesc; 888 fs->populate (fontset[0]->fontdesc);
817 889
818 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 890 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; 891 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
892
893 fs->set_prop (prop2, true);
820 } 894 }
821 895
822 fs->populate (res);
823 fs->set_prop (prop2);
824 } 896 }
825#else 897#else
826 fontset[style] = fontset[0]; 898 fontset[style] = fontset[0];
827#endif 899#endif
828 } 900 }
… …
835 } 907 }
836 908
837 return true; 909 return true;
838} 910}
839 911
912void
840void rxvt_term::set_string_property (Atom prop, const char *str, int len) 913rxvt_term::set_string_property (Atom prop, const char *str, int len)
841{ 914{
842 XChangeProperty (display->display, parent[0], 915 XChangeProperty (dpy, parent[0],
843 prop, XA_STRING, 8, PropModeReplace, 916 prop, XA_STRING, 8, PropModeReplace,
844 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 917 (const unsigned char *)str, len >= 0 ? len : strlen (str));
845} 918}
846 919
920void
847void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 921rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
848{ 922{
849 wchar_t *ws = rxvt_mbstowcs (str, len); 923 wchar_t *ws = rxvt_mbstowcs (str, len);
850 char *s = rxvt_wcstoutf8 (ws); 924 char *s = rxvt_wcstoutf8 (ws);
851 925
852 XChangeProperty (display->display, parent[0], 926 XChangeProperty (dpy, parent[0],
853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 927 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
854 (const unsigned char *)s, strlen (s)); 928 (const unsigned char *)s, strlen (s));
855 929
856 free (s); 930 free (s);
857 free (ws); 931 free (ws);
… …
876#if ENABLE_EWMH 950#if ENABLE_EWMH
877 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 951 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
878#endif 952#endif
879} 953}
880 954
955void
956rxvt_term::set_window_color (int idx, const char *color)
957{
881#ifdef XTERM_COLOR_CHANGE 958#ifdef XTERM_COLOR_CHANGE
882void
883rxvt_term::set_window_color (int idx, const char *color)
884{
885 rxvt_color xcol; 959 rxvt_color xcol;
886 int i; 960 int i;
887 961
888 if (color == NULL || *color == '\0') 962 if (color == NULL || *color == '\0')
889 return; 963 return;
964
965 color = strdup (color);
966 allocated.push_back ((void *)color);
967 rs[Rs_color + idx] = color;
890 968
891 /* handle color aliases */ 969 /* handle color aliases */
892 if (isdigit (*color)) 970 if (isdigit (*color))
893 { 971 {
894 i = atoi (color); 972 i = atoi (color);
895 973
896 if (i >= 8 && i <= 15) 974 if (i >= 8 && i <= 15)
897 { /* bright colors */ 975 { /* bright colors */
898 i -= 8; 976 i -= 8;
899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 977 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
900 SET_PIXCOLOR (idx);
901 goto done; 978 goto done;
902 } 979 }
903 980
904 if (i >= 0 && i <= 7) 981 if (i >= 0 && i <= 7)
905 { /* normal colors */ 982 { /* normal colors */
906 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 983 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
907 SET_PIXCOLOR (idx);
908 goto done; 984 goto done;
909 } 985 }
910 } 986 }
911 987
912 if (!rXParseAllocColor (&xcol, color)) 988 set_color (xcol, color);
913 return;
914
915 /* XStoreColor (display->display, display->cmap, XColor*); */
916 989
917 /* 990 /*
918 * FIXME: should free colors here, but no idea how to do it so instead, 991 * FIXME: should free colors here, but no idea how to do it so instead,
919 * so just keep gobbling up the colormap 992 * so just keep gobbling up the colormap
920 */ 993 */
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 994
933 pix_colors_focused[idx] = xcol; 995 pix_colors_focused[idx] = xcol;
934 SET_PIXCOLOR (idx);
935 996
936 /* XSetWindowAttributes attr; */ 997 /* XSetWindowAttributes attr; */
937 /* Cursor cursor; */ 998 /* Cursor cursor; */
938done: 999done:
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. */ 1000 /*TODO: handle Color_BD, scrollbar background, etc. */
946 1001
1002 update_fade_color (idx);
947 recolour_cursor (); 1003 recolour_cursor ();
948 scr_recolour (); 1004 scr_recolour ();
949}
950
951#else
952# define set_window_color (idx,color) ((void)0)
953#endif /* XTERM_COLOR_CHANGE */ 1005#endif /* XTERM_COLOR_CHANGE */
1006}
954 1007
955void 1008void
956rxvt_term::recolour_cursor () 1009rxvt_term::recolour_cursor ()
957{ 1010{
958 XColor xcol[2]; 1011 XColor fg, bg;
959 1012
960 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1013 (ISSET_PIXCOLOR (Color_pointer_fg)
961 ? pix_colors_focused[Color_pointer_fg] 1014 ? pix_colors_focused[Color_pointer_fg]
962 : pix_colors_focused[Color_fg]; 1015 : pix_colors_focused[Color_fg]).get (fg);
1016
963 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1017 (ISSET_PIXCOLOR (Color_pointer_bg)
964 ? pix_colors_focused[Color_pointer_bg] 1018 ? pix_colors_focused[Color_pointer_bg]
965 : pix_colors_focused[Color_bg]; 1019 : pix_colors_focused[Color_bg]).get (bg);
966 1020
967 XQueryColors (display->display, display->cmap, xcol, 2); 1021 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
968 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
969} 1022}
970 1023
971/*----------------------------------------------------------------------*/ 1024/*----------------------------------------------------------------------*/
972/* 1025/*
973 * find if fg/bg matches any of the normal (low-intensity) colors 1026 * find if fg/bg matches any of the normal (low-intensity) colors
… …
977{ 1030{
978 unsigned int i; 1031 unsigned int i;
979 const char *xpmb = "\0"; 1032 const char *xpmb = "\0";
980 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1033 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
981 1034
982 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
983 strcpy (fstr, "default"); 1035 strcpy (fstr, "default");
984 strcpy (bstr, "default"); 1036 strcpy (bstr, "default");
985 for (i = Color_Black; i <= Color_White; i++) 1037 for (i = Color_Black; i <= Color_White; i++)
986 if (pix_colors[Color_fg] == pix_colors[i]) 1038 if (pix_colors[Color_fg] == pix_colors[i])
987 { 1039 {
… …
991 1043
992 for (i = Color_Black; i <= Color_White; i++) 1044 for (i = Color_Black; i <= Color_White; i++)
993 if (pix_colors[Color_bg] == pix_colors[i]) 1045 if (pix_colors[Color_bg] == pix_colors[i])
994 { 1046 {
995 sprintf (bstr, "%d", (i - Color_Black)); 1047 sprintf (bstr, "%d", (i - Color_Black));
996#ifdef XPM_BACKGROUND 1048#ifdef BG_IMAGE_FROM_FILE
997 xpmb = "default;"; 1049 xpmb = "default;";
998#endif 1050#endif
999 break; 1051 break;
1000 } 1052 }
1001 1053
1002 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1054 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1003} 1055}
1004 1056
1005/*----------------------------------------------------------------------*/ 1057/*----------------------------------------------------------------------*/
1006 1058
1007int 1059bool
1008rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1060rxvt_term::set_color (rxvt_color &color, const char *name)
1009{ 1061{
1010 if (!screen_in_out->set (display, colour)) 1062 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; 1063 return true;
1064
1065 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1066 return false;
1067}
1068
1069void
1070rxvt_term::alias_color (int dst, int src)
1071{
1072 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1017} 1073}
1018 1074
1019/* -------------------------------------------------------------------- * 1075/* -------------------------------------------------------------------- *
1020 * - WINDOW RESIZING - * 1076 * - WINDOW RESIZING - *
1021 * -------------------------------------------------------------------- */ 1077 * -------------------------------------------------------------------- */
… …
1023rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1079rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1024{ 1080{
1025 int fix_screen; 1081 int fix_screen;
1026 int old_width = szHint.width; 1082 int old_width = szHint.width;
1027 int old_height = szHint.height; 1083 int old_height = szHint.height;
1028 dDisp;
1029 1084
1030 window_calc (newwidth, newheight); 1085 window_calc (newwidth, newheight);
1086
1087 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1031 XSetWMNormalHints (disp, parent[0], &szHint); 1088 XSetWMNormalHints (dpy, parent[0], &szHint);
1032 1089
1033 if (!ignoreparent) 1090 if (!ignoreparent)
1034 { 1091 {
1035#ifdef SMART_RESIZE 1092#ifdef SMART_RESIZE
1036 /* 1093 /*
… …
1040 int x, y, x1, y1; 1097 int x, y, x1, y1;
1041 int dx, dy; 1098 int dx, dy;
1042 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1099 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1043 Window unused_cr; 1100 Window unused_cr;
1044 1101
1045 XTranslateCoordinates (disp, parent[0], display->root, 1102 XTranslateCoordinates (dpy, parent[0], display->root,
1046 0, 0, &x, &y, &unused_cr); 1103 0, 0, &x, &y, &unused_cr);
1047 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1104 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1048 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1105 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1049 /* 1106 /*
1050 * if display->root isn't the parent window, a WM will probably have offset 1107 * if display->root isn't the parent window, a WM will probably have offset
1051 * our position for handles and decorations. Counter it 1108 * our position for handles and decorations. Counter it
1052 */ 1109 */
… …
1054 { 1111 {
1055 x -= x1; 1112 x -= x1;
1056 y -= y1; 1113 y -= y1;
1057 } 1114 }
1058 1115
1059 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1116 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1060 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1117 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1061 dx = old_width - szHint.width; 1118 dx = old_width - szHint.width;
1062 dy = old_height - szHint.height; 1119 dy = old_height - szHint.height;
1063 1120
1064 /* Check position of the center of the window */ 1121 /* Check position of the center of the window */
1065 if (x < x1) /* left half */ 1122 if (x < x1) /* left half */
… …
1069 if (y < y1) /* top half */ 1126 if (y < y1) /* top half */
1070 dy = 0; 1127 dy = 0;
1071 else if (y == y1) /* exact center */ 1128 else if (y == y1) /* exact center */
1072 dy /= 2; 1129 dy /= 2;
1073 1130
1074 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1131 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1075 szHint.width, szHint.height); 1132 szHint.width, szHint.height);
1076#else 1133#else
1077 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1134 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1078#endif 1135#endif
1079 } 1136 }
1080 1137
1081 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1082 1139
1083 if (fix_screen || newwidth != old_width || newheight != old_height) 1140 if (fix_screen || newwidth != old_width || newheight != old_height)
1084 { 1141 {
1085 if (scrollBar.state) 1142 if (scrollBar.state)
1086 { 1143 {
1087 XMoveResizeWindow (disp, scrollBar.win, 1144 XMoveResizeWindow (dpy, scrollBar.win,
1088 window_sb_x, 0, 1145 window_sb_x, 0,
1089 scrollbar_TotalWidth (), szHint.height); 1146 scrollbar_TotalWidth (), szHint.height);
1090 resize_scrollbar (); 1147 resize_scrollbar ();
1091 } 1148 }
1092 1149
1093 XMoveResizeWindow (disp, vt, 1150 XMoveResizeWindow (dpy, vt,
1094 window_vt_x, window_vt_y, 1151 window_vt_x, window_vt_y,
1095 width, height); 1152 width, height);
1096 1153
1154#ifdef HAVE_BG_PIXMAP
1155 if (bgPixmap.window_size_sensitive ())
1156 update_background ();
1157#endif
1158
1097 scr_clear (); 1159 scr_clear ();
1098#ifdef XPM_BACKGROUND
1099 resize_pixmap ();
1100#endif
1101 } 1160 }
1102 1161
1103 if (fix_screen || old_height == 0) 1162 if (fix_screen || old_height == 0)
1104 scr_reset (); 1163 scr_reset ();
1105 1164
1106#ifdef XPM_BACKGROUND 1165 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1107 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)
1108 scr_touch (false); 1171// scr_touch (false);
1109#endif 1172#endif
1110 1173
1111#ifdef USE_XIM 1174#ifdef USE_XIM
1112 IMSetStatusPosition (); 1175 IMSetPosition ();
1113#endif 1176#endif
1114} 1177}
1115 1178
1116/* 1179/*
1117 * 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.
… …
1122{ 1185{
1123 XWindowAttributes wattr; 1186 XWindowAttributes wattr;
1124 1187
1125 if (newwidth == 0 || newheight == 0) 1188 if (newwidth == 0 || newheight == 0)
1126 { 1189 {
1127 XGetWindowAttributes (display->display, display->root, &wattr); 1190 XGetWindowAttributes (dpy, display->root, &wattr);
1128 1191
1129 if (newwidth == 0) 1192 if (newwidth == 0)
1130 newwidth = wattr.width - szHint.base_width; 1193 newwidth = wattr.width - szHint.base_width;
1131 if (newheight == 0) 1194 if (newheight == 0)
1132 newheight = wattr.height - szHint.base_height; 1195 newheight = wattr.height - szHint.base_height;
… …
1146#ifdef USE_XIM 1209#ifdef USE_XIM
1147 1210
1148void 1211void
1149rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1212rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1150{ 1213{
1151 fg = pix_colors[Color_fg]; 1214 fg = pix_colors [Color_fg];
1152 bg = pix_colors[Color_bg]; 1215 bg = pix_colors [Color_bg];
1153} 1216}
1154 1217
1155void 1218void
1156rxvt_term::im_set_size (XRectangle &size) 1219rxvt_term::im_set_size (XRectangle &size)
1157{ 1220{
… …
1194 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1257 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1195 1258
1196 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1259 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1197 *p = '\0'; 1260 *p = '\0';
1198 1261
1199 atom = XInternAtom (display->display, server, False); 1262 atom = XInternAtom (dpy, server, False);
1200 win = XGetSelectionOwner (display->display, atom); 1263 win = XGetSelectionOwner (dpy, atom);
1201 1264
1202 if (win != None) 1265 if (win != None)
1203 return True; 1266 return True;
1204 } 1267 }
1205 1268
… …
1212 XPoint nspot; 1275 XPoint nspot;
1213 XVaNestedList preedit_attr; 1276 XVaNestedList preedit_attr;
1214 1277
1215 if (!Input_Context 1278 if (!Input_Context
1216 || !focus 1279 || !focus
1217 || !(input_style & XIMPreeditPosition)) 1280 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1218 return; 1281 return;
1219 1282
1220 im_set_position (nspot); 1283 im_set_position (nspot);
1221 1284
1222 if (nspot.x == spot.x && nspot.y == spot.y) 1285 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1241 input_method = 0; 1304 input_method = 0;
1242 } 1305 }
1243 1306
1244 Input_Context = 0; 1307 Input_Context = 0;
1245} 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
1246 1383
1247/* 1384/*
1248 * 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
1249 * open a suitable preedit type 1386 * open a suitable preedit type
1250 */ 1387 */
… …
1257 XRectangle rect, status_rect, needed_rect; 1394 XRectangle rect, status_rect, needed_rect;
1258 unsigned long fg, bg; 1395 unsigned long fg, bg;
1259 const char *p; 1396 const char *p;
1260 char **s; 1397 char **s;
1261 XIMStyles *xim_styles; 1398 XIMStyles *xim_styles;
1399#ifdef ENABLE_XIM_ONTHESPOT
1400 XIMCallback xcb[4];
1401#endif
1262 1402
1263 set_environ (envv); 1403 set_environ (envv);
1264 1404
1265 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1405 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1266 return false; 1406 return false;
… …
1292 s = rxvt_splitcommastring (p); 1432 s = rxvt_splitcommastring (p);
1293 1433
1294 for (i = found = 0; !found && s[i]; i++) 1434 for (i = found = 0; !found && s[i]; i++)
1295 { 1435 {
1296 if (!strcmp (s[i], "OverTheSpot")) 1436 if (!strcmp (s[i], "OverTheSpot"))
1297 input_style = (XIMPreeditPosition | XIMStatusNothing); 1437 input_style = XIMPreeditPosition | XIMStatusNothing;
1298 else if (!strcmp (s[i], "OffTheSpot")) 1438 else if (!strcmp (s[i], "OffTheSpot"))
1299 input_style = (XIMPreeditArea | XIMStatusArea); 1439 input_style = XIMPreeditArea | XIMStatusArea;
1300 else if (!strcmp (s[i], "Root")) 1440 else if (!strcmp (s[i], "Root"))
1301 input_style = (XIMPreeditNothing | XIMStatusNothing); 1441 input_style = XIMPreeditNothing | XIMStatusNothing;
1302 else if (!strcmp (s[i], "None")) 1442 else if (!strcmp (s[i], "None"))
1303 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;
1304 1450
1305 for (j = 0; j < xim_styles->count_styles; j++) 1451 for (j = 0; j < xim_styles->count_styles; j++)
1306 if (input_style == xim_styles->supported_styles[j]) 1452 if (input_style == xim_styles->supported_styles[j])
1307 { 1453 {
1308 rxvt_freecommastring (s); 1454 rxvt_freecommastring (s);
… …
1346 "*", 1492 "*",
1347 fheight, 1493 fheight,
1348 fheight + 1, fheight - 1, 1494 fheight + 1, fheight - 1,
1349 fheight - 2, fheight + 2); 1495 fheight - 2, fheight + 2);
1350 1496
1351 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1497 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1352 &missing_charset_list, &missing_charset_count, &def_string); 1498 &missing_charset_list, &missing_charset_count, &def_string);
1353 1499
1354 if (missing_charset_list) 1500 if (missing_charset_list)
1355 XFreeStringList (missing_charset_list); 1501 XFreeStringList (missing_charset_list);
1356 1502
… …
1397 XNBackground, bg, 1543 XNBackground, bg,
1398 XNArea, &status_rect, 1544 XNArea, &status_rect,
1399 XNFontSet, fs, 1545 XNFontSet, fs,
1400 NULL); 1546 NULL);
1401 } 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
1402 1571
1403 Input_Context = XCreateIC (xim, 1572 Input_Context = XCreateIC (xim,
1404 XNInputStyle, input_style, 1573 XNInputStyle, input_style,
1405 XNClientWindow, vt, 1574 XNClientWindow, vt,
1406 XNFocusWindow, parent[0], 1575 XNFocusWindow, parent[0],
… …
1408 preedit_attr, 1577 preedit_attr,
1409 status_attr ? XNStatusAttributes : NULL, 1578 status_attr ? XNStatusAttributes : NULL,
1410 status_attr, NULL); 1579 status_attr, NULL);
1411 1580
1412 if (preedit_attr) XFree (preedit_attr); 1581 if (preedit_attr) XFree (preedit_attr);
1413 if (status_attr) XFree (status_attr); 1582 if (status_attr) XFree (status_attr);
1414 if (fs) XFreeFontSet (display->display, fs); 1583 if (fs) XFreeFontSet (dpy, fs);
1415 1584
1416 if (Input_Context == NULL) 1585 if (Input_Context == NULL)
1417 { 1586 {
1418 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1587 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1419 im_destroy (); 1588 im_destroy ();
1420 return false; 1589 return false;
1421 } 1590 }
1422 1591
1592#if 0
1593 // unfortunately, only the focus window is used by XIM, hard to fix
1423 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1594 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1424 vt_select_input (); 1595 vt_select_input ();
1596#endif
1425 1597
1426 if (input_style & XIMPreeditArea)
1427 IMSetStatusPosition (); 1598 IMSetPosition ();
1428 1599
1429 return true; 1600 return true;
1430} 1601}
1431 1602
1432void 1603void
… …
1490 SET_LOCALE (locale); 1661 SET_LOCALE (locale);
1491#endif 1662#endif
1492} 1663}
1493 1664
1494void 1665void
1495rxvt_term::IMSetStatusPosition () 1666rxvt_term::IMSetPosition ()
1496{ 1667{
1497 XRectangle preedit_rect, status_rect, *needed_rect; 1668 XRectangle preedit_rect, status_rect, *needed_rect;
1498 XVaNestedList preedit_attr, status_attr; 1669 XVaNestedList preedit_attr, status_attr;
1499 1670
1500 if (!Input_Context 1671 if (!Input_Context
1501 || !focus 1672 || !focus
1502 || !(input_style & XIMPreeditArea) 1673 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1503 || !IMisRunning ()) 1674 || !IMisRunning ())
1504 return; 1675 return;
1505 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 {
1506 /* Getting the necessary width of preedit area */ 1687 /* Getting the necessary width of preedit area */
1507 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1688 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1508 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1689 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1509 XFree (status_attr); 1690 XFree (status_attr);
1510 1691
1511 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1692 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1512 XFree (needed_rect); 1693 XFree (needed_rect);
1513 1694
1514 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1695 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1515 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1696 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1516 1697
1517 XSetICValues (Input_Context, 1698 XSetICValues (Input_Context,
1518 XNPreeditAttributes, preedit_attr, 1699 XNPreeditAttributes, preedit_attr,
1519 XNStatusAttributes, status_attr, NULL); 1700 XNStatusAttributes, status_attr,
1701 NULL);
1520 1702
1703 XFree (status_attr);
1704 }
1705
1521 XFree (preedit_attr); 1706 XFree (preedit_attr);
1522 XFree (status_attr);
1523} 1707}
1524#endif /* USE_XIM */ 1708#endif /* USE_XIM */
1525 1709
1710void
1711rxvt_term::get_window_origin (int &x, int &y)
1712{
1713 Window cr;
1714 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1715/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1716}
1717
1718Pixmap
1719rxvt_term::get_pixmap_property (int prop_id)
1720{
1721 if (prop_id > 0 && prop_id < NUM_XA)
1722 if (xa[prop_id])
1723 {
1724 int aformat;
1725 unsigned long nitems, bytes_after;
1726 Atom atype;
1727 unsigned char *prop = NULL;
1728 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1729 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1730 &nitems, &bytes_after, &prop);
1731 if (result == Success && prop && atype == XA_PIXMAP)
1732 {
1733 return *(Pixmap *)prop;
1734 }
1735 }
1736 return None;
1737}
1738
1739#ifdef HAVE_BG_PIXMAP
1740int
1741rxvt_term::update_background ()
1742{
1743 bgPixmap.invalidate ();
1744
1745 /* no chance of real time refresh if we are blurring ! */
1746 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1747 bgPixmap.render ();
1748 else
1749 {
1750 update_background_ev.stop ();
1751 if (!bgPixmap.need_client_side_rendering())
1752 update_background_ev.start (NOW + .05);
1753 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1754 update_background_ev.start (NOW + .2); /* very slow !!! */
1755 else
1756 update_background_ev.start (NOW + .07);
1757 }
1758 return 0;
1759}
1760
1761void
1762rxvt_term::update_background_cb (time_watcher &w)
1763{
1764 bgPixmap.render ();
1765}
1766
1767#endif /* HAVE_BG_PIXMAP */
1768
1526/*----------------------- end-of-file (C source) -----------------------*/ 1769/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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