ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.247 by root, Sun Jan 22 20:39:47 2006 UTC vs.
Revision 1.254 by root, Sat Jan 28 14:23:16 2006 UTC

… …
93 */ 93 */
94#define drawBuffer vt 94#define drawBuffer vt
95 95
96#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \ 98 XClearArea (xdisp, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
101 101
102#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 103 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (xdisp, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
107 107
108#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \ 109 XFillRectangle (xdisp, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
111 (unsigned int)width, \ 111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
113 113
114/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
… …
126 width = ncol; 126 width = ncol;
127 } 127 }
128 128
129 l.touch (); 129 l.touch ();
130 130
131 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 133
134 text_t *et = l.t + col; 134 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
136 136
… …
641 } 641 }
642 642
643 // erase newly scrolled-in lines 643 // erase newly scrolled-in lines
644 for (int i = count; i--; ) 644 for (int i = count; i--; )
645 { 645 {
646 // basically this is a slightly optimized scr_blank_screen_mem
647 // it is worth the effort on slower machines
648 line_t &l = ROW(nrow - 1 - i); 646 line_t &l = ROW(nrow - 1 - i);
649 647
648 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask))
651 {
650 scr_blank_line (l, 0, l.l, rstyle); 652 scr_blank_line (l, 0, l.l, rstyle);
651
652 l.l = 0; 653 l.l = 0;
653 l.f = 0; 654 l.f = 0;
655 }
656 else
657 scr_blank_screen_mem (l, rstyle);
654 } 658 }
655 659
656 // now copy lines below the scroll region bottom to the 660 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they 661 // bottom of the screen again, so they look as if they
658 // hadn't moved. 662 // hadn't moved.
… …
758 ZERO_SCROLLBACK (); 762 ZERO_SCROLLBACK ();
759 763
760 if (minlines > 0) 764 if (minlines > 0)
761 { 765 {
762 minlines += screen.cur.row - screen.bscroll; 766 minlines += screen.cur.row - screen.bscroll;
767 min_it (minlines, screen.cur.row - top_row);
763 768
764 if (minlines > 0 769 if (minlines > 0
765 && screen.tscroll == 0 770 && screen.tscroll == 0
766 && screen.bscroll == nrow - 1) 771 && screen.bscroll == nrow - 1)
767 { 772 {
… …
841 846
842 // some utf-8 decoders "decode" surrogate characters: let's fix this. 847 // some utf-8 decoders "decode" surrogate characters: let's fix this.
843 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 848 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
844 c = 0xfffd; 849 c = 0xfffd;
845 850
846 // rely on wcwidth to tell us the character width, at least for non-latin1 851 // rely on wcwidth to tell us the character width, do wcwidth before
847 // do wcwidth before further replacements, as wcwidth might return -1 852 // further replacements, as wcwidth might return -1 for the line
848 // for the line drawing characters below as they might be invalid in the current 853 // drawing characters below as they might be invalid in the current
849 // locale. 854 // locale.
850 int width = c < 0x100 ? 1 : wcwidth (c); 855 int width = WCWIDTH (c);
851 856
852 if (charsets [screen.charset] == '0') // DEC SPECIAL 857 if (charsets [screen.charset] == '0') // DEC SPECIAL
853 { 858 {
854 // vt100 special graphics and line drawing 859 // vt100 special graphics and line drawing
855 // 5f-7e standard vt100 860 // 5f-7e standard vt100
… …
1337 } 1342 }
1338 else 1343 else
1339 { 1344 {
1340 ren = rstyle & (RS_fgMask | RS_bgMask); 1345 ren = rstyle & (RS_fgMask | RS_bgMask);
1341 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1342 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1347 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1343 ERASE_ROWS (row, num); 1348 ERASE_ROWS (row, num);
1344 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1345 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1350 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1346 } 1351 }
1347 1352
1348 for (; num--; row++) 1353 for (; num--; row++)
1349 { 1354 {
1350 scr_blank_screen_mem (ROW(row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
… …
1649 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1650#endif 1655#endif
1651#if TRANSPARENT 1656#if TRANSPARENT
1652 if (!OPTION (Opt_transparent) || am_transparent == 0) 1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1653#endif 1658#endif
1654 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 1659 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
1655 1660
1656 XGCValues gcvalue; 1661 XGCValues gcvalue;
1657 gcvalue.foreground = pix_colors[Color_fg]; 1662 gcvalue.foreground = pix_colors[Color_fg];
1658 gcvalue.background = pix_colors[Color_bg]; 1663 gcvalue.background = pix_colors[Color_bg];
1659 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); 1664 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue);
1660 1665
1661 scr_clear (); 1666 scr_clear ();
1662 scr_touch (true); 1667 scr_touch (true);
1663 } 1668 }
1664} 1669}
… …
1884 1889
1885# ifndef NO_MAPALERT 1890# ifndef NO_MAPALERT
1886# ifdef MAPALERT_OPTION 1891# ifdef MAPALERT_OPTION
1887 if (OPTION (Opt_mapAlert)) 1892 if (OPTION (Opt_mapAlert))
1888# endif 1893# endif
1889 XMapWindow (display->display, parent[0]); 1894 XMapWindow (xdisp, parent[0]);
1890# endif 1895# endif
1891 1896
1892 if (OPTION (Opt_visualBell)) 1897 if (OPTION (Opt_visualBell))
1893 { 1898 {
1894 rvideo_bell = true; 1899 rvideo_bell = true;
… …
1896 display->flush (); 1901 display->flush ();
1897 1902
1898 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1903 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1899 } 1904 }
1900 else 1905 else
1901 XBell (display->display, 0); 1906 XBell (xdisp, 0);
1902 1907
1903#endif 1908#endif
1904} 1909}
1905 1910
1906/* ------------------------------------------------------------------------- */ 1911/* ------------------------------------------------------------------------- */
… …
2145 { 2150 {
2146 /* also comes here at end if needed because of >= above */ 2151 /* also comes here at end if needed because of >= above */
2147 if (wlen < len) 2152 if (wlen < len)
2148 ::swap (wlen, len); 2153 ::swap (wlen, len);
2149 2154
2150 XCopyArea (display->display, vt, vt, 2155 XCopyArea (xdisp, vt, vt,
2151 gc, 0, Row2Pixel (len + i), 2156 gc, 0, Row2Pixel (len + i),
2152 (unsigned int)this->width, 2157 (unsigned int)this->width,
2153 (unsigned int)Height2Pixel (wlen - len + 1), 2158 (unsigned int)Height2Pixel (wlen - len + 1),
2154 0, Row2Pixel (len)); 2159 0, Row2Pixel (len));
2155 len = -1; 2160 len = -1;
… …
2243 2248
2244 // only do special processing if any attributes are set, which is unlikely 2249 // only do special processing if any attributes are set, which is unlikely
2245 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2250 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2246 { 2251 {
2247#if ENABLE_STYLES 2252#if ENABLE_STYLES
2248 // force redraw after "careful" characters to avoid pixel droppings 2253 // "careful" (too wide) character handling
2249 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2250 drp[col + 1] = ~srp[col + 1];
2251 2254
2252 // include previous careful character(s) if possible, looks nicer (best effort...) 2255 // include previous careful character(s) if possible, looks nicer (best effort...)
2253 while (text > stp 2256 while (text > stp
2254 && srp[text - stp - 1] & RS_Careful 2257 && srp[text - stp - 1] & RS_Careful
2255 && RS_SAME (rend, srp[text - stp - 1])) 2258 && RS_SAME (rend, srp[text - stp - 1]))
2256 text--, count++, xpixel -= fwidth; 2259 text--, count++, xpixel -= fwidth;
2260
2261 // force redraw after "careful" characters to avoid pixel droppings
2262 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2263 drp[col + i + 1] = ~srp[col + i + 1];
2264
2265 // force redraw before "careful" characters to avoid pixel droppings
2266 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2267 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2257#endif 2268#endif
2258 2269
2259 bool invert = rend & RS_RVid; 2270 bool invert = rend & RS_RVid;
2260 2271
2261#ifndef NO_BOLD_UNDERLINE_REVERSE 2272#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2345 2356
2346 if (rend & RS_Uline && font->descent > 1 && fore != back) 2357 if (rend & RS_Uline && font->descent > 1 && fore != back)
2347 { 2358 {
2348#if ENABLE_FRILLS 2359#if ENABLE_FRILLS
2349 if (ISSET_PIXCOLOR (Color_underline)) 2360 if (ISSET_PIXCOLOR (Color_underline))
2350 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2361 XSetForeground (xdisp, gc, pix_colors[Color_underline]);
2351 else 2362 else
2352#endif 2363#endif
2353 XSetForeground (display->display, gc, pix_colors[fore]); 2364 XSetForeground (xdisp, gc, pix_colors[fore]);
2354 2365
2355 XDrawLine (display->display, drawBuffer, gc, 2366 XDrawLine (xdisp, drawBuffer, gc,
2356 xpixel, ypixel + font->ascent + 1, 2367 xpixel, ypixel + font->ascent + 1,
2357 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2368 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2358 } 2369 }
2359 } /* for (col....) */ 2370 } /* for (col....) */
2360 } /* for (row....) */ 2371 } /* for (row....) */
… …
2393 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2404 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2394 cursorwidth++; 2405 cursorwidth++;
2395 2406
2396#ifndef NO_CURSORCOLOR 2407#ifndef NO_CURSORCOLOR
2397 if (ISSET_PIXCOLOR (Color_cursor)) 2408 if (ISSET_PIXCOLOR (Color_cursor))
2398 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2409 XSetForeground (xdisp, gc, pix_colors[Color_cursor]);
2399#endif 2410#endif
2400 2411
2401 XDrawRectangle (display->display, drawBuffer, gc, 2412 XDrawRectangle (xdisp, drawBuffer, gc,
2402 Col2Pixel (col), 2413 Col2Pixel (col),
2403 Row2Pixel (oldcursor.row), 2414 Row2Pixel (oldcursor.row),
2404 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2415 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2405 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2416 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2406 } 2417 }
… …
2450#if XPM_BACKGROUND 2461#if XPM_BACKGROUND
2451 && !bgPixmap.pixmap 2462 && !bgPixmap.pixmap
2452#endif 2463#endif
2453 ) 2464 )
2454 { 2465 {
2455 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2466 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]);
2456 XClearWindow (display->display, parent[0]); 2467 XClearWindow (xdisp, parent[0]);
2457 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2468 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
2458#if HAVE_SCROLLBARS 2469#if HAVE_SCROLLBARS
2459 if (scrollBar.win) 2470 if (scrollBar.win)
2460 { 2471 {
2461 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2472 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]);
2462 scrollBar.setIdle (); 2473 scrollBar.setIdle ();
2463 scrollbar_show (0); 2474 scrollbar_show (0);
2464 } 2475 }
2465#endif 2476#endif
2466 } 2477 }
… …
2479 2490
2480 num_scr_allow = 0; 2491 num_scr_allow = 0;
2481 want_refresh = 1; 2492 want_refresh = 1;
2482 2493
2483 if (really) 2494 if (really)
2484 XClearWindow (display->display, vt); 2495 XClearWindow (xdisp, vt);
2485} 2496}
2486 2497
2487void 2498void
2488rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2499rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2489{ 2500{
… …
2664 } 2675 }
2665 2676
2666 unsigned long bytes_after; 2677 unsigned long bytes_after;
2667 XTextProperty ct; 2678 XTextProperty ct;
2668 2679
2669 if (XGetWindowProperty (display->display, win, prop, 2680 if (XGetWindowProperty (xdisp, win, prop,
2670 0, PROP_SIZE / 4, 2681 0, PROP_SIZE / 4,
2671 delete_prop, AnyPropertyType, 2682 delete_prop, AnyPropertyType,
2672 &ct.encoding, &ct.format, 2683 &ct.encoding, &ct.format,
2673 &ct.nitems, &bytes_after, 2684 &ct.nitems, &bytes_after,
2674 &ct.value) != Success) 2685 &ct.value) != Success)
… …
2683 if (bytes_after) 2694 if (bytes_after)
2684 { 2695 {
2685 // fetch and append remaining data 2696 // fetch and append remaining data
2686 XTextProperty ct2; 2697 XTextProperty ct2;
2687 2698
2688 if (XGetWindowProperty (display->display, win, prop, 2699 if (XGetWindowProperty (xdisp, win, prop,
2689 ct.nitems / 4, (bytes_after + 3) / 4, 2700 ct.nitems / 4, (bytes_after + 3) / 4,
2690 delete_prop, AnyPropertyType, 2701 delete_prop, AnyPropertyType,
2691 &ct2.encoding, &ct2.format, 2702 &ct2.encoding, &ct2.format,
2692 &ct2.nitems, &bytes_after, 2703 &ct2.nitems, &bytes_after,
2693 &ct2.value) != Success) 2704 &ct2.value) != Success)
… …
2706 2717
2707 if (ct.encoding == xa[XA_INCR]) 2718 if (ct.encoding == xa[XA_INCR])
2708 { 2719 {
2709 // INCR selection, start handshake 2720 // INCR selection, start handshake
2710 if (!delete_prop) 2721 if (!delete_prop)
2711 XDeleteProperty (display->display, win, prop); 2722 XDeleteProperty (xdisp, win, prop);
2712 2723
2713 selection_wait = Sel_incr; 2724 selection_wait = Sel_incr;
2714 incr_buf_fill = 0; 2725 incr_buf_fill = 0;
2715 incr_ev.start (NOW + 10); 2726 incr_ev.start (NOW + 10);
2716 2727
… …
2777 paste (s, strlen (s)); 2788 paste (s, strlen (s));
2778 free (s); 2789 free (s);
2779 } 2790 }
2780 else 2791 else
2781#endif 2792#endif
2782 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2793 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0
2783 && cl) 2794 && cl)
2784 { 2795 {
2785 for (int i = 0; i < cr; i++) 2796 for (int i = 0; i < cr; i++)
2786 paste (cl[i], strlen (cl[i])); 2797 paste (cl[i], strlen (cl[i]));
2787 2798
… …
2869 else if (selnum == Sel_Secondary) 2880 else if (selnum == Sel_Secondary)
2870 sel = XA_SECONDARY; 2881 sel = XA_SECONDARY;
2871 else 2882 else
2872 sel = xa[XA_CLIPBOARD]; 2883 sel = xa[XA_CLIPBOARD];
2873 2884
2874 if (XGetSelectionOwner (display->display, sel) != None) 2885 if (XGetSelectionOwner (xdisp, sel) != None)
2875 { 2886 {
2876 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2887 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION],
2877 vt, selection_request_time); 2888 vt, selection_request_time);
2878 return 1; 2889 return 1;
2879 } 2890 }
2880 2891
2881 return 0; 2892 return 0;
… …
3034bool 3045bool
3035rxvt_term::selection_grab (Time tm) NOTHROW 3046rxvt_term::selection_grab (Time tm) NOTHROW
3036{ 3047{
3037 selection_time = tm; 3048 selection_time = tm;
3038 3049
3039 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3050 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
3040 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3051 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
3041 { 3052 {
3042 display->set_selection_owner (this); 3053 display->set_selection_owner (this);
3043 return true; 3054 return true;
3044 } 3055 }
3045 else 3056 else
… …
3049 } 3060 }
3050 3061
3051#if 0 3062#if 0
3052 XTextProperty ct; 3063 XTextProperty ct;
3053 3064
3054 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3065 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0)
3055 { 3066 {
3056 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3067 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3057 XFree (ct.value); 3068 XFree (ct.value);
3058 } 3069 }
3059#endif 3070#endif
… …
3507 */ 3518 */
3508void 3519void
3509rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3520rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3510{ 3521{
3511 XSelectionEvent ev; 3522 XSelectionEvent ev;
3512 dDisp;
3513 3523
3514 ev.type = SelectionNotify; 3524 ev.type = SelectionNotify;
3515 ev.property = None; 3525 ev.property = None;
3516 ev.display = rq.display; 3526 ev.display = rq.display;
3517 ev.requestor = rq.requestor; 3527 ev.requestor = rq.requestor;
… …
3531 *target++ = xa[XA_COMPOUND_TEXT]; 3541 *target++ = xa[XA_COMPOUND_TEXT];
3532#if X_HAVE_UTF8_STRING 3542#if X_HAVE_UTF8_STRING
3533 *target++ = xa[XA_UTF8_STRING]; 3543 *target++ = xa[XA_UTF8_STRING];
3534#endif 3544#endif
3535 3545
3536 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3546 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM,
3537 32, PropModeReplace, 3547 32, PropModeReplace,
3538 (unsigned char *)target_list, target - target_list); 3548 (unsigned char *)target_list, target - target_list);
3539 ev.property = rq.property; 3549 ev.property = rq.property;
3540 } 3550 }
3541#if TODO // TODO 3551#if TODO // TODO
… …
3544 /* TODO: Handle MULTIPLE */ 3554 /* TODO: Handle MULTIPLE */
3545 } 3555 }
3546#endif 3556#endif
3547 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3557 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3548 { 3558 {
3549 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3559 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target,
3550 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3560 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3551 ev.property = rq.property; 3561 ev.property = rq.property;
3552 } 3562 }
3553 else if (rq.target == XA_STRING 3563 else if (rq.target == XA_STRING
3554 || rq.target == xa[XA_TEXT] 3564 || rq.target == xa[XA_TEXT]
… …
3612 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3622 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3613 ct.nitems = strlen ((char *)ct.value); 3623 ct.nitems = strlen ((char *)ct.value);
3614 } 3624 }
3615 else 3625 else
3616#endif 3626#endif
3617 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3627 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3618 freect = 1; 3628 freect = 1;
3619 else 3629 else
3620 { 3630 {
3621 /* if we failed to convert then send it raw */ 3631 /* if we failed to convert then send it raw */
3622 ct.value = (unsigned char *)cl; 3632 ct.value = (unsigned char *)cl;
3623 ct.nitems = selectlen; 3633 ct.nitems = selectlen;
3624 ct.encoding = target; 3634 ct.encoding = target;
3625 } 3635 }
3626 3636
3627 XChangeProperty (disp, rq.requestor, rq.property, 3637 XChangeProperty (xdisp, rq.requestor, rq.property,
3628 ct.encoding, 8, PropModeReplace, 3638 ct.encoding, 8, PropModeReplace,
3629 ct.value, (int)ct.nitems); 3639 ct.value, (int)ct.nitems);
3630 ev.property = rq.property; 3640 ev.property = rq.property;
3631 3641
3632 if (freect) 3642 if (freect)
3633 XFree (ct.value); 3643 XFree (ct.value);
3634 } 3644 }
3635 3645
3636 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3646 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev);
3637} 3647}
3638 3648
3639/* ------------------------------------------------------------------------- * 3649/* ------------------------------------------------------------------------- *
3640 * MOUSE ROUTINES * 3650 * MOUSE ROUTINES *
3641 * ------------------------------------------------------------------------- */ 3651 * ------------------------------------------------------------------------- */
… …
3657void 3667void
3658rxvt_term::im_set_position (XPoint &pos) NOTHROW 3668rxvt_term::im_set_position (XPoint &pos) NOTHROW
3659{ 3669{
3660 XWindowAttributes xwa; 3670 XWindowAttributes xwa;
3661 3671
3662 XGetWindowAttributes (display->display, vt, &xwa); 3672 XGetWindowAttributes (xdisp, vt, &xwa);
3663 3673
3664 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3674 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3665 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3675 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3666} 3676}
3667#endif 3677#endif
… …
3763rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3773rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3764{ 3774{
3765 while (*s) 3775 while (*s)
3766 { 3776 {
3767 text_t t = *s++; 3777 text_t t = *s++;
3768 int width = wcwidth (t); 3778 int width = WCWIDTH (t);
3769 3779
3770 while (width--) 3780 while (width--)
3771 { 3781 {
3772 scr_overlay_set (x++, y, t); 3782 scr_overlay_set (x++, y, t);
3773 t = NOCHAR; 3783 t = NOCHAR;

Diff Legend

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