ecore_x: Make x modifiers public

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@72954 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h
index 04f8f12..3dc13ab 100644 (file)
--- a/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h
@@ -985,6 +985,12 @@ EAPI extern int ECORE_X_EVENT_XDND_LEAVE;
 EAPI extern int ECORE_X_EVENT_XDND_DROP;
 EAPI extern int ECORE_X_EVENT_XDND_FINISHED;
 
+EAPI extern int ECORE_X_MODIFIER_SHIFT; /**< @since 1.3 */
+EAPI extern int ECORE_X_MODIFIER_CTRL;  /**< @since 1.3 */
+EAPI extern int ECORE_X_MODIFIER_ALT;   /**< @since 1.3 */
+EAPI extern int ECORE_X_MODIFIER_WIN;   /**< @since 1.3 */
+EAPI extern int ECORE_X_MODIFIER_MODE;  /**< @since 1.3 */
+
 EAPI extern int ECORE_X_LOCK_SCROLL;
 EAPI extern int ECORE_X_LOCK_NUM;
 EAPI extern int ECORE_X_LOCK_CAPS;

diff --git a/src/lib/ecore_x/xcb/ecore_xcb_private.h b/src/lib/ecore_x/xcb/ecore_xcb_private.h
index 3db08f8..838c278 100644 (file)
--- a/src/lib/ecore_x/xcb/ecore_xcb_private.h
+++ b/src/lib/ecore_x/xcb/ecore_xcb_private.h
@@ -209,16 +209,6 @@ extern int _ecore_xcb_event_xfixes;
 extern int _ecore_xcb_event_input;
 extern int _ecore_xcb_event_gesture;
 
-extern int ECORE_X_MODIFIER_SHIFT;
-extern int ECORE_X_MODIFIER_CTRL;
-extern int ECORE_X_MODIFIER_ALT;
-extern int ECORE_X_MODIFIER_WIN;
-extern int ECORE_X_MODIFIER_MODE;
-extern int ECORE_X_LOCK_SCROLL;
-extern int ECORE_X_LOCK_NUM;
-extern int ECORE_X_LOCK_CAPS;
-extern int ECORE_X_LOCK_SHIFT;
-
 extern Ecore_X_Atom _ecore_xcb_atoms_wm_protocol[ECORE_X_WM_PROTOCOL_NUM];
 
 extern int _ecore_xcb_button_grabs_num;

diff --git a/src/lib/ecore_x/xlib/ecore_x.c b/src/lib/ecore_x/xlib/ecore_x.c
index e40966f..fc0d056 100644 (file)
--- a/src/lib/ecore_x/xlib/ecore_x.c
+++ b/src/lib/ecore_x/xlib/ecore_x.c
@@ -126,11 +126,11 @@ EAPI int ECORE_X_EVENT_STARTUP_SEQUENCE_REMOVE = 0;
 
 EAPI int ECORE_X_EVENT_GENERIC = 0;
 
-int ECORE_X_MODIFIER_SHIFT = 0;
-int ECORE_X_MODIFIER_CTRL = 0;
-int ECORE_X_MODIFIER_ALT = 0;
-int ECORE_X_MODIFIER_WIN = 0;
-int ECORE_X_MODIFIER_MODE = 0;
+EAPI int ECORE_X_MODIFIER_SHIFT = 0;
+EAPI int ECORE_X_MODIFIER_CTRL = 0;
+EAPI int ECORE_X_MODIFIER_ALT = 0;
+EAPI int ECORE_X_MODIFIER_WIN = 0;
+EAPI int ECORE_X_MODIFIER_MODE = 0;
 
 EAPI int ECORE_X_LOCK_SCROLL = 0;
 EAPI int ECORE_X_LOCK_NUM = 0;

diff --git a/src/lib/ecore_x/xlib/ecore_x_private.h b/src/lib/ecore_x/xlib/ecore_x_private.h
index c389f53..4236932 100644 (file)
--- a/src/lib/ecore_x/xlib/ecore_x_private.h
+++ b/src/lib/ecore_x/xlib/ecore_x_private.h
@@ -182,17 +182,6 @@ typedef struct _Ecore_X_DND_Target
    int          will_accept;
 } Ecore_X_DND_Target;
 
-extern int ECORE_X_MODIFIER_SHIFT;
-extern int ECORE_X_MODIFIER_CTRL;
-extern int ECORE_X_MODIFIER_ALT;
-extern int ECORE_X_MODIFIER_WIN;
-extern int ECORE_X_MODIFIER_MODE;
-
-extern int ECORE_X_LOCK_SCROLL;
-extern int ECORE_X_LOCK_NUM;
-extern int ECORE_X_LOCK_CAPS;
-extern int ECORE_X_LOCK_SHIFT;
-
 extern Display *_ecore_x_disp;
 extern double _ecore_x_double_click_time;
 extern Time _ecore_x_event_last_time;