diff options
| author | Timothy Pearson <[email protected]> | 2014-03-31 15:36:40 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2014-03-31 15:36:40 -0500 |
| commit | 39cbbdb1607e656aac07834d77573b204a717540 (patch) | |
| tree | 6517cd752cc4075b4bd039c3117d825db23cf9ab /twin | |
| parent | de1901f3abcc56a49c6395b2f810bfee32eb6776 (diff) | |
| download | tdebase-39cbbdb1607e656aac07834d77573b204a717540.tar.gz tdebase-39cbbdb1607e656aac07834d77573b204a717540.zip | |
Rename TDE-specific atoms to avoid stomping on KDE atom names
Diffstat (limited to 'twin')
| -rw-r--r-- | twin/atoms.cpp | 10 | ||||
| -rw-r--r-- | twin/kompmgr/kompmgr.c | 18 |
2 files changed, 14 insertions, 14 deletions
diff --git a/twin/atoms.cpp b/twin/atoms.cpp index 0d4ee6195..de2dfff9f 100644 --- a/twin/atoms.cpp +++ b/twin/atoms.cpp @@ -68,19 +68,19 @@ Atoms::Atoms() names[n++] = (char*) "_NET_WM_TAKE_ACTIVITY"; atoms[n] = &net_wm_window_opacity; - names[n++] = (char*) "_KDE_WM_WINDOW_OPACITY"; + names[n++] = (char*) "_TDE_WM_WINDOW_OPACITY"; atoms[n] = &net_wm_window_shadow; - names[n++] = (char*) "_KDE_WM_WINDOW_SHADOW"; + names[n++] = (char*) "_TDE_WM_WINDOW_SHADOW"; atoms[n] = &net_wm_window_shade; - names[n++] = (char*) "_KDE_WM_WINDOW_SHADE"; + names[n++] = (char*) "_TDE_WM_WINDOW_SHADE"; atoms[n] = &net_wm_window_shapable; - names[n++] = (char*) "_KDE_WM_WINDOW_SHAPABLE"; + names[n++] = (char*) "_TDE_WM_WINDOW_SHAPABLE"; atoms[n] = &net_wm_window_decohash; - names[n++] = (char*) "_KDE_WM_WINDOW_DECOHASH"; + names[n++] = (char*) "_TDE_WM_WINDOW_DECOHASH"; atoms[n] = &net_wm_system_modal_notification; names[n++] = (char*) "_KDE_WM_MODAL_SYS_NOTIFICATION"; diff --git a/twin/kompmgr/kompmgr.c b/twin/kompmgr/kompmgr.c index 751f86eaf..150c06bb8 100644 --- a/twin/kompmgr/kompmgr.c +++ b/twin/kompmgr/kompmgr.c @@ -239,13 +239,13 @@ Bool winTypeShadow[NUM_WINTYPES]; Bool winTypeFade[NUM_WINTYPES]; /* opacity property name; sometime soon I'll write up an EWMH spec for it */ -#define OPACITY_PROP "_KDE_WM_WINDOW_OPACITY" -#define SHADOW_PROP "_KDE_WM_WINDOW_SHADOW" -#define SHADE_PROP "_KDE_WM_WINDOW_SHADE" -#define SHAPABLE_PROP "_KDE_WM_WINDOW_SHAPABLE" -#define DECOHASH_PROP "_KDE_WM_WINDOW_DECOHASH" -#define DIM_PROP "_KDE_WM_WINDOW_DIM" -#define DESKCHANGE_PROP "_KDE_WM_DESKTOP_CHANGE" +#define OPACITY_PROP "_TDE_WM_WINDOW_OPACITY" +#define SHADOW_PROP "_TDE_WM_WINDOW_SHADOW" +#define SHADE_PROP "_TDE_WM_WINDOW_SHADE" +#define SHAPABLE_PROP "_TDE_WM_WINDOW_SHAPABLE" +#define DECOHASH_PROP "_TDE_WM_WINDOW_DECOHASH" +#define DIM_PROP "_TDE_WM_WINDOW_DIM" +#define DESKCHANGE_PROP "_TDE_WM_DESKTOP_CHANGE" #define TRANSLUCENT 0xe0000000 #define OPAQUE 0xffffffff @@ -3546,8 +3546,8 @@ main (int argc, char **argv) dimAtom = XInternAtom (dpy, DIM_PROP, False); deskChangeAtom = XInternAtom (dpy, DESKCHANGE_PROP, False); winTypeAtom = XInternAtom (dpy, "_NET_WM_WINDOW_TYPE", False); - winTDETTDAtom = XInternAtom (dpy, "_KDE_TRANSPARENT_TO_DESKTOP", False); - winTDETTBAtom = XInternAtom (dpy, "_KDE_TRANSPARENT_TO_BLACK", False); + winTDETTDAtom = XInternAtom (dpy, "_TDE_TRANSPARENT_TO_DESKTOP", False); + winTDETTBAtom = XInternAtom (dpy, "_TDE_TRANSPARENT_TO_BLACK", False); winType[WINTYPE_DESKTOP] = XInternAtom (dpy, "_NET_WM_WINDOW_TYPE_DESKTOP", False); winType[WINTYPE_DOCK] = XInternAtom (dpy, "_NET_WM_WINDOW_TYPE_DOCK", False); winType[WINTYPE_TOOLBAR] = XInternAtom (dpy, "_NET_WM_WINDOW_TYPE_TOOLBAR", False); |