[PULL] cleanups and more MAXSCREENS removals

[Jamey Sharp]

On Wed, Jun 02, 2010 at 09:08:25PM -0700, Keith Packard wrote:
> I've applied Aaron's patch separately as he posted that with your
> review, and your 'Delete XineramaScreenRegions cache.' patch is calling
> the pixman region functions directly rather than using the REGION_
> macros. That's a no-no as we aren't using the pixman API directly at
> this point.

That doesn't seem to be true; pixman API is used all over, and the
pixman region API is used in fbpict.c and mipict.c. So I thought I was
justified using it in Xext. But OK, if you pull now you'll get the much
more awkward BoxRec and REGION_INIT version.

> Other than that, your patch sequence looks good to me; if you'll fix
> the calls to the pixman region code and pull Aaron's patch out, I can
> merge the whole thing.

Thanks!

The following changes since commit b13d7a8e09c8e3eb5003420c3c0484431e5a052b:
  Keith Packard (1):
        Merge remote branch 'vignatti/for-keith'

are available in the git repository at:

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

Jamey Sharp (10):
      dmx: Fix XSetExtensionErrorHandler calls to agree on constness.
      mi: Delete unused flicker-free MoveCursor code.
      midispcur: Add comment explaining why pRootPicture must not be freed.
      Move each screen's screensaver data into ScreenRec.
      Move each screen's root-window pointer into ScreenRec.
      Delete panoramiXdataPtr: it's redundant.
      Move each screen's x/y origin into ScreenRec.
      XineramaSetCursorPosition: use screen bounds directly, not POINT_IN_REGION.
      Delete XineramaScreenRegions cache.
      Accumulate graphics exposures incrementally in PanoramiXCopyArea/Plane.

 Xext/panoramiX.c                      |  103 ++++++-------
 Xext/panoramiX.h                      |    7 -
 Xext/panoramiXprocs.c                 |  192 +++++++++++------------
 Xext/panoramiXsrv.h                   |    3 -
 Xext/saver.c                          |   18 +-
 Xext/shm.c                            |   12 +-
 Xext/xvdisp.c                         |   16 +-
 Xi/closedev.c                         |    2 +-
 Xi/exevents.c                         |    6 +-
 Xi/xichangecursor.c                   |    2 +-
 Xi/xiquerypointer.c                   |    9 +-
 composite/compinit.c                  |    2 +-
 composite/compoverlay.c               |    2 +-
 composite/compwindow.c                |    2 +-
 dix/devices.c                         |    6 +-
 dix/dispatch.c                        |   13 +-
 dix/enterleave.c                      |   12 +-
 dix/events.c                          |  179 +++++++++++-----------
 dix/getevents.c                       |    4 +-
 dix/globals.c                         |    4 -
 dix/main.c                            |    5 +-
 dix/window.c                          |  102 ++++++-------
 fb/fb.h                               |    2 +-
 hw/dmx/dmxcursor.c                    |   62 ++++----
 hw/dmx/dmxextension.c                 |   26 ++--
 hw/dmx/doc/dmx.xml                    |   15 +--
 hw/dmx/input/dmxcommon.c              |    9 +-
 hw/dmx/input/dmxconsole.c             |   25 ++--
 hw/dmx/input/dmxinputinit.c           |    6 +-
 hw/dmx/input/dmxinputinit.h           |    4 +-
 hw/kdrive/src/kdrive.c                |    7 +-
 hw/xfree86/common/xf86Cursor.c        |   94 ++++++------
 hw/xfree86/common/xf86Helper.c        |    2 +-
 hw/xfree86/common/xf86RandR.c         |    2 +-
 hw/xfree86/common/xf86xv.c            |    2 +-
 hw/xfree86/dixmods/extmod/xf86vmode.c |    2 +-
 hw/xfree86/dri/dri.c                  |    2 +-
 hw/xfree86/dri2/dri2.c                |    2 +-
 hw/xfree86/modes/xf86RandR12.c        |    6 +-
 hw/xfree86/modes/xf86Rotate.c         |    4 +-
 hw/xfree86/xaa/xaaCpyWin.c            |    2 +-
 hw/xfree86/xaa/xaaOverlay.c           |    2 +-
 hw/xfree86/xaa/xaaOverlayDF.c         |    2 +-
 hw/xquartz/applewm.c                  |    6 +-
 hw/xquartz/darwin.c                   |   24 ++--
 hw/xquartz/darwinEvents.c             |    4 +-
 hw/xquartz/pseudoramiX.c              |    4 +-
 hw/xquartz/quartz.c                   |   14 +-
 hw/xquartz/xpr/xprCursor.c            |    4 +-
 hw/xquartz/xpr/xprFrame.c             |    2 +-
 hw/xquartz/xpr/xprScreen.c            |    4 +-
 hw/xwin/winkeybd.c                    |    2 +-
 hw/xwin/winscrinit.c                  |    6 +-
 hw/xwin/winwin32rootlesswindow.c      |    2 +-
 hw/xwin/winwindow.c                   |    2 +-
 include/globals.h                     |    3 -
 include/scrnintstr.h                  |   14 ++-
 include/windowstr.h                   |   13 +--
 mi/midispcur.c                        |  276 ++-------------------------------
 mi/miexpose.c                         |    6 +-
 mi/mioverlay.c                        |    6 +-
 mi/misprite.c                         |   70 +--------
 mi/misprite.h                         |    7 -
 miext/rootless/rootlessCommon.c       |    4 +-
 miext/rootless/rootlessCommon.h       |    2 +-
 miext/rootless/rootlessScreen.c       |    2 +-
 miext/rootless/rootlessWindow.c       |   26 ++--
 randr/rrscreen.c                      |   10 +-
 randr/rrxinerama.c                    |    2 +-
 record/record.c                       |    9 +-
 render/render.c                       |   46 +++---
 xfixes/cursor.c                       |    2 +-
 xkb/xkbInit.c                         |    3 +-
 73 files changed, 597 insertions(+), 957 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg-devel/attachments/20100603/07bfdb43/attachment.pgp>