# HG changeset patch # User Hans-G?nter Theisgen # Date 1658654525 -3600 # Node ID 1801955a1d6da77f890d7b6b17d42fbbf561787e # Parent b8412c979a498042deb9f1f3925c6b84b924b422 updated svkbd packages ( -> 0.4.1) diff -r b8412c979a49 -r 1801955a1d6d svkbd-de/receipt --- a/svkbd-de/receipt Sat Jul 23 20:18:41 2022 +0100 +++ b/svkbd-de/receipt Sun Jul 24 10:22:05 2022 +0100 @@ -1,21 +1,21 @@ # SliTaz package receipt. PACKAGE="svkbd-de" -BRANCH="a5b40479e354ce11a1b009492da65ea562070cba" -VERSION=${BRANCH:0:7} +VERSION="0.4.1" CATEGORY="x-window" -SHORT_DESC="Simple virtual keyboard that suck less (DE Layout)." +SHORT_DESC="Simple virtual keyboard that suck less (german layout)." MAINTAINER="pankso@slitaz.org" LICENSE="BSD" -WEB_SITE="http://tools.suckless.org/x/svkbd/" +WEB_SITE="https://tools.suckless.org/x/svkbd/" + +DEPENDS="xorg-libX11 xorg-libXtst" +WANTED="svkbd" + HOST_ARCH="i486 arm" -WANTED="svkbd" -DEPENDS="xorg-libX11 xorg-libXtst" - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/bin/ - cp -a ${install}/usr/bin/${PACKAGE} $fs/usr/bin + mkdir -p $fs/usr/bin + cp -a ${install}/usr/bin/${PACKAGE} $fs/usr/bin } diff -r b8412c979a49 -r 1801955a1d6d svkbd-fr/receipt --- a/svkbd-fr/receipt Sat Jul 23 20:18:41 2022 +0100 +++ b/svkbd-fr/receipt Sun Jul 24 10:22:05 2022 +0100 @@ -1,21 +1,21 @@ # SliTaz package receipt. PACKAGE="svkbd-fr" -BRANCH="a5b40479e354ce11a1b009492da65ea562070cba" -VERSION=${BRANCH:0:7} +VERSION="0.4.1" CATEGORY="x-window" -SHORT_DESC="Simple virtual keyboard that suck less (FR Layout)." +SHORT_DESC="Simple virtual keyboard that suck less (french layout)." MAINTAINER="pankso@slitaz.org" LICENSE="BSD" -WEB_SITE="http://tools.suckless.org/x/svkbd/" +WEB_SITE="https://tools.suckless.org/x/svkbd/" + +DEPENDS="xorg-libX11 xorg-libXtst" +WANTED="svkbd" + HOST_ARCH="i486 arm" -WANTED="svkbd" -DEPENDS="xorg-libX11 xorg-libXtst" - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/bin/ - cp -a ${install}/usr/bin/${PACKAGE} $fs/usr/bin + mkdir -p $fs/usr/bin + cp -a ${install}/usr/bin/${PACKAGE} $fs/usr/bin } diff -r b8412c979a49 -r 1801955a1d6d svkbd-ru/receipt --- a/svkbd-ru/receipt Sat Jul 23 20:18:41 2022 +0100 +++ b/svkbd-ru/receipt Sun Jul 24 10:22:05 2022 +0100 @@ -1,21 +1,21 @@ # SliTaz package receipt. PACKAGE="svkbd-ru" -BRANCH="a5b40479e354ce11a1b009492da65ea562070cba" -VERSION=${BRANCH:0:7} +VERSION="0.4.1" CATEGORY="x-window" -SHORT_DESC="Simple virtual keyboard that suck less (RU Layout)." +SHORT_DESC="Simple virtual keyboard that suck less (russian layout)." MAINTAINER="pankso@slitaz.org" LICENSE="BSD" -WEB_SITE="http://tools.suckless.org/x/svkbd/" +WEB_SITE="https://tools.suckless.org/x/svkbd/" + +DEPENDS="xorg-libX11 xorg-libXtst" +WANTED="svkbd" + HOST_ARCH="i486 arm" -WANTED="svkbd" -DEPENDS="xorg-libX11 xorg-libXtst" - # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/bin/ - cp -a ${install}/usr/bin/${PACKAGE} $fs/usr/bin + mkdir -p $fs/usr/bin + cp -a ${install}/usr/bin/${PACKAGE} $fs/usr/bin } diff -r b8412c979a49 -r 1801955a1d6d svkbd/description.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/svkbd/description.txt Sun Jul 24 10:22:05 2022 +0100 @@ -0,0 +1,2 @@ +This is a simple virtual keyboard, intended to be used +in environments, where no keyboard is available. diff -r b8412c979a49 -r 1801955a1d6d svkbd/receipt --- a/svkbd/receipt Sat Jul 23 20:18:41 2022 +0100 +++ b/svkbd/receipt Sun Jul 24 10:22:05 2022 +0100 @@ -1,19 +1,20 @@ # SliTaz package receipt. PACKAGE="svkbd" -BRANCH="a5b40479e354ce11a1b009492da65ea562070cba" -VERSION=${BRANCH:0:7} +VERSION="0.4.1" CATEGORY="x-window" -SHORT_DESC="Simple virtual keyboard that suck less (EN Layout)." +SHORT_DESC="Simple virtual keyboard that suck less (english layout)." MAINTAINER="pankso@slitaz.org" LICENSE="BSD" -TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="http://tools.suckless.org/x/svkbd/" -WGET_URL="git|git://git.suckless.org/svkbd" -HOST_ARCH="i486 arm" +WEB_SITE="https://tools.suckless.org/x/svkbd/" + +TARBALL="$PACKAGE-$VERSION.tar.gz" +WGET_URL="https://dl.suckless.org/tools/$TARBALL" DEPENDS="xorg-libX11 xorg-libXtst" -BUILD_DEPENDS="xorg-libX11-dev xorg-libXtst-dev" +BUILD_DEPENDS="fontconfig-dev libxml2-dev xorg-libX11-dev xorg-libXtst-dev" + +HOST_ARCH="i486 arm" # What is the latest version available today? current_version() @@ -24,20 +25,25 @@ # Rules to configure and make the package. compile_rules() -{ +{ cp -d ${stuff}/*.h . - for layout in de en ru fr - do - make svkbd-${layout} CC=${HOST_SYSTEM}-gcc || return 1 - done + + for layout in de en fr ru + do + make LAYOUT=$layout \ + CC=$HOST_SYSTEM-gcc || return 1 + make install \ + LAYOUT=$layout \ + DESTDIR=${DESTDIR} \ + PREFIX="/usr" + done # We may need to sed config.def.h to set correct font for RU ??? #make svkbd-ru CC=${HOST_SYSTEM}-gcc - make install DESTDIR=${DESTDIR} PREFIX="/usr" } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/bin - cp -a ${install}/usr/bin/${PACKAGE}-en $fs/usr/bin + cp -a $install/usr/bin/$PACKAGE-en $fs/usr/bin } diff -r b8412c979a49 -r 1801955a1d6d svkbd/stuff/config.def.h --- a/svkbd/stuff/config.def.h Sat Jul 23 20:18:41 2022 +0100 +++ b/svkbd/stuff/config.def.h Sun Jul 24 10:22:05 2022 +0100 @@ -1,9 +1,28 @@ static const Bool wmborder = True; -static const char font[] = "-misc-fixed-medium-r-semicondensed--0-0-75-75-c-0-iso8859-1"; -static const char normbgcolor[] = "#dfdfdf"; -static const char normfgcolor[] = "#000000"; -static const char pressbgcolor[] = "#111111"; -static const char pressfgcolor[] = "#ffffff"; -static const char highlightbgcolor[] = "#111111"; -static const char highlightfgcolor[] = "#ffffff"; +static int fontsize = 22; +static double overlay_delay = 1.0; //in seconds +static double repeat_delay = 0.75; //in seconds, will not work on keys with overlays +static int scan_rate = 50; //scan rate in microseconds, affects key repetition rate +static int heightfactor = 14; //one row of keys takes up 1/x of the screen height +static int xspacing = 5; +static int yspacing = 5; +static const char *defaultfonts[] = { + "DejaVu Sans:bold:size=22" +}; +static const char *defaultcolors[SchemeLast][2] = { + /* fg bg */ + [SchemeNorm] = { "#000000", "#dfdfdf" }, + [SchemeNormShift] = { "#008ac0", "#132a33" }, + [SchemeNormABC] = { "#ffffff", "#14313d" }, + [SchemeNormABCShift] = { "#008ac0", "#14313d" }, + [SchemePress] = { "#ffffff", "#111111" }, + [SchemePressShift] = { "#00c001", "#259937" }, + [SchemeHighlight] = { "#ffffff", "#111111" }, + [SchemeHighlightShift] = { "#008ac0", "#005577" }, + [SchemeOverlay] = { "#ffffff", "#2b3313" }, + [SchemeOverlayShift] = { "#008ac0", "#2b3313" }, + [SchemeWindow] = { "#bbbbbb", "#132a33" }, +}; +/* static const char font[] = "-misc-fixed-medium-r-semicondensed--0-0-75-75-c-0-iso8859-1"; */ + diff -r b8412c979a49 -r 1801955a1d6d svkbd/stuff/layout.fr.h --- a/svkbd/stuff/layout.fr.h Sat Jul 23 20:18:41 2022 +0100 +++ b/svkbd/stuff/layout.fr.h Sun Jul 24 10:22:05 2022 +0100 @@ -1,67 +1,68 @@ -static Key keys[] = { - { "&1", XK_ampersand, 1 }, - { "é2~", XK_eacute, 1 }, - { "\"3#", XK_quotedbl, 1 }, - { "'4{", XK_apostrophe, 1 }, - { "(5[", XK_parenleft, 1 }, - { "-6|", XK_minus, 1 }, - { "é7`", XK_egrave, 1 }, - { "_8\\", XK_underscore, 1 }, - { "ç9^", XK_cedilla, 1 }, - { "à0@", XK_agrave, 1 }, - { ")°]", XK_parenright, 1 }, - { "=+}", XK_equal, 1 }, - { "<-", XK_BackSpace, 2 }, +#define KEYS 63 +static Key keys_fr[KEYS] = { + { "&", "1", XK_ampersand, 1 }, + { "é", "2~", XK_eacute, 1 }, + { "\"", "3#", XK_quotedbl, 1 }, + { "'", "4{", XK_apostrophe, 1 }, + { "(", "5[", XK_parenleft, 1 }, + { "-", "6|", XK_minus, 1 }, + { "é", "7`", XK_egrave, 1 }, + { "_", "8\\", XK_underscore, 1 }, + { "ç", "9^", XK_cedilla, 1 }, + { "à", "0@", XK_agrave, 1 }, + { ")", "°]", XK_parenright, 1 }, + { "=", "+}", XK_equal, 1 }, + { "<-", 0, XK_BackSpace, 2 }, { 0 }, /* New row */ - { "->|", XK_Tab, 1 }, - { "aA", XK_a, 1 }, - { "zZ", XK_z, 1 }, - { "eE€", XK_e, 1 }, - { "rR", XK_r, 1 }, - { "tT", XK_t, 1 }, - { "yY", XK_y, 1 }, - { "uU", XK_u, 1 }, - { "iI", XK_i, 1 }, - { "oO", XK_o, 1 }, - { "pP", XK_p, 1 }, - { "^", XK_dead_circumflex, 1 }, - { "$£¤", XK_dollar, 1 }, - { "Return", XK_Return, 3 }, + { "-", ">|", XK_Tab, 1 }, + { "a", "A", XK_a, 1 }, + { "z", "Z", XK_z, 1 }, + { "e", "E€", XK_e, 1 }, + { "r", "R", XK_r, 1 }, + { "t", "T", XK_t, 1 }, + { "y", "Y", XK_y, 1 }, + { "u", "U", XK_u, 1 }, + { "i", "I", XK_i, 1 }, + { "o", "O", XK_o, 1 }, + { "p", "P", XK_p, 1 }, + { "^", "", XK_dead_circumflex, 1 }, + { "$", "£¤", XK_dollar, 1 }, + { "Return", 0, XK_Return, 3 }, { 0 }, /* New row */ - { 0, XK_Caps_Lock, 2 }, - { "qQ", XK_q, 1 }, - { "sS", XK_s, 1 }, - { "dD", XK_d, 1 }, - { "fF", XK_f, 1 }, - { "gG", XK_g, 1 }, - { "hH", XK_h, 1 }, - { "jJ", XK_j, 1 }, - { "kK", XK_k, 1 }, - { "lL", XK_l, 1 }, - { "mM", XK_m, 1 }, - { "ù%", XK_ugrave, 1 }, - { "*µ", XK_multiply, 1 }, - { "\\|", XK_backslash, 1 }, + { 0, 0, XK_Caps_Lock, 2 }, + { "q", "Q", XK_q, 1 }, + { "s", "S", XK_s, 1 }, + { "d", "D", XK_d, 1 }, + { "f", "F", XK_f, 1 }, + { "g", "G", XK_g, 1 }, + { "h", "H", XK_h, 1 }, + { "j", "J", XK_j, 1 }, + { "k", "K", XK_k, 1 }, + { "l", "L", XK_l, 1 }, + { "m", "M", XK_m, 1 }, + { "ù", "%", XK_ugrave, 1 }, + { "*", "µ", XK_multiply, 1 }, + { "\\", "|", XK_backslash, 1 }, { 0 }, /* New row */ - { 0, XK_Shift_L, 3 }, - { "wW", XK_w, 1 }, - { "xX", XK_x, 1 }, - { "cC", XK_c, 1 }, - { "vV", XK_v, 1 }, - { "bB", XK_b, 1 }, - { "nN", XK_n, 1 }, - { ",?", XK_comma, 1 }, - { ";.", XK_semicolon, 1 }, - { ":/", XK_colon, 1 }, - { "!§", XK_exclam, 1 }, - { 0, XK_Shift_R, 2 }, + { 0, 0, XK_Shift_L, 2 }, + { "w", "W", XK_w, 1 }, + { "x", "X", XK_x, 1 }, + { "c", "C", XK_c, 1 }, + { "v", "V", XK_v, 1 }, + { "b", "B", XK_b, 1 }, + { "n", "N", XK_n, 1 }, + { ",", "?", XK_comma, 1 }, + { ";", ".", XK_semicolon, 1 }, + { ":", "/", XK_colon, 1 }, + { "!", "§", XK_exclam, 1 }, + { 0, 0, XK_Shift_R, 2 }, { 0 }, /* New row */ - { "Ctrl", XK_Control_L, 2 }, - { "Alt", XK_Alt_L, 2 }, - { "", XK_space, 5 }, - { "Alt", XK_Alt_R, 2 }, - { "Ctrl", XK_Control_R, 2 }, - { "[X]", XK_Cancel, 1}, + { "Ctrl", 0, XK_Control_L, 2 }, + { "Alt", 0, XK_Alt_L, 2 }, + { "", 0, XK_space, 5 }, + { "Alt", 0, XK_Alt_R, 2 }, + { "Ctrl", 0, XK_Control_R, 2 }, + { "[X]", 0, XK_Cancel, 1}, }; Buttonmod buttonmods[] = { @@ -69,3 +70,17 @@ { XK_Alt_L, Button3 }, }; +#define OVERLAYS 1 +static Key overlay[OVERLAYS] = { + { 0, 0, XK_Cancel }, +}; + +#define LAYERS 1 +static char* layer_names[LAYERS] = { + "fr", +}; + +static Key* available_layers[LAYERS] = { + keys_fr, +}; +