summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoronestone <onestone>2006-11-15 18:42:52 +0000
committeronestone <onestone>2006-11-15 18:42:52 +0000
commitf701eeab3f5485cf7ddfeb2871d23913d329c72d (patch)
tree46176a417f2d7d58a64ecf69961ff3ace5bdd027
parent94fe6d2cb12eb517ae6f596f6f5e0f779011a04e (diff)
downloadaquamarine-f701eeab3f5485cf7ddfeb2871d23913d329c72d.tar.gz
aquamarine-f701eeab3f5485cf7ddfeb2871d23913d329c72d.tar.bz2
applied gnumdk's patch
-rw-r--r--src/aquamarine.cpp10
-rw-r--r--src/window.cpp1
2 files changed, 6 insertions, 5 deletions
diff --git a/src/aquamarine.cpp b/src/aquamarine.cpp
index b488781..4d61fe5 100644
--- a/src/aquamarine.cpp
+++ b/src/aquamarine.cpp
@@ -111,7 +111,7 @@ main (int argc, char **argv)
}
}
- Bool berylRunning = false;
+ Bool wmRunning = false;
do
{
XEvent xev;
@@ -133,15 +133,15 @@ main (int argc, char **argv)
sprintf(buf,"%s",data);
if (strcmp(buf,"beryl") == 0)
{
- berylRunning = true;
+ wmRunning = true;
}
if (strcmp(buf,"compiz") == 0)
{
- berylRunning = true;
+ wmRunning = true;
}
}
- if (!berylRunning)
+ if (!wmRunning)
{
XSelectInput(dpy, wm, StructureNotifyMask);
printf("Found not compatible window manager. Waiting...\n");
@@ -170,7 +170,7 @@ main (int argc, char **argv)
xev.xclient.message_type == manager &&
(Atom)xev.xclient.data.l[1] == wm_sn);
}
- } while (!berylRunning);
+ } while (!wmRunning);
Aquamarine::Decorator *app = new Aquamarine::Decorator(dpy, Qt::HANDLE (visual),
Qt::HANDLE (colormap));
diff --git a/src/window.cpp b/src/window.cpp
index a6eeaf6..6c74f8b 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1574,6 +1574,7 @@ void Aquamarine::Window::performMouseCommand(Options::MouseCommand command, QMou
switch (command)
{
case Options::MouseRaise:
+ case Options::MouseActivateAndRaise:
KWin::raiseWindow (m_wid);
break;
case Options::MouseLower: