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.23 by root, Wed Jan 11 00:59:58 2006 UTC vs.
Revision 1.27 by root, Wed Jan 25 21:09:21 2006 UTC

… …
32#ifndef NO_SLOW_LINK_SUPPORT 32#ifndef NO_SLOW_LINK_SUPPORT
33# include <sys/socket.h> 33# include <sys/socket.h>
34# include <sys/un.h> 34# include <sys/un.h>
35#endif 35#endif
36 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
37refcounted::refcounted (const char *id) 75refcounted::refcounted (const char *id)
38{ 76{
39 this->id = strdup (id); 77 this->id = strdup (id);
40} 78}
41 79
… …
93} 131}
94 132
95///////////////////////////////////////////////////////////////////////////// 133/////////////////////////////////////////////////////////////////////////////
96 134
97#ifdef USE_XIM 135#ifdef USE_XIM
136
98static void 137static void
99#if XIMCB_PROTO_BROKEN 138#if XIMCB_PROTO_BROKEN
100im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3) 139im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3)
101#else 140#else
102im_destroy_cb (XIM unused1, XPointer client_data, XPointer unused3) 141im_destroy_cb (XIM unused1, XPointer client_data, XPointer unused3)
… …
133rxvt_xim::~rxvt_xim () 172rxvt_xim::~rxvt_xim ()
134{ 173{
135 if (xim) 174 if (xim)
136 XCloseIM (xim); 175 XCloseIM (xim);
137} 176}
177
138#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 depth)
197{
198 set (disp);
199
200 XVisualInfo vinfo;
201
202 if (XMatchVisualInfo (xdisp, display->screen, depth, TrueColor, &vinfo))
203 {
204 this->depth = depth;
205 this->visual = vinfo.visual;
206 this->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}
139 216
140///////////////////////////////////////////////////////////////////////////// 217/////////////////////////////////////////////////////////////////////////////
141 218
142rxvt_display::rxvt_display (const char *id) 219rxvt_display::rxvt_display (const char *id)
143: refcounted (id) 220: refcounted (id)
… …
247 if (!display) 324 if (!display)
248 return false; 325 return false;
249 326
250 screen = DefaultScreen (display); 327 screen = DefaultScreen (display);
251 root = DefaultRootWindow (display); 328 root = DefaultRootWindow (display);
252 visual = DefaultVisual (display, screen); 329
253 cmap = DefaultColormap (display, screen); 330 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
254 depth = DefaultDepth (display, screen); 331 XInternAtoms (display, (char **)xa_names, NUM_XA, False, xa);
255 332
256 XrmSetDatabase (display, get_resources ()); 333 XrmSetDatabase (display, get_resources ());
257 334
258#ifdef POINTER_BLANK 335#ifdef POINTER_BLANK
259 XColor blackcolour; 336 XColor blackcolour;
… …
264 blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ', 341 blank_cursor = XCreateGlyphCursor (display, f, f, ' ', ' ',
265 &blackcolour, &blackcolour); 342 &blackcolour, &blackcolour);
266 XUnloadFont (display, f); 343 XUnloadFont (display, f);
267#endif 344#endif
268 345
269#ifdef PREFER_24BIT
270 /*
271 * If depth is not 24, look for a 24bit visual.
272 */
273 if (depth != 24)
274 {
275 XVisualInfo vinfo;
276
277 if (XMatchVisualInfo (display, screen, 24, TrueColor, &vinfo))
278 {
279 depth = 24;
280 visual = vinfo.visual;
281 cmap = XCreateColormap (display,
282 RootWindow (display, screen),
283 visual, AllocNone);
284 }
285 }
286#endif
287
288 int fd = XConnectionNumber (display); 346 int fd = XConnectionNumber (display);
289 347
290#ifndef NO_SLOW_LINK_SUPPORT 348#ifndef NO_SLOW_LINK_SUPPORT
291 // try to detect wether we have a local connection. 349 // try to detect wether we have a local connection.
292 // assume unix domains socket == local, everything else not 350 // assume unix domains socket == local, everything else not
… …
301 359
302 x_ev.start (fd, EVENT_READ); 360 x_ev.start (fd, EVENT_READ);
303 fcntl (fd, F_SETFD, FD_CLOEXEC); 361 fcntl (fd, F_SETFD, FD_CLOEXEC);
304 362
305 XSelectInput (display, root, PropertyChangeMask); 363 XSelectInput (display, root, PropertyChangeMask);
306#ifdef USE_XIM
307 xa_xim_servers = XInternAtom (display, "XIM_SERVERS", 0);
308#endif
309 364
310 flush (); 365 flush ();
311 366
312 return true; 367 return true;
313} 368}
… …
349 // registers, as xlib crashes due to a race otherwise. 404 // registers, as xlib crashes due to a race otherwise.
350 Atom actual_type, *atoms; 405 Atom actual_type, *atoms;
351 int actual_format; 406 int actual_format;
352 unsigned long nitems, bytes_after; 407 unsigned long nitems, bytes_after;
353 408
354 if (XGetWindowProperty (display, root, xa_xim_servers, 0L, 1000000L, 409 if (XGetWindowProperty (display, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
355 False, XA_ATOM, &actual_type, &actual_format, 410 False, XA_ATOM, &actual_type, &actual_format,
356 &nitems, &bytes_after, (unsigned char **)&atoms) 411 &nitems, &bytes_after, (unsigned char **)&atoms)
357 != Success ) 412 != Success )
358 return; 413 return;
359 414
… …
379#ifdef USE_XIM 434#ifdef USE_XIM
380 if (!XFilterEvent (&xev, None)) 435 if (!XFilterEvent (&xev, None))
381 { 436 {
382 if (xev.type == PropertyNotify 437 if (xev.type == PropertyNotify
383 && xev.xany.window == root 438 && xev.xany.window == root
384 && xev.xproperty.atom == xa_xim_servers) 439 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
385 im_change_check (); 440 im_change_check ();
386#endif 441#endif
387 for (int i = xw.size (); i--; ) 442 for (int i = xw.size (); i--; )
388 { 443 {
389 if (!xw[i]) 444 if (!xw[i])
… …
479refcache<rxvt_display> displays; 534refcache<rxvt_display> displays;
480 535
481///////////////////////////////////////////////////////////////////////////// 536/////////////////////////////////////////////////////////////////////////////
482 537
483bool 538bool
484rxvt_color::set (rxvt_display *display, Pixel p) 539rxvt_color::set (rxvt_screen *screen, Pixel p)
485{ 540{
486#if XFT 541#if XFT
487 XColor xc; 542 XColor xc;
488 543
489 xc.pixel = p; 544 xc.pixel = p;
490 if (!XQueryColor (display->display, display->cmap, &xc)) 545 if (!XQueryColor (screen->xdisp, screen->cmap, &xc))
491 return false; 546 return false;
492 547
493 XRenderColor d; 548 XRenderColor d;
494 549
495 d.red = xc.red; 550 d.red = xc.red;
496 d.green = xc.green; 551 d.green = xc.green;
497 d.blue = xc.blue; 552 d.blue = xc.blue;
498 d.alpha = 0xffff; 553 d.alpha = 0xffff;
499 554
500 return 555 return
501 XftColorAllocValue (display->display, 556 XftColorAllocValue (screen->xdisp,
502 display->visual, 557 screen->visual,
503 display->cmap, 558 screen->cmap,
504 &d, &c); 559 &d, &c);
505#else 560#else
506 this->p = p; 561 this->p = p;
507#endif 562#endif
508 563
509 return true; 564 return true;
510} 565}
511 566
512bool 567bool
513rxvt_color::set (rxvt_display *display, const char *name) 568rxvt_color::set (rxvt_screen *screen, const char *name)
514{ 569{
515#if XFT 570#if XFT
516 return XftColorAllocName (display->display, display->visual, display->cmap, 571 return XftColorAllocName (screen->xdisp, screen->visual, screen->cmap, name, &c);
517 name, &c);
518#else 572#else
519 XColor xc; 573 XColor xc;
520 574
521 if (XParseColor (display->display, display->cmap, name, &xc)) 575 if (XParseColor (screen->xdisp, screen->cmap, name, &xc))
522 return set (display, xc.red, xc.green, xc.blue); 576 return set (screen, xc.red, xc.green, xc.blue);
523 577
524 return false; 578 return false;
525#endif 579#endif
526} 580}
527 581
528bool 582bool
529rxvt_color::set (rxvt_display *display, unsigned short cr, unsigned short cg, unsigned short cb) 583rxvt_color::set (rxvt_screen *screen, unsigned short cr, unsigned short cg, unsigned short cb)
530{ 584{
531 XColor xc; 585 XColor xc;
532 586
533 xc.red = cr; 587 xc.red = cr;
534 xc.green = cg; 588 xc.green = cg;
535 xc.blue = cb; 589 xc.blue = cb;
536 xc.flags = DoRed | DoGreen | DoBlue; 590 xc.flags = DoRed | DoGreen | DoBlue;
537 591
538 if (XAllocColor (display->display, display->cmap, &xc)) 592 if (XAllocColor (screen->xdisp, screen->cmap, &xc))
539 return set (display, xc.pixel); 593 return set (screen, xc.pixel);
540 594
541 return false; 595 return false;
542} 596}
543 597
544void 598void
545rxvt_color::get (rxvt_display *display, unsigned short &cr, unsigned short &cg, unsigned short &cb) 599rxvt_color::get (rxvt_screen *screen, unsigned short &cr, unsigned short &cg, unsigned short &cb)
546{ 600{
547#if XFT 601#if XFT
548 cr = c.color.red; 602 cr = c.color.red;
549 cg = c.color.green; 603 cg = c.color.green;
550 cb = c.color.blue; 604 cb = c.color.blue;
551#else 605#else
552 XColor c; 606 XColor c;
553 607
554 c.pixel = p; 608 c.pixel = p;
555 XQueryColor (display->display, display->cmap, &c); 609 XQueryColor (screen->xdisp, screen->cmap, &c);
556 610
557 cr = c.red; 611 cr = c.red;
558 cg = c.green; 612 cg = c.green;
559 cb = c.blue; 613 cb = c.blue;
560#endif 614#endif
561} 615}
562 616
563void 617void
564rxvt_color::free (rxvt_display *display) 618rxvt_color::free (rxvt_screen *screen)
565{ 619{
566#if XFT 620#if XFT
567 XftColorFree (display->display, display->visual, display->cmap, &c); 621 XftColorFree (screen->xdisp, screen->visual, screen->cmap, &c);
568#else 622#else
569 XFreeColors (display->display, display->cmap, &p, 1, AllPlanes); 623 XFreeColors (screen->xdisp, screen->cmap, &p, 1, AllPlanes);
570#endif 624#endif
571} 625}
572 626
573rxvt_color 627rxvt_color
574rxvt_color::fade (rxvt_display *display, int percent) 628rxvt_color::fade (rxvt_screen *screen, int percent)
575{ 629{
576 percent = 100 - percent; 630 percent = 100 - percent;
577 631
578 unsigned short cr, cg, cb; 632 unsigned short cr, cg, cb;
579 rxvt_color faded; 633 rxvt_color faded;
580 634
581 get (display, cr, cg, cb); 635 get (screen, cr, cg, cb);
582 636
583 faded.set ( 637 faded.set (
584 display, 638 screen,
585 cr * percent / 100, 639 cr * percent / 100,
586 cg * percent / 100, 640 cg * percent / 100,
587 cb * percent / 100 641 cb * percent / 100
588 ); 642 );
589 643
… …
591} 645}
592 646
593#define LERP(a,b,p) (a * p + b * (100 - p)) / 100 647#define LERP(a,b,p) (a * p + b * (100 - p)) / 100
594 648
595rxvt_color 649rxvt_color
596rxvt_color::fade (rxvt_display *display, int percent, rxvt_color &fadeto) 650rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &fadeto)
597{ 651{
598 percent = 100 - percent; 652 percent = 100 - percent;
599 653
600 unsigned short cr, cg, cb; 654 unsigned short cr, cg, cb;
601 unsigned short fcr, fcg, fcb; 655 unsigned short fcr, fcg, fcb;
602 rxvt_color faded; 656 rxvt_color faded;
603 657
604 get (display, cr, cg, cb); 658 get (screen, cr, cg, cb);
605 fadeto.get(display, fcr, fcg, fcb); 659 fadeto.get (screen, fcr, fcg, fcb);
606 660
607 faded.set ( 661 faded.set (
608 display, 662 screen,
609 LERP (cr, fcr, percent), 663 LERP (cr, fcr, percent),
610 LERP (cg, fcg, percent), 664 LERP (cg, fcg, percent),
611 LERP (cb, fcb, percent) 665 LERP (cb, fcb, percent)
612 ); 666 );
613 667

Diff Legend

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