added / fixed fullscreen support: need to add "own_window_hints undecorate fullscreen" to conf
if window hint fullscreen is used, can exit with click to top right corner
messed around with some other stuff but it's commented back out for now as it's not needed
default_color white
default_outline_color white
default_shade_color white
-diskio_avg_samples 2
+diskio_avg_samples 10
draw_borders no
draw_graph_borders yes
draw_outline no
short_units yes
stippled_borders 0
temperature_unit celsius
-update_interval 1
-update_interval_on_battery 5
+update_interval 1.5
+update_interval_on_battery 4
uppercase no
use_spacer none
use_xft yes
${color 4072a5}RAM:${goto 47}${color blue}${voffset 2}${membar 16,240}
${color }${voffset -20}${goto 110}$mem${goto 160}/ $memmax
${color }${alignr 525}${voffset -18}$memperc%
-${color 4072a5}${voffset -18}${goto 315} #something could go here
-
+${color 4072a5}${voffset -18}${goto 315} Top I/O ${goto 480}READ ${goto 550}WRITE ${goto 630}%
${color 4072a5}Swap:${goto 48}${color green}${swapbar 16,240}
-${color }${voffset -18}${goto 110}$swap${goto 160}/ $swapmax
+${color }${voffset -19}${goto 110}$swap${goto 160}/ $swapmax
${color }${alignr 525}${voffset -18}$swapperc%
+${color red}${voffset -18}${goto 315} ${top_io name 1} ${goto 480}${top_io io_read 1}${goto 550}${top_io io_write 1}${goto 610}${top_io io_perc 1}
${color 4072a5}rootfs:${goto 70}${color darkgreen}${fs_bar 16,240 /}
${color }${voffset -18}${goto 110}${fs_used /}${goto 160}/ ${fs_size /}
${color }${alignr 490}${voffset -20}(${fs_free /})
+${color }${voffset -18}${goto 315} ${top_io name 2} ${goto 480}${top_io io_read 2}${goto 550}${top_io io_write 2}${goto 610}${top_io io_perc 2}
${color 4072a5}home:${goto 70}${color darkgreen}${fs_bar 16,240 /home}
-${color }${voffset -18}${goto 110}${fs_used /home}${goto 160}/ ${fs_size /home}
+${color }${voffset -19}${goto 110}${fs_used /home}${goto 160}/ ${fs_size /home}
${color }${alignr 490}${voffset -20}(${fs_free /home})
-${if_mounted /home/user/MyDocs}${color 4072a5}MyDocs:${goto 70}${color darkgreen}${fs_bar 16,240 /home/user/MyDocs}
-${color }${voffset -18}${goto 110}${fs_used /home/user/MyDocs}${goto 160}/ ${fs_size /home/user/MyDocs}
-${color }${alignr 490}${voffset -20}(${fs_free /home/user/MyDocs})$endif
+${color }${voffset -18}${goto 315} ${top_io name 3} ${goto 480}${top_io io_read 3}${goto 550}${top_io io_write 3}${goto 610}${top_io io_perc 3}
+${voffset 1}${if_mounted /home/user/MyDocs}${color 4072a5}MyDocs:${goto 70}${color darkgreen}${fs_bar 16,240 /home/user/MyDocs}
+${color }${voffset -19}${goto 110}${fs_used /home/user/MyDocs}${goto 160}/ ${fs_size /home/user/MyDocs}
+${color }${alignr 490}${voffset -19}(${fs_free /home/user/MyDocs})$endif
${if_mounted /media/mmc1}${color 4072a5}MicroSD:${goto 70}${color darkgreen}${fs_bar 16,240 /media/mmc1}
${color }${voffset -18}${goto 110}${fs_used /media/mmc1}${goto 160}/ ${fs_size /media/mmc1}
${color }${alignr 490}${voffset -20}(${fs_free /media/mmc1})$endif
${if_up gprs0}${color 4072a5}gprs0: ${color 4072a5}Up:$color ${upspeed gprs0}/s ${color 4072a5}Down:$color ${downspeed gprs0}/s
-${color 4072a5}gprs0 Up: ${color black}${upspeedgraph gprs0 20,290 ff0000 00ff00}$alignr${color 4072a5}gprs0 Down: ${color black}${downspeedgraph gprs0 20,290 00ff0000 ff0000}$else${if_empty ${wireless_essid wlan0}}$else${color #4072a5}wlan0 ESSID: $color${wireless_essid wlan0} ${color #4072a5}Rate: ${color}${wireless_bitrate wlan0} ${color #4072a5}Connection Quality: $color${wireless_link_qual_perc wlan0}% ${color #4072a5}Up:$color ${upspeed wlan0}/s ${color grey} - ${color #4072a5}Down:$color ${downspeed wlan0}/s
+${color 4072a5}gprs0 Up: ${color black}${upspeedgraph gprs0 20,290 ff0000 00ff00}$alignr${color 4072a5}gprs0 Down: ${color black}${downspeedgraph gprs0 20,290 00ff0000 ff0000}$else${if_empty ${wireless_essid wlan0}}$else${color #4072a5}wlan0 ESSID: $color${wireless_essid wlan0} ${color #4072a5}Rate: ${color}${wireless_bitrate wlan0} ${color #4072a5}Connection Quality: $color${wireless_link_qual_perc wlan0}% ${color #4072a5}Up:$color ${upspeed wlan0}/s ${color grey} ${color #4072a5}Down:$color ${downspeed wlan0}/s
${color 4072a5}wlan0 Up: ${color black}${upspeedgraph wlan0 20,290 00ff00 ff0000}$alignr${color 4072a5}wlan0 Down: ${color black}${downspeedgraph wlan0 20,290 ff0000 00ff00}$endif$endif
-${color 4072a5}CONNECTIONS [$color${tcp_portmon 1 65535 count}${color 4072a5}] (lport:rservice:rport):$color ${goto 405}${tcp_portmon 1 65535 lservice 3}${goto 450}:${scroll 32 5${tcp_portmon 1 65535 rhost 3}}${goto 744}:${scroll 5 1 ${tcp_portmon 1 65535 rservice 3}}
-$color${tcp_portmon 1 65535 lservice 0}${goto 50}:${scroll 32 5${tcp_portmon 1 65535 rhost 0}}${goto 345}:${scroll 5 2${tcp_portmon 1 65535 rservice 0}}${goto 405}${tcp_portmon 1 65535 lservice 4}${goto 450}:${scroll 32 5${tcp_portmon 1 65535 rhost 4}}${goto 744}:${scroll 5 1 ${tcp_portmon 1 65535 rservice 4}}
-$color${tcp_portmon 1 65535 lservice 1}${goto 50}:${scroll 32 5${tcp_portmon 1 65535 rhost 1}}${goto 345}:${scroll 5 2${tcp_portmon 1 65535 rservice 1}}${goto 405}${tcp_portmon 1 65535 lservice 5}${goto 450}:${scroll 32 5${tcp_portmon 1 65535 rhost 5}}${goto 744}:${scroll 5 1 ${tcp_portmon 1 65535 rservice 5}}
-$color${tcp_portmon 1 65535 lservice 2}${goto 50}:${scroll 32 5${tcp_portmon 1 65535 rhost 2}}${goto 345}:${scroll 5 2${tcp_portmon 1 65535 rservice 2}}${goto 405}${tcp_portmon 1 65535 lservice 6}${goto 450}:${scroll 32 5${tcp_portmon 1 65535 rhost 6}}${goto 744}:${scroll 5 1 ${tcp_portmon 1 65535 rservice 6}}
+${color 4072a5}CONNECTIONS [$color${tcp_portmon 1 65535 count}${color 4072a5}] (lport:rservice:rport):$color ${goto 405}${tcp_portmon 1 65535 lservice 0}${goto 450}:${scroll 32 5${tcp_portmon 1 65535 rhost 0}}${goto 744}:${scroll 5 1 ${tcp_portmon 1 65535 rservice 0}}
+$color${tcp_portmon 1 65535 lservice 1}${goto 50}:${scroll 32 5${tcp_portmon 1 65535 rhost 1}}${goto 345}:${scroll 5 2${tcp_portmon 1 65535 rservice 1}}${goto 405}${tcp_portmon 1 65535 lservice 2}${goto 450}:${scroll 32 5${tcp_portmon 1 65535 rhost 2}}${goto 744}:${scroll 5 1 ${tcp_portmon 1 65535 rservice 2}}
+$color${tcp_portmon 1 65535 lservice 3}${goto 50}:${scroll 32 5${tcp_portmon 1 65535 rhost 3}}${goto 345}:${scroll 5 2${tcp_portmon 1 65535 rservice 3}}${goto 405}${tcp_portmon 1 65535 lservice 4}${goto 450}:${scroll 32 5${tcp_portmon 1 65535 rhost 4}}${goto 744}:${scroll 5 1 ${tcp_portmon 1 65535 rservice 4}}
+$color${tcp_portmon 1 65535 lservice 5}${goto 50}:${scroll 32 5${tcp_portmon 1 65535 rhost 5}}${goto 345}:${scroll 5 2${tcp_portmon 1 65535 rservice 5}}${goto 405}${tcp_portmon 1 65535 lservice 6}${goto 450}:${scroll 32 5${tcp_portmon 1 65535 rhost 6}}${goto 744}:${scroll 5 1 ${tcp_portmon 1 65535 rservice 6}}
+$color${tcp_portmon 1 65535 lservice 7}${goto 50}:${scroll 32 5${tcp_portmon 1 65535 rhost 7}}${goto 345}:${scroll 5 2${tcp_portmon 1 65535 rservice 7}}${goto 405}${tcp_portmon 1 65535 lservice 8}${goto 450}:${scroll 32 5${tcp_portmon 1 65535 rhost 8}}${goto 744}:${scroll 5 1 ${tcp_portmon 1 65535 rservice 8}}
${color 4072a5}Top CPU% CPU% MEM% ${goto 257}${color 4072a5} | ${color 4072a5}Top Total Memory RAM VM ${goto 555}${color 4072a5}| ${color 4072a5}Top CPU TIME MM:SS.cs
${color red}${top name 1}${top cpu 1}${top mem 1} ${goto 257}${color 4072a5} | ${color red}${top_mem name 1}${top_mem mem_res 1} ${top_mem mem_vsize 1} ${goto 555}${color 4072a5}| ${color red}${top_time name 1}${top_time time 1} ${top_time cpu 1}
$color${top name 2}${top cpu 2}${top mem 2} ${goto 257}${color 4072a5} | ${color }${top_mem name 2}${top_mem mem_res 2} ${top_mem mem_vsize 2} ${goto 555}${color 4072a5}| ${color }${top_time name 2}${top_time time 2} ${top_time cpu 2}
$color${top name 3}${top cpu 3}${top mem 3} ${goto 257}${color 4072a5} | ${color }${top_mem name 3}${top_mem mem_res 3} ${top_mem mem_vsize 3} ${goto 555}${color 4072a5}| ${color }${top_time name 3}${top_time time 3} ${top_time cpu 3}
+$color${top name 4}${top cpu 4}${top mem 4} ${goto 257}${color 4072a5} | ${color }${top_mem name 4}${top_mem mem_res 4} ${top_mem mem_vsize 4} ${goto 555}${color 4072a5}| ${color }${top_time name 4}${top_time time 4} ${top_time cpu 4}
$color---------1---------2---------3---------4---------5---------6---------7---------8---------9---------0---------1
#imagetest: ${image /home/user/image-test.png -p 100,410}
-conky (1.9.0-1) unstable; urgency=low
+conky (1.9.5-1) unstable; urgency=low
* New maemo release:
- i'm too lazy to fill this in for now
- - lazy
+ - did i mention lazy?
+ whatever
-- Lance Colton <lance.colton@gmail.com> Thu, 21 Oct 2010 12:00:00 -0700
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libkvm-dev [kfreebsd-i386 kfreebsd-amd64],
libdevstat-dev [kfreebsd-i386 kfreebsd-amd64],
- libncurses5-dev, liblua5.1-0-dev, libdbus-1-dev
+ libncurses5-dev, liblua5.1-0-dev, libdbus-1-dev, libcairo2-dev
Homepage: http://conky.sourceforge.net/
Standards-Version: 3.8.4
CFLAGS = -Wall -g
LDFLAGS = -Wl,--as-needed -ldbus-1
+# CFLAGS += `pkg-config --cflags gtk+-2.0`
+# LDFLAGS += `pkg-config --libs gtk+-2.0`
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
mkdir build-all
-#DML# cd build-std && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-#DML# ../configure $(COMMON_CONFIGURE_FLAGS) $(LINUX_CONF_ARGS_STD)
-
-#DML# cd build-cli && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-#DML# ../configure $(COMMON_CONFIGURE_FLAGS) \
-#DML# --disable-lua --disable-double-buffer --disable-x11 \
-#DML# --disable-xdamage --disable-own-window --disable-xft \
-#DML# --disable-hddtemp --disable-alsa --disable-portmon \
-#DML# --enable-ncurses
-
cd build-all && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
../configure $(COMMON_CONFIGURE_FLAGS) \
--enable-rss --enable-weather-xoap \
- --enable-eve --enable-lua=yes --enable-lua-cairo=no --enable-lua-imlib2=no \
+ --enable-eve --enable-lua=yes --enable-lua-cairo --enable-lua-imlib2 \
--disable-static --enable-argb --enable-x11 --enable-imlib2 \
$(LINUX_CONF_ARGS_ALL) $(ENABLE_NVIDIA)
build-stamp: config-stamp
dh_testdir
-#DML# cd build-std && $(MAKE)
-#DML# cd build-cli && $(MAKE)
cd build-all && $(MAKE)
touch $@
dh_testroot
dh_clean -k
-#DML# cd build-std && $(MAKE) install DESTDIR=$(CURDIR)/debian/conky-std
-#DML# cd build-cli && $(MAKE) install DESTDIR=$(CURDIR)/debian/conky-cli
cd build-all && $(MAKE) install DESTDIR=$(CURDIR)/debian/conky-n900
mkdir -p debian/conky-n900/usr/share/icons/hicolor/scalable/apps/
cp -p debian/conkylogo64.png debian/conky-n900/usr/share/icons/hicolor/scalable/apps/conky.png
<option>own_window_hints</option>
</command>
<option>
- undecorated,below,above,sticky,skip_taskbar,skip_pager</option>
+ undecorated,below,above,sticky,skip_taskbar,fullscreen</option>
</term>
<listitem>If own_window is yes, you may use these window
manager hints to affect the way Conky displays. Notes: Use
$#include <cairo-deprecated.h>
$#include <cairo.h>
$#include <cairo-xlib.h>
+/*$#include <cairo-qt.h>*/
$#include <X11/Xlib.h>
$#include "libcairo-helper.h"
+/*$#include <gdk/gdk.h>*/
/*
* This code was mostly copied from cairo.h and cairo-xlib.h with comments
* removed. The licence noticed below is present for the sake of clarity.
Drawable drawable,
Visual * visual, int width, int height);
+/*
+cairo_surface_t *cairo_qt_surface_create (QPainter *painter);
+
+cairo_surface_t *cairo_qt_surface_create_with_qimage (cairo_format_t format,
+ int width, int height);
+
+cairo_surface_t *cairo_qt_surface_create_with_qpixmap (cairo_content_t content,
+ int width, int height);
+
+QPainter *cairo_qt_surface_get_qpainter (cairo_surface_t *surface);
+
+cairo_surface_t *cairo_qt_surface_get_image (cairo_surface_t *surface);
+
+QImage *cairo_qt_surface_get_qimage (cairo_surface_t *surface);
+*/
+
cairo_surface_t *cairo_xlib_surface_create_for_bitmap(Display * dpy,
Pixmap bitmap,
Screen * screen, int width, int height);
cairo_t *cairo_create(cairo_surface_t * target);
+/*cairo_t *gdk_cairo_create(GdkDrawable *drawable);*/
+
+
cairo_t *cairo_reference(cairo_t * cr);
void cairo_destroy(cairo_t * cr);
CAIRO_SURFACE_TYPE_OS2,
CAIRO_SURFACE_TYPE_WIN32_PRINTING,
CAIRO_SURFACE_TYPE_QUARTZ_IMAGE
+// ,CAIRO_SURFACE_TYPE_QT
} cairo_surface_type_t;
cairo_surface_type_t cairo_surface_get_type(cairo_surface_t * surface);
window.type == TYPE_DESKTOP) {
/* allow conky to hold input focus. */
break;
+ } else if(TEST_HINT(window.hints,HINT_FULLSCREEN)) {
+ //detect top right click
+ if (ev.xbutton.x > 750 && ev.xbutton.y < 50)
+ {
+ terminate = 1;
+ }
+ break;
} else {
/* forward the click to the desktop window */
XUngrabPointer(display, ev.xbutton.time);
SET_HINT(window.hints, HINT_STICKY);
} else if (strncmp(p_hint, "skip_taskbar", 12) == EQUAL) {
SET_HINT(window.hints, HINT_SKIP_TASKBAR);
- } else if (strncmp(p_hint, "skip_pager", 10) == EQUAL) {
- SET_HINT(window.hints, HINT_SKIP_PAGER);
+ } else if (strncmp(p_hint, "fullscreen", 10) == EQUAL) {
+ SET_HINT(window.hints, HINT_FULLSCREEN);
} else {
CONF_ERR;
}
BMPx_LIBS =
BUILD_APCUPSD_FALSE = #
BUILD_APCUPSD_TRUE =
-BUILD_ARCH = Linux 2.6.32-25-generic (arm)
+BUILD_ARCH = Linux 2.6.32-26-generic (arm)
BUILD_AUDACIOUS_FALSE =
BUILD_AUDACIOUS_TRUE = #
BUILD_BMPX_FALSE =
BUILD_CONFIG_OUTPUT_TRUE =
BUILD_CURL_FALSE =
BUILD_CURL_TRUE = #
-BUILD_DATE = Thu Nov 11 17:04:35 PST 2010
+BUILD_DATE = Wed Dec 1 13:09:35 PST 2010
BUILD_EVE_FALSE =
BUILD_EVE_TRUE = #
BUILD_FREEBSD_FALSE =
} else {
#endif /* USE_ARGB */
// pseudo transparency
-
+
if (set_transparent) {
Window parent = win;
unsigned int i;
XVisualInfo visual_template;
XVisualInfo *visual_list;
int nxvisuals = 0, i;
-
+
visual_template.screen = screen;
visual_list = XGetVisualInfo (display, VisualScreenMask,
&visual_template, &nxvisuals);
if (own_window) {
int depth = 0, flags;
Visual *visual = NULL;
-
+
if (!find_desktop_window(&window.root, &window.desktop)) {
return;
}
-
+
#ifdef USE_ARGB
if (use_argb_visual && get_argb_visual(&visual, &depth)) {
have_argb_visual = 1;
}
/* Skip pager */
- if (TEST_HINT(window.hints, HINT_SKIP_PAGER)) {
+ if (TEST_HINT(window.hints, HINT_FULLSCREEN)) {
/* fprintf(stderr, PACKAGE_NAME": hint - skip_pager\n");
fflush(stderr); */
xa = ATOM(_NET_WM_STATE);
if (xa != None) {
- Atom xa_prop = ATOM(_NET_WM_STATE_SKIP_PAGER);
+ Atom xa_prop = ATOM(_NET_WM_STATE_FULLSCREEN);
XChangeProperty(display, window.window, xa, XA_ATOM, 32,
PropModeAppend, (unsigned char *) &xa_prop, 1);
HINT_ABOVE,
HINT_STICKY,
HINT_SKIP_TASKBAR,
- HINT_SKIP_PAGER
+ HINT_FULLSCREEN
};
#define SET_HINT(mask, hint) (mask |= (1 << hint))