Removed startkde and exitkde events. They don't belong into kwin.

I remember that I removed those already some time ago. Somebody keeps
believing that KWin has something to do with a) KDE startup and b) KDE
Exit, grmbl.

This is not true, it's ksmserver who does this.

Unfortunatly I cannot remove the "logout" keybindings due to the translations.
It rather belongs into kdesktopbindings than kwinbindings.

Please, guys, kwin is a *window* manager, not a desktop (seems like a
neverending story...)

svn path=/trunk/kdebase/kwin/; revision=66503
This commit is contained in:
Matthias Ettrich 2000-10-05 22:09:49 +00:00
parent a3b30fce8c
commit a2c3696df5
5 changed files with 18 additions and 136 deletions

View file

@ -309,6 +309,8 @@ void WindowWrapper::releaseWindow()
}
XRemoveFromSaveSet(qt_xdisplay(), win );
qWarning("release window, give up select");
XSelectInput( qt_xdisplay(), win, NoEventMask );
invalidateWindow();
}
}
@ -827,6 +829,8 @@ bool Client::mapRequest( XMapRequestEvent& /* e */ )
bool Client::unmapNotify( XUnmapEvent& e )
{
qWarning("unmapNotify for window %ld", e.window);
if ( e.event != windowWrapper()->winId() && !e.send_event )
return TRUE;
@ -837,16 +841,27 @@ bool Client::unmapNotify( XUnmapEvent& e )
withdraw();
break;
case NormalState:
qWarning("in normal state: %s", caption().latin1() );
if ( ( !mapped || !windowWrapper()->isVisibleTo( this )) && !e.send_event )
return TRUE; // this event was produced by us as well
// maybe we will be destroyed soon. Check this first.
qWarning("do something");
XEvent ev;
if ( XCheckTypedWindowEvent (qt_xdisplay(), windowWrapper()->winId(),
DestroyNotify, &ev) ){
if ( XCheckTypedWindowEvent (qt_xdisplay(), windowWrapper()->winId(),
DestroyNotify, &ev) ){
workspace()->destroyClient( this );
return TRUE;
}
if ( XCheckTypedWindowEvent (qt_xdisplay(), windowWrapper()->winId(),
ReparentNotify, &ev) ){
if ( ev.xreparent.window == windowWrapper()->window() &&
ev.xreparent.parent != windowWrapper()->winId() ) {
qWarning("will miss window");
invalidateWindow();
}
}
qWarning("do withdraw");
// fall through
case WithdrawnState: // however that has been possible....
withdraw();

View file

@ -68,12 +68,6 @@ void Events::raise( Event e )
case ResizeEnd:
event = "resizeend";
break;
case StartKDE:
event = "startkde";
break;
case ExitKDE:
event = "exitkde";
break;
}
if ( !event )

View file

@ -29,9 +29,7 @@ public:
MoveStart,
MoveEnd,
ResizeStart,
ResizeEnd,
StartKDE,
ExitKDE
ResizeEnd
};
static void raise( Event );

122
eventsrc
View file

