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.6 by pcg, Wed Feb 11 08:13:45 2004 UTC vs.
Revision 1.18 by root, Fri Jul 30 14:12:38 2004 UTC

1/*--------------------------------*-C-*---------------------------------*
2 * File: rxvtcolor.C
3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *----------------------------------------------------------------------*/
22
1#include "../config.h" 23#include "../config.h"
2#include <rxvt.h> 24#include <rxvt.h>
3#include <rxvtcolor.h> 25#include <rxvtcolor.h>
4 26
5#include <unistd.h> 27#include <unistd.h>
6#include <fcntl.h> 28#include <fcntl.h>
7 29
30class byteorder byteorder;
31
32byteorder::byteorder ()
33{
34 union {
35 uint32_t u;
36 uint8_t b[4];
37 } w;
38
39 w.b[0] = 0x11;
40 w.b[1] = 0x22;
41 w.b[2] = 0x33;
42 w.b[3] = 0x44;
43
44 e = w.u;
45}
46
8refcounted::refcounted (const char *id) 47refcounted::refcounted (const char *id)
9{ 48{
10 this->id = STRDUP (id); 49 this->id = STRDUP (id);
11} 50}
12 51
… …
16} 55}
17 56
18template<class T> 57template<class T>
19T *refcache<T>::get (const char *id) 58T *refcache<T>::get (const char *id)
20{ 59{
21 for (T **i = begin (); i < end (); ++i) 60 for (T **i = this->begin (); i < this->end (); ++i)
22 { 61 {
23 if (!strcmp (id, (*i)->id)) 62 if (!strcmp (id, (*i)->id))
24 { 63 {
25 (*i)->referenced++; 64 (*i)->referenced++;
26 return *i; 65 return *i;
… …
31 70
32 obj->referenced = 1; 71 obj->referenced = 1;
33 72
34 if (obj && obj->init ()) 73 if (obj && obj->init ())
35 { 74 {
36 push_back (obj); 75 this->push_back (obj);
37 return obj; 76 return obj;
38 } 77 }
39 else 78 else
40 { 79 {
41 delete obj; 80 delete obj;
… …
49 if (!obj) 88 if (!obj)
50 return; 89 return;
51 90
52 if (!--obj->referenced) 91 if (!--obj->referenced)
53 { 92 {
54 erase (find (begin (), end (), obj)); 93 this->erase (find (this->begin (), this->end (), obj));
55 delete obj; 94 delete obj;
56 } 95 }
57} 96}
58 97
59template<class T> 98template<class T>
60refcache<T>::~refcache () 99refcache<T>::~refcache ()
61{ 100{
62 while (size ()) 101 while (this->size ())
63 put (*begin ()); 102 put (*this->begin ());
64} 103}
65 104
66///////////////////////////////////////////////////////////////////////////// 105/////////////////////////////////////////////////////////////////////////////
67 106
107#ifdef USE_XIM
68static void 108static void
69im_destroy_cb (XIM unused1, XPointer client_data, XPointer unused3) 109im_destroy_cb (XIM unused1, XPointer client_data, XPointer unused3)
70{ 110{
71 rxvt_xim *xim = (rxvt_xim *)client_data; 111 rxvt_xim *xim = (rxvt_xim *)client_data;
72 rxvt_display *display = xim->display; 112 rxvt_display *display = xim->display;
… …
97rxvt_xim::~rxvt_xim () 137rxvt_xim::~rxvt_xim ()
98{ 138{
99 if (xim) 139 if (xim)
100 XCloseIM (xim); 140 XCloseIM (xim);
101} 141}
142#endif
102 143
103///////////////////////////////////////////////////////////////////////////// 144/////////////////////////////////////////////////////////////////////////////
104 145
105rxvt_display::rxvt_display (const char *id) 146rxvt_display::rxvt_display (const char *id)
106: refcounted (id) 147: refcounted (id)
107, x_watcher (this, &rxvt_display::x_event) 148, x_ev (this, &rxvt_display::x_cb)
108, selection_owner (0) 149, selection_owner (0)
109{ 150{
110} 151}
111 152
112bool rxvt_display::init () 153bool rxvt_display::init ()
113{ 154{
114 display = XOpenDisplay (id); 155 display = XOpenDisplay (id);
156
157 if (!display)
158 return false;
115 159
116 screen = DefaultScreen (display); 160 screen = DefaultScreen (display);
117 root = DefaultRootWindow (display); 161 root = DefaultRootWindow (display);
118 visual = DefaultVisual (display, screen); 162 visual = DefaultVisual (display, screen);
119 cmap = DefaultColormap (display, screen); 163 cmap = DefaultColormap (display, screen);
… …
137 } 181 }
138 } 182 }
139#endif 183#endif
140 184
141 int fd = XConnectionNumber (display); 185 int fd = XConnectionNumber (display);
142 x_watcher.start (fd, EVENT_READ); 186 x_ev.start (fd, EVENT_READ);
143 fcntl (fd, F_SETFL, FD_CLOEXEC); 187 fcntl (fd, F_SETFD, FD_CLOEXEC);
144 188
145 XSelectInput (display, root, PropertyChangeMask); 189 XSelectInput (display, root, PropertyChangeMask);
190#ifdef USE_XIM
146 xa_xim_servers = XInternAtom (display, "XIM_SERVERS", 0); 191 xa_xim_servers = XInternAtom (display, "XIM_SERVERS", 0);
192#endif
193
194 flush ();
147 195
148 return true; 196 return true;
149} 197}
150 198
151rxvt_display::~rxvt_display () 199rxvt_display::~rxvt_display ()
152{ 200{
153 x_watcher.stop (); 201 x_ev.stop ();
154 202
203 if (display)
155 XCloseDisplay (display); 204 XCloseDisplay (display);
156} 205}
157 206
207#ifdef USE_XIM
158void rxvt_display::im_change_cb () 208void rxvt_display::im_change_cb ()
159{ 209{
160 for (im_watcher **i = imw.begin (); i != imw.end (); ++i) 210 for (im_watcher **i = imw.begin (); i != imw.end (); ++i)
161 (*i)->call (); 211 (*i)->call ();
162} 212}
213#endif
163 214
164void rxvt_display::x_event (io_watcher &w, short revents) 215void rxvt_display::x_cb (io_watcher &w, short revents)
165{ 216{
166 do 217 do
167 { 218 {
168 XEvent xev; 219 XEvent xev;
169 XNextEvent (display, &xev); 220 XNextEvent (display, &xev);
170 221
171 //printf ("T %d w %lx\n", xev.type, xev.xany.window);//D 222 //printf ("T %d w %lx\n", xev.type, xev.xany.window);//D
172 223
224#ifdef USE_XIM
173 if (xev.type == PropertyNotify 225 if (xev.type == PropertyNotify
174 && xev.xany.window == root 226 && xev.xany.window == root
175 && xev.xproperty.atom == xa_xim_servers) 227 && xev.xproperty.atom == xa_xim_servers)
176 im_change_cb (); 228 im_change_cb ();
229#endif
177 230
178 for (int i = xw.size (); i--; ) 231 for (int i = xw.size (); i--; )
179 { 232 {
180 if (!xw[i]) 233 if (!xw[i])
181 xw.erase_unordered (i); 234 xw.erase_unordered (i);
182 else if (xw[i]->window == xev.xany.window) 235 else if (xw[i]->window == xev.xany.window)
183 xw[i]->call (xev); 236 xw[i]->call (xev);
184 } 237 }
185 } 238 }
186 while (XPending (display)); 239 while (XPending (display));
240
241 flush ();
242}
243
244void rxvt_display::flush ()
245{
246 for (;;)
247 {
248 XFlush (display);
249
250 if (!XPending (display))
251 break;
252
253 x_cb (x_ev, 0);
254 }
187} 255}
188 256
189void rxvt_display::reg (xevent_watcher *w) 257void rxvt_display::reg (xevent_watcher *w)
190{ 258{
191 xw.push_back (w); 259 xw.push_back (w);
… …
196{ 264{
197 if (w->active) 265 if (w->active)
198 xw[w->active - 1] = 0; 266 xw[w->active - 1] = 0;
199} 267}
200 268
201void rxvt_display::reg (im_watcher *w)
202{
203 imw.push_back (w);
204}
205
206void rxvt_display::unreg (im_watcher *w)
207{
208 imw.erase (find (imw.begin (), imw.end (), w));
209}
210
211void rxvt_display::set_selection_owner (rxvt_term *owner) 269void rxvt_display::set_selection_owner (rxvt_term *owner)
212{ 270{
213 if (selection_owner && selection_owner != owner) 271 if (selection_owner && selection_owner != owner)
214 selection_owner->selection_clear (); 272 selection_owner->selection_clear ();
215 273
216 selection_owner = owner; 274 selection_owner = owner;
217} 275}
218 276
277#ifdef USE_XIM
278void rxvt_display::reg (im_watcher *w)
279{
280 imw.push_back (w);
281}
282
283void rxvt_display::unreg (im_watcher *w)
284{
285 imw.erase (find (imw.begin (), imw.end (), w));
286}
287
219rxvt_xim *rxvt_display::get_xim (const char *locale, const char *modifiers) 288rxvt_xim *rxvt_display::get_xim (const char *locale, const char *modifiers)
220{ 289{
221 // asprintf is a GNU and *BSD extension.. sorry...
222 char *id; 290 char *id;
291 int l, m;
223 292
224 if (asprintf (&id, "%s\n%s", locale, modifiers) < 0) 293 l = strlen (locale);
294 m = strlen (modifiers);
295
296 if (!(id = (char *)malloc (l + m + 2)))
225 return 0; 297 return 0;
226 298
299 memcpy (id, locale, l); id[l] = '\n';
300 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
301
227 rxvt_xim *xim = xims.get (id); 302 rxvt_xim *xim = xims.get (id);
228 303
229 free (id); 304 free (id);
230 305
231 return xim; 306 return xim;
… …
233 308
234void rxvt_display::put_xim (rxvt_xim *xim) 309void rxvt_display::put_xim (rxvt_xim *xim)
235{ 310{
236 xims.put (xim); 311 xims.put (xim);
237} 312}
313#endif
314
315Atom rxvt_display::atom (const char *name)
316{
317 return XInternAtom (display, name, False);
318}
238 319
239///////////////////////////////////////////////////////////////////////////// 320/////////////////////////////////////////////////////////////////////////////
240 321
241template refcache<rxvt_display>; 322template class refcache<rxvt_display>;
242refcache<rxvt_display> displays; 323refcache<rxvt_display> displays;
243 324
244///////////////////////////////////////////////////////////////////////////// 325/////////////////////////////////////////////////////////////////////////////
245 326
246bool 327bool
… …
322rxvt_color::free (rxvt_display *display) 403rxvt_color::free (rxvt_display *display)
323{ 404{
324#if XFT 405#if XFT
325 XftColorFree (display->display, display->visual, display->cmap, &c); 406 XftColorFree (display->display, display->visual, display->cmap, &c);
326#else 407#else
327 XFreeColors (display->display, display->cmap, &c, 1, AllPlanes); 408 XFreeColors (display->display, display->cmap, &p, 1, AllPlanes);
328#endif 409#endif
329} 410}
330 411

Diff Legend

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