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.257 by root, Tue Jan 31 00:25:16 2006 UTC vs.
Revision 1.258 by root, Thu Feb 2 18:04:46 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 (xdisp, drawBuffer, 0, \ 98 XClearArea (dpy, 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 (xdisp, drawBuffer, x, y, \ 104 XClearArea (dpy, 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 (xdisp, drawBuffer, gc, \ 109 XFillRectangle (dpy, 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/* ------------------------------------------------------------------------- *
… …
1342 } 1342 }
1343 else 1343 else
1344 { 1344 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1345 ren = rstyle & (RS_fgMask | RS_bgMask);
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1347 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1348 ERASE_ROWS (row, num);
1349 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1350 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1351 } 1351 }
1352 1352
1353 for (; num--; row++) 1353 for (; num--; row++)
1354 { 1354 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
… …
1654 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1655#endif 1655#endif
1656#if TRANSPARENT 1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0) 1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif 1658#endif
1659 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1660
1661 XGCValues gcvalue; 1661 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1662 gcvalue.foreground = pix_colors[Color_fg];
1663 gcvalue.background = pix_colors[Color_bg]; 1663 gcvalue.background = pix_colors[Color_bg];
1664 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1664 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1665 1665
1666 scr_clear (); 1666 scr_clear ();
1667 scr_touch (true); 1667 scr_touch (true);
1668 } 1668 }
1669} 1669}
… …
1888 1888
1889# ifndef NO_MAPALERT 1889# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1890# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1891 if (OPTION (Opt_mapAlert))
1892# endif 1892# endif
1893 XMapWindow (xdisp, parent[0]); 1893 XMapWindow (dpy, parent[0]);
1894# endif 1894# endif
1895 1895
1896 if (OPTION (Opt_visualBell)) 1896 if (OPTION (Opt_visualBell))
1897 { 1897 {
1898 rvideo_bell = true; 1898 rvideo_bell = true;
… …
1900 display->flush (); 1900 display->flush ();
1901 1901
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1902 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1903 } 1903 }
1904 else 1904 else
1905 XBell (xdisp, 0); 1905 XBell (dpy, 0);
1906 1906
1907#endif 1907#endif
1908} 1908}
1909 1909
1910/* ------------------------------------------------------------------------- */ 1910/* ------------------------------------------------------------------------- */
… …
2149 { 2149 {
2150 /* also comes here at end if needed because of >= above */ 2150 /* also comes here at end if needed because of >= above */
2151 if (wlen < len) 2151 if (wlen < len)
2152 ::swap (wlen, len); 2152 ::swap (wlen, len);
2153 2153
2154 XCopyArea (xdisp, vt, vt, 2154 XCopyArea (dpy, vt, vt,
2155 gc, 0, Row2Pixel (len + i), 2155 gc, 0, Row2Pixel (len + i),
2156 (unsigned int)this->width, 2156 (unsigned int)this->width,
2157 (unsigned int)Height2Pixel (wlen - len + 1), 2157 (unsigned int)Height2Pixel (wlen - len + 1),
2158 0, Row2Pixel (len)); 2158 0, Row2Pixel (len));
2159 len = -1; 2159 len = -1;
… …
2353 2353
2354 if (rend & RS_Uline && font->descent > 1 && fore != back) 2354 if (rend & RS_Uline && font->descent > 1 && fore != back)
2355 { 2355 {
2356#if ENABLE_FRILLS 2356#if ENABLE_FRILLS
2357 if (ISSET_PIXCOLOR (Color_underline)) 2357 if (ISSET_PIXCOLOR (Color_underline))
2358 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2358 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2359 else 2359 else
2360#endif 2360#endif
2361 XSetForeground (xdisp, gc, pix_colors[fore]); 2361 XSetForeground (dpy, gc, pix_colors[fore]);
2362 2362
2363 XDrawLine (xdisp, drawBuffer, gc, 2363 XDrawLine (dpy, drawBuffer, gc,
2364 xpixel, ypixel + font->ascent + 1, 2364 xpixel, ypixel + font->ascent + 1,
2365 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2365 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2366 } 2366 }
2367 } /* for (col....) */ 2367 } /* for (col....) */
2368 } /* for (row....) */ 2368 } /* for (row....) */
… …
2401 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2401 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2402 cursorwidth++; 2402 cursorwidth++;
2403 2403
2404#ifndef NO_CURSORCOLOR 2404#ifndef NO_CURSORCOLOR
2405 if (ISSET_PIXCOLOR (Color_cursor)) 2405 if (ISSET_PIXCOLOR (Color_cursor))
2406 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2406 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2407#endif 2407#endif
2408 2408
2409 XDrawRectangle (xdisp, drawBuffer, gc, 2409 XDrawRectangle (dpy, drawBuffer, gc,
2410 Col2Pixel (col), 2410 Col2Pixel (col),
2411 Row2Pixel (oldcursor.row), 2411 Row2Pixel (oldcursor.row),
2412 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2412 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2413 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2413 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2414 } 2414 }
… …
2458#if XPM_BACKGROUND 2458#if XPM_BACKGROUND
2459 && !bgPixmap.pixmap 2459 && !bgPixmap.pixmap
2460#endif 2460#endif
2461 ) 2461 )
2462 { 2462 {
2463 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2463 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2464 XClearWindow (xdisp, parent[0]); 2464 XClearWindow (dpy, parent[0]);
2465 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2465 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2466#if HAVE_SCROLLBARS 2466#if HAVE_SCROLLBARS
2467 if (scrollBar.win) 2467 if (scrollBar.win)
2468 { 2468 {
2469 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2469 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2470 scrollBar.setIdle (); 2470 scrollBar.setIdle ();
2471 scrollbar_show (0); 2471 scrollbar_show (0);
2472 } 2472 }
2473#endif 2473#endif
2474 } 2474 }
… …
2487 2487
2488 num_scr_allow = 0; 2488 num_scr_allow = 0;
2489 want_refresh = 1; 2489 want_refresh = 1;
2490 2490
2491 if (really) 2491 if (really)
2492 XClearWindow (xdisp, vt); 2492 XClearWindow (dpy, vt);
2493} 2493}
2494 2494
2495void 2495void
2496rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2496rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2497{ 2497{
… …
2672 } 2672 }
2673 2673
2674 unsigned long bytes_after; 2674 unsigned long bytes_after;
2675 XTextProperty ct; 2675 XTextProperty ct;
2676 2676
2677 if (XGetWindowProperty (xdisp, win, prop, 2677 if (XGetWindowProperty (dpy, win, prop,
2678 0, PROP_SIZE / 4, 2678 0, PROP_SIZE / 4,
2679 delete_prop, AnyPropertyType, 2679 delete_prop, AnyPropertyType,
2680 &ct.encoding, &ct.format, 2680 &ct.encoding, &ct.format,
2681 &ct.nitems, &bytes_after, 2681 &ct.nitems, &bytes_after,
2682 &ct.value) != Success) 2682 &ct.value) != Success)
… …
2691 if (bytes_after) 2691 if (bytes_after)
2692 { 2692 {
2693 // fetch and append remaining data 2693 // fetch and append remaining data
2694 XTextProperty ct2; 2694 XTextProperty ct2;
2695 2695
2696 if (XGetWindowProperty (xdisp, win, prop, 2696 if (XGetWindowProperty (dpy, win, prop,
2697 ct.nitems / 4, (bytes_after + 3) / 4, 2697 ct.nitems / 4, (bytes_after + 3) / 4,
2698 delete_prop, AnyPropertyType, 2698 delete_prop, AnyPropertyType,
2699 &ct2.encoding, &ct2.format, 2699 &ct2.encoding, &ct2.format,
2700 &ct2.nitems, &bytes_after, 2700 &ct2.nitems, &bytes_after,
2701 &ct2.value) != Success) 2701 &ct2.value) != Success)
… …
2714 2714
2715 if (ct.encoding == xa[XA_INCR]) 2715 if (ct.encoding == xa[XA_INCR])
2716 { 2716 {
2717 // INCR selection, start handshake 2717 // INCR selection, start handshake
2718 if (!delete_prop) 2718 if (!delete_prop)
2719 XDeleteProperty (xdisp, win, prop); 2719 XDeleteProperty (dpy, win, prop);
2720 2720
2721 selection_wait = Sel_incr; 2721 selection_wait = Sel_incr;
2722 incr_buf_fill = 0; 2722 incr_buf_fill = 0;
2723 incr_ev.start (NOW + 10); 2723 incr_ev.start (NOW + 10);
2724 2724
… …
2785 paste (s, strlen (s)); 2785 paste (s, strlen (s));
2786 free (s); 2786 free (s);
2787 } 2787 }
2788 else 2788 else
2789#endif 2789#endif
2790 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2790 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2791 && cl) 2791 && cl)
2792 { 2792 {
2793 for (int i = 0; i < cr; i++) 2793 for (int i = 0; i < cr; i++)
2794 paste (cl[i], strlen (cl[i])); 2794 paste (cl[i], strlen (cl[i]));
2795 2795
… …
2877 else if (selnum == Sel_Secondary) 2877 else if (selnum == Sel_Secondary)
2878 sel = XA_SECONDARY; 2878 sel = XA_SECONDARY;
2879 else 2879 else
2880 sel = xa[XA_CLIPBOARD]; 2880 sel = xa[XA_CLIPBOARD];
2881 2881
2882 if (XGetSelectionOwner (xdisp, sel) != None) 2882 if (XGetSelectionOwner (dpy, sel) != None)
2883 { 2883 {
2884 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2884 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2885 vt, selection_request_time); 2885 vt, selection_request_time);
2886 return 1; 2886 return 1;
2887 } 2887 }
2888 2888
2889 return 0; 2889 return 0;
… …
3042bool 3042bool
3043rxvt_term::selection_grab (Time tm) NOTHROW 3043rxvt_term::selection_grab (Time tm) NOTHROW
3044{ 3044{
3045 selection_time = tm; 3045 selection_time = tm;
3046 3046
3047 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); 3047 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3048 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) 3048 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3049 { 3049 {
3050 display->set_selection_owner (this); 3050 display->set_selection_owner (this);
3051 return true; 3051 return true;
3052 } 3052 }
3053 else 3053 else
… …
3057 } 3057 }
3058 3058
3059#if 0 3059#if 0
3060 XTextProperty ct; 3060 XTextProperty ct;
3061 3061
3062 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3062 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3063 { 3063 {
3064 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3064 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3065 XFree (ct.value); 3065 XFree (ct.value);
3066 } 3066 }
3067#endif 3067#endif
… …
3540 *target++ = xa[XA_COMPOUND_TEXT]; 3540 *target++ = xa[XA_COMPOUND_TEXT];
3541#if X_HAVE_UTF8_STRING 3541#if X_HAVE_UTF8_STRING
3542 *target++ = xa[XA_UTF8_STRING]; 3542 *target++ = xa[XA_UTF8_STRING];
3543#endif 3543#endif
3544 3544
3545 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3545 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3546 32, PropModeReplace, 3546 32, PropModeReplace,
3547 (unsigned char *)target_list, target - target_list); 3547 (unsigned char *)target_list, target - target_list);
3548 ev.property = rq.property; 3548 ev.property = rq.property;
3549 } 3549 }
3550#if TODO // TODO 3550#if TODO // TODO
… …
3553 /* TODO: Handle MULTIPLE */ 3553 /* TODO: Handle MULTIPLE */
3554 } 3554 }
3555#endif 3555#endif
3556 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3556 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3557 { 3557 {
3558 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3558 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3559 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3559 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3560 ev.property = rq.property; 3560 ev.property = rq.property;
3561 } 3561 }
3562 else if (rq.target == XA_STRING 3562 else if (rq.target == XA_STRING
3563 || rq.target == xa[XA_TEXT] 3563 || rq.target == xa[XA_TEXT]
… …
3621 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3621 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3622 ct.nitems = strlen ((char *)ct.value); 3622 ct.nitems = strlen ((char *)ct.value);
3623 } 3623 }
3624 else 3624 else
3625#endif 3625#endif
3626 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3626 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3627 freect = 1; 3627 freect = 1;
3628 else 3628 else
3629 { 3629 {
3630 /* if we failed to convert then send it raw */ 3630 /* if we failed to convert then send it raw */
3631 ct.value = (unsigned char *)cl; 3631 ct.value = (unsigned char *)cl;
3632 ct.nitems = selectlen; 3632 ct.nitems = selectlen;
3633 ct.encoding = target; 3633 ct.encoding = target;
3634 } 3634 }
3635 3635
3636 XChangeProperty (xdisp, rq.requestor, rq.property, 3636 XChangeProperty (dpy, rq.requestor, rq.property,
3637 ct.encoding, 8, PropModeReplace, 3637 ct.encoding, 8, PropModeReplace,
3638 ct.value, (int)ct.nitems); 3638 ct.value, (int)ct.nitems);
3639 ev.property = rq.property; 3639 ev.property = rq.property;
3640 3640
3641 if (freect) 3641 if (freect)
3642 XFree (ct.value); 3642 XFree (ct.value);
3643 } 3643 }
3644 3644
3645 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3645 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3646} 3646}
3647 3647
3648/* ------------------------------------------------------------------------- * 3648/* ------------------------------------------------------------------------- *
3649 * MOUSE ROUTINES * 3649 * MOUSE ROUTINES *
3650 * ------------------------------------------------------------------------- */ 3650 * ------------------------------------------------------------------------- */
… …
3666void 3666void
3667rxvt_term::im_set_position (XPoint &pos) NOTHROW 3667rxvt_term::im_set_position (XPoint &pos) NOTHROW
3668{ 3668{
3669 XWindowAttributes xwa; 3669 XWindowAttributes xwa;
3670 3670
3671 XGetWindowAttributes (xdisp, vt, &xwa); 3671 XGetWindowAttributes (dpy, vt, &xwa);
3672 3672
3673 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3673 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3674 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3674 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3675} 3675}
3676#endif 3676#endif

Diff Legend

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