Merge pull request #956 from runrevfraser/bugfix-12931

Fraser Gordon · Fraser Gordon · commit 5a40bc690d1b · 2014-07-31T10:21:29.000+01:00
Bugfix 12931
diff --git a/docs/notes/bugfix-12931.md b/docs/notes/bugfix-12931.md
@@ -0,0 +1 @@
+# Prevent Linux backdrop from gaining focus
diff --git a/engine/src/linux.stubs b/engine/src/linux.stubs
@@ -293,6 +293,8 @@ gdk libgdk-x11-2.0.so.0
 	gdk_cairo_create: (pointer) -> (pointer)
 	gdk_cairo_region: (pointer, pointer) -> ()
 	gdk_cairo_set_source_pixbuf: (pointer, pointer, double, double) -> ()
+	gdk_window_set_skip_taskbar_hint: (pointer, integer) -> ()
+	gdk_window_set_skip_pager_hint: (pointer, integer) -> ()
 
 gdk_pixbuf libgdk_pixbuf-2.0.so.0
 	gdk_pixbuf_get_pixels: (pointer) -> (pointer)
diff --git a/engine/src/lnxdc.h b/engine/src/lnxdc.h
@@ -238,8 +238,8 @@ class MCScreenDC : public MCUIDC
 
 	virtual MCImageBitmap *snapshot(MCRectangle &r, uint4 window, MCStringRef displayname, MCPoint *size);
 	
-    virtual void createbackdrop(MCStringRef color);
-	virtual void destroybackdrop();
+    //virtual void createbackdrop(MCStringRef color);
+	void destroybackdrop();
 	
 	void createbackdrop_window(void);
 	Window get_backdrop(void) { return backdrop; };
diff --git a/engine/src/lnxdcs.cpp b/engine/src/lnxdcs.cpp
@@ -1391,13 +1391,14 @@ void MCScreenDC::createbackdrop_window(void)
     gdkwa.event_mask = GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK
         | GDK_POINTER_MOTION_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_EXPOSURE_MASK;
     gdkwa.x = gdkwa.y = 0;
-    gdkwa.width = gdkwa.height = 0;
+    gdkwa.width = gdkwa.height = 100;
     gdkwa.wclass = GDK_INPUT_OUTPUT;
     gdkwa.visual = getvisual();
     gdkwa.colormap = getcmap();
     gdkwa.window_type = GDK_WINDOW_TOPLEVEL;
     
-    backdrop = gdk_window_new(NULL, &gdkwa, GDK_WA_VISUAL);
+    backdrop = gdk_window_new(getroot(), &gdkwa, GDK_WA_VISUAL);
+    gdk_display_sync(MCdpy);
 }
 
 
@@ -1421,7 +1422,11 @@ void MCScreenDC::enablebackdrop(bool p_hard)
 	
 	if (!t_error)	
 	{
-		gdk_window_fullscreen(backdrop);
+        gdk_window_set_functions(backdrop, GdkWMFunction(0));
+        gdk_window_set_decorations(backdrop, GdkWMDecoration(0));
+        gdk_window_set_skip_taskbar_hint(backdrop, TRUE);
+        gdk_window_set_skip_pager_hint(backdrop, TRUE);
+        gdk_window_fullscreen(backdrop);
         gdk_window_show_unraised(backdrop);
 		MCstacks -> refresh();
 	}
@@ -1508,6 +1513,7 @@ void MCScreenDC::assignbackdrop(Window_mode p_mode, Window p_window)
 }
 
 
+/*void MCScreenDC::createbackdrop(MCStringRef color)
 void MCScreenDC::createbackdrop(MCStringRef color)
 {
 	if (m_backdrop_pixmap == DNULL &&
@@ -1544,7 +1550,7 @@ void MCScreenDC::createbackdrop(MCStringRef color)
 	}
     
     gdk_window_show_unraised(backdrop);
-}
+}*/
 
 
 void MCScreenDC::destroybackdrop()
@@ -1561,18 +1567,7 @@ void MCScreenDC::destroybackdrop()
 }
 
 
-
-
-
-
 Bool MCScreenDC::is_composite_wm ( int screen_id ) 
 {
     return gdk_display_supports_composite(dpy);
 }
-
-
-
-
-
-
-

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Prevent Linux backdrop from gaining focus`