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.21 by root, Sun Jan 8 07:55:36 2006 UTC vs.
Revision 1.28 by root, Sun Jan 29 20:51:28 2006 UTC

… …
25#include <rxvttoolkit.h> 25#include <rxvttoolkit.h>
26 26
27#include <unistd.h> 27#include <unistd.h>
28#include <fcntl.h> 28#include <fcntl.h>
29 29
30#include <sys/utsname.h>
31
30#ifndef NO_SLOW_LINK_SUPPORT 32#ifndef NO_SLOW_LINK_SUPPORT
31# include <sys/socket.h> 33# include <sys/socket.h>
32# include <sys/un.h> 34# include <sys/un.h>
33#endif 35#endif
34 36
37const char *const xa_names[] =
38 {
39 "TEXT",
40 "COMPOUND_TEXT",
41 "UTF8_STRING",
42 "MULTIPLE",
43 "TARGETS",
44 "TIMESTAMP",
45 "VT_SELECTION",
46 "INCR",
47 "WM_PROTOCOLS",
48 "WM_DELETE_WINDOW",
49 "CLIPBOARD",
50#if ENABLE_FRILLS
51 "_MOTIF_WM_HINTS",
52#endif
53#if ENABLE_EWMH
54 "_NET_WM_PID",
55 "_NET_WM_NAME",
56 "_NET_WM_ICON_NAME",
57 "_NET_WM_PING",
58#endif
59#if USE_XIM
60 "WM_LOCALE_NAME",
61 "XIM_SERVERS",
62#endif
63#ifdef TRANSPARENT
64 "_XROOTPMAP_ID",
65 "ESETROOT_PMAP_ID",
66#endif
67#if ENABLE_XEMBED
68 "_XEMBED",
69 "_XEMBED_INFO",
70#endif
71 };
72
73/////////////////////////////////////////////////////////////////////////////
74
35refcounted::refcounted (const char *id) 75refcounted::refcounted (const char *id)
36{ 76{
37 this->id = strdup (id); 77 this->id = strdup (id);
38} 78}
39 79
… …
47{ 87{
48 for (T **i = this->begin (); i < this->end (); ++i) 88 for (T **i = this->begin (); i < this->end (); ++i)
49 { 89 {
50 if (!strcmp (id, (*i)->id)) 90 if (!strcmp (id, (*i)->id))
51 { 91 {
52 (*i)->referenced++; 92 ++(*i)->referenced;
93 (*i)->ref_next ();
53 return *i; 94 return *i;
54 } 95 }
55 } 96 }
56 97
57 T *obj = new T (id); 98 T *obj = new T (id);
58 99
59 obj->referenced = 1;
60
61 if (obj && obj->init ()) 100 if (obj && obj->ref_init ())
62 { 101 {
102 obj->referenced = 1;
63 this->push_back (obj); 103 this->push_back (obj);
64 return obj; 104 return obj;
65 } 105 }
66 else 106 else
67 { 107 {
… …
91} 131}
92 132
93///////////////////////////////////////////////////////////////////////////// 133/////////////////////////////////////////////////////////////////////////////
94 134
95#ifdef USE_XIM 135#ifdef USE_XIM
136
96static void 137static void
97#if XIMCB_PROTO_BROKEN 138#if XIMCB_PROTO_BROKEN
98im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3) 139im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3)
99#else 140#else
100im_destroy_cb (XIM unused1, XPointer client_data, XPointer unused3) 141im_destroy_cb (XIM unused1, XPointer client_data, XPointer unused3)
… …
107 148
108 display->xims.erase (find (display->xims.begin (), display->xims.end (), xim)); 149 display->xims.erase (find (display->xims.begin (), display->xims.end (), xim));
109 display->im_change_cb (); 150 display->im_change_cb ();
110} 151}
111 152
153bool
112bool rxvt_xim::init () 154rxvt_xim::ref_init ()
113{ 155{
114 display = GET_R->display; //HACK: TODO 156 display = GET_R->display; //HACK: TODO
115 157
116 xim = XOpenIM (display->display, NULL, NULL, NULL); 158 xim = XOpenIM (display->display, NULL, NULL, NULL);
117 159
… …
130rxvt_xim::~rxvt_xim () 172rxvt_xim::~rxvt_xim ()
131{ 173{
132 if (xim) 174 if (xim)
133 XCloseIM (xim); 175 XCloseIM (xim);
134} 176}
177
135#endif 178#endif
179
180/////////////////////////////////////////////////////////////////////////////
181
182void
183rxvt_screen::set (rxvt_display *disp)
184{
185 display = disp;
186 xdisp = disp->display;
187
188 Screen *screen = ScreenOfDisplay (xdisp, disp->screen);
189
190 depth = DefaultDepthOfScreen (screen);
191 visual = DefaultVisualOfScreen (screen);
192 cmap = DefaultColormapOfScreen (screen);
193}
194
195void
196rxvt_screen::set (rxvt_display *disp, int bitdepth)
197{
198 set (disp);
199
200 XVisualInfo vinfo;
201
202 if (XMatchVisualInfo (xdisp, display->screen, bitdepth, TrueColor, &vinfo))
203 {
204 depth = bitdepth;
205 visual = vinfo.visual;
206 cmap = XCreateColormap (xdisp, disp->root, visual, AllocNone);
207 }
208}
209
210void
211rxvt_screen::clear ()
212{
213 if (cmap != DefaultColormapOfScreen (ScreenOfDisplay (xdisp, display->screen)))
214 XFreeColormap (xdisp, cmap);
215}
136 216
137///////////////////////////////////////////////////////////////////////////// 217/////////////////////////////////////////////////////////////////////////////
138 218
139rxvt_display::rxvt_display (const char *id) 219rxvt_display::rxvt_display (const char *id)
140: refcounted (id) 220: refcounted (id)
141, x_ev (this, &rxvt_display::x_cb) 221, x_ev (this, &rxvt_display::x_cb)
142, selection_owner (0) 222, selection_owner (0)
143{ 223{
144} 224}
145 225
226XrmDatabase
227rxvt_display::get_resources ()
228{
229 char *homedir = (char *)getenv ("HOME");
230 char fname[1024];
231
232 /*
233 * get resources using the X library function
234 */
235 char *displayResource, *xe;
236 XrmDatabase database, rdb1;
237
238 database = NULL;
239
240 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
241
242 // 6. System wide per application default file.
243
244 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
245 if ((xe = (char *)getenv ("XAPPLRESDIR")))
246 {
247 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
248
249 if ((rdb1 = XrmGetFileDatabase (fname)))
250 XrmMergeDatabases (rdb1, &database);
251 }
252
253 // 5. User's per application default file.
254 // none
255
256 // 4. User's defaults file.
257 /* Get any Xserver defaults */
258 displayResource = XResourceManagerString (display);
259
260 if (displayResource != NULL)
261 {
262 if ((rdb1 = XrmGetStringDatabase (displayResource)))
263 XrmMergeDatabases (rdb1, &database);
264 }
265 else if (homedir)
266 {
267 snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
268
269 if ((rdb1 = XrmGetFileDatabase (fname)))
270 XrmMergeDatabases (rdb1, &database);
271 }
272
273 /* Get screen specific resources */
274 displayResource = XScreenResourceString (ScreenOfDisplay (display, screen));
275
276 if (displayResource != NULL)
277 {
278 if ((rdb1 = XrmGetStringDatabase (displayResource)))
279 /* Merge with screen-independent resources */
280 XrmMergeDatabases (rdb1, &database);
281
282 XFree (displayResource);
283 }
284
285 // 3. User's per host defaults file
286 /* Add in XENVIRONMENT file */
287 if ((xe = (char *)getenv ("XENVIRONMENT"))
288 && (rdb1 = XrmGetFileDatabase (xe)))
289 XrmMergeDatabases (rdb1, &database);
290 else if (homedir)
291 {
292 struct utsname un;
293
294 if (!uname (&un))
295 {
296 snprintf (fname, sizeof (fname), "%s/.Xdefaults-%s", homedir, un.nodename);
297
298 if ((rdb1 = XrmGetFileDatabase (fname)))
299 XrmMergeDatabases (rdb1, &database);
300 }
301 }
302
303 return database;
304}
305
146bool rxvt_display::init () 306bool rxvt_display::ref_init ()
147{ 307{
148#ifdef LOCAL_X_IS_UNIX 308#ifdef LOCAL_X_IS_UNIX
149 if (id[0] == ':') 309 if (id[0] == ':')
150 { 310 {
151 val = rxvt_malloc (5 + strlen (id) + 1); 311 val = rxvt_malloc (5 + strlen (id) + 1);
… …
164 if (!display) 324 if (!display)
165 return false; 325 return false;
166 326
167 screen = DefaultScreen (display); 327 screen = DefaultScreen (display);
168 root = DefaultRootWindow (display); 328 root = DefaultRootWindow (display);
169 visual = DefaultVisual (display, screen);
170 cmap = DefaultColormap (display, screen);
171 depth = DefaultDepth (display, screen);
172 329
173 int fd = XConnectionNumber (display); 330 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
331 XInternAtoms (display, (char **)xa_names, NUM_XA, False, xa);
174 332
175#ifndef NO_SLOW_LINK_SUPPORT 333 XrmSetDatabase (display, get_resources ());
176 // try to detect wether we have a local connection.
177 // assume unix domains socket == local, everything else not
178 // TODO: might want to check for inet/127.0.0.1
179 is_local = 0;
180 sockaddr_un sa;
181 socklen_t sl = sizeof (sa);
182
183 if (!getsockname (fd, (sockaddr *)&sa, &sl))
184 is_local = sa.sun_family == AF_LOCAL;
185#endif
186 334
187#ifdef POINTER_BLANK 335#ifdef POINTER_BLANK
188 XColor blackcolour; 336 XColor blackcolour;
189 blackcolour.red = 0; 337 blackcolour.red = 0;
190 blackcolour.green = 0; 338 blackcolour.green = 0;
… …
193 blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ', 341 blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ',
194 &blackcolour, &blackcolour); 342 &blackcolour, &blackcolour);
195 XUnloadFont (display, f); 343 XUnloadFont (display, f);
196#endif 344#endif
197 345
198#ifdef PREFER_24BIT 346 int fd = XConnectionNumber (display);
199 /*
200 * If depth is not 24, look for a 24bit visual.
201 */
202 if (depth != 24)
203 {
204 XVisualInfo vinfo;
205 347
206 if (XMatchVisualInfo (display, screen, 24, TrueColor, &vinfo)) 348#ifndef NO_SLOW_LINK_SUPPORT
207 { 349 // try to detect wether we have a local connection.
208 depth = 24; 350 // assume unix domains socket == local, everything else not
209 visual = vinfo.visual; 351 // TODO: might want to check for inet/127.0.0.1
210 cmap = XCreateColormap (display, 352 is_local = 0;
211 RootWindow (display, screen), 353 sockaddr_un sa;
212 visual, AllocNone); 354 socklen_t sl = sizeof (sa);
213 } 355
214 } 356 if (!getsockname (fd, (sockaddr *)&sa, &sl))
357 is_local = sa.sun_family == AF_LOCAL;
215#endif 358#endif
216 359
217 x_ev.start (fd, EVENT_READ); 360 x_ev.start (fd, EVENT_READ);
218 fcntl (fd, F_SETFD, FD_CLOEXEC); 361 fcntl (fd, F_SETFD, FD_CLOEXEC);
219 362
220 XSelectInput (display, root, PropertyChangeMask); 363 XSelectInput (display, root, PropertyChangeMask);
221#ifdef USE_XIM
222 xa_xim_servers = XInternAtom (display, "XIM_SERVERS", 0);
223#endif
224 364
225 flush (); 365 flush ();
226 366
227 return true; 367 return true;
228} 368}
229 369
370void
371rxvt_display::ref_next ()
372{
373 // TODO: somehow check wether the database files/resources changed
374 // before re-loading/parsing
375 XrmDestroyDatabase (XrmGetDatabase (display));
376 XrmSetDatabase (display, get_resources ());
377}
378
230rxvt_display::~rxvt_display () 379rxvt_display::~rxvt_display ()
231{ 380{
381 if (!display)
382 return;
383
232#ifdef POINTER_BLANK 384#ifdef POINTER_BLANK
233 XFreeCursor (display, blank_cursor); 385 XFreeCursor (display, blank_cursor);
234#endif 386#endif
235 x_ev.stop (); 387 x_ev.stop ();
236#ifdef USE_XIM 388#ifdef USE_XIM
237 xims.clear (); 389 xims.clear ();
238#endif 390#endif
239
240 if (display)
241 XCloseDisplay (display); 391 XCloseDisplay (display);
242} 392}
243 393
244#ifdef USE_XIM 394#ifdef USE_XIM
245void rxvt_display::im_change_cb () 395void rxvt_display::im_change_cb ()
246{ 396{
… …
254 // registers, as xlib crashes due to a race otherwise. 404 // registers, as xlib crashes due to a race otherwise.
255 Atom actual_type, *atoms; 405 Atom actual_type, *atoms;
256 int actual_format; 406 int actual_format;
257 unsigned long nitems, bytes_after; 407 unsigned long nitems, bytes_after;
258 408
259 if (XGetWindowProperty (display, root, xa_xim_servers, 0L, 1000000L, 409 if (XGetWindowProperty (display, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
260 False, XA_ATOM, &actual_type, &actual_format, 410 False, XA_ATOM, &actual_type, &actual_format,
261 &nitems, &bytes_after, (unsigned char **)&atoms) 411 &nitems, &bytes_after, (unsigned char **)&atoms)
262 != Success ) 412 != Success )
263 return; 413 return;
264 414
… …
284#ifdef USE_XIM 434#ifdef USE_XIM
285 if (!XFilterEvent (&xev, None)) 435 if (!XFilterEvent (&xev, None))
286 { 436 {
287 if (xev.type == PropertyNotify 437 if (xev.type == PropertyNotify
288 && xev.xany.window == root 438 && xev.xany.window == root
289 && xev.xproperty.atom == xa_xim_servers) 439 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
290 im_change_check (); 440 im_change_check ();
291#endif 441#endif
292 for (int i = xw.size (); i--; ) 442 for (int i = xw.size (); i--; )
293 { 443 {
294 if (!xw[i]) 444 if (!xw[i])
… …
384refcache<rxvt_display> displays; 534refcache<rxvt_display> displays;
385 535
386///////////////////////////////////////////////////////////////////////////// 536/////////////////////////////////////////////////////////////////////////////
387 537
388bool 538bool
389rxvt_color::set (rxvt_display *display, Pixel p) 539rxvt_color::set (rxvt_screen *screen, const char *name)
390{ 540{
391#if XFT 541#if XFT
392 XColor xc; 542 int l = strlen (name);
543 rxvt_rgba r;
544 char eos;
545 int mult;
393 546
394 xc.pixel = p; 547 if ( l == 1+4*1 && 4 == sscanf (name, "#%1hx%1hx%1hx%1hx%c", &r.a, &r.r, &r.g, &r.b, &eos))
395 if (!XQueryColor (display->display, display->cmap, &xc)) 548 mult = 0x1111;
396 return false; 549 else if (l == 1+4*2 && 4 == sscanf (name, "#%2hx%2hx%2hx%2hx%c", &r.a, &r.r, &r.g, &r.b, &eos))
550 mult = 0x0101;
551 else if (l == 1+4*4 && 4 == sscanf (name, "#%4hx%4hx%4hx%4hx%c", &r.a, &r.r, &r.g, &r.b, &eos))
552 mult = 0x0001;
553 else
554 return XftColorAllocName (screen->xdisp, screen->visual, screen->cmap, name, &c);
397 555
398 XRenderColor d; 556 r.r *= mult; r.g *= mult; r.b *= mult; r.a *= mult;
399 557 return set (screen, r);
400 d.red = xc.red;
401 d.green = xc.green;
402 d.blue = xc.blue;
403 d.alpha = 0xffff;
404
405 return
406 XftColorAllocValue (display->display,
407 display->visual,
408 display->cmap,
409 &d, &c);
410#else
411 this->p = p;
412#endif
413
414 return true;
415}
416
417bool
418rxvt_color::set (rxvt_display *display, const char *name)
419{
420#if XFT
421 return XftColorAllocName (display->display, display->visual, display->cmap,
422 name, &c);
423#else 558#else
424 XColor xc; 559 XColor xc;
425 560
426 if (XParseColor (display->display, display->cmap, name, &xc)) 561 if (XParseColor (screen->xdisp, screen->cmap, name, &xc))
427 return set (display, xc.red, xc.green, xc.blue); 562 return set (screen, rxvt_rgba (xc.red, xc.green, xc.blue));
428 563
429 return false; 564 return false;
430#endif 565#endif
431} 566}
432 567
433bool 568bool
434rxvt_color::set (rxvt_display *display, unsigned short cr, unsigned short cg, unsigned short cb) 569rxvt_color::set (rxvt_screen *screen, rxvt_rgba rgba)
435{ 570{
571#if XFT
572 XRenderColor d;
573
574 d.red = rgba.r;
575 d.green = rgba.g;
576 d.blue = rgba.b;
577 d.alpha = rgba.a;
578
579 return XftColorAllocValue (screen->xdisp, screen->visual, screen->cmap, &d, &c);
580#else
436 XColor xc; 581 XColor xc;
437 582
438 xc.red = cr; 583 xc.red = rgba.r;
439 xc.green = cg; 584 xc.green = rgba.g;
440 xc.blue = cb; 585 xc.blue = rgba.b;
441 xc.flags = DoRed | DoGreen | DoBlue; 586 xc.flags = DoRed | DoGreen | DoBlue;
442 587
443 if (XAllocColor (display->display, display->cmap, &xc)) 588 if (XAllocColor (screen->xdisp, screen->cmap, &xc))
444 return set (display, xc.pixel); 589 {
590 p = xc.pixel;
591 return true;
592 }
445 593
446 return false; 594 return false;
595#endif
447} 596}
448 597
449void 598void
450rxvt_color::get (rxvt_display *display, unsigned short &cr, unsigned short &cg, unsigned short &cb) 599rxvt_color::get (rxvt_screen *screen, rxvt_rgba &rgba)
451{ 600{
452#if XFT 601#if XFT
453 cr = c.color.red; 602 rgba.r = c.color.red;
454 cg = c.color.green; 603 rgba.g = c.color.green;
455 cb = c.color.blue; 604 rgba.b = c.color.blue;
605 rgba.a = c.color.alpha;
456#else 606#else
457 XColor c; 607 XColor c;
458 608
459 c.pixel = p; 609 c.pixel = p;
460 XQueryColor (display->display, display->cmap, &c); 610 XQueryColor (screen->xdisp, screen->cmap, &c);
461 611
462 cr = c.red; 612 rgba.r = c.red;
463 cg = c.green; 613 rgba.g = c.green;
464 cb = c.blue; 614 rgba.b = c.blue;
615 rgba.a = rxvt_rgba::MAX_CC;
465#endif 616#endif
466} 617}
467 618
468void 619void
469rxvt_color::free (rxvt_display *display) 620rxvt_color::free (rxvt_screen *screen)
470{ 621{
471#if XFT 622#if XFT
472 XftColorFree (display->display, display->visual, display->cmap, &c); 623 XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c);
473#else 624#else
474 XFreeColors (display->display, display->cmap, &p, 1, AllPlanes); 625 XFreeColors (screen->xdisp, screen->cmap, &p, 1, AllPlanes);
475#endif 626#endif
476} 627}
477 628
478rxvt_color 629rxvt_color
479rxvt_color::fade (rxvt_display *display, int percent) 630rxvt_color::fade (rxvt_screen *screen, int percent)
480{ 631{
481 percent = 100 - percent;
482
483 unsigned short cr, cg, cb;
484 rxvt_color faded; 632 rxvt_color faded;
485 633
486 get (display, cr, cg, cb); 634 rxvt_rgba c;
635 get (screen, c);
487 636
488 faded.set ( 637 c.r = lerp (0, c.r, percent);
489 display, 638 c.g = lerp (0, c.g, percent);
490 cr * percent / 100, 639 c.b = lerp (0, c.b, percent);
491 cg * percent / 100, 640
492 cb * percent / 100 641 faded.set (screen, c);
493 );
494 642
495 return faded; 643 return faded;
496} 644}
497 645
498#define LERP(a,b,p) (a * p + b * (100 - p)) / 100
499
500rxvt_color 646rxvt_color
501rxvt_color::fade (rxvt_display *display, int percent, rxvt_color &fadeto) 647rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &fadeto)
502{ 648{
503 percent = 100 - percent; 649 rxvt_rgba c, fc;
504
505 unsigned short cr, cg, cb;
506 unsigned short fcr, fcg, fcb;
507 rxvt_color faded; 650 rxvt_color faded;
508 651
509 get (display, cr, cg, cb); 652 get (screen, c);
510 fadeto.get(display, fcr, fcg, fcb); 653 fadeto.get (screen, fc);
511 654
512 faded.set ( 655 faded.set (
513 display, 656 screen,
657 rxvt_rgba (
514 LERP (cr, fcr, percent), 658 lerp (fc.r, c.r, percent),
515 LERP (cg, fcg, percent), 659 lerp (fc.g, c.g, percent),
516 LERP (cb, fcb, percent) 660 lerp (fc.b, c.b, percent),
661 lerp (fc.a, c.a, percent)
662 )
517 ); 663 );
518 664
519 return faded; 665 return faded;
520} 666}
521 667

Diff Legend

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