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.96 by root, Sat Jan 26 12:12:38 2008 UTC vs.
Revision 1.111 by sf-exg, Sat Dec 18 18:17:39 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
… …
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;
… …
543} 545}
544#endif 546#endif
545 547
546void rxvt_display::x_cb (ev::io &w, int revents) 548void rxvt_display::x_cb (ev::io &w, int revents)
547{ 549{
550 flush_ev.start ();
551}
552
553void rxvt_display::flush_cb (ev::prepare &w, int revents)
554{
548 while (XEventsQueued (dpy, QueuedAfterReading)) 555 while (XEventsQueued (dpy, QueuedAfterFlush))
556 do
549 { 557 {
550 XEvent xev; 558 XEvent xev;
551 XNextEvent (dpy, &xev); 559 XNextEvent (dpy, &xev);
552 560
553#ifdef USE_XIM 561#ifdef USE_XIM
554 if (!XFilterEvent (&xev, None)) 562 if (!XFilterEvent (&xev, None))
555#endif
556 { 563 {
557 if (xev.type == PropertyNotify 564 if (xev.type == PropertyNotify
558 && xev.xany.window == root 565 && xev.xany.window == root
559 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 566 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
560 im_change_check (); 567 im_change_check ();
561 568#endif
562 if (xev.type == MappingNotify) 569 if (xev.type == MappingNotify)
563 XRefreshKeyboardMapping (&xev.xmapping); 570 XRefreshKeyboardMapping (&xev.xmapping);
564 571
565 for (int i = xw.size (); i--; ) 572 for (int i = xw.size (); i--; )
566 { 573 {
567 if (!xw[i]) 574 if (!xw[i])
568 xw.erase_unordered (i); 575 xw.erase_unordered (i);
569 else if (xw[i]->window == xev.xany.window) 576 else if (xw[i]->window == xev.xany.window)
570 xw[i]->call (xev); 577 xw[i]->call (xev);
571 } 578 }
579#ifdef USE_XIM
572 } 580 }
581#endif
573 } 582 }
574}
575
576void rxvt_display::flush_cb (ev::prepare &w, int revents)
577{
578 XFlush (dpy);
579 if (XEventsQueued (dpy, QueuedAfterReading)) 583 while (XEventsQueued (dpy, QueuedAlready));
580 x_cb(x_ev,0);//D 584
581 XFlush (dpy);
582 if (XEventsQueued (dpy, QueuedAfterReading))
583 x_cb(x_ev,0);//D
584 XFlush (dpy);
585 w.stop (); 585 w.stop ();
586} 586}
587 587
588void rxvt_display::reg (xevent_watcher *w) 588void rxvt_display::reg (xevent_watcher *w)
589{ 589{
… …
601 xw[w->active - 1] = 0; 601 xw[w->active - 1] = 0;
602 w->active = 0; 602 w->active = 0;
603 } 603 }
604} 604}
605 605
606void rxvt_display::set_selection_owner (rxvt_term *owner) 606void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
607{ 607{
608 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
609
608 if (selection_owner && selection_owner != owner) 610 if (cur_owner && cur_owner != owner)
609 { 611 {
610 rxvt_term *owner = selection_owner; 612 rxvt_term *term = cur_owner;
611
612 owner->selection_clear (); 613 term->selection_clear (clipboard);
613 owner->flush (); 614 term->flush ();
614 } 615 }
615 616
616 selection_owner = owner; 617 cur_owner = owner;
617} 618}
618 619
619#ifdef USE_XIM 620#ifdef USE_XIM
620 621
621void rxvt_display::reg (im_watcher *w) 622void rxvt_display::reg (im_watcher *w)
… …
634 int l, m; 635 int l, m;
635 636
636 l = strlen (locale); 637 l = strlen (locale);
637 m = strlen (modifiers); 638 m = strlen (modifiers);
638 639
639 if (!(id = (char *)malloc (l + m + 2))) 640 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
640 return 0; 641 return 0;
641 642
642 memcpy (id, locale, l); id[l] = '\n'; 643 memcpy (id, locale, l); id[l] = '\n';
643 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 644 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
644 645
645 rxvt_xim *xim = xims.get (id); 646 rxvt_xim *xim = xims.get (id);
646
647 free (id);
648 647
649 return xim; 648 return xim;
650} 649}
651 650
652void rxvt_display::put_xim (rxvt_xim *xim) 651void rxvt_display::put_xim (rxvt_xim *xim)
… …
721 c.green = color.g; 720 c.green = color.g;
722 c.blue = color.b; 721 c.blue = color.b;
723 722
724 if (screen->visual->c_class == TrueColor) 723 if (screen->visual->c_class == TrueColor)
725 { 724 {
726 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 ))
727 | (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))
728 | (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 ));
729 728
730 return true; 729 return true;
731 } 730 }
732 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 731 else if (XAllocColor (screen->dpy, screen->cmap, &c))
733 return true; 732 return true;
… …
885 lerp (c.a, to.a, percent) 884 lerp (c.a, to.a, percent)
886 ) 885 )
887 ); 886 );
888} 887}
889 888
890#if TRACE_PIXMAPS
891# undef XCreatePixmap
892# undef XFreePixmap
893Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
894{
895 Pixmap res = XCreatePixmap (dpy, r, w, h, d);
896 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res);
897 return res;
898}
899
900void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p)
901{
902 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p);
903 XFreePixmap (dpy,p);
904}
905#endif

Diff Legend

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