Combine and remove redundant detection method

l3ib · Dec 3, 2016 · 07c8eb5 · 07c8eb5
1 parent 441be61
commit 07c8eb5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 30 deletions.
diff --git a/src/SetBG.cc b/src/SetBG.cc
@@ -41,7 +41,7 @@ SetBG* SetBG::get_bg_setter()
     Glib::RefPtr<Gdk::Display> dpy = Gdk::DisplayManager::get()->get_default_display();
 
     SetBG* setter = NULL;
-    SetBG::RootWindowData wd = SetBG::get_rootwindowdata(dpy);
+    SetBG::RootWindowData wd = SetBG::get_root_window_data(dpy);
 
     Util::program_log("root window type %d\n", wd.type);
 
@@ -150,14 +150,15 @@ std::vector<SetBG::RootWindowData> SetBG::find_desktop_windows(Display *xdisp, W
  *
  * @returns The Window's ID, or 0.
  */
-SetBG::RootWindowData SetBG::get_root_window_type(Glib::RefPtr<Gdk::Display> display) {
+SetBG::RootWindowData SetBG::get_root_window_data(Glib::RefPtr<Gdk::Display> display) {
 	GdkAtom type;
     gint format;
     gint length;
 	guchar *data;
     gboolean ret = FALSE;
     Glib::RefPtr<Gdk::Window> rootwin = display->get_default_screen()->get_root_window();
     Display *xdisp = GDK_DISPLAY_XDISPLAY(rootwin->get_display()->gobj());
+    Window xrootwin = (Window)GDK_WINDOW_XID(rootwin->gobj());
     guint wid = 0;
 
     ret = gdk_property_get(rootwin->gobj(),
@@ -183,7 +184,7 @@ SetBG::RootWindowData SetBG::get_root_window_type(Glib::RefPtr<Gdk::Display> dis
 
         if (ret) {
             g_free(data);
-            return SetBG::RootWindowData((Window)GDK_WINDOW_XID(rootwin->gobj()), SetBG::NAUTILUS, std::string("_MUTTER_SENTINEL"));
+            return SetBG::RootWindowData(xrootwin, SetBG::NAUTILUS, std::string("_MUTTER_SENTINEL"));
         } else {
             // newer nautilus and nemo don't leave a hint on the root window (whyyyy)
             // now we have to search for it!
@@ -218,7 +219,13 @@ SetBG::RootWindowData SetBG::get_root_window_type(Glib::RefPtr<Gdk::Display> dis
         }
     }
 
-    return SetBG::RootWindowData(0, SetBG::UNKNOWN, std::string(""));
+#ifdef USE_XINERAMA
+    // determine if xinerama is in play
+    if (XineramaIsActive(xdisp))
+        return SetBG::RootWindowData(xrootwin, SetBG::XINERAMA, std::string("default"));
+#endif
+
+    return SetBG::RootWindowData(xrootwin, SetBG::DEFAULT, std::string("default"));
 }
 
 /**
@@ -280,28 +287,6 @@ SetBG::RootWindowData SetBG::check_window_type(Display *display, Window window)
     return retval;
 }
 
-/**
- * Determines the RootWindowData that should be used to construct a SetBG object.
- */
-SetBG::RootWindowData SetBG::get_rootwindowdata(Glib::RefPtr<Gdk::Display> display)
-{
-    Glib::RefPtr<Gdk::Window> rootwin = display->get_default_screen()->get_root_window();
-    Display *xdisp = GDK_DISPLAY_XDISPLAY(rootwin->get_display()->gobj());
-
-    SetBG::RootWindowData rootData = get_root_window_type(display);
-
-    if (rootData.type != SetBG::UNKNOWN)
-        return rootData;
-
-#ifdef USE_XINERAMA
-    // determine if xinerama is in play
-    if (XineramaIsActive(GDK_DISPLAY_XDISPLAY(display->gobj())))
-        return SetBG::RootWindowData((Window)GDK_WINDOW_XID(rootwin->gobj()), SetBG::XINERAMA, std::string(""));
-#endif
-
-    return SetBG::RootWindowData((Window)GDK_WINDOW_XID(rootwin->gobj()), SetBG::DEFAULT, std::string(""));
-}
-
 /**
  * Handles SET_SCALE mode.
  *
@@ -1358,7 +1343,7 @@ bool SetBGPcmanfm::set_bg(Glib::ustring &disp, Glib::ustring file, SetMode mode,
     Glib::RefPtr<Gdk::Display> display = Gdk::DisplayManager::get()->get_default_display();
     Display* xdisp = GDK_DISPLAY_XDISPLAY(display->gobj());
 
-    SetBG::RootWindowData rootData = get_root_window_type(display);
+    SetBG::RootWindowData rootData = get_root_window_data(display);
 
     if (rootData.type == SetBG::PCMANFM) {
         // pull PID atom from pcman desktop window

diff --git a/src/SetBG.h b/src/SetBG.h
@@ -83,8 +83,6 @@ class SetBG {
         virtual std::map<Glib::ustring, Glib::ustring> get_active_displays() = 0;
         virtual Glib::ustring get_fullscreen_key() = 0;
 
-		static SetBG::RootWindowData get_rootwindowdata(Glib::RefPtr<Gdk::Display> display);
-
         static SetBG* get_bg_setter();
 
 		static Glib::ustring mode_to_string( const SetMode mode );
@@ -112,7 +110,7 @@ class SetBG {
 
         static int handle_x_errors(Display *display, XErrorEvent *error);
         static std::vector<RootWindowData> find_desktop_windows(Display *display, Window curwindow);
-        static RootWindowData get_root_window_type(Glib::RefPtr<Gdk::Display> display);
+        static RootWindowData get_root_window_data(Glib::RefPtr<Gdk::Display> display);
         static RootWindowData check_window_type(Display *display, Window window);
 
         Glib::RefPtr<Gdk::Pixbuf> make_resized_pixbuf(Glib::RefPtr<Gdk::Pixbuf> pixbuf, SetBG::SetMode mode, Gdk::Color bgcolor, gint tarw, gint tarh);