ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtcolor.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtcolor.C (file contents):
Revision 1.7 by pcg, Thu Feb 12 01:42:03 2004 UTC vs.
Revision 1.10 by pcg, Mon Mar 29 21:02:11 2004 UTC

2#include <rxvt.h> 2#include <rxvt.h>
3#include <rxvtcolor.h> 3#include <rxvtcolor.h>
4 4
5#include <unistd.h> 5#include <unistd.h>
6#include <fcntl.h> 6#include <fcntl.h>
7
8class byteorder byteorder;
9
10byteorder::byteorder ()
11{
12 union {
13 uint32_t u;
14 uint8_t b[4];
15 } w;
16
17 w.b[0] = 0x11;
18 w.b[1] = 0x22;
19 w.b[2] = 0x33;
20 w.b[3] = 0x44;
21
22 e = w.u;
23}
7 24
8refcounted::refcounted (const char *id) 25refcounted::refcounted (const char *id)
9{ 26{
10 this->id = STRDUP (id); 27 this->id = STRDUP (id);
11} 28}
110} 127}
111 128
112bool rxvt_display::init () 129bool rxvt_display::init ()
113{ 130{
114 display = XOpenDisplay (id); 131 display = XOpenDisplay (id);
132
133 if (!display)
134 return false;
115 135
116 screen = DefaultScreen (display); 136 screen = DefaultScreen (display);
117 root = DefaultRootWindow (display); 137 root = DefaultRootWindow (display);
118 visual = DefaultVisual (display, screen); 138 visual = DefaultVisual (display, screen);
119 cmap = DefaultColormap (display, screen); 139 cmap = DefaultColormap (display, screen);
152 172
153rxvt_display::~rxvt_display () 173rxvt_display::~rxvt_display ()
154{ 174{
155 x_ev.stop (); 175 x_ev.stop ();
156 176
177 if (display)
157 XCloseDisplay (display); 178 XCloseDisplay (display);
158} 179}
159 180
160void rxvt_display::im_change_cb () 181void rxvt_display::im_change_cb ()
161{ 182{
162 for (im_watcher **i = imw.begin (); i != imw.end (); ++i) 183 for (im_watcher **i = imw.begin (); i != imw.end (); ++i)
339rxvt_color::free (rxvt_display *display) 360rxvt_color::free (rxvt_display *display)
340{ 361{
341#if XFT 362#if XFT
342 XftColorFree (display->display, display->visual, display->cmap, &c); 363 XftColorFree (display->display, display->visual, display->cmap, &c);
343#else 364#else
344 XFreeColors (display->display, display->cmap, &c, 1, AllPlanes); 365 XFreeColors (display->display, display->cmap, &p, 1, AllPlanes);
345#endif 366#endif
346} 367}
347 368

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines