diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..9b5ae0a --- /dev/null +++ b/.clang-format @@ -0,0 +1,95 @@ +--- +# SPDX-FileCopyrightText: 2019 Christoph Cullmann +# SPDX-FileCopyrightText: 2019 Gernot Gebhard +# +# SPDX-License-Identifier: MIT + +# This file got automatically created by ECM, do not edit +# See https://clang.llvm.org/docs/ClangFormatStyleOptions.html for the config options +# and https://community.kde.org/Policies/Frameworks_Coding_Style#Clang-format_automatic_code_formatting +# for clang-format tips & tricks +--- +Language: JavaScript +DisableFormat: true +--- +Language: Json +DisableFormat: false +IndentWidth: 4 +--- + +# Style for C++ +Language: Cpp + +# base is WebKit coding style: https://webkit.org/code-style-guidelines/ +# below are only things set that diverge from this style! +BasedOnStyle: WebKit + +# enforce C++11 (e.g. for std::vector> +Standard: Cpp11 + +# 4 spaces indent +TabWidth: 4 + +# 2 * 80 wide lines +ColumnLimit: 160 + +# sort includes inside line separated groups +SortIncludes: true + +# break before braces on function, namespace and class definitions. +BreakBeforeBraces: Linux + +# CrlInstruction *a; +PointerAlignment: Right + +# horizontally aligns arguments after an open bracket. +AlignAfterOpenBracket: Align + +# don't move all parameters to new line +AllowAllParametersOfDeclarationOnNextLine: false + +# no single line functions +AllowShortFunctionsOnASingleLine: None + +# no single line enums +AllowShortEnumsOnASingleLine: false + +# always break before you encounter multi line strings +AlwaysBreakBeforeMultilineStrings: true + +# don't move arguments to own lines if they are not all on the same +BinPackArguments: false + +# don't move parameters to own lines if they are not all on the same +BinPackParameters: false + +# In case we have an if statement with multiple lines the operator should be at the beginning of the line +# but we do not want to break assignments +BreakBeforeBinaryOperators: NonAssignment + +# format C++11 braced lists like function calls +Cpp11BracedListStyle: true + +# do not put a space before C++11 braced lists +SpaceBeforeCpp11BracedList: false + +# remove empty lines +KeepEmptyLinesAtTheStartOfBlocks: false + +# no namespace indentation to keep indent level low +NamespaceIndentation: None + +# we use template< without space. +SpaceAfterTemplateKeyword: false + +# Always break after template declaration +AlwaysBreakTemplateDeclarations: true + +# macros for which the opening brace stays attached. +ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE , wl_resource_for_each, wl_resource_for_each_safe ] + +# keep lambda formatting multi-line if not empty +AllowShortLambdasOnASingleLine: Empty + +# We do not want clang-format to put all arguments on a new line +AllowAllArgumentsOnNextLine: false diff --git a/CMakeLists.txt b/CMakeLists.txt index 5be9996..a0b3307 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,23 +1,44 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.15) project(switcher) -set(QT_MIN_VERSION "5.9.0") -set(KF5_MIN_VERSION "5.42.0") +find_package(ECM ${KF6_MIN_VERSION} REQUIRED NO_MODULE) -find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) -set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Widgets X11Extras) -find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Runner I18n) +set(QT_MAJOR_VERSION "6") +set(QT_MIN_VERSION "6.4.0") +set(KF_MAJOR_VERSION "6") +set(KF6_MIN_VERSION "6.4.0") +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) include(FeatureSummary) +include(ECMQtDeclareLoggingCategory) +include(KDEClangFormat) +include(KDEGitCommitHooks) + + +find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} + CONFIG REQUIRED + COMPONENTS + Widgets) +find_package(KF${KF_MAJOR_VERSION} ${KF6_MIN_VERSION} + REQUIRED COMPONENTS + Runner + I18n + WindowSystem + # Pulled in by Plasma + Config) add_subdirectory(src) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) + +# add clang-format target for all our real source files +file(GLOB ALL_CLANG_FORMAT_SOURCE_FILES src/*.cpp *.h) +kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) +kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..7b63d8e --- /dev/null +++ b/LICENSE @@ -0,0 +1,338 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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) any later version. + + 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, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 044d789..dd20ba2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,19 +1,26 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasma_runner_org.kde.switcher\") set(switcher_SRCS switcher.cpp) - -find_package(XCB MODULE REQUIRED COMPONENTS XCB RANDR) +ecm_qt_declare_logging_category(switcher_SRCS + HEADER switcher_debug.h + IDENTIFIER KRUNNER_SWITCHER + CATEGORY_NAME kf.krunner.runner.switcher + DESCRIPTION "KRunner Switcher Runner" + EXPORT KRUNNER_SWITCHER +) add_library(krunner_switcher MODULE ${switcher_SRCS}) -target_link_libraries(krunner_switcher Qt5::Widgets KF5::WindowSystem KF5::I18n KF5::Runner) - - -configure_file(config-switcher.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-switcher.h) - -target_link_libraries(krunner_switcher ${X11_LIBRARIES} XCB::XCB ) -target_link_libraries(krunner_switcher Qt5::X11Extras) +target_link_libraries(krunner_switcher + Qt${QT_MAJOR_VERSION}::Widgets + KF${KF_MAJOR_VERSION}::WindowSystem + KF${KF_MAJOR_VERSION}::I18n + KF${KF_MAJOR_VERSION}::Runner) -install(TARGETS krunner_switcher DESTINATION ${KDE_INSTALL_PLUGINDIR}) -install(FILES plasma-runner-switcher.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) +install(TARGETS krunner_switcher DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/kf${KF_MAJOR_VERSION}/krunner) +ecm_qt_install_logging_categories( + EXPORT KRUNNER_SWITCHER + FILE krunner_switcher.categories + DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} +) diff --git a/src/plasma-runner-switcher.desktop b/src/plasma-runner-switcher.desktop deleted file mode 100644 index 551cfd8..0000000 --- a/src/plasma-runner-switcher.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Name=Switcher -Comment=Switcher is an app switching plugin. Type part of the application name/title preceded with a dot, e.g. ".emacs" to switch between apps. -Icon=kde - -X-KDE-ServiceTypes=Plasma/Runner -Type=Service -X-KDE-Library=krunner_switcher -X-KDE-PluginInfo-Author=Tatu Lahtela -X-KDE-PluginInfo-Email=lahtela@iki.fi -X-KDE-PluginInfo-Name=switcher -X-KDE-PluginInfo-Version=0.1 -X-KDE-PluginInfo-License=LGPL 2.1+ -X-KDE-PluginInfo-EnabledByDefault=true diff --git a/src/plasma-runner-switcher.json b/src/plasma-runner-switcher.json new file mode 100644 index 0000000..e01605a --- /dev/null +++ b/src/plasma-runner-switcher.json @@ -0,0 +1,24 @@ +{ + "KPlugin": { + "Authors": [ + { + "Email": "lahtela@iki.fi", + "Name": "Tatu Lahtela" + }, + { + "Email": "bjorn.kettunen@thaodan.de", + "Name": "Björn Kettunen" + } + ], + "Description": "Window Switcher is an app switching plugin. Type part of the application name/title preceded with a dot, e.g. \".emacs\" to switch between apps.", + "EnabledByDefault": true, + "X-Plasma-Runner-Unique-Results": true, + "Icon": "kde", + "License": "LGPL 2.1+", + "Name": "Windows", + "ServiceTypes": [ + "Plasma/Runner" + ], + "Version": "0.1" + } +} diff --git a/src/switcher.cpp b/src/switcher.cpp index 1177d93..67361d3 100644 --- a/src/switcher.cpp +++ b/src/switcher.cpp @@ -1,156 +1,223 @@ -/*************************************************************************** - * Copyright 2009 by Martin Gräßlin * - * * - * 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) any later version. * - * * - * 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, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA . * - ***************************************************************************/ +/* -*- c++ -*- + * Copyright 2018 by Tatu Lahtela + * SPDX-FileCopyrightText: 2026 Bjorn Kettunen + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + #include "switcher.h" -#include "config-switcher.h" +#include "switcher_debug.h" -#include +#include +#include +#include +#include #include #include -#include -#include - -#ifdef HAVE_X11 - -#include -#include - -#endif +#include -K_EXPORT_PLASMA_RUNNER(windows, Switcher) +K_PLUGIN_CLASS_WITH_JSON(Switcher, "plasma-runner-switcher.json") -Switcher::Switcher(QObject *parent, const QVariantList &args) - : AbstractRunner(parent, args) { +Switcher::Switcher(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args) + : AbstractRunner(parent, metaData) +{ Q_UNUSED(args); setObjectName(QLatin1String("Switcher")); + addSyntax(QStringLiteral(":q:"), + i18n("Switch to application by typing a dot and the app " + "name, e.g. '.emacs'")); - setDefaultSyntax(Plasma::RunnerSyntax(i18nc("Note this is a KRunner keyword", "."), - i18n("Switch to application by typing a dot and the app name, e.g. '.emacs'"))); - - connect(this, &Plasma::AbstractRunner::prepare, this, &Switcher::prepareForMatchSession); - connect(this, &Plasma::AbstractRunner::teardown, this, &Switcher::matchSessionComplete); + connect(this, &KRunner::AbstractRunner::prepare, this, &Switcher::prepareForMatchSession); + connect(this, &KRunner::AbstractRunner::teardown, this, &Switcher::matchSessionComplete); } Switcher::~Switcher() = default; // Called in the main thread -void Switcher::gatherInfo() { - for (const WId &w: KWindowSystem::windows()) { - KWindowInfo info(w, NET::WMWindowType | NET::WMDesktop | - NET::WMState | NET::XAWMState | - NET::WMName, +void Switcher::gatherInfo() +{ + for (const WId &w : KX11Extras::windows()) { + KWindowInfo info(w, + NET::WMWindowType | NET::WMDesktop | NET::WMState | NET::XAWMState | NET::WMName, NET::WM2WindowClass | NET::WM2WindowRole | NET::WM2AllowedActions); if (info.valid() && info.name() != "KRunner — krunner") { // ignore NET::Tool and other special window types - NET::WindowType wType = info.windowType(NET::NormalMask | NET::DesktopMask | NET::DockMask | - NET::ToolbarMask | NET::MenuMask | NET::DialogMask | - NET::OverrideMask | NET::TopMenuMask | - NET::UtilityMask | NET::SplashMask); + NET::WindowType wType = info.windowType(NET::NormalMask | NET::DesktopMask | NET::DockMask | NET::ToolbarMask | NET::MenuMask | NET::DialogMask + | NET::OverrideMask | NET::TopMenuMask | NET::UtilityMask | NET::SplashMask); - if (wType != NET::Normal && wType != NET::Override && wType != NET::Unknown && - wType != NET::Dialog && wType != NET::Utility) { + if (wType != NET::Normal && wType != NET::Override && wType != NET::Unknown && wType != NET::Dialog && wType != NET::Utility) { continue; } m_windows.insert(w, info); - m_icons.insert(w, QIcon(KWindowSystem::icon(w))); + m_icons.insert(w, QIcon(KX11Extras::icon(w))); } } - const int desktopCount = KWindowSystem::numberOfDesktops(); + const int desktopCount = KX11Extras::numberOfDesktops(); for (int i = 1; i <= desktopCount; ++i) { - m_desktopNames.append(KWindowSystem::desktopName(i)); + m_desktopNames.append(KX11Extras::desktopName(i)); } } // Called in the main thread -void Switcher::prepareForMatchSession() { +void Switcher::prepareForMatchSession() +{ gatherInfo(); } // Called in the main thread -void Switcher::matchSessionComplete() { +void Switcher::matchSessionComplete() +{ m_desktopNames.clear(); m_icons.clear(); m_windows.clear(); } // Called in the secondary thread -void Switcher::match(Plasma::RunnerContext &context) { - const QString term = context.query(); - if (!context.isValid() || !term.startsWith(i18nc("Note this is a KRunner keyword", "."), Qt::CaseInsensitive)) return; +void Switcher::match(KRunner::RunnerContext &context) +{ + if (!context.isValid() && context.query().size() < 3) { + return; + } - QList matches; + QList matches; + qreal relevance = 0.75; // keyword match: when term starts with "window" we list all windows - // the list can be restricted to windows matching a given name, class, role or desktop - const QString windowName = term.mid(1, term.size()); + // the list can be restricted to windows matching a given name, class, role or + // desktop + + KRunner::QueryMatch::CategoryRelevance matchCategoryRelevance; + QString termsUnsplit; + + // Maybe change to increase priority instead of making it the highest + if (context.query()[0] == '.') { + termsUnsplit = context.query().mid(1, -1); + relevance = relevance + 0.1; + } else { + termsUnsplit = context.query(); + } + + QStringList terms = termsUnsplit.split(' ', Qt::SkipEmptyParts); + QList skippedWindows; QHashIterator it(m_windows); + + /* First remove all windows which don't match. */ while (it.hasNext()) { it.next(); const WId w = it.key(); const KWindowInfo info = it.value(); const QString windowClass = QString::fromUtf8(info.windowClassName()); - // exclude not matching windows - if (!KWindowSystem::hasWId(w)) continue; + for (auto &term : terms) { + if (!KX11Extras::hasWId(w) || (!info.name().contains(term, Qt::CaseInsensitive) && !windowClass.contains(term, Qt::CaseInsensitive))) { + qCDebug(KRUNNER_SWITCHER) << QStringLiteral("Removing window: %1").arg(info.name()); + skippedWindows.append(w); + } + } + } + + /* Then iterate over them again and sort them based on their relevance. */ + it.toFront(); + while (it.hasNext()) { + it.next(); + const WId w = it.key(); + const KWindowInfo info = it.value(); + const QString windowClass = QString::fromUtf8(info.windowClassName()); - if (!windowName.isEmpty() && !info.name().contains(windowName, Qt::CaseInsensitive) && - !windowClass.contains(windowName, Qt::CaseInsensitive)) { + if (skippedWindows.contains(w)) continue; + + for (auto &term : terms) { + // // exclude not matching windows + + static ushort highestMatchSize = 5; + static int indexOfTermWindowName = info.name().indexOf(term, 0, Qt::CaseInsensitive); + + /* Match either by windowName or windowClass. + Categorize by what matches best.*/ + + if (indexOfTermWindowName != -1) { + // check fullname match or term fully contains match + if (term.size() > highestMatchSize && indexOfTermWindowName == 0) { + matchCategoryRelevance = KRunner::QueryMatch::CategoryRelevance::Highest; + relevance = relevance + 0.1; + } else if (indexOfTermWindowName + == 0 /*startswith, but not equals => smaller relevance + boost*/) { + relevance = relevance + 0.1; + matchCategoryRelevance = KRunner::QueryMatch::CategoryRelevance::High; + } else { + matchCategoryRelevance = KRunner::QueryMatch::CategoryRelevance::Moderate; + } + } + + static int indexOfTermWindowClass = windowClass.indexOf(term, 0, Qt::CaseInsensitive); + + if (indexOfTermWindowClass != -1) { + if (term.size() > highestMatchSize && indexOfTermWindowClass == 0) { + matchCategoryRelevance = KRunner::QueryMatch::CategoryRelevance::Highest; + } else if (indexOfTermWindowClass == 0) { + relevance = relevance * 0.1; + if (qToUnderlying(matchCategoryRelevance) < qToUnderlying(KRunner::QueryMatch::CategoryRelevance::High)) { + relevance = relevance + 0.1; + matchCategoryRelevance = KRunner::QueryMatch::CategoryRelevance::High; + } + } else { + if (qToUnderlying(matchCategoryRelevance) < qToUnderlying(KRunner::QueryMatch::CategoryRelevance::Moderate)) { + relevance = relevance + 0.1; + matchCategoryRelevance = KRunner::QueryMatch::CategoryRelevance::Moderate; + } + } + } + + if (indexOfTermWindowClass != -1 || indexOfTermWindowName != -1) { + qCDebug(KRUNNER_SWITCHER) << QStringLiteral("Addding info.name %1").arg(info.name()); + matches.append(windowMatch(info, matchCategoryRelevance, relevance)); + break; + } else { + qCDebug(KRUNNER_SWITCHER) << QStringLiteral("Not ading window %1").arg(info.name()); + } } - matches.append(windowMatch(info)); } context.addMatches(matches); } // Called in the main thread -void Switcher::run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &match) { +void Switcher::run(const KRunner::RunnerContext &context, const KRunner::QueryMatch &match) +{ Q_UNUSED(context) // check if it's a desktop if (match.id().startsWith(QLatin1String("windows_desktop"))) { - KWindowSystem::setCurrentDesktop(match.data().toInt()); + KX11Extras::setCurrentDesktop(match.data().toInt()); return; } WId w(match.data().toString().toULong()); - KWindowSystem::forceActiveWindow(w); + KX11Extras::forceActiveWindow(w); } - -Plasma::QueryMatch Switcher::windowMatch(const KWindowInfo &info, qreal relevance, const Plasma::QueryMatch::Type type) { - Plasma::QueryMatch match(this); - match.setType(type); +KRunner::QueryMatch Switcher::windowMatch(const KWindowInfo &info, const KRunner::QueryMatch::CategoryRelevance categoryRelevance, const qreal relevance) +{ + KRunner::QueryMatch match(this); + match.setCategoryRelevance(categoryRelevance); match.setData(QString::number(info.win())); match.setIcon(m_icons[info.win()]); match.setText(info.name()); QString desktopName; int desktop = info.desktop(); if (desktop == NET::OnAllDesktops) { - desktop = KWindowSystem::currentDesktop(); + desktop = KX11Extras::currentDesktop(); } if (desktop <= m_desktopNames.size()) { desktopName = m_desktopNames[desktop - 1]; } else { - desktopName = KWindowSystem::desktopName(desktop); + desktopName = KX11Extras::desktopName(desktop); } match.setSubtext(i18n("Activate running window on %1", desktopName)); @@ -158,5 +225,4 @@ Plasma::QueryMatch Switcher::windowMatch(const KWindowInfo &info, qreal relevanc return match; } - #include "switcher.moc" diff --git a/src/switcher.h b/src/switcher.h index f358e77..66db7c9 100644 --- a/src/switcher.h +++ b/src/switcher.h @@ -1,39 +1,31 @@ -/* - Copyright 2018 by Tatu Lahtela - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see . -*/ +/* -*- c++ -*- + * Copyright 2018 by Tatu Lahtela + * SPDX-FileCopyrightText: 2026 Bjorn Kettunen + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ #ifndef SWITCHER_H #define SWITCHER_H #include +#include class KWindowInfo; - -class Switcher : public Plasma::AbstractRunner { -Q_OBJECT +class Switcher : public KRunner::AbstractRunner +{ + Q_OBJECT public: - Switcher(QObject *parent, const QVariantList &args); + Switcher(QObject *parent, const KPluginMetaData &metaData, const QVariantList &args); ~Switcher() override; - void match(Plasma::RunnerContext &context) override; + void match(KRunner::RunnerContext &context) override; - void run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &match) override; + void run(const KRunner::RunnerContext &context, const KRunner::QueryMatch &match) override; private Q_SLOTS: @@ -44,8 +36,7 @@ private Q_SLOTS: void gatherInfo(); private: - Plasma::QueryMatch windowMatch(const KWindowInfo &info, qreal relevance = 1.0, - Plasma::QueryMatch::Type type = Plasma::QueryMatch::ExactMatch); + KRunner::QueryMatch windowMatch(const KWindowInfo &info, const KRunner::QueryMatch::CategoryRelevance categoryRelevance, const qreal relevance = 1.0); QHash m_windows; QHash m_icons;