Importing applet for displaying currently used keyboard layout

ede-panel/Panel.cpp

@@ -375,6 +375,7 @@ void Panel::load_applets(void) {
 		"pager.so",
 		"clock.so",
 		"taskbar.so",
+		"keyboard_layout.so",
 		0
 	};
 
@@ -396,6 +397,7 @@ void Panel::load_applets(void) {
 	mgr.load("./applets/pager/pager.so");
 	mgr.load("./applets/clock/clock.so");
 	mgr.load("./applets/taskbar/taskbar.so");
+	mgr.load("./applets/keyboard-layout/keyboard_layout.so");
 	mgr.fill_group(this);
 #endif
 }

ede-panel/applets/Jamfile

@@ -16,3 +16,4 @@ SubInclude TOP ede-panel applets pager ;
 SubInclude TOP ede-panel applets quick-launch ;
 SubInclude TOP ede-panel applets start-menu ;
 SubInclude TOP ede-panel applets taskbar ;
+SubInclude TOP ede-panel applets keyboard-layout ;

ede-panel/applets/keyboard-layout/Jamfile

@@ -0,0 +1,13 @@
+#
+# $Id$
+#
+# Part of Equinox Desktop Environment (EDE).
+# Copyright (c) 2009 EDE Authors.
+#
+# This program is licensed under terms of the 
+# GNU General Public License version 2 or newer.
+# See COPYING for details.
+
+SubDir TOP ede-panel applets keyboard-layout ;
+
+PanelApplet keyboard_layout : KeyLayout.cpp : -lxkbfile ;

ede-panel/applets/keyboard-layout/KeyLayout.cpp

@@ -0,0 +1,146 @@
+#include "Applet.h"
+
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Shared_Image.H>
+#include <FL/x.H>
+#include <FL/Fl.H>
+
+#include <stdio.h> /* needed for XKBrules.h */
+
+#include <X11/XKBlib.h>
+#include <X11/extensions/XKBgeom.h>
+#include <X11/extensions/XKBrules.h>
+
+#include <edelib/Resource.h>
+#include <edelib/Debug.h>
+#include <edelib/List.h>
+#include <edelib/Directory.h>
+#include <edelib/Nls.h>
+
+EDELIB_NS_USING(Resource)
+EDELIB_NS_USING(String)
+EDELIB_NS_USING(list)
+EDELIB_NS_USING(RES_SYS_ONLY)
+
+static Atom _XA_XKB_RF_NAMES_PROP_ATOM = 0;
+
+class KeyLayout : public Fl_Button {
+private:
+	String path, curr_layout;
+public:
+	KeyLayout();
+	void do_key_layout(void);
+	int  handle(int e);
+};
+
+typedef list<KeyLayout*> KeyLayoutList;
+typedef list<KeyLayout*>::iterator KeyLayoutListIt;
+
+static KeyLayoutList keylayout_objects;
+
+/* Xkb does not provide this */
+static void xkbrf_names_prop_free(XkbRF_VarDefsRec &vd, char *tmp) {
+	XFree(tmp);
+	XFree(vd.model);
+	XFree(vd.layout);
+	XFree(vd.options);
+	XFree(vd.variant);
+}
+
+static int xkb_events(int e) {
+	if(fl_xevent->xproperty.atom == _XA_XKB_RF_NAMES_PROP_ATOM) {
+		/* TODO: lock this */
+		KeyLayoutListIt it = keylayout_objects.begin(), it_end = keylayout_objects.end();
+
+		for(; it != it_end; ++it)
+			(*it)->do_key_layout();
+	}
+
+	return 0;
+}
+
+KeyLayout::KeyLayout() : Fl_Button(0, 0, 30, 25) {
+	box(FL_FLAT_BOX);
+	labelfont(FL_HELVETICA_BOLD);
+	labelsize(10);
+	label("??");
+
+	tooltip(_("Current keyboard layout"));
+
+	path = Resource::find_data("icons/kbflags/21x14", RES_SYS_ONLY, NULL);
+
+	do_key_layout();
+
+	/* TODO: lock this */
+	keylayout_objects.push_back(this);
+
+	/* with this, kb layout chages will be catched */
+	if(!_XA_XKB_RF_NAMES_PROP_ATOM)
+		_XA_XKB_RF_NAMES_PROP_ATOM = XInternAtom(fl_display, _XKB_RF_NAMES_PROP_ATOM, False);
+
+	Fl::add_handler(xkb_events);
+}
+
+void KeyLayout::do_key_layout(void) {
+	char             *tmp = NULL;
+	XkbRF_VarDefsRec  vd;
+
+	if(XkbRF_GetNamesProp(fl_display, &tmp, &vd)) {
+		Fl_Image *img = NULL;
+
+		/* do nothing if layout do not exists or the same was catched */
+		if(!vd.layout || (curr_layout == vd.layout))
+			return;
+
+		curr_layout = vd.layout;
+
+		if(!path.empty()) {
+			/* construct image path that has the same name as layout */
+			String full_path = path;
+
+			full_path += E_DIR_SEPARATOR_STR;
+			full_path += curr_layout;
+			full_path += ".png";
+
+			img = Fl_Shared_Image::get(full_path.c_str());
+		}
+
+		if(img) {
+			image(img);
+			label(NULL);
+		} else {
+			image(NULL);
+			label(curr_layout.c_str());
+		}
+
+		xkbrf_names_prop_free(vd, tmp);
+	}
+
+	redraw();
+}
+
+int KeyLayout::handle(int e) {
+	switch(e) {
+		case FL_ENTER:
+			box(FL_THIN_UP_BOX);
+			redraw();
+			break;
+		case FL_LEAVE:
+			box(FL_FLAT_BOX);
+			redraw();
+			break;
+		default:
+			break;
+	}
+
+	return Fl_Button::handle(e);
+}
+
+EDE_PANEL_APPLET_EXPORT (
+ KeyLayout, 
+ EDE_PANEL_APPLET_OPTION_ALIGN_RIGHT,
+ "Keyboard Layout applet",
+ "0.1",
+ "empty",
+ "Sanel Zukan"
+)