Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-23 19:39:06 +00:00
Code Issues Releases Activity

* own_window_type dock patch (thanks Morgan).

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1115 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Brenden Matthews 2008-04-29 21:31:04 +00:00
parent f9cd4d49a4
commit fda6b66eb9
9 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS
View File

@ -200,6 +200,9 @@ Miroslav Lichvar <lichvarm at gmail dot com>
Moncelier Camille <pixdamix at users dot sourceforge dot net>
METAR patch
Morgan Veyret <patzy at appart dot kicks-ass dot net>
own_window_type dock patch
Nattfodd <Nattfodd@gmail.com>
Fixed top_mem dupes

3
ChangeLog
View File

@ -1,5 +1,8 @@
# $Id$
2008-04-29
* own_window_type dock patch (thanks Morgan).
2008-04-12
* Added patch for the following (thanks larsko):
* New $loadgraph to show a graph of load averages,

6
README
View File

@ -360,9 +360,9 @@ CONFIGURATION SETTINGS
own_window_type
if own_window is yes, you may specify type normal, desktop or
override (default: normal). Desktop windows are special windows
that have no window decorations; are always visible on your
if own_window is yes, you may specify type normal, desktop, dock
or override (default: normal). Desktop windows are special win-
dows that have no window decorations; are always visible on your
desktop; do not appear in your pager or taskbar; and are sticky
across all workspaces. Override windows are not under the con-
trol of the window manager. Hints are ignored. This type of win-

2
doc/config_settings.xml
View File

@ -355,7 +355,7 @@
<varlistentry>
<term><command><option>own_window_type</option></command></term>
<listitem>
if own_window is yes, you may specify type normal, desktop or override (default: normal).
if own_window is yes, you may specify type normal, desktop, dock or override (default: normal).
Desktop windows are special windows that have no window decorations; are always visible
on your desktop; do not appear in your pager or taskbar; and are sticky across all workspaces.
Override windows are not under the control of the window manager. Hints are ignored. This type

2
doc/conky.1
View File

@ -340,7 +340,7 @@ Boolean, set pseudo-transparency?
.TP
\fB\*(T<\fBown_window_type\fR\*(T>\fR
if own_window is yes, you may specify type normal, desktop or override (default: normal).
if own_window is yes, you may specify type normal, desktop, dock or override (default: normal).
Desktop windows are special windows that have no window decorations; are always visible
on your desktop; do not appear in your pager or taskbar; and are sticky across all workspaces.
Override windows are not under the control of the window manager. Hints are ignored. This type

2
src/conky.c
View File

@ -8387,6 +8387,8 @@ static void load_config_file(const char *f)
window.type = TYPE_NORMAL;
} else if (strncmp(value, "desktop", 7) == 0) {
window.type = TYPE_DESKTOP;
} else if (strncmp(value, "dock", 7) == 0) {
window.type = TYPE_DOCK;
} else if (strncmp(value, "override", 8) == 0) {
window.type = TYPE_OVERRIDE;
} else {

1
src/conky.h
View File

@ -453,6 +453,7 @@ char *tmpstring2;
#ifdef OWN_WINDOW
enum _window_type {
TYPE_NORMAL = 0,
TYPE_DOCK,
TYPE_DESKTOP,
TYPE_OVERRIDE
};

1
src/linux.c
View File

@ -263,6 +263,7 @@ int interface_up(const char *dev)
break;
}
/* otherwise we are good */
free(conf.ifc_buf);
close(fd);
return 1;
}

5
src/x11.c
View File

@ -282,6 +282,11 @@ void init_window(int own_window, int w, int h, int set_trans, int back_colour,
fprintf(stderr, "Conky: window type - desktop\n");
fflush(stderr);
break;
case TYPE_DOCK:
prop = ATOM(_NET_WM_WINDOW_TYPE_DOCK);
fprintf(stderr, "Conky: window type - dock\n");
fflush(stderr);
break;
case TYPE_NORMAL:
default:
prop = ATOM(_NET_WM_WINDOW_TYPE_NORMAL);