diff --git a/applets/appmenu/lib/appmenuapplet.cpp b/applets/appmenu/lib/appmenuapplet.cpp index 62b43c90f..4560b9e77 100644 --- a/applets/appmenu/lib/appmenuapplet.cpp +++ b/applets/appmenu/lib/appmenuapplet.cpp @@ -1,283 +1,291 @@ /* * Copyright 2016 Kai Uwe Broulik * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as * published by the Free Software Foundation; either version 2 of * the License or (at your option) version 3 or any later version * accepted by the membership of KDE e.V. (or its successor approved * by the membership of KDE e.V.), which shall act as a proxy * defined in Section 14 of version 3 of the license. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program. If not, see . * */ #include "appmenuapplet.h" #include "../plugin/appmenumodel.h" #include #include #include #include #include #include #include #include #include #include AppMenuApplet::AppMenuApplet(QObject *parent, const QVariantList &data) : Plasma::Applet(parent, data) { } AppMenuApplet::~AppMenuApplet() = default; void AppMenuApplet::init() { // TODO Wayland PlasmaShellSurface stuff QDBusConnection::sessionBus().connect(QStringLiteral("org.kde.kappmenu"), QStringLiteral("/KAppMenu"), QStringLiteral("org.kde.kappmenu"), QStringLiteral("reconfigured"), this, SLOT(updateAppletEnabled())); updateAppletEnabled(); } AppMenuModel *AppMenuApplet::model() const { return m_model; } void AppMenuApplet::setModel(AppMenuModel *model) { if (m_model != model) { m_model = model; emit modelChanged(); } } int AppMenuApplet::view() const { return m_viewType; } void AppMenuApplet::setView(int type) { if (m_viewType != type) { m_viewType = type; emit viewChanged(); } } int AppMenuApplet::currentIndex() const { return m_currentIndex; } void AppMenuApplet::setCurrentIndex(int currentIndex) { if (m_currentIndex != currentIndex) { m_currentIndex = currentIndex; emit currentIndexChanged(); } } QQuickItem *AppMenuApplet::buttonGrid() const { return m_buttonGrid; } void AppMenuApplet::setButtonGrid(QQuickItem *buttonGrid) { if (m_buttonGrid != buttonGrid) { m_buttonGrid = buttonGrid; emit buttonGridChanged(); } } bool AppMenuApplet::appletEnabled() const { return m_appletEnabled; } void AppMenuApplet::updateAppletEnabled() { KConfigGroup config(KSharedConfig::openConfig(QStringLiteral("kdeglobals")), QStringLiteral("Appmenu Style")); const QString &menuStyle = config.readEntry(QStringLiteral("Style")); const bool enabled = (menuStyle == QLatin1String("Widget")); if (m_appletEnabled != enabled) { m_appletEnabled = enabled; emit appletEnabledChanged(); } } QMenu *AppMenuApplet::createMenu(int idx) const { QMenu *menu = nullptr; QAction *action = nullptr; if (view() == CompactView) { menu = new QMenu(); for (int i=0; irowCount(); i++) { const QModelIndex index = m_model->index(i, 0); const QVariant data = m_model->data(index, AppMenuModel::ActionRole); action = (QAction *)data.value(); menu->addAction(action); } menu->setAttribute(Qt::WA_DeleteOnClose); } else if (view() == FullView) { const QModelIndex index = m_model->index(idx, 0); const QVariant data = m_model->data(index, AppMenuModel::ActionRole); action = (QAction *)data.value(); if (action) { menu = action->menu(); } } return menu; } void AppMenuApplet::onMenuAboutToHide() { setCurrentIndex(-1); } void AppMenuApplet::trigger(QQuickItem *ctx, int idx) { if (m_currentIndex == idx) { return; } if (!ctx || !ctx->window() || !ctx->window()->screen()) { return; } QMenu *actionMenu = createMenu(idx); if (actionMenu) { //this is a workaround where Qt will fail to realise a mouse has been released // this happens if a window which does not accept focus spawns a new window that takes focus and X grab // whilst the mouse is depressed // https://bugreports.qt.io/browse/QTBUG-59044 // this causes the next click to go missing //by releasing manually we avoid that situation auto ungrabMouseHack = [ctx]() { if (ctx && ctx->window() && ctx->window()->mouseGrabberItem()) { // FIXME event forge thing enters press and hold move mode :/ ctx->window()->mouseGrabberItem()->ungrabMouse(); } }; //pre 5.8.0 QQuickWindow code is "item->grabMouse(); sendEvent(item, mouseEvent)" //post 5.8.0 QQuickWindow code is sendEvent(item, mouseEvent); item->grabMouse() if (QVersionNumber::fromString(qVersion()) > QVersionNumber(5, 8, 0)) { QTimer::singleShot(0, ctx, ungrabMouseHack); } else { ungrabMouseHack(); } //end workaround const auto &geo = ctx->window()->screen()->availableVirtualGeometry(); QPoint pos = ctx->window()->mapToGlobal(ctx->mapToScene(QPointF()).toPoint()); if (location() == Plasma::Types::TopEdge) { pos.setY(pos.y() + ctx->height()); } actionMenu->adjustSize(); pos = QPoint(qBound(geo.x(), pos.x(), geo.x() + geo.width() - actionMenu->width()), qBound(geo.y(), pos.y(), geo.y() + geo.height() - actionMenu->height())); if (view() == FullView) { actionMenu->installEventFilter(this); } + setStatus(Plasma::Types::AcceptingInputStatus); + actionMenu->winId();//create window handle + actionMenu->windowHandle()->setTransientParent(ctx->window()); + actionMenu->popup(pos); + //we can return to passive immediately, an autohide panel will stay open whilst + //any transient window is showing + setStatus(Plasma::Types::PassiveStatus); + if (view() == FullView) { // hide the old menu only after showing the new one to avoid brief flickering // in other windows as they briefly re-gain focus QMenu *oldMenu = m_currentMenu; m_currentMenu = actionMenu; if (oldMenu && oldMenu != actionMenu) { oldMenu->hide(); } } setCurrentIndex(idx); // FIXME TODO connect only once connect(actionMenu, &QMenu::aboutToHide, this, &AppMenuApplet::onMenuAboutToHide, Qt::UniqueConnection); return; } } // FIXME TODO doesn't work on submenu bool AppMenuApplet::eventFilter(QObject *watched, QEvent *event) { auto *menu = qobject_cast(watched); if (!menu) { return false; } if (event->type() == QEvent::KeyPress) { auto *e = static_cast(event); // TODO right to left languages if (e->key() == Qt::Key_Left) { int desiredIndex = m_currentIndex - 1; emit requestActivateIndex(desiredIndex); return true; } else if (e->key() == Qt::Key_Right) { if (menu->activeAction() && menu->activeAction()->menu()) { return false; } int desiredIndex = m_currentIndex + 1; emit requestActivateIndex(desiredIndex); return true; } } else if (event->type() == QEvent::MouseMove) { auto *e = static_cast(event); if (!m_buttonGrid || !m_buttonGrid->window()) { return false; } // FIXME the panel margin breaks Fitt's law :( const QPointF &windowLocalPos = m_buttonGrid->window()->mapFromGlobal(e->globalPos()); const QPointF &buttonGridLocalPos = m_buttonGrid->mapFromScene(windowLocalPos); auto *item = m_buttonGrid->childAt(buttonGridLocalPos.x(), buttonGridLocalPos.y()); if (!item) { return false; } bool ok; const int buttonIndex = item->property("buttonIndex").toInt(&ok); if (!ok) { return false; } emit requestActivateIndex(buttonIndex); } return false; } K_EXPORT_PLASMA_APPLET_WITH_JSON(appmenu, AppMenuApplet, "metadata.json") #include "appmenuapplet.moc" diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake index 462ab74f5..84e20b2cc 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -1,368 +1,363 @@ #!/bin/sh # # DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) # # When the X server dies we get a HUP signal from xinit. We must ignore it # because we still need to do some cleanup. trap 'echo GOT SIGHUP' HUP # Check if a Plasma session already is running and whether it's possible to connect to X kcheckrunning kcheckrunning_result=$? if test $kcheckrunning_result -eq 0 ; then echo "Plasma seems to be already running on this display." xmessage -geometry 500x100 "Plasma seems to be already running on this display." > /dev/null 2>/dev/null exit 1 elif test $kcheckrunning_result -eq 2 ; then echo "\$DISPLAY is not set or cannot connect to the X server." exit 1 fi # Boot sequence: # # kdeinit is used to fork off processes which improves memory usage # and startup time. # # * kdeinit starts klauncher first. # * Then kded is started. kded is responsible for keeping the sycoca # database up to date. When an up to date database is present it goes # into the background and the startup continues. # * Then kdeinit starts kcminit. kcminit performs initialisation of # certain devices according to the user's settings # # * Then ksmserver is started which takes control of the rest of the startup sequence # We need to create config folder so we can write startupconfigkeys if [ ${XDG_CONFIG_HOME} ]; then configDir=$XDG_CONFIG_HOME; else configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html fi mkdir -p $configDir #This is basically setting defaults so we can use them with kstartupconfig5 cat >$configDir/startupconfigkeys <$plasmalocalerc <$kdeglobalsfile </plasma-workspace/env/*.sh # (where correspond to the system and user's configuration # directories, as identified by Qt's qtpaths, e.g. $HOME/.config # and /etc/xdg/ on Linux) # # This is where you can define environment variables that will be available to # all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` # or eval `gpg-agent --daemon`. # Note: if you do that, you should also put "ssh-agent -k" as a shutdown script # # (see end of this file). # For anything else (that doesn't set env vars, or that needs a window manager), # better use the Autostart folder. scriptpath=`qtpaths --locate-dirs GenericConfigLocation plasma-workspace | tr ':' '\n'` # Add /env/ to the directory to locate the scripts to be sourced for prefix in `echo $scriptpath`; do for file in "$prefix"/env/*.sh; do test -r "$file" && . "$file" || true done done # Activate the kde font directories. # # There are 4 directories that may be used for supplying fonts for KDE. # # There are two system directories. These belong to the administrator. # There are two user directories, where the user may add her own fonts. # # The 'override' versions are for fonts that should come first in the list, # i.e. if you have a font in your 'override' directory, it will be used in # preference to any other. # # The preference order looks like this: # user override, system override, X, user, system # # Where X is the original font database that was set up before this script # runs. usr_odir=$HOME/.fonts/kde-override usr_fdir=$HOME/.fonts if test -n "$KDEDIRS"; then kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'` sys_odir=$kdedirs_first/share/fonts/override sys_fdir=$kdedirs_first/share/fonts else sys_odir=$KDEDIR/share/fonts/override sys_fdir=$KDEDIR/share/fonts fi # We run mkfontdir on the user's font dirs (if we have permission) to pick # up any new fonts they may have installed. If mkfontdir fails, we still # add the user's dirs to the font path, as they might simply have been made # read-only by the administrator, for whatever reason. test -d "$sys_odir" && xset +fp "$sys_odir" test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir") test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir") test -d "$sys_fdir" && xset fp+ "$sys_fdir" # Ask X11 to rebuild its font list. xset fp rehash # Set a left cursor instead of the standard X11 "X" cursor, since I've heard # from some users that they're confused and don't know what to do. This is # especially necessary on slow machines, where starting KDE takes one or two # minutes until anything appears on the screen. # # If the user has overwritten fonts, the cursor font may be different now # so don't move this up. # xsetroot -cursor_name left_ptr # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap if test -n "$GS_LIB" ; then GS_LIB=$usr_fdir:$GS_LIB export GS_LIB else GS_LIB=$usr_fdir export GS_LIB fi echo 'startkde: Starting up...' 1>&2 # Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. # The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend # to set it to a list of paths *not* including the KDE prefix if it's not /usr or # /usr/local. if test -z "$XDG_DATA_DIRS"; then XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share" fi export XDG_DATA_DIRS # Mark that full KDE session is running (e.g. Konqueror preloading works only # with full KDE running). The KDE_FULL_SESSION property can be detected by # any X client connected to the same X session, even if not launched # directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION # however guarantees that the application is launched in the same environment # like the KDE session and that e.g. KDE utilities/libraries are available. # KDE_FULL_SESSION property is also only available since KDE 3.5.5. # The matching tests are: # For $KDE_FULL_SESSION: # if test -n "$KDE_FULL_SESSION"; then ... whatever # For KDE_FULL_SESSION property: # xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null # if test $? -eq 0; then ... whatever # # Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid # of the user running the KDE session. It should be rarely needed (e.g. # after sudo to prevent desktop-wide functionality in the new user's kded). # # Since KDE4 there is also KDE_SESSION_VERSION, containing the major version number. # Note that this didn't exist in KDE3, which can be detected by its absense and # the presence of KDE_FULL_SESSION. # KDE_FULL_SESSION=true export KDE_FULL_SESSION xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true KDE_SESSION_VERSION=5 export KDE_SESSION_VERSION xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 KDE_SESSION_UID=`id -ru` export KDE_SESSION_UID XDG_CURRENT_DESKTOP=KDE export XDG_CURRENT_DESKTOP # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment if which dbus-update-activation-environment >/dev/null 2>/dev/null ; then dbus-update-activation-environment --systemd --all else @CMAKE_INSTALL_FULL_LIBEXECDIR@/ksyncdbusenv fi if test $? -ne 0; then # Startup error echo 'startkde: Could not sync environment to dbus.' 1>&2 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null xmessage -geometry 500x100 "Could not sync environment to dbus." exit 1 fi # We set LD_BIND_NOW to increase the efficiency of kdeinit. # kdeinit unsets this variable before loading applications. LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup if test $? -ne 0; then # Startup error echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." exit 1 fi qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence # if the KDEWM environment variable has been set, then it will be used as KDE's # window manager instead of kwin. # if KDEWM is not set, ksmserver will ensure kwin is started. # kwrapper5 is used to reduce startup time and memory usage # kwrapper5 does not return useful error codes such as the exit code of ksmserver. # We only check for 255 which means that the ksmserver process could not be # started, any problems thereafter, e.g. ksmserver failing to initialize, # will remain undetected. test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM" # If the session should be locked from the start (locked autologin), # lock now and do the rest of the KDE startup underneath the locker. KSMSERVEROPTIONS="" test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen" kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS if test $? -eq 255; then # Startup error echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." fi #Anything after here is logout/shutdown wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` if test x"$wait_drkonqi"x = x"true"x ; then # wait for remaining drkonqi instances with timeout (in seconds) wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` wait_drkonqi_counter=0 while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do sleep 5 wait_drkonqi_counter=$((wait_drkonqi_counter+5)) if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then # ask remaining drkonqis to die in a graceful way qdbus | grep 'org.kde.drkonqi-' | while read address ; do qdbus "$address" "/MainApplication" "quit" done break fi done fi echo 'startkde: Shutting down...' 1>&2 # just in case test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null # Clean up kdeinit5_shutdown unset KDE_FULL_SESSION xprop -root -remove KDE_FULL_SESSION unset KDE_SESSION_VERSION xprop -root -remove KDE_SESSION_VERSION unset KDE_SESSION_UID echo 'startkde: Done.' 1>&2 diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake index 45218fcb5..d1e684fcb 100644 --- a/startkde/startplasma.cmake +++ b/startkde/startplasma.cmake @@ -1,203 +1,198 @@ #!/bin/sh # # DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ ) # # Boot sequence: # # kdeinit is used to fork off processes which improves memory usage # and startup time. # # * kdeinit starts klauncher first. # * Then kded is started. kded is responsible for keeping the sycoca # database up to date. When an up to date database is present it goes # into the background and the startup continues. # * Then kdeinit starts kcminit. kcminit performs initialisation of # certain devices according to the user's settings # # * Then ksmserver is started which takes control of the rest of the startup sequence # We need to create config folder so we can write startupconfigkeys if [ ${XDG_CONFIG_HOME} ]; then configDir=$XDG_CONFIG_HOME; else configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html fi [ -r $configDir/startupconfig ] && . $configDir/startupconfig if test "$kcmfonts_general_forcefontdpi" -ne 0; then xrdb -quiet -merge -nocpp <&2 # export our session variables to the Xwayland server xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5 # We set LD_BIND_NOW to increase the efficiency of kdeinit. # kdeinit unsets this variable before loading applications. LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup if test $? -ne 0; then # Startup error echo 'startplasma: Could not start kdeinit5. Check your installation.' 1>&2 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation." exit 1 fi qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence # if the KDEWM environment variable has been set, then it will be used as KDE's # window manager instead of kwin. # if KDEWM is not set, ksmserver will ensure kwin is started. # kwrapper5 is used to reduce startup time and memory usage # kwrapper5 does not return useful error codes such as the exit code of ksmserver. # We only check for 255 which means that the ksmserver process could not be # started, any problems thereafter, e.g. ksmserver failing to initialize, # will remain undetected. # If the session should be locked from the start (locked autologin), # lock now and do the rest of the KDE startup underneath the locker. KSMSERVEROPTIONS=" --no-lockscreen" kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS if test $? -eq 255; then # Startup error echo 'startplasma: Could not start ksmserver. Check your installation.' 1>&2 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." fi wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` if test x"$wait_drkonqi"x = x"true"x ; then # wait for remaining drkonqi instances with timeout (in seconds) wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` wait_drkonqi_counter=0 while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do sleep 5 wait_drkonqi_counter=$((wait_drkonqi_counter+5)) if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then # ask remaining drkonqis to die in a graceful way qdbus | grep 'org.kde.drkonqi-' | while read address ; do qdbus "$address" "/MainApplication" "quit" done break fi done fi echo 'startplasma: Shutting down...' 1>&2 # just in case test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null # Clean up kdeinit5_shutdown unset KDE_FULL_SESSION xprop -root -remove KDE_FULL_SESSION unset KDE_SESSION_VERSION xprop -root -remove KDE_SESSION_VERSION unset KDE_SESSION_UID echo 'startplasma: Done.' 1>&2