[libgnomekbd] Added handling of caps/num/scroll locks

[Sergey V. Udaltsov <svu src gnome org>]

commit 7b9ca571c8975532319c1545e5425305d75769ce
Author: Sergey V. Udaltsov <svu gnome org>
Date:   Fri Jan 7 17:28:48 2011 +0000

    Added handling of caps/num/scroll locks
    
    Signal and state functions - to be used from JS

 libgnomekbd/gkbd-configuration.c |   66 +++++++++++++++++++++++++++++++++++---
 libgnomekbd/gkbd-configuration.h |    7 ++++
 2 files changed, 68 insertions(+), 5 deletions(-)
---
diff --git a/libgnomekbd/gkbd-configuration.c b/libgnomekbd/gkbd-configuration.c
index 413f89c..00f4f1e 100644
--- a/libgnomekbd/gkbd-configuration.c
+++ b/libgnomekbd/gkbd-configuration.c
@@ -48,11 +48,16 @@ struct _GkbdConfigurationPrivate {
 	gulong config_changed_handler;
 
 	GSList *widget_instances;
+
+	Atom caps_lock_atom;
+	Atom num_lock_atom;
+	Atom scroll_lock_atom;
 };
 
 enum {
 	SIGNAL_CHANGED,
 	SIGNAL_GROUP_CHANGED,
+	SIGNAL_INDICATORS_CHANGED,
 	LAST_SIGNAL
 };
 
@@ -170,17 +175,25 @@ gkbd_configuration_state_callback (XklEngine * engine,
 				   gint group, gboolean restore,
 				   GkbdConfiguration * configuration)
 {
-	xkl_debug (150, "group is now %d, restore: %d\n", group, restore);
+	xkl_debug (150, "change type: %d, group is now %d, restore: %d\n",
+		   changeType, group, restore);
 
-	if (changeType == GROUP_CHANGED) {
+	switch (changeType) {
+	case GROUP_CHANGED:
 		g_signal_emit (configuration,
 			       signals[SIGNAL_GROUP_CHANGED], 0, group);
+		break;
+	case INDICATORS_CHANGED:
+		g_signal_emit (configuration,
+			       signals[SIGNAL_INDICATORS_CHANGED], 0);
+		break;
 	}
 }
 
 static void
 gkbd_configuration_init (GkbdConfiguration * configuration)
 {
+	Display *display;
 	GkbdConfigurationPrivate *priv;
 	XklConfigRec *xklrec = xkl_config_rec_new ();
 
@@ -193,14 +206,18 @@ gkbd_configuration_init (GkbdConfiguration * configuration)
 	/* Initing some global vars */
 	priv->tooltips_format = "%s";
 
-	priv->engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY
-						(gdk_display_get_default
-						 ()));
+	display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+	priv->engine = xkl_engine_get_instance (display);
 	if (priv->engine == NULL) {
 		xkl_debug (0, "Libxklavier initialization error");
 		return;
 	}
 
+	priv->caps_lock_atom = XInternAtom (display, "Caps Lock", False);
+	priv->num_lock_atom = XInternAtom (display, "Num Lock", False);
+	priv->scroll_lock_atom =
+	    XInternAtom (display, "Scroll Lock", False);
+
 	priv->state_changed_handler =
 	    g_signal_connect (priv->engine, "X-state-changed",
 			      G_CALLBACK
@@ -313,6 +330,10 @@ gkbd_configuration_class_init (GkbdConfigurationClass * klass)
 						      g_cclosure_marshal_VOID__INT,
 						      G_TYPE_NONE,
 						      1, G_TYPE_INT);
+	signals[SIGNAL_INDICATORS_CHANGED] =
+	    g_signal_new ("indicators-changed", GKBD_TYPE_CONFIGURATION,
+			  G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+			  g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 
 	g_type_class_add_private (klass,
 				  sizeof (GkbdConfigurationPrivate));
@@ -667,3 +688,38 @@ gkbd_configuration_get_group_name (GkbdConfiguration * configuration,
 	}
 	return NULL;
 }
+
+gboolean
+gkbd_configuration_get_caps_lock_state (GkbdConfiguration * configuration)
+{
+	Bool state;
+	Display *display =
+	    GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+	XkbGetNamedIndicator (display, configuration->priv->caps_lock_atom,
+			      NULL, &state, NULL, NULL);
+	return state;
+}
+
+gboolean
+gkbd_configuration_get_num_lock_state (GkbdConfiguration * configuration)
+{
+	Bool state;
+	Display *display =
+	    GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+	XkbGetNamedIndicator (display, configuration->priv->num_lock_atom,
+			      NULL, &state, NULL, NULL);
+	return state;
+}
+
+gboolean
+gkbd_configuration_get_scroll_lock_state (GkbdConfiguration *
+					  configuration)
+{
+	Bool state;
+	Display *display =
+	    GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+	XkbGetNamedIndicator (display,
+			      configuration->priv->scroll_lock_atom, NULL,
+			      &state, NULL, NULL);
+	return state;
+}
diff --git a/libgnomekbd/gkbd-configuration.h b/libgnomekbd/gkbd-configuration.h
index 77ef92e..64b6e79 100644
--- a/libgnomekbd/gkbd-configuration.h
+++ b/libgnomekbd/gkbd-configuration.h
@@ -140,5 +140,12 @@ extern gchar *gkbd_configuration_create_label_title (int group,
 						     ln2cnt_map,
 						     gchar * layout_name);
 
+extern gboolean gkbd_configuration_get_caps_lock_state (GkbdConfiguration *
+							configuration);
+extern gboolean gkbd_configuration_get_num_lock_state (GkbdConfiguration *
+						       configuration);
+extern gboolean gkbd_configuration_get_scroll_lock_state (GkbdConfiguration
+							  * configuration);
+
 G_END_DECLS
 #endif