| … | |
… | |
| 110 | } |
110 | } |
| 111 | |
111 | |
| 112 | bool rxvt_display::init () |
112 | bool rxvt_display::init () |
| 113 | { |
113 | { |
| 114 | display = XOpenDisplay (id); |
114 | display = XOpenDisplay (id); |
|
|
115 | |
|
|
116 | if (!display) |
|
|
117 | return false; |
| 115 | |
118 | |
| 116 | screen = DefaultScreen (display); |
119 | screen = DefaultScreen (display); |
| 117 | root = DefaultRootWindow (display); |
120 | root = DefaultRootWindow (display); |
| 118 | visual = DefaultVisual (display, screen); |
121 | visual = DefaultVisual (display, screen); |
| 119 | cmap = DefaultColormap (display, screen); |
122 | cmap = DefaultColormap (display, screen); |
| … | |
… | |
| 152 | |
155 | |
| 153 | rxvt_display::~rxvt_display () |
156 | rxvt_display::~rxvt_display () |
| 154 | { |
157 | { |
| 155 | x_ev.stop (); |
158 | x_ev.stop (); |
| 156 | |
159 | |
|
|
160 | if (display) |
| 157 | XCloseDisplay (display); |
161 | XCloseDisplay (display); |
| 158 | } |
162 | } |
| 159 | |
163 | |
| 160 | void rxvt_display::im_change_cb () |
164 | void rxvt_display::im_change_cb () |
| 161 | { |
165 | { |
| 162 | for (im_watcher **i = imw.begin (); i != imw.end (); ++i) |
166 | for (im_watcher **i = imw.begin (); i != imw.end (); ++i) |
| … | |
… | |
| 339 | rxvt_color::free (rxvt_display *display) |
343 | rxvt_color::free (rxvt_display *display) |
| 340 | { |
344 | { |
| 341 | #if XFT |
345 | #if XFT |
| 342 | XftColorFree (display->display, display->visual, display->cmap, &c); |
346 | XftColorFree (display->display, display->visual, display->cmap, &c); |
| 343 | #else |
347 | #else |
| 344 | XFreeColors (display->display, display->cmap, &c, 1, AllPlanes); |
348 | XFreeColors (display->display, display->cmap, &p, 1, AllPlanes); |
| 345 | #endif |
349 | #endif |
| 346 | } |
350 | } |
| 347 | |
351 | |
