[PULL updated] XQuartz pending & formatting cleanup

Jeremy Huddleston jeremyhu at apple.com
Sat Mar 24 01:17:06 PDT 2012


The following changes since commit a7eac500e652f30deffd9dc5e623fab701077738:

  Merge branch 'per-device-sync-counters' into for-keith (2012-03-22 13:13:07 +1000)

are available in the git repository at:


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

for you to fetch changes up to 5324557c7b12dcacddac830bdb65769cb622c6cf:

  XQuartz: Source formatting cleanup (2012-03-24 01:07:06 -0700)

----------------------------------------------------------------
Jeremy Huddleston (8):
      test: Fix 'make dist' for configurations that build the Xorg DDX
      XQuartz: Move our logs into an X11 subdirectory
      XQuartz: Xi: darwinPointer is now Relative
      XQuartz: Use doubles for input valuators
      XQuartz: Add a defaults option to disable the RENDER extension
      os: Pass the FatalError message to OsVendorFatalError
      XQuartz: Detect FatalErrors on startup to prevent tight crash loops
      XQuartz: Source formatting cleanup

 hw/dmx/dmxinit.c                                   |    2 +-
 hw/dmx/dmxlog.c                                    |    3 -
 hw/kdrive/src/kdrive.c                             |    2 +-
 hw/vfb/InitOutput.c                                |    2 +-
 hw/xfree86/common/xf86Init.c                       |    2 +-
 hw/xnest/Init.c                                    |    2 +-
 hw/xquartz/GL/capabilities.c                       |  104 +-
 hw/xquartz/GL/capabilities.h                       |    8 +-
 hw/xquartz/GL/glcontextmodes.c                     |  145 +-
 hw/xquartz/GL/glcontextmodes.h                     |   40 +-
 hw/xquartz/GL/indirect.c                           |  191 +--
 hw/xquartz/GL/visualConfigs.c                      |  102 +-
 hw/xquartz/GL/visualConfigs.h                      |    3 +-
 hw/xquartz/X11Application.h                        |  177 +--
 hw/xquartz/X11Application.m                        |  920 ++++++------
 hw/xquartz/X11Controller.h                         |  122 +-
 hw/xquartz/X11Controller.m                         |  778 +++++-----
 hw/xquartz/applewm.c                               |  196 +--
 hw/xquartz/applewmExt.h                            |  112 +-
 .../Resources/English.lproj/Localizable.strings    |  Bin 4410 -> 5454 bytes
 hw/xquartz/console_redirect.c                      |  166 ++-
 hw/xquartz/console_redirect.h                      |    8 +-
 hw/xquartz/darwin.c                                |  208 +--
 hw/xquartz/darwin.h                                |   32 +-
 hw/xquartz/darwinEvents.c                          |  335 +++--
 hw/xquartz/darwinEvents.h                          |   86 +-
 hw/xquartz/darwinXinput.c                          |   91 +-
 hw/xquartz/darwinfb.h                              |   15 +-
 hw/xquartz/keysym2ucs.c                            | 1556 ++++++++++----------
 hw/xquartz/keysym2ucs.h                            |    8 +-
 hw/xquartz/mach-startup/bundle-main.c              |  254 ++--
 hw/xquartz/mach-startup/launchd_fd.c               |   39 +-
 hw/xquartz/mach-startup/launchd_fd.h               |    7 +-
 hw/xquartz/mach-startup/mach_startup_types.h       |    2 +-
 hw/xquartz/mach-startup/stub.c                     |  102 +-
 hw/xquartz/pbproxy/app-main.m                      |   77 +-
 hw/xquartz/pbproxy/main.m                          |   62 +-
 hw/xquartz/pbproxy/pbproxy.h                       |   97 +-
 hw/xquartz/pbproxy/x-input.m                       |  108 +-
 hw/xquartz/pbproxy/x-selection.h                   |  123 +-
 hw/xquartz/pbproxy/x-selection.m                   |  596 ++++----
 hw/xquartz/pseudoramiX.c                           |  132 +-
 hw/xquartz/pseudoramiX.h                           |    6 +-
 hw/xquartz/quartz.c                                |   75 +-
 hw/xquartz/quartz.h                                |  110 +-
 hw/xquartz/quartzCocoa.m                           |   10 +-
 hw/xquartz/quartzCommon.h                          |   12 +-
 hw/xquartz/quartzKeyboard.c                        |  566 +++----
 hw/xquartz/quartzKeyboard.h                        |   37 +-
 hw/xquartz/quartzRandR.c                           |  174 ++-
 hw/xquartz/quartzRandR.h                           |   24 +-
 hw/xquartz/quartzStartup.c                         |   17 +-
 hw/xquartz/sanitizedCarbon.h                       |   14 +-
 hw/xquartz/sanitizedCocoa.h                        |   14 +-
 hw/xquartz/xpr/appledri.c                          |  128 +-
 hw/xquartz/xpr/appledri.h                          |  157 +-
 hw/xquartz/xpr/appledristr.h                       |  175 ++-
 hw/xquartz/xpr/dri.c                               |  182 +--
 hw/xquartz/xpr/dri.h                               |  127 +-
 hw/xquartz/xpr/driWrap.c                           |  129 +-
 hw/xquartz/xpr/driWrap.h                           |   55 +-
 hw/xquartz/xpr/dristruct.h                         |   75 +-
 hw/xquartz/xpr/x-hash.c                            |  122 +-
 hw/xquartz/xpr/x-hash.h                            |   85 +-
 hw/xquartz/xpr/x-hook.c                            |   77 +-
 hw/xquartz/xpr/x-hook.h                            |   59 +-
 hw/xquartz/xpr/x-list.c                            |  124 +-
 hw/xquartz/xpr/x-list.h                            |   67 +-
 hw/xquartz/xpr/xpr.h                               |   36 +-
 hw/xquartz/xpr/xprAppleWM.c                        |   12 +-
 hw/xquartz/xpr/xprCursor.c                         |   52 +-
 hw/xquartz/xpr/xprEvent.c                          |    8 +-
 hw/xquartz/xpr/xprEvent.h                          |    5 +-
 hw/xquartz/xpr/xprFrame.c                          |  114 +-
 hw/xquartz/xpr/xprScreen.c                         |   91 +-
 hw/xwin/winerror.c                                 |    2 +-
 include/os.h                                       |    2 +-
 os/log.c                                           |   18 +-
 test/Makefile.am                                   |    3 +
 test/ddxstubs.c                                    |    2 +-
 80 files changed, 5312 insertions(+), 4669 deletions(-)



More information about the xorg-devel mailing list