definitions match implementations

11 files changed, 48 insertions, 36 deletions

diff --git a/libxklavier/xklavier.c b/libxklavier/xklavier.c
index 5c0dd03..7b818c8 100644
--- a/libxklavier/xklavier.c
+++ b/libxklavier/xklavier.c
@@ -60,7 +60,7 @@ xkl_engine_set_switch_to_secondary_group(XklEngine * engine, gboolean val)
 }
 
 void
-xkl_engine_group_allow_one_switch_to_secondary(XklEngine * engine)
+xkl_engine_allow_one_switch_to_secondary_group(XklEngine * engine)
 {
 	xkl_debug(150,
 		  "Setting allow_one_switch_to_secondary_group flag\n");
@@ -255,7 +255,7 @@ xkl_term(XklEngine * engine)
 }
 
 gboolean
-xkl_engine_key_grab(XklEngine * engine, gint keycode, guint modifiers)
+xkl_engine_grab_key(XklEngine * engine, gint keycode, guint modifiers)
 {
 	gboolean ret_code;
 	gchar *keyname;
@@ -291,7 +291,7 @@ xkl_engine_key_grab(XklEngine * engine, gint keycode, guint modifiers)
 }
 
 gboolean
-xkl_engine_key_ungrab(XklEngine * engine, gint keycode, guint modifiers)
+xkl_engine_ungrab_key(XklEngine * engine, gint keycode, guint modifiers)
 {
 	if (0 == keycode)
 		return FALSE;
@@ -330,7 +330,7 @@ xkl_engine_get_current_window_group(XklEngine * engine)
 			  "Unbelievable: current client " WINID_FORMAT
 			  ", '%s' has no group\n",
 			  engine->priv->curr_toplvl_win,
-			  xkl_get_debug_window_title(engine->priv->
+			  xkl_get_debug_window_title(engine, engine->priv->
 						     curr_toplvl_win));
 	return 0;
 }
