diff options
author | 2016-08-22 18:17:57 +0200 | |
---|---|---|
committer | 2016-08-22 18:17:57 +0200 | |
commit | 72a2bb40ae21ed97e7ee9e75f00aadaa352578ad (patch) | |
tree | 99ba020f772cdce0ebca8f34a1efe9a9e90946af /deps/xorg-server/patches | |
parent | db67df3cf8a58828960ce535166c208dc73725f7 (diff) | |
download | ktown-72a2bb40ae21ed97e7ee9e75f00aadaa352578ad.tar.gz ktown-72a2bb40ae21ed97e7ee9e75f00aadaa352578ad.tar.xz |
Wayland: needs recompiled mesa, xorg-server and addition of elogind.
- Slackware's mesa package was recompiled against wayland.
- Slackware's xorg-server package was recompiled against wayland; note that
this package obsoletes the original xorg-server-xephyr, xorg-server-xnest
and xorg-server-xvfb packages because the new xorg-server package is
all-in-one.
- New package elogind is the systemd project's 'logind', extracted to be
a standalone daemon (quite similar to the 'eudev' package we already have
in Slackware). An implementation of the logind dbus protociol is required
by kwin_wayland. At the moment, there is no other option than elogind
until the ConsoleKit2 developers implement the protocol.
Diffstat (limited to 'deps/xorg-server/patches')
-rw-r--r-- | deps/xorg-server/patches/x11.startwithblackscreen.diff | 14 | ||||
-rw-r--r-- | deps/xorg-server/patches/xorg-server.combo.mouse.keyboard.layout.patch | 49 |
2 files changed, 63 insertions, 0 deletions
diff --git a/deps/xorg-server/patches/x11.startwithblackscreen.diff b/deps/xorg-server/patches/x11.startwithblackscreen.diff new file mode 100644 index 0000000..8c0e3b5 --- /dev/null +++ b/deps/xorg-server/patches/x11.startwithblackscreen.diff @@ -0,0 +1,14 @@ +diff -Nur xorg-server-1.12.1.orig/dix/window.c xorg-server-1.12.1/dix/window.c +--- xorg-server-1.12.1.orig/dix/window.c 2012-03-29 21:57:25.000000000 -0500 ++++ xorg-server-1.12.1/dix/window.c 2012-04-13 22:01:24.456073603 -0500 +@@ -145,8 +145,8 @@ + + Bool bgNoneRoot = FALSE; + +-static unsigned char _back_lsb[4] = { 0x88, 0x22, 0x44, 0x11 }; +-static unsigned char _back_msb[4] = { 0x11, 0x44, 0x22, 0x88 }; ++static unsigned char _back_lsb[4] = { 0x00, 0x00, 0x00, 0x00 }; ++static unsigned char _back_msb[4] = { 0x00, 0x00, 0x00, 0x00 }; + + static Bool WindowParentHasDeviceCursor(WindowPtr pWin, + DeviceIntPtr pDev, CursorPtr pCurs); diff --git a/deps/xorg-server/patches/xorg-server.combo.mouse.keyboard.layout.patch b/deps/xorg-server/patches/xorg-server.combo.mouse.keyboard.layout.patch new file mode 100644 index 0000000..83f6730 --- /dev/null +++ b/deps/xorg-server/patches/xorg-server.combo.mouse.keyboard.layout.patch @@ -0,0 +1,49 @@ +--- b/Xi/exevents.c 2013-12-27 19:38:52.000000000 +0200 ++++ a/Xi/exevents.c 2014-03-04 19:44:15.228721619 +0200 +@@ -665,7 +665,8 @@ + DeepCopyFeedbackClasses(from, to); + + if ((dce->flags & DEVCHANGE_KEYBOARD_EVENT)) +- DeepCopyKeyboardClasses(from, to); ++ /* We need to copy to MASTER_KEYBOARD. Didn't worked with 'to'. */ ++ DeepCopyKeyboardClasses(from, GetMaster(from, MASTER_KEYBOARD)); + if ((dce->flags & DEVCHANGE_POINTER_EVENT)) + DeepCopyPointerClasses(from, to); + } +--- b/dix/getevents.c 2013-12-27 19:38:52.000000000 +0200 ++++ a/dix/getevents.c 2014-03-04 19:46:50.126336327 +0200 +@@ -706,12 +706,19 @@ + { + DeviceIntPtr master; + +- master = +- GetMaster(dev, +- (type & DEVCHANGE_POINTER_EVENT) ? MASTER_POINTER : +- MASTER_KEYBOARD); ++ /* Don't guess the master upon the event type. Use MASTER_ATTACHED, ++ * otherwise we'll never get a DeviceChangedEvent(reason:SlaveSwith). */ ++ master = GetMaster(dev, MASTER_ATTACHED); ++ /* Need to track the slave event type. Other we'le never get a ++ * DeviceChangedEvent(reason:SlaveSwith) for the 'keyboard' if the ++ * 'pointer' has been touched before. */ ++ int slave_type = (type & DEVCHANGE_KEYBOARD_EVENT) | ++ (type & DEVCHANGE_POINTER_EVENT); + +- if (master && master->last.slave != dev) { ++ if (master && ++ ((master->last.slave != dev) || ++ (master->last.slave == dev && master->last.slave_type != slave_type))) { ++ master->last.slave_type = slave_type; + CreateClassesChangedEvent(events, master, dev, + type | DEVCHANGE_SLAVE_SWITCH); + if (IsPointerDevice(master)) { +--- b/include/inputstr.h 2013-12-27 19:38:52.000000000 +0200 ++++ a/include/inputstr.h 2014-03-04 19:47:28.074051116 +0200 +@@ -577,6 +577,7 @@ + double valuators[MAX_VALUATORS]; + int numValuators; + DeviceIntPtr slave; ++ int slave_type; + ValuatorMask *scroll; + int num_touches; /* size of the touches array */ + DDXTouchPointInfoPtr touches; |