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

Use for_each

Browse Source
This commit is contained in:
Sanel Zukan 2011-10-07 14:19:04 +00:00
parent f16c76e5b6
commit f3ff9ade2d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@
#include <edelib/Nls.h> #include <edelib/Nls.h>
#include <edelib/Run.h> #include <edelib/Run.h>
#include <edelib/ForeignCallback.h> #include <edelib/ForeignCallback.h>
#include <edelib/Functional.h>
/* they should match names in ede-keyboard-conf */ /* they should match names in ede-keyboard-conf */
#define PANEL_APPLET_ID "ede-keyboard" #define PANEL_APPLET_ID "ede-keyboard"
@ -35,6 +36,7 @@ EDELIB_NS_USING(list)
EDELIB_NS_USING(run_async) EDELIB_NS_USING(run_async)
EDELIB_NS_USING(foreign_callback_add) EDELIB_NS_USING(foreign_callback_add)
EDELIB_NS_USING(foreign_callback_remove) EDELIB_NS_USING(foreign_callback_remove)
EDELIB_NS_USING(for_each)
EDELIB_NS_USING(RES_SYS_ONLY) EDELIB_NS_USING(RES_SYS_ONLY)
static Atom _XA_XKB_RF_NAMES_PROP_ATOM = 0; static Atom _XA_XKB_RF_NAMES_PROP_ATOM = 0;
@ -54,9 +56,7 @@ public:
}; };
typedef list<KeyLayout*> KeyLayoutList; typedef list<KeyLayout*> KeyLayoutList;
typedef list<KeyLayout*>::iterator KeyLayoutListIt; static KeyLayoutList keylayout_objects;
static KeyLayoutList keylayout_objects;
#ifdef HAVE_XKBRULES #ifdef HAVE_XKBRULES
/* Xkb does not provide this */ /* Xkb does not provide this */
@ -69,6 +69,11 @@ static void xkbrf_names_prop_free(XkbRF_VarDefsRec &vd, char *tmp) {
} }
#endif #endif
static void update_key_layout(KeyLayout *k) {
k->do_key_layout();
k->update_flag(false);
}
/* /*
* any layout changes on X will be reported here, executed either via ede-keyboard-conf or * 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 * another tool, so there are no needs to read layout from configuration file
@ -76,12 +81,7 @@ static void xkbrf_names_prop_free(XkbRF_VarDefsRec &vd, char *tmp) {
static int xkb_events(int e) { static int xkb_events(int e) {
if(fl_xevent->xproperty.atom == _XA_XKB_RF_NAMES_PROP_ATOM) { if(fl_xevent->xproperty.atom == _XA_XKB_RF_NAMES_PROP_ATOM) {
/* TODO: lock this */ /* TODO: lock this */
KeyLayoutListIt it = keylayout_objects.begin(), it_end = keylayout_objects.end(); for_each(update_key_layout, keylayout_objects);
for(; it != it_end; ++it) {
(*it)->do_key_layout();
(*it)->update_flag(false);
}
} }
return 0; return 0;