From: Hugo Villeneuve Date: Fri, 12 Jul 2013 12:32:05 +0000 (-0400) Subject: Initial import from hvclock X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=40e387337c249f6a86b3f1d026550aeb83d2abbf;p=dockapps%2Fdockbatmon.git Initial import from hvclock --- 40e387337c249f6a86b3f1d026550aeb83d2abbf diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..4295f32 --- /dev/null +++ b/AUTHORS @@ -0,0 +1 @@ +Author: Hugo Villeneuve (hugo@hugovil.com) diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..d60c31a --- /dev/null +++ b/COPYING @@ -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. + + + Copyright (C) + + 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. + + , 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..09b196d --- /dev/null +++ b/ChangeLog @@ -0,0 +1,2 @@ +2013-07-12 Hugo Villeneuve + * Initial version diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..a4b3414 --- /dev/null +++ b/INSTALL @@ -0,0 +1,229 @@ +Copyright 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..82b402c --- /dev/null +++ b/Makefile.am @@ -0,0 +1,21 @@ +## Makefile.am -- Process this file with automake to produce Makefile.in + +AUTOMAKE_OPTIONS = gnu + +SUBDIRS = src doc + +## we want these in the dist tarball +EXTRA_DIST = autogen.sh \ + pixmaps + +ACLOCAL = aclocal -I $(ac_aux_dir) + +CLEANFILES = *~ + +DISTCLEANFILES = .deps/*.P + +MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in \ + stamp-h.in $(ac_aux_dir)/depcomp \ + $(ac_aux_dir)/install-sh $(ac_aux_dir)/missing \ + $(ac_aux_dir)/mkinstalldirs $(ac_aux_dir)/config.guess \ + $(ac_aux_dir)/config.sub $(ac_aux_dir)/ltmain.sh diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..e69de29 diff --git a/README b/README new file mode 100644 index 0000000..197a087 --- /dev/null +++ b/README @@ -0,0 +1,37 @@ + hvclock + +Dockable analog clock and calendar. + +Project website: + http://www.hugovil.com/en/hvclock + +This program was tested on the following systems: + "Linux From Scratch 4.0" + "Ubuntu 10.04" + "Ubuntu 10.10" + +For recent project news, see the NEWS file. + + +Building hvclock: +----------------- + +For generic installation instructions, see the "INSTALL" file. + +If you are building from the subversion repository, first run the "autogen.sh" script. + +If you are seeing this error message during configure: + "Can't find X11 library" +it means you are missing some libX11 files. +On Debian-based systems, install libX11-dev with this command: + apt-get install libX11-dev + + +Running hvclock: +---------------- + +When running under WindowMaker and with recent versions of Linux distributions, +there is an additional window appearing in addition to the dockapp window. +To get rid of this added window, right-click on the title bar and select +"Attributes...", then select "Application Specific" from the drop-down list +and then select "Start Hidden". diff --git a/TODO b/TODO new file mode 100644 index 0000000..1c3cb1a --- /dev/null +++ b/TODO @@ -0,0 +1,4 @@ +TODO +==== + +Utiliser des polices proportionelles diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..44c1a7d --- /dev/null +++ b/autogen.sh @@ -0,0 +1,5 @@ +#!/bin/sh +# autogen.sh -- Use this script to create generated files from the git distribution + +autoreconf -vi + diff --git a/config/.gitignore b/config/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..1f69d1d --- /dev/null +++ b/configure.ac @@ -0,0 +1,62 @@ +# configure.ac -- Process this file with autoconf to produce configure. + +dnl Initialization stuff. +AC_INIT(dockbatmon, 0.1.0) +AC_CONFIG_AUX_DIR(config) +AC_CONFIG_SRCDIR(src/batmon.c) +AM_CONFIG_HEADER(config.h:config-h.in) +dnl Checking if the NEWS file has been updated to reflect the current version. +AM_INIT_AUTOMAKE(check-news) +AM_SILENT_RULES([yes]) + +dnl Testing the C compiler. +AC_PROG_CC +AC_LANG_C + +dnl Checking for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_TYPE_PID_T +AC_TYPE_SIZE_T + +dnl Basic CFLAGS values +CFLAGS="${CFLAGS} -Wall" + +dnl Trying to locate the X window system's includes and libraries, and sets the +dnl variables x_includes and x_libraries to their locations. Also adds the +dnl required include flags to X_CFLAGS and required linking flags to X_LIBS. +AC_PATH_XTRA +CFLAGS="${CFLAGS} ${X_CFLAGS}" +LIBS="${LIBS} ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS}" + +dnl Checking for X11 library. +AC_CHECK_LIB(X11, XOpenDisplay, LIBS="${LIBS} -lX11", + echo "Can't find X11 library" ; exit 1, "${X_LIBS}") + +dnl Checks for Gtk+-2.0 +PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8, CFLAGS="${CFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED") +AC_SUBST(GTK_CFLAGS) +AC_SUBST(GTK_LIBS) + +AC_CHECK_HEADERS(math.h, ,dnl +echo "Can't find header file for math library" ; exit 1) +dnl Checking for math library +AC_CHECK_LIB(m, sin, LIBS="${LIBS} -lm",dnl + echo "Can't find math library" ; exit 1, "${X_LIBS}") + +AC_SUBST(CFLAGS) +AC_SUBST(LIBS) +AC_SUBST(ac_aux_dir) + +dnl Creating output file(s) +AC_OUTPUT(Makefile src/Makefile doc/Makefile) + +dnl Output the configuration summary +echo +echo "Configuration summary:" +echo +echo " Install path: ${prefix}" +echo " Compiler: ${CC}" +echo " Compiler flags: ${CFLAGS}" +echo " Linker flags: ${LIBS}" +echo +echo "Configure finished. Type 'make' to build." diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..84c7715 --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,9 @@ +## Makefile.am -- Process this file with automake to produce Makefile.in + +man1_MANS = dockbatmon.man + +EXTRA_DIST = $(man1_MANS) + +CLEANFILES = *~ + +MAINTAINERCLEANFILES = Makefile.in diff --git a/doc/dockbatmon.man b/doc/dockbatmon.man new file mode 100644 index 0000000..6a87304 --- /dev/null +++ b/doc/dockbatmon.man @@ -0,0 +1,46 @@ +.TH DOCKBATMON 1 "July 2013" "dockbatmon" "User's Manual" + +.SH NAME +dockbatmon \- Dockable battery monitor + +.SH SYNOPSIS +.B dockbatmon +[\fIOPTION\fR]... + +.SH DESCRIPTION +\fBdockbatmon\fR is a dockable application to monitor the capacity and charge +of a laptop battery for the WindowMaker window manager. + +.SH "OPTIONS" + +.TP +\fB\-d\fR +display debugging messages. + +.TP +.BI \-display " host" : display +specifies the host and screen to be used by \fBdockbatmon\fR. By default this +is obtained from the environment variable +.SB DISPLAY. + +.TP +.BI \-geometry " geometry" +.RB ( *geometry ) +specifies the initial geometry of the window. + +.TP +\fB\-h\fR +display usage and exit + +.TP +\fB\-v\fR +output version information and exit + +.SH CREDITS +\fBdockbatmon\fR was written by Hugo Villeneuve . + +.SH COPYRIGHT +\fBdockbatmon\fR is free; anyone may redistribute it to anyone under the terms +stated in the GNU General Public License. A copy of the license is included in +the \fBdockbatmon\fR distribution. You can also browse it online at +.I http://www.gnu.org/copyleft/gpl.html diff --git a/pixmaps/dockapp-mask.xpm b/pixmaps/dockapp-mask.xpm new file mode 100644 index 0000000..d66b428 --- /dev/null +++ b/pixmaps/dockapp-mask.xpm @@ -0,0 +1,71 @@ +/* XPM */ +static char * dockapp_mask_xpm[] = { +"64 64 4 1", +" c None", +". c #000000", +"+ c #4C4C4C", +"@ c #00FF00", +" ", +" ", +" ", +" ", +" ............. ", +" ............. ", +" ..+++++++++.. ", +" ..+++++++++.. ", +" ..+++++++++.. ", +" ..+++++++++.. ", +" ......................... ", +" ......................... ", +" ..+++++++++++++++++++++.. ", +" ..+++++++++++++++++++++.. ", +" ..+++++++++++++++++++++.. ", +" ..+++++++++++++++++++++.. ", +" ..+++++++++++++++++++++.. ", +" ..+++++++++++++++++++++.. ", +" ..+++++++++++++++++++++.. ", +" ..+++++++++++++++++++++.. ", +" ..+++++++++++++++++++++.. ", +" ..+++++++++++++++++++++.. ", +" ..+++++++++++++++++++++.. ", +" ..+++++++++++++++++++++.. ", +" ..+++++++++++++++++++++.. ", +" ..+++++++++++++++++++++.. ", +" ..+++++++++++++++++++++.. ", +" ..+++++++++++++++++++++.. ", +" ..+++++++++++++++++++++.. ", +" ..+++++++++++++++++++++.. ", +" ..+++++++++++++++++++++.. ", +" ..+++++++++++++++++++++.. ", +" ......................... ", +" ......................... ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ..@@@@@@@@@@@@@@@@@@@@@.. ", +" ......................... ", +" ......................... ", +" ", +" ", +" ", +" "}; diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..e475f55 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,26 @@ +# This file is processed by GNU automake to generate Makefile.in + +INCLUDES = -I$(top_srcdir) \ + -I$(top_srcdir)/pixmaps \ + $(GTK_CFLAGS) + +bin_PROGRAMS = dockbatmon + +dockbatmon_SOURCES = main.c main.h batmon.c batmon.h \ + options.c options.h dockapp.c dockapp.h \ + common.h + +dockbatmon_LDADD = $(GTK_LIBS) + +# These headers will be included in the distribution tarball, but will not be +# installed by 'make install' +noinst_HEADERS = + +# we want these in the dist tarball +EXTRA_DIST = + +CLEANFILES = *~ + +DISTCLEANFILES = .deps/*.P + +MAINTAINERCLEANFILES = Makefile.in diff --git a/src/batmon.c b/src/batmon.c new file mode 100644 index 0000000..1bd024a --- /dev/null +++ b/src/batmon.c @@ -0,0 +1,356 @@ +/* + * batmon.c -- functions for displaying battery level + * + * Copyright (C) 2005 Hugo Villeneuve + * + * Based on EggClockFace + * (c) 2005, Davyd Madeley + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/* Define filename_M */ +#define BATMON_M 1 + +#if HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#if STDC_HEADERS +# include +#elif HAVE_STRINGS_H +# include +#else +# error "Needs or " +#endif +#include + +#include +#include +#include + +#include "common.h" +#include "batmon.h" +#include "main.h" +#include "dockapp.h" +#include "dockapp-mask.xpm" + +#define BAT_W 23 +#define BAT_H 48 +#define BAT_TIP_W (BAT_W / 2) +#define BAT_TIP_H 6 + +#define BAT_START_X ((64 / 2) - (BAT_W / 2)) +#define BAT_START_Y ((64 / 2) - ((BAT_H + BAT_TIP_H) / 2)) + +#define BAT_LOW_LEVEL 20 +#define BAT_CRITICAL_LEVEL 10 + +static int capacity; +static int ac_online = false; +static const char battery[] = "BAT0"; +static const char ac[] = "AC0"; +static const char ac_acpi_dir_base[] = "/sys/class/power_supply"; +static const char battery_acpi_dir_base[] = "/sys/class/power_supply"; + +static void read_ac_status(void) +{ + FILE *ac_file; + char ac_file_path[256], ac_file_line[40]; + + sprintf(ac_file_path, "%s/%s/online", ac_acpi_dir_base, + ac); + + ac_file = fopen(ac_file_path, "r"); + + if (ac_file == NULL) { + perror(ac_file_path); + } else { + while (!feof(ac_file)) { + memset(ac_file_line, 0, 40); + fgets(ac_file_line, 40, ac_file); + + sscanf(ac_file_line, "%d", &ac_online); + + break; + } + + printf("ac online = %d\n", ac_online); + } + + fclose(ac_file); +} + +static void read_battery_status(void) +{ + FILE *batt_file; + char batt_file_path[256], batt_file_line[40]; + + sprintf(batt_file_path, "%s/%s/capacity", battery_acpi_dir_base, + battery); + + batt_file = fopen(batt_file_path, "r"); + + if (batt_file == NULL) { + perror(batt_file_path); + } else { + while (!feof(batt_file)) { + memset(batt_file_line, 0, 40); + fgets(batt_file_line, 40, batt_file); + + sscanf(batt_file_line, "%d", &capacity); +#ifdef _DEBUG_ + printf("DEBUG: Found capacity: %d.\n", capacity); +#endif + break; + } + + printf("capacity = %d%%\n", capacity); + } + + fclose(batt_file); +} + +static void +color_set_black(cairo_t *cr) +{ + cairo_set_source_rgb(cr, 0, 0, 0); +} + +static void +color_set_white(cairo_t *cr) +{ + cairo_set_source_rgb(cr, 1, 1, 1); +} + +static void +color_set_gray(cairo_t *cr) +{ + const float g = 0.3; + + cairo_set_source_rgb(cr, g, g, g); +} + +static void +color_set_red(cairo_t *cr) +{ + cairo_set_source_rgb(cr, 1, 0, 0); +} + +static void +color_set_green(cairo_t *cr) +{ + cairo_set_source_rgb(cr, 0, 1, 0); +} + +static void +color_set_blue(cairo_t *cr) +{ + cairo_set_source_rgb(cr, 0, 0, 1); +} + +static void +color_set_yellow(cairo_t *cr) +{ + cairo_set_source_rgb(cr, 1, 1, 0); +} + +static void +display_string(cairo_t *cr, char *str, int center_x, int center_y) +{ + cairo_text_extents_t extents; + double xx, yy; + + /* Get string dimensions */ + cairo_text_extents(cr, str, &extents); + + xx = (extents.width / 2) + 1; + yy = extents.height / 2; + + cairo_move_to(cr, center_x - xx, center_y + yy); + cairo_show_text(cr, str); +} + +static void +display_capacity(cairo_t *cr) +{ + char str[256]; + int center_x = 32; + int center_y = 32; + + cairo_select_font_face(cr, "serif", CAIRO_FONT_SLANT_NORMAL, + CAIRO_FONT_WEIGHT_BOLD); + cairo_set_font_size(cr, 10); + + /* Convert digit to string */ + if (capacity == 100) + sprintf(str, "F"); + else + sprintf(str, "%d", capacity); + + if (capacity <= 40) { + color_set_white(cr); + center_y -= 12; + } else { + color_set_black(cr); + center_y += 15; + } + + display_string(cr, str, center_x, center_y); +} + +static void +draw_background(GtkWidget *clock, cairo_t *cr) +{ + int y; + + read_ac_status(); + read_battery_status(); + + cairo_save(cr); + + cairo_set_line_width(cr, 2); + + /* Draw battery tip. */ + color_set_gray(cr); + cairo_rectangle(cr, BAT_START_X + ((BAT_W - BAT_TIP_W) / 2), + BAT_START_Y, + BAT_TIP_W, BAT_TIP_H); + cairo_fill_preserve(cr); + color_set_black(cr); + cairo_stroke(cr); + + /* Draw battery outline. */ + color_set_gray(cr); + cairo_rectangle(cr, BAT_START_X, BAT_START_Y + BAT_TIP_H, + BAT_W, BAT_H); + cairo_fill_preserve(cr); + color_set_black(cr); + cairo_stroke(cr); + + if (ac_online) { + color_set_blue(cr); + } else if (capacity <= BAT_CRITICAL_LEVEL) { + color_set_red(cr); + } else if (capacity <= BAT_LOW_LEVEL) { + color_set_yellow(cr); + } else { + color_set_green(cr); + } + + y = BAT_START_Y + BAT_TIP_H + BAT_H - ((BAT_H * capacity) / 100); + + /* Draw remaining capacity. */ + cairo_rectangle(cr, BAT_START_X, y, BAT_W, + BAT_START_Y + BAT_TIP_H + BAT_H - y); + + cairo_fill_preserve(cr); + color_set_black(cr); + cairo_stroke(cr); + + display_capacity(cr); + + cairo_restore(cr); +} + +static gboolean +batmon_expose(GtkWidget *clock, GdkEventExpose *event) +{ + cairo_t *cr; + + /* Get a cairo_t */ + cr = gdk_cairo_create(clock->window); + + cairo_rectangle(cr, event->area.x, event->area.y, + event->area.width, event->area.height); + cairo_clip(cr); + + draw_background(clock, cr); + + cairo_destroy(cr); + + return TRUE; +} + +static void +batmon_redraw_canvas(GtkWidget *widget) +{ + GdkRegion *region; + + if (!widget->window) + return; + + region = gdk_drawable_get_clip_region(widget->window); + /* redraw the cairo canvas completely by exposing it */ + gdk_window_invalidate_region(widget->window, region, TRUE); + gdk_window_process_updates(widget->window, TRUE); + + gdk_region_destroy(region); +} + +static gboolean +batmon_button_release(GtkWidget *clock, GdkEventButton *event) +{ + if (batmon_infos.debug) + printf("%s: button released\n", PACKAGE); + + return FALSE; +} + +static gboolean +dockapp_update(gpointer data) +{ + GtkWidget *clock = GTK_WIDGET(data); + + batmon_redraw_canvas(clock); + + return TRUE; /* keep running this event */ +} + +void +batmon_init(GtkWidget *dockwin, GtkWidget *iconwin) +{ + gtk_widget_add_events(dockwin, GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_RELEASE_MASK | + GDK_POINTER_MOTION_MASK); + gtk_widget_add_events(iconwin, GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_RELEASE_MASK | + GDK_POINTER_MOTION_MASK); + + g_signal_connect(G_OBJECT(dockwin), "expose-event", + G_CALLBACK(batmon_expose), NULL); + g_signal_connect(G_OBJECT(iconwin), "expose-event", + G_CALLBACK(batmon_expose), NULL); + + g_signal_connect(G_OBJECT(dockwin), "button-press-event", + G_CALLBACK(batmon_button_release), NULL); + g_signal_connect(G_OBJECT(iconwin), "button-press-event", + G_CALLBACK(batmon_button_release), NULL); + g_signal_connect(G_OBJECT(dockwin), "button-release-event", + G_CALLBACK(batmon_button_release), NULL); + g_signal_connect(G_OBJECT(iconwin), "button-release-event", + G_CALLBACK(batmon_button_release), NULL); + + dockapp_set_mask(iconwin, dockapp_mask_xpm); + + /* update the battery status once per second */ + g_timeout_add(1000, dockapp_update, iconwin); + + batmon_redraw_canvas(iconwin); +} diff --git a/src/batmon.h b/src/batmon.h new file mode 100644 index 0000000..68c0133 --- /dev/null +++ b/src/batmon.h @@ -0,0 +1,29 @@ +/* + * batmon.h + * + * Copyright (C) 2013 Hugo Villeneuve + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef BATMON_H +#define BATMON_H 1 + +#include + +void +batmon_init(GtkWidget *dockwin, GtkWidget *iconwin); + +#endif /* BATMON_H */ diff --git a/src/common.h b/src/common.h new file mode 100644 index 0000000..8338342 --- /dev/null +++ b/src/common.h @@ -0,0 +1,44 @@ +/* + * common.h + * + * Copyright (C) 2005 Hugo Villeneuve + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef COMMON_H +#define COMMON_H 1 + +#include +#include +#include +#include + +/* Common constants. */ +#ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 +# define EXIT_FAILURE 1 +#endif + +/* Returns TRUE if the strings 'a' and 'b' are equal. */ +#define STREQ(a, b) (strcmp((a), (b)) == 0) + +/* Returns TRUE if the first 'c' characters of strings 'a' and 'b' are equal. */ +#define STREQ_LEN(a, b, c) (strncmp((a), (b), (c)) == 0) + +inline void +ErrorLocation(const char *file, int line); + +#endif /* COMMON_H */ diff --git a/src/dockapp.c b/src/dockapp.c new file mode 100644 index 0000000..87da243 --- /dev/null +++ b/src/dockapp.c @@ -0,0 +1,161 @@ +/* + * dockapp.c -- routines for managing dockapp windows and icons. + * + * Copyright (C) 2005 Hugo Villeneuve + * + * Code for GTK withdraw ack taken from wmudmount + * http://wmudmount.sourceforge.net/ + * Copyright © 2010 Brad Jorsch + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/* Define filename_M */ +#define DOCKAPP_M 1 + +#if HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include +#include +#include + +#include "common.h" +#include "batmon.h" +#include "main.h" +#include "dockapp.h" + +#define GTK_WITHDRAWN_HACK 1 + +/* Width and height in pixels of Window Maker icons. */ +#define ICON_SIZE 64 + +static void +dockapp_set_withdrawn_state(Display *d, Window w) +{ + XWMHints *hints; + + hints = XGetWMHints(d, w); + hints->flags |= StateHint; + hints->initial_state = WithdrawnState; + XSetWMHints(d, w, hints); + XFree(hints); +} + +/* + * Gtk/Gdk gives us no way to specify intial_state = WithdrawnState, + * because ICCCM doesn't list it in the little table for initial_state. + * And it even overrides it just before mapping the window! + * See https://bugzilla.gnome.org/show_bug.cgi?id=139322 + * + * But there is a hack: an X window isn't actually mapped until its + * parent is mapped. So if we reparent the troublesome window to an + * unmapped window and call GTK's map function, we can then easily + * change the hints before reparenting it back to the root window. + */ +static void +dockapp_gtk_withdrawn_hack(GtkWidget *dockwin, GtkWidget *iconwin) +{ + Display *d; + Window p, root, *children; + unsigned int nchildren; + Window win_temp; + Window win_orig; + + d = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); + win_orig = GDK_WINDOW_XID(dockwin->window); + + XQueryTree(d, win_orig, &root, &p, &children, &nchildren); + + if (children) + XFree(children); + + win_temp = XCreateSimpleWindow(d, p, 0, 0, 1, 1, 0, 0, 0); + XReparentWindow(d, win_orig, win_temp, 0, 0); + gtk_widget_show(dockwin); + + dockapp_set_withdrawn_state(d, win_orig); + + XReparentWindow(d, win_orig, p, 0, 0); + XDestroyWindow(d, win_temp); +} + +void +dockapp_set_mask(GtkWidget *iconwin, char **xpm) +{ + GdkPixbuf *pixbuf; + GdkPixmap *pixmap; + GdkBitmap *mask; + + pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)xpm); + + gdk_pixbuf_render_pixmap_and_mask(pixbuf, &pixmap, &mask, 127); + + g_object_unref(pixbuf); + + if (!pixmap) { + printf("Could not load pixmap\n"); + exit(1); + } + + gtk_widget_shape_combine_mask(iconwin, mask, 0, 0); +} + +/******************************************************************************* + * New window creation and initialization for a Dockable Application + ******************************************************************************/ +void +dockapp_init(int argc, char *argv[], char *display_arg, char *geometry_arg) +{ + GtkWidget *dockwin; + GtkWidget *iconwin; + + gtk_init(&argc, &argv); + + dockwin = gtk_window_new(GTK_WINDOW_TOPLEVEL); + iconwin = gtk_window_new(GTK_WINDOW_POPUP); + + gtk_window_set_wmclass(GTK_WINDOW(dockwin), g_get_prgname(), "DockApp"); + gtk_window_set_wmclass(GTK_WINDOW(iconwin), g_get_prgname(), "DockApp"); + + gtk_widget_set_size_request(dockwin, ICON_SIZE, ICON_SIZE); + gtk_widget_set_size_request(iconwin, ICON_SIZE, ICON_SIZE); + gtk_widget_set_app_paintable(dockwin, TRUE); + gtk_widget_set_app_paintable(iconwin, TRUE); + + gtk_window_set_default_size(GTK_WINDOW(dockwin), ICON_SIZE, ICON_SIZE); + + g_signal_connect(dockwin, "destroy", G_CALLBACK(gtk_main_quit), NULL); + + gtk_widget_realize(dockwin); + gtk_widget_realize(iconwin); + gdk_window_set_icon(dockwin->window, iconwin->window, NULL, NULL); + + batmon_init(dockwin, iconwin); + + gtk_widget_show(iconwin); + +#ifdef GTK_WITHDRAWN_HACK + dockapp_gtk_withdrawn_hack(dockwin, iconwin); +#else + gtk_widget_show(dockwin); + gdk_window_withdraw(dockwin->window); +#endif +} diff --git a/src/dockapp.h b/src/dockapp.h new file mode 100644 index 0000000..5ae2ac5 --- /dev/null +++ b/src/dockapp.h @@ -0,0 +1,33 @@ +/* + * dockapp.h + * + * Copyright (C) 2005 Hugo Villeneuve + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef DOCKAPP_H +#define DOCKAPP_H 1 + +#include +#include + +void +dockapp_init(int argc, char *argv[], char *display_arg, char *geometry_arg); + +void +dockapp_set_mask(GtkWidget *iconwin, char **xpm); + +#endif /* DOCKAPP_H */ diff --git a/src/main.c b/src/main.c new file mode 100644 index 0000000..5182a9b --- /dev/null +++ b/src/main.c @@ -0,0 +1,60 @@ +/* + * main.c -- main program + * + * Copyright (C) 2005 Hugo Villeneuve + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/* Define filename_M */ +#define MAIN_M 1 + +#if HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include + +#include "common.h" +#include "dockapp.h" +#include "options.h" +#include "batmon.h" +#include "main.h" + +inline void ErrorLocation(const char *file, int line) +{ + fprintf(stderr, " Error in file \"%s\" at line #%d\n", file, line); +} + +/******************************************************************************* + * Main function + ******************************************************************************/ +int main(int argc, char *argv[]) +{ + /* Initialization */ + ParseCommandLineOptions(argc, argv); + + /* Initializing and creating a DockApp window. */ + dockapp_init(argc, argv, batmon_infos.display_arg, + batmon_infos.geometry_arg); + + gtk_main(); + + return EXIT_SUCCESS; +} diff --git a/src/main.h b/src/main.h new file mode 100644 index 0000000..b68c32e --- /dev/null +++ b/src/main.h @@ -0,0 +1,40 @@ +/* + * main.h + * + * Copyright (C) 2005 Hugo Villeneuve + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef MAIN_H +#define MAIN_H 1 + +struct batmon_t { + int debug; + char *display_arg; + char *geometry_arg; +}; + +/* Exported variables */ +#undef _SCOPE_ +#ifdef BATMON_M +# define _SCOPE_ /**/ +#else +# define _SCOPE_ extern +#endif + +_SCOPE_ struct batmon_t batmon_infos; + +#endif /* MAIN_H */ diff --git a/src/options.c b/src/options.c new file mode 100644 index 0000000..bafe665 --- /dev/null +++ b/src/options.c @@ -0,0 +1,141 @@ +/* + * options.c -- functions for processing command-line options and arguments + * + * Copyright (C) 2005 Hugo Villeneuve + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#if HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include + +#if STDC_HEADERS +# include +#elif HAVE_STRINGS_H +# include +#endif + +#include "common.h" +#include "main.h" +#include "options.h" + +/******************************************************************************* + * Display the help message and exit + ******************************************************************************/ +static void DisplayUsage(void) +{ + printf("Usage: %s [OPTIONS]...\n", PACKAGE); + printf("Dockable analog clock and calendar.\n\n"); + printf + (" -d Display debugging messages.\n"); + printf(" -display X display name\n"); + printf(" -geometry +XPOS+YPOS initial window position\n"); + printf(" -h display this help and exit\n"); + printf(" -version display version information"); + printf(" and exit\n"); + printf("\n"); +} + +/******************************************************************************* + * Display version information and exit + ******************************************************************************/ +static void DisplayVersion(void) +{ + printf("\n"); + printf(" %s, version %s\n", PACKAGE, VERSION); + printf(" Written by Hugo Villeneuve\n\n"); +} + +static void InvalidOption(char *message, /*@null@ */ char *string) +{ + if (string == NULL) + fprintf(stderr, "%s: %s\n", PACKAGE, message); + else + fprintf(stderr, "%s: %s %s\n", PACKAGE, message, string); + + fprintf(stderr, "Try `%s -h' for more information.\n", PACKAGE); + + exit(EXIT_FAILURE); +} + +/******************************************************************************* + * Initializes the different options passed as arguments on the command line. + ******************************************************************************/ +void ParseCommandLineOptions(int argc, char *argv[]) +{ + int i; + char *token; + int display_on = false; + int geometry_on = false; + + /* Default values. */ + batmon_infos.debug = false; + + for (i = 1; i < argc; i++) { + token = argv[i]; + switch (token[0]) { + case '-': + /* Processing options names */ + switch (token[1]) { + case 'd': + if (STREQ("display", &token[1])) + display_on = true; + else if (strlen(&token[1]) == 1) + batmon_infos.debug = true; + break; + case 'g': + if (STREQ("geometry", &token[1])) + geometry_on = true; + break; + case 'h': + DisplayUsage(); + exit(EXIT_SUCCESS); + case 'v': + if (STREQ("version", &token[1])) { + DisplayVersion(); + exit(EXIT_SUCCESS); + } + InvalidOption("invalid option", token); + break; + default: + InvalidOption("invalid option", token); + break; + } /* end switch( token[1] ) */ + break; + default: + /* Processing options arguments */ + if (display_on != false) { + display_on = false; + batmon_infos.display_arg = token; + } else if (geometry_on != false) { + geometry_on = false; + batmon_infos.geometry_arg = token; + } else { + InvalidOption("invalid option", token); + } + break; + } /* end switch( token[0] ) */ + } /* end for */ + + if (display_on != false) + InvalidOption("missing display parameter", NULL); + else if (geometry_on != false) + InvalidOption("missing geometry parameter", NULL); +} diff --git a/src/options.h b/src/options.h new file mode 100644 index 0000000..e72130a --- /dev/null +++ b/src/options.h @@ -0,0 +1,27 @@ +/* + * options.h + * + * Copyright (C) 2005 Hugo Villeneuve + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef OPTIONS_H +#define OPTIONS_H 1 + +void +ParseCommandLineOptions(int argc, char *argv[]); + +#endif /* OPTIONS_H */