fix bug that wroing window position in X11

source/gui/detail/native_window_interface.cpp

@@ -157,15 +157,44 @@ namespace nana{
 			return nullptr;
 		}
 
+		native_window_type x11_decoration_frame(native_window_type wd)
+		{
+			auto const owner = restrict::spec.get_owner(wd);
+			auto const root_wd = restrict::spec.root_window();
+
+			if(owner)
+			{
+				auto test_wd = wd;
+				while(true)
+				{
+					auto upper = x11_parent_window(test_wd);
+					if((reinterpret_cast<Window>(upper) != root_wd) && (upper != owner))
+					{
+						test_wd = upper;
+					}
+					else if(wd != test_wd)
+						return test_wd;
+					else
+						return nullptr;
+				}
+			}
+
+			return nullptr;
+		}
+
 		// Revise the position for moving window. Because the window is moved depending on
 		//implementation of Window Manager. A reparenting window may not be moved the origin to
 		//the specified location. it may be moved the left-top corner to the specified location.
-		void x11_revise_position(native_window_type wd, int &x, int& y)
+
+#if 0
+		void x11_revise_position(native_window_type wd, int &x, int& y, bool written)
 		{
 			auto const disp = restrict::spec.open_display();
 			auto const owner = reinterpret_cast<Window>(restrict::spec.get_owner(wd));
 			auto const root_wd = restrict::spec.root_window();
 
+			if(written)
+			{
 				Window decoration_wd = 0;
 				if(owner)
 				{
@@ -184,7 +213,7 @@ namespace nana{
 
 				if(decoration_wd)
 				{
-				auto fm_extents = x11_frame_extents(reinterpret_cast<Window>(wd));
+					auto fm_extents = native_interface::window_frame_extents(wd);
 
 					XWindowAttributes attr;
 					::XGetWindowAttributes(disp, reinterpret_cast<Window>(wd), &attr);
@@ -193,6 +222,48 @@ namespace nana{
 					y += attr.y - fm_extents.top;
 				}
 			}
+		}
+#else
+		void x11_revise_position(native_window_type wd, int &x, int& y, bool written)
+		{
+			return;
+			auto const disp = restrict::spec.open_display();
+			auto const root_wd = restrict::spec.root_window();
+
+			if(written)
+			{
+				auto decoration_wd = x11_decoration_frame(wd);
+
+
+				if(decoration_wd)
+				{
+					auto const owner = reinterpret_cast<Window>(restrict::spec.get_owner(wd));
+					Window child;
+					::XTranslateCoordinates(disp, owner, root_wd,
+							x, y, &x, &y, &child);
+
+
+					auto fm_extents = native_interface::window_frame_extents(wd);
+
+					XWindowAttributes attr;
+					::XGetWindowAttributes(disp, reinterpret_cast<Window>(wd), &attr);
+
+					point client_pos{0, 0};
+					::XTranslateCoordinates(disp, reinterpret_cast<Window>(wd), root_wd, 0, 0, &client_pos.x, &client_pos.y, &child);
+
+					point decoration_pos{0, 0};
+					::XTranslateCoordinates(disp, reinterpret_cast<Window>(decoration_wd), root_wd, 0, 0, &decoration_pos.x, &decoration_pos.y, &child);
+
+					auto x1 = (client_pos.x - decoration_pos.x - fm_extents.left);
+					auto y1 = (client_pos.y - decoration_pos.y - fm_extents.top);
+
+					return;
+					x -= (client_pos.x - decoration_pos.x - fm_extents.left);
+					y -= (client_pos.y - decoration_pos.y - fm_extents.top);
+				}
+			}
+		}		
+#endif
 
 		void x11_apply_exposed_position(native_window_type wd)
 		{
@@ -939,6 +1010,7 @@ namespace nana{
 			point scr_pos;
 			nana::detail::platform_scope_guard lock;
 
+#if 0
 			auto coord_wd = restrict::spec.get_owner(wd);
 			if(coord_wd)
 			{
@@ -953,6 +1025,32 @@ namespace nana{
 			Window child;
 			::XTranslateCoordinates(restrict::spec.open_display(), reinterpret_cast<Window>(wd), reinterpret_cast<Window>(coord_wd), 0, 0, &scr_pos.x, &scr_pos.y, &child);
 
+			x11_revise_position(wd, scr_pos.x, scr_pos.y, false);
+#else
+			point origin{};
+
+			auto coord_wd = restrict::spec.get_owner(wd);
+			if(coord_wd)
+			{
+				auto fm_extents = window_frame_extents(wd);
+				origin.x = -fm_extents.left;
+				origin.y = -fm_extents.top;
+
+				if(reinterpret_cast<Window>(coord_wd) != restrict::spec.root_window())
+				{
+					fm_extents = window_frame_extents(coord_wd);
+					origin.x += fm_extents.left;
+					origin.y += fm_extents.top;
+				}
+			}
+			else
+				coord_wd = get_window(wd, window_relationship::parent);
+
+			Window child;
+			::XTranslateCoordinates(restrict::spec.open_display(), reinterpret_cast<Window>(wd), reinterpret_cast<Window>(coord_wd), origin.x, origin.y, &scr_pos.x, &scr_pos.y, &child);
+
+#endif
+
 			return scr_pos;
 #endif
 		}
@@ -991,8 +1089,16 @@ namespace nana{
 			if(attr.map_state == IsUnmapped)
 				exposed_positions[reinterpret_cast<Window>(wd)] = ::nana::point{x, y};
 
+			auto const owner = restrict::spec.get_owner(wd);
+			if(owner && (owner != reinterpret_cast<native_window_type>(restrict::spec.root_window())))
+			{
+				auto fm_extents = window_frame_extents(owner);
+				auto origin = window_position(owner);
+				x += origin.x;
+				y += origin.y;
+			}
 
-			x11_revise_position(wd, x, y);
+			x11_revise_position(wd, x, y, true);
 
 			::XMoveWindow(disp, reinterpret_cast<Window>(wd), x, y);
 
@@ -1064,7 +1170,16 @@ namespace nana{
 
 			int x = r.x;
 			int y = r.y;
-			x11_revise_position(wd, x, y);
+
+			auto const owner = restrict::spec.get_owner(wd);
+			if(owner && (owner != reinterpret_cast<native_window_type>(restrict::spec.root_window())))
+			{
+				auto origin = window_position(owner);
+				x += origin.x;
+				y += origin.y;
+			}
+
+			x11_revise_position(wd, x, y, true);
 			::XMoveResizeWindow(disp, reinterpret_cast<Window>(wd), x, y, r.width, r.height);
 
 			//Wait for the configuration notify to update the local attribute of position so that

source/gui/programming_interface.cpp

@@ -812,8 +812,14 @@ namespace API
 			return{};
 
 		auto sz = window_size(wd);
-		sz.width += iwd->extra_width;
+
-		sz.height += iwd->extra_height;
+		if(category::flags::root == iwd->other.category)
+		{
+			auto fm_extents = interface_type::window_frame_extents(iwd->root);
+			sz.width += fm_extents.left + fm_extents.right;
+			sz.height += fm_extents.top + fm_extents.bottom;
+		}
+
 		return sz;
 	}
 
@@ -825,7 +831,11 @@ namespace API
 		{
 			if (category::flags::root == iwd->other.category)
 			{
+				auto fm_extents = interface_type::window_frame_extents(iwd->root);
+
 				size inner_size = sz;
+
+#if 0
 				if (inner_size.width < iwd->extra_width)
 					inner_size.width = 0;
 				else
@@ -835,6 +845,17 @@ namespace API
 					inner_size.height = 0;
 				else
 					inner_size.height -= iwd->extra_height;
+#else
+				if (inner_size.width < static_cast<unsigned>(fm_extents.left + fm_extents.right))
+					inner_size.width = 0;
+				else
+					inner_size.width -= static_cast<unsigned>(fm_extents.left + fm_extents.right);
+
+				if (inner_size.height < static_cast<unsigned>(fm_extents.top + fm_extents.bottom))
+					inner_size.height = 0;
+				else
+					inner_size.height -= static_cast<unsigned>(fm_extents.top + fm_extents.bottom);			
+#endif
 
 				window_size(wd, inner_size);
 			}