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.251 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.252 by root, Wed Jan 25 21:09:21 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/* ------------------------------------------------------------------------- *
… …
1338 } 1338 }
1339 else 1339 else
1340 { 1340 {
1341 ren = rstyle & (RS_fgMask | RS_bgMask); 1341 ren = rstyle & (RS_fgMask | RS_bgMask);
1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1343 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1343 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1344 ERASE_ROWS (row, num); 1344 ERASE_ROWS (row, num);
1345 gcvalue.foreground = pix_colors[Color_fg]; 1345 gcvalue.foreground = pix_colors[Color_fg];
1346 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1346 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1347 } 1347 }
1348 1348
1349 for (; num--; row++) 1349 for (; num--; row++)
1350 { 1350 {
1351 scr_blank_screen_mem (ROW(row), rstyle); 1351 scr_blank_screen_mem (ROW(row), rstyle);
… …
1650 if (bgPixmap.pixmap == None) 1650 if (bgPixmap.pixmap == None)
1651#endif 1651#endif
1652#if TRANSPARENT 1652#if TRANSPARENT
1653 if (!OPTION (Opt_transparent) || am_transparent == 0) 1653 if (!OPTION (Opt_transparent) || am_transparent == 0)
1654#endif 1654#endif
1655 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 1655 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
1656 1656
1657 XGCValues gcvalue; 1657 XGCValues gcvalue;
1658 gcvalue.foreground = pix_colors[Color_fg]; 1658 gcvalue.foreground = pix_colors[Color_fg];
1659 gcvalue.background = pix_colors[Color_bg]; 1659 gcvalue.background = pix_colors[Color_bg];
1660 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); 1660 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue);
1661 1661
1662 scr_clear (); 1662 scr_clear ();
1663 scr_touch (true); 1663 scr_touch (true);
1664 } 1664 }
1665} 1665}
… …
1885 1885
1886# ifndef NO_MAPALERT 1886# ifndef NO_MAPALERT
1887# ifdef MAPALERT_OPTION 1887# ifdef MAPALERT_OPTION
1888 if (OPTION (Opt_mapAlert)) 1888 if (OPTION (Opt_mapAlert))
1889# endif 1889# endif
1890 XMapWindow (display->display, parent[0]); 1890 XMapWindow (xdisp, parent[0]);
1891# endif 1891# endif
1892 1892
1893 if (OPTION (Opt_visualBell)) 1893 if (OPTION (Opt_visualBell))
1894 { 1894 {
1895 rvideo_bell = true; 1895 rvideo_bell = true;
… …
1897 display->flush (); 1897 display->flush ();
1898 1898
1899 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1899 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1900 } 1900 }
1901 else 1901 else
1902 XBell (display->display, 0); 1902 XBell (xdisp, 0);
1903 1903
1904#endif 1904#endif
1905} 1905}
1906 1906
1907/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
… …
2146 { 2146 {
2147 /* also comes here at end if needed because of >= above */ 2147 /* also comes here at end if needed because of >= above */
2148 if (wlen < len) 2148 if (wlen < len)
2149 ::swap (wlen, len); 2149 ::swap (wlen, len);
2150 2150
2151 XCopyArea (display->display, vt, vt, 2151 XCopyArea (xdisp, vt, vt,
2152 gc, 0, Row2Pixel (len + i), 2152 gc, 0, Row2Pixel (len + i),
2153 (unsigned int)this->width, 2153 (unsigned int)this->width,
2154 (unsigned int)Height2Pixel (wlen - len + 1), 2154 (unsigned int)Height2Pixel (wlen - len + 1),
2155 0, Row2Pixel (len)); 2155 0, Row2Pixel (len));
2156 len = -1; 2156 len = -1;
… …
2352 2352
2353 if (rend & RS_Uline && font->descent > 1 && fore != back) 2353 if (rend & RS_Uline && font->descent > 1 && fore != back)
2354 { 2354 {
2355#if ENABLE_FRILLS 2355#if ENABLE_FRILLS
2356 if (ISSET_PIXCOLOR (Color_underline)) 2356 if (ISSET_PIXCOLOR (Color_underline))
2357 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2357 XSetForeground (xdisp, gc, pix_colors[Color_underline]);
2358 else 2358 else
2359#endif 2359#endif
2360 XSetForeground (display->display, gc, pix_colors[fore]); 2360 XSetForeground (xdisp, gc, pix_colors[fore]);
2361 2361
2362 XDrawLine (display->display, drawBuffer, gc, 2362 XDrawLine (xdisp, drawBuffer, gc,
2363 xpixel, ypixel + font->ascent + 1, 2363 xpixel, ypixel + font->ascent + 1,
2364 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2364 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2365 } 2365 }
2366 } /* for (col....) */ 2366 } /* for (col....) */
2367 } /* for (row....) */ 2367 } /* for (row....) */
… …
2400 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2400 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2401 cursorwidth++; 2401 cursorwidth++;
2402 2402
2403#ifndef NO_CURSORCOLOR 2403#ifndef NO_CURSORCOLOR
2404 if (ISSET_PIXCOLOR (Color_cursor)) 2404 if (ISSET_PIXCOLOR (Color_cursor))
2405 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2405 XSetForeground (xdisp, gc, pix_colors[Color_cursor]);
2406#endif 2406#endif
2407 2407
2408 XDrawRectangle (display->display, drawBuffer, gc, 2408 XDrawRectangle (xdisp, drawBuffer, gc,
2409 Col2Pixel (col), 2409 Col2Pixel (col),
2410 Row2Pixel (oldcursor.row), 2410 Row2Pixel (oldcursor.row),
2411 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2411 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2412 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2412 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2413 } 2413 }
… …
2457#if XPM_BACKGROUND 2457#if XPM_BACKGROUND
2458 && !bgPixmap.pixmap 2458 && !bgPixmap.pixmap
2459#endif 2459#endif
2460 ) 2460 )
2461 { 2461 {
2462 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2462 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]);
2463 XClearWindow (display->display, parent[0]); 2463 XClearWindow (xdisp, parent[0]);
2464 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2464 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
2465#if HAVE_SCROLLBARS 2465#if HAVE_SCROLLBARS
2466 if (scrollBar.win) 2466 if (scrollBar.win)
2467 { 2467 {
2468 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2468 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]);
2469 scrollBar.setIdle (); 2469 scrollBar.setIdle ();
2470 scrollbar_show (0); 2470 scrollbar_show (0);
2471 } 2471 }
2472#endif 2472#endif
2473 } 2473 }
… …
2486 2486
2487 num_scr_allow = 0; 2487 num_scr_allow = 0;
2488 want_refresh = 1; 2488 want_refresh = 1;
2489 2489
2490 if (really) 2490 if (really)
2491 XClearWindow (display->display, vt); 2491 XClearWindow (xdisp, vt);
2492} 2492}
2493 2493
2494void 2494void
2495rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2495rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2496{ 2496{
… …
2671 } 2671 }
2672 2672
2673 unsigned long bytes_after; 2673 unsigned long bytes_after;
2674 XTextProperty ct; 2674 XTextProperty ct;
2675 2675
2676 if (XGetWindowProperty (display->display, win, prop, 2676 if (XGetWindowProperty (xdisp, win, prop,
2677 0, PROP_SIZE / 4, 2677 0, PROP_SIZE / 4,
2678 delete_prop, AnyPropertyType, 2678 delete_prop, AnyPropertyType,
2679 &ct.encoding, &ct.format, 2679 &ct.encoding, &ct.format,
2680 &ct.nitems, &bytes_after, 2680 &ct.nitems, &bytes_after,
2681 &ct.value) != Success) 2681 &ct.value) != Success)
… …
2690 if (bytes_after) 2690 if (bytes_after)
2691 { 2691 {
2692 // fetch and append remaining data 2692 // fetch and append remaining data
2693 XTextProperty ct2; 2693 XTextProperty ct2;
2694 2694
2695 if (XGetWindowProperty (display->display, win, prop, 2695 if (XGetWindowProperty (xdisp, win, prop,
2696 ct.nitems / 4, (bytes_after + 3) / 4, 2696 ct.nitems / 4, (bytes_after + 3) / 4,
2697 delete_prop, AnyPropertyType, 2697 delete_prop, AnyPropertyType,
2698 &ct2.encoding, &ct2.format, 2698 &ct2.encoding, &ct2.format,
2699 &ct2.nitems, &bytes_after, 2699 &ct2.nitems, &bytes_after,
2700 &ct2.value) != Success) 2700 &ct2.value) != Success)
… …
2713 2713
2714 if (ct.encoding == xa[XA_INCR]) 2714 if (ct.encoding == xa[XA_INCR])
2715 { 2715 {
2716 // INCR selection, start handshake 2716 // INCR selection, start handshake
2717 if (!delete_prop) 2717 if (!delete_prop)
2718 XDeleteProperty (display->display, win, prop); 2718 XDeleteProperty (xdisp, win, prop);
2719 2719
2720 selection_wait = Sel_incr; 2720 selection_wait = Sel_incr;
2721 incr_buf_fill = 0; 2721 incr_buf_fill = 0;
2722 incr_ev.start (NOW + 10); 2722 incr_ev.start (NOW + 10);
2723 2723
… …
2784 paste (s, strlen (s)); 2784 paste (s, strlen (s));
2785 free (s); 2785 free (s);
2786 } 2786 }
2787 else 2787 else
2788#endif 2788#endif
2789 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2789 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0
2790 && cl) 2790 && cl)
2791 { 2791 {
2792 for (int i = 0; i < cr; i++) 2792 for (int i = 0; i < cr; i++)
2793 paste (cl[i], strlen (cl[i])); 2793 paste (cl[i], strlen (cl[i]));
2794 2794
… …
2876 else if (selnum == Sel_Secondary) 2876 else if (selnum == Sel_Secondary)
2877 sel = XA_SECONDARY; 2877 sel = XA_SECONDARY;
2878 else 2878 else
2879 sel = xa[XA_CLIPBOARD]; 2879 sel = xa[XA_CLIPBOARD];
2880 2880
2881 if (XGetSelectionOwner (display->display, sel) != None) 2881 if (XGetSelectionOwner (xdisp, sel) != None)
2882 { 2882 {
2883 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2883 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION],
2884 vt, selection_request_time); 2884 vt, selection_request_time);
2885 return 1; 2885 return 1;
2886 } 2886 }
2887 2887
2888 return 0; 2888 return 0;
… …
3041bool 3041bool
3042rxvt_term::selection_grab (Time tm) NOTHROW 3042rxvt_term::selection_grab (Time tm) NOTHROW
3043{ 3043{
3044 selection_time = tm; 3044 selection_time = tm;
3045 3045
3046 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3046 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
3047 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3047 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
3048 { 3048 {
3049 display->set_selection_owner (this); 3049 display->set_selection_owner (this);
3050 return true; 3050 return true;
3051 } 3051 }
3052 else 3052 else
… …
3056 } 3056 }
3057 3057
3058#if 0 3058#if 0
3059 XTextProperty ct; 3059 XTextProperty ct;
3060 3060
3061 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3061 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0)
3062 { 3062 {
3063 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3063 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3064 XFree (ct.value); 3064 XFree (ct.value);
3065 } 3065 }
3066#endif 3066#endif
… …
3663void 3663void
3664rxvt_term::im_set_position (XPoint &pos) NOTHROW 3664rxvt_term::im_set_position (XPoint &pos) NOTHROW
3665{ 3665{
3666 XWindowAttributes xwa; 3666 XWindowAttributes xwa;
3667 3667
3668 XGetWindowAttributes (display->display, vt, &xwa); 3668 XGetWindowAttributes (xdisp, vt, &xwa);
3669 3669
3670 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3670 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3671 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3671 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3672} 3672}
3673#endif 3673#endif

Diff Legend

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