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.203 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.247 by ayin, Tue Aug 28 16:56:40 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 ()
… …
319 im_ev.stop (display); 334 im_ev.stop (display);
320#endif 335#endif
321#if HAVE_SCROLLBARS 336#if HAVE_SCROLLBARS
322 scrollbar_ev.stop (display); 337 scrollbar_ev.stop (display);
323#endif 338#endif
324#if TRANSPARENT 339#if ENABLE_TRANSPARENCY || ENABLE_PERL
325 rootwin_ev.stop (display); 340 rootwin_ev.stop (display);
326#endif 341#endif
327 incr_ev.stop (); 342 incr_ev.stop ();
328 termwin_ev.stop (display); 343 termwin_ev.stop (display);
329 vt_ev.stop (display); 344 vt_ev.stop (display);
… …
370{ 385{
371 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++)
372 (*t)->emergency_cleanup (); 387 (*t)->emergency_cleanup ();
373} 388}
374 389
375#if ENABLE_FRILLS 390#if !ENABLE_MINIMAL
376static void 391static void
377print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
378{ 393{
379 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
… …
428 GET_R->allowedxerror = event->error_code; 443 GET_R->allowedxerror = event->error_code;
429 else 444 else
430 { 445 {
431 // 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,
432 // so just output the error and continue 447 // so just output the error and continue
433#if ENABLE_FRILLS 448#if ENABLE_MINIMAL
449 old_xerror_handler (display, event);
450#else
434 print_x_error (display, event); 451 print_x_error (display, event);
435#else
436 old_xerror_handler (display, event);
437#endif 452#endif
438 } 453 }
439 454
440 return 0; 455 return 0;
441} 456}
… …
469#ifdef KEYSYM_RESOURCE 484#ifdef KEYSYM_RESOURCE
470 keyboard->register_done (); 485 keyboard->register_done ();
471#endif 486#endif
472 487
473#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
474 if (OPTION (Opt_scrollBar)) 489 if (option (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 490 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 491#endif
477 492
478 pty = ptytty::create (); 493 pty = ptytty::create ();
479 494
480 create_windows (argc, argv); 495 create_windows (argc, argv);
481 496
482 dDisp;
483
484 init_xlocale (); 497 init_xlocale ();
485 498
486 scr_reset (); // initialize screen 499 scr_reset (); // initialize screen
487 500
488#if 0 501#if 0
489 XSynchronize (disp, True); 502 XSynchronize (dpy, True);
490#endif 503#endif
491 504
492#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
493 if (OPTION (Opt_scrollBar)) 506 if (option (Opt_scrollBar))
494 resize_scrollbar (); /* create and map scrollbar */ 507 resize_scrollbar (); /* create and map scrollbar */
495#endif 508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bgPixmap.set_target (this);
512
496#ifdef TRANSPARENT 513#ifdef ENABLE_TRANSPARENCY
497 if (OPTION (Opt_transparent)) 514 if (option (Opt_transparent))
498 { 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 ();
499 XSelectInput (disp, display->root, PropertyChangeMask); 527 XSelectInput (dpy, display->root, PropertyChangeMask);
500 check_our_parents ();
501 rootwin_ev.start (display, display->root); 528 rootwin_ev.start (display, display->root);
502 } 529 }
530#endif
531
532#ifdef XPM_BACKGROUND
533 if (rs[Rs_backgroundPixmap] != NULL)
534 {
535 const char *p = rs[Rs_backgroundPixmap];
536
537 if ((p = strchr (p, ';')) != NULL)
538 {
539 p++;
540 bgPixmap.set_geometry (p);
541 }
542 else
543 bgPixmap.set_defaultGeometry ();
544
545 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
546 if (!option (Opt_transparent))
547 update_background ();
548 }
549#endif
550 }
551#endif
552
553#if ENABLE_PERL
554 rootwin_ev.start (display, display->root);
503#endif 555#endif
504 556
505 set_colorfgbg (); 557 set_colorfgbg ();
506 558
507 init_command (cmd_argv); 559 init_command (cmd_argv);
… …
518#if ENABLE_XEMBED 570#if ENABLE_XEMBED
519 if (rs[Rs_embed]) 571 if (rs[Rs_embed])
520 { 572 {
521 long info[2] = { 0, XEMBED_MAPPED }; 573 long info[2] = { 0, XEMBED_MAPPED };
522 574
523 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 575 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
524 32, PropModeReplace, (unsigned char *)&info, 2); 576 32, PropModeReplace, (unsigned char *)&info, 2);
525 } 577 }
526#endif 578#endif
527 579
528 XMapWindow (disp, vt); 580 XMapWindow (dpy, vt);
529 XMapWindow (disp, parent[0]); 581 XMapWindow (dpy, parent[0]);
530 582
531 return true; 583 return true;
532} 584}
533 585
534static struct sig_handlers 586static struct sig_handlers
… …
614 return p; 666 return p;
615} 667}
616 668
617/*----------------------------------------------------------------------*/ 669/*----------------------------------------------------------------------*/
618/* 670/*
619 * window size/position calculcations for XSizeHint and other storage. 671 * window size/position calculations for XSizeHint and other storage.
620 * if width/height are non-zero then override calculated width/height 672 * if width/height are non-zero then override calculated width/height
621 */ 673 */
622void 674void
623rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 675rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
624{ 676{
625 short recalc_x, recalc_y; 677 short recalc_x, recalc_y;
626 int x, y, sb_w, flags; 678 int x, y, sb_w, flags;
627 unsigned int w, h; 679 unsigned int w, h;
628 unsigned int max_width, max_height; 680 unsigned int max_width, max_height;
629 dDisp;
630 681
631 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 682 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
632 szHint.win_gravity = NorthWestGravity; 683 szHint.win_gravity = NorthWestGravity;
633 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 684 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
634 685
… …
696 747
697 if (scrollBar.state) 748 if (scrollBar.state)
698 { 749 {
699 sb_w = scrollbar_TotalWidth (); 750 sb_w = scrollbar_TotalWidth ();
700 szHint.base_width += sb_w; 751 szHint.base_width += sb_w;
752
701 if (!OPTION (Opt_scrollBar_right)) 753 if (!option (Opt_scrollBar_right))
702 window_vt_x += sb_w; 754 window_vt_x += sb_w;
703 } 755 }
704 756
705 szHint.width_inc = fwidth; 757 szHint.width_inc = fwidth;
706 szHint.height_inc = fheight; 758 szHint.height_inc = fheight;
707 szHint.min_width = szHint.base_width + szHint.width_inc; 759 szHint.min_width = szHint.base_width + szHint.width_inc;
708 szHint.min_height = szHint.base_height + szHint.height_inc; 760 szHint.min_height = szHint.base_height + szHint.height_inc;
709 761
710 if (newwidth && newwidth - szHint.base_width < max_width) 762 if (newwidth && newwidth - szHint.base_width < max_width)
711 { 763 {
712 szHint.width = newwidth; 764 szHint.width = newwidth;
… …
727 { 779 {
728 min_it (height, max_height); 780 min_it (height, max_height);
729 szHint.height = szHint.base_height + height; 781 szHint.height = szHint.base_height + height;
730 } 782 }
731 783
732 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 784 if (scrollBar.state && option (Opt_scrollBar_right))
733 window_sb_x = szHint.width - sb_w; 785 window_sb_x = szHint.width - sb_w;
734 786
735 if (recalc_x) 787 if (recalc_x)
736 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 788 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
789
737 if (recalc_y) 790 if (recalc_y)
738 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 791 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
739 792
740 ncol = width / fwidth; 793 ncol = width / fwidth;
741 nrow = height / fheight; 794 nrow = height / fheight;
742} 795}
743 796
… …
798 delete fontset[0]; 851 delete fontset[0];
799 fontset[0] = fs; 852 fontset[0] = fs;
800 853
801 prop = (*fs)[1]->properties (); 854 prop = (*fs)[1]->properties ();
802 prop.height += lineSpace; 855 prop.height += lineSpace;
856
803 fs->set_prop (prop); 857 fs->set_prop (prop, false);
804 858
805 fwidth = prop.width; 859 fwidth = prop.width;
806 fheight = prop.height; 860 fheight = prop.height;
807 fbase = prop.ascent; 861 fbase = prop.ascent;
808 862
… …
817 { 871 {
818 fontset[style] = fs = new rxvt_fontset (this); 872 fontset[style] = fs = new rxvt_fontset (this);
819 rxvt_fontprop prop2 = prop; 873 rxvt_fontprop prop2 = prop;
820 874
821 if (res) 875 if (res)
822 prop2.weight = prop2.slant = rxvt_fontprop::unset; 876 {
877 fs->populate (res);
878 fs->set_prop (prop2, false);
879 }
823 else 880 else
824 { 881 {
825 res = fontset[0]->fontdesc; 882 fs->populate (fontset[0]->fontdesc);
826 883
827 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 884 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
828 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 885 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
886
887 fs->set_prop (prop2, true);
829 } 888 }
830 889
831 fs->populate (res);
832 fs->set_prop (prop2);
833 } 890 }
834#else 891#else
835 fontset[style] = fontset[0]; 892 fontset[style] = fontset[0];
836#endif 893#endif
837 } 894 }
… …
846 return true; 903 return true;
847} 904}
848 905
849void rxvt_term::set_string_property (Atom prop, const char *str, int len) 906void rxvt_term::set_string_property (Atom prop, const char *str, int len)
850{ 907{
851 XChangeProperty (display->display, parent[0], 908 XChangeProperty (dpy, parent[0],
852 prop, XA_STRING, 8, PropModeReplace, 909 prop, XA_STRING, 8, PropModeReplace,
853 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 910 (const unsigned char *)str, len >= 0 ? len : strlen (str));
854} 911}
855 912
856void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 913void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
857{ 914{
858 wchar_t *ws = rxvt_mbstowcs (str, len); 915 wchar_t *ws = rxvt_mbstowcs (str, len);
859 char *s = rxvt_wcstoutf8 (ws); 916 char *s = rxvt_wcstoutf8 (ws);
860 917
861 XChangeProperty (display->display, parent[0], 918 XChangeProperty (dpy, parent[0],
862 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 919 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
863 (const unsigned char *)s, strlen (s)); 920 (const unsigned char *)s, strlen (s));
864 921
865 free (s); 922 free (s);
866 free (ws); 923 free (ws);
… …
891void 948void
892rxvt_term::set_window_color (int idx, const char *color) 949rxvt_term::set_window_color (int idx, const char *color)
893{ 950{
894 rxvt_color xcol; 951 rxvt_color xcol;
895 int i; 952 int i;
896 953
897 if (color == NULL || *color == '\0') 954 if (color == NULL || *color == '\0')
898 return; 955 return;
956
957 color = strdup (color);
958 allocated.push_back ((void *)color);
959 rs[Rs_color + idx] = color;
899 960
900 /* handle color aliases */ 961 /* handle color aliases */
901 if (isdigit (*color)) 962 if (isdigit (*color))
902 { 963 {
903 i = atoi (color); 964 i = atoi (color);
904 965
905 if (i >= 8 && i <= 15) 966 if (i >= 8 && i <= 15)
906 { /* bright colors */ 967 { /* bright colors */
907 i -= 8; 968 i -= 8;
908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 969 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
909 SET_PIXCOLOR (idx);
910 goto done; 970 goto done;
911 } 971 }
912 972
913 if (i >= 0 && i <= 7) 973 if (i >= 0 && i <= 7)
914 { /* normal colors */ 974 { /* normal colors */
915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 975 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
916 SET_PIXCOLOR (idx);
917 goto done; 976 goto done;
918 } 977 }
919 } 978 }
920 979
921 if (!rXParseAllocColor (&xcol, color)) 980 set_color (xcol, color);
922 return;
923
924 /* XStoreColor (display->display, display->cmap, XColor*); */
925 981
926 /* 982 /*
927 * FIXME: should free colors here, but no idea how to do it so instead, 983 * FIXME: should free colors here, but no idea how to do it so instead,
928 * so just keep gobbling up the colormap 984 * so just keep gobbling up the colormap
929 */ 985 */
930# if 0
931 for (i = Color_Black; i <= Color_White; i++)
932 if (pix_colors[idx] == pix_colors[i])
933 break;
934 if (i > Color_White)
935 {
936 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
937 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
938 DisplayPlanes (display->display, display->screen));
939 }
940# endif
941 986
942 pix_colors_focused[idx] = xcol; 987 pix_colors_focused[idx] = xcol;
943 SET_PIXCOLOR (idx);
944 988
945 /* XSetWindowAttributes attr; */ 989 /* XSetWindowAttributes attr; */
946 /* Cursor cursor; */ 990 /* Cursor cursor; */
947done: 991done:
948
949#if OFF_FOCUS_FADING
950 if (rs[Rs_fade])
951 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
952#endif
953
954 /*TODO: handle Color_BD, scrollbar background, etc. */ 992 /*TODO: handle Color_BD, scrollbar background, etc. */
955 993
994 update_fade_color (idx);
956 recolour_cursor (); 995 recolour_cursor ();
957 scr_recolour (); 996 scr_recolour ();
958} 997}
959 998
960#else 999#else
… …
962#endif /* XTERM_COLOR_CHANGE */ 1001#endif /* XTERM_COLOR_CHANGE */
963 1002
964void 1003void
965rxvt_term::recolour_cursor () 1004rxvt_term::recolour_cursor ()
966{ 1005{
967 XColor xcol[2]; 1006 XColor fg, bg;
968 1007
969 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1008 (ISSET_PIXCOLOR (Color_pointer_fg)
970 ? pix_colors_focused[Color_pointer_fg] 1009 ? pix_colors_focused[Color_pointer_fg]
971 : pix_colors_focused[Color_fg]; 1010 : pix_colors_focused[Color_fg]).get (fg);
1011
972 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1012 (ISSET_PIXCOLOR (Color_pointer_bg)
973 ? pix_colors_focused[Color_pointer_bg] 1013 ? pix_colors_focused[Color_pointer_bg]
974 : pix_colors_focused[Color_bg]; 1014 : pix_colors_focused[Color_bg]).get (bg);
975 1015
976 XQueryColors (display->display, display->cmap, xcol, 2); 1016 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
977 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
978} 1017}
979 1018
980/*----------------------------------------------------------------------*/ 1019/*----------------------------------------------------------------------*/
981/* 1020/*
982 * 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
… …
986{ 1025{
987 unsigned int i; 1026 unsigned int i;
988 const char *xpmb = "\0"; 1027 const char *xpmb = "\0";
989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1028 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
990 1029
991 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
992 strcpy (fstr, "default"); 1030 strcpy (fstr, "default");
993 strcpy (bstr, "default"); 1031 strcpy (bstr, "default");
994 for (i = Color_Black; i <= Color_White; i++) 1032 for (i = Color_Black; i <= Color_White; i++)
995 if (pix_colors[Color_fg] == pix_colors[i]) 1033 if (pix_colors[Color_fg] == pix_colors[i])
996 { 1034 {
… …
1011 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1049 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1012} 1050}
1013 1051
1014/*----------------------------------------------------------------------*/ 1052/*----------------------------------------------------------------------*/
1015 1053
1016int 1054bool
1017rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1055rxvt_term::set_color (rxvt_color &color, const char *name)
1018{ 1056{
1019 if (!screen_in_out->set (display, colour)) 1057 if (color.set (this, name))
1020 {
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1022 return false;
1023 }
1024
1025 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]);
1026} 1068}
1027 1069
1028/* -------------------------------------------------------------------- * 1070/* -------------------------------------------------------------------- *
1029 * - WINDOW RESIZING - * 1071 * - WINDOW RESIZING - *
1030 * -------------------------------------------------------------------- */ 1072 * -------------------------------------------------------------------- */
… …
1032rxvt_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)
1033{ 1075{
1034 int fix_screen; 1076 int fix_screen;
1035 int old_width = szHint.width; 1077 int old_width = szHint.width;
1036 int old_height = szHint.height; 1078 int old_height = szHint.height;
1037 dDisp;
1038 1079
1039 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)))
1040 XSetWMNormalHints (disp, parent[0], &szHint); 1083 XSetWMNormalHints (dpy, parent[0], &szHint);
1041 1084
1042 if (!ignoreparent) 1085 if (!ignoreparent)
1043 { 1086 {
1044#ifdef SMART_RESIZE 1087#ifdef SMART_RESIZE
1045 /* 1088 /*
… …
1049 int x, y, x1, y1; 1092 int x, y, x1, y1;
1050 int dx, dy; 1093 int dx, dy;
1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1094 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1052 Window unused_cr; 1095 Window unused_cr;
1053 1096
1054 XTranslateCoordinates (disp, parent[0], display->root, 1097 XTranslateCoordinates (dpy, parent[0], display->root,
1055 0, 0, &x, &y, &unused_cr); 1098 0, 0, &x, &y, &unused_cr);
1056 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1099 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1100 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1058 /* 1101 /*
1059 * 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
1060 * our position for handles and decorations. Counter it 1103 * our position for handles and decorations. Counter it
1061 */ 1104 */
… …
1063 { 1106 {
1064 x -= x1; 1107 x -= x1;
1065 y -= y1; 1108 y -= y1;
1066 } 1109 }
1067 1110
1068 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1111 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1069 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1112 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1070 dx = old_width - szHint.width; 1113 dx = old_width - szHint.width;
1071 dy = old_height - szHint.height; 1114 dy = old_height - szHint.height;
1072 1115
1073 /* Check position of the center of the window */ 1116 /* Check position of the center of the window */
1074 if (x < x1) /* left half */ 1117 if (x < x1) /* left half */
… …
1078 if (y < y1) /* top half */ 1121 if (y < y1) /* top half */
1079 dy = 0; 1122 dy = 0;
1080 else if (y == y1) /* exact center */ 1123 else if (y == y1) /* exact center */
1081 dy /= 2; 1124 dy /= 2;
1082 1125
1083 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1126 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1084 szHint.width, szHint.height); 1127 szHint.width, szHint.height);
1085#else 1128#else
1086 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1129 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1087#endif 1130#endif
1088 } 1131 }
1089 1132
1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1133 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1091 1134
1092 if (fix_screen || newwidth != old_width || newheight != old_height) 1135 if (fix_screen || newwidth != old_width || newheight != old_height)
1093 { 1136 {
1094 if (scrollBar.state) 1137 if (scrollBar.state)
1095 { 1138 {
1096 XMoveResizeWindow (disp, scrollBar.win, 1139 XMoveResizeWindow (dpy, scrollBar.win,
1097 window_sb_x, 0, 1140 window_sb_x, 0,
1098 scrollbar_TotalWidth (), szHint.height); 1141 scrollbar_TotalWidth (), szHint.height);
1099 resize_scrollbar (); 1142 resize_scrollbar ();
1100 } 1143 }
1101 1144
1102 XMoveResizeWindow (disp, vt, 1145 XMoveResizeWindow (dpy, vt,
1103 window_vt_x, window_vt_y, 1146 window_vt_x, window_vt_y,
1104 width, height); 1147 width, height);
1105 1148
1149#ifdef HAVE_BG_PIXMAP
1150 if (bgPixmap.window_size_sensitive ())
1151 update_background ();
1152#endif
1153
1106 scr_clear (); 1154 scr_clear ();
1107#ifdef XPM_BACKGROUND
1108 resize_pixmap ();
1109#endif
1110 } 1155 }
1111 1156
1112 if (fix_screen || old_height == 0) 1157 if (fix_screen || old_height == 0)
1113 scr_reset (); 1158 scr_reset ();
1114 1159
1115#ifdef XPM_BACKGROUND 1160 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1116 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)
1117 scr_touch (false); 1166// scr_touch (false);
1118#endif 1167#endif
1119 1168
1120#ifdef USE_XIM 1169#ifdef USE_XIM
1121 IMSetStatusPosition (); 1170 IMSetPosition ();
1122#endif 1171#endif
1123} 1172}
1124 1173
1125/* 1174/*
1126 * 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.
… …
1131{ 1180{
1132 XWindowAttributes wattr; 1181 XWindowAttributes wattr;
1133 1182
1134 if (newwidth == 0 || newheight == 0) 1183 if (newwidth == 0 || newheight == 0)
1135 { 1184 {
1136 XGetWindowAttributes (display->display, display->root, &wattr); 1185 XGetWindowAttributes (dpy, display->root, &wattr);
1137 1186
1138 if (newwidth == 0) 1187 if (newwidth == 0)
1139 newwidth = wattr.width - szHint.base_width; 1188 newwidth = wattr.width - szHint.base_width;
1140 if (newheight == 0) 1189 if (newheight == 0)
1141 newheight = wattr.height - szHint.base_height; 1190 newheight = wattr.height - szHint.base_height;
… …
1155#ifdef USE_XIM 1204#ifdef USE_XIM
1156 1205
1157void 1206void
1158rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1207rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1159{ 1208{
1160 fg = pix_colors[Color_fg]; 1209 fg = pix_colors [Color_fg];
1161 bg = pix_colors[Color_bg]; 1210 bg = pix_colors [Color_bg];
1162} 1211}
1163 1212
1164void 1213void
1165rxvt_term::im_set_size (XRectangle &size) 1214rxvt_term::im_set_size (XRectangle &size)
1166{ 1215{
… …
1203 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1252 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1204 1253
1205 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1254 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1206 *p = '\0'; 1255 *p = '\0';
1207 1256
1208 atom = XInternAtom (display->display, server, False); 1257 atom = XInternAtom (dpy, server, False);
1209 win = XGetSelectionOwner (display->display, atom); 1258 win = XGetSelectionOwner (dpy, atom);
1210 1259
1211 if (win != None) 1260 if (win != None)
1212 return True; 1261 return True;
1213 } 1262 }
1214 1263
… …
1438 "*", 1487 "*",
1439 fheight, 1488 fheight,
1440 fheight + 1, fheight - 1, 1489 fheight + 1, fheight - 1,
1441 fheight - 2, fheight + 2); 1490 fheight - 2, fheight + 2);
1442 1491
1443 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1492 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1444 &missing_charset_list, &missing_charset_count, &def_string); 1493 &missing_charset_list, &missing_charset_count, &def_string);
1445 1494
1446 if (missing_charset_list) 1495 if (missing_charset_list)
1447 XFreeStringList (missing_charset_list); 1496 XFreeStringList (missing_charset_list);
1448 1497
… …
1489 XNBackground, bg, 1538 XNBackground, bg,
1490 XNArea, &status_rect, 1539 XNArea, &status_rect,
1491 XNFontSet, fs, 1540 XNFontSet, fs,
1492 NULL); 1541 NULL);
1493 } 1542 }
1543#if ENABLE_XIM_ONTHESPOT
1494 else if (input_style & XIMPreeditCallbacks) 1544 else if (input_style & XIMPreeditCallbacks)
1495 { 1545 {
1496 im_set_position (spot); 1546 im_set_position (spot);
1497 1547
1498 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1548 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1499 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1549 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1500 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1550 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1501#if 0 1551# if 0
1502 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1552 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1503#endif 1553# endif
1504 1554
1505 preedit_attr = XVaCreateNestedList (0, 1555 preedit_attr = XVaCreateNestedList (0,
1506 XNSpotLocation, &spot, 1556 XNSpotLocation, &spot,
1507 XNPreeditStartCallback, &xcb[0], 1557 XNPreeditStartCallback, &xcb[0],
1508 XNPreeditDoneCallback , &xcb[1], 1558 XNPreeditDoneCallback , &xcb[1],
1509 XNPreeditDrawCallback , &xcb[2], 1559 XNPreeditDrawCallback , &xcb[2],
1510#if 0 1560# if 0
1511 XNPreeditCaretCallback, &xcb[3], 1561 XNPreeditCaretCallback, &xcb[3],
1512#endif 1562# endif
1513 NULL); 1563 NULL);
1514 } 1564 }
1565#endif
1515 1566
1516 Input_Context = XCreateIC (xim, 1567 Input_Context = XCreateIC (xim,
1517 XNInputStyle, input_style, 1568 XNInputStyle, input_style,
1518 XNClientWindow, vt, 1569 XNClientWindow, vt,
1519 XNFocusWindow, parent[0], 1570 XNFocusWindow, parent[0],
… …
1521 preedit_attr, 1572 preedit_attr,
1522 status_attr ? XNStatusAttributes : NULL, 1573 status_attr ? XNStatusAttributes : NULL,
1523 status_attr, NULL); 1574 status_attr, NULL);
1524 1575
1525 if (preedit_attr) XFree (preedit_attr); 1576 if (preedit_attr) XFree (preedit_attr);
1526 if (status_attr) XFree (status_attr); 1577 if (status_attr) XFree (status_attr);
1527 if (fs) XFreeFontSet (display->display, fs); 1578 if (fs) XFreeFontSet (dpy, fs);
1528 1579
1529 if (Input_Context == NULL) 1580 if (Input_Context == NULL)
1530 { 1581 {
1531 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1582 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1532 im_destroy (); 1583 im_destroy ();
… …
1537 // unfortunately, only the focus window is used by XIM, hard to fix 1588 // unfortunately, only the focus window is used by XIM, hard to fix
1538 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1589 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1539 vt_select_input (); 1590 vt_select_input ();
1540#endif 1591#endif
1541 1592
1542 if (input_style & XIMPreeditArea)
1543 IMSetStatusPosition (); 1593 IMSetPosition ();
1544 1594
1545 return true; 1595 return true;
1546} 1596}
1547 1597
1548void 1598void
… …
1606 SET_LOCALE (locale); 1656 SET_LOCALE (locale);
1607#endif 1657#endif
1608} 1658}
1609 1659
1610void 1660void
1611rxvt_term::IMSetStatusPosition () 1661rxvt_term::IMSetPosition ()
1612{ 1662{
1613 XRectangle preedit_rect, status_rect, *needed_rect; 1663 XRectangle preedit_rect, status_rect, *needed_rect;
1614 XVaNestedList preedit_attr, status_attr; 1664 XVaNestedList preedit_attr, status_attr;
1615 1665
1616 if (!Input_Context 1666 if (!Input_Context
1617 || !focus 1667 || !focus
1618 || !(input_style & XIMPreeditArea) 1668 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1619 || !IMisRunning ()) 1669 || !IMisRunning ())
1620 return; 1670 return;
1621 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 {
1622 /* Getting the necessary width of preedit area */ 1682 /* Getting the necessary width of preedit area */
1623 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1683 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1624 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1684 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1625 XFree (status_attr); 1685 XFree (status_attr);
1626 1686
1627 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1687 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1628 XFree (needed_rect); 1688 XFree (needed_rect);
1629 1689
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1690 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1691 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1632 1692
1633 XSetICValues (Input_Context, 1693 XSetICValues (Input_Context,
1634 XNPreeditAttributes, preedit_attr, 1694 XNPreeditAttributes, preedit_attr,
1635 XNStatusAttributes, status_attr, NULL); 1695 XNStatusAttributes, status_attr,
1696 NULL);
1636 1697
1698 XFree (status_attr);
1699 }
1700
1637 XFree (preedit_attr); 1701 XFree (preedit_attr);
1638 XFree (status_attr);
1639} 1702}
1640#endif /* USE_XIM */ 1703#endif /* USE_XIM */
1641 1704
1642/*----------------------- end-of-file (C source) -----------------------*/ 1705/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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