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.73 by ayin, Wed Oct 31 09:55:24 2007 UTC vs.
Revision 1.98 by root, Sat Jan 26 13:13:20 2008 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: rxvttoolkit.C 2 * File: rxvttoolkit.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 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 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 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
183 183
184 XIMCallback ximcallback; 184 XIMCallback ximcallback;
185 ximcallback.client_data = (XPointer)this; 185 ximcallback.client_data = (XPointer)this;
186 ximcallback.callback = im_destroy_cb; 186 ximcallback.callback = im_destroy_cb;
187 187
188 XSetIMValues (xim, XNDestroyCallback, &ximcallback, 0); 188 XSetIMValues (xim, XNDestroyCallback, &ximcallback, (char *)0);
189 189
190 return true; 190 return true;
191} 191}
192 192
193rxvt_xim::~rxvt_xim () 193rxvt_xim::~rxvt_xim ()
… …
295 295
296///////////////////////////////////////////////////////////////////////////// 296/////////////////////////////////////////////////////////////////////////////
297 297
298rxvt_display::rxvt_display (const char *id) 298rxvt_display::rxvt_display (const char *id)
299: refcounted (id) 299: refcounted (id)
300, x_ev (this, &rxvt_display::x_cb)
301, selection_owner (0) 300, selection_owner (0)
302{ 301{
302 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
303 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
303} 304}
304 305
305XrmDatabase 306XrmDatabase
306rxvt_display::get_resources (bool refresh) 307rxvt_display::get_resources (bool refresh)
307{ 308{
308 char *homedir = (char *)getenv ("HOME"); 309 char *homedir = getenv ("HOME");
309 char fname[1024]; 310 char fname[1024];
310 311
311 /* 312 /*
312 * get resources using the X library function 313 * get resources using the X library function
313 */ 314 */
… …
318 // as opposed to "standard practise", we always read in ~/.Xdefaults 319 // as opposed to "standard practise", we always read in ~/.Xdefaults
319 320
320 // 6. System wide per application default file. 321 // 6. System wide per application default file.
321 322
322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 323 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
323 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 324 if ((xe = getenv ("XAPPLRESDIR")))
324 { 325 {
325 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 326 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
326 327
327 if ((rdb1 = XrmGetFileDatabase (fname))) 328 if ((rdb1 = XrmGetFileDatabase (fname)))
328 XrmMergeDatabases (rdb1, &database); 329 XrmMergeDatabases (rdb1, &database);
… …
400 XFree (displayResource); 401 XFree (displayResource);
401 } 402 }
402 403
403 // 3. User's per host defaults file 404 // 3. User's per host defaults file
404 /* Add in XENVIRONMENT file */ 405 /* Add in XENVIRONMENT file */
405 if ((xe = (char *)getenv ("XENVIRONMENT")) 406 if ((xe = getenv ("XENVIRONMENT"))
406 && (rdb1 = XrmGetFileDatabase (xe))) 407 && (rdb1 = XrmGetFileDatabase (xe)))
407 XrmMergeDatabases (rdb1, &database); 408 XrmMergeDatabases (rdb1, &database);
408 else if (homedir) 409 else if (homedir)
409 { 410 {
410 struct utsname un; 411 struct utsname un;
… …
462#endif 463#endif
463 464
464 int fd = XConnectionNumber (dpy); 465 int fd = XConnectionNumber (dpy);
465 466
466 // try to detect wether we have a local connection. 467 // try to detect wether we have a local connection.
467 // assume unix domains socket == local, everything else not 468 // assume unix domain socket == local, everything else not
468 // TODO: might want to check for inet/127.0.0.1 469 // TODO: might want to check for inet/127.0.0.1
469 is_local = 0; 470 is_local = 0;
470 sockaddr_un sa; 471 sockaddr_un sa;
471 socklen_t sl = sizeof (sa); 472 socklen_t sl = sizeof (sa);
472 473
473 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 474 if (!getsockname (fd, (sockaddr *)&sa, &sl))
474 is_local = sa.sun_family == AF_UNIX; 475 is_local = sa.sun_family == AF_UNIX;
475 476
477 flush_ev.start ();
476 x_ev.start (fd, EVENT_READ); 478 x_ev.start (fd, ev::READ);
477 fcntl (fd, F_SETFD, FD_CLOEXEC); 479 fcntl (fd, F_SETFD, FD_CLOEXEC);
478 480
479 XSelectInput (dpy, root, PropertyChangeMask); 481 XSelectInput (dpy, root, PropertyChangeMask);
480 482
481 flush (); 483 flush ();
… …
499 501
500#ifdef POINTER_BLANK 502#ifdef POINTER_BLANK
501 XFreeCursor (dpy, blank_cursor); 503 XFreeCursor (dpy, blank_cursor);
502#endif 504#endif
503 x_ev.stop (); 505 x_ev.stop ();
506 flush_ev.stop ();
504#ifdef USE_XIM 507#ifdef USE_XIM
505 xims.clear (); 508 xims.clear ();
506#endif 509#endif
507 XCloseDisplay (dpy); 510 XCloseDisplay (dpy);
508} 511}
… …
538 541
539 XFree (atoms); 542 XFree (atoms);
540} 543}
541#endif 544#endif
542 545
543void rxvt_display::x_cb (io_watcher &w, short revents) 546void rxvt_display::x_cb (ev::io &w, int revents)
544{ 547{
545 do 548 while (XEventsQueued (dpy, QueuedAfterReading))
546 { 549 {
547 XEvent xev; 550 XEvent xev;
548 XNextEvent (dpy, &xev); 551 XNextEvent (dpy, &xev);
549 552
550#ifdef USE_XIM 553#ifdef USE_XIM
551 if (!XFilterEvent (&xev, None)) 554 if (!XFilterEvent (&xev, None))
555#endif
552 { 556 {
553 if (xev.type == PropertyNotify 557 if (xev.type == PropertyNotify
554 && xev.xany.window == root 558 && xev.xany.window == root
555 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 559 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
556 im_change_check (); 560 im_change_check ();
557#endif 561
558 if (xev.type == MappingNotify) 562 if (xev.type == MappingNotify)
559 XRefreshKeyboardMapping (&xev.xmapping); 563 XRefreshKeyboardMapping (&xev.xmapping);
560 564
561 for (int i = xw.size (); i--; ) 565 for (int i = xw.size (); i--; )
562 { 566 {
563 if (!xw[i]) 567 if (!xw[i])
564 xw.erase_unordered (i); 568 xw.erase_unordered (i);
565 else if (xw[i]->window == xev.xany.window) 569 else if (xw[i]->window == xev.xany.window)
566 xw[i]->call (xev); 570 xw[i]->call (xev);
567 } 571 }
568#ifdef USE_XIM
569 } 572 }
570#endif
571 } 573 }
574}
575
576void rxvt_display::flush_cb (ev::prepare &w, int revents)
577{
572 while (XEventsQueued (dpy, QueuedAlready)); 578 while (XEventsQueued (dpy, QueuedAfterFlush))
573
574 XFlush (dpy);
575}
576
577void rxvt_display::flush ()
578{
579 if (XEventsQueued (dpy, QueuedAlready))
580 x_cb (x_ev, EVENT_READ); 579 x_cb (x_ev, EV_READ);
581 580
582 XFlush (dpy); 581 w.stop ();
583} 582}
584 583
585void rxvt_display::reg (xevent_watcher *w) 584void rxvt_display::reg (xevent_watcher *w)
586{ 585{
587 if (!w->active) 586 if (!w->active)
… …
601} 600}
602 601
603void rxvt_display::set_selection_owner (rxvt_term *owner) 602void rxvt_display::set_selection_owner (rxvt_term *owner)
604{ 603{
605 if (selection_owner && selection_owner != owner) 604 if (selection_owner && selection_owner != owner)
605 {
606 rxvt_term *owner = selection_owner;
607
606 selection_owner->selection_clear (); 608 owner->selection_clear ();
609 owner->flush ();
610 }
607 611
608 selection_owner = owner; 612 selection_owner = owner;
609} 613}
610 614
611#ifdef USE_XIM 615#ifdef USE_XIM
… …
670} 674}
671 675
672bool 676bool
673rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 677rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
674{ 678{
679 //TODO: only supports 24 bit
680 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
681
675#if XFT 682#if XFT
676 XRenderPictFormat *format; 683 XRenderPictFormat *format;
677 684
678 // FUCKING Xft gets it wrong, of course, so work around it. 685 // FUCKING Xft gets it wrong, of course, so work around it.
679 // Transparency users should eat shit and die, and then 686 // Transparency users should eat shit and die, and then
… …
683 { 690 {
684 // the fun lies in doing everything manually... 691 // the fun lies in doing everything manually...
685 c.color.red = color.r; 692 c.color.red = color.r;
686 c.color.green = color.g; 693 c.color.green = color.g;
687 c.color.blue = color.b; 694 c.color.blue = color.b;
688 c.color.alpha = color.a; 695 c.color.alpha = alpha;
689 696
690 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red ) 697 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
691 | insert_component (color.g, format->direct.greenMask, format->direct.green) 698 | insert_component (color.g, format->direct.greenMask, format->direct.green)
692 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 699 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
693 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha); 700 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
694 701
695 return true; 702 return true;
696 } 703 }
697 else 704 else
698 { 705 {
699 XRenderColor d; 706 XRenderColor d;
700 707
701 d.red = color.r; 708 d.red = color.r;
702 d.green = color.g; 709 d.green = color.g;
703 d.blue = color.b; 710 d.blue = color.b;
704 d.alpha = color.a; 711 d.alpha = alpha;
705 712
706 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 713 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
707 } 714 }
708#else 715#else
709 c.red = color.r; 716 c.red = color.r;
… …
734{ 741{
735 rgba c; 742 rgba c;
736 char eos; 743 char eos;
737 int skip; 744 int skip;
738 745
746 c.a = rgba::MAX_CC;
747
739 // parse the nonstandard "[alphapercent]" prefix 748 // parse the nonstandard "[alphapercent]" prefix
740 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 749 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
741 { 750 {
742 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a); 751 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
743 name += skip; 752 name += skip;
744 } 753 }
745 else
746 c.a = rgba::MAX_CC;
747 754
748 // parse the non-standard "#aarrggbb" format
749 if (name[0] == '#' && strlen (name) == 1+2+2+2+2 && 4 == sscanf (name+1, "%2hx%2hx%2hx%2hx%c", &c.a, &c.r, &c.g, &c.b, &eos))
750 {
751 if (c.r)
752 c.r = (c.r << 8) | 0x0ff;
753 if (c.g)
754 c.g = (c.g << 8) | 0x0ff;
755 if (c.b)
756 c.b = (c.b << 8) | 0x0ff;
757 if (c.a)
758 c.a = (c.a << 8) | 0x0ff;
759 }
760 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format 755 // parse the non-standard "rgba:rrrr/gggg/bbbb/aaaa" format
761 else if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos)) 756 if (strlen (name) != 4+5*4 || 4 != sscanf (name, "rgba:%4hx/%4hx/%4hx/%4hx%c", &c.r, &c.g, &c.b, &c.a, &eos))
762 { 757 {
763 XColor xc; 758 XColor xc;
764 759
765 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 760 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
766 { 761 {
… …
886 lerp (c.a, to.a, percent) 881 lerp (c.a, to.a, percent)
887 ) 882 )
888 ); 883 );
889} 884}
890 885
886#if TRACE_PIXMAPS
887# undef XCreatePixmap
888# undef XFreePixmap
889Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
890{
891 Pixmap res = XCreatePixmap (dpy, r, w, h, d);
892 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
893 return res;
894}
895
896void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
897{
898 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
899 XFreePixmap (dpy,p);
900}
901#endif

Diff Legend

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