Re: [PATCH 2/2] cairo-util: Set geometry_dirty in frame_set_title

2014-07-05 Thread Jason Ekstrand 
Both patches look good and are committed.  I also grabbed them for 1.5
since they're simple bugfixes.
Thanks,
--Jason Ekstrand


On Fri, Jul 4, 2014 at 12:19 AM, Boyan Ding  wrote:

> Title can decide the geometry of a frame because it may affect the
> existence of titlebar, so setting geometry_dirty in frame_set_title for
> potential change.
>
> Signed-off-by: Boyan Ding 
> ---
>  shared/frame.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/shared/frame.c b/shared/frame.c
> index aacca60..53f3f5f 100644
> --- a/shared/frame.c
> +++ b/shared/frame.c
> @@ -385,6 +385,7 @@ frame_set_title(struct frame *frame, const char *title)
> free(frame->title);
> frame->title = dup;
>
> +   frame->geometry_dirty = 1;
> frame->status |= FRAME_STATUS_REPAINT;
>
> return 0;
> --
> 2.0.1
>
>
> ___
> wayland-devel mailing list
> wayland-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
>
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel

[PATCH weston 1/2] xwm: Use cursor theme and size in weston.ini

2014-07-05 Thread Boyan Ding 
to make it consistent with native wayland apps

Signed-off-by: Boyan Ding 
---
 xwayland/window-manager.c | 19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c
index 2fb65b1..f64ef94 100644
--- a/xwayland/window-manager.c
+++ b/xwayland/window-manager.c
@@ -38,6 +38,7 @@
 
 #include "cairo-util.h"
 #include "compositor.h"
