wok rev 25338
updated svkbd packages ( -> 0.4.1)
| author | Hans-G?nter Theisgen |
|---|---|
| date | Sun Jul 24 10:22:05 2022 +0100 (2022-07-24) |
| parents | b8412c979a49 |
| children | 0aa9b0da5f5c |
| files | svkbd-de/receipt svkbd-fr/receipt svkbd-ru/receipt svkbd/description.txt svkbd/receipt svkbd/stuff/config.def.h svkbd/stuff/layout.fr.h |
line diff
1.1 --- a/svkbd-de/receipt Sat Jul 23 20:18:41 2022 +0100 1.2 +++ b/svkbd-de/receipt Sun Jul 24 10:22:05 2022 +0100 1.3 @@ -1,21 +1,21 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="svkbd-de" 1.7 -BRANCH="a5b40479e354ce11a1b009492da65ea562070cba" 1.8 -VERSION=${BRANCH:0:7} 1.9 +VERSION="0.4.1" 1.10 CATEGORY="x-window" 1.11 -SHORT_DESC="Simple virtual keyboard that suck less (DE Layout)." 1.12 +SHORT_DESC="Simple virtual keyboard that suck less (german layout)." 1.13 MAINTAINER="pankso@slitaz.org" 1.14 LICENSE="BSD" 1.15 -WEB_SITE="http://tools.suckless.org/x/svkbd/" 1.16 +WEB_SITE="https://tools.suckless.org/x/svkbd/" 1.17 + 1.18 +DEPENDS="xorg-libX11 xorg-libXtst" 1.19 +WANTED="svkbd" 1.20 + 1.21 HOST_ARCH="i486 arm" 1.22 1.23 -WANTED="svkbd" 1.24 -DEPENDS="xorg-libX11 xorg-libXtst" 1.25 - 1.26 # Rules to gen a SliTaz package suitable for Tazpkg. 1.27 genpkg_rules() 1.28 { 1.29 - mkdir -p $fs/usr/bin/ 1.30 - cp -a ${install}/usr/bin/${PACKAGE} $fs/usr/bin 1.31 + mkdir -p $fs/usr/bin 1.32 + cp -a ${install}/usr/bin/${PACKAGE} $fs/usr/bin 1.33 }
2.1 --- a/svkbd-fr/receipt Sat Jul 23 20:18:41 2022 +0100 2.2 +++ b/svkbd-fr/receipt Sun Jul 24 10:22:05 2022 +0100 2.3 @@ -1,21 +1,21 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="svkbd-fr" 2.7 -BRANCH="a5b40479e354ce11a1b009492da65ea562070cba" 2.8 -VERSION=${BRANCH:0:7} 2.9 +VERSION="0.4.1" 2.10 CATEGORY="x-window" 2.11 -SHORT_DESC="Simple virtual keyboard that suck less (FR Layout)." 2.12 +SHORT_DESC="Simple virtual keyboard that suck less (french layout)." 2.13 MAINTAINER="pankso@slitaz.org" 2.14 LICENSE="BSD" 2.15 -WEB_SITE="http://tools.suckless.org/x/svkbd/" 2.16 +WEB_SITE="https://tools.suckless.org/x/svkbd/" 2.17 + 2.18 +DEPENDS="xorg-libX11 xorg-libXtst" 2.19 +WANTED="svkbd" 2.20 + 2.21 HOST_ARCH="i486 arm" 2.22 2.23 -WANTED="svkbd" 2.24 -DEPENDS="xorg-libX11 xorg-libXtst" 2.25 - 2.26 # Rules to gen a SliTaz package suitable for Tazpkg. 2.27 genpkg_rules() 2.28 { 2.29 - mkdir -p $fs/usr/bin/ 2.30 - cp -a ${install}/usr/bin/${PACKAGE} $fs/usr/bin 2.31 + mkdir -p $fs/usr/bin 2.32 + cp -a ${install}/usr/bin/${PACKAGE} $fs/usr/bin 2.33 }
3.1 --- a/svkbd-ru/receipt Sat Jul 23 20:18:41 2022 +0100 3.2 +++ b/svkbd-ru/receipt Sun Jul 24 10:22:05 2022 +0100 3.3 @@ -1,21 +1,21 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="svkbd-ru" 3.7 -BRANCH="a5b40479e354ce11a1b009492da65ea562070cba" 3.8 -VERSION=${BRANCH:0:7} 3.9 +VERSION="0.4.1" 3.10 CATEGORY="x-window" 3.11 -SHORT_DESC="Simple virtual keyboard that suck less (RU Layout)." 3.12 +SHORT_DESC="Simple virtual keyboard that suck less (russian layout)." 3.13 MAINTAINER="pankso@slitaz.org" 3.14 LICENSE="BSD" 3.15 -WEB_SITE="http://tools.suckless.org/x/svkbd/" 3.16 +WEB_SITE="https://tools.suckless.org/x/svkbd/" 3.17 + 3.18 +DEPENDS="xorg-libX11 xorg-libXtst" 3.19 +WANTED="svkbd" 3.20 + 3.21 HOST_ARCH="i486 arm" 3.22 3.23 -WANTED="svkbd" 3.24 -DEPENDS="xorg-libX11 xorg-libXtst" 3.25 - 3.26 # Rules to gen a SliTaz package suitable for Tazpkg. 3.27 genpkg_rules() 3.28 { 3.29 - mkdir -p $fs/usr/bin/ 3.30 - cp -a ${install}/usr/bin/${PACKAGE} $fs/usr/bin 3.31 + mkdir -p $fs/usr/bin 3.32 + cp -a ${install}/usr/bin/${PACKAGE} $fs/usr/bin 3.33 }
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/svkbd/description.txt Sun Jul 24 10:22:05 2022 +0100 4.3 @@ -0,0 +1,2 @@ 4.4 +This is a simple virtual keyboard, intended to be used 4.5 +in environments, where no keyboard is available.
5.1 --- a/svkbd/receipt Sat Jul 23 20:18:41 2022 +0100 5.2 +++ b/svkbd/receipt Sun Jul 24 10:22:05 2022 +0100 5.3 @@ -1,19 +1,20 @@ 5.4 # SliTaz package receipt. 5.5 5.6 PACKAGE="svkbd" 5.7 -BRANCH="a5b40479e354ce11a1b009492da65ea562070cba" 5.8 -VERSION=${BRANCH:0:7} 5.9 +VERSION="0.4.1" 5.10 CATEGORY="x-window" 5.11 -SHORT_DESC="Simple virtual keyboard that suck less (EN Layout)." 5.12 +SHORT_DESC="Simple virtual keyboard that suck less (english layout)." 5.13 MAINTAINER="pankso@slitaz.org" 5.14 LICENSE="BSD" 5.15 -TARBALL="$PACKAGE-$VERSION.tar.bz2" 5.16 -WEB_SITE="http://tools.suckless.org/x/svkbd/" 5.17 -WGET_URL="git|git://git.suckless.org/svkbd" 5.18 -HOST_ARCH="i486 arm" 5.19 +WEB_SITE="https://tools.suckless.org/x/svkbd/" 5.20 + 5.21 +TARBALL="$PACKAGE-$VERSION.tar.gz" 5.22 +WGET_URL="https://dl.suckless.org/tools/$TARBALL" 5.23 5.24 DEPENDS="xorg-libX11 xorg-libXtst" 5.25 -BUILD_DEPENDS="xorg-libX11-dev xorg-libXtst-dev" 5.26 +BUILD_DEPENDS="fontconfig-dev libxml2-dev xorg-libX11-dev xorg-libXtst-dev" 5.27 + 5.28 +HOST_ARCH="i486 arm" 5.29 5.30 # What is the latest version available today? 5.31 current_version() 5.32 @@ -24,20 +25,25 @@ 5.33 5.34 # Rules to configure and make the package. 5.35 compile_rules() 5.36 -{ 5.37 +{ 5.38 cp -d ${stuff}/*.h . 5.39 - for layout in de en ru fr 5.40 - do 5.41 - make svkbd-${layout} CC=${HOST_SYSTEM}-gcc || return 1 5.42 - done 5.43 + 5.44 + for layout in de en fr ru 5.45 + do 5.46 + make LAYOUT=$layout \ 5.47 + CC=$HOST_SYSTEM-gcc || return 1 5.48 + make install \ 5.49 + LAYOUT=$layout \ 5.50 + DESTDIR=${DESTDIR} \ 5.51 + PREFIX="/usr" 5.52 + done 5.53 # We may need to sed config.def.h to set correct font for RU ??? 5.54 #make svkbd-ru CC=${HOST_SYSTEM}-gcc 5.55 - make install DESTDIR=${DESTDIR} PREFIX="/usr" 5.56 } 5.57 5.58 # Rules to gen a SliTaz package suitable for Tazpkg. 5.59 genpkg_rules() 5.60 { 5.61 mkdir -p $fs/usr/bin 5.62 - cp -a ${install}/usr/bin/${PACKAGE}-en $fs/usr/bin 5.63 + cp -a $install/usr/bin/$PACKAGE-en $fs/usr/bin 5.64 }
6.1 --- a/svkbd/stuff/config.def.h Sat Jul 23 20:18:41 2022 +0100 6.2 +++ b/svkbd/stuff/config.def.h Sun Jul 24 10:22:05 2022 +0100 6.3 @@ -1,9 +1,28 @@ 6.4 static const Bool wmborder = True; 6.5 -static const char font[] = "-misc-fixed-medium-r-semicondensed--0-0-75-75-c-0-iso8859-1"; 6.6 -static const char normbgcolor[] = "#dfdfdf"; 6.7 -static const char normfgcolor[] = "#000000"; 6.8 -static const char pressbgcolor[] = "#111111"; 6.9 -static const char pressfgcolor[] = "#ffffff"; 6.10 -static const char highlightbgcolor[] = "#111111"; 6.11 -static const char highlightfgcolor[] = "#ffffff"; 6.12 +static int fontsize = 22; 6.13 +static double overlay_delay = 1.0; //in seconds 6.14 +static double repeat_delay = 0.75; //in seconds, will not work on keys with overlays 6.15 +static int scan_rate = 50; //scan rate in microseconds, affects key repetition rate 6.16 +static int heightfactor = 14; //one row of keys takes up 1/x of the screen height 6.17 +static int xspacing = 5; 6.18 +static int yspacing = 5; 6.19 +static const char *defaultfonts[] = { 6.20 + "DejaVu Sans:bold:size=22" 6.21 +}; 6.22 +static const char *defaultcolors[SchemeLast][2] = { 6.23 + /* fg bg */ 6.24 + [SchemeNorm] = { "#000000", "#dfdfdf" }, 6.25 + [SchemeNormShift] = { "#008ac0", "#132a33" }, 6.26 + [SchemeNormABC] = { "#ffffff", "#14313d" }, 6.27 + [SchemeNormABCShift] = { "#008ac0", "#14313d" }, 6.28 + [SchemePress] = { "#ffffff", "#111111" }, 6.29 + [SchemePressShift] = { "#00c001", "#259937" }, 6.30 + [SchemeHighlight] = { "#ffffff", "#111111" }, 6.31 + [SchemeHighlightShift] = { "#008ac0", "#005577" }, 6.32 + [SchemeOverlay] = { "#ffffff", "#2b3313" }, 6.33 + [SchemeOverlayShift] = { "#008ac0", "#2b3313" }, 6.34 + [SchemeWindow] = { "#bbbbbb", "#132a33" }, 6.35 +}; 6.36 6.37 +/* static const char font[] = "-misc-fixed-medium-r-semicondensed--0-0-75-75-c-0-iso8859-1"; */ 6.38 +
7.1 --- a/svkbd/stuff/layout.fr.h Sat Jul 23 20:18:41 2022 +0100 7.2 +++ b/svkbd/stuff/layout.fr.h Sun Jul 24 10:22:05 2022 +0100 7.3 @@ -1,67 +1,68 @@ 7.4 -static Key keys[] = { 7.5 - { "&1", XK_ampersand, 1 }, 7.6 - { "é2~", XK_eacute, 1 }, 7.7 - { "\"3#", XK_quotedbl, 1 }, 7.8 - { "'4{", XK_apostrophe, 1 }, 7.9 - { "(5[", XK_parenleft, 1 }, 7.10 - { "-6|", XK_minus, 1 }, 7.11 - { "é7`", XK_egrave, 1 }, 7.12 - { "_8\\", XK_underscore, 1 }, 7.13 - { "ç9^", XK_cedilla, 1 }, 7.14 - { "à0@", XK_agrave, 1 }, 7.15 - { ")°]", XK_parenright, 1 }, 7.16 - { "=+}", XK_equal, 1 }, 7.17 - { "<-", XK_BackSpace, 2 }, 7.18 +#define KEYS 63 7.19 +static Key keys_fr[KEYS] = { 7.20 + { "&", "1", XK_ampersand, 1 }, 7.21 + { "é", "2~", XK_eacute, 1 }, 7.22 + { "\"", "3#", XK_quotedbl, 1 }, 7.23 + { "'", "4{", XK_apostrophe, 1 }, 7.24 + { "(", "5[", XK_parenleft, 1 }, 7.25 + { "-", "6|", XK_minus, 1 }, 7.26 + { "é", "7`", XK_egrave, 1 }, 7.27 + { "_", "8\\", XK_underscore, 1 }, 7.28 + { "ç", "9^", XK_cedilla, 1 }, 7.29 + { "à", "0@", XK_agrave, 1 }, 7.30 + { ")", "°]", XK_parenright, 1 }, 7.31 + { "=", "+}", XK_equal, 1 }, 7.32 + { "<-", 0, XK_BackSpace, 2 }, 7.33 { 0 }, /* New row */ 7.34 - { "->|", XK_Tab, 1 }, 7.35 - { "aA", XK_a, 1 }, 7.36 - { "zZ", XK_z, 1 }, 7.37 - { "eE€", XK_e, 1 }, 7.38 - { "rR", XK_r, 1 }, 7.39 - { "tT", XK_t, 1 }, 7.40 - { "yY", XK_y, 1 }, 7.41 - { "uU", XK_u, 1 }, 7.42 - { "iI", XK_i, 1 }, 7.43 - { "oO", XK_o, 1 }, 7.44 - { "pP", XK_p, 1 }, 7.45 - { "^", XK_dead_circumflex, 1 }, 7.46 - { "$£¤", XK_dollar, 1 }, 7.47 - { "Return", XK_Return, 3 }, 7.48 + { "-", ">|", XK_Tab, 1 }, 7.49 + { "a", "A", XK_a, 1 }, 7.50 + { "z", "Z", XK_z, 1 }, 7.51 + { "e", "E€", XK_e, 1 }, 7.52 + { "r", "R", XK_r, 1 }, 7.53 + { "t", "T", XK_t, 1 }, 7.54 + { "y", "Y", XK_y, 1 }, 7.55 + { "u", "U", XK_u, 1 }, 7.56 + { "i", "I", XK_i, 1 }, 7.57 + { "o", "O", XK_o, 1 }, 7.58 + { "p", "P", XK_p, 1 }, 7.59 + { "^", "", XK_dead_circumflex, 1 }, 7.60 + { "$", "£¤", XK_dollar, 1 }, 7.61 + { "Return", 0, XK_Return, 3 }, 7.62 { 0 }, /* New row */ 7.63 - { 0, XK_Caps_Lock, 2 }, 7.64 - { "qQ", XK_q, 1 }, 7.65 - { "sS", XK_s, 1 }, 7.66 - { "dD", XK_d, 1 }, 7.67 - { "fF", XK_f, 1 }, 7.68 - { "gG", XK_g, 1 }, 7.69 - { "hH", XK_h, 1 }, 7.70 - { "jJ", XK_j, 1 }, 7.71 - { "kK", XK_k, 1 }, 7.72 - { "lL", XK_l, 1 }, 7.73 - { "mM", XK_m, 1 }, 7.74 - { "ù%", XK_ugrave, 1 }, 7.75 - { "*µ", XK_multiply, 1 }, 7.76 - { "\\|", XK_backslash, 1 }, 7.77 + { 0, 0, XK_Caps_Lock, 2 }, 7.78 + { "q", "Q", XK_q, 1 }, 7.79 + { "s", "S", XK_s, 1 }, 7.80 + { "d", "D", XK_d, 1 }, 7.81 + { "f", "F", XK_f, 1 }, 7.82 + { "g", "G", XK_g, 1 }, 7.83 + { "h", "H", XK_h, 1 }, 7.84 + { "j", "J", XK_j, 1 }, 7.85 + { "k", "K", XK_k, 1 }, 7.86 + { "l", "L", XK_l, 1 }, 7.87 + { "m", "M", XK_m, 1 }, 7.88 + { "ù", "%", XK_ugrave, 1 }, 7.89 + { "*", "µ", XK_multiply, 1 }, 7.90 + { "\\", "|", XK_backslash, 1 }, 7.91 { 0 }, /* New row */ 7.92 - { 0, XK_Shift_L, 3 }, 7.93 - { "wW", XK_w, 1 }, 7.94 - { "xX", XK_x, 1 }, 7.95 - { "cC", XK_c, 1 }, 7.96 - { "vV", XK_v, 1 }, 7.97 - { "bB", XK_b, 1 }, 7.98 - { "nN", XK_n, 1 }, 7.99 - { ",?", XK_comma, 1 }, 7.100 - { ";.", XK_semicolon, 1 }, 7.101 - { ":/", XK_colon, 1 }, 7.102 - { "!§", XK_exclam, 1 }, 7.103 - { 0, XK_Shift_R, 2 }, 7.104 + { 0, 0, XK_Shift_L, 2 }, 7.105 + { "w", "W", XK_w, 1 }, 7.106 + { "x", "X", XK_x, 1 }, 7.107 + { "c", "C", XK_c, 1 }, 7.108 + { "v", "V", XK_v, 1 }, 7.109 + { "b", "B", XK_b, 1 }, 7.110 + { "n", "N", XK_n, 1 }, 7.111 + { ",", "?", XK_comma, 1 }, 7.112 + { ";", ".", XK_semicolon, 1 }, 7.113 + { ":", "/", XK_colon, 1 }, 7.114 + { "!", "§", XK_exclam, 1 }, 7.115 + { 0, 0, XK_Shift_R, 2 }, 7.116 { 0 }, /* New row */ 7.117 - { "Ctrl", XK_Control_L, 2 }, 7.118 - { "Alt", XK_Alt_L, 2 }, 7.119 - { "", XK_space, 5 }, 7.120 - { "Alt", XK_Alt_R, 2 }, 7.121 - { "Ctrl", XK_Control_R, 2 }, 7.122 - { "[X]", XK_Cancel, 1}, 7.123 + { "Ctrl", 0, XK_Control_L, 2 }, 7.124 + { "Alt", 0, XK_Alt_L, 2 }, 7.125 + { "", 0, XK_space, 5 }, 7.126 + { "Alt", 0, XK_Alt_R, 2 }, 7.127 + { "Ctrl", 0, XK_Control_R, 2 }, 7.128 + { "[X]", 0, XK_Cancel, 1}, 7.129 }; 7.130 7.131 Buttonmod buttonmods[] = { 7.132 @@ -69,3 +70,17 @@ 7.133 { XK_Alt_L, Button3 }, 7.134 }; 7.135 7.136 +#define OVERLAYS 1 7.137 +static Key overlay[OVERLAYS] = { 7.138 + { 0, 0, XK_Cancel }, 7.139 +}; 7.140 + 7.141 +#define LAYERS 1 7.142 +static char* layer_names[LAYERS] = { 7.143 + "fr", 7.144 +}; 7.145 + 7.146 +static Key* available_layers[LAYERS] = { 7.147 + keys_fr, 7.148 +}; 7.149 +