e_focus: make an internal header

Move the internal resources and the function declaration
to the internal header

Change-Id: I1026abedf198906306b0e2bd0c40610c36f9b5d3

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 8eb6c4b..0fb43d5 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -41,7 +41,6 @@ src/bin/e_dnd.h \
 src/bin/e_dpms.h \
 src/bin/e_env.h \
 src/bin/e_eom.h \
-src/bin/e_focus_policy_iface.h \
 src/bin/e_focus.h \
 src/bin/e.h \
 src/bin/e_hints.h \

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 0cd0da0..4ead6e3 100644 (file)
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -11,6 +11,7 @@
 #include "e_hwc_window_intern.h"
 #include "e_hwc_windows_intern.h"
 #include "e_grabinput_intern.h"
+#include "e_focus_intern.h"
 
 #include <sys/xattr.h>
 #include "services/e_service_quickpanel.h"

diff --git a/src/bin/e_focus.c b/src/bin/e_focus.c
index e11acbc..46eeef8 100644 (file)
--- a/src/bin/e_focus.c
+++ b/src/bin/e_focus.c
@@ -1,4 +1,6 @@
 #include "e.h"
+#include "e_focus_intern.h"
+#include "e_focus_policy_iface.h"
 
 struct _E_Focus {
    E_Focus_Policy_Ext    policy_type;     // the focus policy type

diff --git a/src/bin/e_focus.h b/src/bin/e_focus.h
index 57b296b..2844967 100644 (file)
--- a/src/bin/e_focus.h
+++ b/src/bin/e_focus.h
@@ -1,14 +1,6 @@
-#ifdef E_TYPEDEFS
-#else
 #ifndef E_FOCUS_H
 #define E_FOCUS_H
 
 typedef struct _E_Focus E_Focus;
 
-EINTERN E_Focus   *e_focus_new(E_Zone* zone, E_Focus_Policy_Ext policy_type);
-EINTERN void       e_focus_del(E_Focus *focus);
-EINTERN E_Client  *e_focus_focused_ec_get(E_Focus *focus);  // get the current focused ec
-EINTERN Eina_Bool  e_focus_update(E_Focus *focus); // update (find and set) the current focused ec
-
-#endif
-#endif
+#endif
\ No newline at end of file

diff --git a/src/bin/e_focus_intern.h b/src/bin/e_focus_intern.h
new file mode 100644 (file)
index 0000000..d415409
--- /dev/null
+++ b/src/bin/e_focus_intern.h
@@ -0,0 +1,11 @@
+#ifndef E_FOCUS_INTERN_H
+#define E_FOCUS_INTERN_H
+
+typedef struct _E_Focus E_Focus;
+
+EINTERN E_Focus   *e_focus_new(E_Zone* zone, E_Focus_Policy_Ext policy_type);
+EINTERN void       e_focus_del(E_Focus *focus);
+EINTERN E_Client  *e_focus_focused_ec_get(E_Focus *focus);  // get the current focused ec
+EINTERN Eina_Bool  e_focus_update(E_Focus *focus); // update (find and set) the current focused ec
+
+#endif

diff --git a/src/bin/e_focus_policy_history.c b/src/bin/e_focus_policy_history.c
index 3bf9a0f..d24d89f 100644 (file)
--- a/src/bin/e_focus_policy_history.c
+++ b/src/bin/e_focus_policy_history.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_focus_policy_iface.h"
 #include "e_zone_intern.h"
 #include "e_client_intern.h"
 #include "e_comp_object_intern.h"

diff --git a/src/bin/e_focus_policy_iface.c b/src/bin/e_focus_policy_iface.c
index 62e3538..48fb00f 100644 (file)
--- a/src/bin/e_focus_policy_iface.c
+++ b/src/bin/e_focus_policy_iface.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_focus_policy_iface.h"
 
 EINTERN void
 e_focus_policy_iface_del(E_Focus_Policy_Iface *policy_iface)

diff --git a/src/bin/e_focus_policy_topmost.c b/src/bin/e_focus_policy_topmost.c
index 6ccf7af..44a1fd6 100644 (file)
--- a/src/bin/e_focus_policy_topmost.c
+++ b/src/bin/e_focus_policy_topmost.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_focus_policy_iface.h"
 #include "e_zone_intern.h"
 #include "e_client_intern.h"
 

diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index b3b0bfc..af4397d 100644 (file)
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -1,5 +1,4 @@
 #include "e_object.h"
-#include "e_focus_policy_iface.h"
 #include "e_focus.h"
 #include "e_zone.h"
 #include "e_desk.h"

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index a0c1d9d..876c008 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -24,6 +24,7 @@
 #include "e_hwc_window_intern.h"
 #include "e_hwc_windows_intern.h"
 #include "e_hwc_intern.h"
+#include "e_focus_intern.h"
 
 #include <tbm_bufmgr.h>
 #include <tbm_surface.h>

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index a2ad5c9..b7086c5 100644 (file)
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -12,6 +12,7 @@
 #include "e_place_intern.h"
 #include "e_policy_intern.h"
 #include "e_maximize_intern.h"
+#include "e_focus_intern.h"
 
 #include <libds-tizen/screen.h>