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.89 by root, Wed Jan 23 09:23:39 2008 UTC vs.
Revision 1.112 by sf-exg, Thu Dec 30 00:35:29 2010 UTC

… …
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
… …
296///////////////////////////////////////////////////////////////////////////// 297/////////////////////////////////////////////////////////////////////////////
297 298
298rxvt_display::rxvt_display (const char *id) 299rxvt_display::rxvt_display (const char *id)
299: refcounted (id) 300: refcounted (id)
300, selection_owner (0) 301, selection_owner (0)
302, clipboard_owner (0)
301{ 303{
302 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this); 304 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
303 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this); 305 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
304} 306}
305 307
… …
360 XA_STRING, &actual_type, &actual_format, 362 XA_STRING, &actual_type, &actual_format,
361 &nitems, &nremaining, 363 &nitems, &nremaining,
362 (unsigned char **)&val) == Success 364 (unsigned char **)&val) == Success
363 && actual_type == XA_STRING 365 && actual_type == XA_STRING
364 && actual_format == 8) 366 && actual_format == 8)
365 displayResource = val; 367 displayResource = val;
366 else 368 else
367 { 369 {
368 displayResource = 0; 370 displayResource = 0;
369 371
370 if (val) 372 if (val)
371 XFree(val); 373 XFree (val);
372 } 374 }
373 375
374#if XLIB_ILLEGAL_ACCESS 376#if XLIB_ILLEGAL_ACCESS
375 dpy->xdefaults = displayResource; 377 dpy->xdefaults = displayResource;
376#endif 378#endif
377 } 379 }
… …
425bool rxvt_display::ref_init () 427bool rxvt_display::ref_init ()
426{ 428{
427#ifdef LOCAL_X_IS_UNIX 429#ifdef LOCAL_X_IS_UNIX
428 if (id[0] == ':') 430 if (id[0] == ':')
429 { 431 {
430 val = rxvt_malloc (5 + strlen (id) + 1); 432 if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
433 return false;
431 strcpy (val, "unix/"); 434 strcpy (val, "unix/");
432 strcat (val, id); 435 strcat (val, id);
433 dpy = XOpenDisplay (val); 436 dpy = XOpenDisplay (val);
434 free (val);
435 } 437 }
436 else 438 else
437#endif 439#endif
438 dpy = 0; 440 dpy = 0;
439 441
… …
444 return false; 446 return false;
445 447
446 screen = DefaultScreen (dpy); 448 screen = DefaultScreen (dpy);
447 root = DefaultRootWindow (dpy); 449 root = DefaultRootWindow (dpy);
448 450
449 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 451 assert (ARRAY_LENGTH(xa_names) == NUM_XA);
450 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 452 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
451 453
452 XrmSetDatabase (dpy, get_resources (false)); 454 XrmSetDatabase (dpy, get_resources (false));
453 455
454#ifdef POINTER_BLANK 456#ifdef POINTER_BLANK
… …
462 XUnloadFont (dpy, f); 464 XUnloadFont (dpy, f);
463#endif 465#endif
464 466
465 int fd = XConnectionNumber (dpy); 467 int fd = XConnectionNumber (dpy);
466 468
467 // try to detect wether we have a local connection. 469 // try to detect whether we have a local connection.
468 // assume unix domain socket == local, everything else not 470 // assume unix domain socket == local, everything else not
469 // TODO: might want to check for inet/127.0.0.1 471 // TODO: might want to check for inet/127.0.0.1
470 is_local = 0; 472 is_local = 0;
471 sockaddr_un sa; 473 sockaddr_un sa;
472 socklen_t sl = sizeof (sa); 474 socklen_t sl = sizeof (sa);
… …
486} 488}
487 489
488void 490void
489rxvt_display::ref_next () 491rxvt_display::ref_next ()
490{ 492{
491 // TODO: somehow check wether the database files/resources changed 493 // TODO: somehow check whether the database files/resources changed
492 // before affording re-loading/parsing 494 // before affording re-loading/parsing
493 XrmDestroyDatabase (XrmGetDatabase (dpy)); 495 XrmDestroyDatabase (XrmGetDatabase (dpy));
494 XrmSetDatabase (dpy, get_resources (true)); 496 XrmSetDatabase (dpy, get_resources (true));
495} 497}
496 498
… …
505 x_ev.stop (); 507 x_ev.stop ();
506 flush_ev.stop (); 508 flush_ev.stop ();
507#ifdef USE_XIM 509#ifdef USE_XIM
508 xims.clear (); 510 xims.clear ();
509#endif 511#endif
512 XrmDestroyDatabase (XrmGetDatabase (dpy));
510 XCloseDisplay (dpy); 513 XCloseDisplay (dpy);
511} 514}
512 515
513#ifdef USE_XIM 516#ifdef USE_XIM
514void rxvt_display::im_change_cb () 517void rxvt_display::im_change_cb ()
… …
526 unsigned long nitems, bytes_after; 529 unsigned long nitems, bytes_after;
527 530
528 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 531 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
529 False, XA_ATOM, &actual_type, &actual_format, 532 False, XA_ATOM, &actual_type, &actual_format,
530 &nitems, &bytes_after, (unsigned char **)&atoms) 533 &nitems, &bytes_after, (unsigned char **)&atoms)
531 != Success ) 534 != Success)
532 return; 535 return;
533 536
534 if (actual_type == XA_ATOM && actual_format == 32) 537 if (actual_type == XA_ATOM && actual_format == 32)
535 for (int i = 0; i < nitems; i++) 538 for (int i = 0; i < nitems; i++)
536 if (XGetSelectionOwner (dpy, atoms[i])) 539 if (XGetSelectionOwner (dpy, atoms[i]))
537 { 540 {
538 im_change_cb (); 541 im_change_cb ();
539 break; 542 break;
… …
543} 546}
544#endif 547#endif
545 548
546void rxvt_display::x_cb (ev::io &w, int revents) 549void rxvt_display::x_cb (ev::io &w, int revents)
547{ 550{
551 flush_ev.start ();
552}
553
554void rxvt_display::flush_cb (ev::prepare &w, int revents)
555{
548 while (XEventsQueued (dpy, QueuedAfterReading)) 556 while (XEventsQueued (dpy, QueuedAfterFlush))
557 do
549 { 558 {
550 XEvent xev; 559 XEvent xev;
551 XNextEvent (dpy, &xev); 560 XNextEvent (dpy, &xev);
552 561
553#ifdef USE_XIM 562#ifdef USE_XIM
554 if (!XFilterEvent (&xev, None)) 563 if (!XFilterEvent (&xev, None))
555 { 564 {
556 if (xev.type == PropertyNotify 565 if (xev.type == PropertyNotify
557 && xev.xany.window == root 566 && xev.xany.window == root
558 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 567 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
559 im_change_check (); 568 im_change_check ();
560#endif 569#endif
561 if (xev.type == MappingNotify) 570 if (xev.type == MappingNotify)
562 XRefreshKeyboardMapping (&xev.xmapping); 571 XRefreshKeyboardMapping (&xev.xmapping);
563 572
564 for (int i = xw.size (); i--; ) 573 for (int i = xw.size (); i--; )
565 { 574 {
566 if (!xw[i]) 575 if (!xw[i])
567 xw.erase_unordered (i); 576 xw.erase_unordered (i);
568 else if (xw[i]->window == xev.xany.window) 577 else if (xw[i]->window == xev.xany.window)
569 xw[i]->call (xev); 578 xw[i]->call (xev);
570 } 579 }
571#ifdef USE_XIM 580#ifdef USE_XIM
572 } 581 }
573#endif 582#endif
574 } 583 }
575} 584 while (XEventsQueued (dpy, QueuedAlready));
576 585
577void rxvt_display::flush_cb (ev::prepare &w, int revents)
578{
579 w.stop (); 586 w.stop ();
580 XFlush (dpy);
581} 587}
582 588
583void rxvt_display::reg (xevent_watcher *w) 589void rxvt_display::reg (xevent_watcher *w)
584{ 590{
585 if (!w->active) 591 if (!w->active)
… …
596 xw[w->active - 1] = 0; 602 xw[w->active - 1] = 0;
597 w->active = 0; 603 w->active = 0;
598 } 604 }
599} 605}
600 606
601void rxvt_display::set_selection_owner (rxvt_term *owner) 607void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
602{ 608{
609 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
610
603 if (selection_owner && selection_owner != owner) 611 if (cur_owner && cur_owner != owner)
604 { 612 {
605 rxvt_term *owner = selection_owner; 613 rxvt_term *term = cur_owner;
606
607 owner->selection_clear (); 614 term->selection_clear (clipboard);
608 owner->flush (); 615 term->flush ();
609 } 616 }
610 617
611 selection_owner = owner; 618 cur_owner = owner;
612} 619}
613 620
614#ifdef USE_XIM 621#ifdef USE_XIM
615 622
616void rxvt_display::reg (im_watcher *w) 623void rxvt_display::reg (im_watcher *w)
… …
629 int l, m; 636 int l, m;
630 637
631 l = strlen (locale); 638 l = strlen (locale);
632 m = strlen (modifiers); 639 m = strlen (modifiers);
633 640
634 if (!(id = (char *)malloc (l + m + 2))) 641 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
635 return 0; 642 return 0;
636 643
637 memcpy (id, locale, l); id[l] = '\n'; 644 memcpy (id, locale, l); id[l] = '\n';
638 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 645 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
639 646
640 rxvt_xim *xim = xims.get (id); 647 rxvt_xim *xim = xims.get (id);
641
642 free (id);
643 648
644 return xim; 649 return xim;
645} 650}
646 651
647void rxvt_display::put_xim (rxvt_xim *xim) 652void rxvt_display::put_xim (rxvt_xim *xim)
… …
673} 678}
674 679
675bool 680bool
676rxvt_color::alloc (rxvt_screen *screen, const rgba &color) 681rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
677{ 682{
678 //TODO: only supports 24 bit truecolour 683 //TODO: only supports 24 bit
679 int alpha = color.a >= 0xff00 ? 0xffff : color.a; 684 int alpha = color.a >= 0xff00 ? 0xffff : color.a;
680 685
681#if XFT 686#if XFT
682 XRenderPictFormat *format; 687 XRenderPictFormat *format;
683 688
… …
716 c.green = color.g; 721 c.green = color.g;
717 c.blue = color.b; 722 c.blue = color.b;
718 723
719 if (screen->visual->c_class == TrueColor) 724 if (screen->visual->c_class == TrueColor)
720 { 725 {
721 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask )) 726 c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask ))
722 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask)) 727 | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask))
723 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask )); 728 | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask ));
724 729
725 return true; 730 return true;
726 } 731 }
727 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 732 else if (XAllocColor (screen->dpy, screen->cmap, &c))
728 return true; 733 return true;
… …
880 lerp (c.a, to.a, percent) 885 lerp (c.a, to.a, percent)
881 ) 886 )
882 ); 887 );
883} 888}
884 889
885#if TRACE_PIXMAPS
886# undef XCreatePixmap
887# undef XFreePixmap
888Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
889{
890 Pixmap res = XCreatePixmap (dpy, r, w, h, d);
891 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
892 return res;
893}
894
895void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
896{
897 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
898 XFreePixmap (dpy,p);
899}
900#endif

Diff Legend

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