Re: [PULL] Misc fixes

2015-05-11 Thread Keith Packard
Adam Jackson a...@redhat.com writes:

 Brent Collins (1):
   shm: Fix xselinux resource initialization for xinerama pixmaps

 Chris Wilson (2):
   glx/dri2: Disable AIGLX if indirect GLX is disabled
   shm: Fix use-after-free in ShmDestroyPixmap

 Jason Gerecke (1):
   xfree86: Return NULL from xf86CompatOutput if no compat_output is 
 defined

 Olivier Fourdan (1):
   dix: Fix image byte order on big endian hardware

 Robert Ancell (1):
   xwayland: Fix error strings

Merged.
   6b65e96..c39c3a9  master - master

-- 
-keith


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

[PULL] Misc fixes

2015-05-07 Thread Adam Jackson
Just some stuff that's accumulated on the list and deserves merging,
all of which would be appropriate for a 1.17.2.

The following changes since commit b1029716e41e252f149b82124a149da180607c96:

  systemd-logind: don't second guess D-Bus default timeout (2015-04-17 10:57:48 
-0700)

are available in the git repository at:

  ssh://people.freedesktop.org/~ajax/xserver.git xserver-next

for you to fetch changes up to 7470578520e90b6402b2509cd0c51fd4fd84849f:

  shm: Fix xselinux resource initialization for xinerama pixmaps (2015-05-07 
15:10:19 -0400)


Brent Collins (1):
  shm: Fix xselinux resource initialization for xinerama pixmaps

Chris Wilson (2):
  glx/dri2: Disable AIGLX if indirect GLX is disabled
  shm: Fix use-after-free in ShmDestroyPixmap

Jason Gerecke (1):
  xfree86: Return NULL from xf86CompatOutput if no compat_output is defined

Olivier Fourdan (1):
  dix: Fix image byte order on big endian hardware

Robert Ancell (1):
  xwayland: Fix error strings

 Xext/shm.c| 10 --
 glx/glxdri2.c |  3 +++
 hw/xfree86/modes/xf86Crtc.h   |  2 ++
 hw/xwayland/xwayland-glamor.c |  4 ++--
 hw/xwayland/xwayland-input.c  |  2 +-
 hw/xwayland/xwayland-output.c |  4 ++--
 include/servermd.h|  2 ++
 7 files changed, 20 insertions(+), 7 deletions(-)

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

[PULL] Misc fixes

2013-08-21 Thread Adam Jackson
A collection of little fixes across the board from the past few months
that haven't been merged yet.  I've added my r-b to the ones I didn't
write myself.

The following changes since commit fe7463b8ce0de301c2f82b108c93963424f77219:

  dix: add missing include for DeleteWindowFromAnySelections (2013-08-18 
02:39:44 +0200)

are available in the git repository at:

  ssh://people.freedesktop.org/~ajax/xserver.git for-keithp

for you to fetch changes up to 30cc7b6aca683adf72e669887b4cb4de5aed9674:

  xnest: Ignore GetImage() error in xnestGetImage() (2013-08-21 15:06:04 -0400)


Adam Jackson (1):
  randr: Fix a copypasta bug in CRTC confinement

Chris Wilson (1):
  os: Immediately queue initial WriteToClient

Keith Packard (1):
  miext/sync: Fix multi-screen support in SyncFence initialization

Laurent Carlier (1):
  ephyr: restore GLX support

Michal Srb (1):
  Xnest: Implement xnestModifyPixmapHeader

Peter Harris (2):
  mi: Avoid stack smash when drawing dashed lines
  security: Don't count RetainPermanent clients twice

Radek Doulik (1):
  xnest: Ignore GetImage() error in xnestGetImage()

 Xext/security.c | 11 ---
 hw/kdrive/ephyr/ephyrinit.c | 20 
 hw/xnest/GCOps.c| 14 ++
 hw/xnest/Pixmap.c   | 15 +++
 hw/xnest/Screen.c   |  1 +
 hw/xnest/XNPixmap.h |  2 ++
 mi/miwideline.c |  6 +++---
 miext/sync/misync.c | 21 +++--
 os/io.c |  2 +-
 randr/rrpointer.c   |  2 +-
 10 files changed, 76 insertions(+), 18 deletions(-)

- ajax

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


Re: [PULL] misc fixes

2012-06-28 Thread Keith Packard
Peter Hutterer peter.hutte...@who-t.net writes:

 Peter Hutterer (4):
   dix: if the scroll valuator reaches INT_MAX, reset to 0
   os: print newline after printing display name
   AC_SUBST the GLX_SYS_LIBS
   include: document _XkbErrCode2 macros

 Sergei Trofimovich (1):
   test/.gitignore: add hashtabletest

Merged.
   855003c..59294a2  master - master

-- 
keith.pack...@intel.com


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

[PULL] misc fixes

2012-06-21 Thread Peter Hutterer
The following changes since commit 8dc70acbf3d82611ac9ec1ec2a52edcc01934850:

  Merge remote-tracking branch 'alanc/master' (2012-06-14 13:04:29 -0700)

are available in the git repository at:


  git://people.freedesktop.org/~whot/xserver for-keith

for you to fetch changes up to 191b630656ba206ad78b7803c3a76f7d9567d9d8:

  include: document _XkbErrCode2 macros (2012-06-22 10:51:00 +1000)


Peter Hutterer (4):
  dix: if the scroll valuator reaches INT_MAX, reset to 0
  os: print newline after printing display name
  AC_SUBST the GLX_SYS_LIBS
  include: document _XkbErrCode2 macros

Sergei Trofimovich (1):
  test/.gitignore: add hashtabletest

 dix/getevents.c  |   40 ++--
 include/xkbsrv.h |5 +
 os/connection.c  |1 +
 test/.gitignore  |1 +
 test/Makefile.am |2 +-
 test/xi2/Makefile.am |2 +-
 6 files changed, 43 insertions(+), 8 deletions(-)


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

[PULL] misc fixes

2011-03-08 Thread Peter Hutterer
a few warning fixes, ptraccel refactoring and memleaks, that pretty much
sums it up.

The following changes since commit 628d16a92a7fa556fbb70bf4a4adf57ec05c190b:

  loader: Don't distribute sdksyms.c and make it depend on the config 
(2011-03-03 21:54:25 -0800)

are available in the git repository at:
  git://people.freedesktop.org/~whot/xserver.git for-keith

Adam Jackson (3):
  input: warning fix
  input: warning fixes
  record: warning fix

Julien Cristau (1):
  Xi: fix length checks for swapped clients

Peter Hutterer (2):
  xfree86: block signals between EnableDevice and first CheckMotion()
  Xi: fix XI2 passive grab reply length calculation

Rami Ylimäki (3):
  xkb: Ensure that XKB device private won't leak on device disconnect.
  dix: Release input device config info when the device disconnects.
  config: Ensure that stolen option list elements are released.

Simon Thum (3):
  dix: refactor predictable scheme initialization
  dix: update pointer acceleration code to use ValuatorMask
  dix: change all timestamps in pointer acceleration to CARD32

 Xi/xipassivegrab.c |4 +-
 Xi/xiproperty.c|4 +-
 config/hal.c   |6 +-
 config/udev.c  |6 +-
 dix/devices.c  |2 +
 dix/eventconvert.c |3 +
 dix/getevents.c|   26 +
 dix/ptrveloc.c |  217 ++--
 hw/xfree86/common/xf86Xinput.c |3 +
 include/input.h|   12 +--
 include/ptrveloc.h |   26 +++--
 record/record.c|1 -
 xkb/xkbActions.c   |   11 +--
 13 files changed, 164 insertions(+), 157 deletions(-)
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel


[PULL] misc fixes

2010-11-18 Thread Peter Hutterer
looks like my branches got out-of-sync with your pulls, so only part of the
last was merged in. Please pull the 4 fixes below as well, they're prety
straightforward fixes.

The following changes since commit 38c46ccf796462d068d95acb9022de2acfc3a1f7:

  Merge remote branch 'whot/for-keith' (2010-11-15 09:06:33 +0800)

are available in the git repository at:

  git://people.freedesktop.org/~whot/xserver.git for-keith

Adam Jackson (1):
  linux: Fix CPU usage bug in console fd flushing

Chase Douglas (2):
  Fix GPE Y axis scaling
  Fix transformAbsolute

Dan Horák (1):
  XF86CONFIGDIR is undefined when built with --disable-xorg (#28672)

 config/Makefile.am |2 ++
 dix/getevents.c|   14 +-
 hw/xfree86/os-support/linux/lnx_init.c |6 +-
 3 files changed, 16 insertions(+), 6 deletions(-)
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel


[PULL] Misc fixes for xfree86.

2010-08-01 Thread Jesse Adkins
Various commits to xfree86, most taking out unused variables, externs,
and macros. Nothing too big.

Available at :
git://gitorious.org/xf86jessefixes/xserver.git master

Jesse Adkins (15):
Purge vgaCmap.c from vgaHW.
Remove unused parsePrologueVoid
Remove unused mouse_assoc from xf86Config.c
Simplify xf86Msg{,Verb}
Remove unused message defines in Configint.h
Plug a leak in OpenConfigFile.
Remove unused xorg_symbols extern from loader.c.
Remove comments about unable to use malloc.
Loader: Don't print loader 'magic'.
Loader: Remove prototypes for non-existant functions.
Remove unused kbdCustomKeycodes from xf86Info.
Remove unused constants supposedly for isc cc.
Remove unused tokens from xf86parser.h
Remove vtSysReq option.
Remove xf86sFlag
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel


Re: [PULL] Misc fixes for xfree86.

2010-08-01 Thread Peter Hutterer
On Sun, Aug 01, 2010 at 02:39:40PM -0700, Jesse Adkins wrote:
 Various commits to xfree86, most taking out unused variables, externs,
 and macros. Nothing too big.
 
 Available at :
 git://gitorious.org/xf86jessefixes/xserver.git master
 
 Jesse Adkins (15):
 Purge vgaCmap.c from vgaHW.
 Remove unused parsePrologueVoid
 Remove unused mouse_assoc from xf86Config.c
 Simplify xf86Msg{,Verb}
 Remove unused message defines in Configint.h
 Plug a leak in OpenConfigFile.
 Remove unused xorg_symbols extern from loader.c.
 Remove comments about unable to use malloc.
 Loader: Don't print loader 'magic'.
 Loader: Remove prototypes for non-existant functions.
 Remove unused kbdCustomKeycodes from xf86Info.
 Remove unused constants supposedly for isc cc.
 Remove unused tokens from xf86parser.h
 Remove vtSysReq option.
 Remove xf86sFlag


can you please send these as patches to the list first. Reviewing patches is
much easier in-line.

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


Re: [PULL] misc fixes and XKB cleanup

2010-02-04 Thread Julien Cristau
On Thu, Feb  4, 2010 at 08:04:57 +1000, Peter Hutterer wrote:

 The fixes didn't get pulled in, Keith applied them himself instead.
 
Some of them still aren't on master, so I guess they'll need resending.

Cheers,
Julien
___
xorg-devel mailing list
xorg-devel@lists.x.org
http://lists.x.org/mailman/listinfo/xorg-devel


Re: [PULL] misc fixes and XKB cleanup

2010-02-03 Thread Julien Cristau
On Sun, Jan 24, 2010 at 13:07:29 -0800, Keith Packard wrote:

 On Tue, 19 Jan 2010 14:45:30 +1300, Peter Hutterer peter.hutte...@who-t.net 
 wrote:
 
dix: EventToCore needs to copy the root window too.
 
 This makes the xinput test fail -- it expects to see 0 for the root
 window. Is the test broken?
 
Did this get resolved?  What's the status of this pull request now?

Thanks,
Julien
___
xorg-devel mailing list
xorg-devel@lists.x.org
http://lists.x.org/mailman/listinfo/xorg-devel


Re: [PULL] misc fixes and XKB cleanup

2010-02-03 Thread Peter Hutterer
On Wed, Feb 03, 2010 at 10:44:27PM +0100, Julien Cristau wrote:
 On Sun, Jan 24, 2010 at 13:07:29 -0800, Keith Packard wrote:
 
  On Tue, 19 Jan 2010 14:45:30 +1300, Peter Hutterer 
  peter.hutte...@who-t.net wrote:
  
 dix: EventToCore needs to copy the root window too.
  
  This makes the xinput test fail -- it expects to see 0 for the root
  window. Is the test broken?
  
 Did this get resolved?  What's the status of this pull request now?

Correct fix committed as b4baab90c0d98bef98d485682d4a69a327a380d6.
The fixes didn't get pulled in, Keith applied them himself instead.

Cheers,
  Peter
___
xorg-devel mailing list
xorg-devel@lists.x.org
http://lists.x.org/mailman/listinfo/xorg-devel


[PULL] misc fixes and XKB cleanup

2010-01-18 Thread Peter Hutterer
Keith,

Please pull the changes below into master. Included are misc. bug fixes and
the first round of reviewed xkb cleanup patches.

The following changes since commit 6f6a99abc12ddee82898fdabfb50c17e90e094b9:
  Jeremy Huddleston (1):
XQuartz: Don't FatalError in x_hook_run if the list is empty

are available in the git repository at:

  git://people.freedesktop.org/~whot/xserver.git master

Dan Nicholson (1):
  Don't use AC_CHECK_FILE for fontpath checks when cross compiling

Gaetan Nadon (1):
  packaging: provide a default README file #24206

Horst Wente (1):
  xkb: make ctrl+alt+keypad + / ctrl+alt+keypad - work again (#25743)

Julien Cristau (1):
  main: move config_init() after InitInput()

Oldřich Jedlička (2):
  Fix typo in updateSlaveDeviceCoords
  Allow driver to call DeleteInputDeviceRequest during UnInit

Peter Hutterer (10):
  dix: EventToCore needs to copy the root window too.
  xfree86: replace True/False with TRUE/FALSE.
  xkb: Add XKM file format description.
  xkb: remove _XkbTyped*alloc
  xkb: remove _XkbClearElems, a memset will do.
  xkb: remove XkbAtomGetString, replace with NameForAtom.
  xkb: unexport xkbDevicePrivateKey and xkbUnwrapProc.
  xkb: remove IsKeypadKey define, only used in two places.
  xkb: remove unused _XkbIsPressEvent and _XkbIsReleaseEvent defines
  xkb: sed True - TRUE and False - FALSE

Tiago Vignatti (1):
  dix: move cursor realize code to its own function

 README |   37 +++
 configure.ac   |   22 +-
 dix/cursor.c   |  203 +---
 dix/devices.c  |   44 ++-
 dix/eventconvert.c |1 +
 dix/getevents.c|2 +-
 dix/main.c |2 +-
 hw/xfree86/common/xf86Xinput.c |   20 +-
 include/xkbsrv.h   |   23 +--
 test/input.c   |4 +-
 xkb/XKBAlloc.c |   58 ++--
 xkb/XKBGAlloc.c|   34 +-
 xkb/XKBMAlloc.c|   71 ++--
 xkb/XKBMisc.c  |   52 ++--
 xkb/XKM_file_format.txt|  684 
 xkb/ddxBeep.c  |2 +-
 xkb/ddxList.c  |8 +-
 xkb/ddxLoad.c  |   18 +-
 xkb/maprules.c |  102 +++---
 xkb/xkb.c  |  101 +++---
 xkb/xkbAccessX.c   |   30 +-
 xkb/xkbActions.c   |   45 ++--
 xkb/xkbEvents.c|8 +-
 xkb/xkbInit.c  |   30 +-
 xkb/xkbLEDs.c  |   50 ++--
 xkb/xkbUtils.c |   20 +-
 xkb/xkbfmisc.c |   48 ++--
 xkb/xkbout.c   |   70 ++--
 xkb/xkbtext.c  |   46 ++--
 xkb/xkmread.c  |   28 +-
 30 files changed, 1284 insertions(+), 579 deletions(-)
 create mode 100644 README
 create mode 100644 xkb/XKM_file_format.txt
___
xorg-devel mailing list
xorg-devel@lists.x.org
http://lists.x.org/mailman/listinfo/xorg-devel


[PULL] misc fixes

2009-12-10 Thread Peter Hutterer
Keith,

Please pull the fixes below into master. Nothing exciting, three clang
fixes, the udev-independent part of Julien's udev patches and a crasher fix.

The following changes since commit df2635d4644d1fa2772ff58d8d34cdf788ece412:
  Michel Dänzer (1):
EXA/mixed: Don't consider devKind for detecting dimension change.

are available in the git repository at:

  git://people.freedesktop.org/~whot/xserver.git master

Julien Cristau (1):
  Move config_init() after CreateWellKnownSockets() and InitCoreDevices()

Peter Hutterer (3):
  xfree86: remove unused variable in configureDDMonitorSection.
  Xi: reset device properties to NULL after deleting them. (#25374)
  xkb: don't assign garbage value to led_return.

Tomas Carnecky (2):
  XkbWriteCountedString(): return early if str is NULL
  Fix possible NULL dereference in XkbFlushLedEvents()

 Xi/xiproperty.c   |2 ++
 dix/main.c|2 +-
 hw/xfree86/common/xf86Configure.c |1 -
 xkb/xkb.c |   12 
 xkb/xkbLEDs.c |   12 +++-
 5 files changed, 18 insertions(+), 11 deletions(-)

___
xorg-devel mailing list
xorg-devel@lists.x.org
http://lists.x.org/mailman/listinfo/xorg-devel


Re: [PULL] misc fixes

2009-12-10 Thread Keith Packard
On Fri, 11 Dec 2009 13:08:24 +1000, Peter Hutterer peter.hutte...@who-t.net 
wrote:

 Please pull the fixes below into master. Nothing exciting, three clang
 fixes, the udev-independent part of Julien's udev patches and a
 crasher fix.

Thanks!

-- 
keith.pack...@intel.com


pgpUmp3GBh8ks.pgp
Description: PGP signature
___
xorg-devel mailing list
xorg-devel@lists.x.org
http://lists.x.org/mailman/listinfo/xorg-devel