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.216 by root, Wed Feb 1 21:15:33 2006 UTC vs.
Revision 1.244 by sasha, Fri Aug 17 22:01:32 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{
… …
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]);
256 265
257 for (int i = 0; i < TOTAL_COLORS; i++) 266 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i)) 267 if (ISSET_PIXCOLOR (i))
259 { 268 {
260 pix_colors_focused [i].free (this); 269 pix_colors_focused [i].free (this);
… …
264 } 273 }
265 274
266 clear (); 275 clear ();
267 } 276 }
268 277
269 delete pix_colors_focused; 278 delete [] pix_colors_focused;
270#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
271 delete pix_colors_unfocused; 280 delete [] pix_colors_unfocused;
272#endif 281#endif
273 282
274 displays.put (display); 283 displays.put (display);
275 284
276 scr_release (); 285 scr_release ();
… …
301{ 310{
302 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303 312
304 cmd_pid = 0; 313 cmd_pid = 0;
305 314
306 if (!OPTION (Opt_hold)) 315 if (!option (Opt_hold))
307 destroy (); 316 destroy ();
308} 317}
309 318
310void 319void
311rxvt_term::destroy () 320rxvt_term::destroy ()
… …
325 im_ev.stop (display); 334 im_ev.stop (display);
326#endif 335#endif
327#if HAVE_SCROLLBARS 336#if HAVE_SCROLLBARS
328 scrollbar_ev.stop (display); 337 scrollbar_ev.stop (display);
329#endif 338#endif
330#if TRANSPARENT 339#if ENABLE_TRANSPARENCY || ENABLE_PERL
331 rootwin_ev.stop (display); 340 rootwin_ev.stop (display);
332#endif 341#endif
333 incr_ev.stop (); 342 incr_ev.stop ();
334 termwin_ev.stop (display); 343 termwin_ev.stop (display);
335 vt_ev.stop (display); 344 vt_ev.stop (display);
… …
475#ifdef KEYSYM_RESOURCE 484#ifdef KEYSYM_RESOURCE
476 keyboard->register_done (); 485 keyboard->register_done ();
477#endif 486#endif
478 487
479#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
480 if (OPTION (Opt_scrollBar)) 489 if (option (Opt_scrollBar))
481 scrollBar.setIdle (); /* set existence for size calculations */ 490 scrollBar.setIdle (); /* set existence for size calculations */
482#endif 491#endif
483 492
484 pty = ptytty::create (); 493 pty = ptytty::create ();
485 494
… …
488 init_xlocale (); 497 init_xlocale ();
489 498
490 scr_reset (); // initialize screen 499 scr_reset (); // initialize screen
491 500
492#if 0 501#if 0
493 XSynchronize (xdisp, True); 502 XSynchronize (dpy, True);
494#endif 503#endif
495 504
496#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar)) 506 if (option (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */ 507 resize_scrollbar (); /* create and map scrollbar */
499#endif 508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bgPixmap.set_target (this);
512
500#ifdef TRANSPARENT 513#ifdef ENABLE_TRANSPARENCY
501 if (OPTION (Opt_transparent)) 514 if (option (Opt_transparent))
502 { 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 ();
503 XSelectInput (xdisp, display->root, PropertyChangeMask); 527 XSelectInput (dpy, display->root, PropertyChangeMask);
504 check_our_parents ();
505 rootwin_ev.start (display, display->root); 528 rootwin_ev.start (display, display->root);
506 } 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);
507#endif 559#endif
508 560
509 set_colorfgbg (); 561 set_colorfgbg ();
510 562
511 init_command (cmd_argv); 563 init_command (cmd_argv);
… …
522#if ENABLE_XEMBED 574#if ENABLE_XEMBED
523 if (rs[Rs_embed]) 575 if (rs[Rs_embed])
524 { 576 {
525 long info[2] = { 0, XEMBED_MAPPED }; 577 long info[2] = { 0, XEMBED_MAPPED };
526 578
527 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 579 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528 32, PropModeReplace, (unsigned char *)&info, 2); 580 32, PropModeReplace, (unsigned char *)&info, 2);
529 } 581 }
530#endif 582#endif
531 583
532 XMapWindow (xdisp, vt); 584 XMapWindow (dpy, vt);
533 XMapWindow (xdisp, parent[0]); 585 XMapWindow (dpy, parent[0]);
534 586
535 return true; 587 return true;
536} 588}
537 589
538static struct sig_handlers 590static struct sig_handlers
… …
618 return p; 670 return p;
619} 671}
620 672
621/*----------------------------------------------------------------------*/ 673/*----------------------------------------------------------------------*/
622/* 674/*
623 * window size/position calculcations for XSizeHint and other storage. 675 * window size/position calculations for XSizeHint and other storage.
624 * if width/height are non-zero then override calculated width/height 676 * if width/height are non-zero then override calculated width/height
625 */ 677 */
626void 678void
627rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 679rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
628{ 680{
… …
700 if (scrollBar.state) 752 if (scrollBar.state)
701 { 753 {
702 sb_w = scrollbar_TotalWidth (); 754 sb_w = scrollbar_TotalWidth ();
703 szHint.base_width += sb_w; 755 szHint.base_width += sb_w;
704 756
705 if (!OPTION (Opt_scrollBar_right)) 757 if (!option (Opt_scrollBar_right))
706 window_vt_x += sb_w; 758 window_vt_x += sb_w;
707 } 759 }
708 760
709 szHint.width_inc = fwidth; 761 szHint.width_inc = fwidth;
710 szHint.height_inc = fheight; 762 szHint.height_inc = fheight;
711 szHint.min_width = szHint.base_width + szHint.width_inc; 763 szHint.min_width = szHint.base_width + szHint.width_inc;
712 szHint.min_height = szHint.base_height + szHint.height_inc; 764 szHint.min_height = szHint.base_height + szHint.height_inc;
713 765
714 if (newwidth && newwidth - szHint.base_width < max_width) 766 if (newwidth && newwidth - szHint.base_width < max_width)
715 { 767 {
716 szHint.width = newwidth; 768 szHint.width = newwidth;
… …
731 { 783 {
732 min_it (height, max_height); 784 min_it (height, max_height);
733 szHint.height = szHint.base_height + height; 785 szHint.height = szHint.base_height + height;
734 } 786 }
735 787
736 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 788 if (scrollBar.state && option (Opt_scrollBar_right))
737 window_sb_x = szHint.width - sb_w; 789 window_sb_x = szHint.width - sb_w;
738 790
739 if (recalc_x) 791 if (recalc_x)
740 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 792 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741 793
742 if (recalc_y) 794 if (recalc_y)
743 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 795 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
744 796
745 ncol = width / fwidth; 797 ncol = width / fwidth;
746 nrow = height / fheight; 798 nrow = height / fheight;
747} 799}
748 800
… …
803 delete fontset[0]; 855 delete fontset[0];
804 fontset[0] = fs; 856 fontset[0] = fs;
805 857
806 prop = (*fs)[1]->properties (); 858 prop = (*fs)[1]->properties ();
807 prop.height += lineSpace; 859 prop.height += lineSpace;
860
808 fs->set_prop (prop); 861 fs->set_prop (prop, false);
809 862
810 fwidth = prop.width; 863 fwidth = prop.width;
811 fheight = prop.height; 864 fheight = prop.height;
812 fbase = prop.ascent; 865 fbase = prop.ascent;
813 866
… …
822 { 875 {
823 fontset[style] = fs = new rxvt_fontset (this); 876 fontset[style] = fs = new rxvt_fontset (this);
824 rxvt_fontprop prop2 = prop; 877 rxvt_fontprop prop2 = prop;
825 878
826 if (res) 879 if (res)
827 prop2.weight = prop2.slant = rxvt_fontprop::unset; 880 {
881 fs->populate (res);
882 fs->set_prop (prop2, false);
883 }
828 else 884 else
829 { 885 {
830 res = fontset[0]->fontdesc; 886 fs->populate (fontset[0]->fontdesc);
831 887
832 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;
833 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);
834 } 892 }
835 893
836 fs->populate (res);
837 fs->set_prop (prop2);
838 } 894 }
839#else 895#else
840 fontset[style] = fontset[0]; 896 fontset[style] = fontset[0];
841#endif 897#endif
842 } 898 }
… …
851 return true; 907 return true;
852} 908}
853 909
854void 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)
855{ 911{
856 XChangeProperty (xdisp, parent[0], 912 XChangeProperty (dpy, parent[0],
857 prop, XA_STRING, 8, PropModeReplace, 913 prop, XA_STRING, 8, PropModeReplace,
858 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 914 (const unsigned char *)str, len >= 0 ? len : strlen (str));
859} 915}
860 916
861void 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)
862{ 918{
863 wchar_t *ws = rxvt_mbstowcs (str, len); 919 wchar_t *ws = rxvt_mbstowcs (str, len);
864 char *s = rxvt_wcstoutf8 (ws); 920 char *s = rxvt_wcstoutf8 (ws);
865 921
866 XChangeProperty (xdisp, parent[0], 922 XChangeProperty (dpy, parent[0],
867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 923 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
868 (const unsigned char *)s, strlen (s)); 924 (const unsigned char *)s, strlen (s));
869 925
870 free (s); 926 free (s);
871 free (ws); 927 free (ws);
… …
935 pix_colors_focused[idx] = xcol; 991 pix_colors_focused[idx] = xcol;
936 992
937 /* XSetWindowAttributes attr; */ 993 /* XSetWindowAttributes attr; */
938 /* Cursor cursor; */ 994 /* Cursor cursor; */
939done: 995done:
940
941#if OFF_FOCUS_FADING
942 if (rs[Rs_fade])
943 {
944 rgba c;
945 pix_colors [Color_fade].get (c);
946 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
947 }
948#endif
949
950 /*TODO: handle Color_BD, scrollbar background, etc. */ 996 /*TODO: handle Color_BD, scrollbar background, etc. */
951 997
998 update_fade_color (idx);
952 recolour_cursor (); 999 recolour_cursor ();
953 scr_recolour (); 1000 scr_recolour ();
954} 1001}
955 1002
956#else 1003#else
… …
968 1015
969 (ISSET_PIXCOLOR (Color_pointer_bg) 1016 (ISSET_PIXCOLOR (Color_pointer_bg)
970 ? pix_colors_focused[Color_pointer_bg] 1017 ? pix_colors_focused[Color_pointer_bg]
971 : pix_colors_focused[Color_bg]).get (bg); 1018 : pix_colors_focused[Color_bg]).get (bg);
972 1019
973 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg); 1020 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
974} 1021}
975 1022
976/*----------------------------------------------------------------------*/ 1023/*----------------------------------------------------------------------*/
977/* 1024/*
978 * 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
… …
1033 int fix_screen; 1080 int fix_screen;
1034 int old_width = szHint.width; 1081 int old_width = szHint.width;
1035 int old_height = szHint.height; 1082 int old_height = szHint.height;
1036 1083
1037 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)))
1038 XSetWMNormalHints (xdisp, parent[0], &szHint); 1087 XSetWMNormalHints (dpy, parent[0], &szHint);
1039 1088
1040 if (!ignoreparent) 1089 if (!ignoreparent)
1041 { 1090 {
1042#ifdef SMART_RESIZE 1091#ifdef SMART_RESIZE
1043 /* 1092 /*
… …
1047 int x, y, x1, y1; 1096 int x, y, x1, y1;
1048 int dx, dy; 1097 int dx, dy;
1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1098 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1050 Window unused_cr; 1099 Window unused_cr;
1051 1100
1052 XTranslateCoordinates (xdisp, parent[0], display->root, 1101 XTranslateCoordinates (dpy, parent[0], display->root,
1053 0, 0, &x, &y, &unused_cr); 1102 0, 0, &x, &y, &unused_cr);
1054 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1103 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1104 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1056 /* 1105 /*
1057 * 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
1058 * our position for handles and decorations. Counter it 1107 * our position for handles and decorations. Counter it
1059 */ 1108 */
… …
1061 { 1110 {
1062 x -= x1; 1111 x -= x1;
1063 y -= y1; 1112 y -= y1;
1064 } 1113 }
1065 1114
1066 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1115 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1067 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1116 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1068 dx = old_width - szHint.width; 1117 dx = old_width - szHint.width;
1069 dy = old_height - szHint.height; 1118 dy = old_height - szHint.height;
1070 1119
1071 /* Check position of the center of the window */ 1120 /* Check position of the center of the window */
1072 if (x < x1) /* left half */ 1121 if (x < x1) /* left half */
… …
1076 if (y < y1) /* top half */ 1125 if (y < y1) /* top half */
1077 dy = 0; 1126 dy = 0;
1078 else if (y == y1) /* exact center */ 1127 else if (y == y1) /* exact center */
1079 dy /= 2; 1128 dy /= 2;
1080 1129
1081 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1130 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1082 szHint.width, szHint.height); 1131 szHint.width, szHint.height);
1083#else 1132#else
1084 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1133 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1085#endif 1134#endif
1086 } 1135 }
1087 1136
1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1137 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1089 1138
1090 if (fix_screen || newwidth != old_width || newheight != old_height) 1139 if (fix_screen || newwidth != old_width || newheight != old_height)
1091 { 1140 {
1092 if (scrollBar.state) 1141 if (scrollBar.state)
1093 { 1142 {
1094 XMoveResizeWindow (xdisp, scrollBar.win, 1143 XMoveResizeWindow (dpy, scrollBar.win,
1095 window_sb_x, 0, 1144 window_sb_x, 0,
1096 scrollbar_TotalWidth (), szHint.height); 1145 scrollbar_TotalWidth (), szHint.height);
1097 resize_scrollbar (); 1146 resize_scrollbar ();
1098 } 1147 }
1099 1148
1100 XMoveResizeWindow (xdisp, vt, 1149 XMoveResizeWindow (dpy, vt,
1101 window_vt_x, window_vt_y, 1150 window_vt_x, window_vt_y,
1102 width, height); 1151 width, height);
1103 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
1104 scr_clear (); 1159 scr_clear ();
1105#ifdef XPM_BACKGROUND
1106 resize_pixmap ();
1107#endif
1108 } 1160 }
1109 1161
1110 if (fix_screen || old_height == 0) 1162 if (fix_screen || old_height == 0)
1111 scr_reset (); 1163 scr_reset ();
1112 1164
1113#ifdef XPM_BACKGROUND 1165 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1114 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)
1115 scr_touch (false); 1171// scr_touch (false);
1116#endif 1172#endif
1117 1173
1118#ifdef USE_XIM 1174#ifdef USE_XIM
1119 IMSetStatusPosition (); 1175 IMSetPosition ();
1120#endif 1176#endif
1121} 1177}
1122 1178
1123/* 1179/*
1124 * 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.
… …
1129{ 1185{
1130 XWindowAttributes wattr; 1186 XWindowAttributes wattr;
1131 1187
1132 if (newwidth == 0 || newheight == 0) 1188 if (newwidth == 0 || newheight == 0)
1133 { 1189 {
1134 XGetWindowAttributes (xdisp, display->root, &wattr); 1190 XGetWindowAttributes (dpy, display->root, &wattr);
1135 1191
1136 if (newwidth == 0) 1192 if (newwidth == 0)
1137 newwidth = wattr.width - szHint.base_width; 1193 newwidth = wattr.width - szHint.base_width;
1138 if (newheight == 0) 1194 if (newheight == 0)
1139 newheight = wattr.height - szHint.base_height; 1195 newheight = wattr.height - szHint.base_height;
… …
1201 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1257 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1202 1258
1203 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1259 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1204 *p = '\0'; 1260 *p = '\0';
1205 1261
1206 atom = XInternAtom (xdisp, server, False); 1262 atom = XInternAtom (dpy, server, False);
1207 win = XGetSelectionOwner (xdisp, atom); 1263 win = XGetSelectionOwner (dpy, atom);
1208 1264
1209 if (win != None) 1265 if (win != None)
1210 return True; 1266 return True;
1211 } 1267 }
1212 1268
… …
1436 "*", 1492 "*",
1437 fheight, 1493 fheight,
1438 fheight + 1, fheight - 1, 1494 fheight + 1, fheight - 1,
1439 fheight - 2, fheight + 2); 1495 fheight - 2, fheight + 2);
1440 1496
1441 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1497 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1442 &missing_charset_list, &missing_charset_count, &def_string); 1498 &missing_charset_list, &missing_charset_count, &def_string);
1443 1499
1444 if (missing_charset_list) 1500 if (missing_charset_list)
1445 XFreeStringList (missing_charset_list); 1501 XFreeStringList (missing_charset_list);
1446 1502
… …
1521 preedit_attr, 1577 preedit_attr,
1522 status_attr ? XNStatusAttributes : NULL, 1578 status_attr ? XNStatusAttributes : NULL,
1523 status_attr, NULL); 1579 status_attr, NULL);
1524 1580
1525 if (preedit_attr) XFree (preedit_attr); 1581 if (preedit_attr) XFree (preedit_attr);
1526 if (status_attr) XFree (status_attr); 1582 if (status_attr) XFree (status_attr);
1527 if (fs) XFreeFontSet (xdisp, fs); 1583 if (fs) XFreeFontSet (dpy, fs);
1528 1584
1529 if (Input_Context == NULL) 1585 if (Input_Context == NULL)
1530 { 1586 {
1531 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1587 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1532 im_destroy (); 1588 im_destroy ();
… …
1537 // 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
1538 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1594 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1539 vt_select_input (); 1595 vt_select_input ();
1540#endif 1596#endif
1541 1597
1542 if (input_style & XIMPreeditArea)
1543 IMSetStatusPosition (); 1598 IMSetPosition ();
1544 1599
1545 return true; 1600 return true;
1546} 1601}
1547 1602
1548void 1603void
… …
1606 SET_LOCALE (locale); 1661 SET_LOCALE (locale);
1607#endif 1662#endif
1608} 1663}
1609 1664
1610void 1665void
1611rxvt_term::IMSetStatusPosition () 1666rxvt_term::IMSetPosition ()
1612{ 1667{
1613 XRectangle preedit_rect, status_rect, *needed_rect; 1668 XRectangle preedit_rect, status_rect, *needed_rect;
1614 XVaNestedList preedit_attr, status_attr; 1669 XVaNestedList preedit_attr, status_attr;
1615 1670
1616 if (!Input_Context 1671 if (!Input_Context
1617 || !focus 1672 || !focus
1618 || !(input_style & XIMPreeditArea) 1673 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1619 || !IMisRunning ()) 1674 || !IMisRunning ())
1620 return; 1675 return;
1621 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 {
1622 /* Getting the necessary width of preedit area */ 1687 /* Getting the necessary width of preedit area */
1623 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1688 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1624 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1689 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1625 XFree (status_attr); 1690 XFree (status_attr);
1626 1691
1627 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1692 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1628 XFree (needed_rect); 1693 XFree (needed_rect);
1629 1694
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1695 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1696 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1632 1697
1633 XSetICValues (Input_Context, 1698 XSetICValues (Input_Context,
1634 XNPreeditAttributes, preedit_attr, 1699 XNPreeditAttributes, preedit_attr,
1635 XNStatusAttributes, status_attr, NULL); 1700 XNStatusAttributes, status_attr,
1701 NULL);
1636 1702
1703 XFree (status_attr);
1704 }
1705
1637 XFree (preedit_attr); 1706 XFree (preedit_attr);
1638 XFree (status_attr);
1639} 1707}
1640#endif /* USE_XIM */ 1708#endif /* USE_XIM */
1641 1709
1642/*----------------------- end-of-file (C source) -----------------------*/ 1710/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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