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.104 by sf-exg, Sun Jan 24 21:53:13 2010 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",
… …
362 XA_STRING, &actual_type, &actual_format, 362 XA_STRING, &actual_type, &actual_format,
363 &nitems, &nremaining, 363 &nitems, &nremaining,
364 (unsigned char **)&val) == Success 364 (unsigned char **)&val) == Success
365 && actual_type == XA_STRING 365 && actual_type == XA_STRING
366 && actual_format == 8) 366 && actual_format == 8)
367 displayResource = val; 367 displayResource = val;
368 else 368 else
369 { 369 {
370 displayResource = 0; 370 displayResource = 0;
371 371
372 if (val) 372 if (val)
373 XFree(val); 373 XFree (val);
374 } 374 }
375 375
376#if XLIB_ILLEGAL_ACCESS 376#if XLIB_ILLEGAL_ACCESS
377 dpy->xdefaults = displayResource; 377 dpy->xdefaults = displayResource;
378#endif 378#endif
379 } 379 }
… …
427bool rxvt_display::ref_init () 427bool rxvt_display::ref_init ()
428{ 428{
429#ifdef LOCAL_X_IS_UNIX 429#ifdef LOCAL_X_IS_UNIX
430 if (id[0] == ':') 430 if (id[0] == ':')
431 { 431 {
432 val = rxvt_malloc (5 + strlen (id) + 1); 432 if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
433 return false;
433 strcpy (val, "unix/"); 434 strcpy (val, "unix/");
434 strcat (val, id); 435 strcat (val, id);
435 dpy = XOpenDisplay (val); 436 dpy = XOpenDisplay (val);
436 free (val);
437 } 437 }
438 else 438 else
439#endif 439#endif
440 dpy = 0; 440 dpy = 0;
441 441
… …
446 return false; 446 return false;
447 447
448 screen = DefaultScreen (dpy); 448 screen = DefaultScreen (dpy);
449 root = DefaultRootWindow (dpy); 449 root = DefaultRootWindow (dpy);
450 450
451 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 451 assert (ARRAY_LENGTH(xa_names) == NUM_XA);
452 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 452 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
453 453
454 XrmSetDatabase (dpy, get_resources (false)); 454 XrmSetDatabase (dpy, get_resources (false));
455 455
456#ifdef POINTER_BLANK 456#ifdef POINTER_BLANK
… …
464 XUnloadFont (dpy, f); 464 XUnloadFont (dpy, f);
465#endif 465#endif
466 466
467 int fd = XConnectionNumber (dpy); 467 int fd = XConnectionNumber (dpy);
468 468
469 // try to detect wether we have a local connection. 469 // try to detect whether we have a local connection.
470 // assume unix domain socket == local, everything else not 470 // assume unix domain socket == local, everything else not
471 // TODO: might want to check for inet/127.0.0.1 471 // TODO: might want to check for inet/127.0.0.1
472 is_local = 0; 472 is_local = 0;
473 sockaddr_un sa; 473 sockaddr_un sa;
474 socklen_t sl = sizeof (sa); 474 socklen_t sl = sizeof (sa);
… …
488} 488}
489 489
490void 490void
491rxvt_display::ref_next () 491rxvt_display::ref_next ()
492{ 492{
493 // TODO: somehow check wether the database files/resources changed 493 // TODO: somehow check whether the database files/resources changed
494 // before affording re-loading/parsing 494 // before affording re-loading/parsing
495 XrmDestroyDatabase (XrmGetDatabase (dpy)); 495 XrmDestroyDatabase (XrmGetDatabase (dpy));
496 XrmSetDatabase (dpy, get_resources (true)); 496 XrmSetDatabase (dpy, get_resources (true));
497} 497}
498 498
… …
507 x_ev.stop (); 507 x_ev.stop ();
508 flush_ev.stop (); 508 flush_ev.stop ();
509#ifdef USE_XIM 509#ifdef USE_XIM
510 xims.clear (); 510 xims.clear ();
511#endif 511#endif
512 XrmDestroyDatabase (XrmGetDatabase (dpy));
512 XCloseDisplay (dpy); 513 XCloseDisplay (dpy);
513} 514}
514 515
515#ifdef USE_XIM 516#ifdef USE_XIM
516void rxvt_display::im_change_cb () 517void rxvt_display::im_change_cb ()
… …
528 unsigned long nitems, bytes_after; 529 unsigned long nitems, bytes_after;
529 530
530 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L, 531 if (XGetWindowProperty (dpy, root, xa[XA_XIM_SERVERS], 0L, 1000000L,
531 False, XA_ATOM, &actual_type, &actual_format, 532 False, XA_ATOM, &actual_type, &actual_format,
532 &nitems, &bytes_after, (unsigned char **)&atoms) 533 &nitems, &bytes_after, (unsigned char **)&atoms)
533 != Success ) 534 != Success)
534 return; 535 return;
535 536
536 if (actual_type == XA_ATOM && actual_format == 32) 537 if (actual_type == XA_ATOM && actual_format == 32)
537 for (int i = 0; i < nitems; i++) 538 for (int i = 0; i < nitems; i++)
538 if (XGetSelectionOwner (dpy, atoms[i])) 539 if (XGetSelectionOwner (dpy, atoms[i]))
539 { 540 {
540 im_change_cb (); 541 im_change_cb ();
541 break; 542 break;
… …
607{ 608{
608 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner; 609 rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
609 610
610 if (cur_owner && cur_owner != owner) 611 if (cur_owner && cur_owner != owner)
611 { 612 {
613 rxvt_term *term = cur_owner;
612 cur_owner->selection_clear (clipboard); 614 term->selection_clear (clipboard);
613 cur_owner->flush (); 615 term->flush ();
614 } 616 }
615 617
616 cur_owner = owner; 618 cur_owner = owner;
617} 619}
618 620
… …
634 int l, m; 636 int l, m;
635 637
636 l = strlen (locale); 638 l = strlen (locale);
637 m = strlen (modifiers); 639 m = strlen (modifiers);
638 640
639 if (!(id = (char *)malloc (l + m + 2))) 641 if (!(id = rxvt_temp_buf<char> (l + m + 2)))
640 return 0; 642 return 0;
641 643
642 memcpy (id, locale, l); id[l] = '\n'; 644 memcpy (id, locale, l); id[l] = '\n';
643 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0; 645 memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
644 646
645 rxvt_xim *xim = xims.get (id); 647 rxvt_xim *xim = xims.get (id);
646
647 free (id);
648 648
649 return xim; 649 return xim;
650} 650}
651 651
652void rxvt_display::put_xim (rxvt_xim *xim) 652void rxvt_display::put_xim (rxvt_xim *xim)
… …
885 lerp (c.a, to.a, percent) 885 lerp (c.a, to.a, percent)
886 ) 886 )
887 ); 887 );
888} 888}
889 889
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