Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 10:35:10 +00:00
Code Issues Releases Activity

small fixes, updated ebuild

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@126 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Brenden Matthews 2005-08-21 17:32:43 +00:00
parent 8f830a5c9d
commit 4995f8c69e
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Conky.kdevelop
View File

@ -9,7 +9,7 @@
<ignoreparts/> <ignoreparts/>
<projectdirectory>.</projectdirectory> <projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath> <absoluteprojectpath>false</absoluteprojectpath>
<description/> <description></description>
<versioncontrol/> <versioncontrol/>
</general> </general>
<kdevautoproject> <kdevautoproject>
@ -48,21 +48,21 @@
<f77flags/> <f77flags/>
</optimized> </optimized>
<debug> <debug>
<configargs>--enable-debug=full --prefix=/usr --enable-mpd --enable-xft --enable-seti --enable-double-buffer --enable-own-window --enable-metar --enable-mldonkey --enable-x11</configargs> <configargs>--enable-debug=full --prefix=/usr --enable-mpd --disable-xft --enable-seti --enable-double-buffer --disable-own-window --enable-metar --enable-mldonkey --enable-x11</configargs>
<builddir>debug</builddir> <builddir>debug</builddir>
<ccompiler>kdevgccoptions</ccompiler> <ccompiler>kdevgccoptions</ccompiler>
<cxxcompiler>kdevgppoptions</cxxcompiler> <cxxcompiler>kdevgppoptions</cxxcompiler>
<f77compiler>kdevpgf77options</f77compiler> <f77compiler>kdevpgf77options</f77compiler>
<cflags>-O2 -Wall -fexceptions -fomit-frame-pointer -fshort-enums -ggdb</cflags> <cflags>-O2 -Wall -fexceptions -fomit-frame-pointer -fshort-enums -ggdb</cflags>
<envvars/> <envvars/>
<topsourcedir/> <topsourcedir></topsourcedir>
<cppflags/> <cppflags></cppflags>
<ldflags/> <ldflags></ldflags>
<ccompilerbinary/> <ccompilerbinary></ccompilerbinary>
<cxxcompilerbinary/> <cxxcompilerbinary></cxxcompilerbinary>
<f77compilerbinary/> <f77compilerbinary></f77compilerbinary>
<cxxflags/> <cxxflags></cxxflags>
<f77flags/> <f77flags></f77flags>
</debug> </debug>
<debug-no-x> <debug-no-x>
<envvars/> <envvars/>
@ -97,11 +97,11 @@
<kdevdebugger> <kdevdebugger>
<general> <general>
<dbgshell>/usr/bin/libtool</dbgshell> <dbgshell>/usr/bin/libtool</dbgshell>
<programargs/> <programargs></programargs>
<gdbpath>/usr/bin/</gdbpath> <gdbpath>/usr/bin/</gdbpath>
<configGdbScript/> <configGdbScript></configGdbScript>
<runShellScript/> <runShellScript></runShellScript>
<runGdbScript/> <runGdbScript></runGdbScript>
<breakonloadinglibs>true</breakonloadinglibs> <breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty> <separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar> <floatingtoolbar>false</floatingtoolbar>
@ -182,7 +182,7 @@
<headerCompletionDelay>250</headerCompletionDelay> <headerCompletionDelay>250</headerCompletionDelay>
</codecompletion> </codecompletion>
<creategettersetter> <creategettersetter>
<prefixGet/> <prefixGet></prefixGet>
<prefixSet>set</prefixSet> <prefixSet>set</prefixSet>
<prefixVariable>m_,_</prefixVariable> <prefixVariable>m_,_</prefixVariable>
<parameterName>theValue</parameterName> <parameterName>theValue</parameterName>

2
app-admin/conky/conky-1.9999.ebuild
View File

@ -40,7 +40,7 @@ src_compile() {
econf \ econf \
$(use_enable truetype xft) \ $(use_enable truetype xft) \
$(use_enable seti) \ $(use_enable seti) \
$(use_enable x x11) \ $(use_enable X x11) \
--enable-double-buffer \ --enable-double-buffer \
--enable-own-window \ --enable-own-window \
--enable-proc-uptime \ --enable-proc-uptime \

6
conky.c
View File

@ -2611,6 +2611,7 @@ static void update_text_area()
y = workarea[3] - text_height - gap_y; y = workarea[3] - text_height - gap_y;
break; break;
#ifdef OWN_WINDOW
case NONE: // Let the WM manage the window case NONE: // Let the WM manage the window
x = window.x; x = window.x;
y = window.y; y = window.y;
@ -2618,9 +2619,10 @@ static void update_text_area()
fixed_pos = 1; fixed_pos = 1;
fixed_size = 1; fixed_size = 1;
break; break;
#endif
} }
#ifdef OWN_WINDOW #ifdef OWN_WINDOW
if (own_window && !fixed_pos) { if (own_window && !fixed_pos) {
x += workarea[0]; x += workarea[0];
y += workarea[1]; y += workarea[1];
@ -4253,7 +4255,7 @@ int main(int argc, char **argv)
text_height + border_margin * 2 + 1, text_height + border_margin * 2 + 1,
on_bottom, fixed_pos); on_bottom, fixed_pos);
#else #else
init_winow init_window
(own_window, (own_window,
text_width + border_margin * 2 + 1, text_width + border_margin * 2 + 1,
text_height + border_margin * 2 + 1, text_height + border_margin * 2 + 1,