[PATCH wayland-web 2/6] Simple updates to Weston build instructions
From: Bill Spitzak wspit...@oblong.com - $WLD/bin must be on the path - Put info about system-wide install in one place - Removed drm, libxkbcommon, pixman, cairo as distributed versions are usable nowadays. - Added libinput --- building.html | 167 +++-- 1 file changed, 80 insertions(+), 87 deletions(-) diff --git a/building.html b/building.html index 04c2c8b..7f6f753 100644 --- a/building.html +++ b/building.html @@ -4,20 +4,18 @@ head meta http-equiv=Content-Type content=text/html;charset=utf-8 link href=wayland.css rel=stylesheet type=text/css -titleWayland/title +titleBuilding Weston/title /head body -h1a href=/img src=wayland.png alt=Wayland logo/a/h1 +h1a href=index.htmlimg src=wayland.png alt=Wayland logo/a +Building Weston/h1 pThe instructions below assume some familiarity with git and building and running experimental software. Also, be prepared for the fact that this project is still very much a prototype. When the instructions suggest to clone a git repo, you can of course just add a remote and fetch instead, if you have a clone of -that repo around already. By default the software is installed in $HOME/install -but you can change it by altering $WLD (explained later). You can also install -everything system-wide by setting WLD to /usr and passing --sysconfdir=/etc -to autogen.sh./p +that repo around already./p h2Hardware / Drivers/h2 @@ -49,13 +47,15 @@ Pi/a, see a href=raspberrypi.htmlRaspberry Pi build guide/a./p the following environment variables to get various libraries to link appropriately:/p -preWLD=$HOME/install # change this to another location if you prefer -LD_LIBRARY_PATH=$WLD/lib -PKG_CONFIG_PATH=$WLD/lib/pkgconfig/:$WLD/share/pkgconfig/ -ACLOCAL_PATH=$WLD/share/aclocal -ACLOCAL=aclocal -I $ACLOCAL_PATH - -export WLD LD_LIBRARY_PATH PKG_CONFIG_PATH ACLOCAL ACLOCAL_PATH +pre +export WLD=$HOME/install span class=comment# change this to another location if you prefer/span +export LD_LIBRARY_PATH=$WLD/lib +export PKG_CONFIG_PATH=$WLD/lib/pkgconfig/:$WLD/share/pkgconfig/ +export PATH=$WLD/bin:$PATH +export ACLOCAL_PATH=$WLD/share/aclocal +export ACLOCAL=aclocal -I $ACLOCAL_PATH + +mkdir -p $WLD/share/aclocal span class=comment# needed by autotools/span /pre pDo not set LD_LIBRARY_PATH as your default, it will break things./p @@ -63,11 +63,19 @@ export WLD LD_LIBRARY_PATH PKG_CONFIG_PATH ACLOCAL ACLOCAL_PATH you wish to build the packages./p h3Installing system wide/h3 -pTo install system wide, you'll need to set this variable, and possibly -build with --libdir=/usr/lib64 :/p -preWLD=/usr -export WLD +pTo install system wide, you'll need to set WLD differently, add +some switches to every autogen.sh invocation, and use sudo to make +install. Choose the libdir as appropriate for your distribution and +architecture (32 vs. 64 bit)./p + +pre +export WLD=/usr +... +./autogen.sh --prefix=$WLD --libdir=/usr/lib --sysconfdir=/etc +make +sudo make install +... /pre h2Wayland libraries/h2 @@ -75,11 +83,12 @@ export WLD pThis is required in order to be able to build Mesa with --with-egl-platforms=x11,wayland,drm./p -pre$ git clone git://anongit.freedesktop.org/wayland/wayland -$ cd wayland -$ ./autogen.sh --prefix=$WLD -$ make -$ make install +pre +$ git clone git://anongit.freedesktop.org/wayland/wayland +$ cd wayland +$ ./autogen.sh --prefix=$WLD +$ make amp;amp; make install +$ cd .. /pre h2Mesa/h2 @@ -93,17 +102,14 @@ optimization will only be available in more recent releases./p Other dependencies are development packages of xcb-dri2 and xcb-xfixes./p -pre$ git clone git://anongit.freedesktop.org/git/mesa/drm -$ cd drm -$ ./autogen.sh --prefix=$WLD -$ make amp;amp; make install - -$ git clone git://anongit.freedesktop.org/mesa/mesa -$ cd mesa -$ ./autogen.sh --prefix=$WLD --enable-gles2 --disable-gallium-egl \ - --with-egl-platforms=x11,wayland,drm --enable-gbm --enable-shared-glapi \ - --with-gallium-drivers=r300,r600,swrast,nouveau -$ make amp;amp; make install +pre +$ git clone git://anongit.freedesktop.org/mesa/mesa +$ cd mesa +$ ./autogen.sh --prefix=$WLD --enable-gles2 --disable-gallium-egl \ + --with-egl-platforms=x11,wayland,drm --enable-gbm --enable-shared-glapi \ + --with-gallium-drivers=r300,r600,swrast,nouveau +$ make amp;amp; make install +$ cd .. /pre pWe disable Gallium for Intel 915 and 965, which just means that libEGL @@ -113,50 +119,35 @@ be built as DRI drivers, which the EGL loader will load just fine./p pa href=mesa-configure.htmlExample mesa configure output./a/p pNote on Mesa build failures: If you're not building in your Mesa git -repo for the first time, the first thing to try is always git clean --xfd, and possibly deleting your $WLD directory, as Mesa requires +repo for the first time, the first thing to try is always codegitnbsp;cleannbsp;-xfd/code, and possibly
[PATCH wayland-web 1/6] Put a box around all code samples
From: Bill Spitzak wspit...@oblong.com
Added comment css class to colorize comments
---
wayland.css |2 ++
1 file changed, 2 insertions(+)
diff --git a/wayland.css b/wayland.css
index 7f058ba..d7ef79f 100644
--- a/wayland.css
+++ b/wayland.css
@@ -8,3 +8,5 @@ a { color: #444; }
a:hover { color: #888; }
a:visited { color: #666; }
li { margin: 10px 0px; }
+pre { border: 1px solid; padding: 10px; background: #eee; }
+.comment { color: #800; }
--
1.7.9.5
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel
[PATCH wayland-web 1/6] Put a box around all code samples
From: Bill Spitzak wspit...@oblong.com
Added comment css class to colorize comments
---
wayland.css |2 ++
1 file changed, 2 insertions(+)
diff --git a/wayland.css b/wayland.css
index 7f058ba..d7ef79f 100644
--- a/wayland.css
+++ b/wayland.css
@@ -8,3 +8,5 @@ a { color: #444; }
a:hover { color: #888; }
a:visited { color: #666; }
li { margin: 10px 0px; }
+pre { border: 1px solid; padding: 10px; background: #eee; }
+.comment { color: #800; }
--
1.7.9.5
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel
[PATCH wayland-web 3/6] Fixed xserver build instructions
From: Bill Spitzak wspit...@oblong.com - Removed xtrans as it is no different than other dependencies - Added comment from commit message about new configure line - Fix for bug in libepoxy configure --- building.html |2 +- xserver.html | 53 + 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/building.html b/building.html index 7f6f753..57ee2fb 100644 --- a/building.html +++ b/building.html @@ -275,7 +275,7 @@ protocol: /p h2XWayland/h2 p -a href=/xserver.htmlDirections for building support for X clients (XWayland)/a +a href=xserver.htmlDirections for building support for X clients (XWayland)/a /p h2Notes/h2 diff --git a/xserver.html b/xserver.html index d5b3dfd..9ac0401 100644 --- a/xserver.html +++ b/xserver.html @@ -9,7 +9,7 @@ /head body -h1a href=/img src=wayland.png alt=Wayland logo/a/h1 +h1a href=index.htmlimg src=wayland.png alt=Wayland logo/a/h1 div id=generated-toc class=generate_from_h2/div @@ -35,24 +35,17 @@ Wayland build instructions first/a. /p -h2libxtrans/h2 -p - It may be necessary to build libxtrans from - git://anongit.freedesktop.org/xorg/lib/libxtrans before building - xserver on 32-bit systems. -/p - h2libepoxy/h2 p The Xwayland server depends on a href=https://github.com/anholt/libepoxy;libepoxy/a. /p -pre$ git clone https://github.com/anholt/libepoxy.git -$ cd libepoxy -$ ./autogen.sh --prefix=$WLD -$ make -$ make install -$ cd .. +pre +$ git clone https://github.com/anholt/libepoxy.git +$ cd libepoxy +$ ./autogen.sh --prefix=$WLD +$ make amp;amp; make install +$ cd .. /pre @@ -60,15 +53,17 @@ The Xwayland server depends on pXWayland support has been merged in the master branch on April 4th, 2014, and is first released with xserver 1.16. The separate X.org video DDXes -are not needed anymore./p -pre$ git clone git://anongit.freedesktop.org/xorg/xserver -$ cd xserver -$ ./autogen.sh --prefix=$WLD --disable-docs --disable-devel-docs \ - --enable-xwayland --disable-xorg --disable-xvfb --disable-xnest \ - --disable-xquartz --disable-xwin -$ make -$ make install -$ cd .. +are not needed anymore. With this config it will only install the Xwayland +binary and few other files:/p + +pre +$ git clone git://anongit.freedesktop.org/xorg/xserver +$ cd xserver +$ ./autogen.sh --prefix=$WLD --disable-docs --disable-devel-docs \ + --enable-xwayland --disable-xorg --disable-xvfb --disable-xnest \ + --disable-xquartz --disable-xwin +$ make amp;amp; make install +$ cd .. /pre h2Paths/h2 @@ -77,9 +72,10 @@ are not needed anymore./p Without this you will get the error XKB: Failed to compile keymap. /p -pre$ mkdir -p $WLD/share/X11/xkb/rules -$ ln -s /usr/share/X11/xkb/rules/evdev $WLD/share/X11/xkb/rules/ -$ ln -s /usr/bin/xkbcomp $WLD/bin/ +pre +$ mkdir -p $WLD/share/X11/xkb/rules +$ ln -s /usr/share/X11/xkb/rules/evdev $WLD/share/X11/xkb/rules/ +$ ln -s /usr/bin/xkbcomp $WLD/bin/ /pre h2weston.ini/h2 @@ -88,8 +84,9 @@ are not needed anymore./p Add this to tt~/.config/weston.ini/tt (or use the --modules=xwayland.so command line argument): /p -pre[core] -modules=xwayland.so,desktop-shell.so +pre +[core] +modules=xwayland.so /pre h2Running/h2 -- 1.7.9.5 ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
[PATCH wayland-web 4/6] Added page of Ubuntu12.04 specific directions
From: Bill Spitzak wspit...@oblong.com --- building.html| 19 +++- ubuntu12.04.html | 291 ++ 2 files changed, 307 insertions(+), 3 deletions(-) create mode 100644 ubuntu12.04.html diff --git a/building.html b/building.html index 57ee2fb..d0ddccf 100644 --- a/building.html +++ b/building.html @@ -17,6 +17,22 @@ project is still very much a prototype. When the instructions suggest to clone of course just add a remote and fetch instead, if you have a clone of that repo around already./p +h2System-specific Directions/h2 + +pThis page has the generic instructions on building Wayland and Weston +from git. There are also some guides specific to certain distribution +or hardware:/p + +ul + +lia href=ubuntu12.04.htmlBuilding Weston and XWayland on +Ubuntu 12.04/a. May be useful for any Debian-derived system./li + +liFor building Weston for a href=http://www.raspberrypi.org/;Raspberry +Pi/a, see a href=raspberrypi.htmlRaspberry Pi build guide/a./li + +/ul + h2Hardware / Drivers/h2 pX output requires DRI2. DRM output (without X) requires Kernel Mode @@ -38,9 +54,6 @@ cards require a href=http://nouveau.freedesktop.org/wiki/InstallDRM#Firmware;loading external firmware/a./p -pFor building Weston for a href=http://www.raspberrypi.org/;Raspberry -Pi/a, see a href=raspberrypi.htmlRaspberry Pi build guide/a./p - h2 id=environmentSetting up the environment/h2 h3Installing in a custom location/h3 pIf you do not want to install system wide, you'll need to set diff --git a/ubuntu12.04.html b/ubuntu12.04.html new file mode 100644 index 000..0ce270f --- /dev/null +++ b/ubuntu12.04.html @@ -0,0 +1,291 @@ +!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01//EN http://www.w3.org/TR/html4/strict.dtd; +html + +head +meta http-equiv=Content-Type content=text/html;charset=utf-8 +link href=wayland.css rel=stylesheet type=text/css +titleBuilding Weston on Ubuntu 12.04/title +/head + +body +h1a href=index.htmlimg src=wayland.png alt=Wayland logo/a +Building Weston on Ubuntu 12.04/h1 + +pThe following sequence of commands successfully built Weston and +XWayland on an Ubuntu 12.04 LTS system, on May 23rd, 2014. This system had +previously been used to compile Xlib programs, and thus already had +some dependencies (such as git, the compiler, and X11 header files) +installed./p + +pParallel make (codemake -j 9/code) will probably work on all +packages but only the ones shown were compiled this way./p + +pNewer Linux distributions should require fewer things to be +compiled from git./p + +pConversely, newer versions of the code, in particular Mesa, will +probably require more dependencies than shown here./p + +pre +span class=comment# setup environment for local install:/span +export WLD=$HOME/install +export LD_LIBRARY_PATH=$WLD/lib +export PKG_CONFIG_PATH=$WLD/lib/pkgconfig/:$WLD/share/pkgconfig/ +export PATH=$WLD/bin:$PATH + +export ACLOCAL_PATH=$WLD/share/aclocal +export ACLOCAL=aclocal -I $ACLOCAL_PATH +mkdir -p $ACLOCAL_PATH + +span class=comment# dependencies for libwayland:/span +sudo apt-get install doxygen span class=comment# or use --disable-documentation/span + +span class=comment# libwayland-*:/span +git clone git://anongit.freedesktop.org/wayland/wayland +cd wayland +./autogen.sh --prefix=$WLD +make amp;amp; make install +cd .. + +span class=comment# dependencies for Mesa: +# sudo apt-get build-dep mesa will install these, but will also +# install unwanted items, such as wayland itself, and xcb prototypes +# that are too old./span +sudo apt-get install autoconf automake bison debhelper dpkg-dev flex \ + libdrm-dev libexpat1-dev libudev-dev libx11-dev libx11-xcb-dev \ + libxdamage-dev libxext-dev libxfixes-dev libxxf86vm-dev \ + linux-libc-dev pkg-config python-libxml2 quilt x11proto-dri2-dev \ + x11proto-gl-dev xutils-dev + +span class=comment# Mesa required llvm-3.1, but newer versions are available. +# apt-cache search 'llvm-[0-9.]*-dev' will list them/span +sudo apt-get install llvm-3.1-dev +sudo ln -sf llvm-config-3.1 /usr/bin/llvm-config + +sudo apt-get install libpciaccess-dev span class=comment# needed by drm/span +git clone git://anongit.freedesktop.org/git/mesa/drm +cd drm +./autogen.sh --prefix=$WLD +make amp;amp; make install +cd .. + +span class=comment# needed by libxcb:/span +git clone git://anongit.freedesktop.org/xcb/proto +cd proto +./autogen.sh --prefix=$WLD +make amp;amp; make install +cd .. + +span class=comment# needed by libxcb:/span +git clone git://anongit.freedesktop.org/xorg/util/macros +cd macros +./autogen.sh --prefix=$WLD +make amp;amp; make install +cd .. + +git clone git://anongit.freedesktop.org/xcb/libxcb +cd libxcb +./autogen.sh --prefix=$WLD +make amp;amp; make install +cd .. + +git clone git://anongit.freedesktop.org/xorg/proto/presentproto +cd presentproto +./autogen.sh --prefix=$WLD +make amp;amp; make install +cd .. + +git clone git://anongit.freedesktop.org/xorg/proto/dri3proto +cd dri3proto
[PATCH wayland-web 2/6] Simple updates to Weston build instructions
From: Bill Spitzak wspit...@oblong.com - $WLD/bin must be on the path - Put info about system-wide install in one place - Removed drm, libxkbcommon, pixman, cairo as distributed versions are usable nowadays. - Added libinput --- building.html | 167 +++-- 1 file changed, 80 insertions(+), 87 deletions(-) diff --git a/building.html b/building.html index 04c2c8b..7f6f753 100644 --- a/building.html +++ b/building.html @@ -4,20 +4,18 @@ head meta http-equiv=Content-Type content=text/html;charset=utf-8 link href=wayland.css rel=stylesheet type=text/css -titleWayland/title +titleBuilding Weston/title /head body -h1a href=/img src=wayland.png alt=Wayland logo/a/h1 +h1a href=index.htmlimg src=wayland.png alt=Wayland logo/a +Building Weston/h1 pThe instructions below assume some familiarity with git and building and running experimental software. Also, be prepared for the fact that this project is still very much a prototype. When the instructions suggest to clone a git repo, you can of course just add a remote and fetch instead, if you have a clone of -that repo around already. By default the software is installed in $HOME/install -but you can change it by altering $WLD (explained later). You can also install -everything system-wide by setting WLD to /usr and passing --sysconfdir=/etc -to autogen.sh./p +that repo around already./p h2Hardware / Drivers/h2 @@ -49,13 +47,15 @@ Pi/a, see a href=raspberrypi.htmlRaspberry Pi build guide/a./p the following environment variables to get various libraries to link appropriately:/p -preWLD=$HOME/install # change this to another location if you prefer -LD_LIBRARY_PATH=$WLD/lib -PKG_CONFIG_PATH=$WLD/lib/pkgconfig/:$WLD/share/pkgconfig/ -ACLOCAL_PATH=$WLD/share/aclocal -ACLOCAL=aclocal -I $ACLOCAL_PATH - -export WLD LD_LIBRARY_PATH PKG_CONFIG_PATH ACLOCAL ACLOCAL_PATH +pre +export WLD=$HOME/install span class=comment# change this to another location if you prefer/span +export LD_LIBRARY_PATH=$WLD/lib +export PKG_CONFIG_PATH=$WLD/lib/pkgconfig/:$WLD/share/pkgconfig/ +export PATH=$WLD/bin:$PATH +export ACLOCAL_PATH=$WLD/share/aclocal +export ACLOCAL=aclocal -I $ACLOCAL_PATH + +mkdir -p $WLD/share/aclocal span class=comment# needed by autotools/span /pre pDo not set LD_LIBRARY_PATH as your default, it will break things./p @@ -63,11 +63,19 @@ export WLD LD_LIBRARY_PATH PKG_CONFIG_PATH ACLOCAL ACLOCAL_PATH you wish to build the packages./p h3Installing system wide/h3 -pTo install system wide, you'll need to set this variable, and possibly -build with --libdir=/usr/lib64 :/p -preWLD=/usr -export WLD +pTo install system wide, you'll need to set WLD differently, add +some switches to every autogen.sh invocation, and use sudo to make +install. Choose the libdir as appropriate for your distribution and +architecture (32 vs. 64 bit)./p + +pre +export WLD=/usr +... +./autogen.sh --prefix=$WLD --libdir=/usr/lib --sysconfdir=/etc +make +sudo make install +... /pre h2Wayland libraries/h2 @@ -75,11 +83,12 @@ export WLD pThis is required in order to be able to build Mesa with --with-egl-platforms=x11,wayland,drm./p -pre$ git clone git://anongit.freedesktop.org/wayland/wayland -$ cd wayland -$ ./autogen.sh --prefix=$WLD -$ make -$ make install +pre +$ git clone git://anongit.freedesktop.org/wayland/wayland +$ cd wayland +$ ./autogen.sh --prefix=$WLD +$ make amp;amp; make install +$ cd .. /pre h2Mesa/h2 @@ -93,17 +102,14 @@ optimization will only be available in more recent releases./p Other dependencies are development packages of xcb-dri2 and xcb-xfixes./p -pre$ git clone git://anongit.freedesktop.org/git/mesa/drm -$ cd drm -$ ./autogen.sh --prefix=$WLD -$ make amp;amp; make install - -$ git clone git://anongit.freedesktop.org/mesa/mesa -$ cd mesa -$ ./autogen.sh --prefix=$WLD --enable-gles2 --disable-gallium-egl \ - --with-egl-platforms=x11,wayland,drm --enable-gbm --enable-shared-glapi \ - --with-gallium-drivers=r300,r600,swrast,nouveau -$ make amp;amp; make install +pre +$ git clone git://anongit.freedesktop.org/mesa/mesa +$ cd mesa +$ ./autogen.sh --prefix=$WLD --enable-gles2 --disable-gallium-egl \ + --with-egl-platforms=x11,wayland,drm --enable-gbm --enable-shared-glapi \ + --with-gallium-drivers=r300,r600,swrast,nouveau +$ make amp;amp; make install +$ cd .. /pre pWe disable Gallium for Intel 915 and 965, which just means that libEGL @@ -113,50 +119,35 @@ be built as DRI drivers, which the EGL loader will load just fine./p pa href=mesa-configure.htmlExample mesa configure output./a/p pNote on Mesa build failures: If you're not building in your Mesa git -repo for the first time, the first thing to try is always git clean --xfd, and possibly deleting your $WLD directory, as Mesa requires +repo for the first time, the first thing to try is always codegitnbsp;cleannbsp;-xfd/code, and possibly
Re: [PATCH wayland-web 1/6] Put a box around all code samples
This series is v4 of the patches. It includes changes suggested by Pekka and many other fixes. The final patch (adding help for dependencies) still needs work to add links to the projects home pages, but I think the first 5 patches are ok. Sorry for the email screwup. git send-email --compose is not working as documented, and is sending some email here even though I was using --to to try to send it to myself, and refusing to send the composed text. Still trying to figure this out. ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
Re: [PATCH wayland-web 1/6] Put a box around all code samples
Please ignore these 2, they were sent by accident. Git send-email apparently ignored by --to switch? ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
Updated Wayland Live CD with Wayland/Weston 1.5
Hi I have uploaded new RebeccaBlackOS Wayland Live CD ISOs named after my favorite celebrity to SourceForge. By now they should be replicated throughout the SourceForge mirrors. They now have Wayland 1.5, and are based on Ubuntu 14.04 packages. The smaller ISO without development headers and packages is called RebeccaBlackLinux_i386.iso, while the larger one with headers is called RebeccaBlackLinux_DevDbg_i386.iso All the features including a direct startup to a Wayland server (weston), Wayland enabled GTK, SDL, EFL, QT, and Kde Frameworks 5 applications, and a graphical tool to configure multipointer Weston are in this ISO too. Wayland environments include the default Weston shell, Orbital, Hawaii, Gnome-Shell-Wayland, and Enlightenment, and swc. Gnome-Shell-Wayland, Enlightenment, and swc do not work on VirtualBox. I also enabled Weston's freerdp support in this ISO, and can easily be called as the user with the command westonrdpcaller. The remote session is NOT password protected. Systemd v212 has also been switched as the default init system over upstart for supporting Mutter-Wayland's ability to run as the user without the setuid binary However, I had to manually import and tweak many init files from a Fedora live CD, as systemd unit files are not packaged in with Ubuntu yet. I tried to ensure that everything starts up the best I can, and I think that most other software that I missed like apache uses sysvinit startup files Some Problems and notes: I have noticed on an older Intel, that there are some Mesa issues however, so I added a fallback wsession that starts up weston with its pixman renderer. https://bugs.freedesktop.org/show_bug.cgi?id=77952 Enlightenment-Wayland is in early development. The screen size seems to be currently hardcoded to 1920x1200. I recommend experimenting with the nested version from the menu or the command enlightenmentnestedcaller instead for now Also, to support Enlightenment for now, the WaylandLoginManager supports when the string wlminputinsecure is passed to the kernel command line, which allows global access to all input device files. It's passed when the live CD is started without a framebuffer option, but when it's installed, you will have to pass wlminputsecure to the kernel yourself. Just a security notice in the rare case someone tries to start a multi user live session... In the swc session, if it starts all black, and just a cursor, it's working. programs start with super+enter for the terminal and super+r for the menu. Please don't use this distribution in production environments You can get the files here https://sourceforge.net/projects/rebeccablackos/files/2014-05-26/ or see my build script source here http://rebeccablackos.svn.sourceforge.net/viewvc/ or patches that the scripts apply to the source repos that get downloaded. http://rebeccablackos.svn.sourceforge.net/viewvc/rebeccablackos/rebeccablacklinux_files/usr/share/RBOS_PATCHES/ md5sum: d378e8e5d049429566323d13e2748745 RebeccaBlackLinux_DevDbg_i386.iso e32c7016923b1ef593c3efb9bb86 RebeccaBlackLinux_i386.iso ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
[PATCH libinput 1/2] evdev-mt-touchpad-buttons: Rename some variables and functions
Rename some clickpad softbutton area variables to have bottom in their
name, this is a preperation patch for adding top softbutton area support.
Signed-off-by: Hans de Goede hdego...@redhat.com
---
src/evdev-mt-touchpad-buttons.c | 26 +-
src/evdev-mt-touchpad.h | 2 +-
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/evdev-mt-touchpad-buttons.c b/src/evdev-mt-touchpad-buttons.c
index 65fa21b..b4d3920 100644
--- a/src/evdev-mt-touchpad-buttons.c
+++ b/src/evdev-mt-touchpad-buttons.c
@@ -75,23 +75,23 @@ button_event_to_str(enum button_event event) {
}
static inline bool
-is_inside_button_area(struct tp_dispatch *tp, struct tp_touch *t)
+is_inside_bottom_button_area(struct tp_dispatch *tp, struct tp_touch *t)
{
- return t-y = tp-buttons.area.top_edge;
+ return t-y = tp-buttons.bottom_area.top_edge;
}
static inline bool
-is_inside_right_area(struct tp_dispatch *tp, struct tp_touch *t)
+is_inside_bottom_right_area(struct tp_dispatch *tp, struct tp_touch *t)
{
- return is_inside_button_area(tp, t)
- t-x tp-buttons.area.rightbutton_left_edge;
+ return is_inside_bottom_button_area(tp, t)
+ t-x tp-buttons.bottom_area.rightbutton_left_edge;
}
static inline bool
-is_inside_left_area(struct tp_dispatch *tp, struct tp_touch *t)
+is_inside_bottom_left_area(struct tp_dispatch *tp, struct tp_touch *t)
{
- return is_inside_button_area(tp, t)
- !is_inside_right_area(tp, t);
+ return is_inside_bottom_button_area(tp, t)
+ !is_inside_bottom_right_area(tp, t);
}
static void
@@ -327,9 +327,9 @@ tp_button_handle_state(struct tp_dispatch *tp, uint64_t
time)
if (t-state == TOUCH_END) {
tp_button_handle_event(tp, t, BUTTON_EVENT_UP, time);
} else if (t-dirty) {
- if (is_inside_right_area(tp, t))
+ if (is_inside_bottom_right_area(tp, t))
tp_button_handle_event(tp, t,
BUTTON_EVENT_IN_BOTTOM_R, time);
- else if (is_inside_left_area(tp, t))
+ else if (is_inside_bottom_left_area(tp, t))
tp_button_handle_event(tp, t,
BUTTON_EVENT_IN_BOTTOM_L, time);
else
tp_button_handle_event(tp, t,
BUTTON_EVENT_IN_AREA, time);
@@ -432,8 +432,8 @@ tp_init_buttons(struct tp_dispatch *tp,
tp-buttons.use_clickfinger = true;
if (tp-buttons.is_clickpad !tp-buttons.use_clickfinger) {
- tp-buttons.area.top_edge = height * .8 + device-abs.min_y;
- tp-buttons.area.rightbutton_left_edge = width/2 +
device-abs.min_x;
+ tp-buttons.bottom_area.top_edge = height * .8 +
device-abs.min_y;
+ tp-buttons.bottom_area.rightbutton_left_edge = width/2 +
device-abs.min_x;
tp-buttons.timer_fd = timerfd_create(CLOCK_MONOTONIC,
TFD_CLOEXEC);
if (tp-buttons.timer_fd == -1)
@@ -447,7 +447,7 @@ tp_init_buttons(struct tp_dispatch *tp,
if (tp-buttons.source == NULL)
return -1;
} else {
- tp-buttons.area.top_edge = INT_MAX;
+ tp-buttons.bottom_area.top_edge = INT_MAX;
}
return 0;
diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h
index 41e3ca4..62abe59 100644
--- a/src/evdev-mt-touchpad.h
+++ b/src/evdev-mt-touchpad.h
@@ -170,7 +170,7 @@ struct tp_dispatch {
struct {
int32_t top_edge;
int32_t rightbutton_left_edge;
- } area;
+ } bottom_area;
unsigned int timeout; /* current timeout in ms */
--
1.9.3
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel
Re: [PATCH libinput 1/7] filter: Add motion filter destruction helper
Hi,
The entire series looks good, and isL
Reviewed-by: Hans de Goede hdego...@redhat.com
Regards,
Hans
On 05/26/2014 11:27 PM, Jonas Ådahl wrote:
Signed-off-by: Jonas Ådahl jad...@gmail.com
---
src/evdev-mt-touchpad.c | 3 +--
src/filter.c| 9 +
src/filter.h| 3 +++
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 89cebd5..751132c 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -606,8 +606,7 @@ tp_destroy(struct evdev_dispatch *dispatch)
tp_destroy_tap(tp);
tp_destroy_buttons(tp);
- if (tp-filter)
- tp-filter-interface-destroy(tp-filter);
+ motion_filter_destroy(tp-filter);
free(tp-touches);
free(tp);
}
diff --git a/src/filter.c b/src/filter.c
index 2c23da1..22c3ed8 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -331,3 +331,12 @@ create_pointer_accelator_filter(accel_profile_func_t
profile)
return filter-base;
}
+
+void
+motion_filter_destroy(struct motion_filter *filter)
+{
+ if (!filter)
+ return;
+
+ filter-interface-destroy(filter);
+}
diff --git a/src/filter.h b/src/filter.h
index 0ef3d03..ada4f93 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -59,4 +59,7 @@ typedef double (*accel_profile_func_t)(struct motion_filter
*filter,
struct motion_filter *
create_pointer_accelator_filter(accel_profile_func_t filter);
+void
+motion_filter_destroy(struct motion_filter *filter);
+
#endif /* FILTER_H */
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel
