diff options
| -rw-r--r-- | AUTHORS | 0 | ||||
| -rw-r--r-- | COPYING | 340 | ||||
| -rw-r--r-- | ChangeLog | 0 | ||||
| -rw-r--r-- | INSTALL | 229 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | NEWS | 0 | ||||
| -rw-r--r-- | README | 0 | ||||
| -rwxr-xr-x | autogen.sh | 3 | ||||
| -rw-r--r-- | configure.ac | 182 | ||||
| -rw-r--r-- | src/Makefile.am | 21 | ||||
| -rw-r--r-- | src/config-parser.c | 343 | ||||
| -rw-r--r-- | src/config.xml | 45 | ||||
| -rw-r--r-- | src/matchbox-keyboard-defs.c | 1 | ||||
| -rw-r--r-- | src/matchbox-keyboard-key.c | 152 | ||||
| -rw-r--r-- | src/matchbox-keyboard-layout.c | 38 | ||||
| -rw-r--r-- | src/matchbox-keyboard-row.c | 29 | ||||
| -rw-r--r-- | src/matchbox-keyboard-ui.c | 62 | ||||
| -rw-r--r-- | src/matchbox-keyboard.c | 51 | ||||
| -rw-r--r-- | src/matchbox-keyboard.h | 182 | ||||
| -rw-r--r-- | src/util-list.c | 53 | ||||
| -rw-r--r-- | src/util-list.h | 6 | ||||
| -rw-r--r-- | src/util.c | 19 |
22 files changed, 1760 insertions, 0 deletions
@@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 of the License, 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. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,229 @@ +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software +Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + These are generic installation instructions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. (Caching is +disabled by default to prevent problems with accidental use of stale +cache files.) + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. If you're + using `csh' on an old version of System V, you might need to type + `sh ./configure' instead to prevent `csh' from trying to execute + `configure' itself. + + Running `configure' takes awhile. While running, it prints some + messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you must use a version of `make' that +supports the `VPATH' variable, such as GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + If you have to use a `make' that does not support the `VPATH' +variable, you have to compile the package for one architecture at a +time in the source code directory. After you have installed the +package for one architecture, use `make distclean' before reconfiguring +for another architecture. + +Installation Names +================== + + By default, `make install' will install the package's files in +`/usr/local/bin', `/usr/local/man', etc. You can specify an +installation prefix other than `/usr/local' by giving `configure' the +option `--prefix=PATH'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +give `configure' the option `--exec-prefix=PATH', the package will use +PATH as the prefix for installing programs and libraries. +Documentation and other data files will still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=PATH' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the `--target=TYPE' option to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +will cause the specified gcc to be used as the C compiler (unless it is +overridden in the site shell script). + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of the options to `configure', and exit. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..31af503 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS = src + +snapshot: + $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..b1376df --- /dev/null +++ b/autogen.sh @@ -0,0 +1,3 @@ +#! /bin/sh +autoreconf -v --install || exit 1 +./configure --enable-maintainer-mode "$@" diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..5fa2192 --- /dev/null +++ b/configure.ac @@ -0,0 +1,182 @@ +AC_PREREQ(2.53) +AC_INIT([matchbox-keyboard], 0.0.0, [mallum@handhelds.org]) +AC_CONFIG_SRCDIR([src/matchbox-keyboard.c]) + +AM_INIT_AUTOMAKE() +AM_MAINTAINER_MODE +AM_CONFIG_HEADER([config.h]) + +# Checks for programs. +AC_GNU_SOURCE +AC_PROG_CC +AC_HEADER_DIRENT +AC_HEADER_STDC + +# Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_TYPE_PID_T +AC_HEADER_TIME + +# Checks for library functions. +AC_FUNC_ALLOCA +AC_FUNC_CLOSEDIR_VOID +AC_FUNC_FORK +AC_FUNC_SELECT_ARGTYPES +AC_TYPE_SIGNAL +AC_FUNC_STAT + +AC_ARG_ENABLE(debug, + [ --enable-debug enable debug ( verbose ) build], + enable_debug=$enableval, enable_debug=no ) + +AC_ARG_WITH(expat-includes, + [ --with-expat-includes=DIR Use Expat includes in DIR], + expat_includes=$withval, expat_includes=yes) + +AC_ARG_WITH(expat-lib, + [ --with-expat-lib=DIR Use Expat library in DIR], + expat_lib=$withval, expat_lib=yes) + + +PKG_CHECK_MODULES(LIBMB, libmb >= 1.5 libfakekey,, + AC_MSG_ERROR([*** Required Librarys not found ***])) + +dnl ------ Expat ------------------------------------------------------------ + + case "$expat_includes" in + yes|no) + EXPAT_CFLAGS="" + ;; + *) + EXPAT_CFLAGS="-I$expat_includes" + ;; + esac + + case "$expat_lib" in + yes) + + case "$expat" in + yes) + EXPAT_LIBS="-lexpat" + ;; + *) + EXPAT_LIBS="-L$expat/lib -lexpat" + ;; + esac + + ;; + no) + ;; + *) + EXPAT_LIBS="-L$expat_lib -lexpat" + ;; + esac + + expatsaved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $EXPAT_CFLAGS" + expatsaved_LIBS="$LIBS" + LIBS="$LIBS $EXPAT_LIBS" + + AC_CHECK_HEADER(expat.h) + case "$ac_cv_header_expat_h" in + no) + AC_CHECK_HEADER(xmlparse.h) + + case "$ac_cv_header_xmlparse_h" in + no) + have_expat_header=no; + ;; + yes) + HAVE_XMLPARSE_H=1 + AC_SUBST(HAVE_XMLPARSE_H) + AC_DEFINE_UNQUOTED(HAVE_XMLPARSE_H,$HAVE_XMLPARSE_H, + [Use xmlparse.h instead of expat.h]) + have_expat_header=yes + ;; + esac + ;; + yes) + have_expat_header=yes + ;; + esac + + case "$have_expat_header" in + no) + expat=no + ;; + yes) + AC_CHECK_FUNCS(XML_ParserCreate) + + case "$ac_cv_func_XML_ParserCreate" in + no) + expat=no + ;; + yes) + HAVE_EXPAT=1 + AC_SUBST(HAVE_EXPAT) + AC_DEFINE_UNQUOTED(HAVE_EXPAT,$HAVE_EXPAT, + [Found a useable expat library]) + ;; + esac + ;; + esac + + CPPFLAGS="$saved_CPPFLAGS" + LIBS="$saved_LIBS" + + if test x$expat = xno; then + AC_MSG_ERROR([cannot find expat library]) + fi + + +dnl ------ Debug Build ------------------------------------------------------ + +if test x$enable_debug = xyes; then + LIBMB_CFLAGS="$LIBMB_CFLAGS -DDEBUG" +fi + + +dnl ---- Png Support ------------------------------------------------------- + +if $PKG_CONFIG --libs libmb | grep png ; then + found_png="yes" +else + found_png="no" +fi + +AM_CONDITIONAL(WANT_PNGS, test x$found_png = xyes) + + +dnl ------ GCC flags -------------------------------------------------------- + +if test "x$GCC" = "xyes"; then + GCC_WARNINGS="-g -Wall -fno-strict-aliasing" + LIBMB_CFLAGS="$GCC_WARNINGS $LIBMB_CFLAGS" +fi + + +dnl ------ Substitute in found libs, clags to Makefiles etc ----------------- + +AC_SUBST(LIBMB_CFLAGS) +AC_SUBST(LIBMB_LIBS) + +AC_SUBST(EXPAT_LIBS) +AC_SUBST(EXPAT_CFLAGS) + + +AC_OUTPUT([ +Makefile +src/Makefile +]) + +dnl ========================================================================== +echo " + Matchbox-keyboard $VERSION + ========================= + + prefix: ${prefix} + source code location: ${srcdir} + compiler: ${CC} + + Building with Debug: ${enable_debug} +"
\ No newline at end of file diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..34d842d --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,21 @@ +PREFIXDIR = $(prefix) +PKGDATADIR = $(datadir)/matchbox +DATADIR = $(datadir) + +INCLUDES = -DDATADIR=\"$(DATADIR)\" -DPKGDATADIR=\"$(PKGDATADIR)\" -DPREFIX=\"$(PREFIXDIR)\" $(LIBMB_CFLAGS) $(EXPAT_CFLAGS) + +bin_PROGRAMS = matchbox-keyboard + +matchbox_keyboard_LDADD = $(LIBMB_LIBS) $(EXPAT_LIBS) + +matchbox_keyboard_SOURCES = \ + matchbox-keyboard.c matchbox-keyboard.h \ + matchbox-keyboard-layout.c \ + matchbox-keyboard-row.c \ + matchbox-keyboard-key.c \ + matchbox-keyboard-ui.c \ + config-parser.c \ + util-list.c \ + util.c + + diff --git a/src/config-parser.c b/src/config-parser.c new file mode 100644 index 0000000..34b4a66 --- /dev/null +++ b/src/config-parser.c @@ -0,0 +1,343 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <strings.h> +#include <unistd.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <libgen.h> /* dirname() */ +#include <expat.h> + +#include "matchbox-keyboard.h" + +/* + <keyboard> + + <options> + <font prefered-size=''> + <size fixed='100x100'> + <padding> + </options> + + <layout id="name"> + <row> + <key id="optional-id" obey-caps='true|false' geometry padding + <defualt + display="a" + display="image:" + action="utf8char" // optional, action defulats to this + action="modifier:Shift|Alt|ctrl|mod1|mod2|mod3|caps" + action="xkeysym:XK_BLAH" + action="control:"> // return etc + <shifted + ...... > + <mod1 + ...... > + + /> + <key ... /> + <key ... /> + <spacer size="100px/%" + </row> + </layout> + + + </keyboard> +*/ + +struct _keysymlookup +{ + KeySym keysym; char *name; +} +MBKeyboardKeysymLookup[] = +{ + { XK_BackSpace, "backspace" }, + { XK_Tab, "tab" }, + { XK_Linefeed, "linefeed" }, + { XK_Clear, "clear" }, + { XK_Return, "return" }, + { XK_Pause, "pause" }, + { XK_Scroll_Lock, "scrolllock" }, + { XK_Sys_Req, "sysreq" }, + { XK_Escape, "escape" }, + { XK_Delete, "delete" }, + { XK_Home, "home" }, + { XK_Left, "left" }, + { XK_Up, "up" }, + { XK_Right, "right" }, + { XK_Down, "down" }, + { XK_Prior, "prior" }, + { XK_Page_Up, "pageup" }, + { XK_Next, "next" }, + { XK_Page_Down, "pagedown" }, + { XK_End, "end" }, + { XK_Begin, "begin" }, + { XK_F1, "f1" }, + { XK_F2, "f2" }, + { XK_F3, "f3" }, + { XK_F4, "f4" }, + { XK_F5, "f5" }, + { XK_F6, "f6" }, + { XK_F7, "f7" }, + { XK_F8, "f8" }, + { XK_F9, "f9" }, + { XK_F10, "f10" }, + { XK_F11, "f11" }, + { XK_F12, "f12" } +}; + + +typedef struct MBKeyboardConfigState +{ + MBKeyboard *keyboard; + MBKeyboardLayout *current_layout; + MBKeyboardRow *current_row; + MBKeyboardKey *current_key; + Bool error; + char *error_msg; +} +MBKeyboardConfigState; + +KeySym +mb_kbd_config_str_to_keysym(const char* str) +{ + int i; + + for (i=0; i<sizeof(MBKeyboardKeysymLookup)/sizeof(struct _keysymlookup); i++) + if (streq(str, MBKeyboardKeysymLookup[i].name)) + return MBKeyboardKeysymLookup[i].keysym; + + return 0; +} + +static unsigned char* +config_load_file(const char* filename) +{ + struct stat st; + FILE* fp; + unsigned char* str; + int len; + char tmp[1024]; + + strncpy(tmp, filename, 1024); + + stat(tmp, &st); + +#if 0 + if (stat(tmp, &st)) + { + snprintf(tmp, 1024, "%s.xml", filename); + if (stat(tmp, &st)) + {/* + snprintf(tmp, 1024, PKGDATADIR "/%s", filename); + if (stat(tmp, &st)) + { + snprintf(tmp, 1024, PKGDATADIR "/%s.xml", filename); + if (stat(tmp, &st)) + return NULL; + } + */ + } + } +#endif + + if (!(fp = fopen(tmp, "rb"))) return NULL; + + /* Read in the file. */ + str = malloc(sizeof(char)*(st.st_size + 1)); + len = fread(str, 1, st.st_size, fp); + if (len >= 0) str[len] = '\0'; + + fclose(fp); + + /* change to the same directory as the conf file - for images */ + // chdir(dirname(tmp)); + return str; +} + +static const char * +attr_get_val (char *key, const char **attr) +{ + int i = 0; + + while (attr[i] != NULL) + { + if (!strcmp(attr[i], key)) + return attr[i+1]; + i += 2; + } + + return NULL; +} + + +static void +config_handle_key_subtag(MBKeyboardConfigState *state, + const char *tag, + const char **attr) +{ + MBKeyboardKeyStateType keystate; + const char *val; + KeySym found_keysym; + + /* TODO: Fix below with a lookup table + */ + if (streq(tag, "normal")) + { + keystate = MBKeyboardKeyStateNormal; + } + else if (streq(tag, "shifted")) + { + keystate = MBKeyboardKeyStateShifted; + } + else if (streq(tag, "mod1")) + { + keystate = MBKeyboardKeyStateMod1; + } + else if (streq(tag, "mod2")) + { + keystate = MBKeyboardKeyStateMod2; + } + else if (streq(tag, "mod3")) + { + keystate = MBKeyboardKeyStateMod3; + } + else + { + state->error = True; + return; + } + + if ((val = attr_get_val("display", attr)) == NULL) + { + state->error = True; + return; + } + + if (strlen(val) > 1 + && ((found_keysym = mb_kbd_config_str_to_keysym(val)) != NULL)) + { + + + } + + mb_kbd_key_set_glyph_face(state->current_key, keystate, + attr_get_val("display", attr)); + + if (attr_get_val("action", attr) != NULL) + { + mb_kbd_key_set_char_action(state->current_key, + keystate, + attr_get_val("action", attr)); + } + else + mb_kbd_key_set_char_action(state->current_key, + keystate, + attr_get_val("display", attr)); + +} + +static void +config_handle_layout_tag(MBKeyboardConfigState *state, const char **attr) +{ + const char *val; + + if ((val = attr_get_val("id", attr)) == NULL) + { + state->error = True; + return; + } + + state->current_layout = mb_kbd_layout_new(state->keyboard, val); + + mb_kbd_add_layout(state->keyboard, state->current_layout); +} + +static void +config_handle_row_tag(MBKeyboardConfigState *state, const char **attr) +{ + state->current_row = mb_kbd_row_new(state->keyboard); + mb_kbd_layout_append_row(state->current_layout, state->current_row); +} + +static void +config_handle_key_tag(MBKeyboardConfigState *state, const char **attr) +{ + state->current_key = mb_kbd_key_new(state->keyboard); + mb_kbd_row_append_key(state->current_row, state->current_key); +} + +static void +config_xml_start_cb(void *data, const char *tag, const char **attr) +{ + MBKeyboardConfigState *state = (MBKeyboardConfigState *)data; + + if (streq(tag, "layout")) + { + config_handle_layout_tag(state, attr); + } + else if (streq(tag, "row")) + { + config_handle_row_tag(state, attr); + } + else if (streq(tag, "key")) + { + config_handle_key_tag(state, attr); + } + else if (streq(tag, "normal") + || streq(tag, "shift") + || streq(tag, "mod1") + || streq(tag, "mod2") + || streq(tag, "mod3")) + { + config_handle_key_subtag(state, tag, attr); + } + + if (state->error) + { + util_fatal_error("Error parsing\n"); + } +} + + +int +mb_kbd_config_load(MBKeyboard *kbd, char *conf_file) +{ + unsigned char *data; + XML_Parser p; + MBKeyboardConfigState *state; + + if ((data = config_load_file(conf_file)) == NULL) + { + fprintf(stderr, "Couldn't find '%s' device config file\n", conf_file); + exit(1); + } + + p = XML_ParserCreate(NULL); + + if (! p) { + fprintf(stderr, "Couldn't allocate memory for XML parser\n"); + exit(1); + } + + state = util_malloc0(sizeof(MBKeyboardConfigState)); + + state->keyboard = kbd; + + XML_SetElementHandler(p, config_xml_start_cb, NULL); + + /* XML_SetCharacterDataHandler(p, chars); */ + + XML_SetUserData(p, (void *)state); + + if (! XML_Parse(p, data, strlen(data), 1)) { + fprintf(stderr, "XML Parse error at line %d:\n%s\n", + XML_GetCurrentLineNumber(p), + XML_ErrorString(XML_GetErrorCode(p))); + exit(1); + } + + return 1; +} + diff --git a/src/config.xml b/src/config.xml new file mode 100644 index 0000000..271f700 --- /dev/null +++ b/src/config.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<keyboard> + +<options> +<!-- + <font prefered-size=''> + <size fixed='100x100'> + <padding> +--> +</options> + +<layout id="name"> + <row> + <key obey-caps='true'> + <defualt display="a" /> + <shifted display="A" /> + </key> + <key obey-caps='true'> + <defualt display="b" /> + <shifted display="B" /> + </key> + <key obey-caps='true'> + <defualt display="c" /> + <shifted display="C" /> + </key> + </row> + <row> + <key obey-caps='true'> + <defualt display="d" /> + <shifted display="D" /> + </key> + <key obey-caps='true'> + <defualt display="f" /> + <shifted display="F" /> + </key> + <key obey-caps='true'> + <defualt display="g" /> + <shifted display="G" /> + </key> + </row> + +</layout> + + +</keyboard> diff --git a/src/matchbox-keyboard-defs.c b/src/matchbox-keyboard-defs.c new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/matchbox-keyboard-defs.c @@ -0,0 +1 @@ + diff --git a/src/matchbox-keyboard-key.c b/src/matchbox-keyboard-key.c new file mode 100644 index 0000000..eb67902 --- /dev/null +++ b/src/matchbox-keyboard-key.c @@ -0,0 +1,152 @@ +#include "matchbox-keyboard.h" + +#define MBKB_N_KEY_STATES 5 + +typedef struct MBKeyboardKeyFace +{ + MBKeyboardKeyFaceType type; + + union + { + void *image; + unsigned char *str; + } u; +} +MBKeyboardKeyFace; + +typedef struct MBKeyboardKeyAction +{ + MBKeyboardKeyActionType type; + union + { + unsigned char *glyph; + KeySym keysym; + } u; +} +MBKeyboardKeyAction; + + +/* A key can have 5 different 'states' */ + +typedef struct MBKeyboardKeyState +{ + MBKeyboardKeyAction action; + MBKeyboardKeyFace face; + +} MBKeyboardKeyState; + +struct MBKeyboardKey +{ + MBKeyboard *kbd; + int alloc_x, alloc_y, alloc_width, alloc_height; + MBKeyboardKeyState *states[N_MBKeyboardKeyStateTypes]; + MBKeyboardRow *row; +}; + +static void +_mb_kbd_key_init_state(MBKeyboardKey *key, + MBKeyboardKeyStateType state) +{ + key->states[state] = util_malloc0(sizeof(MBKeyboardKeyState)); +} + +MBKeyboardKey* +mb_kbd_key_new(MBKeyboard *kbd) +{ + MBKeyboardKey *key = NULL; + int i; + + key = util_malloc0(sizeof(MBKeyboardKey)); + key->kbd = kbd; + + for (i=0; i<N_MBKeyboardKeyStateTypes; i++) + key->states[i] = NULL; + + return key; +} + +Bool +mb_kdb_key_has_state(MBKeyboardKey *key, + MBKeyboardKeyStateType state) +{ + return (key->states[state] != NULL); +} + +void +mb_kbd_key_set_glyph_face(MBKeyboardKey *key, + MBKeyboardKeyStateType state, + const unsigned char *glyph) +{ + + if (key->states[state] == NULL) + _mb_kbd_key_init_state(key, state); + + key->states[state]->face.type = MBKeyboardKeyFaceGlyph; + key->states[state]->face.u.str = strdup(glyph); +} + +void +mb_kbd_key_set_image_face(MBKeyboardKey *key, + MBKeyboardKeyStateType state, + void *image) +{ + + if (key->states[state] == NULL) + _mb_kbd_key_init_state(key, state); + + key->states[state]->face.type = MBKeyboardKeyFaceImage; + key->states[state]->face.u.image = image; +} + + +void +mb_kbd_key_set_char_action(MBKeyboardKey *key, + MBKeyboardKeyStateType state, + const unsigned char *glyphs) +{ + if (key->states[state] == NULL) + _mb_kbd_key_init_state(key, state); + + key->states[state]->action.type = MBKeyboardKeyActionGlyph; + key->states[state]->action.u.glyph = strdup(glyphs); +} + +void +mb_kbd_key_set_keysym_action(MBKeyboardKey *key, + MBKeyboardKeyStateType state, + KeySym keysym) +{ + if (key->states[state] == NULL) + _mb_kbd_key_init_state(key, state); + + key->states[state]->action.type = MBKeyboardKeyActionXKeySym; + key->states[state]->action.u.keysym = keysym; +} + +void +mb_kbd_key_set_modifer_action(MBKeyboardKey *key, + MBKeyboardKeyStateType state, + int modifier) +{ + if (key->states[state] == NULL) + _mb_kbd_key_init_state(key, state); + + key->states[state]->action.type = MBKeyboardKeyActionModifier; +} + +MBKeyboardKeyFaceType +mb_kbd_key_get_face_type(MBKeyboardKey *key, + MBKeyboardKeyStateType state) +{ + return 0; +} + + +MBKeyboardKeyActionType +mb_kbd_key_get_action_type(MBKeyboardKey *key, + MBKeyboardKeyStateType state) +{ + return 0; +} + + diff --git a/src/matchbox-keyboard-layout.c b/src/matchbox-keyboard-layout.c new file mode 100644 index 0000000..92089fa --- /dev/null +++ b/src/matchbox-keyboard-layout.c @@ -0,0 +1,38 @@ +#include "matchbox-keyboard.h" + +struct MBKeyboardLayout +{ + MBKeyboard *kbd; + char *id; + + List *rows; +}; + + +MBKeyboardLayout* +mb_kbd_layout_new(MBKeyboard *kbd, const char *id) +{ + MBKeyboardLayout *layout = NULL; + + layout = util_malloc0(sizeof(MBKeyboardLayout)); + + layout->kbd = kbd; + layout->id = strdup(id); + + return layout; +} + +void +mb_kbd_layout_append_row(MBKeyboardLayout *layout, + MBKeyboardRow *row) +{ + layout->rows = util_list_append(layout->rows, (pointer)row); + +} + +List* +mb_kbd_layout_rows(MBKeyboardLayout *layout) +{ + return layout->rows; +} + diff --git a/src/matchbox-keyboard-row.c b/src/matchbox-keyboard-row.c new file mode 100644 index 0000000..40087f6 --- /dev/null +++ b/src/matchbox-keyboard-row.c @@ -0,0 +1,29 @@ +#include "matchbox-keyboard.h" + +struct MBKeyboardRow +{ + MBKeyboard *kbd; + List *keys; +}; + +MBKeyboardRow* +mb_kbd_row_new(MBKeyboard *kbd) +{ + MBKeyboardRow *row = NULL; + + row = util_malloc0(sizeof(MBKeyboardRow)); + + return row; +} + +void +mb_kbd_row_append_key(MBKeyboardRow *row, MBKeyboardKey *key) +{ + row->keys = util_list_append(row->keys, (pointer)key); +} + +List* +mb_kdb_row_keys(MBKeyboardRow *row) +{ + return row->keys; +} diff --git a/src/matchbox-keyboard-ui.c b/src/matchbox-keyboard-ui.c new file mode 100644 index 0000000..8adaa9b --- /dev/null +++ b/src/matchbox-keyboard-ui.c @@ -0,0 +1,62 @@ +#include "matchbox-keyboard.h" + +#define PROP_MOTIF_WM_HINTS_ELEMENTS 5 +#define MWM_HINTS_DECORATIONS (1L << 1) +#define MWM_DECOR_BORDER (1L << 1) + +typedef struct +{ + unsigned long flags; + unsigned long functions; + unsigned long decorations; + long inputMode; + unsigned long status; +} +PropMotifWmHints; + +struct MBKeyboardUI +{ + Display *xdpy; + int xscreen; + Window xwin_root, xwin; + + FakeKey *fakekey; + + MBKeyboard *kbd; +}; + +void +mb_kbd_ui_allocate_layout(MBKeyboardUI *ui, + int width, + int height) +{ + + +} + + +int +mb_kbd_ui_init(MBKeyboard *kbd) +{ + MBKeyboardUI *ui = NULL; + + PropMotifWmHints *mwm_hints; + XSizeHints size_hints; + XWMHints *wm_hints; + + ui = kbd->ui = util_malloc0(sizeof(MBKeyboardUI)); + + ui->kbd = kbd; + + if ((ui->xdpy = XOpenDisplay(getenv("DISPLAY"))) == NULL) + return 0; + + if ((ui->fakekey = fakekey_init(ui->xdpy)) == NULL) + return 0; + + ui->xscreen = DefaultScreen(ui->xdpy); + ui->xwin_root = RootWindow(ui->xdpy, ui->xscreen); + + + return 1; +} diff --git a/src/matchbox-keyboard.c b/src/matchbox-keyboard.c new file mode 100644 index 0000000..bccb87c --- /dev/null +++ b/src/matchbox-keyboard.c @@ -0,0 +1,51 @@ +#include "matchbox-keyboard.h" + +MBKeyboard* +mb_kbd_new(int argc, char **argv) +{ + MBKeyboard *kb = NULL; + + kb = util_malloc0(sizeof(MBKeyboard)); + + if (!mb_kbd_config_load(kb, "config.xml")) + return NULL; + + if (!mb_kbd_ui_init(kb)) + return NULL; + + return kb; +} + +void +mb_kbd_add_layout(MBKeyboard *kb, MBKeyboardLayout *layout) +{ + kb->layouts = util_list_append(kb->layouts, (pointer)layout); +} + +MBKeyboardLayout* +mb_kbd_get_current_layout(MBKeyboard *kb) +{ + return NULL; +} + + +void +mb_kbd_run(MBKeyboard *kb) +{ + + + +} + + +int +main(int argc, char **argv) +{ + MBKeyboard *kb; + + kb = mb_kbd_new(argc, argv); + + if (kb) mb_kbd_run(kb); + + return 0; +} diff --git a/src/matchbox-keyboard.h b/src/matchbox-keyboard.h new file mode 100644 index 0000000..80064fb --- /dev/null +++ b/src/matchbox-keyboard.h @@ -0,0 +1,182 @@ +#ifndef HAVE_MB_KEYBOARD_H +#define HAVE_MB_KEYBOARD_H + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include <X11/Xlib.h> +#include <X11/Xutil.h> +#include <X11/Xatom.h> +#include <X11/Xresource.h> +#include <X11/keysym.h> + +#include <fakekey/fakekey.h> + +#define WANT_DEBUG 1 + +#if (WANT_DEBUG) +#define DBG(x, a...) \ + fprintf (stderr, __FILE__ ":%d,%s() " x "\n", __LINE__, __func__, ##a) +#else +#define DBG(x, a...) do {} while (0) +#endif + +#define MARK() DBG("mark") + +typedef void* pointer ; + +typedef struct List List; + +struct List +{ + List *next, *prev; + void *data; +}; + +typedef struct MBKeyboard MBKeyboard; +typedef struct MBKeyboardLayout MBKeyboardLayout; +typedef struct MBKeyboardRow MBKeyboardRow; +typedef struct MBKeyboardKey MBKeyboardKey; +typedef struct MBKeyboardUI MBKeyboardUI; + +typedef enum +{ + MBKeyboardKeyActionGlyph, + MBKeyboardKeyActionXKeySym, /* 'specials' be converted into this */ + MBKeyboardKeyActionModifier, + +} MBKeyboardKeyActionType; + +typedef enum +{ + MBKeyboardKeyFaceGlyph, + MBKeyboardKeyFaceImage, + +} MBKeyboardKeyFaceType; + +typedef enum +{ + MBKeyboardKeyStateNormal = 0, + MBKeyboardKeyStateShifted, + MBKeyboardKeyStateMod1, + MBKeyboardKeyStateMod2, + MBKeyboardKeyStateMod3, + N_MBKeyboardKeyStateTypes +} +MBKeyboardKeyStateType; + + +struct MBKeyboard +{ + MBKeyboardUI *ui; + List *layouts; + +}; + +/**** UI ***********/ + +int +mb_kbd_ui_init(MBKeyboard *kbd); + +/**** Keyboard ****/ + +void +mb_kbd_add_layout(MBKeyboard *kb, MBKeyboardLayout *layout); + +MBKeyboardLayout* +mb_kbd_get_current_layout(MBKeyboard *kb); + + +/**** Layout ****/ + +MBKeyboardLayout* +mb_kbd_layout_new(MBKeyboard *kbd, const char *id); + +void +mb_kbd_layout_append_row(MBKeyboardLayout *layout, + MBKeyboardRow *row); + +List* +mb_kbd_layout_rows(MBKeyboardLayout *layout); + +/**** Rows ******/ + +MBKeyboardRow* +mb_kbd_row_new(MBKeyboard *kbd); + +void +mb_kbd_row_append_key(MBKeyboardRow *row, MBKeyboardKey *key); + +List* +mb_kdb_row_keys(MBKeyboardRow *row); + +/**** Keys ******/ + +MBKeyboardKey* +mb_kbd_key_new(MBKeyboard *kbd); + +Bool +mb_kdb_key_has_state(MBKeyboardKey *key, + MBKeyboardKeyStateType state); + +void +mb_kbd_key_set_glyph_face(MBKeyboardKey *key, + MBKeyboardKeyStateType state, + const unsigned char *glyph); + +void +mb_kbd_key_set_image_face(MBKeyboardKey *key, + MBKeyboardKeyStateType state, + void *image); + +MBKeyboardKeyFaceType +mb_kbd_key_get_face_type(MBKeyboardKey *key, + MBKeyboardKeyStateType state); + +void +mb_kbd_key_set_char_action(MBKeyboardKey *key, + MBKeyboardKeyStateType state, + const unsigned char *glyphs); + +/*** Config *****/ + +int +mb_kbd_config_load(MBKeyboard *kbd, char *conf_file); + + +/**** Util *****/ + +#define streq(a,b) (strcmp(a,b) == 0) +#define unless(x) if (!(x)) + +void* +util_malloc0(int size); + +void +util_fatal_error(char *msg); + +/* Util list */ + +typedef void (*ListForEachCB) (void *data, void *userdata) ; + +#define util_list_next(l) (l)->next +#define util_list_previous(l) (l)->prev + +List* +util_list_alloc_item(void); + +List* +util_list_get_last(List *list); + +List* +util_list_get_first(List *list); + +List* +util_list_append(List *list, void *data); + +List* +util_list_foreach(List *list, ListForEachCB func, void *userdata); + + +#endif diff --git a/src/util-list.c b/src/util-list.c new file mode 100644 index 0000000..d771e42 --- /dev/null +++ b/src/util-list.c @@ -0,0 +1,53 @@ +#include "matchbox-keyboard.h" + +List * +util_list_alloc_item(void) +{ + return util_malloc0(sizeof(List)); +} + +List* +util_list_get_last(List *list) +{ + while (list->next) list = util_list_next(list); + return list; +} + +List* +util_list_get_first(List *list) +{ + while (list->prev) list = util_list_previous(list); + return list; +} + +List* +util_list_append(List *list, void *data) +{ + List *new; + + if (list == NULL) + { + list = util_list_alloc_item(); + list->data = data; + } + else + { + list = util_list_get_last(list); + + list->next = util_list_alloc_item(); + list->next->prev = list; + list->next->data = data; + } + + return list; +} + +List* +util_list_foreach(List *list, ListForEachCB func, void *userdata) +{ + while (list) + { + func(list->data, userdata); + list = util_list_next(list); + } +} diff --git a/src/util-list.h b/src/util-list.h new file mode 100644 index 0000000..8de4c7d --- /dev/null +++ b/src/util-list.h @@ -0,0 +1,6 @@ +#ifndef HAVE_MBKB_UTIL_LIST_H +#define HAVE_MBKB_UTIL_LIST_H + + +#endif + diff --git a/src/util.c b/src/util.c new file mode 100644 index 0000000..6035a84 --- /dev/null +++ b/src/util.c @@ -0,0 +1,19 @@ +#include "matchbox-keyboard.h" + +void* +util_malloc0(int size) +{ + void *p; + + p = malloc(size); + memset(p, 0, size); + + return p; +} + +void +util_fatal_error(char *msg) +{ + fprintf(stderr, "%s", msg); + exit(1); +} |