New import
git-svn-id: http://tint2.googlecode.com/svn/trunk@13 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
parent
a5f3607239
commit
420dd5d1e2
46 changed files with 5231 additions and 0 deletions
9
AUTHORS
Normal file
9
AUTHORS
Normal file
|
@ -0,0 +1,9 @@
|
|||
Developed by:
|
||||
Thierry Lorthiois <lorthiois@bbsoft.fr>, project maintainer
|
||||
Pål Staurland <staura@gmail.com>, tint2 is based on ttm originally written by Pål Staurland
|
||||
|
||||
|
||||
Contributors:
|
||||
Daniel Moerner <dmoerner@gmail.com>, man page
|
||||
|
||||
|
340
COPYING
Normal file
340
COPYING
Normal file
|
@ -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.
|
252
ChangeLog
Normal file
252
ChangeLog
Normal file
|
@ -0,0 +1,252 @@
|
|||
|
||||
|
||||
2008-09-30
|
||||
- change tintrc format
|
||||
background and border can use linear gradiant
|
||||
- update documentation
|
||||
|
||||
2008-09-24
|
||||
- change tintrc format
|
||||
user can define a list of background and border at the beginning of tintrc
|
||||
and each object (panel, taskbar, task, clock, systray) get a background number.
|
||||
the background number 0 is reserved by tint2 for full transparency.
|
||||
user's background start with number 1, 2, ...
|
||||
|
||||
2008-09-22
|
||||
- better control on icon opacity
|
||||
icon opacity use the same value as text opacity
|
||||
|
||||
2008-09-21
|
||||
- new parameter task_text = 0 or 1
|
||||
so you can show task's icon without text
|
||||
- remove task_icon_size parameter because icon_size is calculate with task->padding_y
|
||||
|
||||
2008-09-19
|
||||
- improve clock drawing on 2 lines
|
||||
- new design : object oriented
|
||||
clock inherit Area (with draw_background)
|
||||
- rename parameter 'panel_mode' in 'taskbar_mode'
|
||||
|
||||
2008-09-17
|
||||
- change name from tint to tint2 because debian has already a package named tint
|
||||
- new design : object oriented
|
||||
tasks inherit Area
|
||||
taskbars inherit Area
|
||||
|
||||
2008-09-16
|
||||
- new design : object oriented
|
||||
remove task_margin parameter, replaced by taskbar_padding
|
||||
fixed segfault with new layout
|
||||
|
||||
2008-09-04
|
||||
- new design : object oriented
|
||||
all objects inherit from Area : panel, taskbar, task, clock
|
||||
|
||||
2008-09-02 licence changed to GPL V2
|
||||
> Hi Pål,
|
||||
> Since latest release (tint-0.6), I try to merge a systray in tint.
|
||||
> The code I would like to merge is under GPL V2 licence.
|
||||
> So are you agree to change the licence of tint to GPL V2 ?
|
||||
Pål Staurland answer :
|
||||
Yeah no problem::)
|
||||
|
||||
2008-08-17 patch from i...@noctus.net
|
||||
- fixed bug : "Task button titles do not update"
|
||||
|
||||
2008-08-12
|
||||
- code cleanup : Taskbar use GSLIST from glib
|
||||
|
||||
2008-08-07
|
||||
- add 1 space between task title and icon
|
||||
|
||||
2008-07-25
|
||||
- fixed bug when (task_rounded > panel_height/2)
|
||||
|
||||
|
||||
----------------------------------------------------------------
|
||||
2008-07-20 thil7 <lorthiois@bbsoft.fr>
|
||||
released tint-0.6
|
||||
|
||||
2008-07-19
|
||||
- backward compatibility : save new config file
|
||||
|
||||
2008-07-18
|
||||
- bug fixed with multi-monitor : memory leak, move task on the same monitor
|
||||
|
||||
2008-07-12
|
||||
- multi_monitor : added window_get_monitor(win)
|
||||
|
||||
2008-07-05
|
||||
- multi_monitor : changed taskbar allocation when add/remove a monitor
|
||||
- update documentation
|
||||
|
||||
2008-07-04
|
||||
- changed in config file, panel_show_all_desktop
|
||||
replaced by panel_mode = single_desktop / multi_desktop / multi_monitor
|
||||
- with panel_mode = multi_monitor, tint show one taskbar by monitor
|
||||
|
||||
2008-07-02
|
||||
- add xinerama dependency
|
||||
- read monitors configuration
|
||||
- tint will run in 'sleep_mode'
|
||||
if you specify 'panel_monitor' on an unplug monitor
|
||||
- tint 'wake up' when the monitor is detected or resolution changed
|
||||
|
||||
2008-06-30 patch from goo...@dougbarton.us
|
||||
- tint wait for window manager on startup
|
||||
|
||||
2008-06-29
|
||||
- specify monitor with parameter 'panel_monitor'
|
||||
- panel_position is relative to your monitor
|
||||
panel_monitor = 1
|
||||
panel_position = bottom center
|
||||
|
||||
2008-06-24
|
||||
- fixed bug : show tint on all desktop with fluxbox
|
||||
|
||||
2008-06-23
|
||||
- task_width = 0 to get full taskbar width
|
||||
- added documentation in /doc
|
||||
|
||||
2008-06-16
|
||||
- renamed parameter panel_margin to panel_padding
|
||||
- added parameter panel_margin = vertical_margin horizontal_margin
|
||||
|
||||
2008-06-15
|
||||
- fixed bug : icon position changed when clock adjust width
|
||||
- removed boolean parameter panel_background and task_background
|
||||
replaced with opacity (alpha) = 0
|
||||
- removed task_active_border_width parameter
|
||||
identical to task_border_width
|
||||
- fixed bug : draw task below panel border
|
||||
|
||||
2008-06-11
|
||||
- removed the need of desktop margin.
|
||||
tint specify margin to window magager (_NET_WM_STRUT)
|
||||
|
||||
2008-06-10
|
||||
- fixed bug : time/date vertical and horizontal center
|
||||
|
||||
2008-06-10 patch from benjaminfranzke
|
||||
- fixed bug : draw icon on 64bit system.
|
||||
|
||||
2008-06-08
|
||||
- fixed bug : in draw border and fill background
|
||||
|
||||
2008-06-04
|
||||
- allow config file on the command line : tint -c ./tintrc2
|
||||
- allow 2 value in config file : key = value1 value2
|
||||
- panel_margin can get 2 values : vertical_margin horizontal_margin
|
||||
panel_margin = 8 4
|
||||
|
||||
2008-05-30
|
||||
- put panel below other window
|
||||
- set locale LANG
|
||||
|
||||
2008-05-28
|
||||
- clock_width adjust automatically
|
||||
- configure : time2_format see 'man strftime'
|
||||
|
||||
2008-05-27
|
||||
- configure : time1_format see 'man strftime'
|
||||
- cleanup code : refresh_pos()
|
||||
|
||||
2008-05-26
|
||||
- catch time event in main loop
|
||||
- draw clock fixed format %H:%M
|
||||
|
||||
2008-05-24
|
||||
- removed boolean parameter task_icon
|
||||
task_icon_size = 0 replace task_icon = 0
|
||||
- all colors parameters can get 2 values : color and opacity (alpha)
|
||||
font_color = #ffffff 70
|
||||
|
||||
2008-05-23
|
||||
- cpu optimisation : limit call to visual_refresh()
|
||||
|
||||
2008-05-22
|
||||
- configure clock : clock_font, clock_font_color
|
||||
|
||||
|
||||
----------------------------------------------------------------
|
||||
2008-05-20 thil7 <lorthiois@bbsoft.fr>
|
||||
released tint-0.5
|
||||
|
||||
2008-05-19
|
||||
- improve usability in mode 'show_all_desktop'
|
||||
-> don't switch desktop when close a task of another desktop
|
||||
-> allow to drag and drop task between desktop
|
||||
- change panel_position : you can now specify top or bottom.
|
||||
values : bottom left, bottom right, bottom center, top left, top right, top center
|
||||
keep compatibility with old tintrc files
|
||||
- change Makefile :
|
||||
add $PREFIX and $DESTDIR
|
||||
install default config file in /etc/xdg/tint/tintrc
|
||||
- on startup, tint copy $XDG_CONFIG_DIR/tint/tintrc in ~/.config/tint/tintrc
|
||||
so each user can customize tintrc
|
||||
- fixed : name of task in fluxbox
|
||||
- improve focus detection (TransientForHint)
|
||||
- cleanup code : send_event
|
||||
|
||||
|
||||
----------------------------------------------------------------
|
||||
2008-05-14 thil7 <lorthiois@bbsoft.fr>
|
||||
released tint-0.4
|
||||
|
||||
2008-05-12
|
||||
- boolean option 'show_all_desktop'
|
||||
0 : tint panel show one taskbar (from current desktop)
|
||||
1 : tint panel show all taskbars (from all desktops)
|
||||
- clic on a task switch to the desktop
|
||||
- clic on a taskbar (if empty) switch to the desktop
|
||||
- add layout for taskbar : panel -> taskbar -> task
|
||||
- cleanup code : state 'active' in Task replaced by task_active in Panel
|
||||
- hide some window : _NET_WM_WINDOW_TYPE_DIALOG, _NET_WM_STATE_MODAL
|
||||
- change project to 'MIT licence'
|
||||
because Pål Staurland put 'MIT licence' in all file source
|
||||
|
||||
|
||||
----------------------------------------------------------------
|
||||
2008-05-10 thil7 <lorthiois@bbsoft.fr>
|
||||
released tint-0.3
|
||||
|
||||
2008-05-10
|
||||
- manage events : 'send to desktop' and 'send to all desktop'
|
||||
- bug solved : 'close' action now send _NET_CLOSE_WINDOW
|
||||
so openoffice ask 'save document...' if needed
|
||||
- cpu optimisation :
|
||||
-> don't redraw panel background on all events. just when desktop change.
|
||||
-> don't remove/add all tasks when switch between desktop. remove 'task_new_desktop()'.
|
||||
- small bug on _NET_WM_STATE_SKIP_TASKBAR corrected
|
||||
- memory leak on g_build_filename
|
||||
|
||||
|
||||
----------------------------------------------------------------
|
||||
2008-05-09 thil7 <lorthiois@bbsoft.fr>
|
||||
released tint-0.2
|
||||
|
||||
2008-05-08
|
||||
- panel : add rounded and border (color and alpha)
|
||||
- remove option 'panel_tasks_centered'
|
||||
- user can configure mouse event on task
|
||||
(none, toggle, iconify, shade, close, toggle_iconify)
|
||||
|
||||
2008-05-07
|
||||
- cpu optimisation : resize_tasks only when add/remove task,
|
||||
compute pos_y at startup
|
||||
|
||||
2008-05-04
|
||||
- task width adjust when too many task
|
||||
|
||||
2008-05-01
|
||||
- task : add rounded and border (color and alpha)
|
||||
- panel position (left, right, center) thank to ak47izatool
|
||||
- cleanup code : vertical position (icon and text),
|
||||
better refresh after delete task, memory leak *font
|
||||
- panel : changed panel_margin and task_margin
|
||||
|
||||
2008-04-22
|
||||
- fork ttm projet from p://code.google.com/p/ttm/ (by Pål Staurland staura@gmail.com)
|
||||
while the projet is no longer in developpement, have not changed the name of 'tint'.
|
||||
|
||||
|
18
README
Normal file
18
README
Normal file
|
@ -0,0 +1,18 @@
|
|||
DEPENDENCIES:
|
||||
cairo, pango, glib, imlib2
|
||||
|
||||
---------------------------------------------------------
|
||||
INSTALL:
|
||||
|
||||
cd to "src" and type "make"
|
||||
as root type "make install"
|
||||
|
||||
execute "tint2"
|
||||
or "tint2 -c path_to_config_file"
|
||||
|
||||
documentation is in /doc
|
||||
|
||||
check http://code.google.com/p/tint2/
|
||||
for latest release, documentation and sample config file.
|
||||
|
||||
|
50
doc/man/tint2.1
Normal file
50
doc/man/tint2.1
Normal file
|
@ -0,0 +1,50 @@
|
|||
.\" Hey, EMACS: -*- nroff -*-
|
||||
.\" First parameter, NAME, should be all caps
|
||||
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
|
||||
.\" other parameters are allowed: see man(7), man(1)
|
||||
.TH TINT 1 "2008-09-05"
|
||||
.\" Please adjust this date whenever revising the manpage.
|
||||
.\"
|
||||
.\" Some roff macros, for reference:
|
||||
.\" .nh disable hyphenation
|
||||
.\" .hy enable hyphenation
|
||||
.\" .ad l left justify
|
||||
.\" .ad b justify to both left and right margins
|
||||
.\" .nf disable filling
|
||||
.\" .fi enable filling
|
||||
.\" .br insert line break
|
||||
.\" .sp <n> insert n+1 empty lines
|
||||
.\" for manpage-specific macros, see man(7)
|
||||
.SH NAME
|
||||
tint \- lightweight taskbar
|
||||
.SH SYNOPSIS
|
||||
.B tint
|
||||
.br
|
||||
.B tint
|
||||
.RI -c
|
||||
.IR /path/to/config/file
|
||||
.SH DESCRIPTION
|
||||
This manual page documents briefly the
|
||||
.B tint
|
||||
command.
|
||||
.PP
|
||||
.\" TeX users may be more comfortable with the \fB<whatever>\fP and
|
||||
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
|
||||
.\" respectively.
|
||||
\fBtint\fP is a simple panel/taskbar intentionally made for openbox3, but
|
||||
should also work with other window managers. It's based on ttm code. The goal is to keep a clean and unintrusive look with code lightweight and
|
||||
compliance with freedesktop specifications.
|
||||
.PP
|
||||
On the first startup tint creates a config file in $HOME/.config/tint/tintrc.
|
||||
See the /usr/share/tint2/doc directory for more information.
|
||||
.SH OPTIONS
|
||||
.TP
|
||||
.B \-c config-file
|
||||
Specify which configuration file to use instead of the default.
|
||||
.SH AUTHOR
|
||||
tint was written by Thierry Lorthiois <lorthiois@bbsoft.fr>. It is based on
|
||||
ttm, originally written by Pål Staurland <staura@gmail.com>
|
||||
.PP
|
||||
This manual page was written by Daniel Moerner <dmoerner@gmail.com>,
|
||||
for the Debian project (but may be used by others). It was adopted from the
|
||||
tint docs.
|
BIN
doc/tint2-0.7.odt
Normal file
BIN
doc/tint2-0.7.odt
Normal file
Binary file not shown.
BIN
doc/tint2-0.7.pdf
Normal file
BIN
doc/tint2-0.7.pdf
Normal file
Binary file not shown.
36
src/Makefile
Normal file
36
src/Makefile
Normal file
|
@ -0,0 +1,36 @@
|
|||
#CFLAGS="-O2"
|
||||
FLAGS=-Wall -g `pkg-config --cflags --libs cairo pangocairo x11 xinerama imlib2 glib-2.0`
|
||||
PROGNAME=tint2
|
||||
FILES=tint.c server.c panel.c config.c taskbar/task.c taskbar/taskbar.c clock/clock.c systray/docker.c systray/icons.c systray/kde.c systray/net.c systray/xproperty.c util/window.c util/area.c
|
||||
|
||||
ifndef DESTDIR
|
||||
ifndef PREFIX
|
||||
BINDIR=/usr/bin
|
||||
XDG_CONFIG_DIR=/etc/xdg
|
||||
else
|
||||
BINDIR=$(PREFIX)/bin
|
||||
XDG_CONFIG_DIR=/etc/xdg
|
||||
endif
|
||||
else
|
||||
BINDIR=$(DESTDIR)/usr/bin
|
||||
XDG_CONFIG_DIR=$(DESTDIR)/etc/xdg
|
||||
endif
|
||||
|
||||
|
||||
$(PROGNAME): $(FILES) $(SYSTRAYOBJ)
|
||||
$(CC) $(CFLAGS) $(FLAGS) -I. -Iutil -Iclock -Itaskbar -Isystray -o $(PROGNAME) $(FILES)
|
||||
strip $(PROGNAME)
|
||||
|
||||
install:
|
||||
mkdir -p $(BINDIR)
|
||||
mkdir -p $(XDG_CONFIG_DIR)/tint2
|
||||
install $(PROGNAME) $(BINDIR)
|
||||
cp -f ../tintrc06 $(XDG_CONFIG_DIR)/tint2/tint2rc
|
||||
cp -f ../doc/man/tint2.1 /usr/man/man1
|
||||
|
||||
uninstall:
|
||||
rm -f $(BINDIR)/$(PROGNAME)
|
||||
|
||||
clean:
|
||||
rm -f $(PROGNAME)
|
||||
|
126
src/clock/clock.c
Normal file
126
src/clock/clock.c
Normal file
|
@ -0,0 +1,126 @@
|
|||
/**************************************************************************
|
||||
*
|
||||
* Tint2 : clock
|
||||
*
|
||||
* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License version 2
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* 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 Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
**************************************************************************/
|
||||
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <cairo.h>
|
||||
#include <cairo-xlib.h>
|
||||
#include <pango/pangocairo.h>
|
||||
|
||||
#include "window.h"
|
||||
#include "server.h"
|
||||
#include "area.h"
|
||||
#include "clock.h"
|
||||
|
||||
|
||||
void init_clock(Clock *clock, int panel_height)
|
||||
{
|
||||
char buf_time[40];
|
||||
char buf_date[40];
|
||||
int time_height, time_height_ink, date_height, date_height_ink;
|
||||
|
||||
if (!clock->time1_format) return;
|
||||
|
||||
if (strchr(clock->time1_format, 'S') == NULL) clock->time_precision = 60;
|
||||
else clock->time_precision = 1;
|
||||
|
||||
gettimeofday(&clock->clock, 0);
|
||||
clock->clock.tv_sec -= clock->clock.tv_sec % clock->time_precision;
|
||||
|
||||
strftime(buf_time, sizeof(buf_time), clock->time1_format, localtime(&clock->clock.tv_sec));
|
||||
if (clock->time2_format)
|
||||
strftime(buf_date, sizeof(buf_date), clock->time2_format, localtime(&clock->clock.tv_sec));
|
||||
|
||||
get_text_size(clock->time1_font_desc, &time_height_ink, &time_height, panel_height, buf_time, strlen(buf_time));
|
||||
clock->time1_posy = (clock->area.height - time_height) / 2;
|
||||
|
||||
if (clock->time2_format) {
|
||||
get_text_size(clock->time2_font_desc, &date_height_ink, &date_height, panel_height, buf_date, strlen(buf_date));
|
||||
|
||||
clock->time1_posy -= ((date_height_ink + 2) / 2);
|
||||
clock->time2_posy = clock->time1_posy + time_height + 2 - (time_height - time_height_ink)/2 - (date_height - date_height_ink)/2;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int draw_foreground_clock (void *obj, cairo_t *c)
|
||||
{
|
||||
Clock *clock = obj;
|
||||
PangoLayout *layout;
|
||||
char buf_time[40];
|
||||
char buf_date[40];
|
||||
int time_width, date_width, new_width;
|
||||
|
||||
time_width = date_width = 0;
|
||||
strftime(buf_time, sizeof(buf_time), clock->time1_format, localtime(&clock->clock.tv_sec));
|
||||
if (clock->time2_format)
|
||||
strftime(buf_date, sizeof(buf_date), clock->time2_format, localtime(&clock->clock.tv_sec));
|
||||
|
||||
layout = pango_cairo_create_layout (c);
|
||||
|
||||
// check width
|
||||
pango_layout_set_font_description (layout, clock->time1_font_desc);
|
||||
pango_layout_set_indent(layout, 0);
|
||||
pango_layout_set_text (layout, buf_time, strlen(buf_time));
|
||||
pango_layout_get_pixel_size (layout, &time_width, NULL);
|
||||
if (clock->time2_format) {
|
||||
pango_layout_set_font_description (layout, clock->time2_font_desc);
|
||||
pango_layout_set_indent(layout, 0);
|
||||
pango_layout_set_text (layout, buf_date, strlen(buf_date));
|
||||
pango_layout_get_pixel_size (layout, &date_width, NULL);
|
||||
}
|
||||
if (time_width > date_width) new_width = time_width;
|
||||
else new_width = date_width;
|
||||
new_width += (2*clock->area.paddingx) + (2*clock->area.border.width);
|
||||
|
||||
if (new_width > clock->area.width || (new_width != clock->area.width && date_width > time_width)) {
|
||||
printf("clock_width %d, new_width %d\n", clock->area.width, new_width);
|
||||
clock->area.width = new_width;
|
||||
|
||||
g_object_unref (layout);
|
||||
return 1;
|
||||
}
|
||||
|
||||
// draw layout
|
||||
pango_layout_set_font_description (layout, clock->time1_font_desc);
|
||||
pango_layout_set_width (layout, clock->area.width * PANGO_SCALE);
|
||||
pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
|
||||
pango_layout_set_text (layout, buf_time, strlen(buf_time));
|
||||
|
||||
cairo_set_source_rgba (c, clock->font.color[0], clock->font.color[1], clock->font.color[2], clock->font.alpha);
|
||||
|
||||
pango_cairo_update_layout (c, layout);
|
||||
cairo_move_to (c, 0, clock->time1_posy);
|
||||
pango_cairo_show_layout (c, layout);
|
||||
|
||||
if (clock->time2_format) {
|
||||
pango_layout_set_font_description (layout, clock->time2_font_desc);
|
||||
pango_layout_set_indent(layout, 0);
|
||||
pango_layout_set_text (layout, buf_date, strlen(buf_date));
|
||||
pango_layout_set_width (layout, clock->area.width * PANGO_SCALE);
|
||||
|
||||
pango_cairo_update_layout (c, layout);
|
||||
cairo_move_to (c, 0, clock->time2_posy);
|
||||
pango_cairo_show_layout (c, layout);
|
||||
}
|
||||
|
||||
g_object_unref (layout);
|
||||
return 0;
|
||||
}
|
||||
|
39
src/clock/clock.h
Normal file
39
src/clock/clock.h
Normal file
|
@ -0,0 +1,39 @@
|
|||
/**************************************************************************
|
||||
* clock :
|
||||
* - draw clock, adjust width
|
||||
*
|
||||
**************************************************************************/
|
||||
|
||||
#ifndef CLOCK_H
|
||||
#define CLOCK_H
|
||||
|
||||
#include <sys/time.h>
|
||||
#include "common.h"
|
||||
#include "area.h"
|
||||
|
||||
|
||||
typedef struct Clock {
|
||||
// --------------------------------------------------
|
||||
// always start with area
|
||||
Area area;
|
||||
|
||||
config_color font;
|
||||
PangoFontDescription *time1_font_desc;
|
||||
PangoFontDescription *time2_font_desc;
|
||||
int time1_posy;
|
||||
int time2_posy;
|
||||
char *time1_format;
|
||||
char *time2_format;
|
||||
|
||||
struct timeval clock;
|
||||
int time_precision;
|
||||
} Clock;
|
||||
|
||||
|
||||
// initialize clock : y position, precision, ...
|
||||
void init_clock(Clock *clock, int panel_height);
|
||||
|
||||
int draw_foreground_clock (void *obj, cairo_t *c);
|
||||
|
||||
|
||||
#endif
|
751
src/config.c
Normal file
751
src/config.c
Normal file
|
@ -0,0 +1,751 @@
|
|||
/**************************************************************************
|
||||
*
|
||||
* Tint2 : read/write config file
|
||||
*
|
||||
* Copyright (C) 2007 Pål Staurland (staura@gmail.com)
|
||||
* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License version 2
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* 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 Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
**************************************************************************/
|
||||
|
||||
#include <sys/stat.h>
|
||||
#include <sys/time.h>
|
||||
#include <unistd.h>
|
||||
#include <cairo.h>
|
||||
#include <cairo-xlib.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/Xatom.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <glib/gstdio.h>
|
||||
#include <pango/pangocairo.h>
|
||||
#include <Imlib2.h>
|
||||
|
||||
#include "common.h"
|
||||
#include "server.h"
|
||||
#include "task.h"
|
||||
#include "taskbar.h"
|
||||
#include "clock.h"
|
||||
#include "panel.h"
|
||||
#include "config.h"
|
||||
#include "window.h"
|
||||
|
||||
|
||||
void cleanup_taskbar()
|
||||
{
|
||||
Task *tsk;
|
||||
Taskbar *tskbar;
|
||||
GSList *l0;
|
||||
for (l0 = panel.area.list; l0 ; l0 = l0->next) {
|
||||
tskbar = l0->data;
|
||||
GSList *l1;
|
||||
for (l1 = tskbar->area.list; l1 ; l1 = l1->next) {
|
||||
tsk = l1->data;
|
||||
remove_task (tsk);
|
||||
}
|
||||
g_slist_free(tskbar->area.list);
|
||||
}
|
||||
g_slist_free(panel.area.list);
|
||||
panel.area.list = 0;
|
||||
}
|
||||
|
||||
|
||||
void cleanup ()
|
||||
{
|
||||
if (panel.old_task_font) free(panel.old_task_font);
|
||||
if (g_task.font_desc) pango_font_description_free(g_task.font_desc);
|
||||
if (panel.clock.time1_font_desc) pango_font_description_free(panel.clock.time1_font_desc);
|
||||
if (panel.clock.time2_font_desc) pango_font_description_free(panel.clock.time2_font_desc);
|
||||
cleanup_taskbar();
|
||||
if (panel.clock.time1_format) g_free(panel.clock.time1_format);
|
||||
if (panel.clock.time2_format) g_free(panel.clock.time2_format);
|
||||
if (server.monitor) free(server.monitor);
|
||||
XCloseDisplay(server.dsp);
|
||||
}
|
||||
|
||||
|
||||
void copy_file(const char *pathSrc, const char *pathDest)
|
||||
{
|
||||
FILE *fileSrc, *fileDest;
|
||||
char line[100];
|
||||
int nb;
|
||||
|
||||
fileSrc = fopen(pathSrc, "rb");
|
||||
if (fileSrc == NULL) return;
|
||||
|
||||
fileDest = fopen(pathDest, "wb");
|
||||
if (fileDest == NULL) return;
|
||||
|
||||
while ((nb = fread(line, 1, 100, fileSrc)) > 0) fwrite(line, 1, nb, fileDest);
|
||||
|
||||
fclose (fileDest);
|
||||
fclose (fileSrc);
|
||||
}
|
||||
|
||||
|
||||
void extract_values (const char *value, char **value1, char **value2)
|
||||
{
|
||||
char *b;
|
||||
|
||||
if (*value1) free (*value1);
|
||||
if (*value2) free (*value2);
|
||||
|
||||
if ((b = strchr (value, ' '))) {
|
||||
b[0] = '\0';
|
||||
b++;
|
||||
*value2 = strdup (b);
|
||||
g_strstrip(*value2);
|
||||
}
|
||||
else *value2 = 0;
|
||||
|
||||
*value1 = strdup (value);
|
||||
g_strstrip(*value1);
|
||||
}
|
||||
|
||||
|
||||
int hex_char_to_int (char c)
|
||||
{
|
||||
int r;
|
||||
|
||||
if (c >= '0' && c <= '9') r = c - '0';
|
||||
else if (c >= 'a' && c <= 'f') r = c - 'a' + 10;
|
||||
else if (c >= 'A' && c <= 'F') r = c - 'A' + 10;
|
||||
else r = 0;
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
|
||||
int hex_to_rgb (char *hex, int *r, int *g, int *b)
|
||||
{
|
||||
int len;
|
||||
|
||||
if (hex == NULL || hex[0] != '#') return (0);
|
||||
|
||||
len = strlen (hex);
|
||||
if (len == 3 + 1) {
|
||||
*r = hex_char_to_int (hex[1]);
|
||||
*g = hex_char_to_int (hex[2]);
|
||||
*b = hex_char_to_int (hex[3]);
|
||||
}
|
||||
else if (len == 6 + 1) {
|
||||
*r = hex_char_to_int (hex[1]) * 16 + hex_char_to_int (hex[2]);
|
||||
*g = hex_char_to_int (hex[3]) * 16 + hex_char_to_int (hex[4]);
|
||||
*b = hex_char_to_int (hex[5]) * 16 + hex_char_to_int (hex[6]);
|
||||
}
|
||||
else if (len == 12 + 1) {
|
||||
*r = hex_char_to_int (hex[1]) * 16 + hex_char_to_int (hex[2]);
|
||||
*g = hex_char_to_int (hex[5]) * 16 + hex_char_to_int (hex[6]);
|
||||
*b = hex_char_to_int (hex[9]) * 16 + hex_char_to_int (hex[10]);
|
||||
}
|
||||
else return 0;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
void get_color (char *hex, double *rgb)
|
||||
{
|
||||
int r, g, b;
|
||||
hex_to_rgb (hex, &r, &g, &b);
|
||||
|
||||
rgb[0] = (r / 255.0);
|
||||
rgb[1] = (g / 255.0);
|
||||
rgb[2] = (b / 255.0);
|
||||
}
|
||||
|
||||
|
||||
void get_action (char *event, int *action)
|
||||
{
|
||||
if (strcmp (event, "none") == 0)
|
||||
*action = NONE;
|
||||
else if (strcmp (event, "close") == 0)
|
||||
*action = CLOSE;
|
||||
else if (strcmp (event, "toggle") == 0)
|
||||
*action = TOGGLE;
|
||||
else if (strcmp (event, "iconify") == 0)
|
||||
*action = ICONIFY;
|
||||
else if (strcmp (event, "shade") == 0)
|
||||
*action = SHADE;
|
||||
else if (strcmp (event, "toggle_iconify") == 0)
|
||||
*action = TOGGLE_ICONIFY;
|
||||
}
|
||||
|
||||
|
||||
void add_entry (char *key, char *value)
|
||||
{
|
||||
char *value1=0, *value2=0;
|
||||
|
||||
/* Background and border */
|
||||
if (strcmp (key, "rounded") == 0) {
|
||||
// 'rounded' is the first parameter => alloc a new background
|
||||
Area *back = calloc(1, sizeof(Area));
|
||||
back->border.rounded = atoi (value);
|
||||
list_back = g_slist_append(list_back, back);
|
||||
}
|
||||
else if (strcmp (key, "border_width") == 0) {
|
||||
Area *back = g_slist_last(list_back)->data;
|
||||
back->border.width = atoi (value);
|
||||
}
|
||||
else if (strcmp (key, "background_color") == 0) {
|
||||
Area *back = g_slist_last(list_back)->data;
|
||||
extract_values(value, &value1, &value2);
|
||||
get_color (value1, back->back.color);
|
||||
if (value2) back->back.alpha = (atoi (value2) / 100.0);
|
||||
else back->back.alpha = 0.5;
|
||||
}
|
||||
else if (strcmp (key, "border_color") == 0) {
|
||||
Area *back = g_slist_last(list_back)->data;
|
||||
extract_values(value, &value1, &value2);
|
||||
get_color (value1, back->border.color);
|
||||
if (value2) back->border.alpha = (atoi (value2) / 100.0);
|
||||
else back->border.alpha = 0.5;
|
||||
}
|
||||
|
||||
/* Panel */
|
||||
else if (strcmp (key, "panel_monitor") == 0) {
|
||||
panel.monitor = atoi (value);
|
||||
if (panel.monitor > 0) panel.monitor -= 1;
|
||||
}
|
||||
else if (strcmp (key, "panel_size") == 0) {
|
||||
extract_values(value, &value1, &value2);
|
||||
panel.area.width = atoi (value1);
|
||||
if (value2) panel.area.height = atoi (value2);
|
||||
}
|
||||
else if (strcmp (key, "panel_margin") == 0) {
|
||||
extract_values(value, &value1, &value2);
|
||||
panel.marginx = atoi (value1);
|
||||
if (value2) panel.marginy = atoi (value2);
|
||||
}
|
||||
else if (strcmp (key, "panel_padding") == 0) {
|
||||
extract_values(value, &value1, &value2);
|
||||
panel.area.paddingx = atoi (value1);
|
||||
if (value2) panel.area.paddingy = atoi (value2);
|
||||
}
|
||||
else if (strcmp (key, "panel_position") == 0) {
|
||||
extract_values(value, &value1, &value2);
|
||||
if (strcmp (value1, "top") == 0) panel.position = TOP;
|
||||
else panel.position = BOTTOM;
|
||||
|
||||
if (!value2) panel.position = CENTER;
|
||||
else {
|
||||
if (strcmp (value2, "left") == 0) panel.position |= LEFT;
|
||||
else {
|
||||
if (strcmp (value2, "right") == 0) panel.position |= RIGHT;
|
||||
else panel.position |= CENTER;
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (strcmp (key, "font_shadow") == 0)
|
||||
g_task.font_shadow = atoi (value);
|
||||
else if (strcmp (key, "panel_background_id") == 0) {
|
||||
int id = atoi (value);
|
||||
Area *back = g_slist_nth_data(list_back, id);
|
||||
memcpy(&panel.area.back, &back->back, sizeof(Color));
|
||||
memcpy(&panel.area.border, &back->border, sizeof(Border));
|
||||
}
|
||||
|
||||
/* Clock */
|
||||
else if (strcmp (key, "time1_format") == 0) {
|
||||
if (panel.clock.time1_format) g_free(panel.clock.time1_format);
|
||||
if (strlen(value) > 0) panel.clock.time1_format = strdup (value);
|
||||
else panel.clock.time1_format = 0;
|
||||
}
|
||||
else if (strcmp (key, "time2_format") == 0) {
|
||||
if (panel.clock.time2_format) g_free(panel.clock.time2_format);
|
||||
if (strlen(value) > 0) panel.clock.time2_format = strdup (value);
|
||||
else panel.clock.time2_format = 0;
|
||||
}
|
||||
else if (strcmp (key, "time1_font") == 0) {
|
||||
if (panel.clock.time1_font_desc) pango_font_description_free(panel.clock.time1_font_desc);
|
||||
panel.clock.time1_font_desc = pango_font_description_from_string (value);
|
||||
}
|
||||
else if (strcmp (key, "time2_font") == 0) {
|
||||
if (panel.clock.time2_font_desc) pango_font_description_free(panel.clock.time2_font_desc);
|
||||
panel.clock.time2_font_desc = pango_font_description_from_string (value);
|
||||
}
|
||||
else if (strcmp (key, "clock_font_color") == 0) {
|
||||
extract_values(value, &value1, &value2);
|
||||
get_color (value1, panel.clock.font.color);
|
||||
if (value2) panel.clock.font.alpha = (atoi (value2) / 100.0);
|
||||
else panel.clock.font.alpha = 0.1;
|
||||
}
|
||||
else if (strcmp (key, "clock_padding") == 0) {
|
||||
extract_values(value, &value1, &value2);
|
||||
panel.clock.area.paddingx = atoi (value1);
|
||||
if (value2) panel.clock.area.paddingy = atoi (value2);
|
||||
}
|
||||
else if (strcmp (key, "clock_background_id") == 0) {
|
||||
int id = atoi (value);
|
||||
Area *back = g_slist_nth_data(list_back, id);
|
||||
memcpy(&panel.clock.area.back, &back->back, sizeof(Color));
|
||||
memcpy(&panel.clock.area.border, &back->border, sizeof(Border));
|
||||
}
|
||||
|
||||
/* Taskbar */
|
||||
else if (strcmp (key, "taskbar_mode") == 0) {
|
||||
if (strcmp (value, "multi_desktop") == 0) panel.mode = MULTI_DESKTOP;
|
||||
else if (strcmp (value, "multi_monitor") == 0) panel.mode = MULTI_MONITOR;
|
||||
else panel.mode = SINGLE_DESKTOP;
|
||||
}
|
||||
else if (strcmp (key, "taskbar_padding") == 0) {
|
||||
extract_values(value, &value1, &value2);
|
||||
g_taskbar.paddingx = atoi (value1);
|
||||
if (value2) g_taskbar.paddingy = atoi (value2);
|
||||
}
|
||||
else if (strcmp (key, "taskbar_background_id") == 0) {
|
||||
int id = atoi (value);
|
||||
Area *back = g_slist_nth_data(list_back, id);
|
||||
memcpy(&g_taskbar.back, &back->back, sizeof(Color));
|
||||
memcpy(&g_taskbar.border, &back->border, sizeof(Border));
|
||||
}
|
||||
|
||||
/* Task */
|
||||
else if (strcmp (key, "task_text") == 0)
|
||||
g_task.text = atoi (value);
|
||||
else if (strcmp (key, "task_icon") == 0)
|
||||
g_task.icon = atoi (value);
|
||||
else if (strcmp (key, "task_centered") == 0)
|
||||
g_task.centered = atoi (value);
|
||||
else if (strcmp (key, "task_width") == 0)
|
||||
g_task.maximum_width = atoi (value);
|
||||
else if (strcmp (key, "task_padding") == 0) {
|
||||
extract_values(value, &value1, &value2);
|
||||
g_task.area.paddingx = atoi (value1);
|
||||
g_task.area_active.paddingx = atoi (value1);
|
||||
if (value2) {
|
||||
g_task.area.paddingy = atoi (value2);
|
||||
g_task.area_active.paddingy = atoi (value2);
|
||||
}
|
||||
}
|
||||
else if (strcmp (key, "task_font") == 0) {
|
||||
if (g_task.font_desc) pango_font_description_free(g_task.font_desc);
|
||||
g_task.font_desc = pango_font_description_from_string (value);
|
||||
}
|
||||
else if (strcmp (key, "task_font_color") == 0) {
|
||||
extract_values(value, &value1, &value2);
|
||||
get_color (value1, g_task.font.color);
|
||||
if (value2) g_task.font.alpha = (atoi (value2) / 100.0);
|
||||
else g_task.font.alpha = 0.1;
|
||||
}
|
||||
else if (strcmp (key, "task_active_font_color") == 0) {
|
||||
extract_values(value, &value1, &value2);
|
||||
get_color (value1, g_task.font_active.color);
|
||||
if (value2) g_task.font_active.alpha = (atoi (value2) / 100.0);
|
||||
else g_task.font_active.alpha = 0.1;
|
||||
}
|
||||
else if (strcmp (key, "task_background_id") == 0) {
|
||||
int id = atoi (value);
|
||||
Area *back = g_slist_nth_data(list_back, id);
|
||||
memcpy(&g_task.area.back, &back->back, sizeof(Color));
|
||||
memcpy(&g_task.area.border, &back->border, sizeof(Border));
|
||||
}
|
||||
else if (strcmp (key, "task_active_background_id") == 0) {
|
||||
int id = atoi (value);
|
||||
Area *back = g_slist_nth_data(list_back, id);
|
||||
memcpy(&g_task.area_active.back, &back->back, sizeof(Color));
|
||||
memcpy(&g_task.area_active.border, &back->border, sizeof(Border));
|
||||
}
|
||||
|
||||
/* Mouse actions */
|
||||
else if (strcmp (key, "mouse_middle") == 0)
|
||||
get_action (value, &panel.mouse_middle);
|
||||
else if (strcmp (key, "mouse_right") == 0)
|
||||
get_action (value, &panel.mouse_right);
|
||||
else if (strcmp (key, "mouse_scroll_up") == 0)
|
||||
get_action (value, &panel.mouse_scroll_up);
|
||||
else if (strcmp (key, "mouse_scroll_down") == 0)
|
||||
get_action (value, &panel.mouse_scroll_down);
|
||||
|
||||
|
||||
/* Read old config for backward compatibility */
|
||||
else if (strcmp (key, "font") == 0) {
|
||||
panel.old_config_file = 1;
|
||||
if (g_task.font_desc) pango_font_description_free(g_task.font_desc);
|
||||
g_task.font_desc = pango_font_description_from_string (value);
|
||||
if (panel.old_task_font) free(panel.old_task_font);
|
||||
panel.old_task_font = strdup (value);
|
||||
}
|
||||
else if (strcmp (key, "font_color") == 0)
|
||||
get_color (value, g_task.font.color);
|
||||
else if (strcmp (key, "font_alpha") == 0)
|
||||
g_task.font.alpha = (atoi (value) / 100.0);
|
||||
else if (strcmp (key, "font_active_color") == 0)
|
||||
get_color (value, g_task.font_active.color);
|
||||
else if (strcmp (key, "font_active_alpha") == 0)
|
||||
g_task.font_active.alpha = (atoi (value) / 100.0);
|
||||
else if (strcmp (key, "panel_show_all_desktop") == 0) {
|
||||
if (atoi (value) == 0) panel.mode = SINGLE_DESKTOP;
|
||||
else panel.mode = MULTI_DESKTOP;
|
||||
}
|
||||
else if (strcmp (key, "panel_width") == 0)
|
||||
panel.area.width = atoi (value);
|
||||
else if (strcmp (key, "panel_height") == 0)
|
||||
panel.area.height = atoi (value);
|
||||
else if (strcmp (key, "panel_background") == 0)
|
||||
panel.old_panel_background = atoi (value);
|
||||
else if (strcmp (key, "panel_background_alpha") == 0)
|
||||
panel.area.back.alpha = (atoi (value) / 100.0);
|
||||
else if (strcmp (key, "panel_border_alpha") == 0)
|
||||
panel.area.border.alpha = (atoi (value) / 100.0);
|
||||
else if (strcmp (key, "task_icon") == 0)
|
||||
panel.old_task_icon = atoi (value);
|
||||
else if (strcmp (key, "task_background") == 0)
|
||||
panel.old_task_background = atoi (value);
|
||||
else if (strcmp (key, "task_background_alpha") == 0)
|
||||
g_task.area.back.alpha = (atoi (value) / 100.0);
|
||||
else if (strcmp (key, "task_active_background_alpha") == 0)
|
||||
g_task.area_active.back.alpha = (atoi (value) / 100.0);
|
||||
else if (strcmp (key, "task_border_alpha") == 0)
|
||||
g_task.area.border.alpha = (atoi (value) / 100.0);
|
||||
else if (strcmp (key, "task_active_border_alpha") == 0)
|
||||
g_task.area_active.border.alpha = (atoi (value) / 100.0);
|
||||
// disabled parameters
|
||||
else if (strcmp (key, "task_active_border_width") == 0) ;
|
||||
else if (strcmp (key, "task_active_rounded") == 0) ;
|
||||
|
||||
else
|
||||
fprintf(stderr, "Invalid option: \"%s\", correct your config file\n", key);
|
||||
|
||||
if (value1) free (value1);
|
||||
if (value2) free (value2);
|
||||
}
|
||||
|
||||
|
||||
int parse_line (const char *line)
|
||||
{
|
||||
char *a, *b, *key, *value;
|
||||
|
||||
/* Skip useless lines */
|
||||
if ((line[0] == '#') || (line[0] == '\n')) return 0;
|
||||
if (!(a = strchr (line, '='))) return 0;
|
||||
|
||||
/* overwrite '=' with '\0' */
|
||||
a[0] = '\0';
|
||||
key = strdup (line);
|
||||
a++;
|
||||
|
||||
/* overwrite '\n' with '\0' if '\n' present */
|
||||
if ((b = strchr (a, '\n'))) b[0] = '\0';
|
||||
|
||||
value = strdup (a);
|
||||
|
||||
g_strstrip(key);
|
||||
g_strstrip(value);
|
||||
|
||||
add_entry (key, value);
|
||||
|
||||
free (key);
|
||||
free (value);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
void config_taskbar()
|
||||
{
|
||||
int i, j;
|
||||
|
||||
if (g_task.area.border.rounded > g_task.area.height/2) {
|
||||
g_task.area.border.rounded = g_task.area.height/2;
|
||||
g_task.area_active.border.rounded = g_task.area.border.rounded;
|
||||
}
|
||||
|
||||
for (i=0 ; i < 15 ; i++) {
|
||||
server.nb_desktop = server_get_number_of_desktop ();
|
||||
if (server.nb_desktop > 0) break;
|
||||
sleep(1);
|
||||
}
|
||||
if (server.nb_desktop == 0) {
|
||||
server.nb_desktop = 1;
|
||||
fprintf(stderr, "tint2 warning : cannot found number of desktop.\n");
|
||||
}
|
||||
|
||||
cleanup_taskbar();
|
||||
|
||||
panel.nb_desktop = server.nb_desktop;
|
||||
if (panel.mode == MULTI_MONITOR) panel.nb_monitor = server.nb_monitor;
|
||||
else panel.nb_monitor = 1;
|
||||
|
||||
// TODO: mémoriser le pointeur sur la première
|
||||
// malgré l'apparant désordre, les taskbars sont ordonnées
|
||||
Taskbar *new_tskbar;
|
||||
for (i=0 ; i < panel.nb_desktop ; i++) {
|
||||
for (j=0 ; j < panel.nb_monitor ; j++) {
|
||||
new_tskbar = calloc(1, sizeof(Taskbar));
|
||||
memcpy(&new_tskbar->area, &g_taskbar, sizeof(Area));
|
||||
new_tskbar->desktop = i;
|
||||
new_tskbar->monitor = j;
|
||||
|
||||
panel.area.list = g_slist_append(panel.area.list, new_tskbar);
|
||||
}
|
||||
}
|
||||
/*
|
||||
comment faire pour parcourir les barres de taches ? on ne peut pas se baser sur l'ordre des éléments !!
|
||||
a t'on besoin de parcourir les barres de taches ?? OUI !! bof ??
|
||||
=> resize_taskbar() dans panel.c =>
|
||||
=> task_refresh_tasklist () dans taskbar.c
|
||||
=> Task *task_get_task (Window win) dans taskbar.c
|
||||
=> event_button_press (int x, int y) dans tint.c => area->event_button_press() est conseillé !!
|
||||
cela enlève aussi l'organisation des barres de taches en tableau à 2 dimensions
|
||||
il est possible de mémoriser un pointeur sur la première barre de taches
|
||||
*/
|
||||
|
||||
//printf("tasbar (desktop x monitor) : (%d x %d)\n", panel.nb_desktop, panel.nb_monitor);
|
||||
resize_taskbar();
|
||||
task_refresh_tasklist ();
|
||||
panel.refresh = 1;
|
||||
}
|
||||
|
||||
|
||||
void config_finish ()
|
||||
{
|
||||
int height_ink, height;
|
||||
|
||||
if (panel.old_config_file) save_config();
|
||||
|
||||
// get monitor's configuration
|
||||
get_monitors();
|
||||
|
||||
if (panel.monitor > (server.nb_monitor-1)) {
|
||||
panel.sleep_mode = 1;
|
||||
printf("tint2 sleep and wait monitor %d.\n", panel.monitor+1);
|
||||
}
|
||||
else {
|
||||
panel.sleep_mode = 0;
|
||||
//printf("tint2 wake up on monitor %d\n", panel.monitor+1);
|
||||
if (!server.monitor[panel.monitor].width || !server.monitor[panel.monitor].height)
|
||||
fprintf(stderr, "tint2 error : invalid monitor size.\n");
|
||||
}
|
||||
|
||||
if (!panel.area.width) panel.area.width = server.monitor[panel.monitor].width;
|
||||
|
||||
// taskbar
|
||||
g_taskbar.posy = panel.area.border.width + panel.area.paddingy;
|
||||
g_taskbar.height = panel.area.height - (2 * g_taskbar.posy);
|
||||
g_taskbar.redraw = 1;
|
||||
|
||||
// task
|
||||
g_task.area.posy = g_taskbar.posy + g_taskbar.border.width + g_taskbar.paddingy;
|
||||
g_task.area_active.posy = g_task.area.posy;
|
||||
g_task.area.height = panel.area.height - (2 * g_task.area.posy);
|
||||
g_task.area_active.height = g_task.area.height;
|
||||
g_task.area.redraw = 1;
|
||||
|
||||
if (!g_task.maximum_width)
|
||||
g_task.maximum_width = server.monitor[panel.monitor].width;
|
||||
|
||||
if (panel.area.border.rounded > panel.area.height/2)
|
||||
panel.area.border.rounded = panel.area.height/2;
|
||||
|
||||
// clock
|
||||
panel.clock.area.posy = panel.area.border.width + panel.area.paddingy;
|
||||
panel.clock.area.height = panel.area.height - (2 * panel.clock.area.posy);
|
||||
panel.clock.area.redraw = 1;
|
||||
init_clock(&panel.clock, panel.area.height);
|
||||
|
||||
// compute vertical position : text and icon
|
||||
get_text_size(g_task.font_desc, &height_ink, &height, panel.area.height, "TAjpg", 5);
|
||||
g_task.text_posy = (g_task.area.height - height) / 2.0;
|
||||
|
||||
// add task_icon_size
|
||||
g_task.text_posx = g_task.area.paddingx + g_task.area.border.width;
|
||||
if (g_task.icon) {
|
||||
g_task.icon_size1 = g_task.area.height - (2 * g_task.area.paddingy);
|
||||
g_task.text_posx += g_task.icon_size1;
|
||||
g_task.icon_posy = (g_task.area.height - g_task.icon_size1) / 2;
|
||||
}
|
||||
|
||||
config_taskbar();
|
||||
|
||||
// cleanup background list
|
||||
GSList *l0;
|
||||
for (l0 = list_back; l0 ; l0 = l0->next) {
|
||||
free(l0->data);
|
||||
}
|
||||
g_slist_free(list_back);
|
||||
}
|
||||
|
||||
|
||||
int config_read ()
|
||||
{
|
||||
const gchar * const * system_dirs;
|
||||
char *path1, *path2, *dir;
|
||||
gint i;
|
||||
|
||||
// check tint2rc file according to XDG specification
|
||||
path1 = g_build_filename (g_get_user_config_dir(), "tint2", "tint2rc", NULL);
|
||||
if (!g_file_test (path1, G_FILE_TEST_EXISTS)) {
|
||||
|
||||
path2 = 0;
|
||||
system_dirs = g_get_system_config_dirs();
|
||||
for (i = 0; system_dirs[i]; i++) {
|
||||
path2 = g_build_filename(system_dirs[i], "tint2", "tint2rc", NULL);
|
||||
|
||||
if (g_file_test(path2, G_FILE_TEST_EXISTS)) break;
|
||||
g_free (path2);
|
||||
path2 = 0;
|
||||
}
|
||||
|
||||
if (path2) {
|
||||
// copy file in user directory (path1)
|
||||
dir = g_build_filename (g_get_user_config_dir(), "tint2", NULL);
|
||||
if (!g_file_test (dir, G_FILE_TEST_IS_DIR)) g_mkdir(dir, 0777);
|
||||
g_free(dir);
|
||||
|
||||
copy_file(path2, path1);
|
||||
g_free(path2);
|
||||
}
|
||||
}
|
||||
|
||||
i = config_read_file (path1);
|
||||
g_free(path1);
|
||||
return i;
|
||||
}
|
||||
|
||||
|
||||
int config_read_file (const char *path)
|
||||
{
|
||||
FILE *fp;
|
||||
char line[80];
|
||||
|
||||
if ((fp = fopen(path, "r")) == NULL) return 0;
|
||||
|
||||
while (fgets(line, sizeof(line), fp) != NULL)
|
||||
parse_line (line);
|
||||
|
||||
fclose (fp);
|
||||