Commit 69fc109c22a59acdf0fbf35c03b9c7a516869ba8

Matthias Clasen <mclasen @red…at.com>
Sun Aug 09 02:00:07 GMT 2009

Tree SHA1: 0c429b3
Parent SHA1: 913c95a (Updated Arabic translation)
raw diff | raw patch

Avoid some gratitious behaviour changes

Go back to allowing a lot of the WM-level functions on foreign windows,
since we used to allow that before csw. Fixes bug 589732.

Diff rendering mode:
inline
side by side


113	113	static void gdk_window_impl_x11_finalize (GObject *object);
114	114	static void gdk_window_impl_iface_init (GdkWindowImplIface *iface);
115	115
	116	#define WINDOW_IS_TOPLEVEL_OR_FOREIGN(window) \
	117	(GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD && \
	118	GDK_WINDOW_TYPE (window) != GDK_WINDOW_OFFSCREEN)
	119
116	120	#define WINDOW_IS_TOPLEVEL(window) \
117	121	(GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD && \
118	122	GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN && \
…	…
1820	1820	{
1821	1821	GdkDisplay *display;
1822	1822
1823		g_return_if_fail (WINDOW_IS_TOPLEVEL (window));
1824
	1823	g_return_if_fail (GDK_IS_WINDOW (window));
	1824
1825	1825	if (GDK_WINDOW_DESTROYED (window) \|\|
1826		!WINDOW_IS_TOPLEVEL (window))
	1826	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
1827	1827	return;
1828	1828
1829	1829	display = GDK_WINDOW_DISPLAY (window);
…	…
1894	1894	XSizeHints size_hints;
1895	1895
1896	1896	if (GDK_WINDOW_DESTROYED (window) \|\|
1897		!WINDOW_IS_TOPLEVEL (window))
	1897	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
1898	1898	return;
1899	1899
1900	1900	size_hints.flags = 0;
…	…
1948	1948	Atom atom;
1949	1949
1950	1950	if (GDK_WINDOW_DESTROYED (window) \|\|
1951		!WINDOW_IS_TOPLEVEL (window))
	1951	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
1952	1952	return;
1953	1953
1954	1954	display = gdk_drawable_get_display (window);
…	…
2032	2032	g_return_val_if_fail (GDK_IS_WINDOW (window), GDK_WINDOW_TYPE_HINT_NORMAL);
2033	2033
2034	2034	if (GDK_WINDOW_DESTROYED (window) \|\|
2035		!WINDOW_IS_TOPLEVEL (window))
	2035	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
2036	2036	return GDK_WINDOW_TYPE_HINT_NORMAL;
2037	2037
2038	2038	type = GDK_WINDOW_TYPE_HINT_NORMAL;
…	…
2134	2134	GdkWindowObject *private;
2135	2135
2136	2136	if (GDK_WINDOW_DESTROYED (window) \|\|
2137		!WINDOW_IS_TOPLEVEL (window))
	2137	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
2138	2138	return;
2139	2139
2140	2140	private = (GdkWindowObject*) window;
…	…
2170	2170	g_return_if_fail (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD);
2171	2171
2172	2172	if (GDK_WINDOW_DESTROYED (window) \|\|
2173		!WINDOW_IS_TOPLEVEL (window))
	2173	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
2174	2174	return;
2175	2175
2176	2176	toplevel = _gdk_x11_window_get_toplevel (window);
…	…
2207	2207	g_return_if_fail (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD);
2208	2208
2209	2209	if (GDK_WINDOW_DESTROYED (window) \|\|
2210		!WINDOW_IS_TOPLEVEL (window))
	2210	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
2211	2211	return;
2212	2212
2213	2213	toplevel = _gdk_x11_window_get_toplevel (window);
…	…
2238	2238	g_return_if_fail (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD);
2239	2239
2240	2240	if (GDK_WINDOW_DESTROYED (window) \|\|
2241		!WINDOW_IS_TOPLEVEL (window))
	2241	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
2242	2242	return;
2243	2243
2244	2244	toplevel = _gdk_x11_window_get_toplevel (window);
…	…
2284	2284	XSizeHints size_hints;
2285	2285
2286	2286	if (GDK_WINDOW_DESTROYED (window) \|\|
2287		!WINDOW_IS_TOPLEVEL (window))
	2287	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
2288	2288	return;
2289	2289
2290	2290	size_hints.flags = 0;
…	…
2392	2392	*geom_mask = 0;
2393	2393
2394	2394	if (GDK_WINDOW_DESTROYED (window) \|\|
2395		!WINDOW_IS_TOPLEVEL (window))
	2395	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
2396	2396	return;
2397	2397
2398	2398	size_hints = XAllocSizeHints ();
…	…
2550	2550	g_return_if_fail (title != NULL);
2551	2551
2552	2552	if (GDK_WINDOW_DESTROYED (window) \|\|
2553		!WINDOW_IS_TOPLEVEL (window))
	2553	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
2554	2554	return;
2555	2555
2556	2556	display = gdk_drawable_get_display (window);
…	…
2596	2596	const gchar *role)
2597	2597	{
2598	2598	GdkDisplay *display;
2599
	2599
2600	2600	display = gdk_drawable_get_display (window);
2601	2601
2602		if (!GDK_WINDOW_DESTROYED (window) &&
2603		WINDOW_IS_TOPLEVEL (window))
2604		{
2605		if (role)
2606		XChangeProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window),
2607		gdk_x11_get_xatom_by_name_for_display (display, "WM_WINDOW_ROLE"),
2608		XA_STRING, 8, PropModeReplace, (guchar *)role, strlen (role));
2609		else
2610		XDeleteProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window),
2611		gdk_x11_get_xatom_by_name_for_display (display, "WM_WINDOW_ROLE"));
2612		}
	2602	if (GDK_WINDOW_DESTROYED (window) \|\|
	2603	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
	2604	return;
	2605
	2606	if (role)
	2607	XChangeProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window),
	2608	gdk_x11_get_xatom_by_name_for_display (display, "WM_WINDOW_ROLE"),
	2609	XA_STRING, 8, PropModeReplace, (guchar *)role, strlen (role));
	2610	else
	2611	XDeleteProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window),
	2612	gdk_x11_get_xatom_by_name_for_display (display, "WM_WINDOW_ROLE"));
