"_NET_WM_NAME",
"_NET_WM_ICON_NAME",
"_NET_WM_PING",
+ "_NET_WM_ICON",
+ "_NET_WM_USER_TIME",
#endif
#if USE_XIM
"WM_LOCALE_NAME",
rxvt_display::rxvt_display (const char *id)
: refcounted (id)
, selection_owner (0)
+, clipboard_owner (0)
{
x_ev .set<rxvt_display, &rxvt_display::x_cb > (this);
flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
#ifdef LOCAL_X_IS_UNIX
if (id[0] == ':')
{
- val = rxvt_malloc (5 + strlen (id) + 1);
+ if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
+ return false;
strcpy (val, "unix/");
strcat (val, id);
dpy = XOpenDisplay (val);
- free (val);
}
else
#endif
int fd = XConnectionNumber (dpy);
- // try to detect wether we have a local connection.
+ // try to detect whether we have a local connection.
// assume unix domain socket == local, everything else not
// TODO: might want to check for inet/127.0.0.1
is_local = 0;
void
rxvt_display::ref_next ()
{
- // TODO: somehow check wether the database files/resources changed
+ // TODO: somehow check whether the database files/resources changed
// before affording re-loading/parsing
XrmDestroyDatabase (XrmGetDatabase (dpy));
XrmSetDatabase (dpy, get_resources (true));
void rxvt_display::x_cb (ev::io &w, int revents)
{
- while (XEventsQueued (dpy, QueuedAfterReading))
- {
- XEvent xev;
- XNextEvent (dpy, &xev);
+ flush_ev.start ();
+}
+
+void rxvt_display::flush_cb (ev::prepare &w, int revents)
+{
+ while (XEventsQueued (dpy, QueuedAfterFlush))
+ do
+ {
+ XEvent xev;
+ XNextEvent (dpy, &xev);
#ifdef USE_XIM
- if (!XFilterEvent (&xev, None))
- {
- if (xev.type == PropertyNotify
- && xev.xany.window == root
- && xev.xproperty.atom == xa[XA_XIM_SERVERS])
- im_change_check ();
+ if (!XFilterEvent (&xev, None))
+ {
+ if (xev.type == PropertyNotify
+ && xev.xany.window == root
+ && xev.xproperty.atom == xa[XA_XIM_SERVERS])
+ im_change_check ();
#endif
- if (xev.type == MappingNotify)
- XRefreshKeyboardMapping (&xev.xmapping);
-
- for (int i = xw.size (); i--; )
- {
- if (!xw[i])
- xw.erase_unordered (i);
- else if (xw[i]->window == xev.xany.window)
- xw[i]->call (xev);
- }
+ if (xev.type == MappingNotify)
+ XRefreshKeyboardMapping (&xev.xmapping);
+
+ for (int i = xw.size (); i--; )
+ {
+ if (!xw[i])
+ xw.erase_unordered (i);
+ else if (xw[i]->window == xev.xany.window)
+ xw[i]->call (xev);
+ }
#ifdef USE_XIM
- }
+ }
#endif
- }
-}
+ }
+ while (XEventsQueued (dpy, QueuedAlready));
-void rxvt_display::flush_cb (ev::prepare &w, int revents)
-{
w.stop ();
- XFlush (dpy);
}
void rxvt_display::reg (xevent_watcher *w)
}
}
-void rxvt_display::set_selection_owner (rxvt_term *owner)
+void rxvt_display::set_selection_owner (rxvt_term *owner, bool clipboard)
{
- if (selection_owner && selection_owner != owner)
- {
- rxvt_term *owner = selection_owner;
+ rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
- owner->selection_clear ();
- owner->flush ();
+ if (cur_owner && cur_owner != owner)
+ {
+ rxvt_term *term = cur_owner;
+ term->selection_clear (clipboard);
+ term->flush ();
}
- selection_owner = owner;
+ cur_owner = owner;
}
#ifdef USE_XIM
l = strlen (locale);
m = strlen (modifiers);
- if (!(id = (char *)malloc (l + m + 2)))
+ if (!(id = rxvt_temp_buf<char> (l + m + 2)))
return 0;
memcpy (id, locale, l); id[l] = '\n';
rxvt_xim *xim = xims.get (id);
- free (id);
-
return xim;
}
if (screen->visual->c_class == TrueColor)
{
- c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask )) << ctz (screen->visual->red_mask ))
- | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask))
- | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask ));
+ c.pixel = (color.r >> (16 - rxvt_popcount (screen->visual->red_mask )) << rxvt_ctz (screen->visual->red_mask ))
+ | (color.g >> (16 - rxvt_popcount (screen->visual->green_mask)) << rxvt_ctz (screen->visual->green_mask))
+ | (color.b >> (16 - rxvt_popcount (screen->visual->blue_mask )) << rxvt_ctz (screen->visual->blue_mask ));
return true;
}