@ -1810,125 +1810,3 @@ Comment[ta]=´Õ º¡ÇÃõ «Ç× Á¡üÈõ ÓÊó¾Ð
Comment[uk]=Вікно закінчило змінювати розмір
Comment[zh_CN.GB2312]=窗口完成改变大小
default_presentation=0
[startkde]
Name=Login
Name[bg]=Ëîãîí
Name[ca]=Connexió
Name[cs]=Přihlášení
Name[da]=Logpå
Name[de]=Anmelden
Name[eo]=Saluto
Name[es]=Entrada
Name[et]=Sisse logimine
Name[fi]=Kirjaudu sisään
Name[fr]=Début de session
Name[he]=תכרעמל הסינכ
Name[hr]=Prijava
Name[hu]=Bejelentkezés
Name[it]=Avvio
Name[ja]=ログイン
Name[nl]=Inloggen
Name[no]=Logginn
Name[no_NY]=Logg inn
Name[pl]=Zalogowanie
Name[ro]=Logare
Name[sl]=Prijava
Name[sv]=Logga in
Name[ta]=Ã<>Åì¸õ
Name[uk]=РеєÑ<E2809D>ÑрацÑÑ<E28093>
Comment=KDE is Starting Up
Comment[bg]=KDE ñå Ñòàðòèðà
Comment[ca]=KDE està engegant
Comment[cs]=Spouští se prostředí KDE
Comment[da]=KDE er ved at starte
Comment[de]=KDE startet
Comment[el]=Το KDE ξεκινά
Comment[eo]=KDE estas lanĉata
Comment[es]=KDE está Arrancando
Comment[et]=KDE käivitub
Comment[fi]=KDE käynnistyy
Comment[fr]=KDE est en cours de démarrage
Comment[gl]=KDE está a Iniciarse
Comment[he]=ל××ת××<E284A2> ךילהתב KDE
Comment[hr]=KDE se podiže
Comment[hu]=Belépés a KDE-be
Comment[is]=KDE er að fara í gang
Comment[it]=Avvio di KDE
Comment[ja]=KDEèµ·å•ä¸­
Comment[nl]=KDE is aan het opstarten
Comment[no]=KDE starter opp
Comment[no_NY]=KDE startar
Comment[pl]=Uruchomienie KDE
Comment[pt]=O KDE Está a Iniciar
Comment[pt_BR]=KDE está iniciando
Comment[ro]=KDE porneÅŸte
Comment[sk]=KDE sa spúšťa
Comment[sl]=KDE se zaganja
Comment[sv]=KDE är under uppstart
Comment[ta]=KDE Ã<>Åí̸¢ÈÃ<CB86>
Comment[uk]=ЗапуÑ<C692>к KDE.
default_presentation=1
default_sound=KDE_Startup.wav
[exitkde]
Name=Logout
Name[ca]=Desconnexió
Name[cs]=Odhlášení
Name[da]=Logaf
Name[de]=Abmelden
Name[eo]=AdiaÅ­o
Name[es]=Salida
Name[et]=Väljalogimine
Name[fi]=Kirjaudu ulos
Name[fr]=Fin de session
Name[he]=תכרעמהמ ××<E2809D>×צ×
Name[hr]=Odjava
Name[hu]=Kijelentkezés
Name[is]=Útstimplun
Name[it]=Uscita
Name[ja]=ログアウト
Name[nl]=Uitloggen
Name[no]=Logg ut
Name[no_NY]=Logg ut
Name[pl]=Wylogowanie
Name[pt_BR]=Sair
Name[ro]=IeÅŸire
Name[sl]=Odjava
Name[sv]=Logga ut
Name[ta]=ÓÊò¾ø
Name[uk]=Кінець Ñ<>еанÑ<C2BD>у
Comment=KDE is Exiting
Comment[bg]=KDE ñå Ñïèðà
Comment[ca]=KDE està aturant
Comment[cs]=UkonÄ<6E>uje se prostÅ™edí KDE
Comment[da]=KDE er ved at afslutte
Comment[de]=KDE wird beendet
Comment[el]=Το KDE τεμÏ<C2BC>ατίζει
Comment[eo]=KDE estas finata
Comment[es]=KDE está Terminando
Comment[et]=KDE lõpetab töö
Comment[fi]=KDE lopetetaan
Comment[fr]=KDE est en cours d'arrêt
Comment[gl]=KDE está Saíndo
Comment[he]=××<E2809D>×צי ךילהתב KDE
Comment[hr]=KDE se zatvara
Comment[hu]=Kilépés a KDE-bÅl
Comment[is]=KDE er að hætta keyrslu
Comment[it]=Uscita da KDE
Comment[ja]=KDEã<45>¯å•ä½œä¸­ã<C2AD>§ã<C2A7>
Comment[nl]=KDE is aan het afsluiten
Comment[no]=KDE avslutter
Comment[no_NY]=KDE avsluttar
Comment[pl]=Zakończenie KDE
Comment[pt]=O KDE Está a Sair
Comment[pt_BR]=KDE está saindo
Comment[ro]=KDE se termină
Comment[sk]=KDE sa ukonÄ<6E>uje
Comment[sl]=KDE se konÄ~Muje
Comment[sv]=KDE är på väg att avslutas
Comment[ta]=KDE ¦ÅÇ¢§ÃÚ¸¢ÈÃ<CB86>
Comment[uk]=Вихід KDE
default_presentation=1
default_sound=KDE_Logout.wav

View file

@ -213,7 +213,6 @@ Workspace::Workspace( bool restore )
keys (0),
root (0)
{
Events::raise(Events::StartKDE);
root = qt_xrootwin();
default_colormap = DefaultColormap(qt_xdisplay(), qt_xscreen() );
installed_colormap = default_colormap;
@ -2222,8 +2221,6 @@ void Workspace::slotMouseEmulation()
void Workspace::slotLogout()
{
Events::raise(Events::ExitKDE);
kapp->requestShutDown();
}