Re: [PATCH xserver] dix: Remove clients from input and output ready queues after closing

2017-05-12 Thread Keith Packard
Olivier Fourdan  writes:

> This patch (landed as commit d9e23ea in master) and the other pending
> one (https://patchwork.freedesktop.org/patch/155681/) would benefit in
> stable branch server-1.19-branch as well, right?

I'd guess so. This was effectively introduced when we added the
mark_client_ready to AbortClient though.

-- 
-keith


signature.asc
Description: PGP signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PULL] Mainly hw/xwin warning fixes

2017-05-12 Thread Jon Turney
The following changes since commit 49c742557457ff9200a10f32daadfcea50d4911c:

  meson: Fix CLOCK_MONOTONIC test (2017-05-12 09:49:33 -0400)

are available in the git repository at:

  git://people.freedesktop.org/~jturney/xserver 

for you to fetch changes up to 1520c6ad6783178a4d4538b7c549c7948e419af0:

  hw/xwin: Fix -Wunused-function warning for MessageName() in non-debug builds 
(2017-05-12 19:17:22 +0100)


Jon Turney (4):
  Don't declare variables which will be unused if XSERVER_LIBPICACCESS 
isn't defined
  hw/xwin: Fix -Wmaybe-uninitialized warning in winWindowProc
  hw/xwin: Fix -Wmaybe-uninitialized warnings in engine CloseScreen wrappers
  hw/xwin: Fix -Wunused-function warning for MessageName() in non-debug 
builds

 hw/xfree86/common/xf86Config.c | 2 ++
 hw/xwin/winmultiwindowwm.c | 2 ++
 hw/xwin/winshadddnl.c  | 2 +-
 hw/xwin/winshadgdi.c   | 2 +-
 hw/xwin/winwndproc.c   | 7 ---
 5 files changed, 10 insertions(+), 5 deletions(-)
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xserver 2/2] meson: Fix CLOCK_MONOTONIC test

2017-05-12 Thread Adam Jackson
On Fri, 2017-05-12 at 12:13 +0300, Pekka Paalanen wrote:

> this indeed fixes the CLOCK_MONOTONIC for me. The whole xserver build
> succeeds now, just a few screenfuls of compiler warnings, no errors.
> For both patches:
> 
> Tested-by: Pekka Paalanen 

Merged, thanks for testing!

remote: E: failed to find patch for rev 
152375f4e4f1ee4833129802730b36af8d0f7e1a.
remote: I: patch #155813 updated using rev 
49c742557457ff9200a10f32daadfcea50d4911c.
remote: I: 1 patch(es) updated to state Accepted.
To ssh://git.freedesktop.org/git/xorg/xserver
   d9e23ea42..49c742557  master -> master

- ajax
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xkeyboard-config] Add evdev mappings for KEY_SOUND, KEY_UWB, KEY_WWAN and KEY_RFKILL

2017-05-12 Thread Hans de Goede
KEY_SOUND, KEY_WWAN and KEY_RFKILL are used on actual devices and
current xproto master defines keysyms for these. Add mappings for
these keys.

The XF86UWB keysm exists for quite a while now, as does the KEY_SOUND
evdev code for it, so lets adds a mapping for that too.

Note that this replaces the I255 to XF86Hibernate mapping in
xkb_symbols "evdev", I don't know where that came from, but it is
wrong, I255 was until now not defined in keycodes/evdev and
KEY_HIBERNATE is not defined in linux/input-event-codes.h .

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=100970
Cc: Bastien Nocera 
Cc: Benjamin Berg 
Signed-off-by: Hans de Goede 
---
 keycodes/evdev | 2 ++
 symbols/inet   | 7 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/keycodes/evdev b/keycodes/evdev
