summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2016-08-26 10:51:20 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-08-26 10:51:20 -0400
commit3a561bb00aff44644916bc100aaa341dfdcda1e0 (patch)
treec0ab53fd63a72dc69e0a3e7a57c97b64d184777c
parentb2dee35f41ca62d837e8ed9dee400877daed900b (diff)
ignore xwl clients when flagging wl surfaces as internal
fix T4430
-rw-r--r--src/bin/e_comp_wl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 79689d28d..7e982ed52 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1784,7 +1784,7 @@ _e_comp_wl_compositor_cb_surface_create(struct wl_client *client, struct wl_reso
1784 _e_comp_wl_surface_destroy); 1784 _e_comp_wl_surface_destroy);
1785 1785
1786 wl_client_get_credentials(client, &pid, NULL, NULL); 1786 wl_client_get_credentials(client, &pid, NULL, NULL);
1787 if (pid == getpid()) //internal! 1787 if ((client != e_comp_wl->xwl_client) && (pid == getpid())) //internal!
1788 ec = e_pixmap_find_client(E_PIXMAP_TYPE_WL, (int64_t)id); 1788 ec = e_pixmap_find_client(E_PIXMAP_TYPE_WL, (int64_t)id);
1789 if (ec) 1789 if (ec)
1790 { 1790 {
@@ -1818,7 +1818,8 @@ _e_comp_wl_compositor_cb_surface_create(struct wl_client *client, struct wl_reso
1818 ec->client.w = ec->client.h = 1; 1818 ec->client.w = ec->client.h = 1;
1819 ec->comp_data->surface = res; 1819 ec->comp_data->surface = res;
1820 ec->netwm.pid = pid; 1820 ec->netwm.pid = pid;
1821 ec->internal = pid == getpid(); 1821 if (client != e_comp_wl->xwl_client)
1822 ec->internal = pid == getpid();
1822 1823
1823 /* set reference to pixmap so we can fetch it later */ 1824 /* set reference to pixmap so we can fetch it later */
1824 DBG("\tUsing Client: %p", ec); 1825 DBG("\tUsing Client: %p", ec);