mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-12-25 04:06:03 +00:00
* 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
This commit is contained in:
parent
f9cd4d49a4
commit
fda6b66eb9
3
AUTHORS
3
AUTHORS
@ -200,6 +200,9 @@ Miroslav Lichvar <lichvarm at gmail dot com>
|
|||||||
Moncelier Camille <pixdamix at users dot sourceforge dot net>
|
Moncelier Camille <pixdamix at users dot sourceforge dot net>
|
||||||
METAR patch
|
METAR patch
|
||||||
|
|
||||||
|
Morgan Veyret <patzy at appart dot kicks-ass dot net>
|
||||||
|
own_window_type dock patch
|
||||||
|
|
||||||
Nattfodd <Nattfodd@gmail.com>
|
Nattfodd <Nattfodd@gmail.com>
|
||||||
Fixed top_mem dupes
|
Fixed top_mem dupes
|
||||||
|
|
||||||
|
@ -1,5 +1,8 @@
|
|||||||
# $Id$
|
# $Id$
|
||||||
|
|
||||||
|
2008-04-29
|
||||||
|
* own_window_type dock patch (thanks Morgan).
|
||||||
|
|
||||||
2008-04-12
|
2008-04-12
|
||||||
* Added patch for the following (thanks larsko):
|
* Added patch for the following (thanks larsko):
|
||||||
* New $loadgraph to show a graph of load averages,
|
* New $loadgraph to show a graph of load averages,
|
||||||
|
6
README
6
README
@ -360,9 +360,9 @@ CONFIGURATION SETTINGS
|
|||||||
|
|
||||||
|
|
||||||
own_window_type
|
own_window_type
|
||||||
if own_window is yes, you may specify type normal, desktop or
|
if own_window is yes, you may specify type normal, desktop, dock
|
||||||
override (default: normal). Desktop windows are special windows
|
or override (default: normal). Desktop windows are special win-
|
||||||
that have no window decorations; are always visible on your
|
dows that have no window decorations; are always visible on your
|
||||||
desktop; do not appear in your pager or taskbar; and are sticky
|
desktop; do not appear in your pager or taskbar; and are sticky
|
||||||
across all workspaces. Override windows are not under the con-
|
across all workspaces. Override windows are not under the con-
|
||||||
trol of the window manager. Hints are ignored. This type of win-
|
trol of the window manager. Hints are ignored. This type of win-
|
||||||
|
@ -355,7 +355,7 @@
|
|||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><command><option>own_window_type</option></command></term>
|
<term><command><option>own_window_type</option></command></term>
|
||||||
<listitem>
|
<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
|
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.
|
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
|
Override windows are not under the control of the window manager. Hints are ignored. This type
|
||||||
|
@ -340,7 +340,7 @@ Boolean, set pseudo-transparency?
|
|||||||
|
|
||||||
.TP
|
.TP
|
||||||
\fB\*(T<\fBown_window_type\fR\*(T>\fR
|
\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
|
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.
|
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
|
Override windows are not under the control of the window manager. Hints are ignored. This type
|
||||||
|
@ -8387,6 +8387,8 @@ static void load_config_file(const char *f)
|
|||||||
window.type = TYPE_NORMAL;
|
window.type = TYPE_NORMAL;
|
||||||
} else if (strncmp(value, "desktop", 7) == 0) {
|
} else if (strncmp(value, "desktop", 7) == 0) {
|
||||||
window.type = TYPE_DESKTOP;
|
window.type = TYPE_DESKTOP;
|
||||||
|
} else if (strncmp(value, "dock", 7) == 0) {
|
||||||
|
window.type = TYPE_DOCK;
|
||||||
} else if (strncmp(value, "override", 8) == 0) {
|
} else if (strncmp(value, "override", 8) == 0) {
|
||||||
window.type = TYPE_OVERRIDE;
|
window.type = TYPE_OVERRIDE;
|
||||||
} else {
|
} else {
|
||||||
|
@ -453,6 +453,7 @@ char *tmpstring2;
|
|||||||
#ifdef OWN_WINDOW
|
#ifdef OWN_WINDOW
|
||||||
enum _window_type {
|
enum _window_type {
|
||||||
TYPE_NORMAL = 0,
|
TYPE_NORMAL = 0,
|
||||||
|
TYPE_DOCK,
|
||||||
TYPE_DESKTOP,
|
TYPE_DESKTOP,
|
||||||
TYPE_OVERRIDE
|
TYPE_OVERRIDE
|
||||||
};
|
};
|
||||||
|
@ -263,6 +263,7 @@ int interface_up(const char *dev)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
/* otherwise we are good */
|
/* otherwise we are good */
|
||||||
|
free(conf.ifc_buf);
|
||||||
close(fd);
|
close(fd);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -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");
|
fprintf(stderr, "Conky: window type - desktop\n");
|
||||||
fflush(stderr);
|
fflush(stderr);
|
||||||
break;
|
break;
|
||||||
|
case TYPE_DOCK:
|
||||||
|
prop = ATOM(_NET_WM_WINDOW_TYPE_DOCK);
|
||||||
|
fprintf(stderr, "Conky: window type - dock\n");
|
||||||
|
fflush(stderr);
|
||||||
|
break;
|
||||||
case TYPE_NORMAL:
|
case TYPE_NORMAL:
|
||||||
default:
|
default:
|
||||||
prop = ATOM(_NET_WM_WINDOW_TYPE_NORMAL);
|
prop = ATOM(_NET_WM_WINDOW_TYPE_NORMAL);
|
||||||
|
Loading…
Reference in New Issue
Block a user