From 4c24e07a5230a10d4965aec83d5968f8ee532971 Mon Sep 17 00:00:00 2001 From: TomasM Date: Wed, 13 Dec 2017 17:22:59 -0500 Subject: [PATCH] remember keyboard layout when using persistent changes --- .../rootcopy/root/.fluxbox/kblayout | 1 + .../03-desktop/rootcopy/root/.fluxbox/menu | 97 +++++++++--------- .../03-desktop/rootcopy/root/.fluxbox/startup | 3 + .../03-desktop/rootcopy/usr/bin/fbsetkb | 4 + .../16x16/flags/flag_czech_republic.png | Bin 0 -> 536 bytes .../icons/locolor/16x16/flags/flag_france.png | Bin 0 -> 546 bytes .../locolor/16x16/flags/flag_germany.png | Bin 0 -> 410 bytes .../icons/locolor/16x16/flags/flag_italy.png | Bin 0 -> 547 bytes .../icons/locolor/16x16/flags/flag_poland.png | Bin 0 -> 334 bytes .../locolor/16x16/flags/flag_portugal.png | Bin 0 -> 592 bytes .../icons/locolor/16x16/flags/flag_russia.png | Bin 0 -> 394 bytes .../locolor/16x16/flags/flag_slovakia.png | Bin 0 -> 645 bytes .../icons/locolor/16x16/flags/flag_spain.png | Bin 0 -> 511 bytes .../locolor/16x16/flags/flag_ukraine.png | Bin 0 -> 363 bytes .../icons/locolor/16x16/flags/flag_usa.png | Bin 0 -> 536 bytes 15 files changed, 56 insertions(+), 49 deletions(-) create mode 100644 Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/kblayout create mode 100755 Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbsetkb create mode 100644 Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_czech_republic.png create mode 100644 Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_france.png create mode 100644 Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_germany.png create mode 100644 Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_italy.png create mode 100644 Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_poland.png create mode 100644 Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_portugal.png create mode 100644 Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_russia.png create mode 100644 Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_slovakia.png create mode 100644 Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_spain.png create mode 100644 Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_ukraine.png create mode 100644 Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_usa.png diff --git a/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/kblayout b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/kblayout new file mode 100644 index 0000000..c574d07 --- /dev/null +++ b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/kblayout @@ -0,0 +1 @@ +en diff --git a/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/menu b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/menu index a4747c2..86a5582 100644 --- a/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/menu +++ b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/menu @@ -1,5 +1,4 @@ [begin] (Desktop menu) - [exec] (Terminal) { fbstartupnotify && xterm -ls } [exec] (Web browser) { fbstartupnotify && chromium } [exec] (Text editor) { fbstartupnotify && leafpad } @@ -11,55 +10,55 @@ [include] (~/.fluxbox/menu_resolution) [end] [submenu] (Keyboard layout ...) {} - [exec] (Czech) { setxkbmap cz } - [exec] (English) { setxkbmap us } - [exec] (French) { setxkbmap fr } - [exec] (German) { setxkbmap de } - [exec] (Italian) { setxkbmap it } - [exec] (Polish) { setxkbmap pl } - [exec] (Portuguese) { setxkbmap br } - [exec] (Russian) { setxkbmap ru } - [exec] (Slovak) { setxkbmap sk } - [exec] (Spanish) { setxkbmap es } - [exec] (Turkish) { setxkbmap tr } - [exec] (Ukrainian) { setxkbmap ua } + [exec] (Czech) { fbsetkb cz } + [exec] (English) { fbsetkb us } + [exec] (French) { fbsetkb fr } + [exec] (German) { fbsetkb de } + [exec] (Italian) { fbsetkb it } + [exec] (Polish) { fbsetkb pl } + [exec] (Portuguese) { fbsetkb pt } + [exec] (Russian) { fbsetkb ru } + [exec] (Slovak) { fbsetkb sk } + [exec] (Spanish) { fbsetkb es } + [exec] (Ukrainian) { fbsetkb ua } [submenu] (Other ...) {} - [exec] (Afghani) { setxkbmap af } - [exec] (Albanian) { setxkbmap al } - [exec] (Arabic [Morocco]) { setxkbmap ma } - [exec] (Arabic) { setxkbmap ara } - [exec] (Armenian) { setxkbmap am } - [exec] (Azerbaijani) { setxkbmap az } - [exec] (Belarusian) { setxkbmap by } - [exec] (Belgian) { setxkbmap be } - [exec] (Berber [Algeria]) { setxkbmap dz } - [exec] (Bosnian) { setxkbmap ba } - [exec] (Bulgarian) { setxkbmap bg } - [exec] (Croatian) { setxkbmap hr } - [exec] (Danish) { setxkbmap dk } - [exec] (Dutch) { setxkbmap nl } - [exec] (English [Australian]) { setxkbmap au } - [exec] (Estonian) { setxkbmap ee } - [exec] (Finnish) { setxkbmap fi } - [exec] (French [Canada]) { setxkbmap ca } - [exec] (German [Austria]) { setxkbmap at } - [exec] (German [Switzerland]) { setxkbmap ch } - [exec] (Greek) { setxkbmap gr } - [exec] (Hebrew) { setxkbmap il } - [exec] (Hungarian) { setxkbmap hu } - [exec] (Icelandic) { setxkbmap is } - [exec] (Indian) { setxkbmap in } - [exec] (Iraqi) { setxkbmap iq } - [exec] (Irish) { setxkbmap ie } - [exec] (Latvian) { setxkbmap lv } - [exec] (Lithuanian) { setxkbmap lt } - [exec] (Norwegian) { setxkbmap no } - [exec] (Persian) { setxkbmap ir } - [exec] (Portuguese) { setxkbmap pt } - [exec] (Romanian) { setxkbmap ro } - [exec] (Serbian) { setxkbmap rs } - [exec] (Slovenian) { setxkbmap si } - [exec] (Swedish) { setxkbmap se } + [exec] (Afghani) { fbsetkb af } + [exec] (Albanian) { fbsetkb al } + [exec] (Arabic [Morocco]) { fbsetkb ma } + [exec] (Arabic) { fbsetkb ara } + [exec] (Armenian) { fbsetkb am } + [exec] (Azerbaijani) { fbsetkb az } + [exec] (Belarusian) { fbsetkb by } + [exec] (Belgian) { fbsetkb be } + [exec] (Berber [Algeria]) { fbsetkb dz } + [exec] (Bosnian) { fbsetkb ba } + [exec] (Brasil) { fbsetkb br } + [exec] (Bulgarian) { fbsetkb bg } + [exec] (Croatian) { fbsetkb hr } + [exec] (Danish) { fbsetkb dk } + [exec] (Dutch) { fbsetkb nl } + [exec] (English [Australian]) { fbsetkb au } + [exec] (Estonian) { fbsetkb ee } + [exec] (Finnish) { fbsetkb fi } + [exec] (French [Canada]) { fbsetkb ca } + [exec] (German [Austria]) { fbsetkb at } + [exec] (German [Switzerland]) { fbsetkb ch } + [exec] (Greek) { fbsetkb gr } + [exec] (Hebrew) { fbsetkb il } + [exec] (Hungarian) { fbsetkb hu } + [exec] (Icelandic) { fbsetkb is } + [exec] (Indian) { fbsetkb in } + [exec] (Iraqi) { fbsetkb iq } + [exec] (Irish) { fbsetkb ie } + [exec] (Latvian) { fbsetkb lv } + [exec] (Lithuanian) { fbsetkb lt } + [exec] (Norwegian) { fbsetkb no } + [exec] (Persian) { fbsetkb ir } + [exec] (Romanian) { fbsetkb ro } + [exec] (Serbian) { fbsetkb rs } + [exec] (Slovenian) { fbsetkb si } + [exec] (Swedish) { fbsetkb se } + [exec] (Turkish) { fbsetkb tr } [end] [end] [exec] (Exit / Logout) { fblogout } diff --git a/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/startup b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/startup index a4f04df..22b8435 100644 --- a/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/startup +++ b/Slax/debian/modules/03-desktop/rootcopy/root/.fluxbox/startup @@ -10,6 +10,9 @@ xmodmap "/root/.Xmodmap" # merge xresource settings xrdb -merge ~/.Xresources +# set keyboard layout +fbsetkb $(cat ~/.fluxbox/kblayout) + # Share common directories with guest user. This is necessary # because some apps like chromium must be running under guest for dir in Desktop Documents Downloads Music Pictures Public Templates Videos; do diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbsetkb b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbsetkb new file mode 100755 index 0000000..4e08683 --- /dev/null +++ b/Slax/debian/modules/03-desktop/rootcopy/usr/bin/fbsetkb @@ -0,0 +1,4 @@ +#!/bin/bash + +setxkbmap $1 +echo $1 > ~/.fluxbox/kblayout diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_czech_republic.png b/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_czech_republic.png new file mode 100644 index 0000000000000000000000000000000000000000..d79b3d9d97b55ed3ed56c565cf993b442da889eb GIT binary patch literal 536 zcmV+z0_XjSP)+;08C?h=N#AXpo>nC?bi3k%*D8E&FbF zGkd-w5sr=U-i_{dcjnD|GrMH1#WX`;%AvmP?|$xuda17s_=R=P1X4uK1cVS31&c0#DN1`b~3v6%DGjS@CvsLahi=6%C8;3{+? z4Xp`JKm5ebSr6H?gs%un3dsMMiRBW9vz}I{fs6!F5{1$Q-X7i{oAKaz9)wDbG$WmV z3d+&B>N9{ZAq7GE!0Y-oYQGiA%Xvh+Z$?OP;^^ck0SI}@lo^2=%S$qYbmb$0m#YZG zh)9Q6SOL8+CjbLp@f5U7@%I5XzP`ho#wPG2%W2q!{sv$K?IbJMfb+VhHXTnt&6@_F zzO3W5hV_|ryARtK7}l zf%sceU<~K;bK5u7BoSOAfa&<>dA~WzGmp!y-x$wg7nTGppdY@#n;!*9ibjvS(^!#r k5%NFpl9N@h^FILw0N|Fe?R}o__5c6?07*qoM6N<$g7pOHX#fBK literal 0 HcmV?d00001 diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_germany.png b/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_germany.png new file mode 100644 index 0000000000000000000000000000000000000000..8deb4c93d7ac90874959a7cfc6dff55e1647f03a GIT binary patch literal 410 zcmV;L0cHM)P)h5VD_&~gY z7`cgqn0Wxfz)QF{STXVdq6ZMx$P;Mh9mF#zg5fSQx-;6-535E4BWKoa=%6XS`v0ox zqLdP5ISMl#ljr%3bM7$4IGwUmu-4wvRin7Gu z_yk#IINYA1u01Z!&mgSX_;^PckFe=0Xk|g_@3tf^HF(!B!kW{UXY7q1aZo>Tc#aLU zIFPB;p8zwf%$iCBeF>~D0XpOEv?Pd}AY=_AtO?S5KLJ)288+P<#H?Y2HJ;s|a_pWR zDBY=vh@oMGrF5+l_IH5d{s-o#Ob#vD7=Z}HedbET?#boI)4c;052hexCr1F%m4rY07*qoM6N<$ Ef}_r{VE_OC literal 0 HcmV?d00001 diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_italy.png b/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_italy.png new file mode 100644 index 0000000000000000000000000000000000000000..19064f889b77fad3bcb7eb820f9a40eaac895aec GIT binary patch literal 547 zcmV+;0^I$HP)`Yo7inO5tdKCvzq+t z%Pk5&WkSTL=wolE2~T2(Wq8c8G;2S<0qg64Fx6Q+?jP(~J-I(_;r!+dLgujO;>Xd1 z3fgl8Pz4(wu>JW2Xw)c`Ntaip1>s{3&h zDgX(?qJ`W^s^|m}*6`3^AhQcn1^O|!olru75 z&{?n$TW~IkB{4#h0=uLj0bEv2)jCt4AI4r4MCi|`@dOY8sy3mdv~m?hlZFcxM*bfx zYoOO?^wf70q@}AYXyHaP1>B6~FN+v?I{~>yisqQNfHjh9CMm*8w*+LOP4bL-UDEZ2 z>AY@~ZI=7CK@Sa^fbbQ75_%WkpBidC1dkp8r^5%npJ}P66tF+Gw(#)}n+xqZk10JZ l$EVWue+@6I{+(Y17yxy+y60u^dn^C|002ovPDHLkV1l&t?~(uj literal 0 HcmV?d00001 diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_poland.png b/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_poland.png new file mode 100644 index 0000000000000000000000000000000000000000..4dd7104154542c196f58a21f49c6d99ef9d15de6 GIT binary patch literal 334 zcmV-U0kQsxP)?HLTwrEr238Rf#z12vOkLMU=iH9Sp{p6C zWHhwaCnMyt+`?MhYjYGusH*c$1mJjk(>6fYI@m$6EFfIti(orRob)SCh58J!70Hxj z)1Do$Vdff_=lAJXp(qtN9|6seBEf(5mx>Mo>IPi6%gvBGXo0J&T=V1u gZ>d#d&-pFD04C~crW&GlMF0Q*07*qoM6N<$g5=|hy8r+H literal 0 HcmV?d00001 diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_portugal.png b/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_portugal.png new file mode 100644 index 0000000000000000000000000000000000000000..19cd33adcc428be751f1dc67854aae691beee0fb GIT binary patch literal 592 zcmV-W0V0PYn-}}Dz-U_7@+A#}lT2f4lRY<%>bmLXODop0?IeB_N08K&&l(ksFH8UlIyIA~fiEp( zfHZ?0OLH|qIynr1Pb)@(Mn3aT;AB~ZcRK}a&%8p@jjQfY7unEr2>1XaGrO{T=lE4e)1n z4~mSQEEGwZK?z|PXqpza)T=EC_2x0M1c>xFrF20nHke42Y60G!ykv8SnQ4FAN zGq?y11Kq?dLCTXkJb&4ZChy-jhEVv)OIm{nGmQkl&nvA(YDo8rK_?se<}+~gcne+o z19-YqKq1%#-u42VC{n_Jq?mSbgMqJ(k;|AFhh$k=<^tIVI9Pnf5%!tpIoG?OOx=dp z>VdLcbauo(TF5s?C*+Brj&3i~b&&MprJaJu$vlAiXO+pQIuE$_tTIz-I`oBU-+!4D e?f%Y}0t^6%t*BE^;^Kn<0000T%uMZueWt{cXED+@e$O70_a1#B zLeJo`EH9mNGs*2LN0H_gdx49hKx3_3huR^qF<34ZGiGWb`}-r;VW9-?q)?V0-Wp85 z8$7VHpGQLovqL2(h6c z1-11XX2U|7QM&>5(>)kb5F)^e0%eqCBqMwz88}l1VGocT$|y_s1Ni*p6m?a#J?NZ8 z+k-gIQQh5wKZhbI9>Pv0@Dw&kRS*fIEIS#Ui3w(W@K-!Qfqn#Gl%-{cFYmCs?M|s! oim=jhQ%UpBU9!}7o!0^k07%hqZ;IIiBme*a07*qoM6N<$f>leOH~;_u literal 0 HcmV?d00001 diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_slovakia.png b/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_slovakia.png new file mode 100644 index 0000000000000000000000000000000000000000..8c4d813d7807a9b44dd72cd82b754a00a2a1dd45 GIT binary patch literal 645 zcmV;00($+4P)RCwB?Q$0*mQ562}Pv1|;tJ)xe zO2oyupf+M>OfVf7?BZ%j97tr)I5`kk&Gx6J0dg?Sp1t zxxU>(buWOG@t_05Vj%ny=PJ2o88!~3rXsB9i!b*qgJ8~do$L#%)Ep>NOcV69QX zu@(Z;9W05->$qMbryaBu1o9zNZHhNEEkG2$xS{^QV^ z6>%XSe6eSF#4h5hjd-d((ob0a4(R*gU>2jJTrOD2y3 z!vt030jUhIVzX_sNR6=z6w8CR+vMCV)7;C?ybGvN$W!yw00kpM6rRa3hA22aNK~4n z6|Pa&Y#_88APCUBoX7051z0IQ-A>gQEK6oQsE6&00000NkvXXu0mjf1F<9# literal 0 HcmV?d00001 diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_spain.png b/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_spain.png new file mode 100644 index 0000000000000000000000000000000000000000..d87283c705c02f83b6f2018c4dc8821c4cef2707 GIT binary patch literal 511 zcmVQX&3j0E_JS>gMQC4T*rpw=;+m#(HP>;AuC~LtO zu9lZDnQYmMgsYD$Ln)Zv-oyKvm%H+QpAf(6>+(Uc{eWTa2Ik)LS)F(aG#y!_EyCy# zA5cB|Bx4!cvQC6C(S7*6YmY|w-UP<95!h>gpuV#~dwh}9ZZRglFN$)IslI|cq|Km4 z2bs3%srYN=`Eocz?I7Xl&rLe!6-2$X9$L2^216vLN)!~};=?)fZ;xpv6a2b4L9Zw9 z)#vQ;?hGnW5>$LOu^dbY+ay#zuk!p&i}Qtue@TrW8*4D->mnYp?SULm#3$CM6X7eq zo`c_2qR7cr(8wb}oV44Kbt5vXarZ8fMVCrkey?DBieux~*kU2?n(|$`>!ql4s#mB% z(?sGE%5y3W(Yer}O%m$(P_yK<{vXRm{u^%v7yz?*n$t7$0G0p%002ovPDHLkV1l=u B?41Ar literal 0 HcmV?d00001 diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_ukraine.png b/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_ukraine.png new file mode 100644 index 0000000000000000000000000000000000000000..639aa4ac0f7e9ca23f1abc588c7b7a05e4577597 GIT binary patch literal 363 zcmV-x0hIoUP)FcgM=#}7eO3015} zNQe{k1RWU4R`m)!LRIw?6<6R2u+f2`7ifDBB4uCzk@)q04qYK8iM-hUKL76}cB+at zk83T!`|lEEctQwiWR?MvtsGvzb^UgaV`(-Hcb>DrmboLq?BfT5pePBydeVI&+e1dj8_1rfp65jOwAk$917wU9s|UWIB~?(wUPzqiZR^5P1jfWR zTIVEZO{qU|9=k629$%R69#AFneg|VM%!K3a%DYswzKwqZ3;_1XU!DW((K!GB002ov JPDHLkV1ie?l9~Vj literal 0 HcmV?d00001 diff --git a/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_usa.png b/Slax/debian/modules/03-desktop/rootcopy/usr/share/icons/locolor/16x16/flags/flag_usa.png new file mode 100644 index 0000000000000000000000000000000000000000..f027ed8367e3c24a5b556735bedfff70a7855cfd GIT binary patch literal 536 zcmV+z0_XjSP)PL~N zsQB@6yb~vwrnpFR;qZI&X6DYBnL7qaS%!B`i5Ih6j-4gB6gww6zws)=!G6lY%Bm!I z`H7w5yA1ulBzi(z+7tRxTx3v