2613	2613	}
2614	2614
2615	2615	/**
…	…
2623	2623	* Since: 2.12
2624	2624	*
2625	2625	**/
2626		void
	2626	void
2627	2627	gdk_window_set_startup_id (GdkWindow *window,
2628	2628	const gchar *startup_id)
2629	2629	{
2630	2630	GdkDisplay *display;
2631
	2631
2632	2632	g_return_if_fail (GDK_IS_WINDOW (window));
2633	2633
2634	2634	display = gdk_drawable_get_display (window);
2635	2635
2636		if (!GDK_WINDOW_DESTROYED (window) &&
2637		WINDOW_IS_TOPLEVEL (window))
2638		{
2639		if (startup_id)
2640		XChangeProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window),
2641		gdk_x11_get_xatom_by_name_for_display (display, "_NET_STARTUP_ID"),
2642		gdk_x11_get_xatom_by_name_for_display (display, "UTF8_STRING"), 8,
2643		PropModeReplace, (unsigned char *)startup_id, strlen (startup_id));
2644		else
2645		XDeleteProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window),
2646		gdk_x11_get_xatom_by_name_for_display (display, "_NET_STARTUP_ID"));
2647		}
	2636	if (GDK_WINDOW_DESTROYED (window) \|\|
	2637	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
	2638	return;
	2639
	2640	if (startup_id)
	2641	XChangeProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window),
	2642	gdk_x11_get_xatom_by_name_for_display (display, "_NET_STARTUP_ID"),
	2643	gdk_x11_get_xatom_by_name_for_display (display, "UTF8_STRING"), 8,
	2644	PropModeReplace, (unsigned char *)startup_id, strlen (startup_id));
	2645	else
	2646	XDeleteProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window),
	2647	gdk_x11_get_xatom_by_name_for_display (display, "_NET_STARTUP_ID"));
