adding missing raise and lower keybindings
svn path=/trunk/kdebase/kwin/; revision=59304
This commit is contained in:
parent
13aebff097
commit
5d7ca8f2ee
4 changed files with 34 additions and 10 deletions
|
@ -18,6 +18,8 @@
|
||||||
keys->insertItem(i18n("Window shade"),"Window shade", "");
|
keys->insertItem(i18n("Window shade"),"Window shade", "");
|
||||||
keys->insertItem(i18n("Window move"),"Window move", "");
|
keys->insertItem(i18n("Window move"),"Window move", "");
|
||||||
keys->insertItem(i18n("Window resize"),"Window resize", "");
|
keys->insertItem(i18n("Window resize"),"Window resize", "");
|
||||||
|
keys->insertItem(i18n("Window raise"),"Window raise", "");
|
||||||
|
keys->insertItem(i18n("Window lower"),"Window lower", "");
|
||||||
|
|
||||||
keys->insertItem(i18n("Mouse emulation"),"Mouse emulation", "F12");
|
keys->insertItem(i18n("Mouse emulation"),"Mouse emulation", "F12");
|
||||||
|
|
||||||
|
|
14
main.cpp
14
main.cpp
|
@ -23,11 +23,11 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
// #define INT8 _X11INT8
|
#define INT8 _X11INT8
|
||||||
// #define INT32 _X11INT32
|
#define INT32 _X11INT32
|
||||||
#include <X11/Xproto.h>
|
#include <X11/Xproto.h>
|
||||||
// #undef INT8
|
#undef INT8
|
||||||
// #undef INT32
|
#undef INT32
|
||||||
|
|
||||||
#include <kcmdlineargs.h>
|
#include <kcmdlineargs.h>
|
||||||
#include <kaboutdata.h>
|
#include <kaboutdata.h>
|
||||||
|
@ -46,7 +46,7 @@ static void crashHandler(int)
|
||||||
{
|
{
|
||||||
KCrash::setCrashHandler(0); // Exit on next crash.
|
KCrash::setCrashHandler(0); // Exit on next crash.
|
||||||
delete client; client = 0; // Unregister with dcop.
|
delete client; client = 0; // Unregister with dcop.
|
||||||
// system("kwin&"); // Try to restart
|
system("kwin&"); // Try to restart
|
||||||
}
|
}
|
||||||
|
|
||||||
int x11ErrorHandler(Display *d, XErrorEvent *e){
|
int x11ErrorHandler(Display *d, XErrorEvent *e){
|
||||||
|
@ -179,7 +179,7 @@ void Application::saveState( QSessionManager& sm )
|
||||||
sm.requestPhase2();
|
sm.requestPhase2();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
workspaces.first()->storeSession( kapp->sessionConfig() );
|
workspaces.first()->storeSession( kapp->sessionConfig() );
|
||||||
kapp->sessionConfig()->sync();
|
kapp->sessionConfig()->sync();
|
||||||
}
|
}
|
||||||
|
@ -210,7 +210,7 @@ int main( int argc, char * argv[] )
|
||||||
signal(SIGHUP, SIG_IGN);
|
signal(SIGHUP, SIG_IGN);
|
||||||
|
|
||||||
Application a;
|
Application a;
|
||||||
// KCrash::setCrashHandler(crashHandler); // Try to restart on crash
|
KCrash::setCrashHandler(crashHandler); // Try to restart on crash
|
||||||
fcntl(ConnectionNumber(qt_xdisplay()), F_SETFD, 1);
|
fcntl(ConnectionNumber(qt_xdisplay()), F_SETFD, 1);
|
||||||
|
|
||||||
client = a.dcopClient();
|
client = a.dcopClient();
|
||||||
|
|
|
@ -1957,6 +1957,8 @@ void Workspace::createKeybindings(){
|
||||||
keys->connectItem( "Window shade", this, SLOT( slotWindowShade() ) );
|
keys->connectItem( "Window shade", this, SLOT( slotWindowShade() ) );
|
||||||
keys->connectItem( "Window move", this, SLOT( slotWindowMove() ) );
|
keys->connectItem( "Window move", this, SLOT( slotWindowMove() ) );
|
||||||
keys->connectItem( "Window resize", this, SLOT( slotWindowResize() ) );
|
keys->connectItem( "Window resize", this, SLOT( slotWindowResize() ) );
|
||||||
|
keys->connectItem( "Window raise", this, SLOT( slotWindowRaise() ) );
|
||||||
|
keys->connectItem( "Window lower", this, SLOT( slotWindowLower() ) );
|
||||||
|
|
||||||
keys->connectItem( "Mouse emulation", this, SLOT( slotMouseEmulation() ) );
|
keys->connectItem( "Mouse emulation", this, SLOT( slotMouseEmulation() ) );
|
||||||
|
|
||||||
|
@ -2047,6 +2049,24 @@ void Workspace::slotWindowShade()
|
||||||
performWindowOperation( popup_client, Options::ShadeOp );
|
performWindowOperation( popup_client, Options::ShadeOp );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Raises the popup client
|
||||||
|
*/
|
||||||
|
void Workspace::slotWindowRaise()
|
||||||
|
{
|
||||||
|
if ( popup_client )
|
||||||
|
raiseClient( popup_client );
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Lowers the popup client
|
||||||
|
*/
|
||||||
|
void Workspace::slotWindowLower()
|
||||||
|
{
|
||||||
|
if ( popup_client )
|
||||||
|
lowerClient( popup_client );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
Invokes keyboard mouse emulation
|
Invokes keyboard mouse emulation
|
||||||
|
|
|
@ -175,9 +175,9 @@ public:
|
||||||
void unclutterDesktop();
|
void unclutterDesktop();
|
||||||
void reconfigure();
|
void reconfigure();
|
||||||
void doNotManage(QString);
|
void doNotManage(QString);
|
||||||
|
|
||||||
QString desktopName( int desk );
|
QString desktopName( int desk );
|
||||||
|
|
||||||
bool isNotManaged( const QString& title );
|
bool isNotManaged( const QString& title );
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
|
@ -199,6 +199,8 @@ public slots:
|
||||||
void slotWindowMaximizeHorizontal();
|
void slotWindowMaximizeHorizontal();
|
||||||
void slotWindowIconify();
|
void slotWindowIconify();
|
||||||
void slotWindowShade();
|
void slotWindowShade();
|
||||||
|
void slotWindowRaise();
|
||||||
|
void slotWindowLower();
|
||||||
|
|
||||||
void slotWindowOperations();
|
void slotWindowOperations();
|
||||||
void slotWindowClose();
|
void slotWindowClose();
|
||||||
|
@ -312,7 +314,7 @@ private:
|
||||||
QWidget* supportWindow;
|
QWidget* supportWindow;
|
||||||
|
|
||||||
QRect area;
|
QRect area;
|
||||||
|
|
||||||
// swallowing
|
// swallowing
|
||||||
QStringList doNotManageList;
|
QStringList doNotManageList;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue