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.101 by root, Sat Jan 26 14:35:28 2008 UTC vs.
Revision 1.109 by sf-exg, Mon Dec 13 08:29:25 2010 UTC

… …
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
… …
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
… …
526 unsigned long nitems, bytes_after; 528 unsigned long nitems, bytes_after;
527 529
528 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 530 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
529 False, XA_ATOM, &actual_type, &actual_format, 531 False, XA_ATOM, &actual_type, &actual_format,
530 &nitems, &bytes_after, (unsigned char **)&atoms) 532 &nitems, &bytes_after, (unsigned char **)&atoms)
531 != Success ) 533 != Success)
532 return; 534 return;
533 535
534 if (actual_type == XA_ATOM && actual_format == 32) 536 if (actual_type == XA_ATOM && actual_format == 32)
535 for (int i = 0; i < nitems; i++) 537 for (int i = 0; i < nitems; i++)
536 if (XGetSelectionOwner (dpy, atoms[i])) 538 if (XGetSelectionOwner (dpy, atoms[i]))
537 { 539 {
538 im_change_cb (); 540 im_change_cb ();
539 break; 541 break;
… …
599 xw[w->active - 1] = 0; 601 xw[w->active - 1] = 0;
600 w->active = 0; 602 w->active = 0;
601 } 603 }
602} 604}
603 605
604void rxvt_display::set_selection_owner (rxvt_term *owner) 606void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
605{ 607{
608 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
609
606 if (selection_owner && selection_owner != owner) 610 if (cur_owner && cur_owner != owner)
607 { 611 {
608 rxvt_term *owner = selection_owner; 612 rxvt_term *term = cur_owner;
609
610 owner->selection_clear (); 613 term->selection_clear (clipboard);
611 owner->flush (); 614 term->flush ();
612 } 615 }
613 616
614 selection_owner = owner; 617 cur_owner = owner;
615} 618}
616 619
617#ifdef USE_XIM 620#ifdef USE_XIM
618 621
619void rxvt_display::reg (im_watcher *w) 622void rxvt_display::reg (im_watcher *w)
… …
632 int l, m; 635 int l, m;
633 636
634 l = strlen (locale); 637 l = strlen (locale);
635 m = strlen (modifiers); 638 m = strlen (modifiers);
636 639
637 if (!(id = (char *)malloc (l + m + 2))) 640 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
638 return 0; 641 return 0;
639 642
640 memcpy (id, locale, l); id[l] = '\n'; 643 memcpy (id, locale, l); id[l] = '\n';
641 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 644 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
642 645
643 rxvt_xim *xim = xims.get (id); 646 rxvt_xim *xim = xims.get (id);
644
645 free (id);
646 647
647 return xim; 648 return xim;
648} 649}
649 650
650void rxvt_display::put_xim (rxvt_xim *xim) 651void rxvt_display::put_xim (rxvt_xim *xim)
… …
719 c.green = color.g; 720 c.green = color.g;
720 c.blue = color.b; 721 c.blue = color.b;
721 722
722 if (screen->visual->c_class == TrueColor) 723 if (screen->visual->c_class == TrueColor)
723 { 724 {
724 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask )) 725 c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask ))
725 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask)) 726 | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask))
726 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask )); 727 | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask ));
727 728
728 return true; 729 return true;
729 } 730 }
730 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 731 else if (XAllocColor (screen->dpy, screen->cmap, &c))
731 return true; 732 return true;
… …
883 lerp (c.a, to.a, percent) 884 lerp (c.a, to.a, percent)
884 ) 885 )
885 ); 886 );
886} 887}
887 888
888#if TRACE_PIXMAPS
889# undef XCreatePixmap
890# undef XFreePixmap
891Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
892{
893 Pixmap res = XCreatePixmap (dpy, r, w, h, d);
894 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
895 return res;
896}
897
898void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
899{
900 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
901 XFreePixmap (dpy,p);
902}
903#endif

Diff Legend

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