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.75 by root, Sun Nov 11 04:08:00 2007 UTC vs.
Revision 1.113 by sf-exg, Fri Jan 14 11:09:54 2011 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.
… …
33 33
34#if XFT 34#if XFT
35# include <X11/extensions/Xrender.h> 35# include <X11/extensions/Xrender.h>
36#endif 36#endif
37 37
38const char *const xa_names[] = 38static const char *const xa_names[] =
39{ 39{
40 "TEXT", 40 "TEXT",
41 "COMPOUND_TEXT", 41 "COMPOUND_TEXT",
42 "UTF8_STRING", 42 "UTF8_STRING",
43 "MULTIPLE", 43 "MULTIPLE",
… …
59#if ENABLE_EWMH 59#if ENABLE_EWMH
60 "_NET_WM_PID", 60 "_NET_WM_PID",
61 "_NET_WM_NAME", 61 "_NET_WM_NAME",
62 "_NET_WM_ICON_NAME", 62 "_NET_WM_ICON_NAME",
63 "_NET_WM_PING", 63 "_NET_WM_PING",
64 "_NET_WM_ICON",
64#endif 65#endif
65#if USE_XIM 66#if USE_XIM
66 "WM_LOCALE_NAME", 67 "WM_LOCALE_NAME",
67 "XIM_SERVERS", 68 "XIM_SERVERS",
68#endif 69#endif
… …
226{ 227{
227} 228}
228 229
229rxvt_drawable &rxvt_screen::scratch_drawable (int w, int h) 230rxvt_drawable &rxvt_screen::scratch_drawable (int w, int h)
230{ 231{
231 // it's actually faster to re-allocate every time. don't ask me
232 // why, but its likely no big deal there are no roundtrips
233 // (I think/hope).
234 if (!scratch_area || w > scratch_w || h > scratch_h || 1/*D*/) 232 if (!scratch_area || w > scratch_w || h > scratch_h)
235 { 233 {
236 if (scratch_area) 234 if (scratch_area)
237 { 235 {
238 XFreePixmap (dpy, scratch_area->drawable); 236 XFreePixmap (dpy, scratch_area->drawable);
239 delete scratch_area; 237 delete scratch_area;
… …
295 293
296///////////////////////////////////////////////////////////////////////////// 294/////////////////////////////////////////////////////////////////////////////
297 295
298rxvt_display::rxvt_display (const char *id) 296rxvt_display::rxvt_display (const char *id)
299: refcounted (id) 297: refcounted (id)
300, x_ev (this, &rxvt_display::x_cb)
301, selection_owner (0) 298, selection_owner (0)
299, clipboard_owner (0)
302{ 300{
301 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
302 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
303} 303}
304 304
305XrmDatabase 305XrmDatabase
306rxvt_display::get_resources (bool refresh) 306rxvt_display::get_resources (bool refresh)
307{ 307{
308 char *homedir = (char *)getenv ("HOME"); 308 char *homedir = getenv ("HOME");
309 char fname[1024]; 309 char fname[1024];
310 310
311 /* 311 /*
312 * get resources using the X library function 312 * get resources using the X library function
313 */ 313 */
… …
318 // as opposed to "standard practise", we always read in ~/.Xdefaults 318 // as opposed to "standard practise", we always read in ~/.Xdefaults
319 319
320 // 6. System wide per application default file. 320 // 6. System wide per application default file.
321 321
322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */ 322 /* Add in $XAPPLRESDIR/Rxvt only; not bothering with XUSERFILESEARCHPATH */
323 if ((xe = (char *)getenv ("XAPPLRESDIR"))) 323 if ((xe = getenv ("XAPPLRESDIR")))
324 { 324 {
325 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS); 325 snprintf (fname, sizeof (fname), "%s/%s", xe, RESCLASS);
326 326
327 if ((rdb1 = XrmGetFileDatabase (fname))) 327 if ((rdb1 = XrmGetFileDatabase (fname)))
328 XrmMergeDatabases (rdb1, &database); 328 XrmMergeDatabases (rdb1, &database);
… …
359 XA_STRING, &actual_type, &actual_format, 359 XA_STRING, &actual_type, &actual_format,
360 &nitems, &nremaining, 360 &nitems, &nremaining,
361 (unsigned char **)&val) == Success 361 (unsigned char **)&val) == Success
362 && actual_type == XA_STRING 362 && actual_type == XA_STRING
363 && actual_format == 8) 363 && actual_format == 8)
364 displayResource = val; 364 displayResource = val;
365 else 365 else
366 { 366 {
367 displayResource = 0; 367 displayResource = 0;
368 368
369 if (val) 369 if (val)
370 XFree(val); 370 XFree (val);
371 } 371 }
372 372
373#if XLIB_ILLEGAL_ACCESS 373#if XLIB_ILLEGAL_ACCESS
374 dpy->xdefaults = displayResource; 374 dpy->xdefaults = displayResource;
375#endif 375#endif
376 } 376 }
… …
400 XFree (displayResource); 400 XFree (displayResource);
401 } 401 }
402 402
403 // 3. User's per host defaults file 403 // 3. User's per host defaults file
404 /* Add in XENVIRONMENT file */ 404 /* Add in XENVIRONMENT file */
405 if ((xe = (char *)getenv ("XENVIRONMENT")) 405 if ((xe = getenv ("XENVIRONMENT"))
406 && (rdb1 = XrmGetFileDatabase (xe))) 406 && (rdb1 = XrmGetFileDatabase (xe)))
407 XrmMergeDatabases (rdb1, &database); 407 XrmMergeDatabases (rdb1, &database);
408 else if (homedir) 408 else if (homedir)
409 { 409 {
410 struct utsname un; 410 struct utsname un;
… …
424bool rxvt_display::ref_init () 424bool rxvt_display::ref_init ()
425{ 425{
426#ifdef LOCAL_X_IS_UNIX 426#ifdef LOCAL_X_IS_UNIX
427 if (id[0] == ':') 427 if (id[0] == ':')
428 { 428 {
429 val = rxvt_malloc (5 + strlen (id) + 1); 429 if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
430 return false;
430 strcpy (val, "unix/"); 431 strcpy (val, "unix/");
431 strcat (val, id); 432 strcat (val, id);
432 dpy = XOpenDisplay (val); 433 dpy = XOpenDisplay (val);
433 free (val);
434 } 434 }
435 else 435 else
436#endif 436#endif
437 dpy = 0; 437 dpy = 0;
438 438
… …
443 return false; 443 return false;
444 444
445 screen = DefaultScreen (dpy); 445 screen = DefaultScreen (dpy);
446 root = DefaultRootWindow (dpy); 446 root = DefaultRootWindow (dpy);
447 447
448 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 448 assert (ARRAY_LENGTH(xa_names) == NUM_XA);
449 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 449 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
450 450
451 XrmSetDatabase (dpy, get_resources (false)); 451 XrmSetDatabase (dpy, get_resources (false));
452 452
453#ifdef POINTER_BLANK 453#ifdef POINTER_BLANK
… …
461 XUnloadFont (dpy, f); 461 XUnloadFont (dpy, f);
462#endif 462#endif
463 463
464 int fd = XConnectionNumber (dpy); 464 int fd = XConnectionNumber (dpy);
465 465
466 // try to detect wether we have a local connection. 466 // try to detect whether we have a local connection.
467 // assume unix domains socket == local, everything else not 467 // assume unix domain socket == local, everything else not
468 // TODO: might want to check for inet/127.0.0.1 468 // TODO: might want to check for inet/127.0.0.1
469 is_local = 0; 469 is_local = 0;
470 sockaddr_un sa; 470 sockaddr_un sa;
471 socklen_t sl = sizeof (sa); 471 socklen_t sl = sizeof (sa);
472 472
473 if (!getsockname (fd, (sockaddr *)&sa, &sl)) 473 if (!getsockname (fd, (sockaddr *)&sa, &sl))
474 is_local = sa.sun_family == AF_UNIX; 474 is_local = sa.sun_family == AF_UNIX;
475 475
476 flush_ev.start ();
476 x_ev.start (fd, ev::READ); 477 x_ev.start (fd, ev::READ);
477 fcntl (fd, F_SETFD, FD_CLOEXEC); 478 fcntl (fd, F_SETFD, FD_CLOEXEC);
478 479
479 XSelectInput (dpy, root, PropertyChangeMask); 480 XSelectInput (dpy, root, PropertyChangeMask);
480 481
… …
484} 485}
485 486
486void 487void
487rxvt_display::ref_next () 488rxvt_display::ref_next ()
488{ 489{
489 // TODO: somehow check wether the database files/resources changed 490 // TODO: somehow check whether the database files/resources changed
490 // before affording re-loading/parsing 491 // before affording re-loading/parsing
491 XrmDestroyDatabase (XrmGetDatabase (dpy)); 492 XrmDestroyDatabase (XrmGetDatabase (dpy));
492 XrmSetDatabase (dpy, get_resources (true)); 493 XrmSetDatabase (dpy, get_resources (true));
493} 494}
494 495
… …
499 500
500#ifdef POINTER_BLANK 501#ifdef POINTER_BLANK
501 XFreeCursor (dpy, blank_cursor); 502 XFreeCursor (dpy, blank_cursor);
502#endif 503#endif
503 x_ev.stop (); 504 x_ev.stop ();
505 flush_ev.stop ();
504#ifdef USE_XIM 506#ifdef USE_XIM
505 xims.clear (); 507 xims.clear ();
506#endif 508#endif
509 XrmDestroyDatabase (XrmGetDatabase (dpy));
507 XCloseDisplay (dpy); 510 XCloseDisplay (dpy);
508} 511}
509 512
510#ifdef USE_XIM 513#ifdef USE_XIM
511void rxvt_display::im_change_cb () 514void rxvt_display::im_change_cb ()
… …
523 unsigned long nitems, bytes_after; 526 unsigned long nitems, bytes_after;
524 527
525 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 528 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
526 False, XA_ATOM, &actual_type, &actual_format, 529 False, XA_ATOM, &actual_type, &actual_format,
527 &nitems, &bytes_after, (unsigned char **)&atoms) 530 &nitems, &bytes_after, (unsigned char **)&atoms)
528 != Success ) 531 != Success)
529 return; 532 return;
530 533
531 if (actual_type == XA_ATOM && actual_format == 32) 534 if (actual_type == XA_ATOM && actual_format == 32)
532 for (int i = 0; i < nitems; i++) 535 for (int i = 0; i < nitems; i++)
533 if (XGetSelectionOwner (dpy, atoms[i])) 536 if (XGetSelectionOwner (dpy, atoms[i]))
534 { 537 {
535 im_change_cb (); 538 im_change_cb ();
536 break; 539 break;
… …
540} 543}
541#endif 544#endif
542 545
543void rxvt_display::x_cb (ev::io &w, int revents) 546void rxvt_display::x_cb (ev::io &w, int revents)
544{ 547{
548 flush_ev.start ();
549}
550
551void rxvt_display::flush_cb (ev::prepare &w, int revents)
552{
553 while (XEventsQueued (dpy, QueuedAfterFlush))
545 do 554 do
546 { 555 {
547 XEvent xev; 556 XEvent xev;
548 XNextEvent (dpy, &xev); 557 XNextEvent (dpy, &xev);
549 558
550#ifdef USE_XIM 559#ifdef USE_XIM
551 if (!XFilterEvent (&xev, None)) 560 if (!XFilterEvent (&xev, None))
552 { 561 {
553 if (xev.type == PropertyNotify 562 if (xev.type == PropertyNotify
554 && xev.xany.window == root 563 && xev.xany.window == root
555 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 564 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
556 im_change_check (); 565 im_change_check ();
557#endif 566#endif
558 if (xev.type == MappingNotify) 567 if (xev.type == MappingNotify)
559 XRefreshKeyboardMapping (&xev.xmapping); 568 XRefreshKeyboardMapping (&xev.xmapping);
560 569
561 for (int i = xw.size (); i--; ) 570 for (int i = xw.size (); i--; )
562 { 571 {
563 if (!xw[i]) 572 if (!xw[i])
564 xw.erase_unordered (i); 573 xw.erase_unordered (i);
565 else if (xw[i]->window == xev.xany.window) 574 else if (xw[i]->window == xev.xany.window)
566 xw[i]->call (xev); 575 xw[i]->call (xev);
567 } 576 }
568#ifdef USE_XIM 577#ifdef USE_XIM
569 } 578 }
570#endif 579#endif
571 } 580 }
572 while (XEventsQueued (dpy, QueuedAlready)); 581 while (XEventsQueued (dpy, QueuedAlready));
573 582
574 XFlush (dpy); 583 w.stop ();
575}
576
577void rxvt_display::flush ()
578{
579 if (XEventsQueued (dpy, QueuedAlready))
580 x_cb (x_ev, ev::READ);
581
582 XFlush (dpy);
583} 584}
584 585
585void rxvt_display::reg (xevent_watcher *w) 586void rxvt_display::reg (xevent_watcher *w)
586{ 587{
587 if (!w->active) 588 if (!w->active)
… …
598 xw[w->active - 1] = 0; 599 xw[w->active - 1] = 0;
599 w->active = 0; 600 w->active = 0;
600 } 601 }
601} 602}
602 603
603void rxvt_display::set_selection_owner (rxvt_term *owner) 604void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
604{ 605{
606 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
607
605 if (selection_owner && selection_owner != owner) 608 if (cur_owner && cur_owner != owner)
606 selection_owner->selection_clear (); 609 {
610 rxvt_term *term = cur_owner;
611 term->selection_clear (clipboard);
612 term->flush ();
613 }
607 614
608 selection_owner = owner; 615 cur_owner = owner;
609} 616}
610 617
611#ifdef USE_XIM 618#ifdef USE_XIM
612 619
613void rxvt_display::reg (im_watcher *w) 620void rxvt_display::reg (im_watcher *w)
… …
626 int l, m; 633 int l, m;
627 634
628 l = strlen (locale); 635 l = strlen (locale);
629 m = strlen (modifiers); 636 m = strlen (modifiers);
630 637
631 if (!(id = (char *)malloc (l + m + 2))) 638 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
632 return 0; 639 return 0;
633 640
634 memcpy (id, locale, l); id[l] = '\n'; 641 memcpy (id, locale, l); id[l] = '\n';
635 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 642 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
636 643
637 rxvt_xim *xim = xims.get (id); 644 rxvt_xim *xim = xims.get (id);
638
639 free (id);
640 645
641 return xim; 646 return xim;
642} 647}
643 648
644void rxvt_display::put_xim (rxvt_xim *xim) 649void rxvt_display::put_xim (rxvt_xim *xim)
… …
670} 675}
671 676
672bool 677bool
673rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 678rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
674{ 679{
680 //TODO: only supports 24 bit
681 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
682
675#if XFT 683#if XFT
676 XRenderPictFormat *format; 684 XRenderPictFormat *format;
677 685
678 // FUCKING Xft gets it wrong, of course, so work around it. 686 // FUCKING Xft gets it wrong, of course, so work around it.
679 // Transparency users should eat shit and die, and then 687 // Transparency users should eat shit and die, and then
… …
683 { 691 {
684 // the fun lies in doing everything manually... 692 // the fun lies in doing everything manually...
685 c.color.red = color.r; 693 c.color.red = color.r;
686 c.color.green = color.g; 694 c.color.green = color.g;
687 c.color.blue = color.b; 695 c.color.blue = color.b;
688 c.color.alpha = color.a; 696 c.color.alpha = alpha;
689 697
690 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red ) 698 c.pixel = insert_component (color.r, format->direct.redMask , format->direct.red )
691 | insert_component (color.g, format->direct.greenMask, format->direct.green) 699 | insert_component (color.g, format->direct.greenMask, format->direct.green)
692 | insert_component (color.b, format->direct.blueMask , format->direct.blue ) 700 | insert_component (color.b, format->direct.blueMask , format->direct.blue )
693 | insert_component (color.a, format->direct.alphaMask, format->direct.alpha); 701 | insert_component (alpha , format->direct.alphaMask, format->direct.alpha);
694 702
695 return true; 703 return true;
696 } 704 }
697 else 705 else
698 { 706 {
699 XRenderColor d; 707 XRenderColor d;
700 708
701 d.red = color.r; 709 d.red = color.r;
702 d.green = color.g; 710 d.green = color.g;
703 d.blue = color.b; 711 d.blue = color.b;
704 d.alpha = color.a; 712 d.alpha = alpha;
705 713
706 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c); 714 return XftColorAllocValue (screen->dpy, screen->visual, screen->cmap, &d, &c);
707 } 715 }
708#else 716#else
709 c.red = color.r; 717 c.red = color.r;
710 c.green = color.g; 718 c.green = color.g;
711 c.blue = color.b; 719 c.blue = color.b;
712 720
713 if (screen->visual->c_class == TrueColor) 721 if (screen->visual->c_class == TrueColor)
714 { 722 {
715 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask )) 723 c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask ))
716 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask)) 724 | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask))
717 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask )); 725 | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask ));
718 726
719 return true; 727 return true;
720 } 728 }
721 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 729 else if (XAllocColor (screen->dpy, screen->cmap, &c))
722 return true; 730 return true;
… …
734{ 742{
735 rgba c; 743 rgba c;
736 char eos; 744 char eos;
737 int skip; 745 int skip;
738 746
747 c.a = rgba::MAX_CC;
748
739 // parse the nonstandard "[alphapercent]" prefix 749 // parse the nonstandard "[alphapercent]" prefix
740 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip)) 750 if (1 <= sscanf (name, "[%hd]%n", &c.a, &skip))
741 { 751 {
742 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a); 752 c.a = lerp<int, int, int> (0, rgba::MAX_CC, c.a);
743 name += skip; 753 name += skip;
744 } 754 }
745 else
746 c.a = rgba::MAX_CC;
747 755
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 756 // 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)) 757 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 { 758 {
763 XColor xc; 759 XColor xc;
764 760
765 if (XParseColor (screen->dpy, screen->cmap, name, &xc)) 761 if (XParseColor (screen->dpy, screen->cmap, name, &xc))
766 { 762 {

Diff Legend

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