2648	2648	}
2649	2649
2650	2650	/**
…	…
2659	2659	*
2660	2660	* See gtk_window_set_transient_for() if you're using #GtkWindow or
2661	2661	* #GtkDialog.
2662		*
2663	2662	**/
2664		void
2665		gdk_window_set_transient_for (GdkWindow *window,
	2663	void
	2664	gdk_window_set_transient_for (GdkWindow *window,
2666	2665	GdkWindow *parent)
2667	2666	{
2668	2667	if (!GDK_WINDOW_DESTROYED (window) && !GDK_WINDOW_DESTROYED (parent) &&
2669		WINDOW_IS_TOPLEVEL (window))
	2668	WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
2670	2669	XSetTransientForHint (GDK_WINDOW_XDISPLAY (window),
2671	2670	GDK_WINDOW_XID (window),
2672	2671	GDK_WINDOW_XID (parent));
…	…
3527	3527	XSetWindowAttributes attr;
3528	3528
3529	3529	if (!GDK_WINDOW_DESTROYED (window) &&
3530		WINDOW_IS_TOPLEVEL (window))
	3530	WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
3531	3531	{
3532	3532	GdkWindowObject private = (GdkWindowObject )window;
3533	3533	GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (private->impl);
…	…
3570	3570	private->accept_focus = accept_focus;
3571	3571
3572	3572	if (!GDK_WINDOW_DESTROYED (window) &&
3573		WINDOW_IS_TOPLEVEL (window))
	3573	WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
3574	3574	update_wm_hints (window, FALSE);
3575	3575	}
3576	3576	}
…	…
3607	3607
3608	3608	if ((!GDK_WINDOW_DESTROYED (window)) &&
3609	3609	(!private->focus_on_map) &&
3610		WINDOW_IS_TOPLEVEL (window))
	3610	WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
3611	3611	gdk_x11_window_set_user_time (window, 0);
3612	3612	}
3613	3613	}
…	…
3643	3643	Window xid;
3644	3644
3645	3645	if (GDK_WINDOW_DESTROYED (window) \|\|
3646		!WINDOW_IS_TOPLEVEL (window))
	3646	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
3647	3647	return;
3648	3648
3649	3649	display = gdk_drawable_get_display (window);
…	…
3714	3714	gint n;
3715	3715
3716	3716	if (GDK_WINDOW_DESTROYED (window) \|\|
3717		!WINDOW_IS_TOPLEVEL (window))
	3717	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
