… | … | ||
---|---|---|---|
37 | int width, height, ascent; | 37 | int width, height, ascent; |
38 | int weight, slant; | 38 | int weight, slant; |
39 | }; | 39 | }; |
40 | 40 | ||
41 | struct rxvt_drawable { | 41 | struct rxvt_drawable { |
42 | rxvt_display *display; | 42 | rxvt_screen *screen; |
43 | #if XFT | 43 | #if XFT |
44 | XftDraw *xftdrawable; | 44 | XftDraw *xftdrawable; |
45 | operator XftDraw *(); | 45 | operator XftDraw *(); |
46 | #endif | 46 | #endif |
47 | Drawable drawable; | 47 | Drawable drawable; |
48 | 48 | ||
49 | rxvt_drawable (rxvt_display *display, Drawable drawable) | 49 | rxvt_drawable (rxvt_screen *screen, Drawable drawable) |
50 | : display(display), | 50 | : screen(screen), |
51 | #if XFT | 51 | #if XFT |
52 | xftdrawable(0), | 52 | xftdrawable(0), |
53 | #endif | 53 | #endif |
54 | drawable(drawable) | 54 | drawable(drawable) |
55 | { } | 55 | { } |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |