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.204 by root, Wed Jan 25 02:53:13 2006 UTC vs.
Revision 1.245 by sasha, Fri Aug 17 22:02:14 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
56static char curlocale[128], savelocale[128]; 56static char curlocale[128], savelocale[128];
57 57
58bool 58bool
59rxvt_set_locale (const char *locale) NOTHROW 59rxvt_set_locale (const char *locale) NOTHROW
60{ 60{
61 int size = strlen (locale) + 1;
62
63 if (size > sizeof (curlocale))
64 rxvt_fatal ("locale string too long, aborting.\n");
65
61 if (!locale || !strncmp (locale, curlocale, 128)) 66 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 67 return false;
63 68
64 strncpy (curlocale, locale, 128); 69 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 70 setlocale (LC_CTYPE, curlocale);
66 return true; 71 return true;
67} 72}
68 73
69void 74void
… …
143} 148}
144#endif 149#endif
145 150
146rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
147 : 152 :
148#if TRANSPARENT 153#if ENABLE_TRANSPARENCY || ENABLE_PERL
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
155#endif
156#if HAVE_BG_PIXMAP
157 update_background_ev(this, &rxvt_term::update_background_cb),
150#endif 158#endif
151#ifdef HAVE_SCROLLBARS 159#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 160 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 161#endif
154#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
… …
198void rxvt_term::emergency_cleanup () 206void rxvt_term::emergency_cleanup ()
199{ 207{
200 if (cmd_pid) 208 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 209 kill (-cmd_pid, SIGHUP);
202 210
211 pty_ev.stop ();
203 delete pty; pty = 0; 212 delete pty; pty = 0;
204} 213}
205 214
206rxvt_term::~rxvt_term () 215rxvt_term::~rxvt_term ()
207{ 216{
… …
216#endif 225#endif
217 delete fontset[0]; 226 delete fontset[0];
218 227
219 if (display) 228 if (display)
220 { 229 {
221 dDisp;
222
223 selection_clear (); 230 selection_clear ();
224 231
225#ifdef USE_XIM 232#ifdef USE_XIM
226 im_destroy (); 233 im_destroy ();
227#endif 234#endif
228#ifdef XTERM_SCROLLBAR 235#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 237 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 238#endif
232#ifdef PLAIN_SCROLLBAR 239#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 241#endif
235#ifdef NEXT_SCROLLBAR 242#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 243 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 244 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 245 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 246 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 247 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 248 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 249 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 250 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 253#endif
247#ifdef RXVT_SCROLLBAR 254#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 258#endif
252 if (gc) XFreeGC (disp, gc); 259 if (gc) XFreeGC (dpy, gc);
253 260
254 delete drawable; 261 delete drawable;
255 // destroy all windows 262 // destroy all windows
256 if (parent[0]) 263 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 264 XDestroyWindow (dpy, parent[0]);
258 }
259 265
260 // TODO: free pixcolours, colours should become part of rxvt_display 266 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 267 if (ISSET_PIXCOLOR (i))
268 {
269 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
271 pix_colors_unfocused [i].free (this);
272#endif
273 }
274
275 clear ();
276 }
277
278 delete [] pix_colors_focused;
279#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 280 delete [] pix_colors_unfocused;
264#endif 281#endif
265 282
266 displays.put (display); 283 displays.put (display);
267 284
268 scr_release (); 285 scr_release ();
… …
293{ 310{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 312
296 cmd_pid = 0; 313 cmd_pid = 0;
297 314
298 if (!OPTION (Opt_hold)) 315 if (!option (Opt_hold))
299 destroy (); 316 destroy ();
300} 317}
301 318
302void 319void
303rxvt_term::destroy () 320rxvt_term::destroy ()
… …
317 im_ev.stop (display); 334 im_ev.stop (display);
318#endif 335#endif
319#if HAVE_SCROLLBARS 336#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 337 scrollbar_ev.stop (display);
321#endif 338#endif
322#if TRANSPARENT 339#if ENABLE_TRANSPARENCY || ENABLE_PERL
323 rootwin_ev.stop (display); 340 rootwin_ev.stop (display);
324#endif 341#endif
325 incr_ev.stop (); 342 incr_ev.stop ();
326 termwin_ev.stop (display); 343 termwin_ev.stop (display);
327 vt_ev.stop (display); 344 vt_ev.stop (display);
… …
368{ 385{
369 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++)
370 (*t)->emergency_cleanup (); 387 (*t)->emergency_cleanup ();
371} 388}
372 389
373#if ENABLE_FRILLS 390#if !ENABLE_MINIMAL
374static void 391static void
375print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
376{ 393{
377 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
… …
426 GET_R->allowedxerror = event->error_code; 443 GET_R->allowedxerror = event->error_code;
427 else 444 else
428 { 445 {
429 // 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,
430 // so just output the error and continue 447 // so just output the error and continue
431#if ENABLE_FRILLS 448#if ENABLE_MINIMAL
449 old_xerror_handler (display, event);
450#else
432 print_x_error (display, event); 451 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 452#endif
436 } 453 }
437 454
438 return 0; 455 return 0;
439} 456}
… …
467#ifdef KEYSYM_RESOURCE 484#ifdef KEYSYM_RESOURCE
468 keyboard->register_done (); 485 keyboard->register_done ();
469#endif 486#endif
470 487
471#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
472 if (OPTION (Opt_scrollBar)) 489 if (option (Opt_scrollBar))
473 scrollBar.setIdle (); /* set existence for size calculations */ 490 scrollBar.setIdle (); /* set existence for size calculations */
474#endif 491#endif
475 492
476 pty = ptytty::create (); 493 pty = ptytty::create ();
477 494
478 create_windows (argc, argv); 495 create_windows (argc, argv);
479 496
480 dDisp;
481
482 init_xlocale (); 497 init_xlocale ();
483 498
484 scr_reset (); // initialize screen 499 scr_reset (); // initialize screen
485 500
486#if 0 501#if 0
487 XSynchronize (disp, True); 502 XSynchronize (dpy, True);
488#endif 503#endif
489 504
490#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
491 if (OPTION (Opt_scrollBar)) 506 if (option (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 507 resize_scrollbar (); /* create and map scrollbar */
493#endif 508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bgPixmap.set_target (this);
512
494#ifdef TRANSPARENT 513#ifdef ENABLE_TRANSPARENCY
495 if (OPTION (Opt_transparent)) 514 if (option (Opt_transparent))
496 { 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 ();
497 XSelectInput (disp, display->root, PropertyChangeMask); 527 XSelectInput (dpy, display->root, PropertyChangeMask);
498 check_our_parents ();
499 rootwin_ev.start (display, display->root); 528 rootwin_ev.start (display, display->root);
500 } 529 }
530#endif
531
532#ifdef XPM_BACKGROUND
533 if (rs[Rs_backgroundPixmap] != NULL)
534 {
535 const char *p = rs[Rs_backgroundPixmap];
536
537 if ((p = strchr (p, ';')) != NULL)
538 {
539 p++;
540 bgPixmap.set_geometry (p);
541 }
542 else
543 bgPixmap.set_defaultGeometry ();
544
545 bgPixmap.set_file (rs[Rs_backgroundPixmap]);
546 }
547 /* do not want to render Pixmap yet if we are size/position dependant -
548 * wait for ConfigureNotify at least
549 * TODO: this does not work for some reason when transparency is disabled !!!!
550 */
551 if (!bgPixmap.window_size_sensitive ())
552 update_background ();
553#endif
554 }
555#endif
556
557#if ENABLE_PERL
558 rootwin_ev.start (display, display->root);
501#endif 559#endif
502 560
503 set_colorfgbg (); 561 set_colorfgbg ();
504 562
505 init_command (cmd_argv); 563 init_command (cmd_argv);
… …
516#if ENABLE_XEMBED 574#if ENABLE_XEMBED
517 if (rs[Rs_embed]) 575 if (rs[Rs_embed])
518 { 576 {
519 long info[2] = { 0, XEMBED_MAPPED }; 577 long info[2] = { 0, XEMBED_MAPPED };
520 578
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 579 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2); 580 32, PropModeReplace, (unsigned char *)&info, 2);
523 } 581 }
524#endif 582#endif
525 583
526 XMapWindow (disp, vt); 584 XMapWindow (dpy, vt);
527 XMapWindow (disp, parent[0]); 585 XMapWindow (dpy, parent[0]);
528 586
529 return true; 587 return true;
530} 588}
531 589
532static struct sig_handlers 590static struct sig_handlers
… …
612 return p; 670 return p;
613} 671}
614 672
615/*----------------------------------------------------------------------*/ 673/*----------------------------------------------------------------------*/
616/* 674/*
617 * window size/position calculcations for XSizeHint and other storage. 675 * window size/position calculations for XSizeHint and other storage.
618 * if width/height are non-zero then override calculated width/height 676 * if width/height are non-zero then override calculated width/height
619 */ 677 */
620void 678void
621rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 679rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
622{ 680{
623 short recalc_x, recalc_y; 681 short recalc_x, recalc_y;
624 int x, y, sb_w, flags; 682 int x, y, sb_w, flags;
625 unsigned int w, h; 683 unsigned int w, h;
626 unsigned int max_width, max_height; 684 unsigned int max_width, max_height;
627 dDisp;
628 685
629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 686 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
630 szHint.win_gravity = NorthWestGravity; 687 szHint.win_gravity = NorthWestGravity;
631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 688 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
632 689
… …
694 751
695 if (scrollBar.state) 752 if (scrollBar.state)
696 { 753 {
697 sb_w = scrollbar_TotalWidth (); 754 sb_w = scrollbar_TotalWidth ();
698 szHint.base_width += sb_w; 755 szHint.base_width += sb_w;
756
699 if (!OPTION (Opt_scrollBar_right)) 757 if (!option (Opt_scrollBar_right))
700 window_vt_x += sb_w; 758 window_vt_x += sb_w;
701 } 759 }
702 760
703 szHint.width_inc = fwidth; 761 szHint.width_inc = fwidth;
704 szHint.height_inc = fheight; 762 szHint.height_inc = fheight;
705 szHint.min_width = szHint.base_width + szHint.width_inc; 763 szHint.min_width = szHint.base_width + szHint.width_inc;
706 szHint.min_height = szHint.base_height + szHint.height_inc; 764 szHint.min_height = szHint.base_height + szHint.height_inc;
707 765
708 if (newwidth && newwidth - szHint.base_width < max_width) 766 if (newwidth && newwidth - szHint.base_width < max_width)
709 { 767 {
710 szHint.width = newwidth; 768 szHint.width = newwidth;
… …
725 { 783 {
726 min_it (height, max_height); 784 min_it (height, max_height);
727 szHint.height = szHint.base_height + height; 785 szHint.height = szHint.base_height + height;
728 } 786 }
729 787
730 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 788 if (scrollBar.state && option (Opt_scrollBar_right))
731 window_sb_x = szHint.width - sb_w; 789 window_sb_x = szHint.width - sb_w;
732 790
733 if (recalc_x) 791 if (recalc_x)
734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 792 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
793
735 if (recalc_y) 794 if (recalc_y)
736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 795 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
737 796
738 ncol = width / fwidth; 797 ncol = width / fwidth;
739 nrow = height / fheight; 798 nrow = height / fheight;
740} 799}
741 800
… …
796 delete fontset[0]; 855 delete fontset[0];
797 fontset[0] = fs; 856 fontset[0] = fs;
798 857
799 prop = (*fs)[1]->properties (); 858 prop = (*fs)[1]->properties ();
800 prop.height += lineSpace; 859 prop.height += lineSpace;
860
801 fs->set_prop (prop); 861 fs->set_prop (prop, false);
802 862
803 fwidth = prop.width; 863 fwidth = prop.width;
804 fheight = prop.height; 864 fheight = prop.height;
805 fbase = prop.ascent; 865 fbase = prop.ascent;
806 866
… …
815 { 875 {
816 fontset[style] = fs = new rxvt_fontset (this); 876 fontset[style] = fs = new rxvt_fontset (this);
817 rxvt_fontprop prop2 = prop; 877 rxvt_fontprop prop2 = prop;
818 878
819 if (res) 879 if (res)
820 prop2.weight = prop2.slant = rxvt_fontprop::unset; 880 {
881 fs->populate (res);
882 fs->set_prop (prop2, false);
883 }
821 else 884 else
822 { 885 {
823 res = fontset[0]->fontdesc; 886 fs->populate (fontset[0]->fontdesc);
824 887
825 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 888 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
826 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 889 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
890
891 fs->set_prop (prop2, true);
827 } 892 }
828 893
829 fs->populate (res);
830 fs->set_prop (prop2);
831 } 894 }
832#else 895#else
833 fontset[style] = fontset[0]; 896 fontset[style] = fontset[0];
834#endif 897#endif
835 } 898 }
… …
844 return true; 907 return true;
845} 908}
846 909
847void rxvt_term::set_string_property (Atom prop, const char *str, int len) 910void rxvt_term::set_string_property (Atom prop, const char *str, int len)
848{ 911{
849 XChangeProperty (display->display, parent[0], 912 XChangeProperty (dpy, parent[0],
850 prop, XA_STRING, 8, PropModeReplace, 913 prop, XA_STRING, 8, PropModeReplace,
851 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 914 (const unsigned char *)str, len >= 0 ? len : strlen (str));
852} 915}
853 916
854void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 917void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
855{ 918{
856 wchar_t *ws = rxvt_mbstowcs (str, len); 919 wchar_t *ws = rxvt_mbstowcs (str, len);
857 char *s = rxvt_wcstoutf8 (ws); 920 char *s = rxvt_wcstoutf8 (ws);
858 921
859 XChangeProperty (display->display, parent[0], 922 XChangeProperty (dpy, parent[0],
860 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 923 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
861 (const unsigned char *)s, strlen (s)); 924 (const unsigned char *)s, strlen (s));
862 925
863 free (s); 926 free (s);
864 free (ws); 927 free (ws);
… …
889void 952void
890rxvt_term::set_window_color (int idx, const char *color) 953rxvt_term::set_window_color (int idx, const char *color)
891{ 954{
892 rxvt_color xcol; 955 rxvt_color xcol;
893 int i; 956 int i;
894 957
895 if (color == NULL || *color == '\0') 958 if (color == NULL || *color == '\0')
896 return; 959 return;
960
961 color = strdup (color);
962 allocated.push_back ((void *)color);
963 rs[Rs_color + idx] = color;
897 964
898 /* handle color aliases */ 965 /* handle color aliases */
899 if (isdigit (*color)) 966 if (isdigit (*color))
900 { 967 {
901 i = atoi (color); 968 i = atoi (color);
902 969
903 if (i >= 8 && i <= 15) 970 if (i >= 8 && i <= 15)
904 { /* bright colors */ 971 { /* bright colors */
905 i -= 8; 972 i -= 8;
906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 973 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
907 SET_PIXCOLOR (idx);
908 goto done; 974 goto done;
909 } 975 }
910 976
911 if (i >= 0 && i <= 7) 977 if (i >= 0 && i <= 7)
912 { /* normal colors */ 978 { /* normal colors */
913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 979 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
914 SET_PIXCOLOR (idx);
915 goto done; 980 goto done;
916 } 981 }
917 } 982 }
918 983
919 if (!rXParseAllocColor (&xcol, color)) 984 set_color (xcol, color);
920 return;
921
922 /* XStoreColor (display->display, display->cmap, XColor*); */
923 985
924 /* 986 /*
925 * FIXME: should free colors here, but no idea how to do it so instead, 987 * FIXME: should free colors here, but no idea how to do it so instead,
926 * so just keep gobbling up the colormap 988 * so just keep gobbling up the colormap
927 */ 989 */
928# if 0
929 for (i = Color_Black; i <= Color_White; i++)
930 if (pix_colors[idx] == pix_colors[i])
931 break;
932 if (i > Color_White)
933 {
934 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
935 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
936 DisplayPlanes (display->display, display->screen));
937 }
938# endif
939 990
940 pix_colors_focused[idx] = xcol; 991 pix_colors_focused[idx] = xcol;
941 SET_PIXCOLOR (idx);
942 992
943 /* XSetWindowAttributes attr; */ 993 /* XSetWindowAttributes attr; */
944 /* Cursor cursor; */ 994 /* Cursor cursor; */
945done: 995done:
946
947#if OFF_FOCUS_FADING
948 if (rs[Rs_fade])
949 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
950#endif
951
952 /*TODO: handle Color_BD, scrollbar background, etc. */ 996 /*TODO: handle Color_BD, scrollbar background, etc. */
953 997
998 update_fade_color (idx);
954 recolour_cursor (); 999 recolour_cursor ();
955 scr_recolour (); 1000 scr_recolour ();
956} 1001}
957 1002
958#else 1003#else
… …
960#endif /* XTERM_COLOR_CHANGE */ 1005#endif /* XTERM_COLOR_CHANGE */
961 1006
962void 1007void
963rxvt_term::recolour_cursor () 1008rxvt_term::recolour_cursor ()
964{ 1009{
965 XColor xcol[2]; 1010 XColor fg, bg;
966 1011
967 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1012 (ISSET_PIXCOLOR (Color_pointer_fg)
968 ? pix_colors_focused[Color_pointer_fg] 1013 ? pix_colors_focused[Color_pointer_fg]
969 : pix_colors_focused[Color_fg]; 1014 : pix_colors_focused[Color_fg]).get (fg);
1015
970 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1016 (ISSET_PIXCOLOR (Color_pointer_bg)
971 ? pix_colors_focused[Color_pointer_bg] 1017 ? pix_colors_focused[Color_pointer_bg]
972 : pix_colors_focused[Color_bg]; 1018 : pix_colors_focused[Color_bg]).get (bg);
973 1019
974 XQueryColors (display->display, display->cmap, xcol, 2); 1020 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
975 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
976} 1021}
977 1022
978/*----------------------------------------------------------------------*/ 1023/*----------------------------------------------------------------------*/
979/* 1024/*
980 * find if fg/bg matches any of the normal (low-intensity) colors 1025 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1008 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1053 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1009} 1054}
1010 1055
1011/*----------------------------------------------------------------------*/ 1056/*----------------------------------------------------------------------*/
1012 1057
1013int 1058bool
1014rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1059rxvt_term::set_color (rxvt_color &color, const char *name)
1015{ 1060{
1016 if (!screen_in_out->set (display, colour)) 1061 if (color.set (this, name))
1017 {
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1019 return false;
1020 }
1021
1022 return true; 1062 return true;
1063
1064 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1065 return false;
1066}
1067
1068void
1069rxvt_term::alias_color (int dst, int src)
1070{
1071 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1023} 1072}
1024 1073
1025/* -------------------------------------------------------------------- * 1074/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 1075 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 1076 * -------------------------------------------------------------------- */
… …
1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1078rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1030{ 1079{
1031 int fix_screen; 1080 int fix_screen;
1032 int old_width = szHint.width; 1081 int old_width = szHint.width;
1033 int old_height = szHint.height; 1082 int old_height = szHint.height;
1034 dDisp;
1035 1083
1036 window_calc (newwidth, newheight); 1084 window_calc (newwidth, newheight);
1085
1086 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1037 XSetWMNormalHints (disp, parent[0], &szHint); 1087 XSetWMNormalHints (dpy, parent[0], &szHint);
1038 1088
1039 if (!ignoreparent) 1089 if (!ignoreparent)
1040 { 1090 {
1041#ifdef SMART_RESIZE 1091#ifdef SMART_RESIZE
1042 /* 1092 /*
… …
1046 int x, y, x1, y1; 1096 int x, y, x1, y1;
1047 int dx, dy; 1097 int dx, dy;
1048 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1098 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1049 Window unused_cr; 1099 Window unused_cr;
1050 1100
1051 XTranslateCoordinates (disp, parent[0], display->root, 1101 XTranslateCoordinates (dpy, parent[0], display->root,
1052 0, 0, &x, &y, &unused_cr); 1102 0, 0, &x, &y, &unused_cr);
1053 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1103 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1054 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1104 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1055 /* 1105 /*
1056 * if display->root isn't the parent window, a WM will probably have offset 1106 * if display->root isn't the parent window, a WM will probably have offset
1057 * our position for handles and decorations. Counter it 1107 * our position for handles and decorations. Counter it
1058 */ 1108 */
… …
1060 { 1110 {
1061 x -= x1; 1111 x -= x1;
1062 y -= y1; 1112 y -= y1;
1063 } 1113 }
1064 1114
1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1115 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1116 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1067 dx = old_width - szHint.width; 1117 dx = old_width - szHint.width;
1068 dy = old_height - szHint.height; 1118 dy = old_height - szHint.height;
1069 1119
1070 /* Check position of the center of the window */ 1120 /* Check position of the center of the window */
1071 if (x < x1) /* left half */ 1121 if (x < x1) /* left half */
… …
1075 if (y < y1) /* top half */ 1125 if (y < y1) /* top half */
1076 dy = 0; 1126 dy = 0;
1077 else if (y == y1) /* exact center */ 1127 else if (y == y1) /* exact center */
1078 dy /= 2; 1128 dy /= 2;
1079 1129
1080 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1130 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1081 szHint.width, szHint.height); 1131 szHint.width, szHint.height);
1082#else 1132#else
1083 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1133 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1084#endif 1134#endif
1085 } 1135 }
1086 1136
1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1137 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1088 1138
1089 if (fix_screen || newwidth != old_width || newheight != old_height) 1139 if (fix_screen || newwidth != old_width || newheight != old_height)
1090 { 1140 {
1091 if (scrollBar.state) 1141 if (scrollBar.state)
1092 { 1142 {
1093 XMoveResizeWindow (disp, scrollBar.win, 1143 XMoveResizeWindow (dpy, scrollBar.win,
1094 window_sb_x, 0, 1144 window_sb_x, 0,
1095 scrollbar_TotalWidth (), szHint.height); 1145 scrollbar_TotalWidth (), szHint.height);
1096 resize_scrollbar (); 1146 resize_scrollbar ();
1097 } 1147 }
1098 1148
1099 XMoveResizeWindow (disp, vt, 1149 XMoveResizeWindow (dpy, vt,
1100 window_vt_x, window_vt_y, 1150 window_vt_x, window_vt_y,
1101 width, height); 1151 width, height);
1102 1152
1153#ifdef XPM_BACKGROUND
1154 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1155 if (bgPixmap.window_size_sensitive ())
1156 update_background ();
1157#endif
1158
1103 scr_clear (); 1159 scr_clear ();
1104#ifdef XPM_BACKGROUND
1105 resize_pixmap ();
1106#endif
1107 } 1160 }
1108 1161
1109 if (fix_screen || old_height == 0) 1162 if (fix_screen || old_height == 0)
1110 scr_reset (); 1163 scr_reset ();
1111 1164
1112#ifdef XPM_BACKGROUND 1165 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1113 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)
1114 scr_touch (false); 1171// scr_touch (false);
1115#endif 1172#endif
1116 1173
1117#ifdef USE_XIM 1174#ifdef USE_XIM
1118 IMSetStatusPosition (); 1175 IMSetPosition ();
1119#endif 1176#endif
1120} 1177}
1121 1178
1122/* 1179/*
1123 * 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.
… …
1128{ 1185{
1129 XWindowAttributes wattr; 1186 XWindowAttributes wattr;
1130 1187
1131 if (newwidth == 0 || newheight == 0) 1188 if (newwidth == 0 || newheight == 0)
1132 { 1189 {
1133 XGetWindowAttributes (display->display, display->root, &wattr); 1190 XGetWindowAttributes (dpy, display->root, &wattr);
1134 1191
1135 if (newwidth == 0) 1192 if (newwidth == 0)
1136 newwidth = wattr.width - szHint.base_width; 1193 newwidth = wattr.width - szHint.base_width;
1137 if (newheight == 0) 1194 if (newheight == 0)
1138 newheight = wattr.height - szHint.base_height; 1195 newheight = wattr.height - szHint.base_height;
… …
1152#ifdef USE_XIM 1209#ifdef USE_XIM
1153 1210
1154void 1211void
1155rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1212rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1156{ 1213{
1157 fg = pix_colors[Color_fg]; 1214 fg = pix_colors [Color_fg];
1158 bg = pix_colors[Color_bg]; 1215 bg = pix_colors [Color_bg];
1159} 1216}
1160 1217
1161void 1218void
1162rxvt_term::im_set_size (XRectangle &size) 1219rxvt_term::im_set_size (XRectangle &size)
1163{ 1220{
… …
1200 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1257 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1201 1258
1202 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1259 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1203 *p = '\0'; 1260 *p = '\0';
1204 1261
1205 atom = XInternAtom (display->display, server, False); 1262 atom = XInternAtom (dpy, server, False);
1206 win = XGetSelectionOwner (display->display, atom); 1263 win = XGetSelectionOwner (dpy, atom);
1207 1264
1208 if (win != None) 1265 if (win != None)
1209 return True; 1266 return True;
1210 } 1267 }
1211 1268
… …
1435 "*", 1492 "*",
1436 fheight, 1493 fheight,
1437 fheight + 1, fheight - 1, 1494 fheight + 1, fheight - 1,
1438 fheight - 2, fheight + 2); 1495 fheight - 2, fheight + 2);
1439 1496
1440 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1497 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1441 &missing_charset_list, &missing_charset_count, &def_string); 1498 &missing_charset_list, &missing_charset_count, &def_string);
1442 1499
1443 if (missing_charset_list) 1500 if (missing_charset_list)
1444 XFreeStringList (missing_charset_list); 1501 XFreeStringList (missing_charset_list);
1445 1502
… …
1486 XNBackground, bg, 1543 XNBackground, bg,
1487 XNArea, &status_rect, 1544 XNArea, &status_rect,
1488 XNFontSet, fs, 1545 XNFontSet, fs,
1489 NULL); 1546 NULL);
1490 } 1547 }
1548#if ENABLE_XIM_ONTHESPOT
1491 else if (input_style & XIMPreeditCallbacks) 1549 else if (input_style & XIMPreeditCallbacks)
1492 { 1550 {
1493 im_set_position (spot); 1551 im_set_position (spot);
1494 1552
1495 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1553 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1496 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1554 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1497 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1555 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1498#if 0 1556# if 0
1499 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1557 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1500#endif 1558# endif
1501 1559
1502 preedit_attr = XVaCreateNestedList (0, 1560 preedit_attr = XVaCreateNestedList (0,
1503 XNSpotLocation, &spot, 1561 XNSpotLocation, &spot,
1504 XNPreeditStartCallback, &xcb[0], 1562 XNPreeditStartCallback, &xcb[0],
1505 XNPreeditDoneCallback , &xcb[1], 1563 XNPreeditDoneCallback , &xcb[1],
1506 XNPreeditDrawCallback , &xcb[2], 1564 XNPreeditDrawCallback , &xcb[2],
1507#if 0 1565# if 0
1508 XNPreeditCaretCallback, &xcb[3], 1566 XNPreeditCaretCallback, &xcb[3],
1509#endif 1567# endif
1510 NULL); 1568 NULL);
1511 } 1569 }
1570#endif
1512 1571
1513 Input_Context = XCreateIC (xim, 1572 Input_Context = XCreateIC (xim,
1514 XNInputStyle, input_style, 1573 XNInputStyle, input_style,
1515 XNClientWindow, vt, 1574 XNClientWindow, vt,
1516 XNFocusWindow, parent[0], 1575 XNFocusWindow, parent[0],
… …
1518 preedit_attr, 1577 preedit_attr,
1519 status_attr ? XNStatusAttributes : NULL, 1578 status_attr ? XNStatusAttributes : NULL,
1520 status_attr, NULL); 1579 status_attr, NULL);
1521 1580
1522 if (preedit_attr) XFree (preedit_attr); 1581 if (preedit_attr) XFree (preedit_attr);
1523 if (status_attr) XFree (status_attr); 1582 if (status_attr) XFree (status_attr);
1524 if (fs) XFreeFontSet (display->display, fs); 1583 if (fs) XFreeFontSet (dpy, fs);
1525 1584
1526 if (Input_Context == NULL) 1585 if (Input_Context == NULL)
1527 { 1586 {
1528 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1587 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1529 im_destroy (); 1588 im_destroy ();
… …
1534 // unfortunately, only the focus window is used by XIM, hard to fix 1593 // unfortunately, only the focus window is used by XIM, hard to fix
1535 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1594 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1536 vt_select_input (); 1595 vt_select_input ();
1537#endif 1596#endif
1538 1597
1539 if (input_style & XIMPreeditArea)
1540 IMSetStatusPosition (); 1598 IMSetPosition ();
1541 1599
1542 return true; 1600 return true;
1543} 1601}
1544 1602
1545void 1603void
… …
1603 SET_LOCALE (locale); 1661 SET_LOCALE (locale);
1604#endif 1662#endif
1605} 1663}
1606 1664
1607void 1665void
1608rxvt_term::IMSetStatusPosition () 1666rxvt_term::IMSetPosition ()
1609{ 1667{
1610 XRectangle preedit_rect, status_rect, *needed_rect; 1668 XRectangle preedit_rect, status_rect, *needed_rect;
1611 XVaNestedList preedit_attr, status_attr; 1669 XVaNestedList preedit_attr, status_attr;
1612 1670
1613 if (!Input_Context 1671 if (!Input_Context
1614 || !focus 1672 || !focus
1615 || !(input_style & XIMPreeditArea) 1673 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1616 || !IMisRunning ()) 1674 || !IMisRunning ())
1617 return; 1675 return;
1618 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 {
1619 /* Getting the necessary width of preedit area */ 1687 /* Getting the necessary width of preedit area */
1620 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1688 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1621 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1689 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1622 XFree (status_attr); 1690 XFree (status_attr);
1623 1691
1624 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1692 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1625 XFree (needed_rect); 1693 XFree (needed_rect);
1626 1694
1627 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1695 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1628 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1696 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1629 1697
1630 XSetICValues (Input_Context, 1698 XSetICValues (Input_Context,
1631 XNPreeditAttributes, preedit_attr, 1699 XNPreeditAttributes, preedit_attr,
1632 XNStatusAttributes, status_attr, NULL); 1700 XNStatusAttributes, status_attr,
1701 NULL);
1633 1702
1703 XFree (status_attr);
1704 }
1705
1634 XFree (preedit_attr); 1706 XFree (preedit_attr);
1635 XFree (status_attr);
1636} 1707}
1637#endif /* USE_XIM */ 1708#endif /* USE_XIM */
1638 1709
1639/*----------------------- end-of-file (C source) -----------------------*/ 1710/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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