3718	3718	return;
3719	3719
3720	3720	display = gdk_drawable_get_display (window);
…	…
3824	3824	{
3825	3825	GdkToplevelX11 *toplevel;
3826	3826
3827		g_return_if_fail (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD);
3828
3829	3827	if (GDK_WINDOW_DESTROYED (window) \|\|
3830		!WINDOW_IS_TOPLEVEL (window))
	3828	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
3831	3829	return;
3832	3830
3833	3831	toplevel = _gdk_x11_window_get_toplevel (window);
…	…
3888	3888	GdkDisplay *display;
3889	3889
3890	3890	if (GDK_WINDOW_DESTROYED (window) \|\|
3891		WINDOW_IS_TOPLEVEL (window))
	3891	WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
3892	3892	return;
3893	3893
3894	3894	display = gdk_drawable_get_display (window);
…	…
3934	3934	gdk_window_iconify (GdkWindow *window)
3935	3935	{
3936	3936	if (GDK_WINDOW_DESTROYED (window) \|\|
3937		!WINDOW_IS_TOPLEVEL (window))
	3937	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
3938	3938	return;
3939	3939
3940	3940	if (GDK_WINDOW_IS_MAPPED (window))
…	…
3967	3967	gdk_window_deiconify (GdkWindow *window)
3968	3968	{
3969	3969	if (GDK_WINDOW_DESTROYED (window) \|\|
3970		!WINDOW_IS_TOPLEVEL (window))
	3970	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
3971	3971	return;
3972	3972
3973	3973	if (GDK_WINDOW_IS_MAPPED (window))
…	…
4002	4002	gdk_window_stick (GdkWindow *window)
4003	4003	{
4004	4004	if (GDK_WINDOW_DESTROYED (window) \|\|
4005		!WINDOW_IS_TOPLEVEL (window))
	4005	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
4006	4006	return;
4007	4007
4008	4008	if (GDK_WINDOW_IS_MAPPED (window))
…	…
4058	4058	gdk_window_unstick (GdkWindow *window)
4059	4059	{
4060	4060	if (GDK_WINDOW_DESTROYED (window) \|\|
4061		!WINDOW_IS_TOPLEVEL (window))
	4061	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
4062	4062	return;
4063	4063
4064	4064	if (GDK_WINDOW_IS_MAPPED (window))
…	…
4101	4101	gdk_window_maximize (GdkWindow *window)
4102	4102	{
4103	4103	if (GDK_WINDOW_DESTROYED (window) \|\|
4104		!WINDOW_IS_TOPLEVEL (window))
	4104	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
4105	4105	return;
4106	4106
4107	4107	if (GDK_WINDOW_IS_MAPPED (window))
…	…
4135	4135	gdk_window_unmaximize (GdkWindow *window)
4136	4136	{
4137	4137	if (GDK_WINDOW_DESTROYED (window) \|\|
4138		!WINDOW_IS_TOPLEVEL (window))
	4138	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
4139	4139	return;
4140	4140
4141	4141	if (GDK_WINDOW_IS_MAPPED (window))
…	…
4172	4172	gdk_window_fullscreen (GdkWindow *window)
4173	4173	{
4174	4174	if (GDK_WINDOW_DESTROYED (window) \|\|
4175		!WINDOW_IS_TOPLEVEL (window))
	4175	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
4176	4176	return;
4177	4177
4178	4178	if (GDK_WINDOW_IS_MAPPED (window))
…	…
4207	4207	gdk_window_unfullscreen (GdkWindow *window)
4208	4208	{
4209	4209	if (GDK_WINDOW_DESTROYED (window) \|\|
4210		!WINDOW_IS_TOPLEVEL (window))
	4210	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
4211	4211	return;
4212	4212
4213	4213	if (GDK_WINDOW_IS_MAPPED (window))
…	…
4245	4245	g_return_if_fail (GDK_IS_WINDOW (window));
4246	4246
4247	4247	if (GDK_WINDOW_DESTROYED (window) \|\|
4248		!WINDOW_IS_TOPLEVEL (window))
	4248	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
4249	4249	return;
4250	4250
4251	4251	if (GDK_WINDOW_IS_MAPPED (window))
…	…
4287	4287	g_return_if_fail (GDK_IS_WINDOW (window));
4288	4288
4289	4289	if (GDK_WINDOW_DESTROYED (window) \|\|
4290		!WINDOW_IS_TOPLEVEL (window))
	4290	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
4291	4291	return;
4292	4292
4293	4293	if (GDK_WINDOW_IS_MAPPED (window))
…	…
4321	4321	{
4322	4322	GdkToplevelX11 *toplevel;
4323	4323
4324		g_return_val_if_fail (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD, NULL);
4325
4326	4324	if (GDK_WINDOW_DESTROYED (window) \|\|
4327	4325	!WINDOW_IS_TOPLEVEL (window))
4328	4326	return NULL;
…	…
4347	4347	* if your application pretends to be multiple applications.
4348	4348	**/
4349	4349	void
4350		gdk_window_set_group (GdkWindow *window,
	4350	gdk_window_set_group (GdkWindow *window,
4351	4351	GdkWindow *leader)
4352	4352	{
4353	4353	GdkToplevelX11 *toplevel;
…	…
4363	4363
4364	4364	toplevel = _gdk_x11_window_get_toplevel (window);
4365	4365
4366		if (leader == NULL)
	4366	if (leader == NULL)
4367	4367	leader = gdk_display_get_default_group (gdk_drawable_get_display (window));
4368	4368
4369	4369	if (toplevel->group_leader != leader)
…	…
4485	4485	MotifWmHints hints;
4486	4486
4487	4487	if (GDK_WINDOW_DESTROYED (window) \|\|
4488		!WINDOW_IS_TOPLEVEL (window))
	4488	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
4489	4489	return;
4490	4490
4491	4491	/* initialize to zero to avoid writing uninitialized data to socket */
…	…
4512	4512	gboolean result = FALSE;
4513	4513
4514	4514	if (GDK_WINDOW_DESTROYED (window) \|\|
4515		!WINDOW_IS_TOPLEVEL (window))
	4515	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
4516	4516	return FALSE;
4517	4517
4518	4518	hints = gdk_window_get_mwm_hints (window);
…	…
4561	4561	g_return_if_fail (GDK_IS_WINDOW (window));
4562	4562
4563	4563	if (GDK_WINDOW_DESTROYED (window) \|\|
4564		!WINDOW_IS_TOPLEVEL (window))
	4564	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
4565	4565	return;
4566	4566
4567	4567	/* initialize to zero to avoid writing uninitialized data to socket */
…	…
5303	5303	guint32 timestamp)
5304	5304	{
5305	5305	if (GDK_WINDOW_DESTROYED (window) \|\|
5306		!WINDOW_IS_TOPLEVEL (window))
	5306	!WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
5307	5307	return;
5308	5308
5309	5309	if (gdk_x11_screen_supports_net_wm_hint (GDK_WINDOW_SCREEN (window),
…	…
5480	5480	guint32 cardinal;
5481	5481
5482	5482	g_return_if_fail (GDK_IS_WINDOW (window));
5483		g_return_if_fail (WINDOW_IS_TOPLEVEL (window));
5484	5483
5485	5484	if (GDK_WINDOW_DESTROYED (window) \|\|
5486	5485	!WINDOW_IS_TOPLEVEL (window))

Commit 69fc109c22a59acdf0fbf35c03b9c7a516869ba8

Comments

Add a new comment:

Add your comment