mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

Call ede-keyboard-conf when clicked on applet.

Browse Source 
Let ede-keyboard-conf uses setxkbmap for setting changes.
ede-desktop foreign callback addopted for latest modification in edelib.
ede-conf will display keyboard configuration.
This commit is contained in:
Sanel Zukan
2009-11-13 11:53:02 +00:00
parent dd6039098d
commit cc9725582c
4 changed files with 167 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
ede-panel/applets/keyboard-layout/KeyLayout.cpp
View File

@ -16,20 +16,34 @@
#include <edelib/List.h>
#include <edelib/Directory.h>
#include <edelib/Nls.h>
#include <edelib/Run.h>
#include <edelib/ForeignCallback.h>
/* they should match names in ede-keyboard-conf */
#define PANEL_APPLET_ID "ede-keyboard"
#define CONFIG_NAME "ede-keyboard"
EDELIB_NS_USING(Resource)
EDELIB_NS_USING(String)
EDELIB_NS_USING(list)
EDELIB_NS_USING(run_async)
EDELIB_NS_USING(foreign_callback_add)
EDELIB_NS_USING(foreign_callback_remove)
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;
bool should_show_flag;
String path, curr_layout;
Fl_Image *img;
public:
KeyLayout();
void do_key_layout(void);
~KeyLayout();
void update_flag(bool read_config);
void do_key_layout();
int handle(int e);
};
@ -47,29 +61,53 @@ static void xkbrf_names_prop_free(XkbRF_VarDefsRec &vd, char *tmp) {
XFree(vd.variant);
}
/*
* any layout changes on X will be reported here, executed either via ede-keyboard-conf or
* another tool, so there are no needs to read layout from configuration file
*/
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)
for(; it != it_end; ++it) {
(*it)->do_key_layout();
(*it)->update_flag(false);
}
}
return 0;
}
static void click_cb(Fl_Widget*, void*) {
run_async("ede-keyboard-conf");
}
static void update_flag_cb(Fl_Window*, void *data) {
KeyLayout *k = (KeyLayout*)data;
k->update_flag(true);
k->redraw();
}
KeyLayout::KeyLayout() : Fl_Button(0, 0, 30, 25) {
should_show_flag = true;
curr_layout = "us"; /* default layout */
img = NULL;
box(FL_FLAT_BOX);
labelfont(FL_HELVETICA_BOLD);
labelsize(10);
label("??");
align(FL_ALIGN_CLIP);
tooltip(_("Current keyboard layout"));
callback(click_cb);
foreign_callback_add(window(), PANEL_APPLET_ID, update_flag_cb, this);
path = Resource::find_data("icons/kbflags/21x14", RES_SYS_ONLY, NULL);
do_key_layout();
update_flag(true);
/* TODO: lock this */
keylayout_objects.push_back(this);
@ -81,6 +119,42 @@ KeyLayout::KeyLayout() : Fl_Button(0, 0, 30, 25) {
Fl::add_handler(xkb_events);
}
KeyLayout::~KeyLayout() {
foreign_callback_remove(update_flag_cb);
}
void KeyLayout::update_flag(bool read_config) {
if(read_config) {
Resource r;
if(r.load(CONFIG_NAME))
r.get("Keyboard", "show_country_flag", should_show_flag, true);
}
/* remove previous image if we aren't going to show it */
if(!should_show_flag)
img = NULL;
if(should_show_flag && !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());
}
image(img);
if(img)
label(NULL);
else
label(curr_layout.c_str());
redraw();
}
void KeyLayout::do_key_layout(void) {
char *tmp = NULL;
XkbRF_VarDefsRec vd;
@ -92,31 +166,10 @@ void KeyLayout::do_key_layout(void) {
if(!vd.layout || (curr_layout == vd.layout))
return;
/* just store it, so update_flag() can do the rest */
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) {