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.217 by root, Thu Feb 2 18:00:23 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]);
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 bool changed = false;
512 bgPixmap.set_target (this);
513
500#ifdef TRANSPARENT 514#ifdef ENABLE_TRANSPARENCY
501 if (OPTION (Opt_transparent)) 515 if (option (Opt_transparent))
502 { 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 ();
503 XSelectInput (xdisp, display->root, PropertyChangeMask); 529 XSelectInput (dpy, display->root, PropertyChangeMask);
504 check_our_parents ();
505 rootwin_ev.start (display, display->root); 530 rootwin_ev.start (display, display->root);
506 } 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);
507#endif 560#endif
508 561
509 set_colorfgbg (); 562 set_colorfgbg ();
510 563
511 init_command (cmd_argv); 564 init_command (cmd_argv);
… …
522#if ENABLE_XEMBED 575#if ENABLE_XEMBED
523 if (rs[Rs_embed]) 576 if (rs[Rs_embed])
524 { 577 {
525 long info[2] = { 0, XEMBED_MAPPED }; 578 long info[2] = { 0, XEMBED_MAPPED };
526 579
527 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],
528 32, PropModeReplace, (unsigned char *)&info, 2); 581 32, PropModeReplace, (unsigned char *)&info, 2);
529 } 582 }
530#endif 583#endif
531 584
532 XMapWindow (xdisp, vt); 585 XMapWindow (dpy, vt);
533 XMapWindow (xdisp, parent[0]); 586 XMapWindow (dpy, parent[0]);
534 587
535 return true; 588 return true;
536} 589}
537 590
538static struct sig_handlers 591static struct sig_handlers
… …
618 return p; 671 return p;
619} 672}
620 673
621/*----------------------------------------------------------------------*/ 674/*----------------------------------------------------------------------*/
622/* 675/*
623 * window size/position calculcations for XSizeHint and other storage. 676 * window size/position calculations for XSizeHint and other storage.
624 * if width/height are non-zero then override calculated width/height 677 * if width/height are non-zero then override calculated width/height
625 */ 678 */
626void 679void
627rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 680rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
628{ 681{
… …
700 if (scrollBar.state) 753 if (scrollBar.state)
701 { 754 {
702 sb_w = scrollbar_TotalWidth (); 755 sb_w = scrollbar_TotalWidth ();
703 szHint.base_width += sb_w; 756 szHint.base_width += sb_w;
704 757
705 if (!OPTION (Opt_scrollBar_right)) 758 if (!option (Opt_scrollBar_right))
706 window_vt_x += sb_w; 759 window_vt_x += sb_w;
707 } 760 }
708 761
709 szHint.width_inc = fwidth; 762 szHint.width_inc = fwidth;
710 szHint.height_inc = fheight; 763 szHint.height_inc = fheight;
711 szHint.min_width = szHint.base_width + szHint.width_inc; 764 szHint.min_width = szHint.base_width + szHint.width_inc;
712 szHint.min_height = szHint.base_height + szHint.height_inc; 765 szHint.min_height = szHint.base_height + szHint.height_inc;
713 766
714 if (newwidth && newwidth - szHint.base_width < max_width) 767 if (newwidth && newwidth - szHint.base_width < max_width)
715 { 768 {
716 szHint.width = newwidth; 769 szHint.width = newwidth;
… …
731 { 784 {
732 min_it (height, max_height); 785 min_it (height, max_height);
733 szHint.height = szHint.base_height + height; 786 szHint.height = szHint.base_height + height;
734 } 787 }
735 788
736 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 789 if (scrollBar.state && option (Opt_scrollBar_right))
737 window_sb_x = szHint.width - sb_w; 790 window_sb_x = szHint.width - sb_w;
738 791
739 if (recalc_x) 792 if (recalc_x)
740 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 793 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741 794
742 if (recalc_y) 795 if (recalc_y)
743 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 796 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
744 797
745 ncol = width / fwidth; 798 ncol = width / fwidth;
746 nrow = height / fheight; 799 nrow = height / fheight;
747} 800}
748 801
… …
803 delete fontset[0]; 856 delete fontset[0];
804 fontset[0] = fs; 857 fontset[0] = fs;
805 858
806 prop = (*fs)[1]->properties (); 859 prop = (*fs)[1]->properties ();
807 prop.height += lineSpace; 860 prop.height += lineSpace;
861
808 fs->set_prop (prop); 862 fs->set_prop (prop, false);
809 863
810 fwidth = prop.width; 864 fwidth = prop.width;
811 fheight = prop.height; 865 fheight = prop.height;
812 fbase = prop.ascent; 866 fbase = prop.ascent;
813 867
… …
822 { 876 {
823 fontset[style] = fs = new rxvt_fontset (this); 877 fontset[style] = fs = new rxvt_fontset (this);
824 rxvt_fontprop prop2 = prop; 878 rxvt_fontprop prop2 = prop;
825 879
826 if (res) 880 if (res)
827 prop2.weight = prop2.slant = rxvt_fontprop::unset; 881 {
882 fs->populate (res);
883 fs->set_prop (prop2, false);
884 }
828 else 885 else
829 { 886 {
830 res = fontset[0]->fontdesc; 887 fs->populate (fontset[0]->fontdesc);
831 888
832 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;
833 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);
834 } 893 }
835 894
836 fs->populate (res);
837 fs->set_prop (prop2);
838 } 895 }
839#else 896#else
840 fontset[style] = fontset[0]; 897 fontset[style] = fontset[0];
841#endif 898#endif
842 } 899 }
… …
851 return true; 908 return true;
852} 909}
853 910
854void 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)
855{ 912{
856 XChangeProperty (xdisp, parent[0], 913 XChangeProperty (dpy, parent[0],
857 prop, XA_STRING, 8, PropModeReplace, 914 prop, XA_STRING, 8, PropModeReplace,
858 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 915 (const unsigned char *)str, len >= 0 ? len : strlen (str));
859} 916}
860 917
861void 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)
862{ 919{
863 wchar_t *ws = rxvt_mbstowcs (str, len); 920 wchar_t *ws = rxvt_mbstowcs (str, len);
864 char *s = rxvt_wcstoutf8 (ws); 921 char *s = rxvt_wcstoutf8 (ws);
865 922
866 XChangeProperty (xdisp, parent[0], 923 XChangeProperty (dpy, parent[0],
867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 924 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
868 (const unsigned char *)s, strlen (s)); 925 (const unsigned char *)s, strlen (s));
869 926
870 free (s); 927 free (s);
871 free (ws); 928 free (ws);
… …
935 pix_colors_focused[idx] = xcol; 992 pix_colors_focused[idx] = xcol;
936 993
937 /* XSetWindowAttributes attr; */ 994 /* XSetWindowAttributes attr; */
938 /* Cursor cursor; */ 995 /* Cursor cursor; */
939done: 996done:
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. */ 997 /*TODO: handle Color_BD, scrollbar background, etc. */
951 998
999 update_fade_color (idx);
952 recolour_cursor (); 1000 recolour_cursor ();
953 scr_recolour (); 1001 scr_recolour ();
954} 1002}
955 1003
956#else 1004#else
… …
968 1016
969 (ISSET_PIXCOLOR (Color_pointer_bg) 1017 (ISSET_PIXCOLOR (Color_pointer_bg)
970 ? pix_colors_focused[Color_pointer_bg] 1018 ? pix_colors_focused[Color_pointer_bg]
971 : pix_colors_focused[Color_bg]).get (bg); 1019 : pix_colors_focused[Color_bg]).get (bg);
972 1020
973 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg); 1021 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
974} 1022}
975 1023
976/*----------------------------------------------------------------------*/ 1024/*----------------------------------------------------------------------*/
977/* 1025/*
978 * 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
… …
1033 int fix_screen; 1081 int fix_screen;
1034 int old_width = szHint.width; 1082 int old_width = szHint.width;
1035 int old_height = szHint.height; 1083 int old_height = szHint.height;
1036 1084
1037 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)))
1038 XSetWMNormalHints (xdisp, parent[0], &szHint); 1088 XSetWMNormalHints (dpy, parent[0], &szHint);
1039 1089
1040 if (!ignoreparent) 1090 if (!ignoreparent)
1041 { 1091 {
1042#ifdef SMART_RESIZE 1092#ifdef SMART_RESIZE
1043 /* 1093 /*
… …
1047 int x, y, x1, y1; 1097 int x, y, x1, y1;
1048 int dx, dy; 1098 int dx, dy;
1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1099 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1050 Window unused_cr; 1100 Window unused_cr;
1051 1101
1052 XTranslateCoordinates (xdisp, parent[0], display->root, 1102 XTranslateCoordinates (dpy, parent[0], display->root,
1053 0, 0, &x, &y, &unused_cr); 1103 0, 0, &x, &y, &unused_cr);
1054 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1104 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1105 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1056 /* 1106 /*
1057 * 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
1058 * our position for handles and decorations. Counter it 1108 * our position for handles and decorations. Counter it
1059 */ 1109 */
… …
1061 { 1111 {
1062 x -= x1; 1112 x -= x1;
1063 y -= y1; 1113 y -= y1;
1064 } 1114 }
1065 1115
1066 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1116 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1067 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1117 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1068 dx = old_width - szHint.width; 1118 dx = old_width - szHint.width;
1069 dy = old_height - szHint.height; 1119 dy = old_height - szHint.height;
1070 1120
1071 /* Check position of the center of the window */ 1121 /* Check position of the center of the window */
1072 if (x < x1) /* left half */ 1122 if (x < x1) /* left half */
… …
1076 if (y < y1) /* top half */ 1126 if (y < y1) /* top half */
1077 dy = 0; 1127 dy = 0;
1078 else if (y == y1) /* exact center */ 1128 else if (y == y1) /* exact center */
1079 dy /= 2; 1129 dy /= 2;
1080 1130
1081 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1131 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1082 szHint.width, szHint.height); 1132 szHint.width, szHint.height);
1083#else 1133#else
1084 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1134 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1085#endif 1135#endif
1086 } 1136 }
1087 1137
1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1089 1139
1090 if (fix_screen || newwidth != old_width || newheight != old_height) 1140 if (fix_screen || newwidth != old_width || newheight != old_height)
1091 { 1141 {
1092 if (scrollBar.state) 1142 if (scrollBar.state)
1093 { 1143 {
1094 XMoveResizeWindow (xdisp, scrollBar.win, 1144 XMoveResizeWindow (dpy, scrollBar.win,
1095 window_sb_x, 0, 1145 window_sb_x, 0,
1096 scrollbar_TotalWidth (), szHint.height); 1146 scrollbar_TotalWidth (), szHint.height);
1097 resize_scrollbar (); 1147 resize_scrollbar ();
1098 } 1148 }
1099 1149
1100 XMoveResizeWindow (xdisp, vt, 1150 XMoveResizeWindow (dpy, vt,
1101 window_vt_x, window_vt_y, 1151 window_vt_x, window_vt_y,
1102 width, height); 1152 width, height);
1103 1153
1104 scr_clear (); 1154 scr_clear ();
1105#ifdef XPM_BACKGROUND 1155#ifdef XPM_BACKGROUND
1106 resize_pixmap (); 1156 /* TODO: should that really be here ? */
1157 bgPixmap.render_background ();
1107#endif 1158#endif
1108 } 1159 }
1109 1160
1110 if (fix_screen || old_height == 0) 1161 if (fix_screen || old_height == 0)
1111 scr_reset (); 1162 scr_reset ();
1112 1163
1113 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1164 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1114 //scr_touch (false); 1165 //scr_touch (false);
1115 1166
1116#ifdef XPM_BACKGROUND 1167#ifdef HAVE_BG_PIXMAP
1117 if (pixmap) 1168 if (bgPixmap.pixmap)
1118 scr_touch (false); 1169 scr_touch (false);
1119#endif 1170#endif
1120 1171
1121#ifdef USE_XIM 1172#ifdef USE_XIM
1122 IMSetStatusPosition (); 1173 IMSetPosition ();
1123#endif 1174#endif
1124} 1175}
1125 1176
1126/* 1177/*
1127 * 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.
… …
1132{ 1183{
1133 XWindowAttributes wattr; 1184 XWindowAttributes wattr;
1134 1185
1135 if (newwidth == 0 || newheight == 0) 1186 if (newwidth == 0 || newheight == 0)
1136 { 1187 {
1137 XGetWindowAttributes (xdisp, display->root, &wattr); 1188 XGetWindowAttributes (dpy, display->root, &wattr);
1138 1189
1139 if (newwidth == 0) 1190 if (newwidth == 0)
1140 newwidth = wattr.width - szHint.base_width; 1191 newwidth = wattr.width - szHint.base_width;
1141 if (newheight == 0) 1192 if (newheight == 0)
1142 newheight = wattr.height - szHint.base_height; 1193 newheight = wattr.height - szHint.base_height;
… …
1204 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1255 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1205 1256
1206 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1257 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1207 *p = '\0'; 1258 *p = '\0';
1208 1259
1209 atom = XInternAtom (xdisp, server, False); 1260 atom = XInternAtom (dpy, server, False);
1210 win = XGetSelectionOwner (xdisp, atom); 1261 win = XGetSelectionOwner (dpy, atom);
1211 1262
1212 if (win != None) 1263 if (win != None)
1213 return True; 1264 return True;
1214 } 1265 }
1215 1266
… …
1439 "*", 1490 "*",
1440 fheight, 1491 fheight,
1441 fheight + 1, fheight - 1, 1492 fheight + 1, fheight - 1,
1442 fheight - 2, fheight + 2); 1493 fheight - 2, fheight + 2);
1443 1494
1444 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1495 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1445 &missing_charset_list, &missing_charset_count, &def_string); 1496 &missing_charset_list, &missing_charset_count, &def_string);
1446 1497
1447 if (missing_charset_list) 1498 if (missing_charset_list)
1448 XFreeStringList (missing_charset_list); 1499 XFreeStringList (missing_charset_list);
1449 1500
… …
1524 preedit_attr, 1575 preedit_attr,
1525 status_attr ? XNStatusAttributes : NULL, 1576 status_attr ? XNStatusAttributes : NULL,
1526 status_attr, NULL); 1577 status_attr, NULL);
1527 1578
1528 if (preedit_attr) XFree (preedit_attr); 1579 if (preedit_attr) XFree (preedit_attr);
1529 if (status_attr) XFree (status_attr); 1580 if (status_attr) XFree (status_attr);
1530 if (fs) XFreeFontSet (xdisp, fs); 1581 if (fs) XFreeFontSet (dpy, fs);
1531 1582
1532 if (Input_Context == NULL) 1583 if (Input_Context == NULL)
1533 { 1584 {
1534 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1585 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1535 im_destroy (); 1586 im_destroy ();
… …
1540 // 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
1541 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1592 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1542 vt_select_input (); 1593 vt_select_input ();
1543#endif 1594#endif
1544 1595
1545 if (input_style & XIMPreeditArea)
1546 IMSetStatusPosition (); 1596 IMSetPosition ();
1547 1597
1548 return true; 1598 return true;
1549} 1599}
1550 1600
1551void 1601void
… …
1609 SET_LOCALE (locale); 1659 SET_LOCALE (locale);
1610#endif 1660#endif
1611} 1661}
1612 1662
1613void 1663void
1614rxvt_term::IMSetStatusPosition () 1664rxvt_term::IMSetPosition ()
1615{ 1665{
1616 XRectangle preedit_rect, status_rect, *needed_rect; 1666 XRectangle preedit_rect, status_rect, *needed_rect;
1617 XVaNestedList preedit_attr, status_attr; 1667 XVaNestedList preedit_attr, status_attr;
1618 1668
1619 if (!Input_Context 1669 if (!Input_Context
1620 || !focus 1670 || !focus
1621 || !(input_style & XIMPreeditArea) 1671 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1622 || !IMisRunning ()) 1672 || !IMisRunning ())
1623 return; 1673 return;
1624 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 {
1625 /* Getting the necessary width of preedit area */ 1685 /* Getting the necessary width of preedit area */
1626 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1686 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1627 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1687 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1628 XFree (status_attr); 1688 XFree (status_attr);
1629 1689
1630 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1690 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1631 XFree (needed_rect); 1691 XFree (needed_rect);
1632 1692
1633 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1693 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1634 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1694 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1635 1695
1636 XSetICValues (Input_Context, 1696 XSetICValues (Input_Context,
1637 XNPreeditAttributes, preedit_attr, 1697 XNPreeditAttributes, preedit_attr,
1638 XNStatusAttributes, status_attr, NULL); 1698 XNStatusAttributes, status_attr,
1699 NULL);
1639 1700
1701 XFree (status_attr);
1702 }
1703
1640 XFree (preedit_attr); 1704 XFree (preedit_attr);
1641 XFree (status_attr);
1642} 1705}
1643#endif /* USE_XIM */ 1706#endif /* USE_XIM */
1644 1707
1645/*----------------------- end-of-file (C source) -----------------------*/ 1708/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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