Differential D24529 Diff 67596 xembed-sni-proxy/sniproxy.cpp

Changeset View

Standalone View

xembed-sni-proxy/sniproxy.cpp

Context not available.
92		92
93	auto c = QX11Info::connection();	93		auto c = QX11Info::connection();
94		94
95	auto cookie = xcb_get_geometry(c, m_windowId);
96	QScopedPointer<xcb_get_geometry_reply_t, QScopedPointerPodDeleter>
97	clientGeom(xcb_get_geometry_reply(c, cookie, nullptr));
98
99	//create a container window	95		//create a container window
100	auto screen = xcb_setup_roots_iterator (xcb_get_setup (c)).data;	96		auto screen = xcb_setup_roots_iterator (xcb_get_setup (c)).data;
101	m_containerWid = xcb_generate_id(c);	97		m_containerWid = xcb_generate_id(c);
Context not available.
162	XCB_CONFIG_WINDOW_X \| XCB_CONFIG_WINDOW_Y,	158		XCB_CONFIG_WINDOW_X \| XCB_CONFIG_WINDOW_Y,
163	windowMoveConfigVals);	159		windowMoveConfigVals);
164		160
165		161		QSize clientWindowSize = getClientWindowSize();
166	QSize clientWindowSize;
167
168	if (clientGeom) {
169	clientWindowSize = QSize(clientGeom->width, clientGeom->height);
170	}
171	//if the window is a clearly stupid size resize to be something sensible
172	//this is needed as chormium and such when resized just fill the icon with transparent space and only draw in the middle
173	//however spotify does need this as by default the window size is 900px wide.
174	//use an artbitrary heuristic to make sure icons are always sensible
175	if (clientWindowSize.isEmpty() \|\| clientWindowSize.width() > s_embedSize \|\| clientWindowSize.height() > s_embedSize )
176	{
177	qCDebug(SNIPROXY) << "Resizing window" << wid << Title() << "from w*h" << clientWindowSize;
178
179	xcb_configure_notify_event_t event;
180	memset(&event, 0x00, sizeof(xcb_configure_notify_event_t));
181	event.response_type = XCB_CONFIGURE_NOTIFY;
182	event.event = wid;
183	event.window = wid;
184	event.width = s_embedSize;
185	event.height = s_embedSize;
186	xcb_send_event(c, false, wid, XCB_EVENT_MASK_STRUCTURE_NOTIFY, (char *) &event);
187
188	const uint32_t windowMoveConfigVals[2] = { s_embedSize, s_embedSize };
189	xcb_configure_window(c, wid,
190	XCB_CONFIG_WINDOW_WIDTH \| XCB_CONFIG_WINDOW_HEIGHT,
191	windowMoveConfigVals);
192
193	clientWindowSize = QSize(s_embedSize, s_embedSize);
194	}
195		162
196	//show the embedded window otherwise nothing happens	163		//show the embedded window otherwise nothing happens
197	xcb_map_window(c, wid);	164		xcb_map_window(c, wid);
Context not available.
247	emit NewToolTip();	214		emit NewToolTip();
248	}	215		}
249		216
		217		QSize SNIProxy::getClientWindowSize() const
			davidedmundsonUnsubmitted Not Done It's a bit weird to have a method called "getSomething" that changes the state of things davidedmundson: It's a bit weird to have a method called "getSomething" that changes the state of things
			kmaterkaAuthorUnsubmitted Not Done True, get* should not have side effect. I will change it. kmaterka: True, get* should not have side effect. I will change it.
		218		{
		219		auto c = QX11Info::connection();
		220
		221		auto cookie = xcb_get_geometry(c, m_windowId);
		222		QScopedPointer<xcb_get_geometry_reply_t, QScopedPointerPodDeleter>
		223		clientGeom(xcb_get_geometry_reply(c, cookie, nullptr));
		224
		225		QSize clientWindowSize;
		226		if (clientGeom) {
		227		clientWindowSize = QSize(clientGeom->width, clientGeom->height);
		228		}
		229		//if the window is a clearly stupid size resize to be something sensible
		230		//this is needed as chromium and such when resized just fill the icon with transparent space and only draw in the middle
		231		//however KeePass2 does need this as by default the window size is 273px wide and is not transparent
		232		//use an artbitrary heuristic to make sure icons are always sensible
		233		if (clientWindowSize.isEmpty() \|\| clientWindowSize.width() > s_embedSize \|\| clientWindowSize.height() > s_embedSize) {
		234		qCDebug(SNIPROXY) << "Resizing window" << m_windowId << Title() << "from w*h" << clientWindowSize;
		235
		236		xcb_configure_notify_event_t event;
		237		memset(&event, 0x00, sizeof(xcb_configure_notify_event_t));
		238		event.response_type = XCB_CONFIGURE_NOTIFY;
		239		event.event = m_windowId;
		240		event.window = m_windowId;
		241		event.width = s_embedSize;
		242		event.height = s_embedSize;
		243		xcb_send_event(c, false, m_windowId, XCB_EVENT_MASK_STRUCTURE_NOTIFY, (char *) &event);
		244
		245		const uint32_t windowMoveConfigVals[2] = { s_embedSize, s_embedSize };
		246		xcb_configure_window(c, m_windowId,
		247		XCB_CONFIG_WINDOW_WIDTH \| XCB_CONFIG_WINDOW_HEIGHT,
		248		windowMoveConfigVals);
		249
		250		clientWindowSize = QSize(s_embedSize, s_embedSize);
		251		}
		252
		253		return clientWindowSize;
		254		}
		255
250	void sni_cleanup_xcb_image(void *data) {	256		void sni_cleanup_xcb_image(void *data) {
251	xcb_image_destroy(static_cast<xcb_image_t*>(data));	257		xcb_image_destroy(static_cast<xcb_image_t*>(data));
252	}	258		}
Context not available.
277	QImage SNIProxy::getImageNonComposite() const	283		QImage SNIProxy::getImageNonComposite() const
278	{	284		{
279	auto c = QX11Info::connection();	285		auto c = QX11Info::connection();
280	auto cookie = xcb_get_geometry(c, m_windowId);
281	QScopedPointer<xcb_get_geometry_reply_t, QScopedPointerPodDeleter>
282	geom(xcb_get_geometry_reply(c, cookie, nullptr));
283		286
284	if (!geom) {	287		QSize clientWindowSize = getClientWindowSize();
285	return QImage();
286	}
287		288
288	xcb_image_t *image = xcb_image_get(c, m_windowId, 0, 0, geom->width, geom->height, 0xFFFFFFFF, XCB_IMAGE_FORMAT_Z_PIXMAP);	289		xcb_image_t *image = xcb_image_get(c, m_windowId, 0, 0, clientWindowSize.width(), clientWindowSize.height(), 0xFFFFFFFF, XCB_IMAGE_FORMAT_Z_PIXMAP);
289		290
290	// Don't hook up cleanup yet, we may use a different QImage after all	291		// Don't hook up cleanup yet, we may use a different QImage after all
291	QImage naiveConversion;	292		QImage naiveConversion;
Context not available.