TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename TDE-specific atoms to avoid stomping on KDE atom names

Browse Source
pull/2/head
Timothy Pearson 11 years ago
parent de1901f3ab
commit 39cbbdb160
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File

4
kdesktop/lock/lockprocess.cc
Unescape View File

@ -230,8 +230,8 @@ LockProcess::LockProcess()
// Set up atoms // Set up atoms
kde_wm_system_modal_notification = XInternAtom(tqt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False); kde_wm_system_modal_notification = XInternAtom(tqt_xdisplay(), "_KDE_WM_MODAL_SYS_NOTIFICATION", False);
kde_wm_transparent_to_desktop = XInternAtom(tqt_xdisplay(), "_KDE_TRANSPARENT_TO_DESKTOP", False); kde_wm_transparent_to_desktop = XInternAtom(tqt_xdisplay(), "_TDE_TRANSPARENT_TO_DESKTOP", False);
kde_wm_transparent_to_black = XInternAtom(tqt_xdisplay(), "_KDE_TRANSPARENT_TO_BLACK", False); kde_wm_transparent_to_black = XInternAtom(tqt_xdisplay(), "_TDE_TRANSPARENT_TO_BLACK", False);
kapp->installX11EventFilter(this); kapp->installX11EventFilter(this);

2
konsole/konsole/konsole.cpp
Unescape View File

@ -371,7 +371,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo
// Signal that we want to be transparent to the desktop, not to windows behind us... // Signal that we want to be transparent to the desktop, not to windows behind us...
Atom kde_wm_transparent_to_desktop; Atom kde_wm_transparent_to_desktop;
kde_wm_transparent_to_desktop = XInternAtom(tqt_xdisplay(), "_KDE_TRANSPARENT_TO_DESKTOP", False); kde_wm_transparent_to_desktop = XInternAtom(tqt_xdisplay(), "_TDE_TRANSPARENT_TO_DESKTOP", False);
XChangeProperty(tqt_xdisplay(), winId(), kde_wm_transparent_to_desktop, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L); XChangeProperty(tqt_xdisplay(), winId(), kde_wm_transparent_to_desktop, XA_INTEGER, 32, PropModeReplace, (unsigned char *) "TRUE", 1L);
} }

10
twin/atoms.cpp
Unescape View File

@ -68,19 +68,19 @@ Atoms::Atoms()
names[n++] = (char*) "_NET_WM_TAKE_ACTIVITY"; names[n++] = (char*) "_NET_WM_TAKE_ACTIVITY";
atoms[n] = &net_wm_window_opacity; 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; 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; 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; 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; 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; atoms[n] = &net_wm_system_modal_notification;
names[n++] = (char*) "_KDE_WM_MODAL_SYS_NOTIFICATION"; names[n++] = (char*) "_KDE_WM_MODAL_SYS_NOTIFICATION";

18
twin/kompmgr/kompmgr.c
Unescape View File

@ -239,13 +239,13 @@ Bool winTypeShadow[NUM_WINTYPES];
Bool winTypeFade[NUM_WINTYPES]; Bool winTypeFade[NUM_WINTYPES];
/* opacity property name; sometime soon I'll write up an EWMH spec for it */ /* opacity property name; sometime soon I'll write up an EWMH spec for it */
#define OPACITY_PROP "_KDE_WM_WINDOW_OPACITY" #define OPACITY_PROP "_TDE_WM_WINDOW_OPACITY"
#define SHADOW_PROP "_KDE_WM_WINDOW_SHADOW" #define SHADOW_PROP "_TDE_WM_WINDOW_SHADOW"
#define SHADE_PROP "_KDE_WM_WINDOW_SHADE" #define SHADE_PROP "_TDE_WM_WINDOW_SHADE"
#define SHAPABLE_PROP "_KDE_WM_WINDOW_SHAPABLE" #define SHAPABLE_PROP "_TDE_WM_WINDOW_SHAPABLE"
#define DECOHASH_PROP "_KDE_WM_WINDOW_DECOHASH" #define DECOHASH_PROP "_TDE_WM_WINDOW_DECOHASH"
#define DIM_PROP "_KDE_WM_WINDOW_DIM" #define DIM_PROP "_TDE_WM_WINDOW_DIM"
#define DESKCHANGE_PROP "_KDE_WM_DESKTOP_CHANGE" #define DESKCHANGE_PROP "_TDE_WM_DESKTOP_CHANGE"
#define TRANSLUCENT 0xe0000000 #define TRANSLUCENT 0xe0000000
#define OPAQUE 0xffffffff #define OPAQUE 0xffffffff
@ -3546,8 +3546,8 @@ main (int argc, char **argv)
dimAtom = XInternAtom (dpy, DIM_PROP, False); dimAtom = XInternAtom (dpy, DIM_PROP, False);
deskChangeAtom = XInternAtom (dpy, DESKCHANGE_PROP, False); deskChangeAtom = XInternAtom (dpy, DESKCHANGE_PROP, False);
winTypeAtom = XInternAtom (dpy, "_NET_WM_WINDOW_TYPE", False); winTypeAtom = XInternAtom (dpy, "_NET_WM_WINDOW_TYPE", False);
winTDETTDAtom = XInternAtom (dpy, "_KDE_TRANSPARENT_TO_DESKTOP", False); winTDETTDAtom = XInternAtom (dpy, "_TDE_TRANSPARENT_TO_DESKTOP", False);
winTDETTBAtom = XInternAtom (dpy, "_KDE_TRANSPARENT_TO_BLACK", False); winTDETTBAtom = XInternAtom (dpy, "_TDE_TRANSPARENT_TO_BLACK", False);
winType[WINTYPE_DESKTOP] = XInternAtom (dpy, "_NET_WM_WINDOW_TYPE_DESKTOP", 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_DOCK] = XInternAtom (dpy, "_NET_WM_WINDOW_TYPE_DOCK", False);
winType[WINTYPE_TOOLBAR] = XInternAtom (dpy, "_NET_WM_WINDOW_TYPE_TOOLBAR", False); winType[WINTYPE_TOOLBAR] = XInternAtom (dpy, "_NET_WM_WINDOW_TYPE_TOOLBAR", False);

Write Preview
Loading…
Cancel
Save