1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-20 03:51:18 +00:00
Commit Graph

75 Commits

Author SHA1 Message Date
Nikolas Garofil
4addf71241 Make 16768a5ad4 C90-compliant 2009-07-14 19:17:14 +02:00
Cesare Tirabassi
1e5bc370e4 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-07-14 18:47:00 +02:00
Cesare Tirabassi
16768a5ad4 Fix Property Change Events are passes also to OWN_WINDOW 2009-07-14 18:46:15 +02:00
Nikolas Garofil
cd92949e67 Fix strange effects on desktop caused by 4a14668772 2009-07-14 18:10:43 +02:00
Nikolas Garofil
d75fb18bf8 Fix building with strict compilers 2009-07-14 17:43:27 +02:00
Cesare Tirabassi
7bbde2be73 refactored desktop info code so that its only called on X property events; TO DO doesn't work with own_window 2009-07-14 16:57:51 +02:00
Cesare Tirabassi
602edfea15 Fix compilation with --disable-own-window (sf.net #2820716) 2009-07-13 23:19:32 +02:00
Nikolas Garofil
ed4d2ce0b1 Remove old,unused desktop-finding code 2009-07-13 17:32:33 +02:00
Cesare Tirabassi
88ae603cf5 Add support for $desktop, $desktop_number and $desktop_name
Should work with any window manager that supports the
freedesktop.org Window Manager Specification
(see http://www.freedesktop.org/wiki/Specifications/wm-spec).

I have tested succesfully with openbox but some more testing with other
wm would be needed!

Support is built-in; if it is not acceptable to loose cpu cycles for this
at every conky refresh step than it should be conditionally compiled.
2009-07-11 10:50:02 +02:00
Brenden Matthews
2fa5f97edb A whole bunch of changes, mostly Lua related.
Improved Lua API (lua_read_parse has been removed in favour of the
conky_parse() Lua API call).  The docs have been improved to reflect the
recent Lua API stuff as well.  Introduced new Lua Cairo and Imlib2
bindings, which require the tolua++ tool.  Fixed some other
miscellaneous doc related things.
2009-07-09 22:47:41 -06:00
Phil Sutter
775d591a68 fix a few memleaks 2009-06-22 02:00:11 +02:00
Ole Christian Tvedt
23e89dca08 Added own_window_type panel
The panel type reserves space along the edge of the
screen, just like regular DE panels, taskbars and the
like. I have tested it for several hours now with lots
of different settings, and it seems to be working fine.

Works especially well with alignment top_??? or
bottom_??? and single-line output. Something like
this:

  own_window yes
  own_window_type panel

  alignment bottom_left
  maximum_width 1680
  minimum_size 1680
  gap_x 0
  gap_y 0

  stippled_borders 1
  draw_borders yes

  update_interval 3.0

  TEXT
  $nodename $tab $freq_g ${color grey}GHz$color $tab $memperc% ${color grey}RAM$color $tab $cpu% ${color grey}CPU $tab etc...etc...$alignr${time %F %R}

The line after TEXT is supposed to be on one line,
just in case some channel has messed it up.

Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-06-13 17:46:09 -06:00
Brenden Matthews
2469b9bea9 Fixed a regression with font rendering.
Fixed a regression which causes fonts to not be rendered properly with
certain types of windows.
2009-06-09 18:39:26 -06:00
Brenden Matthews
00e559aef8 reload_config() fix, fix default net graph args.
Closing the X display on reload caused some weirdness.  We can just
leave it open between reloads.  For whatever reason we had a macro
inside quotes for the default net device.
2009-06-06 22:53:40 -06:00
Phil Sutter
8407d6b3c9 clarify what the preprocessor define does here 2009-06-04 21:46:45 +02:00
Brenden Matthews
295203dd4c Fix an issue with reload_config()? 2009-05-30 21:06:49 -06:00
Nikos Ntarmos
0c62f02553 XCloseDisplay(3) on re-init_X11()
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-05-28 21:27:55 -06:00
Brenden Matthews
dd5fbeb41b Improve reload_config() window destruction/creation. 2009-05-19 21:34:43 -06:00
Brenden Matthews
31ed5ba178 Some work on imlib2 stuff. 2009-05-05 21:45:05 -06:00
Brenden Matthews
a98a927116 Merge branch 'master' into imlib2
Conflicts:
	configure.ac.in
	src/conky.c
2009-05-01 23:29:21 -06:00
Nikos Ntarmos
f91faa64b8 Add X11 display argument/conf entry (FR #2474243)
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Brenden Matthews <brenden@rty.ca>
2009-04-01 16:46:16 -06:00
Brenden Matthews
f05829ad9a Update copyright stuff, fix conky.conf weirdness. 2009-03-29 22:55:51 -06:00
Brenden Matthews
5378d13cfb some imlib2 work 2009-03-18 22:02:25 -06:00
Phil Sutter
9a85812e06 here comes the big header include rewrite
Some statics are now defined by configure.ac.in, conky.h got a lot
smaller, which I see as a positive sign.

This patch should not change any functionality, just change what's
defined where. Some features I did/could not test are probably broken,
also compiling for any other OS surely won't complete now. Though I
think fixing these problems is as easy as including some missing
headers.

I've done compile checks with the following configure options:
./configure --enable-eve --enable-rss --enable-smapi
	--enable-wlan --enable-debug --enable-testing

So what needs to be tested is:
- audacious
- BMPx
- xmms2
- nvidia
2008-12-15 23:12:33 +01:00
Brenden Matthews
dc3ed8df13 Removing old svn keywords. 2008-12-09 16:35:49 -07:00
Phil Sutter
92bdce5d1a set conky in dock mode to be withdrawn
Withdrawn windows are those you get from applications supporting the
'-w' flag, like e.g. gkrellm or all those sweet WindowMaker dockapps
(wmcpu and Co.). In Fluxbox, these windows are drawn into the slit. Most
other window managers put them into their "taskbar", AFAIK.
This patch makes Conky act exactly the same if the following settings
are selected:

| own_window yes
| own_window_type dock
2008-12-08 01:45:12 +01:00
Nikolas Garofil
23321c408d made defines of some literal values and defines to configure.ac.in
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1223 7f574dfc-610e-0410-a909-a81674777703
2008-07-12 10:25:05 +00:00
Nikolas Garofil
312d3d6de8 Merge with conky1-extra, Changelog contains the changes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1193 7f574dfc-610e-0410-a909-a81674777703
2008-06-21 20:37:58 +00:00
Nikolas Garofil
c1c34ae443 'inline' removed from functions that are called from different files
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1187 7f574dfc-610e-0410-a909-a81674777703
2008-06-21 14:18:44 +00:00
Brenden Matthews
fda6b66eb9 * own_window_type dock patch (thanks Morgan).
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1115 7f574dfc-610e-0410-a909-a81674777703
2008-04-29 21:31:04 +00:00
Brenden Matthews
39a00f4cfa fixed hddtemp problems as well as some other misc things
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1112 7f574dfc-610e-0410-a909-a81674777703
2008-04-22 22:54:22 +00:00
Brenden Matthews
d46bcb0945 * Added patch to use mail_spool correctly (thanks Kapil)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1099 7f574dfc-610e-0410-a909-a81674777703
2008-04-02 18:29:08 +00:00
Brenden Matthews
be2cd44e6d doc cleanup
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1090 7f574dfc-610e-0410-a909-a81674777703
2008-03-31 04:56:39 +00:00
Phil
e306a2c2e8 some linting on function definitions
* instead of empty args "void" should always be specified.
  Using this, the compiler can detect incorrect function calls,
  like with update_stuff().
* No args seems to be interpreted as "unspecified args" by the
  compiler, as with update_mail_count(). So no checking for
  correctness of arguments when calling was done at all.
* This is not complete yet, as I still don't have any BSD for
  testing.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1055 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 02:01:03 +00:00
Kevin Lyles
3d26a4880e Reformatted all code
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1007 7f574dfc-610e-0410-a909-a81674777703
2008-02-20 20:30:45 +00:00
Brenden Matthews
27b4c8550c clarifying licensing
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@904 7f574dfc-610e-0410-a909-a81674777703
2007-08-10 19:53:44 +00:00
Philip Kovacs
1c35f432e5 Conky 1.5.0 -- client/server prototype
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@818 7f574dfc-610e-0410-a909-a81674777703
2006-12-23 06:01:16 +00:00
Philip Kovacs
57688b94d5 remove sleep() calls from pop2/imap code; remove debug statements on terminal. e.g. hints, thread destruction
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@796 7f574dfc-610e-0410-a909-a81674777703
2006-11-28 07:26:57 +00:00
Roman Bogorodskiy
60393cc107 Include <string.h> for strncpy().
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@757 7f574dfc-610e-0410-a909-a81674777703
2006-11-12 06:38:21 +00:00
Philip Kovacs
7d71ea09e8 minor macro changes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@733 7f574dfc-610e-0410-a909-a81674777703
2006-11-07 02:19:58 +00:00
Philip Kovacs
06760dc4f3 x11.c revised for clarity
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@575 7f574dfc-610e-0410-a909-a81674777703
2006-03-09 18:51:57 +00:00
Philip Kovacs
aaa70cf062 added own_window_type override
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@570 7f574dfc-610e-0410-a909-a81674777703
2006-03-09 02:28:38 +00:00
Philip Kovacs
49c9b8d6d5 forward ButtonRelease too
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@569 7f574dfc-610e-0410-a909-a81674777703
2006-03-08 23:02:28 +00:00
Philip Kovacs
b93a28ee61 added own_window_type config item
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@568 7f574dfc-610e-0410-a909-a81674777703
2006-03-08 22:17:27 +00:00
Philip Kovacs
900b4e1e17 CARD32 is better
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@567 7f574dfc-610e-0410-a909-a81674777703
2006-03-08 06:31:18 +00:00
Philip Kovacs
3609fe4bb5 replaced uint32_t
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@565 7f574dfc-610e-0410-a909-a81674777703
2006-03-08 06:01:43 +00:00
Philip Kovacs
5b4fcec386 misc doc
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@563 7f574dfc-610e-0410-a909-a81674777703
2006-03-08 04:14:50 +00:00
Philip Kovacs
12c36bd8d9 give parent a sec to terminate
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@559 7f574dfc-610e-0410-a909-a81674777703
2006-03-07 20:35:11 +00:00
Philip Kovacs
d7b85bbf02 find_desktop_window() api changes. window parent s/b root, not desktop,
otherwise the window manager may not control the window.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@558 7f574dfc-610e-0410-a909-a81674777703
2006-03-07 19:46:51 +00:00
Philip Kovacs
4df5f91016 EWMH sticky
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@551 7f574dfc-610e-0410-a909-a81674777703
2006-03-07 05:55:23 +00:00