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.102 by root, Tue Nov 4 11:03:29 2008 UTC vs.
Revision 1.115 by sf-exg, Fri Feb 11 01:24:46 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",
… …
227{ 227{
228} 228}
229 229
230rxvt_drawable &rxvt_screen::scratch_drawable (int w, int h) 230rxvt_drawable &rxvt_screen::scratch_drawable (int w, int h)
231{ 231{
232 // it's actually faster to re-allocate every time. don't ask me
233 // why, but its likely no big deal there are no roundtrips
234 // (I think/hope).
235 if (!scratch_area || w > scratch_w || h > scratch_h || 1/*D*/) 232 if (!scratch_area || w > scratch_w || h > scratch_h)
236 { 233 {
237 if (scratch_area) 234 if (scratch_area)
238 { 235 {
239 XFreePixmap (dpy, scratch_area->drawable); 236 XFreePixmap (dpy, scratch_area->drawable);
240 delete scratch_area; 237 delete scratch_area;
… …
297///////////////////////////////////////////////////////////////////////////// 294/////////////////////////////////////////////////////////////////////////////
298 295
299rxvt_display::rxvt_display (const char *id) 296rxvt_display::rxvt_display (const char *id)
300: refcounted (id) 297: refcounted (id)
301, selection_owner (0) 298, selection_owner (0)
299, clipboard_owner (0)
302{ 300{
303 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this); 301 x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
304 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this); 302 flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
305} 303}
306 304
… …
313 /* 311 /*
314 * get resources using the X library function 312 * get resources using the X library function
315 */ 313 */
316 char *displayResource, *xe; 314 char *displayResource, *xe;
317 XrmDatabase rdb1, database = 0; 315 XrmDatabase rdb1, database = 0;
316
317#if !XLIB_ILLEGAL_ACCESS
318 /* work around a bug in XrmSetDatabase where it frees the db, see ref_next */
319 database = XrmGetStringDatabase ("");
320#endif
318 321
319 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20 322 // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
320 // as opposed to "standard practise", we always read in ~/.Xdefaults 323 // as opposed to "standard practise", we always read in ~/.Xdefaults
321 324
322 // 6. System wide per application default file. 325 // 6. System wide per application default file.
… …
361 XA_STRING, &actual_type, &actual_format, 364 XA_STRING, &actual_type, &actual_format,
362 &nitems, &nremaining, 365 &nitems, &nremaining,
363 (unsigned char **)&val) == Success 366 (unsigned char **)&val) == Success
364 && actual_type == XA_STRING 367 && actual_type == XA_STRING
365 && actual_format == 8) 368 && actual_format == 8)
366 displayResource = val; 369 displayResource = val;
367 else 370 else
368 { 371 {
369 displayResource = 0; 372 displayResource = 0;
370 373
371 if (val) 374 if (val)
372 XFree(val); 375 XFree (val);
373 } 376 }
374 377
375#if XLIB_ILLEGAL_ACCESS 378#if XLIB_ILLEGAL_ACCESS
376 dpy->xdefaults = displayResource; 379 dpy->xdefaults = displayResource;
377#endif 380#endif
378 } 381 }
… …
426bool rxvt_display::ref_init () 429bool rxvt_display::ref_init ()
427{ 430{
428#ifdef LOCAL_X_IS_UNIX 431#ifdef LOCAL_X_IS_UNIX
429 if (id[0] == ':') 432 if (id[0] == ':')
430 { 433 {
431 val = rxvt_malloc (5 + strlen (id) + 1); 434 if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
435 return false;
432 strcpy (val, "unix/"); 436 strcpy (val, "unix/");
433 strcat (val, id); 437 strcat (val, id);
434 dpy = XOpenDisplay (val); 438 dpy = XOpenDisplay (val);
435 free (val);
436 } 439 }
437 else 440 else
438#endif 441#endif
439 dpy = 0; 442 dpy = 0;
440 443
… …
445 return false; 448 return false;
446 449
447 screen = DefaultScreen (dpy); 450 screen = DefaultScreen (dpy);
448 root = DefaultRootWindow (dpy); 451 root = DefaultRootWindow (dpy);
449 452
450 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 453 assert (ARRAY_LENGTH(xa_names) == NUM_XA);
451 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 454 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
452 455
453 XrmSetDatabase (dpy, get_resources (false)); 456 XrmSetDatabase (dpy, get_resources (false));
454 457
455#ifdef POINTER_BLANK 458#ifdef POINTER_BLANK
… …
463 XUnloadFont (dpy, f); 466 XUnloadFont (dpy, f);
464#endif 467#endif
465 468
466 int fd = XConnectionNumber (dpy); 469 int fd = XConnectionNumber (dpy);
467 470
468 // try to detect wether we have a local connection. 471 // try to detect whether we have a local connection.
469 // assume unix domain socket == local, everything else not 472 // assume unix domain socket == local, everything else not
470 // TODO: might want to check for inet/127.0.0.1 473 // TODO: might want to check for inet/127.0.0.1
471 is_local = 0; 474 is_local = 0;
472 sockaddr_un sa; 475 sockaddr_un sa;
473 socklen_t sl = sizeof (sa); 476 socklen_t sl = sizeof (sa);
… …
487} 490}
488 491
489void 492void
490rxvt_display::ref_next () 493rxvt_display::ref_next ()
491{ 494{
492 // TODO: somehow check wether the database files/resources changed 495 // TODO: somehow check whether the database files/resources changed
493 // before affording re-loading/parsing 496 // before affording re-loading/parsing
494 XrmDestroyDatabase (XrmGetDatabase (dpy)); 497 XrmDestroyDatabase (XrmGetDatabase (dpy));
498#if XLIB_ILLEGAL_ACCESS
499 /* work around a bug in XrmSetDatabase where it frees the db */
500 dpy->db = 0;
501#endif
495 XrmSetDatabase (dpy, get_resources (true)); 502 XrmSetDatabase (dpy, get_resources (true));
496} 503}
497 504
498rxvt_display::~rxvt_display () 505rxvt_display::~rxvt_display ()
499{ 506{
… …
506 x_ev.stop (); 513 x_ev.stop ();
507 flush_ev.stop (); 514 flush_ev.stop ();
508#ifdef USE_XIM 515#ifdef USE_XIM
509 xims.clear (); 516 xims.clear ();
510#endif 517#endif
518 XrmDestroyDatabase (XrmGetDatabase (dpy));
511 XCloseDisplay (dpy); 519 XCloseDisplay (dpy);
512} 520}
513 521
514#ifdef USE_XIM 522#ifdef USE_XIM
515void rxvt_display::im_change_cb () 523void rxvt_display::im_change_cb ()
… …
527 unsigned long nitems, bytes_after; 535 unsigned long nitems, bytes_after;
528 536
529 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 537 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
530 False, XA_ATOM, &actual_type, &actual_format, 538 False, XA_ATOM, &actual_type, &actual_format,
531 &nitems, &bytes_after, (unsigned char **)&atoms) 539 &nitems, &bytes_after, (unsigned char **)&atoms)
532 != Success ) 540 != Success)
533 return; 541 return;
534 542
535 if (actual_type == XA_ATOM && actual_format == 32) 543 if (actual_type == XA_ATOM && actual_format == 32)
536 for (int i = 0; i < nitems; i++) 544 for (int i = 0; i < nitems; i++)
537 if (XGetSelectionOwner (dpy, atoms[i])) 545 if (XGetSelectionOwner (dpy, atoms[i]))
538 { 546 {
539 im_change_cb (); 547 im_change_cb ();
540 break; 548 break;
… …
600 xw[w->active - 1] = 0; 608 xw[w->active - 1] = 0;
601 w->active = 0; 609 w->active = 0;
602 } 610 }
603} 611}
604 612
605void rxvt_display::set_selection_owner (rxvt_term *owner) 613void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
606{ 614{
615 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
616
607 if (selection_owner && selection_owner != owner) 617 if (cur_owner && cur_owner != owner)
608 { 618 {
609 rxvt_term *owner = selection_owner; 619 rxvt_term *term = cur_owner;
610
611 owner->selection_clear (); 620 term->selection_clear (clipboard);
612 owner->flush (); 621 term->flush ();
613 } 622 }
614 623
615 selection_owner = owner; 624 cur_owner = owner;
616} 625}
617 626
618#ifdef USE_XIM 627#ifdef USE_XIM
619 628
620void rxvt_display::reg (im_watcher *w) 629void rxvt_display::reg (im_watcher *w)
… …
633 int l, m; 642 int l, m;
634 643
635 l = strlen (locale); 644 l = strlen (locale);
636 m = strlen (modifiers); 645 m = strlen (modifiers);
637 646
638 if (!(id = (char *)malloc (l + m + 2))) 647 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
639 return 0; 648 return 0;
640 649
641 memcpy (id, locale, l); id[l] = '\n'; 650 memcpy (id, locale, l); id[l] = '\n';
642 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 651 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
643 652
644 rxvt_xim *xim = xims.get (id); 653 rxvt_xim *xim = xims.get (id);
645
646 free (id);
647 654
648 return xim; 655 return xim;
649} 656}
650 657
651void rxvt_display::put_xim (rxvt_xim *xim) 658void rxvt_display::put_xim (rxvt_xim *xim)
… …
720 c.green = color.g; 727 c.green = color.g;
721 c.blue = color.b; 728 c.blue = color.b;
722 729
723 if (screen->visual->c_class == TrueColor) 730 if (screen->visual->c_class == TrueColor)
724 { 731 {
725 c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask )) 732 c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask ))
726 | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask)) 733 | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask))
727 | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask )); 734 | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask ));
728 735
729 return true; 736 return true;
730 } 737 }
731 else if (XAllocColor (screen->dpy, screen->cmap, &c)) 738 else if (XAllocColor (screen->dpy, screen->cmap, &c))
732 return true; 739 return true;
… …
884 lerp (c.a, to.a, percent) 891 lerp (c.a, to.a, percent)
885 ) 892 )
886 ); 893 );
887} 894}
888 895
889#if TRACE_PIXMAPS 896rxvt_selection::rxvt_selection (rxvt_display *disp, int selnum, Time tm, Window win, Atom prop, sel_cb cb, void *ptr)
890# undef XCreatePixmap 897: display (disp), request_time (tm), request_win (win), request_prop (prop), request_cb (cb), user_data (ptr)
891# undef XFreePixmap
892Pixmap trace_XCreatePixmap (const char *file, int line, Display *dpy, Window r, unsigned int w, unsigned int h, unsigned int d)
893{ 898{
894 Pixmap res = XCreatePixmap (dpy, r, w, h, d); 899 assert (selnum >= Sel_Primary && selnum <= Sel_Clipboard);
895 fprintf (stderr, "%s:%d: XCreatePixmap (%p,%lX,%u,%u,%u) returned %lX\n", file, line, dpy, r, w, h, d, res); 900
901 timer_ev.set<rxvt_selection, &rxvt_selection::timer_cb> (this);
902 timer_ev.repeat = 10.;
903 x_ev.set<rxvt_selection, &rxvt_selection::x_cb> (this);
904
905 incr_buf = 0;
906 incr_buf_size = incr_buf_fill = 0;
907 selection_wait = Sel_normal;
908
909#if X_HAVE_UTF8_STRING
910 selection_type = Sel_UTF8String;
911 if (request (display->xa[XA_UTF8_STRING], selnum))
912 return;
913#else
914 selection_type = Sel_CompoundText;
915 if (request (display->xa[XA_COMPOUND_TEXT], selnum))
916 return;
917#endif
918
919 // fallback to CUT_BUFFER0 if the requested property has no owner
920 handle_selection (display->root, XA_CUT_BUFFER0, false);
921}
922
923rxvt_selection::~rxvt_selection ()
924{
925 stop ();
926}
927
928void
929rxvt_selection::stop ()
930{
931 free (incr_buf);
932 incr_buf = 0;
933 timer_ev.stop ();
934 x_ev.stop (display);
935}
936
937bool
938rxvt_selection::request (Atom target, int selnum)
939{
940 Atom sel;
941
942 selection_type |= selnum;
943
944 if (selnum == Sel_Primary)
945 sel = XA_PRIMARY;
946 else if (selnum == Sel_Secondary)
947 sel = XA_SECONDARY;
948 else
949 sel = display->xa[XA_CLIPBOARD];
950
951 if (XGetSelectionOwner (display->dpy, sel) != None)
952 {
953 XConvertSelection (display->dpy, sel, target, request_prop,
954 request_win, request_time);
955 x_ev.start (display, request_win);
956 timer_ev.again ();
957 return true;
958 }
959
896 return res; 960 return false;
897} 961}
898 962
899void trace_XFreePixmap (const char *file, int line, Display *dpy, Pixmap p) 963void
964rxvt_selection::handle_selection (Window win, Atom prop, bool delete_prop)
900{ 965{
901 fprintf (stderr, "%s:%d: XFreePixmap (%p,%lX)\n", file, line, dpy, p); 966 Display *dpy = display->dpy;
902 XFreePixmap (dpy,p); 967 char *data = 0;
903} 968 unsigned int data_len = 0;
969 unsigned long bytes_after;
970 XTextProperty ct;
971
972 // check for failed XConvertSelection
973 if (prop == None)
974 {
975 bool error = true;
976 int selnum = selection_type & Sel_whereMask;
977
978 if (selection_type & Sel_CompoundText)
979 {
980 selection_type = 0;
981 error = !request (XA_STRING, selnum);
982 }
983
984 if (selection_type & Sel_UTF8String)
985 {
986 selection_type = Sel_CompoundText;
987 error = !request (display->xa[XA_COMPOUND_TEXT], selnum);
988 }
989
990 if (error)
991 {
992 ct.value = 0;
993 goto bailout;
994 }
995
996 return;
997 }
998
999 // length == (2^31 - 1) / 4, as gdk
1000 if (XGetWindowProperty (dpy, win, prop,
1001 0, 0x1fffffff,
1002 delete_prop, AnyPropertyType,
1003 &ct.encoding, &ct.format,
1004 &ct.nitems, &bytes_after,
1005 &ct.value) != Success)
1006 {
1007 ct.value = 0;
1008 goto bailout;
1009 }
1010
1011 if (ct.encoding == None)
1012 goto bailout;
1013
1014 if (ct.value == 0)
1015 goto bailout;
1016
1017 if (ct.encoding == display->xa[XA_INCR])
1018 {
1019 // INCR selection, start handshake
1020 if (!delete_prop)
1021 XDeleteProperty (dpy, win, prop);
1022
1023 selection_wait = Sel_incr;
1024 timer_ev.again ();
1025
1026 goto bailout;
1027 }
1028
1029 if (ct.nitems == 0)
1030 {
1031 if (selection_wait == Sel_incr)
1032 {
1033 XFree (ct.value);
1034
1035 // finally complete, now paste the whole thing
1036 selection_wait = Sel_normal;
1037 ct.value = (unsigned char *)incr_buf;
1038 ct.nitems = incr_buf_fill;
1039 incr_buf = 0;
1040 timer_ev.stop ();
1041 }
1042 else
1043 {
1044 // avoid recursion
1045 if (win != display->root || prop != XA_CUT_BUFFER0)
1046 {
1047 XFree (ct.value);
1048
1049 // fallback to CUT_BUFFER0 if the requested property
1050 // has an owner but is empty
1051 handle_selection (display->root, XA_CUT_BUFFER0, False);
1052 return;
1053 }
1054
1055 goto bailout;
1056 }
1057 }
1058 else if (selection_wait == Sel_incr)
1059 {
1060 timer_ev.again ();
1061
1062 while (incr_buf_fill + ct.nitems > incr_buf_size)
1063 {
1064 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
1065 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
1066 }
1067
1068 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
1069 incr_buf_fill += ct.nitems;
1070
1071 goto bailout;
1072 }
1073
1074 char **cl;
1075 int cr;
1076
1077 // we honour the first item only
1078
1079#if !ENABLE_MINIMAL
1080 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
1081 // so recode it manually
1082 if (ct.encoding == display->xa[XA_UTF8_STRING])
1083 {
1084 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
1085 data = rxvt_wcstombs (w);
1086 free (w);
1087 }
1088 else
904#endif 1089#endif
1090 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
1091 && cl)
1092 {
1093 data = strdup (cl[0]);
1094 XFreeStringList (cl);
1095 }
1096 else
1097 {
1098 // paste raw
1099 data = strdup ((const char *)ct.value);
1100 }
1101
1102 data_len = strlen (data);
1103
1104bailout:
1105 XFree (ct.value);
1106
1107 if (selection_wait == Sel_normal)
1108 {
1109 stop ();
1110 request_cb (data, data_len, this, user_data);
1111 free (data);
1112 }
1113}
1114
1115void
1116rxvt_selection::timer_cb (ev::timer &w, int revents)
1117{
1118 if (selection_wait == Sel_incr)
1119 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
1120
1121 stop ();
1122 request_cb (NULL, 0, this, user_data);
1123}
1124
1125void
1126rxvt_selection::x_cb (XEvent &xev)
1127{
1128 switch (xev.type)
1129 {
1130 case PropertyNotify:
1131 if (selection_wait == Sel_incr
1132 && xev.xproperty.atom == request_prop
1133 && xev.xproperty.state == PropertyNewValue)
1134 handle_selection (xev.xproperty.window, xev.xproperty.atom, true);
1135 break;
1136
1137 case SelectionNotify:
1138 if (selection_wait == Sel_normal
1139 && xev.xselection.time == request_time
1140 && xev.xselection.property == request_prop)
1141 {
1142 timer_ev.stop ();
1143 handle_selection (xev.xselection.requestor, xev.xselection.property, true);
1144 }
1145 break;
1146 }
1147}

Diff Legend

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