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.95 by root, Sat Jan 26 12:03:36 2008 UTC vs.
Revision 1.113 by sf-exg, Fri Jan 14 11:09:54 2011 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
… …
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;
… …
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, selection_owner (0) 298, selection_owner (0)
299, clipboard_owner (0)
301{ 300{
302 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this); 301 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
303 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this); 302 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
304} 303}
305 304
… …
360 XA_STRING, &actual_type, &actual_format, 359 XA_STRING, &actual_type, &actual_format,
361 &nitems, &nremaining, 360 &nitems, &nremaining,
362 (unsigned char **)&val) == Success 361 (unsigned char **)&val) == Success
363 && actual_type == XA_STRING 362 && actual_type == XA_STRING
364 && actual_format == 8) 363 && actual_format == 8)
365 displayResource = val; 364 displayResource = val;
366 else 365 else
367 { 366 {
368 displayResource = 0; 367 displayResource = 0;
369 368
370 if (val) 369 if (val)
371 XFree(val); 370 XFree (val);
372 } 371 }
373 372
374#if XLIB_ILLEGAL_ACCESS 373#if XLIB_ILLEGAL_ACCESS
375 dpy->xdefaults = displayResource; 374 dpy->xdefaults = displayResource;
376#endif 375#endif
377 } 376 }
… …
425bool rxvt_display::ref_init () 424bool rxvt_display::ref_init ()
426{ 425{
427#ifdef LOCAL_X_IS_UNIX 426#ifdef LOCAL_X_IS_UNIX
428 if (id[0] == ':') 427 if (id[0] == ':')
429 { 428 {
430 val = rxvt_malloc (5 + strlen (id) + 1); 429 if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
430 return false;
431 strcpy (val, "unix/"); 431 strcpy (val, "unix/");
432 strcat (val, id); 432 strcat (val, id);
433 dpy = XOpenDisplay (val); 433 dpy = XOpenDisplay (val);
434 free (val);
435 } 434 }
436 else 435 else
437#endif 436#endif
438 dpy = 0; 437 dpy = 0;
439 438
… …
444 return false; 443 return false;
445 444
446 screen = DefaultScreen (dpy); 445 screen = DefaultScreen (dpy);
447 root = DefaultRootWindow (dpy); 446 root = DefaultRootWindow (dpy);
448 447
449 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 448 assert (ARRAY_LENGTH(xa_names) == NUM_XA);
450 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 449 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
451 450
452 XrmSetDatabase (dpy, get_resources (false)); 451 XrmSetDatabase (dpy, get_resources (false));
453 452
454#ifdef POINTER_BLANK 453#ifdef POINTER_BLANK
… …
462 XUnloadFont (dpy, f); 461 XUnloadFont (dpy, f);
463#endif 462#endif
464 463
465 int fd = XConnectionNumber (dpy); 464 int fd = XConnectionNumber (dpy);
466 465
467 // try to detect wether we have a local connection. 466 // try to detect whether we have a local connection.
468 // assume unix domain socket == local, everything else not 467 // assume unix domain socket == local, everything else not
469 // TODO: might want to check for inet/127.0.0.1 468 // TODO: might want to check for inet/127.0.0.1
470 is_local = 0; 469 is_local = 0;
471 sockaddr_un sa; 470 sockaddr_un sa;
472 socklen_t sl = sizeof (sa); 471 socklen_t sl = sizeof (sa);
… …
486} 485}
487 486
488void 487void
489rxvt_display::ref_next () 488rxvt_display::ref_next ()
490{ 489{
491 // TODO: somehow check wether the database files/resources changed 490 // TODO: somehow check whether the database files/resources changed
492 // before affording re-loading/parsing 491 // before affording re-loading/parsing
493 XrmDestroyDatabase (XrmGetDatabase (dpy)); 492 XrmDestroyDatabase (XrmGetDatabase (dpy));
494 XrmSetDatabase (dpy, get_resources (true)); 493 XrmSetDatabase (dpy, get_resources (true));
495} 494}
496 495
… …
505 x_ev.stop (); 504 x_ev.stop ();
506 flush_ev.stop (); 505 flush_ev.stop ();
507#ifdef USE_XIM 506#ifdef USE_XIM
508 xims.clear (); 507 xims.clear ();
509#endif 508#endif
509 XrmDestroyDatabase (XrmGetDatabase (dpy));
510 XCloseDisplay (dpy); 510 XCloseDisplay (dpy);
511} 511}
512 512
513#ifdef USE_XIM 513#ifdef USE_XIM
514void rxvt_display::im_change_cb () 514void rxvt_display::im_change_cb ()
… …
526 unsigned long nitems, bytes_after; 526 unsigned long nitems, bytes_after;
527 527
528 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 528 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
529 False, XA_ATOM, &actual_type, &actual_format, 529 False, XA_ATOM, &actual_type, &actual_format,
530 &nitems, &bytes_after, (unsigned char **)&atoms) 530 &nitems, &bytes_after, (unsigned char **)&atoms)
531 != Success ) 531 != Success)
532 return; 532 return;
533 533
534 if (actual_type == XA_ATOM && actual_format == 32) 534 if (actual_type == XA_ATOM && actual_format == 32)
535 for (int i = 0; i < nitems; i++) 535 for (int i = 0; i < nitems; i++)
536 if (XGetSelectionOwner (dpy, atoms[i])) 536 if (XGetSelectionOwner (dpy, atoms[i]))
537 { 537 {
538 im_change_cb (); 538 im_change_cb ();
539 break; 539 break;
… …
543} 543}
544#endif 544#endif
545 545
546void rxvt_display::x_cb (ev::io &w, int revents) 546void rxvt_display::x_cb (ev::io &w, int revents)
547{ 547{
548 flush_ev.start ();
549}
550
551void rxvt_display::flush_cb (ev::prepare &w, int revents)
552{
548 while (XEventsQueued (dpy, QueuedAfterReading)) 553 while (XEventsQueued (dpy, QueuedAfterFlush))
554 do
549 { 555 {
550 XEvent xev; 556 XEvent xev;
551 XNextEvent (dpy, &xev); 557 XNextEvent (dpy, &xev);
552 558
553#ifdef USE_XIM 559#ifdef USE_XIM
554 if (!XFilterEvent (&xev, None)) 560 if (!XFilterEvent (&xev, None))
555#endif
556 { 561 {
557 if (xev.type == PropertyNotify 562 if (xev.type == PropertyNotify
558 && xev.xany.window == root 563 && xev.xany.window == root
559 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 564 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
560 im_change_check (); 565 im_change_check ();
561 566#endif
562 if (xev.type == MappingNotify) 567 if (xev.type == MappingNotify)
563 XRefreshKeyboardMapping (&xev.xmapping); 568 XRefreshKeyboardMapping (&xev.xmapping);
564 569
565 for (int i = xw.size (); i--; ) 570 for (int i = xw.size (); i--; )
566 { 571 {
567 if (!xw[i]) 572 if (!xw[i])
568 xw.erase_unordered (i); 573 xw.erase_unordered (i);
569 else if (xw[i]->window == xev.xany.window) 574 else if (xw[i]->window == xev.xany.window)
570 xw[i]->call (xev); 575 xw[i]->call (xev);
571 } 576 }
577#ifdef USE_XIM
572 } 578 }
579#endif
573 } 580 }
581 while (XEventsQueued (dpy, QueuedAlready));
574 582
575 flush_ev.start ();
576}
577
578void rxvt_display::flush_cb (ev::prepare &w, int revents)
579{
580 x_cb(x_ev,0);//D
581 XFlush (dpy);
582 w.stop (); 583 w.stop ();
583} 584}
584 585
585void rxvt_display::reg (xevent_watcher *w) 586void rxvt_display::reg (xevent_watcher *w)
586{ 587{
… …
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 { 609 {
607 rxvt_term *owner = selection_owner; 610 rxvt_term *term = cur_owner;
608
609 owner->selection_clear (); 611 term->selection_clear (clipboard);
610 owner->flush (); 612 term->flush ();
611 } 613 }
612 614
613 selection_owner = owner; 615 cur_owner = owner;
614} 616}
615 617
616#ifdef USE_XIM 618#ifdef USE_XIM
617 619
618void rxvt_display::reg (im_watcher *w) 620void rxvt_display::reg (im_watcher *w)
… …
631 int l, m; 633 int l, m;
632 634
633 l = strlen (locale); 635 l = strlen (locale);
634 m = strlen (modifiers); 636 m = strlen (modifiers);
635 637
636 if (!(id = (char *)malloc (l + m + 2))) 638 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
637 return 0; 639 return 0;
638 640
639 memcpy (id, locale, l); id[l] = '\n'; 641 memcpy (id, locale, l); id[l] = '\n';
640 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 642 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
641 643
642 rxvt_xim *xim = xims.get (id); 644 rxvt_xim *xim = xims.get (id);
643
644 free (id);
645 645
646 return xim; 646 return xim;
647} 647}
648 648
649void rxvt_display::put_xim (rxvt_xim *xim) 649void rxvt_display::put_xim (rxvt_xim *xim)
… …
718 c.green = color.g; 718 c.green = color.g;
719 c.blue = color.b; 719 c.blue = color.b;
720 720
721 if (screen->visual->c_class == TrueColor) 721 if (screen->visual->c_class == TrueColor)
722 { 722 {
723 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 ))
724 | (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))
725 | (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 ));
726 726
727 return true; 727 return true;
728 } 728 }
729 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 729 else if (XAllocColor (screen->dpy, screen->cmap, &c))
730 return true; 730 return true;
… …
882 lerp (c.a, to.a, percent) 882 lerp (c.a, to.a, percent)
883 ) 883 )
884 ); 884 );
885} 885}
886 886
887#if TRACE_PIXMAPS
888# undef XCreatePixmap
889# undef XFreePixmap
890Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
891{
892 Pixmap res = XCreatePixmap (dpy, r, w, h, d);
893 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
894 return res;
895}
896
897void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
898{
899 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
900 XFreePixmap (dpy,p);
901}
902#endif

Diff Legend

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