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.210 by root, Tue Jan 31 16:19:16 2006 UTC vs.
Revision 1.240 by sasha, Fri Aug 10 22:10:36 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 ENABLE_TRANSPARENCY
157 check_our_parents_ev(this, &rxvt_term::check_our_parents_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{
… …
222 231
223#ifdef USE_XIM 232#ifdef USE_XIM
224 im_destroy (); 233 im_destroy ();
225#endif 234#endif
226#ifdef XTERM_SCROLLBAR 235#ifdef XTERM_SCROLLBAR
227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC); 236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
228 if (ShadowGC) XFreeGC (xdisp, ShadowGC); 237 if (ShadowGC) XFreeGC (dpy, ShadowGC);
229#endif 238#endif
230#ifdef PLAIN_SCROLLBAR 239#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC); 240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
232#endif 241#endif
233#ifdef NEXT_SCROLLBAR 242#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (xdisp, blackGC); 243 if (blackGC) XFreeGC (dpy, blackGC);
235 if (whiteGC) XFreeGC (xdisp, whiteGC); 244 if (whiteGC) XFreeGC (dpy, whiteGC);
236 if (grayGC) XFreeGC (xdisp, grayGC); 245 if (grayGC) XFreeGC (dpy, grayGC);
237 if (darkGC) XFreeGC (xdisp, darkGC); 246 if (darkGC) XFreeGC (dpy, darkGC);
238 if (stippleGC) XFreeGC (xdisp, stippleGC); 247 if (stippleGC) XFreeGC (dpy, stippleGC);
239 if (dimple) XFreePixmap (xdisp, dimple); 248 if (dimple) XFreePixmap (dpy, dimple);
240 if (upArrow) XFreePixmap (xdisp, upArrow); 249 if (upArrow) XFreePixmap (dpy, upArrow);
241 if (downArrow) XFreePixmap (xdisp, downArrow); 250 if (downArrow) XFreePixmap (dpy, downArrow);
242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi); 251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi); 252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
244#endif 253#endif
245#ifdef RXVT_SCROLLBAR 254#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (xdisp, topShadowGC); 255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
247 if (botShadowGC) XFreeGC (xdisp, botShadowGC); 256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC); 257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
249#endif 258#endif
250 if (gc) XFreeGC (xdisp, gc); 259 if (gc) XFreeGC (dpy, gc);
251 260
252 delete drawable; 261 delete drawable;
253 // destroy all windows 262 // destroy all windows
254 if (parent[0]) 263 if (parent[0])
255 XDestroyWindow (xdisp, parent[0]); 264 XDestroyWindow (dpy, parent[0]);
265
266 for (int i = 0; i < TOTAL_COLORS; i++)
267 if (ISSET_PIXCOLOR (i))
268 {
269 pix_colors_focused [i].free (this);
270#if OFF_FOCUS_FADING
271 pix_colors_unfocused [i].free (this);
272#endif
273 }
256 274
257 clear (); 275 clear ();
258 } 276 }
259 277
260 // TODO: free pixcolours, colours should become part of rxvt_display
261 delete pix_colors_focused; 278 delete [] pix_colors_focused;
262#if OFF_FOCUS_FADING 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);
… …
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
… …
480 init_xlocale (); 497 init_xlocale ();
481 498
482 scr_reset (); // initialize screen 499 scr_reset (); // initialize screen
483 500
484#if 0 501#if 0
485 XSynchronize (xdisp, True); 502 XSynchronize (dpy, True);
486#endif 503#endif
487 504
488#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
489 if (OPTION (Opt_scrollBar)) 506 if (option (Opt_scrollBar))
490 resize_scrollbar (); /* create and map scrollbar */ 507 resize_scrollbar (); /* create and map scrollbar */
491#endif 508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bool changed = false;
512 bgPixmap.set_target (this);
513
492#ifdef TRANSPARENT 514#ifdef ENABLE_TRANSPARENCY
493 if (OPTION (Opt_transparent)) 515 if (option (Opt_transparent))
494 { 516 {
517 bgPixmap.set_transparent ();
518#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif
522 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]);
526 changed = true;
527
528 bgPixmap.set_root_pixmap ();
495 XSelectInput (xdisp, display->root, PropertyChangeMask); 529 XSelectInput (dpy, display->root, PropertyChangeMask);
496 check_our_parents ();
497 rootwin_ev.start (display, display->root); 530 rootwin_ev.start (display, display->root);
498 } 531 }
532#endif
533
534#ifdef XPM_BACKGROUND
535 if (rs[Rs_backgroundPixmap] != NULL)
536 {
537 const char *p = rs[Rs_backgroundPixmap];
538
539 if ((p = strchr (p, ';')) != NULL)
540 {
541 p++;
542 bgPixmap.set_geometry (p);
543 }
544 else
545 bgPixmap.set_defaultGeometry ();
546
547 changed = bgPixmap.set_file (rs[Rs_backgroundPixmap]);
548 }
549#endif
550 if (changed)
551 {
552 bgPixmap.render_background ();
553 scr_touch (true);
554 }
555 }
556#endif
557
558#if ENABLE_PERL
559 rootwin_ev.start (display, display->root);
499#endif 560#endif
500 561
501 set_colorfgbg (); 562 set_colorfgbg ();
502 563
503 init_command (cmd_argv); 564 init_command (cmd_argv);
… …
514#if ENABLE_XEMBED 575#if ENABLE_XEMBED
515 if (rs[Rs_embed]) 576 if (rs[Rs_embed])
516 { 577 {
517 long info[2] = { 0, XEMBED_MAPPED }; 578 long info[2] = { 0, XEMBED_MAPPED };
518 579
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 580 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2); 581 32, PropModeReplace, (unsigned char *)&info, 2);
521 } 582 }
522#endif 583#endif
523 584
524 XMapWindow (xdisp, vt); 585 XMapWindow (dpy, vt);
525 XMapWindow (xdisp, parent[0]); 586 XMapWindow (dpy, parent[0]);
526 587
527 return true; 588 return true;
528} 589}
529 590
530static struct sig_handlers 591static struct sig_handlers
… …
610 return p; 671 return p;
611} 672}
612 673
613/*----------------------------------------------------------------------*/ 674/*----------------------------------------------------------------------*/
614/* 675/*
615 * window size/position calculcations for XSizeHint and other storage. 676 * window size/position calculations for XSizeHint and other storage.
616 * if width/height are non-zero then override calculated width/height 677 * if width/height are non-zero then override calculated width/height
617 */ 678 */
618void 679void
619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 680rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
620{ 681{
… …
691 752
692 if (scrollBar.state) 753 if (scrollBar.state)
693 { 754 {
694 sb_w = scrollbar_TotalWidth (); 755 sb_w = scrollbar_TotalWidth ();
695 szHint.base_width += sb_w; 756 szHint.base_width += sb_w;
757
696 if (!OPTION (Opt_scrollBar_right)) 758 if (!option (Opt_scrollBar_right))
697 window_vt_x += sb_w; 759 window_vt_x += sb_w;
698 } 760 }
699 761
700 szHint.width_inc = fwidth; 762 szHint.width_inc = fwidth;
701 szHint.height_inc = fheight; 763 szHint.height_inc = fheight;
702 szHint.min_width = szHint.base_width + szHint.width_inc; 764 szHint.min_width = szHint.base_width + szHint.width_inc;
703 szHint.min_height = szHint.base_height + szHint.height_inc; 765 szHint.min_height = szHint.base_height + szHint.height_inc;
704 766
705 if (newwidth && newwidth - szHint.base_width < max_width) 767 if (newwidth && newwidth - szHint.base_width < max_width)
706 { 768 {
707 szHint.width = newwidth; 769 szHint.width = newwidth;
… …
722 { 784 {
723 min_it (height, max_height); 785 min_it (height, max_height);
724 szHint.height = szHint.base_height + height; 786 szHint.height = szHint.base_height + height;
725 } 787 }
726 788
727 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 789 if (scrollBar.state && option (Opt_scrollBar_right))
728 window_sb_x = szHint.width - sb_w; 790 window_sb_x = szHint.width - sb_w;
729 791
730 if (recalc_x) 792 if (recalc_x)
731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 793 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
732 794
733 if (recalc_y) 795 if (recalc_y)
734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 796 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
735 797
736 ncol = width / fwidth; 798 ncol = width / fwidth;
737 nrow = height / fheight; 799 nrow = height / fheight;
738} 800}
739 801
… …
794 delete fontset[0]; 856 delete fontset[0];
795 fontset[0] = fs; 857 fontset[0] = fs;
796 858
797 prop = (*fs)[1]->properties (); 859 prop = (*fs)[1]->properties ();
798 prop.height += lineSpace; 860 prop.height += lineSpace;
861
799 fs->set_prop (prop); 862 fs->set_prop (prop, false);
800 863
801 fwidth = prop.width; 864 fwidth = prop.width;
802 fheight = prop.height; 865 fheight = prop.height;
803 fbase = prop.ascent; 866 fbase = prop.ascent;
804 867
… …
813 { 876 {
814 fontset[style] = fs = new rxvt_fontset (this); 877 fontset[style] = fs = new rxvt_fontset (this);
815 rxvt_fontprop prop2 = prop; 878 rxvt_fontprop prop2 = prop;
816 879
817 if (res) 880 if (res)
818 prop2.weight = prop2.slant = rxvt_fontprop::unset; 881 {
882 fs->populate (res);
883 fs->set_prop (prop2, false);
884 }
819 else 885 else
820 { 886 {
821 res = fontset[0]->fontdesc; 887 fs->populate (fontset[0]->fontdesc);
822 888
823 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 889 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
824 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 890 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
891
892 fs->set_prop (prop2, true);
825 } 893 }
826 894
827 fs->populate (res);
828 fs->set_prop (prop2);
829 } 895 }
830#else 896#else
831 fontset[style] = fontset[0]; 897 fontset[style] = fontset[0];
832#endif 898#endif
833 } 899 }
… …
842 return true; 908 return true;
843} 909}
844 910
845void rxvt_term::set_string_property (Atom prop, const char *str, int len) 911void rxvt_term::set_string_property (Atom prop, const char *str, int len)
846{ 912{
847 XChangeProperty (xdisp, parent[0], 913 XChangeProperty (dpy, parent[0],
848 prop, XA_STRING, 8, PropModeReplace, 914 prop, XA_STRING, 8, PropModeReplace,
849 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 915 (const unsigned char *)str, len >= 0 ? len : strlen (str));
850} 916}
851 917
852void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 918void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
853{ 919{
854 wchar_t *ws = rxvt_mbstowcs (str, len); 920 wchar_t *ws = rxvt_mbstowcs (str, len);
855 char *s = rxvt_wcstoutf8 (ws); 921 char *s = rxvt_wcstoutf8 (ws);
856 922
857 XChangeProperty (xdisp, parent[0], 923 XChangeProperty (dpy, parent[0],
858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 924 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
859 (const unsigned char *)s, strlen (s)); 925 (const unsigned char *)s, strlen (s));
860 926
861 free (s); 927 free (s);
862 free (ws); 928 free (ws);
… …
887void 953void
888rxvt_term::set_window_color (int idx, const char *color) 954rxvt_term::set_window_color (int idx, const char *color)
889{ 955{
890 rxvt_color xcol; 956 rxvt_color xcol;
891 int i; 957 int i;
892 958
893 if (color == NULL || *color == '\0') 959 if (color == NULL || *color == '\0')
894 return; 960 return;
961
962 color = strdup (color);
963 allocated.push_back ((void *)color);
964 rs[Rs_color + idx] = color;
895 965
896 /* handle color aliases */ 966 /* handle color aliases */
897 if (isdigit (*color)) 967 if (isdigit (*color))
898 { 968 {
899 i = atoi (color); 969 i = atoi (color);
900 970
901 if (i >= 8 && i <= 15) 971 if (i >= 8 && i <= 15)
902 { /* bright colors */ 972 { /* bright colors */
903 i -= 8; 973 i -= 8;
904 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 974 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
905 SET_PIXCOLOR (idx);
906 goto done; 975 goto done;
907 } 976 }
908 977
909 if (i >= 0 && i <= 7) 978 if (i >= 0 && i <= 7)
910 { /* normal colors */ 979 { /* normal colors */
911 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 980 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
912 SET_PIXCOLOR (idx);
913 goto done; 981 goto done;
914 } 982 }
915 } 983 }
916 984
917 if (!set_color (xcol, color)) 985 set_color (xcol, color);
918 return;
919
920 /* XStoreColor (xdisp, display->cmap, XColor*); */
921 986
922 /* 987 /*
923 * FIXME: should free colors here, but no idea how to do it so instead, 988 * FIXME: should free colors here, but no idea how to do it so instead,
924 * so just keep gobbling up the colormap 989 * so just keep gobbling up the colormap
925 */ 990 */
926# if 0
927 for (i = Color_Black; i <= Color_White; i++)
928 if (pix_colors[idx] == pix_colors[i])
929 break;
930 if (i > Color_White)
931 {
932 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
933 XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
934 DisplayPlanes (xdisp, display->screen));
935 }
936# endif
937 991
938 pix_colors_focused[idx] = xcol; 992 pix_colors_focused[idx] = xcol;
939 SET_PIXCOLOR (idx);
940 993
941 /* XSetWindowAttributes attr; */ 994 /* XSetWindowAttributes attr; */
942 /* Cursor cursor; */ 995 /* Cursor cursor; */
943done: 996done:
944
945#if OFF_FOCUS_FADING
946 if (rs[Rs_fade])
947 {
948 rxvt_rgba c;
949 pix_colors [Color_fade].get (this, c);
950 pix_colors_unfocused [idx] = pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), c);
951 }
952#endif
953
954 /*TODO: handle Color_BD, scrollbar background, etc. */ 997 /*TODO: handle Color_BD, scrollbar background, etc. */
955 998
999 update_fade_color (idx);
956 recolour_cursor (); 1000 recolour_cursor ();
957 scr_recolour (); 1001 scr_recolour ();
958} 1002}
959 1003
960#else 1004#else
… …
962#endif /* XTERM_COLOR_CHANGE */ 1006#endif /* XTERM_COLOR_CHANGE */
963 1007
964void 1008void
965rxvt_term::recolour_cursor () 1009rxvt_term::recolour_cursor ()
966{ 1010{
967 XColor xcol[2]; 1011 XColor fg, bg;
968 1012
969 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1013 (ISSET_PIXCOLOR (Color_pointer_fg)
970 ? pix_colors_focused[Color_pointer_fg] 1014 ? pix_colors_focused[Color_pointer_fg]
971 : pix_colors_focused[Color_fg]; 1015 : pix_colors_focused[Color_fg]).get (fg);
1016
972 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1017 (ISSET_PIXCOLOR (Color_pointer_bg)
973 ? pix_colors_focused[Color_pointer_bg] 1018 ? pix_colors_focused[Color_pointer_bg]
974 : pix_colors_focused[Color_bg]; 1019 : pix_colors_focused[Color_bg]).get (bg);
975 1020
976 XQueryColors (xdisp, cmap, xcol, 2);
977 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); 1021 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
978} 1022}
979 1023
980/*----------------------------------------------------------------------*/ 1024/*----------------------------------------------------------------------*/
981/* 1025/*
982 * 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
… …
1020 1064
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 1065 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1022 return false; 1066 return false;
1023} 1067}
1024 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]);
1073}
1074
1025/* -------------------------------------------------------------------- * 1075/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 1076 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 1077 * -------------------------------------------------------------------- */
1028void 1078void
1029rxvt_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)
… …
1031 int fix_screen; 1081 int fix_screen;
1032 int old_width = szHint.width; 1082 int old_width = szHint.width;
1033 int old_height = szHint.height; 1083 int old_height = szHint.height;
1034 1084
1035 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)))
1036 XSetWMNormalHints (xdisp, parent[0], &szHint); 1088 XSetWMNormalHints (dpy, parent[0], &szHint);
1037 1089
1038 if (!ignoreparent) 1090 if (!ignoreparent)
1039 { 1091 {
1040#ifdef SMART_RESIZE 1092#ifdef SMART_RESIZE
1041 /* 1093 /*
… …
1045 int x, y, x1, y1; 1097 int x, y, x1, y1;
1046 int dx, dy; 1098 int dx, dy;
1047 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1099 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1048 Window unused_cr; 1100 Window unused_cr;
1049 1101
1050 XTranslateCoordinates (xdisp, parent[0], display->root, 1102 XTranslateCoordinates (dpy, parent[0], display->root,
1051 0, 0, &x, &y, &unused_cr); 1103 0, 0, &x, &y, &unused_cr);
1052 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1104 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1053 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1105 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1054 /* 1106 /*
1055 * 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
1056 * our position for handles and decorations. Counter it 1108 * our position for handles and decorations. Counter it
1057 */ 1109 */
… …
1059 { 1111 {
1060 x -= x1; 1112 x -= x1;
1061 y -= y1; 1113 y -= y1;
1062 } 1114 }
1063 1115
1064 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1116 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1065 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1117 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1066 dx = old_width - szHint.width; 1118 dx = old_width - szHint.width;
1067 dy = old_height - szHint.height; 1119 dy = old_height - szHint.height;
1068 1120
1069 /* Check position of the center of the window */ 1121 /* Check position of the center of the window */
1070 if (x < x1) /* left half */ 1122 if (x < x1) /* left half */
… …
1074 if (y < y1) /* top half */ 1126 if (y < y1) /* top half */
1075 dy = 0; 1127 dy = 0;
1076 else if (y == y1) /* exact center */ 1128 else if (y == y1) /* exact center */
1077 dy /= 2; 1129 dy /= 2;
1078 1130
1079 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1131 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1080 szHint.width, szHint.height); 1132 szHint.width, szHint.height);
1081#else 1133#else
1082 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1134 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1083#endif 1135#endif
1084 } 1136 }
1085 1137
1086 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1087 1139
1088 if (fix_screen || newwidth != old_width || newheight != old_height) 1140 if (fix_screen || newwidth != old_width || newheight != old_height)
1089 { 1141 {
1090 if (scrollBar.state) 1142 if (scrollBar.state)
1091 { 1143 {
1092 XMoveResizeWindow (xdisp, scrollBar.win, 1144 XMoveResizeWindow (dpy, scrollBar.win,
1093 window_sb_x, 0, 1145 window_sb_x, 0,
1094 scrollbar_TotalWidth (), szHint.height); 1146 scrollbar_TotalWidth (), szHint.height);
1095 resize_scrollbar (); 1147 resize_scrollbar ();
1096 } 1148 }
1097 1149
1098 XMoveResizeWindow (xdisp, vt, 1150 XMoveResizeWindow (dpy, vt,
1099 window_vt_x, window_vt_y, 1151 window_vt_x, window_vt_y,
1100 width, height); 1152 width, height);
1101 1153
1102 scr_clear (); 1154 scr_clear ();
1103#ifdef XPM_BACKGROUND 1155#ifdef XPM_BACKGROUND
1104 resize_pixmap (); 1156 /* TODO: should that really be here ? */
1157 bgPixmap.render_background ();
1105#endif 1158#endif
1106 } 1159 }
1107 1160
1108 if (fix_screen || old_height == 0) 1161 if (fix_screen || old_height == 0)
1109 scr_reset (); 1162 scr_reset ();
1110 1163
1111#ifdef XPM_BACKGROUND 1164 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1112 if (pixmap) 1165 //scr_touch (false);
1166
1167#ifdef HAVE_BG_PIXMAP
1168 if (bgPixmap.pixmap)
1113 scr_touch (false); 1169 scr_touch (false);
1114#endif 1170#endif
1115 1171
1116#ifdef USE_XIM 1172#ifdef USE_XIM
1117 IMSetStatusPosition (); 1173 IMSetPosition ();
1118#endif 1174#endif
1119} 1175}
1120 1176
1121/* 1177/*
1122 * Set the width/height of the vt window in characters. Units are pixels. 1178 * Set the width/height of the vt window in characters. Units are pixels.
… …
1127{ 1183{
1128 XWindowAttributes wattr; 1184 XWindowAttributes wattr;
1129 1185
1130 if (newwidth == 0 || newheight == 0) 1186 if (newwidth == 0 || newheight == 0)
1131 { 1187 {
1132 XGetWindowAttributes (xdisp, display->root, &wattr); 1188 XGetWindowAttributes (dpy, display->root, &wattr);
1133 1189
1134 if (newwidth == 0) 1190 if (newwidth == 0)
1135 newwidth = wattr.width - szHint.base_width; 1191 newwidth = wattr.width - szHint.base_width;
1136 if (newheight == 0) 1192 if (newheight == 0)
1137 newheight = wattr.height - szHint.base_height; 1193 newheight = wattr.height - szHint.base_height;
… …
1151#ifdef USE_XIM 1207#ifdef USE_XIM
1152 1208
1153void 1209void
1154rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1210rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1155{ 1211{
1156 fg = pix_colors[Color_fg]; 1212 fg = pix_colors [Color_fg];
1157 bg = pix_colors[Color_bg]; 1213 bg = pix_colors [Color_bg];
1158} 1214}
1159 1215
1160void 1216void
1161rxvt_term::im_set_size (XRectangle &size) 1217rxvt_term::im_set_size (XRectangle &size)
1162{ 1218{
… …
1199 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1255 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1200 1256
1201 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1257 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1202 *p = '\0'; 1258 *p = '\0';
1203 1259
1204 atom = XInternAtom (xdisp, server, False); 1260 atom = XInternAtom (dpy, server, False);
1205 win = XGetSelectionOwner (xdisp, atom); 1261 win = XGetSelectionOwner (dpy, atom);
1206 1262
1207 if (win != None) 1263 if (win != None)
1208 return True; 1264 return True;
1209 } 1265 }
1210 1266
… …
1434 "*", 1490 "*",
1435 fheight, 1491 fheight,
1436 fheight + 1, fheight - 1, 1492 fheight + 1, fheight - 1,
1437 fheight - 2, fheight + 2); 1493 fheight - 2, fheight + 2);
1438 1494
1439 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1495 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1440 &missing_charset_list, &missing_charset_count, &def_string); 1496 &missing_charset_list, &missing_charset_count, &def_string);
1441 1497
1442 if (missing_charset_list) 1498 if (missing_charset_list)
1443 XFreeStringList (missing_charset_list); 1499 XFreeStringList (missing_charset_list);
1444 1500
… …
1519 preedit_attr, 1575 preedit_attr,
1520 status_attr ? XNStatusAttributes : NULL, 1576 status_attr ? XNStatusAttributes : NULL,
1521 status_attr, NULL); 1577 status_attr, NULL);
1522 1578
1523 if (preedit_attr) XFree (preedit_attr); 1579 if (preedit_attr) XFree (preedit_attr);
1524 if (status_attr) XFree (status_attr); 1580 if (status_attr) XFree (status_attr);
1525 if (fs) XFreeFontSet (xdisp, fs); 1581 if (fs) XFreeFontSet (dpy, fs);
1526 1582
1527 if (Input_Context == NULL) 1583 if (Input_Context == NULL)
1528 { 1584 {
1529 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1585 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1530 im_destroy (); 1586 im_destroy ();
… …
1535 // unfortunately, only the focus window is used by XIM, hard to fix 1591 // unfortunately, only the focus window is used by XIM, hard to fix
1536 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1592 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1537 vt_select_input (); 1593 vt_select_input ();
1538#endif 1594#endif
1539 1595
1540 if (input_style & XIMPreeditArea)
1541 IMSetStatusPosition (); 1596 IMSetPosition ();
1542 1597
1543 return true; 1598 return true;
1544} 1599}
1545 1600
1546void 1601void
… …
1604 SET_LOCALE (locale); 1659 SET_LOCALE (locale);
1605#endif 1660#endif
1606} 1661}
1607 1662
1608void 1663void
1609rxvt_term::IMSetStatusPosition () 1664rxvt_term::IMSetPosition ()
1610{ 1665{
1611 XRectangle preedit_rect, status_rect, *needed_rect; 1666 XRectangle preedit_rect, status_rect, *needed_rect;
1612 XVaNestedList preedit_attr, status_attr; 1667 XVaNestedList preedit_attr, status_attr;
1613 1668
1614 if (!Input_Context 1669 if (!Input_Context
1615 || !focus 1670 || !focus
1616 || !(input_style & XIMPreeditArea) 1671 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1617 || !IMisRunning ()) 1672 || !IMisRunning ())
1618 return; 1673 return;
1619 1674
1675 if (input_style & XIMPreeditPosition)
1676 {
1677 im_set_size (preedit_rect);
1678 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1679
1680 XSetICValues (Input_Context,
1681 XNPreeditAttributes, preedit_attr, NULL);
1682 }
1683 else
1684 {
1620 /* Getting the necessary width of preedit area */ 1685 /* Getting the necessary width of preedit area */
1621 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1686 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1622 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1687 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1623 XFree (status_attr); 1688 XFree (status_attr);
1624 1689
1625 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1690 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1626 XFree (needed_rect); 1691 XFree (needed_rect);
1627 1692
1628 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1693 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1629 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1694 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1630 1695
1631 XSetICValues (Input_Context, 1696 XSetICValues (Input_Context,
1632 XNPreeditAttributes, preedit_attr, 1697 XNPreeditAttributes, preedit_attr,
1633 XNStatusAttributes, status_attr, NULL); 1698 XNStatusAttributes, status_attr,
1699 NULL);
1634 1700
1701 XFree (status_attr);
1702 }
1703
1635 XFree (preedit_attr); 1704 XFree (preedit_attr);
1636 XFree (status_attr);
1637} 1705}
1638#endif /* USE_XIM */ 1706#endif /* USE_XIM */
1639 1707
1640/*----------------------- end-of-file (C source) -----------------------*/ 1708/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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