Re: [PATCH] screensaver: apply settings from weston.ini
On Fri, 22 Nov 2013 10:35:57 +0530 Karthik Ramanan a0393...@ti.com wrote: The screensaver duration from weston.ini is not taking effect, the default idletime that is hardcoded is the what kicks the idle_handler and locks the screen. It is hardcoded to 300 seconds. This change makes screensaver configurable from the ini file. Signed-off-by: Karthik Ramanan a0393...@ti.com --- src/shell.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/shell.c b/src/shell.c index 82c3cd8..aa13ecf 100644 --- a/src/shell.c +++ b/src/shell.c @@ -532,6 +532,7 @@ shell_configuration(struct desktop_shell *shell) path, shell-screensaver.path, NULL); weston_config_section_get_int(section, duration, duration, 60); shell-screensaver.duration = duration * 1000; + shell-compositor-idle_time = duration; section = weston_config_get_section(shell-compositor-config, shell, NULL, NULL); Nack. There are two different timeouts, compare the weston command line option -i and weston.ini option 'duration', see the respective man-pages. If you want to set the -i option via weston.ini, you have to add a new key for it. Thanks, pq ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
Re: [PATCH 0/10] Add a mechanism for nested compositors to use subsurfaces without blitting
Hi, I think this thread has gotten a bit tangled so I've done a bit of minor rebasing for the patches and pushed them all to github: https://github.com/bpeel/wayland/commits/wip/wayland-subcompositor https://github.com/bpeel/mesa/commits/wip/wayland-subcompositor https://github.com/bpeel/weston/commits/wip/wayland-subcompositor Regards, - Neil pgpkWCY7gPFId.pgp Description: PGP signature ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
[PATCH] shell: don't crash if a pointer's focus is null
From: Emilio Pozuelo Monfort emilio.pozu...@collabora.co.uk It's possible for a pointer's focus to be null, e.g. because the focus surface has been bestroyed. Prevent a crash when that happens and a client takes too long to respond to a ping. Signed-off-by: Emilio Pozuelo Monfort emilio.pozu...@collabora.co.uk --- src/shell.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/shell.c b/src/shell.c index 82c3cd8..ce8e9dd 100644 --- a/src/shell.c +++ b/src/shell.c @@ -1861,7 +1861,8 @@ ping_timeout_handler(void *data) shsurf-unresponsive = 1; wl_list_for_each(seat, shsurf-surface-compositor-seat_list, link) - if (seat-pointer-focus-surface == shsurf-surface) + if (seat-pointer-focus + seat-pointer-focus-surface == shsurf-surface) set_busy_cursor(shsurf, seat-pointer); return 1; -- 1.8.4.rc3 ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
[PATCH weston] Automatically generate weston.ini with the right paths
Previously weston.ini had hardcoded paths for the weston-* clients in /usr/bin and /usr/libexec. This was a bit annoying when testing Weston because you wouldn't usually install those in the system prefix. This patch adds a make rule to automatically generate weston.ini from a template file with some replacement markers for the paths so that they can have the right prefix. --- .gitignore| 1 + Makefile.am | 11 +- weston.ini| 67 --- weston.ini.in | 67 +++ 4 files changed, 78 insertions(+), 68 deletions(-) delete mode 100644 weston.ini create mode 100644 weston.ini.in diff --git a/.gitignore b/.gitignore index b3fb2a1..111c56c 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ cscope.out /missing /stamp-h1 /test-driver +/weston.ini Makefile Makefile.in TAGS diff --git a/Makefile.am b/Makefile.am index e9ecc38..3a7d337 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,4 +6,13 @@ SUBDIRS = shared src clients data protocol tests $(wcap_subdir) man DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install -EXTRA_DIST = weston.ini wayland-scanner.mk +EXTRA_DIST = weston.ini.in wayland-scanner.mk + +weston.ini : $(srcdir)/weston.ini.in + $(AM_V_GEN)$(SED) \ + -e 's|@bindir[@]|$(bindir)|g' \ + -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ + -e 's|@libexecdir[@]|$(libexecdir)|g' \ + $ $@ + +all-local : weston.ini diff --git a/weston.ini b/weston.ini deleted file mode 100644 index 4761bed..000 --- a/weston.ini +++ /dev/null @@ -1,67 +0,0 @@ -[core] -#modules=xwayland.so,cms-colord.so -#shell=desktop-shell.so -#gbm-format=xrgb2101010 - -[shell] -background-image=/usr/share/backgrounds/gnome/Aqua.jpg -background-color=0xff002244 -background-type=tile -panel-color=0x90ff -locking=true -animation=zoom -startup-animation=fade -#binding-modifier=ctrl -#num-workspaces=6 -#cursor-theme=whiteglass -#cursor-size=24 - -#lockscreen-icon=/usr/share/icons/gnome/256x256/actions/lock.png -#lockscreen=/usr/share/backgrounds/gnome/Garden.jpg -#homescreen=/usr/share/backgrounds/gnome/Blinds.jpg -#animation=fade - -[launcher] -icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png -path=/usr/bin/gnome-terminal - -[launcher] -icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png -path=/usr/bin/weston-terminal - -[launcher] -icon=/usr/share/icons/hicolor/24x24/apps/google-chrome.png -path=/usr/bin/google-chrome - -[launcher] -icon=/usr/share/icons/gnome/24x24/apps/arts.png -path=./clients/weston-flower - -[screensaver] -# Uncomment path to disable screensaver -path=/usr/libexec/weston-screensaver -duration=600 - -[input-method] -path=/usr/libexec/weston-keyboard - -#[output] -#name=LVDS1 -#mode=1680x1050 -#transform=90 -#icc_profile=/usr/share/color/icc/colord/Bluish.icc - -#[output] -#name=VGA1 -#mode=173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync -#transform=flipped - -#[output] -#name=X1 -#mode=1024x768 -#transform=flipped-270 - -#[touchpad] -#constant_accel_factor = 50 -#min_accel_factor = 0.16 -#max_accel_factor = 1.0 diff --git a/weston.ini.in b/weston.ini.in new file mode 100644 index 000..5181a9e --- /dev/null +++ b/weston.ini.in @@ -0,0 +1,67 @@ +[core] +#modules=xwayland.so,cms-colord.so +#shell=desktop-shell.so +#gbm-format=xrgb2101010 + +[shell] +background-image=/usr/share/backgrounds/gnome/Aqua.jpg +background-color=0xff002244 +background-type=tile +panel-color=0x90ff +locking=true +animation=zoom +startup-animation=fade +#binding-modifier=ctrl +#num-workspaces=6 +#cursor-theme=whiteglass +#cursor-size=24 + +#lockscreen-icon=/usr/share/icons/gnome/256x256/actions/lock.png +#lockscreen=/usr/share/backgrounds/gnome/Garden.jpg +#homescreen=/usr/share/backgrounds/gnome/Blinds.jpg +#animation=fade + +[launcher] +icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png +path=/usr/bin/gnome-terminal + +[launcher] +icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png +path=@bindir@/weston-terminal + +[launcher] +icon=/usr/share/icons/hicolor/24x24/apps/google-chrome.png +path=/usr/bin/google-chrome + +[launcher] +icon=/usr/share/icons/gnome/24x24/apps/arts.png +path=@abs_top_builddir@/clients/weston-flower + +[screensaver] +# Uncomment path to disable screensaver +path=@libexecdir@/weston-screensaver +duration=600 + +[input-method] +path=@libexecdir@/weston-keyboard + +#[output] +#name=LVDS1 +#mode=1680x1050 +#transform=90 +#icc_profile=/usr/share/color/icc/colord/Bluish.icc + +#[output] +#name=VGA1 +#mode=173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync +#transform=flipped + +#[output] +#name=X1 +#mode=1024x768 +#transform=flipped-270 + +#[touchpad] +#constant_accel_factor = 50 +#min_accel_factor = 0.16 +#max_accel_factor = 1.0 -- 1.8.3.1 ___ wayland-devel mailing list
Re: [PATCH weston] rpi: avoid vc_dispmanx_set_wl_buffer_in_use without EGL
Hi, On 22 November 2013 15:30, ppaala...@gmail.com wrote: The symbol is needed only for the EGL buffer path. If --disable-egl is given to ./configure, there is no need for it, so fix it to actually not look for that symbol needlessly. This should fix the runtime error: Failed to load module: .../rpi-backend.so: undefined symbol: vc_dispmanx_set_wl_buffer_in_use when you use --disable-egl and do not have a recent enough libraspberrypi package (/opt/vc, a.k.a userland.git) that would provide vc_dispmanx_set_wl_buffer_in_use. Apparently no released version of userland yet provides this. The calls are organized into two helper functions to avoid a boolean argument, and put the #ifdefs away from the main parts of the code. If you really wanted to gold-plate it, you could call it through dlsym instead to avoid the link error altogether, even when someone builds with --enable-egl, but doesn't have the support from the vendor libraries? Cheers, Daniel ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
[ANNOUNCE] libxkbcommon 0.3.2
Hi, libxkbcommon 0.3.2 is released. This is primarily a bug-fix release, and everyone is recommended to update. Note for builders and distributors: -- The build dependencies of libxkbcommon have reduced over several releases. Currently, they are: - bison OR a recent byacc A pre-generated file is included in the tarball if one is not available. - xkeyboard-config For finding the XKB data root path (the path can be passed manually). When building from git, you also need: - xorg-util-macros = 1.16 There are no runtime dependencies, though xkeyboard-config or another XKB dataset is needed for using keymaps. Note for users: -- Due to a bug report[1], there now exists a slightly unfortunate difference between the two functions xkb_state_key_get_one_sym(), and xkb_state_key_get_syms() with a return value of 1 (indicating one keysym is returned). The former now performs a capitalization transformation on the keysym[2], while the latter does not. Therefore, if your application does not utilize the multiple-keysyms support in libxkbcommon, consider using xkb_state_key_get_one_sym() rather than xkb_state_key_get_syms(). Hopefully, we can remove such implicit behavior from all of xkeyboard-config's keymaps in the future, thus making such subtleties irrelevant. Other changes: - Added XKB_KEY_XF86AudioMicMute keysym, to match xproto 7.0.24. - Log messages from the library now look like xkbcommon: ERROR by default, instead of xkbcomp-like Error: . [1] https://bugs.freedesktop.org/show_bug.cgi?id=67167 [2] http://www.x.org/releases/current/doc/kbproto/xkbproto.html#Interpreting_the_Lock_Modifier Tarballs: git tag: xkbcommon-0.3.2 http://xkbcommon.org/download/libxkbcommon-0.3.2.tar.xz MD5: 935cf416354bf05210de2e389484f7e8 libxkbcommon-0.3.2.tar.xz SHA1: 7bfe39fef420d072a84fd295f0c5bb049f8d30b9 libxkbcommon-0.3.2.tar.xz Thanks, Ran and Daniel ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
Re: [PATCH weston] Automatically generate weston.ini with the right paths
On Fri, Nov 22, 2013 at 04:46:00PM +, Neil Roberts wrote: Previously weston.ini had hardcoded paths for the weston-* clients in /usr/bin and /usr/libexec. This was a bit annoying when testing Weston because you wouldn't usually install those in the system prefix. This patch adds a make rule to automatically generate weston.ini from a template file with some replacement markers for the paths so that they can have the right prefix. --- .gitignore| 1 + Makefile.am | 11 +- weston.ini| 67 --- weston.ini.in | 67 +++ 4 files changed, 78 insertions(+), 68 deletions(-) delete mode 100644 weston.ini create mode 100644 weston.ini.in That's a nice idea. Could we just generate it from configure.ac by listing it in AC_CONFIG_FILES? Also, I was thinking that we should add a comment to the top of the file saying that this is a sample weston.ini, that there's a weston.ini man page, and that you can copy the sample weston.ini to ~/.config/weston.ini or /etc/xdg/weston/weston.ini. Kristian diff --git a/.gitignore b/.gitignore index b3fb2a1..111c56c 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ cscope.out /missing /stamp-h1 /test-driver +/weston.ini Makefile Makefile.in TAGS diff --git a/Makefile.am b/Makefile.am index e9ecc38..3a7d337 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,4 +6,13 @@ SUBDIRS = shared src clients data protocol tests $(wcap_subdir) man DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install -EXTRA_DIST = weston.ini wayland-scanner.mk +EXTRA_DIST = weston.ini.in wayland-scanner.mk + +weston.ini : $(srcdir)/weston.ini.in + $(AM_V_GEN)$(SED) \ + -e 's|@bindir[@]|$(bindir)|g' \ + -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ + -e 's|@libexecdir[@]|$(libexecdir)|g' \ + $ $@ + +all-local : weston.ini diff --git a/weston.ini b/weston.ini deleted file mode 100644 index 4761bed..000 --- a/weston.ini +++ /dev/null @@ -1,67 +0,0 @@ -[core] -#modules=xwayland.so,cms-colord.so -#shell=desktop-shell.so -#gbm-format=xrgb2101010 - -[shell] -background-image=/usr/share/backgrounds/gnome/Aqua.jpg -background-color=0xff002244 -background-type=tile -panel-color=0x90ff -locking=true -animation=zoom -startup-animation=fade -#binding-modifier=ctrl -#num-workspaces=6 -#cursor-theme=whiteglass -#cursor-size=24 - -#lockscreen-icon=/usr/share/icons/gnome/256x256/actions/lock.png -#lockscreen=/usr/share/backgrounds/gnome/Garden.jpg -#homescreen=/usr/share/backgrounds/gnome/Blinds.jpg -#animation=fade - -[launcher] -icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png -path=/usr/bin/gnome-terminal - -[launcher] -icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png -path=/usr/bin/weston-terminal - -[launcher] -icon=/usr/share/icons/hicolor/24x24/apps/google-chrome.png -path=/usr/bin/google-chrome - -[launcher] -icon=/usr/share/icons/gnome/24x24/apps/arts.png -path=./clients/weston-flower - -[screensaver] -# Uncomment path to disable screensaver -path=/usr/libexec/weston-screensaver -duration=600 - -[input-method] -path=/usr/libexec/weston-keyboard - -#[output] -#name=LVDS1 -#mode=1680x1050 -#transform=90 -#icc_profile=/usr/share/color/icc/colord/Bluish.icc - -#[output] -#name=VGA1 -#mode=173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync -#transform=flipped - -#[output] -#name=X1 -#mode=1024x768 -#transform=flipped-270 - -#[touchpad] -#constant_accel_factor = 50 -#min_accel_factor = 0.16 -#max_accel_factor = 1.0 diff --git a/weston.ini.in b/weston.ini.in new file mode 100644 index 000..5181a9e --- /dev/null +++ b/weston.ini.in @@ -0,0 +1,67 @@ +[core] +#modules=xwayland.so,cms-colord.so +#shell=desktop-shell.so +#gbm-format=xrgb2101010 + +[shell] +background-image=/usr/share/backgrounds/gnome/Aqua.jpg +background-color=0xff002244 +background-type=tile +panel-color=0x90ff +locking=true +animation=zoom +startup-animation=fade +#binding-modifier=ctrl +#num-workspaces=6 +#cursor-theme=whiteglass +#cursor-size=24 + +#lockscreen-icon=/usr/share/icons/gnome/256x256/actions/lock.png +#lockscreen=/usr/share/backgrounds/gnome/Garden.jpg +#homescreen=/usr/share/backgrounds/gnome/Blinds.jpg +#animation=fade + +[launcher] +icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png +path=/usr/bin/gnome-terminal + +[launcher] +icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png +path=@bindir@/weston-terminal + +[launcher] +icon=/usr/share/icons/hicolor/24x24/apps/google-chrome.png +path=/usr/bin/google-chrome + +[launcher] +icon=/usr/share/icons/gnome/24x24/apps/arts.png +path=@abs_top_builddir@/clients/weston-flower + +[screensaver] +# Uncomment path to disable screensaver