index 624ac68..51a6e26 100644
--- a/keycodes/evdev
+++ b/keycodes/evdev
@@ -281,6 +281,8 @@ default xkb_keycodes "evdev" {
 = 251;   // #define KEY_BRIGHTNESS_CYCLE243
 = 252;   // #define KEY_BRIGHTNESS_ZERO 244
 = 253;   // #define KEY_DISPLAY_OFF 245
+= 254;   // #define KEY_WWAN246
+= 255;   // #define KEY_RFKILL  247
 
// Fake keycodes for virtual keys
 =   92;
diff --git a/symbols/inet b/symbols/inet
index 5403e77..1e06aa9 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -184,7 +184,7 @@ xkb_symbols "evdev" {
 key{  [ Print ]   };
 //  key{  [ ]   }; // KEY_HP
 key{  [ XF86WebCam]   };
-//  key{  [ ]   }; // KEY_SOUND
+key{  [ XF86AudioPreset   ]   };
 //  key{  [ ]   }; // KEY_QUESTION
 key{  [ XF86Mail  ]   };
 key{  [ XF86Messenger ]   }; // KEY_CHAT
@@ -210,13 +210,14 @@ xkb_symbols "evdev" {
 key{  [ XF86Battery   ]   };
 key{  [ XF86Bluetooth ]   };
 key{  [ XF86WLAN  ]   };
+key{  [ XF86UWB   ]   };
 //  key{  [ ]   }; // KEY_VIDEO_NEXT  --  drive next video 
source
 //  key{  [ ]   }; // KEY_VIDEO_PREV  --  drive previous 
video source
 //  key{  [ ]   }; // KEY_BRIGHTNESS_CYCLE  --  bright up, 
max++ == min
 //  key{  [ ]   }; // KEY_BRIGHTNESS_ZERO  --  brightness off
 //  key{  [ ]   }; // KEY_DISPLAY_OFF  --  turn off display
-//  key{  [ ]   }; // KEY_WIMAX
-key{  [ XF86Hibernate ]   }; // KEY_HIBERNATE
+key{  [ XF86WWAN  ]   }; // KEY_WWAN
+key{  [ XF86RFKill]   }; // KEY_RFKILL
 
 key{  [ XF86Tools ]   };
 key{  [ XF86Launch5   ]   };
-- 
2.12.2

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xproto v2 1/2] Add XF86XK_WWAN and XF86XK_Rfkill

2017-05-12 Thread Hans de Goede

Hi,

On 12-05-17 01:02, Peter Hutterer wrote:

On Wed, May 10, 2017 at 05:53:53PM +0200, Hans de Goede wrote:

Add Keysyms corresponding to the evdev WWAN and RFKILL keys, we already
have Keysyms for WLAN and UWB from linux/input-event-codes.h:

  #define KEY_WLAN238
  #define KEY_UWB 239

But not for the WWAN and generic RFKILL keys:

  #define KEY_WWAN246 /* Wireless WAN (LTE, UMTS, GSM, 
etc.) */
  #define KEY_WIMAX   KEY_WWAN
  #define KEY_RFKILL  247 /* Key that controls all radios */

This commits add Keysyms for these so that we can add proper mappings for
them to xkb.

Cc: Bastien Nocera 
Cc: Benjamin Berg 
Signed-off-by: Hans de Goede 
---
Changes in v2:
-Define XF86XK_WWAN instead of XF86XK_WiMAX, as KEY_WIMAX is an alias
  for KEY_WWAN, I intended to do this for v1 before submitting, but I forgot



  XF86keysym.h | 3 +++
  1 file changed, 3 insertions(+)

diff --git a/XF86keysym.h b/XF86keysym.h
index 89d40b8..b04d45e 100644
--- a/XF86keysym.h
+++ b/XF86keysym.h
@@ -199,6 +199,9 @@
  
  #define XF86XK_Keyboard		0x1008FFB3   /* User defined keyboard related action */
  
+#define XF86XK_WWAN		0x1008FFB4   /* Toggle WWAN (LTE, UMTS, etc.) radio */

+#define XF86XK_Rfkill  0x1008FFB5   /* Toggle radios on/off */


Only comment I have: Rfkill seems odd because RF is an abbreviation, so I'd
go with RFKill. See also the capitalisation on Switch_VT, rather than Switch_Vt.

With that change, Reviewed-by: Peter Hutterer 
or without it too, if you think Rfkill is better :)


Thank you, both patches pushed with the suggested RFKill rename.

Regards,

Hans
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xserver 2/2] meson: Fix CLOCK_MONOTONIC test

2017-05-12 Thread Pekka Paalanen
On Thu, 11 May 2017 17:17:55 -0400
Adam Jackson  wrote:

> C99 isn't enough on its own to get POSIX feature sets defined.
> 
> Signed-off-by: Adam Jackson 
> ---
>  include/meson.build | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/include/meson.build b/include/meson.build
> index 358e04976..2f8882803 100644
> --- a/include/meson.build
> +++ b/include/meson.build
> @@ -4,7 +4,10 @@ dri_dep = dependency('dri', required: build_dri2 or 
> build_dri3)
>  conf_data = configuration_data()
>  conf_data.set('_DIX_CONFIG_H_', '1')
>  
> +
> +
>  conf_data.set('MONOTONIC_CLOCK', cc.compiles('''
> +#define _POSIX_C_SOURCE 200112L
>  #include 
>  #include 
>  #ifndef CLOCK_MONOTONIC

Hi Adam,

this indeed fixes the CLOCK_MONOTONIC for me. The whole xserver build
succeeds now, just a few screenfuls of compiler warnings, no errors.
For both patches:

Tested-by: Pekka Paalanen 


Thanks,
pq


pgp9x0lQwNYHS.pgp
Description: OpenPGP digital signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xserver] dix: Remove clients from input and output ready queues after closing

2017-05-12 Thread Olivier Fourdan
Hi Keith, Michel,

> On 12/05/17 03:20 AM, Keith Packard wrote:
> > Delay removing the client from these two queues until all potential
> > I/O has completed in case we mark the client as ready for reading or
> > with pending output during the close operation.
> > 
> > Bugzilla: https://bugs.freedesktop.org/100957
> > Signed-off-by: Keith Packard 
> > Tested-by: Nick Sarnie 

This patch (landed as commit d9e23ea in master) and the other pending one 
(https://patchwork.freedesktop.org/patch/155681/) would benefit in stable 
branch server-1.19-branch as well, right?

I mean, looking at the differences between 1.19 and master it doesn't look like 
a recent regression in master, is it?

Cheers,
Olivier
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel