Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-19 19:45:15 +00:00
Code Issues Releases Activity
1,322 Commits 5 Branches 46 Tags 22 MiB
76dedfd563
Commit Graph

56 Commits

Author SHA1 Message Date
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
Philip Kovacs
580c2c8f34 minor 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@550 7f574dfc-610e-0410-a909-a81674777703
 2006-03-07 05:40:35 +00:00
Brenden Matthews
ac23be3d25 sticky hints 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@548 7f574dfc-610e-0410-a909-a81674777703
 2006-03-07 04:23:55 +00:00
Philip Kovacs
8ad961d96f hints fix, reprise??? 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@547 7f574dfc-610e-0410-a909-a81674777703
 2006-03-07 04:01:32 +00:00
Philip Kovacs
077b3dd15f hints fix, reprise??? 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@546 7f574dfc-610e-0410-a909-a81674777703
 2006-03-07 03:53:45 +00:00
Philip Kovacs
1cc3eb98cd hints fix??? 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@545 7f574dfc-610e-0410-a909-a81674777703
 2006-03-07 03:40:00 +00:00
Philip Kovacs
1d6a4ddde9 added own_window_hints 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@543 7f574dfc-610e-0410-a909-a81674777703
 2006-03-06 23:35:41 +00:00
Philip Kovacs
d265a2d05a conky back under WM control for own_window yes 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@541 7f574dfc-610e-0410-a909-a81674777703
 2006-03-06 05:58:58 +00:00
Philip Kovacs
a41653b74a on_bottom and wm_class_name deprecated 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@533 7f574dfc-610e-0410-a909-a81674777703
 2006-02-14 17:33:31 +00:00
Philip Kovacs
741ffe4b6e drastic simplifications for own_window=yes 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@532 7f574dfc-610e-0410-a909-a81674777703
 2006-02-14 06:15:38 +00:00
Philip Kovacs
3b04e3ecfe using EWM hints STICKY/SKIP_PAGER/SKIP_TASKBAR; window type NORMAL 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@513 7f574dfc-610e-0410-a909-a81674777703
 2006-01-26 19:57:12 +00:00
Philip Kovacs
d7f669a00d set extended wm hint _NET_WM_WINDOW_TYPE to _UTILITY 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@509 7f574dfc-610e-0410-a909-a81674777703
 2006-01-26 01:27:41 +00:00
Brenden Matthews
2d14e4af68 couple small fixes 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@455 7f574dfc-610e-0410-a909-a81674777703
 2005-12-31 17:36:16 +00:00
David Carter
4830c18459 num_chars not used (thanks pkovacs) 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@405 7f574dfc-610e-0410-a909-a81674777703
 2005-11-12 15:33:22 +00:00
David Carter
50866b5efe fix stale static process pointer in top.c and add nodename to X window 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@402 7f574dfc-610e-0410-a909-a81674777703
 2005-11-12 03:41:55 +00:00
Brenden Matthews
cf4392a51d wm_class patch 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@356 7f574dfc-610e-0410-a909-a81674777703
 2005-10-29 01:03:01 +00:00
Brenden Matthews
3441f53fc6 undo changes 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@335 7f574dfc-610e-0410-a909-a81674777703
 2005-09-28 03:21:10 +00:00
Brenden Matthews
ca591b58c3 x11 patch 1291420 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@325 7f574dfc-610e-0410-a909-a81674777703
 2005-09-16 01:11:19 +00:00
Brenden Matthews
0f17101d64 small fixes 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@318 7f574dfc-610e-0410-a909-a81674777703
 2005-09-11 23:07:28 +00:00
Brenden Matthews
e0f010f9c0 fixed x11.c issue 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@239 7f574dfc-610e-0410-a909-a81674777703
 2005-08-30 00:22:55 +00:00