@@ -384,7 +384,7 @@ xkl_engine_load_window_tree(XklEngine * engine)
 	XGetInputFocus(xkl_engine_get_display(engine), &focused, &revert);
 
 	xkl_debug(160, "initially focused: " WINID_FORMAT ", '%s'\n",
-		  focused, xkl_get_debug_window_title(focused));
+		  focused, xkl_get_debug_window_title(engine, focused));
 
 	have_toplevel_win =
 	    xkl_engine_find_toplevel_window(engine, focused,
@@ -402,7 +402,7 @@ xkl_engine_load_window_tree(XklEngine * engine)
 			  "initial toplevel: " WINID_FORMAT
 			  ", '%s' %s state %d/%X\n",
 			  engine->priv->curr_toplvl_win,
-			  xkl_get_debug_window_title(engine->priv->
+			  xkl_get_debug_window_title(engine, engine->priv->
 						     curr_toplvl_win),
 			  (have_state ? "with" : "without"),
 			  (have_state ? engine->priv->curr_state.
diff --git a/libxklavier/xklavier.h b/libxklavier/xklavier.h
index 0b10e79..4a34328 100644
--- a/libxklavier/xklavier.h
+++ b/libxklavier/xklavier.h
@@ -280,7 +280,8 @@ extern "C" {
  * @return the window title of some window or NULL. 
  * If not NULL, it should be freed with XFree
  */
-	extern gchar *xkl_get_window_title(Window w);
+	extern gchar *xkl_engine_get_window_title(XklEngine * engine,
+						  Window w);
 
 /** 
  * Finds the state for a given window (for its "App window").
diff --git a/libxklavier/xklavier_config.c b/libxklavier/xklavier_config.c
index 658de2a..acb6938 100644
--- a/libxklavier/xklavier_config.c
+++ b/libxklavier/xklavier_config.c
@@ -342,7 +342,7 @@ xkl_config_term(void)
 }
 
 gboolean
-xkl_config_registry_load_from_file(XklConfig * config,
+xkl_config_load_registry_from_file(XklConfig * config,
 				   const gchar * file_name)
 {
 	config->priv->doc = xmlParseFile(file_name);
diff --git a/libxklavier/xklavier_config_xkb.c b/libxklavier/xklavier_config_xkb.c
index addfcc5..c166a9b 100644
--- a/libxklavier/xklavier_config_xkb.c
+++ b/libxklavier/xklavier_config_xkb.c
@@ -71,7 +71,7 @@ xkl_rules_set_free(void)
 #endif
 
 void
-xkl_xkb_config_init(void)
+xkl_xkb_init_config(XklConfig * config)
 {
 #ifdef XKB_HEADERS_PRESENT
 	XkbInitAtoms(NULL);
@@ -390,7 +390,7 @@ _XklXkbConfigCleanupNative(gpointer componentNamesPtr)
 
 /* check only client side support */
 gboolean
-xkl_xkb_config_multiple_layouts_supported(XklConfig * config)
+xkl_xkb_multiple_layouts_supported(XklEngine * engine)
 {
 	enum { NON_SUPPORTED, SUPPORTED, UNCHECKED };
 
@@ -413,7 +413,6 @@ xkl_xkb_config_multiple_layouts_supported(XklConfig * config)
 		xkl_debug(100, "!!! Checking multiple layouts support\n");
 		support_state = NON_SUPPORTED;
 #ifdef XKB_HEADERS_PRESENT
-		XklEngine *engine = xkl_config_get_engine(config);
 		if (xkl_xkb_config_native_prepare
 		    (engine, &data, &component_names)) {
 			xkl_debug(100,
diff --git a/libxklavier/xklavier_config_xmm.c b/libxklavier/xklavier_config_xmm.c
index 346d4f7..ff7e38a 100644
--- a/libxklavier/xklavier_config_xmm.c
+++ b/libxklavier/xklavier_config_xmm.c
@@ -20,7 +20,7 @@
 #include <X11/keysymdef.h>
 
 void
-xkl_xmm_config_init(void)
+xkl_xmm_init_config(XklConfig * config)
 {
 }
 
diff --git a/libxklavier/xklavier_evt.c b/libxklavier/xklavier_evt.c
index d7280b4..536f3f1 100644
--- a/libxklavier/xklavier_evt.c
+++ b/libxklavier/xklavier_evt.c
@@ -94,14 +94,15 @@ xkl_engine_process_focus_in_evt(XklEngine * engine,
 	}
 
 	xkl_debug(150, "Window " WINID_FORMAT ", '%s' has got focus\n",
-		  win, xkl_get_debug_window_title(win));
+		  win, xkl_get_debug_window_title(engine, win));
 
 	if (!xkl_engine_find_toplevel_window(engine, win, &toplevel_win)) {
 		return;
 	}
 
 	xkl_debug(150, "Appwin " WINID_FORMAT ", '%s' has got focus\n",
-		  toplevel_win, xkl_get_debug_window_title(toplevel_win));
+		  toplevel_win, xkl_get_debug_window_title(engine,
+							   toplevel_win));
 
 	if (xkl_engine_get_toplevel_window_state
 	    (engine, toplevel_win, &selected_window_state)) {
@@ -141,7 +142,8 @@ xkl_engine_process_focus_in_evt(XklEngine * engine,
 				  "CurClient:changed to " WINID_FORMAT
 				  ", '%s'\n",
 				  engine->priv->curr_toplvl_win,
-				  xkl_get_debug_window_title(engine->priv->
+				  xkl_get_debug_window_title(engine,
+							     engine->priv->
 							     curr_toplvl_win));
 
 			new_win_transparent =
@@ -246,7 +248,8 @@ xkl_engine_process_focus_in_evt(XklEngine * engine,
 				  "CurClient:changed to " WINID_FORMAT
 				  ", '%s'\n",
 				  engine->priv->curr_toplvl_win,
-				  xkl_get_debug_window_title(engine->priv->
+				  xkl_get_debug_window_title(engine,
+							     engine->priv->
 							     curr_toplvl_win));
 			xkl_engine_add_toplevel_window(engine,
 						       engine->priv->
@@ -280,7 +283,8 @@ xkl_engine_process_focus_out_evt(XklEngine * engine,
 	}
 
 	xkl_debug(160, "Window " WINID_FORMAT ", '%s' has lost focus\n",
-		  fev->window, xkl_get_debug_window_title(fev->window));
+		  fev->window, xkl_get_debug_window_title(engine,
+							  fev->window));
 
 	if (xkl_engine_is_window_transparent(engine, fev->window)) {
 		xkl_debug(150, "Leaving transparent window!\n");
@@ -382,8 +386,8 @@ xkl_engine_process_create_window_evt(XklEngine * engine,
 	xkl_debug(200,
 		  "Under-root window " WINID_FORMAT
 		  "/%s (%d,%d,%d x %d) is created\n", cev->window,
-		  xkl_get_debug_window_title(cev->window), cev->x, cev->y,
-		  cev->width, cev->height);
+		  xkl_get_debug_window_title(engine, cev->window), cev->x,
+		  cev->y, cev->width, cev->height);
 
 	if (!cev->override_redirect) {
 /* ICCCM 4.1.6: override-redirect is NOT private to
@@ -470,11 +474,11 @@ xkl_engine_process_state_modification(XklEngine * engine,
 
 	xkl_debug(150, "Focused window: " WINID_FORMAT ", '%s'\n",
 		  focused_toplevel,
-		  xkl_get_debug_window_title(focused_toplevel));
+		  xkl_get_debug_window_title(engine, focused_toplevel));
 	if (engine->priv->listener_type & XKLL_MANAGE_WINDOW_STATES) {
 		xkl_debug(150, "CurClient: " WINID_FORMAT ", '%s'\n",
 			  engine->priv->curr_toplvl_win,
-			  xkl_get_debug_window_title(engine->priv->
+			  xkl_get_debug_window_title(engine, engine->priv->
 						     curr_toplvl_win));
 
 		if (focused_toplevel != engine->priv->curr_toplvl_win) {
@@ -506,7 +510,8 @@ xkl_engine_process_state_modification(XklEngine * engine,
 				  "CurClient:changed to " WINID_FORMAT
 				  ", '%s'\n",
 				  engine->priv->curr_toplvl_win,
-				  xkl_get_debug_window_title(engine->priv->
+				  xkl_get_debug_window_title(engine,
+							     engine->priv->
 							     curr_toplvl_win));
 		}
 		/* If the window already has this this state - we are just restoring it!
diff --git a/libxklavier/xklavier_private.h b/libxklavier/xklavier_private.h
index e65d7d7..b94bef4 100644
--- a/libxklavier/xklavier_private.h
+++ b/libxklavier/xklavier_private.h
@@ -234,7 +234,8 @@ extern void xkl_engine_process_state_modification(XklEngine * engine,
 						  unsigned inds,
 						  gboolean set_indicators);
 
-extern Window xkl_get_registered_parent(Window win);
+extern Window xkl_engine_get_registered_parent(XklEngine * engine,
+					       Window win);
 extern gboolean xkl_engine_load_all_info(XklEngine * engine);
 extern void xkl_engine_free_all_info(XklEngine * engine);
 extern void xkl_engine_reset_all_info(XklEngine * engine,
@@ -288,7 +289,7 @@ extern void xkl_engine_save_toplevel_window_state(XklEngine * engine,
 extern void xkl_engine_select_input_merging(XklEngine * engine, Window win,
 					    gulong mask);
 
-extern gchar *xkl_get_debug_window_title(Window win);
+extern gchar *xkl_get_debug_window_title(XklEngine * engine, Window win);
 
 extern Status xkl_engine_query_tree(XklEngine * engine,
 				    Window w,
diff --git a/libxklavier/xklavier_toplevel.c b/libxklavier/xklavier_toplevel.c
index e6c6f16..c4db68e 100644
--- a/libxklavier/xklavier_toplevel.c
+++ b/libxklavier/xklavier_toplevel.c
@@ -56,7 +56,7 @@ xkl_engine_add_toplevel_window(XklEngine * engine, Window toplevel_win,
 	xkl_debug(150,
 		  "Trying to add window " WINID_FORMAT
 		  "/%s with group %d\n", toplevel_win,
-		  xkl_get_debug_window_title(toplevel_win),
+		  xkl_get_debug_window_title(engine, toplevel_win),
 		  init_state->group);
 
 	if (!ignore_existing_state) {
@@ -105,7 +105,8 @@ xkl_engine_add_toplevel_window(XklEngine * engine, Window toplevel_win,
 	}
 
 	if (parent == (Window) NULL)
-		parent = xkl_get_registered_parent(toplevel_win);
+		parent =
+		    xkl_engine_get_registered_parent(engine, toplevel_win);
 
 	xkl_debug(150, "done\n");
 }
@@ -221,7 +222,8 @@ xkl_engine_find_toplevel_window(XklEngine * engine, Window win,
 	if (!rv)
 		xkl_debug(200,
 			  "Could not get the app window for " WINID_FORMAT
-			  "/%s\n", win, xkl_get_debug_window_title(win));
+			  "/%s\n", win, xkl_get_debug_window_title(engine,
+								   win));
 
 	return rv;
 }
@@ -271,13 +273,14 @@ xkl_engine_get_toplevel_window_state(XklEngine * engine,
 			  "Appwin " WINID_FORMAT
 			  ", '%s' has the group %d, indicators %X\n",
 			  toplevel_win,
-			  xkl_get_debug_window_title(toplevel_win), grp,
-			  inds);
+			  xkl_get_debug_window_title(engine, toplevel_win),
+			  grp, inds);
 	else
 		xkl_debug(150,
 			  "Appwin " WINID_FORMAT
 			  ", '%s' does not have state\n", toplevel_win,
-			  xkl_get_debug_window_title(toplevel_win));
+			  xkl_get_debug_window_title(engine,
+						     toplevel_win));
 
 	return ret;
 }
diff --git a/libxklavier/xklavier_util.c b/libxklavier/xklavier_util.c
index 0ec0eee..b1704c7 100644
--- a/libxklavier/xklavier_util.c
+++ b/libxklavier/xklavier_util.c
@@ -88,13 +88,13 @@ xkl_engine_save_state(XklEngine * engine, Window win, XklState * state)
  *  Prepares the name of window suitable for debugging (32characters long).
  */
 gchar *
-xkl_get_debug_window_title(Window win)
+xkl_get_debug_window_title(XklEngine * engine, Window win)
 {
 	static gchar sname[33];
 	gchar *name;
 	strcpy(sname, "NULL");
 	if (win != (Window) NULL) {
-		name = xkl_get_window_title(win);
+		name = xkl_engine_get_window_title(engine, win);
 		if (name != NULL) {
 			snprintf(sname, sizeof(sname), "%.32s", name);
 			g_free(name);
@@ -138,7 +138,8 @@ xkl_engine_load_subtree(XklEngine * engine, Window window, gint level,
 				  "Window " WINID_FORMAT
 				  " '%s' has WM_STATE so we'll add it\n",
 				  *child,
-				  xkl_get_debug_window_title(*child));
+				  xkl_get_debug_window_title(engine,
+							     *child));
 			xkl_engine_add_toplevel_window(engine, *child,
 						       window, TRUE,
 						       init_state);
@@ -147,7 +148,8 @@ xkl_engine_load_subtree(XklEngine * engine, Window window, gint level,
 				  "Window " WINID_FORMAT
 				  " '%s' does not have have WM_STATE so we'll not add it\n",
 				  *child,
-				  xkl_get_debug_window_title(*child));
+				  xkl_get_debug_window_title(engine,
+							     *child));
 
 			if (level == 0) {
 				xkl_debug(200,
diff --git a/libxklavier/xklavier_xkb.c b/libxklavier/xklavier_xkb.c
index fbd7699..d5ca7f8 100644
--- a/libxklavier/xklavier_xkb.c
+++ b/libxklavier/xklavier_xkb.c
@@ -313,7 +313,8 @@ xkl_xkb_get_server_state(XklEngine * engine, XklState * current_state_out)
  * Actually taken from mxkbledpanel, valueChangedProc
  */
 gboolean
-xkl_set_indicator(XklEngine * engine, gint indicator_num, gboolean set)
+xkl_engine_set_indicator(XklEngine * engine, gint indicator_num,
+			 gboolean set)
 {
 	XkbIndicatorMapPtr map;
 	Display *display = xkl_engine_get_display(engine);
diff --git a/libxklavier/xklavier_xmm.c b/libxklavier/xklavier_xmm.c
index 0636dff..4beecc5 100755
--- a/libxklavier/xklavier_xmm.c
+++ b/libxklavier/xklavier_xmm.c
@@ -216,7 +216,7 @@ xkl_xmm_get_server_state(XklEngine * engine, XklState * state)
 }
 
 void
-xkl_xmm_group_actualize(XklEngine * engine, gint group)
+xkl_xmm_actualize_group(XklEngine * engine, gint group)
 {
 	char cmd[1024];
 	int res;