+#include "config-parser.h"
 #include "hash.h"
 
 struct wm_size_hints {
@@ -269,22 +270,24 @@ xcb_cursor_images_load_cursor(struct weston_wm *wm, const 
XcursorImages *images)
 static xcb_cursor_t
 xcb_cursor_library_load_cursor(struct weston_wm *wm, const char *file)
 {
+   struct weston_config *config;
+   struct weston_config_section *s;
xcb_cursor_t cursor;
XcursorImages *images;
-   char *v = NULL;
+   char *theme = NULL;
int size = 0;
 
if (!file)
return 0;
 
-   v = getenv ("XCURSOR_SIZE");
-   if (v)
-   size = atoi(v);
+   config = weston_config_parse("weston.ini");
+   s = weston_config_get_section(config, "shell", NULL, NULL);
+   weston_config_section_get_string(s, "cursor-theme", &theme, NULL);
+   weston_config_section_get_int(s, "cursor-size", &size, 32);
+   weston_config_destroy(config);
 
-   if (!size)
-   size = 32;
-
-   images = XcursorLibraryLoadImages (file, NULL, size);
+   images = XcursorLibraryLoadImages (file, theme, size);
+   free(theme);
if (!images)
return -1;
 
-- 
2.0.1


___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel

[PATCH weston 2/2] xwm: check whether the picked seat can be NULL

2014-07-05 Thread Boyan Ding 
The seat picked in weston_wm_window_handle_moveresize can sometimes
be NULL when it is (somehow) triggered with all buttons released.

This patch checks whether the seat is NULL to avoid NULL dereference.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=80837
Signed-off-by: Boyan Ding 
---
 xwayland/window-manager.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c
index f64ef94..6e74b89 100644
--- a/xwayland/window-manager.c
+++ b/xwayland/window-manager.c
@@ -1250,8 +1250,8 @@ weston_wm_window_handle_moveresize(struct 
weston_wm_window *window,
struct weston_shell_interface *shell_interface =
&wm->server->compositor->shell_interface;
 
-   if (seat->pointer->button_count != 1 || !window->view
-   || seat->pointer->focus != window->view)
+   if (seat == NULL || seat->pointer->button_count != 1
+   || !window->view || seat->pointer->focus != window->view)
return;
 
detail = client_message->data.data32[2];
-- 
2.0.1


___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel

[PATCH wayland-web] Added instructions for Linux Mint 17 / Ubuntu 14.04

2014-07-05 Thread spitzak 
From: Bill Spitzak 

Adds a page of instructions on how to get Weston and the XServer module
compiled on Linux Mint 17 (which is based on Ubuntu 14.04).

---
 building.html |   3 +
 mint17.html   | 183 ++
 2 files changed, 186 insertions(+)
 create mode 100644 mint17.html

diff --git a/building.html b/building.html
index 476a6e1..401069b 100644
--- a/building.html
+++ b/building.html
@@ -36,6 +36,9 @@ or hardware:
 Building Weston and XWayland on
 Ubuntu 12.04. May be useful for any Debian-derived system.
 
+Building Weston and XWayland on
+Linux Mint 17, which is derived from Ubuntu 14.04.
+
 For building Weston for http://www.raspberrypi.org/";>Raspberry
 Pi, see Raspberry Pi build guide.
 
diff --git a/mint17.html b/mint17.html
new file mode 100644
index 000..eeb8343
--- /dev/null
+++ b/mint17.html
@@ -0,0 +1,183 @@
+http://www.w3.org/TR/html4/strict.dtd";>
+
+
+
+
+
+Building Weston on Linux Mint 17
+
+
+
+
+Building Weston on Linux Mint 17
+
+The following sequence of commands successfully built Weston and
+XWayland on a Linux Mint 17 Cinnamon system, on July 5th, 2014. These
+commands will probably work on any system based on Ubuntu 14.04.
+
+This is considerably easier than earlier systems as the distributed
+version of Mesa (10.1.3) can be used and it does not need to be compiled.
+
+
+apt install git autoconf automake libtool
+
+# setup environment for local install:
+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
+
+# libwayland:
+
+apt install libffi-dev libexpat-dev
+
+git clone git://anongit.freedesktop.org/wayland/wayland
+cd wayland
+./autogen.sh --prefix=$WLD --disable-documentation
+make -j 9 && make install
+cd ..
+
+# libinput:
+
+apt install libmtdev-dev libudev-dev libevdev-dev
+
+git clone git://anongit.freedesktop.org/wayland/libinput
+cd libinput
+./autogen.sh --prefix=$WLD
+make -j 9 && make install
+cd ..
+
+# weston:
+
+apt install libegl-mesa-dev libgles2-mesa-dev libxcursor-dev libcairo2-dev \
+  libxcb-composite0-dev libgbm-dev libxkbcommon-dev libjpeg8-dev \
+  libpam0g-dev
+
+git clone git://anongit.freedesktop.org/wayland/weston
+cd weston
+./autogen.sh --prefix=$WLD --enable-libinput-backend --disable-setuid-install
+make -j 9 && make install
+cd ..
+
+# X Server:
+
+apt install libgl1-mesa-dri-dev libgcrypt11-dev libxkbfile-dev libxfont-dev \
+  libepoxy-dev
+
+git clone git://anongit.freedesktop.org/xorg/util/macros
+cd macros
+./autogen.sh --prefix=$WLD
+make && make install
+cd ..
+
+git clone git://anongit.freedesktop.org/xorg/proto/xcmiscproto
+cd xcmiscproto
+./autogen.sh --prefix=$WLD
+make && make install
+cd ..
+
+git clone git://anongit.freedesktop.org/xorg/lib/libxtrans
+cd libxtrans
+./autogen.sh --prefix=$WLD
+make && make install
+cd ..
+
+git clone git://anongit.freedesktop.org/xorg/proto/bigreqsproto
+cd bigreqsproto
+./autogen.sh --prefix=$WLD
+make && make install
+cd ..
+
+git clone git://anongit.freedesktop.org/xorg/proto/xproto
+cd xproto
+./autogen.sh --prefix=$WLD
+make && make install
+cd ..
+
+git clone git://anongit.freedesktop.org/xorg/proto/randrproto
+cd randrproto
+./autogen.sh --prefix=$WLD
+make && make install
+cd ..
+
+git clone git://anongit.freedesktop.org/xorg/proto/fontsproto
+cd fontsproto
+./autogen.sh --prefix=$WLD
+make && make install
+cd ..
+
+git clone git://anongit.freedesktop.org/xorg/proto/videoproto
+cd videoproto
+./autogen.sh --prefix=$WLD
+make && make install
+cd ..
+
+git clone git://anongit.freedesktop.org/xorg/proto/compositeproto
+cd compositeproto
+./autogen.sh --prefix=$WLD
+make && make install
+cd ..
+
+git clone git://anongit.freedesktop.org/xorg/proto/recordproto
+cd recordproto
+./autogen.sh --prefix=$WLD
+make && make install
+cd ..
+
+git clone git://anongit.freedesktop.org/xorg/proto/scrnsaverproto
+cd scrnsaverproto
+./autogen.sh --prefix=$WLD
+make && make install
+cd ..
+
+git clone git://anongit.freedesktop.org/xorg/proto/resourceproto
+cd resourceproto
+./autogen.sh --prefix=$WLD
+make && make install
+cd ..
+
+git clone git://anongit.freedesktop.org/xorg/proto/xf86driproto
+cd xf86driproto
+./autogen.sh --prefix=$WLD
+make && make install
+cd ..
+
+git clone git://anongit.freedesktop.org/xorg/proto/presentproto
+cd presentproto
+./autogen.sh --prefix=$WLD
+make && make install
+cd ..
+
+git clone git://anongit.freedesktop.org/xorg/proto/xineramaproto
+cd xineramaproto
+./autogen.sh --prefix=$WLD
+make && make install
+cd ..
+
+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 ..
+
+# Links needed so XWayland works:
+mkdir -p

Re: [PATCH wayland-web] Added instructions for Linux Mint 17 / Ubuntu 14.04

2014-07-05 Thread Bill Spitzak 

On 07/05/2014 11:50 PM, spit...@gmail.com wrote:

From: Bill Spitzak 

Adds a page of instructions on how to get Weston and the XServer module
compiled on Linux Mint 17 (which is based on Ubuntu 14.04).


Also if you want git send-email to work on Linux Mint you have to 
install this (as well as git-email):


 apt install libauthen-sasl-perl

Seems to be a bug in the git-email package.

This took a lot longer to figure out than actually getting Weston compiled.

___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel