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.248 by root, Sun Jan 22 20:58:33 2006 UTC vs.
Revision 1.253 by root, Fri Jan 27 18:36:43 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/* ------------------------------------------------------------------------- *
… …
640 l.touch (); 640 l.touch ();
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 scr_blank_screen_mem (ROW(nrow - 1 - i), rstyle);
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);
649
650 scr_blank_line (l, 0, l.l, rstyle);
651
652 l.l = 0;
653 l.f = 0;
654 }
655 646
656 // now copy lines below the scroll region bottom to the 647 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they 648 // bottom of the screen again, so they look as if they
658 // hadn't moved. 649 // hadn't moved.
659 for (int i = nrow; --i > row2; ) 650 for (int i = nrow; --i > row2; )
… …
842 833
843 // some utf-8 decoders "decode" surrogate characters: let's fix this. 834 // some utf-8 decoders "decode" surrogate characters: let's fix this.
844 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 835 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
845 c = 0xfffd; 836 c = 0xfffd;
846 837
847 // rely on wcwidth to tell us the character width, at least for non-latin1 838 // rely on wcwidth to tell us the character width, do wcwidth before
848 // do wcwidth before further replacements, as wcwidth might return -1 839 // further replacements, as wcwidth might return -1 for the line
849 // for the line drawing characters below as they might be invalid in the current 840 // drawing characters below as they might be invalid in the current
850 // locale. 841 // locale.
851 int width = c < 0x100 ? 1 : wcwidth (c); 842 int width = WCWIDTH (c);
852 843
853 if (charsets [screen.charset] == '0') // DEC SPECIAL 844 if (charsets [screen.charset] == '0') // DEC SPECIAL
854 { 845 {
855 // vt100 special graphics and line drawing 846 // vt100 special graphics and line drawing
856 // 5f-7e standard vt100 847 // 5f-7e standard vt100
… …
1338 } 1329 }
1339 else 1330 else
1340 { 1331 {
1341 ren = rstyle & (RS_fgMask | RS_bgMask); 1332 ren = rstyle & (RS_fgMask | RS_bgMask);
1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1333 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1343 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1334 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1344 ERASE_ROWS (row, num); 1335 ERASE_ROWS (row, num);
1345 gcvalue.foreground = pix_colors[Color_fg]; 1336 gcvalue.foreground = pix_colors[Color_fg];
1346 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1337 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1347 } 1338 }
1348 1339
1349 for (; num--; row++) 1340 for (; num--; row++)
1350 { 1341 {
1351 scr_blank_screen_mem (ROW(row), rstyle); 1342 scr_blank_screen_mem (ROW(row), rstyle);
… …
1650 if (bgPixmap.pixmap == None) 1641 if (bgPixmap.pixmap == None)
1651#endif 1642#endif
1652#if TRANSPARENT 1643#if TRANSPARENT
1653 if (!OPTION (Opt_transparent) || am_transparent == 0) 1644 if (!OPTION (Opt_transparent) || am_transparent == 0)
1654#endif 1645#endif
1655 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 1646 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
1656 1647
1657 XGCValues gcvalue; 1648 XGCValues gcvalue;
1658 gcvalue.foreground = pix_colors[Color_fg]; 1649 gcvalue.foreground = pix_colors[Color_fg];
1659 gcvalue.background = pix_colors[Color_bg]; 1650 gcvalue.background = pix_colors[Color_bg];
1660 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); 1651 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue);
1661 1652
1662 scr_clear (); 1653 scr_clear ();
1663 scr_touch (true); 1654 scr_touch (true);
1664 } 1655 }
1665} 1656}
… …
1885 1876
1886# ifndef NO_MAPALERT 1877# ifndef NO_MAPALERT
1887# ifdef MAPALERT_OPTION 1878# ifdef MAPALERT_OPTION
1888 if (OPTION (Opt_mapAlert)) 1879 if (OPTION (Opt_mapAlert))
1889# endif 1880# endif
1890 XMapWindow (display->display, parent[0]); 1881 XMapWindow (xdisp, parent[0]);
1891# endif 1882# endif
1892 1883
1893 if (OPTION (Opt_visualBell)) 1884 if (OPTION (Opt_visualBell))
1894 { 1885 {
1895 rvideo_bell = true; 1886 rvideo_bell = true;
… …
1897 display->flush (); 1888 display->flush ();
1898 1889
1899 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1890 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1900 } 1891 }
1901 else 1892 else
1902 XBell (display->display, 0); 1893 XBell (xdisp, 0);
1903 1894
1904#endif 1895#endif
1905} 1896}
1906 1897
1907/* ------------------------------------------------------------------------- */ 1898/* ------------------------------------------------------------------------- */
… …
2146 { 2137 {
2147 /* also comes here at end if needed because of >= above */ 2138 /* also comes here at end if needed because of >= above */
2148 if (wlen < len) 2139 if (wlen < len)
2149 ::swap (wlen, len); 2140 ::swap (wlen, len);
2150 2141
2151 XCopyArea (display->display, vt, vt, 2142 XCopyArea (xdisp, vt, vt,
2152 gc, 0, Row2Pixel (len + i), 2143 gc, 0, Row2Pixel (len + i),
2153 (unsigned int)this->width, 2144 (unsigned int)this->width,
2154 (unsigned int)Height2Pixel (wlen - len + 1), 2145 (unsigned int)Height2Pixel (wlen - len + 1),
2155 0, Row2Pixel (len)); 2146 0, Row2Pixel (len));
2156 len = -1; 2147 len = -1;
… …
2244 2235
2245 // only do special processing if any attributes are set, which is unlikely 2236 // only do special processing if any attributes are set, which is unlikely
2246 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2237 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2247 { 2238 {
2248#if ENABLE_STYLES 2239#if ENABLE_STYLES
2249 // force redraw after "careful" characters to avoid pixel droppings 2240 // "careful" (too wide) character handling
2250 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2251 drp[col + 1] = ~srp[col + 1];
2252 2241
2253 // include previous careful character(s) if possible, looks nicer (best effort...) 2242 // include previous careful character(s) if possible, looks nicer (best effort...)
2254 while (text > stp 2243 while (text > stp
2255 && srp[text - stp - 1] & RS_Careful 2244 && srp[text - stp - 1] & RS_Careful
2256 && RS_SAME (rend, srp[text - stp - 1])) 2245 && RS_SAME (rend, srp[text - stp - 1]))
2257 text--, count++, xpixel -= fwidth; 2246 text--, count++, xpixel -= fwidth;
2247
2248 // force redraw after "careful" characters to avoid pixel droppings
2249 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2250 drp[col + i + 1] = ~srp[col + i + 1];
2251
2252 // force redraw before "careful" characters to avoid pixel droppings
2253 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2254 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2258#endif 2255#endif
2259 2256
2260 bool invert = rend & RS_RVid; 2257 bool invert = rend & RS_RVid;
2261 2258
2262#ifndef NO_BOLD_UNDERLINE_REVERSE 2259#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2346 2343
2347 if (rend & RS_Uline && font->descent > 1 && fore != back) 2344 if (rend & RS_Uline && font->descent > 1 && fore != back)
2348 { 2345 {
2349#if ENABLE_FRILLS 2346#if ENABLE_FRILLS
2350 if (ISSET_PIXCOLOR (Color_underline)) 2347 if (ISSET_PIXCOLOR (Color_underline))
2351 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2348 XSetForeground (xdisp, gc, pix_colors[Color_underline]);
2352 else 2349 else
2353#endif 2350#endif
2354 XSetForeground (display->display, gc, pix_colors[fore]); 2351 XSetForeground (xdisp, gc, pix_colors[fore]);
2355 2352
2356 XDrawLine (display->display, drawBuffer, gc, 2353 XDrawLine (xdisp, drawBuffer, gc,
2357 xpixel, ypixel + font->ascent + 1, 2354 xpixel, ypixel + font->ascent + 1,
2358 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2355 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2359 } 2356 }
2360 } /* for (col....) */ 2357 } /* for (col....) */
2361 } /* for (row....) */ 2358 } /* for (row....) */
… …
2394 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2391 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2395 cursorwidth++; 2392 cursorwidth++;
2396 2393
2397#ifndef NO_CURSORCOLOR 2394#ifndef NO_CURSORCOLOR
2398 if (ISSET_PIXCOLOR (Color_cursor)) 2395 if (ISSET_PIXCOLOR (Color_cursor))
2399 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2396 XSetForeground (xdisp, gc, pix_colors[Color_cursor]);
2400#endif 2397#endif
2401 2398
2402 XDrawRectangle (display->display, drawBuffer, gc, 2399 XDrawRectangle (xdisp, drawBuffer, gc,
2403 Col2Pixel (col), 2400 Col2Pixel (col),
2404 Row2Pixel (oldcursor.row), 2401 Row2Pixel (oldcursor.row),
2405 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2402 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2406 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2403 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2407 } 2404 }
… …
2451#if XPM_BACKGROUND 2448#if XPM_BACKGROUND
2452 && !bgPixmap.pixmap 2449 && !bgPixmap.pixmap
2453#endif 2450#endif
2454 ) 2451 )
2455 { 2452 {
2456 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2453 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]);
2457 XClearWindow (display->display, parent[0]); 2454 XClearWindow (xdisp, parent[0]);
2458 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2455 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
2459#if HAVE_SCROLLBARS 2456#if HAVE_SCROLLBARS
2460 if (scrollBar.win) 2457 if (scrollBar.win)
2461 { 2458 {
2462 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2459 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]);
2463 scrollBar.setIdle (); 2460 scrollBar.setIdle ();
2464 scrollbar_show (0); 2461 scrollbar_show (0);
2465 } 2462 }
2466#endif 2463#endif
2467 } 2464 }
… …
2480 2477
2481 num_scr_allow = 0; 2478 num_scr_allow = 0;
2482 want_refresh = 1; 2479 want_refresh = 1;
2483 2480
2484 if (really) 2481 if (really)
2485 XClearWindow (display->display, vt); 2482 XClearWindow (xdisp, vt);
2486} 2483}
2487 2484
2488void 2485void
2489rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2486rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2490{ 2487{
… …
2665 } 2662 }
2666 2663
2667 unsigned long bytes_after; 2664 unsigned long bytes_after;
2668 XTextProperty ct; 2665 XTextProperty ct;
2669 2666
2670 if (XGetWindowProperty (display->display, win, prop, 2667 if (XGetWindowProperty (xdisp, win, prop,
2671 0, PROP_SIZE / 4, 2668 0, PROP_SIZE / 4,
2672 delete_prop, AnyPropertyType, 2669 delete_prop, AnyPropertyType,
2673 &ct.encoding, &ct.format, 2670 &ct.encoding, &ct.format,
2674 &ct.nitems, &bytes_after, 2671 &ct.nitems, &bytes_after,
2675 &ct.value) != Success) 2672 &ct.value) != Success)
… …
2684 if (bytes_after) 2681 if (bytes_after)
2685 { 2682 {
2686 // fetch and append remaining data 2683 // fetch and append remaining data
2687 XTextProperty ct2; 2684 XTextProperty ct2;
2688 2685
2689 if (XGetWindowProperty (display->display, win, prop, 2686 if (XGetWindowProperty (xdisp, win, prop,
2690 ct.nitems / 4, (bytes_after + 3) / 4, 2687 ct.nitems / 4, (bytes_after + 3) / 4,
2691 delete_prop, AnyPropertyType, 2688 delete_prop, AnyPropertyType,
2692 &ct2.encoding, &ct2.format, 2689 &ct2.encoding, &ct2.format,
2693 &ct2.nitems, &bytes_after, 2690 &ct2.nitems, &bytes_after,
2694 &ct2.value) != Success) 2691 &ct2.value) != Success)
… …
2707 2704
2708 if (ct.encoding == xa[XA_INCR]) 2705 if (ct.encoding == xa[XA_INCR])
2709 { 2706 {
2710 // INCR selection, start handshake 2707 // INCR selection, start handshake
2711 if (!delete_prop) 2708 if (!delete_prop)
2712 XDeleteProperty (display->display, win, prop); 2709 XDeleteProperty (xdisp, win, prop);
2713 2710
2714 selection_wait = Sel_incr; 2711 selection_wait = Sel_incr;
2715 incr_buf_fill = 0; 2712 incr_buf_fill = 0;
2716 incr_ev.start (NOW + 10); 2713 incr_ev.start (NOW + 10);
2717 2714
… …
2778 paste (s, strlen (s)); 2775 paste (s, strlen (s));
2779 free (s); 2776 free (s);
2780 } 2777 }
2781 else 2778 else
2782#endif 2779#endif
2783 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2780 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0
2784 && cl) 2781 && cl)
2785 { 2782 {
2786 for (int i = 0; i < cr; i++) 2783 for (int i = 0; i < cr; i++)
2787 paste (cl[i], strlen (cl[i])); 2784 paste (cl[i], strlen (cl[i]));
2788 2785
… …
2870 else if (selnum == Sel_Secondary) 2867 else if (selnum == Sel_Secondary)
2871 sel = XA_SECONDARY; 2868 sel = XA_SECONDARY;
2872 else 2869 else
2873 sel = xa[XA_CLIPBOARD]; 2870 sel = xa[XA_CLIPBOARD];
2874 2871
2875 if (XGetSelectionOwner (display->display, sel) != None) 2872 if (XGetSelectionOwner (xdisp, sel) != None)
2876 { 2873 {
2877 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2874 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION],
2878 vt, selection_request_time); 2875 vt, selection_request_time);
2879 return 1; 2876 return 1;
2880 } 2877 }
2881 2878
2882 return 0; 2879 return 0;
… …
3035bool 3032bool
3036rxvt_term::selection_grab (Time tm) NOTHROW 3033rxvt_term::selection_grab (Time tm) NOTHROW
3037{ 3034{
3038 selection_time = tm; 3035 selection_time = tm;
3039 3036
3040 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3037 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
3041 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3038 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
3042 { 3039 {
3043 display->set_selection_owner (this); 3040 display->set_selection_owner (this);
3044 return true; 3041 return true;
3045 } 3042 }
3046 else 3043 else
… …
3050 } 3047 }
3051 3048
3052#if 0 3049#if 0
3053 XTextProperty ct; 3050 XTextProperty ct;
3054 3051
3055 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3052 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0)
3056 { 3053 {
3057 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3054 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3058 XFree (ct.value); 3055 XFree (ct.value);
3059 } 3056 }
3060#endif 3057#endif
… …
3508 */ 3505 */
3509void 3506void
3510rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3507rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3511{ 3508{
3512 XSelectionEvent ev; 3509 XSelectionEvent ev;
3513 dDisp;
3514 3510
3515 ev.type = SelectionNotify; 3511 ev.type = SelectionNotify;
3516 ev.property = None; 3512 ev.property = None;
3517 ev.display = rq.display; 3513 ev.display = rq.display;
3518 ev.requestor = rq.requestor; 3514 ev.requestor = rq.requestor;
… …
3532 *target++ = xa[XA_COMPOUND_TEXT]; 3528 *target++ = xa[XA_COMPOUND_TEXT];
3533#if X_HAVE_UTF8_STRING 3529#if X_HAVE_UTF8_STRING
3534 *target++ = xa[XA_UTF8_STRING]; 3530 *target++ = xa[XA_UTF8_STRING];
3535#endif 3531#endif
3536 3532
3537 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3533 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM,
3538 32, PropModeReplace, 3534 32, PropModeReplace,
3539 (unsigned char *)target_list, target - target_list); 3535 (unsigned char *)target_list, target - target_list);
3540 ev.property = rq.property; 3536 ev.property = rq.property;
3541 } 3537 }
3542#if TODO // TODO 3538#if TODO // TODO
… …
3545 /* TODO: Handle MULTIPLE */ 3541 /* TODO: Handle MULTIPLE */
3546 } 3542 }
3547#endif 3543#endif
3548 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3544 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3549 { 3545 {
3550 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3546 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target,
3551 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3547 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3552 ev.property = rq.property; 3548 ev.property = rq.property;
3553 } 3549 }
3554 else if (rq.target == XA_STRING 3550 else if (rq.target == XA_STRING
3555 || rq.target == xa[XA_TEXT] 3551 || rq.target == xa[XA_TEXT]
… …
3613 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3609 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3614 ct.nitems = strlen ((char *)ct.value); 3610 ct.nitems = strlen ((char *)ct.value);
3615 } 3611 }
3616 else 3612 else
3617#endif 3613#endif
3618 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3614 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3619 freect = 1; 3615 freect = 1;
3620 else 3616 else
3621 { 3617 {
3622 /* if we failed to convert then send it raw */ 3618 /* if we failed to convert then send it raw */
3623 ct.value = (unsigned char *)cl; 3619 ct.value = (unsigned char *)cl;
3624 ct.nitems = selectlen; 3620 ct.nitems = selectlen;
3625 ct.encoding = target; 3621 ct.encoding = target;
3626 } 3622 }
3627 3623
3628 XChangeProperty (disp, rq.requestor, rq.property, 3624 XChangeProperty (xdisp, rq.requestor, rq.property,
3629 ct.encoding, 8, PropModeReplace, 3625 ct.encoding, 8, PropModeReplace,
3630 ct.value, (int)ct.nitems); 3626 ct.value, (int)ct.nitems);
3631 ev.property = rq.property; 3627 ev.property = rq.property;
3632 3628
3633 if (freect) 3629 if (freect)
3634 XFree (ct.value); 3630 XFree (ct.value);
3635 } 3631 }
3636 3632
3637 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3633 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev);
3638} 3634}
3639 3635
3640/* ------------------------------------------------------------------------- * 3636/* ------------------------------------------------------------------------- *
3641 * MOUSE ROUTINES * 3637 * MOUSE ROUTINES *
3642 * ------------------------------------------------------------------------- */ 3638 * ------------------------------------------------------------------------- */
… …
3658void 3654void
3659rxvt_term::im_set_position (XPoint &pos) NOTHROW 3655rxvt_term::im_set_position (XPoint &pos) NOTHROW
3660{ 3656{
3661 XWindowAttributes xwa; 3657 XWindowAttributes xwa;
3662 3658
3663 XGetWindowAttributes (display->display, vt, &xwa); 3659 XGetWindowAttributes (xdisp, vt, &xwa);
3664 3660
3665 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3661 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3666 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3662 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3667} 3663}
3668#endif 3664#endif
… …
3764rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3760rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3765{ 3761{
3766 while (*s) 3762 while (*s)
3767 { 3763 {
3768 text_t t = *s++; 3764 text_t t = *s++;
3769 int width = wcwidth (t); 3765 int width = WCWIDTH (t);
3770 3766
3771 while (width--) 3767 while (width--)
3772 { 3768 {
3773 scr_overlay_set (x++, y, t); 3769 scr_overlay_set (x++, y, t);
3774 t = NOCHAR; 3770 t = NOCHAR;

Diff Legend

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