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

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.10 by root, Wed Dec 29 19:59:46 2004 UTC vs.
Revision 1.20 by root, Fri Jan 6 02:11:15 2006 UTC

… …
82 delete obj; 82 delete obj;
83 } 83 }
84} 84}
85 85
86template<class T> 86template<class T>
87refcache<T>::~refcache () 87void refcache<T>::clear ()
88{ 88{
89 while (this->size ()) 89 while (this->size ())
90 put (*this->begin ()); 90 put (*this->begin ());
91} 91}
92 92
… …
143{ 143{
144} 144}
145 145
146bool rxvt_display::init () 146bool rxvt_display::init ()
147{ 147{
148#ifdef LOCAL_X_IS_UNIX
149 if (id[0] == ':')
150 {
151 val = rxvt_malloc (5 + strlen (id) + 1);
152 strcpy (val, "unix/");
153 strcat (val, id);
154 display = XOpenDisplay (val);
155 free (val);
156 }
157 else
158#endif
159 display = 0;
160
161 if (!display)
148 display = XOpenDisplay (id); 162 display = XOpenDisplay (id);
149 163
150 if (!display) 164 if (!display)
151 return false; 165 return false;
152 166
153 screen = DefaultScreen (display); 167 screen = DefaultScreen (display);
… …
157 depth = DefaultDepth (display, screen); 171 depth = DefaultDepth (display, screen);
158 172
159 int fd = XConnectionNumber (display); 173 int fd = XConnectionNumber (display);
160 174
161#ifndef NO_SLOW_LINK_SUPPORT 175#ifndef NO_SLOW_LINK_SUPPORT
162 // try to detetc wether we have a local connection. 176 // try to detect wether we have a local connection.
163 // assume unix domains socket == local, everything else not 177 // assume unix domains socket == local, everything else not
164 // TODO: might want to check for inet/127.0.0.1 178 // TODO: might want to check for inet/127.0.0.1
165 is_local = 0; 179 is_local = 0;
166 sockaddr_un sa; 180 sockaddr_un sa;
167 socklen_t sl = sizeof (sa); 181 socklen_t sl = sizeof (sa);
168 182
169 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 183 if (!getsockname (fd, (sockaddr *)&sa, &sl))
170 is_local = sa.sun_family == AF_LOCAL; 184 is_local = sa.sun_family == AF_LOCAL;
185#endif
186
187#ifdef POINTER_BLANK
188 XColor blackcolour;
189 blackcolour.red = 0;
190 blackcolour.green = 0;
191 blackcolour.blue = 0;
192 Font f = XLoadFont (display, "fixed");
193 blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ',
194 &blackcolour, &blackcolour);
195 XUnloadFont (display, f);
171#endif 196#endif
172 197
173#ifdef PREFER_24BIT 198#ifdef PREFER_24BIT
174 /* 199 /*
175 * If depth is not 24, look for a 24bit visual. 200 * If depth is not 24, look for a 24bit visual.
… …
203} 228}
204 229
205rxvt_display::~rxvt_display () 230rxvt_display::~rxvt_display ()
206{ 231{
207 x_ev.stop (); 232 x_ev.stop ();
233#ifdef USE_XIM
234 xims.clear ();
235#endif
208 236
209 if (display) 237 if (display)
210 XCloseDisplay (display); 238 XCloseDisplay (display);
211} 239}
212 240
… …
217 (*i)->call (); 245 (*i)->call ();
218} 246}
219 247
220void rxvt_display::im_change_check () 248void rxvt_display::im_change_check ()
221{ 249{
222 // make sure we only call im_change_cb when a new input method 250 // try to only call im_change_cb when a new input method
223 // registers, as xlib crashes due to a race otherwise. 251 // registers, as xlib crashes due to a race otherwise.
224 Atom actual_type, *atoms; 252 Atom actual_type, *atoms;
225 int actual_format; 253 int actual_format;
226 unsigned long nitems, bytes_after; 254 unsigned long nitems, bytes_after;
227 255
… …
251 XNextEvent (display, &xev); 279 XNextEvent (display, &xev);
252 280
253#ifdef USE_XIM 281#ifdef USE_XIM
254 if (!XFilterEvent (&xev, None)) 282 if (!XFilterEvent (&xev, None))
255 { 283 {
256
257 if (xev.type == PropertyNotify 284 if (xev.type == PropertyNotify
258 && xev.xany.window == root 285 && xev.xany.window == root
259 && xev.xproperty.atom == xa_xim_servers) 286 && xev.xproperty.atom == xa_xim_servers)
260 im_change_check (); 287 im_change_check ();
261#endif 288#endif
… …
446} 473}
447 474
448rxvt_color 475rxvt_color
449rxvt_color::fade (rxvt_display *display, int percent) 476rxvt_color::fade (rxvt_display *display, int percent)
450{ 477{
478 percent = 100 - percent;
479
451 unsigned short cr, cg, cb; 480 unsigned short cr, cg, cb;
452 rxvt_color faded; 481 rxvt_color faded;
453 482
454 get (display, cr, cg, cb); 483 get (display, cr, cg, cb);
484
455 faded.set (display, 485 faded.set (
486 display,
456 cr * percent / 100, 487 cr * percent / 100,
457 cg * percent / 100, 488 cg * percent / 100,
458 cb * percent / 100); 489 cb * percent / 100
490 );
459 491
460 return faded; 492 return faded;
461} 493}
462 494
495#define LERP(a,b,p) (a * p + b * (100 - p)) / 100
496
497rxvt_color
498rxvt_color::fade (rxvt_display *display, int percent, rxvt_color &fadeto)
499{
500 percent = 100 - percent;
501
502 unsigned short cr, cg, cb;
503 unsigned short fcr, fcg, fcb;
504 rxvt_color faded;
505
506 get (display, cr, cg, cb);
507 fadeto.get(display, fcr, fcg, fcb);
508
509 faded.set (
510 display,
511 LERP (cr, fcr, percent),
512 LERP (cg, fcg, percent),
513 LERP (cb, fcb, percent)
514 );
515
516 return faded;
517}
518

Diff Legend

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