Move x11 out of core over to backend

.gitignore

@@ -10,7 +10,7 @@ MANIFEST
 /env
 # complied cffi output
 libqtile/_ffi_pango.py
-libqtile/core/_ffi_xcursors.py
+libqtile/backend/x11/_ffi_xcursors.py
 # Files generated by setup.py
 qtile.egg-info/
 .eggs

docs/conf.py

@@ -25,7 +25,7 @@ def __dir__(self):
 
 MOCK_MODULES = [
     'libqtile._ffi_pango',
-    'libqtile.core._ffi_xcursors',
+    'libqtile.backend.x11._ffi_xcursors',
     'cairocffi',
     'cairocffi.pixbuf',
     'cffi',

libqtile/core/xcbq.py → libqtile/backend/x11/xcbq.py

@@ -48,8 +48,8 @@
 import xcffib.xinerama
 import xcffib.xproto
 
-from .. import xkeysyms
-from ..log_utils import logger
+from libqtile import xkeysyms
+from libqtile.log_utils import logger
 from .xcursors import Cursors
 
 keysyms = xkeysyms.keysyms

libqtile/core/xcore.py → libqtile/backend/x11/xcore.py

@@ -5,9 +5,9 @@
 import xcffib
 import xcffib.xproto
 
-from . import base
 from . import xcbq
 from libqtile import config, utils, window
+from libqtile.backend import base
 from libqtile.core.manager import Qtile
 from libqtile.log_utils import logger
 from libqtile.utils import QtileError
@@ -306,9 +306,7 @@ def ungrab_keys(self) -> None:
         """Ungrab all of the key events"""
         self._root.ungrab_key(None, None)
 
-    def ungrab_key(
-        self, keysym: int, modmask: int
-    ) -> None:
+    def ungrab_key(self, keysym: int, modmask: int) -> None:
         """Ungrab the key corresponding to the given keysym and modifier mask"""
         code = self.conn.keysym_to_keycode(keysym)
 

libqtile/core/xcursors.py → libqtile/backend/x11/xcursors.py

@@ -1,9 +1,9 @@
-from ..log_utils import logger
+from libqtile.log_utils import logger
 
 try:
     from ._ffi_xcursors import ffi
 except ImportError:
-    raise ImportError("No module named libqtile.core._ffi_xcursors, be sure to run `./scripts/ffibuild`")
+    raise ImportError("No module named libqtile.backend.x11._ffi_xcursors, be sure to run `./scripts/ffibuild`")
 
 
 # Stolen from samurai-x

libqtile/core/xcursors_ffi_build.py → libqtile/backend/x11/xcursors_ffi_build.py

@@ -25,7 +25,7 @@
 from xcffib.ffi_build import ffi as xcffib_ffi
 
 xcursors_ffi = FFI()
-xcursors_ffi.set_source("libqtile.core._ffi_xcursors", None)
+xcursors_ffi.set_source("libqtile.backend.x11._ffi_xcursors", None)
 
 xcursors_ffi.include(xcffib_ffi)
 

libqtile/confreader.py

@@ -26,7 +26,7 @@
 import sys
 from typing import List  # noqa: F401
 
-from .core import base
+from libqtile.backend import base
 from . import config
 
 

libqtile/core/manager.py

@@ -48,7 +48,7 @@
 from .. import hook
 from .. import utils
 from .. import window
-from . import xcbq
+from libqtile.backend.x11 import xcbq
 from libqtile import command_interface
 from libqtile.command_client import InteractiveCommandClient
 from libqtile.command_interface import QtileCommandInterface, IPCCommandServer

libqtile/core/session_manager.py

@@ -1,7 +1,7 @@
 import asyncio
 import os
 
-import libqtile.core.base as base
+import libqtile.backend.base as base
 import libqtile.ipc as ipc
 from libqtile.core.manager import Qtile
 

libqtile/scripts/qtile.py

@@ -27,7 +27,7 @@
 
 from libqtile.log_utils import init_log, logger
 from libqtile import confreader
-from libqtile.core import xcore
+from libqtile.backend.x11 import xcore
 
 locale.setlocale(locale.LC_ALL, locale.getdefaultlocale())  # type: ignore
 

libqtile/widget/clipboard.py

@@ -22,8 +22,8 @@
 # SOFTWARE.
 
 from . import base
-from .. import bar, hook
-from ..core import xcbq
+from libqtile import bar, hook
+from libqtile.backend.x11 import xcbq
 
 
 class Clipboard(base._TextBox):

libqtile/widget/prompt.py

@@ -45,8 +45,8 @@
 from libqtile.log_utils import logger
 
 from . import base
-from .. import bar, hook, pangocffi, utils, xkeysyms
-from ..core import xcbq
+from libqtile import bar, hook, pangocffi, utils, xkeysyms
+from libqtile.backend.x11 import xcbq
 
 
 class AbstractCompleter(metaclass=abc.ABCMeta):

libqtile/widget/systray.py

@@ -26,9 +26,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-from .. import bar, window
-from ..core import xcbq
 from . import base
+from libqtile import bar, window
+from libqtile.backend.x11 import xcbq
 
 import xcffib
 from xcffib.xproto import (ClientMessageEvent, ClientMessageData, EventMask,

scripts/ffibuild

@@ -2,4 +2,4 @@
 echo "building pango"
 python ./libqtile/pango_ffi_build.py
 echo "building xcursors"
-python ./libqtile/core/xcursors_ffi_build.py
+python ./libqtile/backend/x11/xcursors_ffi_build.py

setup.cfg

@@ -112,13 +112,13 @@ mypy_path = stubs
 python_version = 3.5
 [mypy-_cffi_backend]
 ignore_missing_imports = True
-[mypy-cairocffi._ffi]
+[mypy-cairocffi._generated.ffi]
 ignore_missing_imports = True
 [mypy-cairocffi.pixbuf]
 ignore_missing_imports = True
 [mypy-libqtile._ffi_pango]
 ignore_missing_imports = True
-[mypy-libqtile.core._ffi_xcursors]
+[mypy-libqtile.backend.x11._ffi_xcursors]
 ignore_missing_imports = True
 [mypy-xcffib._ffi]
 ignore_missing_imports = True

setup.py

@@ -68,6 +68,6 @@ def finalize_options(self):
     cmdclass={'install': CheckCairoXcb},
     cffi_modules=[
         'libqtile/pango_ffi_build.py:pango_ffi',
-        'libqtile/core/xcursors_ffi_build.py:xcursors_ffi',
+        'libqtile/backend/x11/xcursors_ffi_build.py:xcursors_ffi',
     ],
 )

test/conftest.py

@@ -37,8 +37,8 @@
 import xcffib.xproto
 
 import libqtile.config
+from libqtile.backend.x11 import xcore
 from libqtile.core.session_manager import SessionManager
-from libqtile.core import xcore
 from libqtile.log_utils import init_log
 from libqtile.resources import default_config
 from libqtile import command_client, command_interface, ipc

test/test_config.py

@@ -25,7 +25,7 @@
 
 from libqtile import confreader
 from libqtile import config, utils
-from libqtile.core import xcore
+from libqtile.backend.x11 import xcore
 
 tests_dir = os.path.dirname(os.path.realpath(__file__))
 

test/test_xcbq.py → test/x11/test_xcbq.py

@@ -2,7 +2,7 @@
 import pytest
 import xcffib
 import xcffib.testing
-from libqtile.core import xcbq
+from libqtile.backend.x11 import xcbq
 
 
 @pytest.fixture(scope='function', autouse=True)

test/x11/test_xcore.py

@@ -0,0 +1,7 @@
+from libqtile.backend.x11 import xcore
+
+
+def test_keys(xephyr):
+    xc = xcore.XCore()
+    assert "a" in xc.get_keys()
+    assert "shift" in xc.get_modifiers()