debian/0000755000000000000000000000000011534560075007174 5ustar debian/rules0000755000000000000000000000343211354150214010244 0ustar #!/usr/bin/make -f # -*- makefile -*- DEB_DESTDIR = $(CURDIR)/debian/tmp CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 endif ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) confflags += --build=$(DEB_HOST_GNU_TYPE) else confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) endif build: dh_testdir $(MAKE) clean: dh_testdir dh_testroot rm -f *.o literki dh_clean install: build dh_testdir dh_testroot dh_clean dh_installdirs mkdir -p debian/tmp/usr/share/pixmaps cp -a literki.png debian/tmp/usr/share/pixmaps/ mkdir -p debian/tmp/etc/literki cp -a landscape_layout.conf layout.conf literki.conf debian/tmp/etc/literki/ mkdir -p debian/tmp/usr/share/literki cp -a png debian/tmp/usr/share/literki/ mkdir -p debian/tmp/usr/share/applications cp -a literki.desktop debian/tmp/usr/share/applications/ mkdir -p debian/tmp/usr/bin cp -a literki debian/tmp/usr/bin/ # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installman debian/literki.1 dh_installdocs dh_installchangelogs dh_install --sourcedir=debian/tmp --list-missing dh_link dh_strip dh_compress dh_fixperms dh_installdeb dh_shlibdeps -- --warnings=6 dh_gencontrol dh_md5sums dh_builddeb # Build architecture-independent files here. binary-indep: build install # Nothing to do binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install debian/control0000644000000000000000000000177511534542013010601 0ustar Source: literki Section: embedded Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian freesmartphone.org Team Uploaders: Timo Jyrinki Build-Depends: debhelper (>= 7), libfreetype6-dev, libpng12-dev, libfakekey-dev, libxi-dev, libxcb1-dev, libxrender-dev, libxrandr-dev, libpng++-dev Standards-Version: 3.8.4 Homepage: http://git.senfdax.de/?p=literki Vcs-Git: http://git.debian.org/git/pkg-fso/literki.git Vcs-Browser: http://git.debian.org/?p=pkg-fso/literki.git Package: literki Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Keyboard with configurable layout and transparency Literki is a full qwerty keyboard with configurable layout and always-on functionality by usage of transparency. Applications do not need to redraw and popping up the keyboard is therefore very fast. . In addition to keyboard, literki comes with touchpad and scroll buttons. debian/patches/0000755000000000000000000000000011534560166010624 5ustar debian/patches/05_fix_ftbfs_binutils-gold.diff0000644000000000000000000000152111534560020016554 0ustar Description: FTBFS with binutils-gold and linking --no-add-needed. LIBS moved at the end of line and added missing library -lfreetype. Bug-Debian: http://bugs.debian.org/616624 Forwarded: yes Author: Artur Rona --- literki-0.0.0+20100113.git1da40724.orig/Makefile +++ literki-0.0.0+20100113.git1da40724/Makefile @@ -1,6 +1,6 @@ PLIKI=display.o keymap.o keys.o keyboard.o applet.o launcher.o logger.o slider.o image_cache.o touchpad.o switcher.o vibrator.o -LIBS=-lX11 -lXext -lXtst -lpthread -lXrandr -lpng -lfakekey +LIBS=-lX11 -lXext -lXtst -lpthread -lXrandr -lpng -lfakekey -lfreetype CXXCOMPILE=g++ @@ -11,7 +11,7 @@ LDFLAGS=-g `freetype-config --libs` $(CXXCOMPILE) $(CFLAGS) -c $< all: $(PLIKI) - g++ $(LIBS) $(LDFLAGS) -o literki $(PLIKI) + g++ $(LDFLAGS) -o literki $(PLIKI) $(LIBS) clean: rm *.o debian/patches/series0000644000000000000000000000015011534560166012035 0ustar 01_fix_font_directory.diff 03_use_system_png++.diff 04_fix_desktop.diff 05_fix_ftbfs_binutils-gold.diff debian/patches/02_optional_reduce_to_plain_keyboard.diff0000644000000000000000000000703211352662515020701 0ustar diff --git a/keys.cpp b/keys.cpp index 9a84a54..035cc58 100644 --- a/keys.cpp +++ b/keys.cpp @@ -224,10 +224,12 @@ int main(int argc, char* argv[]) LOG(INFO) << "Creating keyboard"; Keyboard keyboard(params, config.hor_layout_filename, config.layout_filename, key_colors); +/* LOG(INFO) << "Creating switcher"; Switcher switcher(switcher_params, "apps_icon", "phone_icon", "launch_icon"); switcher.SetBackground(display.MakeXColor(0,0,0)); switcher.SetForeground(display.MakeXColor(200,200,200)); +*/ keyboard.SetBackground(display.MakeXColor(0,0,0)); keyboard.SetForeground(display.MakeXColor(255,255,255)); keyboard.SetVibrator(&vibrator); @@ -239,7 +241,7 @@ int main(int argc, char* argv[]) slider.AddAction(Slider::SLIDE_N, "keyboard_show"); slider.AddAction(Slider::SLIDE_E, "$win_ctrl1"); slider.AddAction(Slider::SLIDE_W, "$win_ctrl2"); - +/* LOG(INFO) << "Creating touchpad"; Touchpad touchpad(touchpad_params, "pointer", config.touchpad_sensivity); touchpad.SetBackground(display.MakeXColor(0,0,0)); @@ -264,13 +266,14 @@ int main(int argc, char* argv[]) slider4.SetBackground(display.MakeXColor(0,0,1)); slider4.SetTransparent(true); slider4.AddAction(Slider::SLIDE_S, "switcher_show"); - +*/ LOG(INFO) << "Setting position and orientation"; keyboard.SetPosition(Applet::SOUTH); slider.SetPosition(Applet::SOUTH_EAST); Applet::Rotation rot = (display.Width() <= 480) ? Applet::PORTRAIT : Applet::LANDSCAPE; keyboard.WindowRotate(rot); slider.WindowRotate(rot); +/* touchpad.SetPosition(Applet::SOUTH); touchpad.WindowRotate(rot); touchpad.Hide(); @@ -282,22 +285,24 @@ int main(int argc, char* argv[]) slider3.WindowRotate(rot); slider4.SetPosition(Applet::NORTH_EAST); slider4.WindowRotate(rot); - +*/ LOG(INFO) << "Loading keyboard layout"; LOG(INFO) << "Showing keyboard"; keyboard.SetTransparent(true); keyboard.Hide(); - switcher.Hide(); +// switcher.Hide(); slider.Show(); - slider2.Show(); - slider3.Show(); +// slider2.Show(); +// slider3.Show(); if (config.switcher_on) - slider4.Show(); + { +// slider4.Show(); + } else - slider4.Hide(); +// slider4.Hide(); int bpressx=-1, bpressy=-1; @@ -305,12 +310,14 @@ int main(int argc, char* argv[]) vector applets; applets.push_back(&keyboard); applets.push_back(&slider); +/* applets.push_back(&slider2); applets.push_back(&slider3); if (config.switcher_on) applets.push_back(&slider4); applets.push_back(&touchpad); applets.push_back(&switcher); +*/ LOG(INFO) << "Processing events"; @@ -384,28 +391,28 @@ int main(int argc, char* argv[]) } if (action == "slider_show"){ slider.Show(); - slider2.Show(); +// slider2.Show(); } else if (action == "top_slider_show"){ - slider3.Show(); - slider4.Show(); +// slider3.Show(); +// slider4.Show(); } else if (action == "keyboard_show"){ keyboard.Show(); keyboard.Refresh(); slider.Hide(); - slider2.Hide(); +// slider2.Hide(); } else if (action == "switcher_show"){ LOG(INFO) << "Switcher"; - switcher.Show(); - slider3.Hide(); - slider4.Hide(); +// switcher.Show(); +// slider3.Hide(); +// slider4.Hide(); } else if (action == "touchpad_show"){ - touchpad.Show(); +// touchpad.Show(); slider.Hide(); - slider2.Hide(); +// slider2.Hide(); } else display.GenKeyEvent(action); debian/patches/03_use_system_png++.diff0000644000000000000000000000120611352656366015157 0ustar diff --git a/display.h b/display.h index 117f880..71399dc 100644 --- a/display.h +++ b/display.h @@ -9,8 +9,8 @@ #include #include -#include "png++/image.hpp" -#include "png++/rgb_pixel.hpp" +#include +#include #include diff --git a/image_cache.h b/image_cache.h index 93da204..24d4af9 100644 --- a/image_cache.h +++ b/image_cache.h @@ -4,8 +4,8 @@ #include #include -#include "png++/image.hpp" -#include "png++/rgb_pixel.hpp" +#include +#include typedef png::image PngImage; debian/patches/04_fix_desktop.diff0000644000000000000000000000052411353101312014260 0ustar diff --git a/literki.desktop b/literki.desktop index 52b7e10..c230ef9 100644 --- a/literki.desktop +++ b/literki.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Literki Comment=Hacker's keyboard -Exec=if [ "`ps -A | grep literki`" = "" ]; then literki; else killall literki; fi +Exec=literki Icon=literki Terminal=false Type=Application debian/patches/01_fix_font_directory.diff0000644000000000000000000000053411352662515015657 0ustar diff --git a/literki.conf b/literki.conf index 3322509..c2f75bf 100644 --- a/literki.conf +++ b/literki.conf @@ -44,7 +44,7 @@ trans_key_color color 10 10 10 color 240 240 240 -font_path /usr/share/fonts/truetype/DejaVuSans-Bold.ttf +font_path /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf font_size 20 touchpad_sensivity 0.07 debian/changelog0000644000000000000000000000134611534560075011052 0ustar literki (0.0.0+20100113.git1da40724-1ubuntu1) natty; urgency=low * debian/patches/05_fix_ftbfs_binutils-gold.diff: - Fix FTBFS with binutils-gold / --no-add-needed. (Closes: #616624) -- Artur Rona Sun, 06 Mar 2011 00:15:11 +0100 literki (0.0.0+20100113.git1da40724-1) unstable; urgency=low * Initial release for main archive. Closes: #575441. * 01_fix_font_directory.diff - fix to Debian font dir hierarchy * 03_use_system_png++.diff - patch to depend on system png++ dev library * 04_fix_desktop.diff - fix .desktop file * offer optional patch of disabling touchpad * pkg-fso as the maintainer * Write and provide man page -- Timo Jyrinki Mon, 29 Mar 2010 19:35:41 +0200 debian/layout.conf.fi0000644000000000000000000000725411352662515011765 0ustar key 136 139 84 43 normal space.png $space shift space.png $space fn space.png $space key 346 93 84 43 normal return.png $return shift return.png $return fn return.png $return key 10 -43 42 43 normal 1 1 shift ! ! key 52 -43 42 43 normal 2 2 shift @ @ key 94 -43 42 43 normal 3 3 shift # # key 136 -43 42 43 normal 4 4 shift $ $ key 178 -43 42 43 normal 5 5 shift % % key 220 -43 42 43 normal 6 6 shift ^ ^ key 262 -43 42 43 normal 7 7 shift & & key 304 -43 42 43 normal 8 8 shift * * key 346 -43 42 43 normal 9 9 shift ( ( fn ö ö key 388 -43 42 43 normal 0 0 shift ) ) fn Ö Ö key 10 3 42 43 normal q q shift Q Q fn 1 1 key 52 3 42 43 normal w w shift W W fn 2 2 key 94 3 42 43 normal e e shift E E fn € € key 136 3 42 43 normal r r shift R R fn 4 4 key 178 3 42 43 normal t t shift T T fn 5 5 key 220 3 42 43 normal y y shift Y Y fn 6 6 key 262 3 42 43 normal u u shift U U fn 7 7 key 304 3 42 43 normal i i shift I I fn 8 8 key 346 3 42 43 normal o o shift O O fn 9 9 key 388 3 42 43 normal p p shift P P fn 0 0 key 10 48 42 43 normal a a shift A A fn _ _ key 52 48 42 43 normal s s shift S S fn ( ( key 94 48 42 43 normal d d shift D D fn ) ) key 136 48 42 43 normal f f shift F F fn < < key 178 48 42 43 normal g g shift G G fn > > key 220 48 42 43 normal h h shift H H fn % % key 262 48 42 43 normal j j shift J J fn # # key 304 48 42 43 normal k k shift K K fn @ @ key 346 48 42 43 normal l l shift L L fn ! ! key 346 139 84 43 normal fn.png $is_fn shift fn.png $is_fn fn fn.png $is_fn key 10 93 42 43 normal shift.png $is_shift shift caps.png $is_capslock capslock caps.png $is_capslock key 10 93 42 43 fn = = key 52 93 42 43 normal z z shift Z Z fn [ [ key 94 93 42 43 normal x x shift X X fn ] ] key 136 93 42 43 normal c c shift C C fn + + key 178 93 42 43 normal v v shift V V fn - - key 220 93 42 43 normal b b shift B B fn & & key 262 93 42 43 normal n n shift N N fn key_up.png $key_up key 304 93 42 43 normal m m shift M M fn $ $ key 388 48 42 43 normal ä ä shift Ä Ä fn ` ` key 94 139 42 43 normal " " shift ? ? fn | | key 136 139 42 43 fn ~ ~ key 220 139 42 43 normal : : shift ; ; fn key_left.png $key_left key 262 139 42 43 normal . . shift , , fn key_down.png $key_down key 304 139 42 43 normal / / shift \ \ fn key_right.png $key_right key 52 -89 42 43 normal home.png $home shift home.png $home fn home.png $home key 94 -89 42 43 normal end.png $end shift end.png $end fn end.png $end key 136 -89 42 43 fn escape.png $win_ctrl_close key 52 139 42 43 normal alt.png $is_alt shift alt.png $is_alt fn alt.png $is_alt key 10 139 42 43 normal ctrl.png $is_ctrl shift ctrl.png $is_ctrl fn ctrl.png $is_ctrl key 10 -89 42 43 normal tab.png $tab shift tab.png $tab fn escape.png $escape key 346 -89 84 43 normal backspace.png $backspace shift backspace.png $backspace fn backspace.png $backspace key 220 -89 42 43 normal toggle_bkground.png $toggle_bkground shift toggle_bkground.png $toggle_bkground key 262 -89 42 43 normal change_color.png $change_color shift change_color.png $change_color debian/compat0000644000000000000000000000000211352662515010372 0ustar 7 debian/literki.10000644000000000000000000000202111354150205010702 0ustar .\"Text automatically generated by txt2man .TH literki 1 "29 March 2010" "" "" .SH NAME \fBliterki \fP- on-screen keyboard \fB .SH SYNOPSIS .nf .fam C \fBliterki\fP [\fIconfiguration_file\fP] .fam T .fi .fam T .fi .SH DESCRIPTION \fBliterki\fP is an on-screen keyboard with configurable layout and transparency. It is designed for touch screen devices and has a full qwerty keyboard and always-on functionality by usage of transparency. Applications do not need to redraw windows when \fBliterki\fP is shown, and popping up the keyboard is very fast because \fBliterki\fP is always in the backround. .PP In addition to keyboard, \fBliterki\fP comes with touchpad and scroll buttons. .PP .TP configuration_file An alternative configuration file to use instead of the default. .SH FILES .TP /etc/literki/literki.conf General configuration. .TP /etc/literki/layout.conf Layout for portrait mode. .TP /etc/literki/landscape_layout.conf Layout for landscape mode. .SH AUTHOR \fBliterki\fP was written by Michal Brzozowski . debian/README.source0000644000000000000000000000033711353066063011353 0ustar literki for Debian ------------------ Source includes a copy of BSD-licensed png++ library from http://www.nongnu.org/pngpp/ png++ is now available in Debian, and the system version is used instead of the bundled one. debian/copyright0000644000000000000000000001063511371003544011124 0ustar This work was packaged for Debian by: Timo Jyrinki on Mon, 08 Feb 2010 14:22:11 +0200 It was downloaded from http://git.senfdax.de/?p=literki Upstream Author(s): Michal Brzozowski Copyright: Copyright (C) 2009-2010 Michal Brzozowski License: This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2 file. png++ library is copyright Alexander Shulgin alex.shulgin@gmail.com and licensed under BSD like license as follows: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Protocol Buffers - Google's data interchange format under external/ directory is Copyright 2008 Google Inc. All rights reserved, but available under BSD like license as follows: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of Google Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Author: kenton@google.com (Kenton Varda) and others Modified by Michal Brzozowski to support non-void callbacks. The Debian packaging is: Copyright (C) 2010 Timo Jyrinki and is licensed under the GPL version 2, see `/usr/share/common-licenses/GPL-2'. debian/source/0000755000000000000000000000000011352662515010474 5ustar debian/source/format0000644000000000000000000000001411352662515011702 0ustar 3.0 (quilt) debian/literki.install0000644000000000000000000000005211352662515012224 0ustar usr/share/* usr/bin/literki etc/literki/*