Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[xsrc/trunk]: xsrc/external/mit/xorg-server/dist merge xorg-serer 21.1.3.



details:   https://anonhg.NetBSD.org/xsrc/rev/8cb3a979174a
branches:  trunk
changeset: 7099:8cb3a979174a
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jul 15 02:18:56 2022 +0000

description:
merge xorg-serer 21.1.3.

diffstat:

 external/mit/xorg-server/dist/Xext/saver.c                                     |     6 +-
 external/mit/xorg-server/dist/Xext/shm.c                                       |     6 +-
 external/mit/xorg-server/dist/Xext/vidmode.c                                   |     4 +-
 external/mit/xorg-server/dist/Xext/xres.c                                      |    10 +-
 external/mit/xorg-server/dist/Xext/xtest.c                                     |     5 +-
 external/mit/xorg-server/dist/Xi/xipassivegrab.c                               |    29 +-
 external/mit/xorg-server/dist/Xi/xiproperty.c                                  |     6 +-
 external/mit/xorg-server/dist/Xi/xiquerydevice.c                               |    57 +-
 external/mit/xorg-server/dist/Xi/xiselectev.c                                  |    66 +-
 external/mit/xorg-server/dist/configure                                        |  2135 +----
 external/mit/xorg-server/dist/configure.ac                                     |   263 +-
 external/mit/xorg-server/dist/dbe/dbe.c                                        |     4 +-
 external/mit/xorg-server/dist/dbe/dbestruct.h                                  |     2 +-
 external/mit/xorg-server/dist/dix/Xserver-dtrace.h.in                          |    99 -
 external/mit/xorg-server/dist/dix/Xserver.d                                    |    65 -
 external/mit/xorg-server/dist/dix/devices.c                                    |    56 +-
 external/mit/xorg-server/dist/dix/dispatch.c                                   |   148 +-
 external/mit/xorg-server/dist/dix/dixfonts.c                                   |     2 +-
 external/mit/xorg-server/dist/dix/enterleave.c                                 |     6 +-
 external/mit/xorg-server/dist/dix/events.c                                     |   367 +-
 external/mit/xorg-server/dist/dix/getevents.c                                  |   211 +-
 external/mit/xorg-server/dist/dix/globals.c                                    |    14 +-
 external/mit/xorg-server/dist/dix/pixmap.c                                     |    53 +-
 external/mit/xorg-server/dist/dix/region.c                                     |     7 +-
 external/mit/xorg-server/dist/dix/window.c                                     |   102 +-
 external/mit/xorg-server/dist/exa/exa_accel.c                                  |     2 +-
 external/mit/xorg-server/dist/exa/exa_priv.h                                   |     6 +-
 external/mit/xorg-server/dist/exa/exa_unaccel.c                                |     8 +-
 external/mit/xorg-server/dist/fb/fbcmap_mi.c                                   |     2 +-
 external/mit/xorg-server/dist/glx/glxcmds.c                                    |    43 +-
 external/mit/xorg-server/dist/glx/indirect_util.c                              |     2 +-
 external/mit/xorg-server/dist/hw/dmx/Makefile.am                               |    86 -
 external/mit/xorg-server/dist/hw/dmx/Makefile.in                               |  1206 ---
 external/mit/xorg-server/dist/hw/dmx/config/Canvas.c                           |   165 -
 external/mit/xorg-server/dist/hw/dmx/config/Canvas.h                           |    55 -
 external/mit/xorg-server/dist/hw/dmx/config/CanvasP.h                          |    65 -
 external/mit/xorg-server/dist/hw/dmx/config/Makefile.am                        |    68 -
 external/mit/xorg-server/dist/hw/dmx/config/Makefile.in                        |  1230 ---
 external/mit/xorg-server/dist/hw/dmx/config/TODO                               |     7 -
 external/mit/xorg-server/dist/hw/dmx/config/dmxcompat.c                        |   234 -
 external/mit/xorg-server/dist/hw/dmx/config/dmxcompat.h                        |    44 -
 external/mit/xorg-server/dist/hw/dmx/config/dmxconfig.c                        |   561 -
 external/mit/xorg-server/dist/hw/dmx/config/dmxconfig.h                        |    61 -
 external/mit/xorg-server/dist/hw/dmx/config/dmxparse.c                         |   688 -
 external/mit/xorg-server/dist/hw/dmx/config/dmxparse.h                         |   291 -
 external/mit/xorg-server/dist/hw/dmx/config/dmxprint.c                         |   532 -
 external/mit/xorg-server/dist/hw/dmx/config/dmxprint.h                         |    43 -
 external/mit/xorg-server/dist/hw/dmx/config/dmxtodmx.c                         |    51 -
 external/mit/xorg-server/dist/hw/dmx/config/man/Makefile.am                    |     2 -
 external/mit/xorg-server/dist/hw/dmx/config/man/Makefile.in                    |   848 --
 external/mit/xorg-server/dist/hw/dmx/config/man/dmxtodmx.man                   |    41 -
 external/mit/xorg-server/dist/hw/dmx/config/man/vdltodmx.man                   |    95 -
 external/mit/xorg-server/dist/hw/dmx/config/man/xdmxconfig.man                 |    63 -
 external/mit/xorg-server/dist/hw/dmx/config/meson.build                        |    82 -
 external/mit/xorg-server/dist/hw/dmx/config/parser.c                           |  1737 ----
 external/mit/xorg-server/dist/hw/dmx/config/parser.h                           |   122 -
 external/mit/xorg-server/dist/hw/dmx/config/parser.y                           |   227 -
 external/mit/xorg-server/dist/hw/dmx/config/scanner.c                          |  2039 -----
 external/mit/xorg-server/dist/hw/dmx/config/scanner.l                          |   187 -
 external/mit/xorg-server/dist/hw/dmx/config/test-a.in                          |     1 -
 external/mit/xorg-server/dist/hw/dmx/config/test-a.out                         |     2 -
 external/mit/xorg-server/dist/hw/dmx/config/test-b.in                          |     1 -
 external/mit/xorg-server/dist/hw/dmx/config/test-b.out                         |     1 -
 external/mit/xorg-server/dist/hw/dmx/config/test-c.in                          |     1 -
 external/mit/xorg-server/dist/hw/dmx/config/test-c.out                         |     2 -
 external/mit/xorg-server/dist/hw/dmx/config/test-d.in                          |     1 -
 external/mit/xorg-server/dist/hw/dmx/config/test-d.out                         |     2 -
 external/mit/xorg-server/dist/hw/dmx/config/test-e.in                          |     1 -
 external/mit/xorg-server/dist/hw/dmx/config/test-e.out                         |     2 -
 external/mit/xorg-server/dist/hw/dmx/config/test-f.in                          |     2 -
 external/mit/xorg-server/dist/hw/dmx/config/test-f.out                         |   Bin 
 external/mit/xorg-server/dist/hw/dmx/config/test-g.in                          |     4 -
 external/mit/xorg-server/dist/hw/dmx/config/test-g.out                         |     4 -
 external/mit/xorg-server/dist/hw/dmx/config/test-h.in                          |     7 -
 external/mit/xorg-server/dist/hw/dmx/config/test-h.out                         |     7 -
 external/mit/xorg-server/dist/hw/dmx/config/test-i.in                          |     3 -
 external/mit/xorg-server/dist/hw/dmx/config/test-i.out                         |     3 -
 external/mit/xorg-server/dist/hw/dmx/config/test-j.in                          |    13 -
 external/mit/xorg-server/dist/hw/dmx/config/test-j.out                         |    11 -
 external/mit/xorg-server/dist/hw/dmx/config/test-k.in                          |     3 -
 external/mit/xorg-server/dist/hw/dmx/config/test-k.out                         |     3 -
 external/mit/xorg-server/dist/hw/dmx/config/test-l.in                          |    12 -
 external/mit/xorg-server/dist/hw/dmx/config/test-l.out                         |    12 -
 external/mit/xorg-server/dist/hw/dmx/config/vdltodmx.c                         |    59 -
 external/mit/xorg-server/dist/hw/dmx/config/xdmxconfig.c                       |  1232 ---
 external/mit/xorg-server/dist/hw/dmx/dmx-config.h                              |    75 -
 external/mit/xorg-server/dist/hw/dmx/dmx.c                                     |  1200 ---
 external/mit/xorg-server/dist/hw/dmx/dmx.h                                     |   408 -
 external/mit/xorg-server/dist/hw/dmx/dmx_glxvisuals.c                          |   615 -
 external/mit/xorg-server/dist/hw/dmx/dmx_glxvisuals.h                          |    57 -
 external/mit/xorg-server/dist/hw/dmx/dmxcb.c                                   |   229 -
 external/mit/xorg-server/dist/hw/dmx/dmxcb.h                                   |    53 -
 external/mit/xorg-server/dist/hw/dmx/dmxclient.h                               |   128 -
 external/mit/xorg-server/dist/hw/dmx/dmxcmap.c                                 |   222 -
 external/mit/xorg-server/dist/hw/dmx/dmxcmap.h                                 |    65 -
 external/mit/xorg-server/dist/hw/dmx/dmxcursor.c                               |  1023 --
 external/mit/xorg-server/dist/hw/dmx/dmxcursor.h                               |    73 -
 external/mit/xorg-server/dist/hw/dmx/dmxdpms.c                                 |   201 -
 external/mit/xorg-server/dist/hw/dmx/dmxdpms.h                                 |    43 -
 external/mit/xorg-server/dist/hw/dmx/dmxextension.c                            |  1702 ----
 external/mit/xorg-server/dist/hw/dmx/dmxextension.h                            |   115 -
 external/mit/xorg-server/dist/hw/dmx/dmxfont.c                                 |   573 -
 external/mit/xorg-server/dist/hw/dmx/dmxfont.h                                 |    57 -
 external/mit/xorg-server/dist/hw/dmx/dmxgc.c                                   |   446 -
 external/mit/xorg-server/dist/hw/dmx/dmxgc.h                                   |    85 -
 external/mit/xorg-server/dist/hw/dmx/dmxgcops.c                                |   637 -
 external/mit/xorg-server/dist/hw/dmx/dmxgcops.h                                |    95 -
 external/mit/xorg-server/dist/hw/dmx/dmxinit.c                                 |  1059 --
 external/mit/xorg-server/dist/hw/dmx/dmxinit.h                                 |    50 -
 external/mit/xorg-server/dist/hw/dmx/dmxinput.c                                |   130 -
 external/mit/xorg-server/dist/hw/dmx/dmxinput.h                                |   142 -
 external/mit/xorg-server/dist/hw/dmx/dmxlog.c                                  |   446 -
 external/mit/xorg-server/dist/hw/dmx/dmxlog.h                                  |    81 -
 external/mit/xorg-server/dist/hw/dmx/dmxpict.c                                 |  1277 ---
 external/mit/xorg-server/dist/hw/dmx/dmxpict.h                                 |   116 -
 external/mit/xorg-server/dist/hw/dmx/dmxpixmap.c                               |   262 -
 external/mit/xorg-server/dist/hw/dmx/dmxpixmap.h                               |    63 -
 external/mit/xorg-server/dist/hw/dmx/dmxprop.c                                 |   375 -
 external/mit/xorg-server/dist/hw/dmx/dmxprop.h                                 |    45 -
 external/mit/xorg-server/dist/hw/dmx/dmxscrinit.c                              |   485 -
 external/mit/xorg-server/dist/hw/dmx/dmxscrinit.h                              |    48 -
 external/mit/xorg-server/dist/hw/dmx/dmxstat.c                                 |   238 -
 external/mit/xorg-server/dist/hw/dmx/dmxstat.h                                 |    55 -
 external/mit/xorg-server/dist/hw/dmx/dmxsync.c                                 |   207 -
 external/mit/xorg-server/dist/hw/dmx/dmxsync.h                                 |    43 -
 external/mit/xorg-server/dist/hw/dmx/dmxvisual.c                               |   146 -
 external/mit/xorg-server/dist/hw/dmx/dmxvisual.h                               |    47 -
 external/mit/xorg-server/dist/hw/dmx/dmxwindow.c                               |  1044 --
 external/mit/xorg-server/dist/hw/dmx/dmxwindow.h                               |   131 -
 external/mit/xorg-server/dist/hw/dmx/doc/DMXSpec-v1.txt                        |   458 -
 external/mit/xorg-server/dist/hw/dmx/doc/DMXSpec.txt                           |   875 --
 external/mit/xorg-server/dist/hw/dmx/doc/Makefile.am                           |    34 -
 external/mit/xorg-server/dist/hw/dmx/doc/Makefile.in                           |   771 --
 external/mit/xorg-server/dist/hw/dmx/doc/dmx.xml                               |  3412 --------
 external/mit/xorg-server/dist/hw/dmx/doc/scaled.xml                            |   727 -
 external/mit/xorg-server/dist/hw/dmx/doxygen/Makefile.am                       |    36 -
 external/mit/xorg-server/dist/hw/dmx/doxygen/Makefile.in                       |   728 -
 external/mit/xorg-server/dist/hw/dmx/doxygen/doxygen.conf.in                   |  2400 ------
 external/mit/xorg-server/dist/hw/dmx/doxygen/footer.html                       |     4 -
 external/mit/xorg-server/dist/hw/dmx/examples/Makefile.am                      |    70 -
 external/mit/xorg-server/dist/hw/dmx/examples/Makefile.in                      |  1364 ---
 external/mit/xorg-server/dist/hw/dmx/examples/dmxaddinput.c                    |    85 -
 external/mit/xorg-server/dist/hw/dmx/examples/dmxaddscreen.c                   |   106 -
 external/mit/xorg-server/dist/hw/dmx/examples/dmxinfo.c                        |   256 -
 external/mit/xorg-server/dist/hw/dmx/examples/dmxreconfig.c                    |   161 -
 external/mit/xorg-server/dist/hw/dmx/examples/dmxresize.c                      |   103 -
 external/mit/xorg-server/dist/hw/dmx/examples/dmxrminput.c                     |    79 -
 external/mit/xorg-server/dist/hw/dmx/examples/dmxrmscreen.c                    |    81 -
 external/mit/xorg-server/dist/hw/dmx/examples/dmxwininfo.c                     |   477 -
 external/mit/xorg-server/dist/hw/dmx/examples/ev.c                             |   274 -
 external/mit/xorg-server/dist/hw/dmx/examples/evi.c                            |    87 -
 external/mit/xorg-server/dist/hw/dmx/examples/meson.build                      |    53 -
 external/mit/xorg-server/dist/hw/dmx/examples/res.c                            |   101 -
 external/mit/xorg-server/dist/hw/dmx/examples/xbell.c                          |   101 -
 external/mit/xorg-server/dist/hw/dmx/examples/xinput.c                         |   355 -
 external/mit/xorg-server/dist/hw/dmx/examples/xled.c                           |   126 -
 external/mit/xorg-server/dist/hw/dmx/examples/xtest.c                          |    77 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/Makefile.am                      |    42 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/Makefile.in                      |   938 --
 external/mit/xorg-server/dist/hw/dmx/glxProxy/compsize.c                       |   641 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/compsize.h                       |    58 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/g_disptab.c                      |   610 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/g_disptab.h                      |   699 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/g_renderswap.c                   |  2663 ------
 external/mit/xorg-server/dist/hw/dmx/glxProxy/global.c                         |    70 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxcmds.c                        |  3843 ----------
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxcmds.h                        |    43 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxcmdsswap.c                    |  1157 ---
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxcontext.h                     |   109 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxdrawable.h                    |    65 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxerror.h                       |    51 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxext.c                         |   497 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxext.h                         |    70 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxfbconfig.c                    |   106 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxfbconfig.h                    |    39 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxscreens.c                     |   340 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxscreens.h                     |    53 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxserver.h                      |   292 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxsingle.c                      |  1067 --
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxsingle.h                      |    50 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxswap.c                        |   560 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxswap.h                        |    46 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxutil.h                        |    39 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxvendor.c                      |   618 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxvendor.h                      |    53 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxvisuals.c                     |   158 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/glxvisuals.h                     |    46 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/meson.build                      |    27 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/render2swap.c                    |   283 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/renderpixswap.c                  |   403 -
 external/mit/xorg-server/dist/hw/dmx/glxProxy/unpack.h                         |   223 -
 external/mit/xorg-server/dist/hw/dmx/input/ChkNotMaskEv.c                      |   106 -
 external/mit/xorg-server/dist/hw/dmx/input/ChkNotMaskEv.h                      |    40 -
 external/mit/xorg-server/dist/hw/dmx/input/Makefile.am                         |    56 -
 external/mit/xorg-server/dist/hw/dmx/input/Makefile.in                         |   957 --
 external/mit/xorg-server/dist/hw/dmx/input/atKeynames.h                        |   292 -
 external/mit/xorg-server/dist/hw/dmx/input/dmxarg.c                            |   177 -
 external/mit/xorg-server/dist/hw/dmx/input/dmxarg.h                            |    49 -
 external/mit/xorg-server/dist/hw/dmx/input/dmxbackend.c                        |   661 -
 external/mit/xorg-server/dist/hw/dmx/input/dmxbackend.h                        |    56 -
 external/mit/xorg-server/dist/hw/dmx/input/dmxcommon.c                         |   702 -
 external/mit/xorg-server/dist/hw/dmx/input/dmxcommon.h                         |   124 -
 external/mit/xorg-server/dist/hw/dmx/input/dmxconsole.c                        |  1090 --
 external/mit/xorg-server/dist/hw/dmx/input/dmxconsole.h                        |    59 -
 external/mit/xorg-server/dist/hw/dmx/input/dmxdetach.c                         |    60 -
 external/mit/xorg-server/dist/hw/dmx/input/dmxdummy.c                          |    88 -
 external/mit/xorg-server/dist/hw/dmx/input/dmxdummy.h                          |    43 -
 external/mit/xorg-server/dist/hw/dmx/input/dmxevents.c                         |   826 --
 external/mit/xorg-server/dist/hw/dmx/input/dmxevents.h                         |    46 -
 external/mit/xorg-server/dist/hw/dmx/input/dmxinputinit.c                      |  1350 ---
 external/mit/xorg-server/dist/hw/dmx/input/dmxinputinit.h                      |   284 -
 external/mit/xorg-server/dist/hw/dmx/input/dmxmap.c                            |   127 -
 external/mit/xorg-server/dist/hw/dmx/input/dmxmap.h                            |    42 -
 external/mit/xorg-server/dist/hw/dmx/input/dmxmotion.c                         |   148 -
 external/mit/xorg-server/dist/hw/dmx/input/dmxmotion.h                         |    48 -
 external/mit/xorg-server/dist/hw/dmx/input/dmxxinput.c                         |    75 -
 external/mit/xorg-server/dist/hw/dmx/input/meson.build                         |    32 -
 external/mit/xorg-server/dist/hw/dmx/input/usb-common.c                        |   492 -
 external/mit/xorg-server/dist/hw/dmx/input/usb-common.h                        |    54 -
 external/mit/xorg-server/dist/hw/dmx/input/usb-keyboard.c                      |   478 -
 external/mit/xorg-server/dist/hw/dmx/input/usb-keyboard.h                      |    47 -
 external/mit/xorg-server/dist/hw/dmx/input/usb-mouse.c                         |   133 -
 external/mit/xorg-server/dist/hw/dmx/input/usb-mouse.h                         |    47 -
 external/mit/xorg-server/dist/hw/dmx/input/usb-other.c                         |   166 -
 external/mit/xorg-server/dist/hw/dmx/input/usb-other.h                         |    47 -
 external/mit/xorg-server/dist/hw/dmx/input/usb-private.h                       |   117 -
 external/mit/xorg-server/dist/hw/dmx/man/Makefile.am                           |     2 -
 external/mit/xorg-server/dist/hw/dmx/man/Makefile.in                           |   848 --
 external/mit/xorg-server/dist/hw/dmx/man/Xdmx.man                              |   732 -
 external/mit/xorg-server/dist/hw/dmx/meson.build                               |    91 -
 external/mit/xorg-server/dist/hw/kdrive/src/fourcc.h                           |   132 -
 external/mit/xorg-server/dist/hw/xfree86/common/compiler.h                     |     5 +-
 external/mit/xorg-server/dist/hw/xfree86/common/fourcc.h                       |   159 -
 external/mit/xorg-server/dist/hw/xfree86/common/xf86.h                         |    16 +-
 external/mit/xorg-server/dist/hw/xfree86/common/xf86Build.h.in                 |     2 -
 external/mit/xorg-server/dist/hw/xfree86/common/xf86Build.sh                   |    13 -
 external/mit/xorg-server/dist/hw/xfree86/common/xf86Bus.c                      |    95 +-
 external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c                   |    48 +-
 external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c                |     4 +-
 external/mit/xorg-server/dist/hw/xfree86/common/xf86DGA.c                      |    39 +-
 external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.c                   |    46 +-
 external/mit/xorg-server/dist/hw/xfree86/common/xf86pciBus.c                   |     2 +-
 external/mit/xorg-server/dist/hw/xfree86/common/xf86str.h                      |     3 +-
 external/mit/xorg-server/dist/hw/xfree86/dri2/dri2.c                           |    83 +-
 external/mit/xorg-server/dist/hw/xfree86/dri2/dri2ext.c                        |     2 +-
 external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c          |   360 +-
 external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.h          |    65 +-
 external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c |   449 +-
 external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c         |    68 +-
 external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/vblank.c          |    25 +-
 external/mit/xorg-server/dist/hw/xfree86/fbdevhw/fbdevhw.c                     |     8 +-
 external/mit/xorg-server/dist/hw/xfree86/int10/generic.c                       |    14 +-
 external/mit/xorg-server/dist/hw/xfree86/int10/helper_exec.c                   |     6 +-
 external/mit/xorg-server/dist/hw/xfree86/int10/xf86int10.c                     |     2 +-
 external/mit/xorg-server/dist/hw/xfree86/loader/loader.c                       |     3 +-
 external/mit/xorg-server/dist/hw/xfree86/modes/xf86RandR12.c                   |    53 +-
 external/mit/xorg-server/dist/hw/xfree86/modes/xf86cvt.c                       |   295 -
 external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/arm_video.c            |     3 +
 external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_apm.c              |   137 -
 external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c             |     6 +-
 external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c       |   199 -
 external/mit/xorg-server/dist/hw/xfree86/ramdac/BT.c                           |   167 -
 external/mit/xorg-server/dist/hw/xfree86/ramdac/BT.h                           |    37 -
 external/mit/xorg-server/dist/hw/xfree86/ramdac/BTPriv.h                       |    20 -
 external/mit/xorg-server/dist/hw/xfree86/ramdac/IBM.c                          |   645 -
 external/mit/xorg-server/dist/hw/xfree86/ramdac/IBM.h                          |   418 -
 external/mit/xorg-server/dist/hw/xfree86/ramdac/IBMPriv.h                      |    27 -
 external/mit/xorg-server/dist/hw/xfree86/ramdac/TI.c                           |   726 -
 external/mit/xorg-server/dist/hw/xfree86/ramdac/TI.h                           |   106 -
 external/mit/xorg-server/dist/hw/xfree86/ramdac/TIPriv.h                       |    29 -
 external/mit/xorg-server/dist/hw/xfree86/ramdac/xf86RamDac.c                   |   152 -
 external/mit/xorg-server/dist/hw/xfree86/ramdac/xf86RamDac.h                   |    88 -
 external/mit/xorg-server/dist/hw/xfree86/ramdac/xf86RamDacCmap.c               |    70 -
 external/mit/xorg-server/dist/hw/xfree86/ramdac/xf86RamDacPriv.h               |    13 -
 external/mit/xorg-server/dist/hw/xfree86/utils/cvt/Makefile.am                 |    35 -
 external/mit/xorg-server/dist/hw/xfree86/utils/cvt/Makefile.in                 |   972 --
 external/mit/xorg-server/dist/hw/xfree86/utils/cvt/cvt.c                       |   294 -
 external/mit/xorg-server/dist/hw/xfree86/utils/man/cvt.man                     |    41 -
 external/mit/xorg-server/dist/hw/xfree86/vbe/Makefile.am                       |    14 -
 external/mit/xorg-server/dist/hw/xfree86/vbe/Makefile.in                       |   942 --
 external/mit/xorg-server/dist/hw/xfree86/vbe/meson.build                       |    10 -
 external/mit/xorg-server/dist/hw/xfree86/vbe/vbe.c                             |  1096 --
 external/mit/xorg-server/dist/hw/xfree86/vbe/vbe.h                             |   357 -
 external/mit/xorg-server/dist/hw/xfree86/vbe/vbeModes.c                        |   453 -
 external/mit/xorg-server/dist/hw/xfree86/vbe/vbeModes.h                        |    94 -
 external/mit/xorg-server/dist/hw/xfree86/vbe/vbe_module.c                      |    22 -
 external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h                         |     2 +-
 external/mit/xorg-server/dist/hw/xfree86/x86emu/prim_ops.c                     |    14 +-
 external/mit/xorg-server/dist/hw/xwayland/Makefile.am                          |   137 -
 external/mit/xorg-server/dist/hw/xwayland/Makefile.in                          |  1449 ---
 external/mit/xorg-server/dist/hw/xwayland/drm.xml                              |   185 -
 external/mit/xorg-server/dist/hw/xwayland/meson.build                          |   103 -
 external/mit/xorg-server/dist/hw/xwayland/xwayland-cursor.c                    |   314 -
 external/mit/xorg-server/dist/hw/xwayland/xwayland-cvt.c                       |   311 -
 external/mit/xorg-server/dist/hw/xwayland/xwayland-glamor-eglstream.c          |   933 --
 external/mit/xorg-server/dist/hw/xwayland/xwayland-glamor-gbm.c                |  1077 --
 external/mit/xorg-server/dist/hw/xwayland/xwayland-glamor-xv.c                 |   412 -
 external/mit/xorg-server/dist/hw/xwayland/xwayland-glamor.c                    |   266 -
 external/mit/xorg-server/dist/hw/xwayland/xwayland-input.c                     |  2960 -------
 external/mit/xorg-server/dist/hw/xwayland/xwayland-output.c                    |   474 -
 external/mit/xorg-server/dist/hw/xwayland/xwayland-present.c                   |   579 -
 external/mit/xorg-server/dist/hw/xwayland/xwayland-shm.c                       |   306 -
 external/mit/xorg-server/dist/hw/xwayland/xwayland-vidmode.c                   |   420 -
 external/mit/xorg-server/dist/hw/xwayland/xwayland.c                           |  1356 ---
 external/mit/xorg-server/dist/hw/xwayland/xwayland.h                           |   495 -
 external/mit/xorg-server/dist/hw/xwin/winauth.c                                |    29 +-
 external/mit/xorg-server/dist/hw/xwin/winwin32rootless.c                       |   965 --
 external/mit/xorg-server/dist/hw/xwin/winwin32rootlesswindow.c                 |   420 -
 external/mit/xorg-server/dist/hw/xwin/winwin32rootlesswndproc.c                |  1080 --
 external/mit/xorg-server/dist/hw/xwin/winwindowswm.c                           |   596 -
 external/mit/xorg-server/dist/include/dix-config.h.in                          |    12 +-
 external/mit/xorg-server/dist/include/dix.h                                    |   132 +-
 external/mit/xorg-server/dist/include/dixfont.h                                |     1 -
 external/mit/xorg-server/dist/include/os.h                                     |    15 +-
 external/mit/xorg-server/dist/include/site.h                                   |   126 -
 external/mit/xorg-server/dist/include/xwayland-config.h.in                     |    13 -
 external/mit/xorg-server/dist/include/xwayland-config.h.meson.in               |    11 -
 external/mit/xorg-server/dist/mi/miarc.c                                       |     4 +-
 external/mit/xorg-server/dist/mi/miinitext.c                                   |    39 +-
 external/mit/xorg-server/dist/mi/miscrinit.c                                   |    13 +-
 external/mit/xorg-server/dist/os/WaitFor.c                                     |     6 +-
 external/mit/xorg-server/dist/os/access.c                                      |     9 +-
 external/mit/xorg-server/dist/os/auth.c                                        |     4 +-
 external/mit/xorg-server/dist/os/backtrace.c                                   |     4 +-
 external/mit/xorg-server/dist/os/connection.c                                  |    57 +-
 external/mit/xorg-server/dist/os/io.c                                          |     6 +-
 external/mit/xorg-server/dist/os/utils.c                                       |    56 +-
 external/mit/xorg-server/dist/present/present_wnmd.c                           |   721 -
 external/mit/xorg-server/dist/randr/randr.c                                    |   116 +-
 external/mit/xorg-server/dist/randr/randrstr.h                                 |     5 +-
 external/mit/xorg-server/dist/render/render.c                                  |     9 +
 external/mit/xorg-server/dist/test/Makefile.am                                 |     1 +
 external/mit/xorg-server/dist/test/xi1/protocol-xchangedevicecontrol.c         |     3 +
 external/mit/xorg-server/dist/test/xi2/protocol-xigetclientpointer.c           |     3 +
 external/mit/xorg-server/dist/test/xi2/protocol-xiquerypointer.c               |     3 +
 external/mit/xorg-server/dist/test/xi2/protocol-xiwarppointer.c                |     3 +
 external/mit/xorg-server/dist/xfixes/cursor.c                                  |     8 +-
 external/mit/xorg-server/dist/xfixes/xfixes.c                                  |    38 +-
 external/mit/xorg-server/dist/xkb/xkb.c                                        |    68 +-
 339 files changed, 2613 insertions(+), 93675 deletions(-)

diffs (truncated from 102181 to 300 lines):

diff -r 99c1e1350370 -r 8cb3a979174a external/mit/xorg-server/dist/Xext/saver.c
--- a/external/mit/xorg-server/dist/Xext/saver.c        Fri Jul 15 02:12:39 2022 +0000
+++ b/external/mit/xorg-server/dist/Xext/saver.c        Fri Jul 15 02:18:56 2022 +0000
@@ -366,7 +366,7 @@
         }
     }
 
-    /* Reenable the screensaver if this was the last client suspending it. */
+    /* Re-enable the screensaver if this was the last client suspending it. */
     if (screenSaverSuspended && suspendingClients == NULL) {
         screenSaverSuspended = FALSE;
 
@@ -1243,7 +1243,7 @@
     /*
      * Allocate a suspension record for the client, and stop the screensaver
      * if it isn't already suspended by another client. We attach a resource ID
-     * to the record, so the screensaver will be reenabled and the record freed
+     * to the record, so the screensaver will be re-enabled and the record freed
      * if the client disconnects without reenabling it first.
      */
     this = malloc(sizeof(ScreenSaverSuspensionRec));
@@ -1351,8 +1351,8 @@
     REQUEST(xScreenSaverSuspendReq);
 
     swaps(&stuff->length);
+    REQUEST_SIZE_MATCH(xScreenSaverSuspendReq);
     swapl(&stuff->suspend);
-    REQUEST_SIZE_MATCH(xScreenSaverSuspendReq);
     return ProcScreenSaverSuspend(client);
 }
 
diff -r 99c1e1350370 -r 8cb3a979174a external/mit/xorg-server/dist/Xext/shm.c
--- a/external/mit/xorg-server/dist/Xext/shm.c  Fri Jul 15 02:12:39 2022 +0000
+++ b/external/mit/xorg-server/dist/Xext/shm.c  Fri Jul 15 02:18:56 2022 +0000
@@ -303,8 +303,8 @@
 }
 
 /*
- * Simulate the access() system call for a shared memory segement,
- * using the credentials from the client if available
+ * Simulate the access() system call for a shared memory segment,
+ * using the credentials from the client if available.
  */
 static int
 shm_access(ClientPtr client, SHMPERM_TYPE * perm, int readonly)
@@ -1248,7 +1248,7 @@
         int flags = fcntl(fd, F_GETFD);
         if (flags != -1) {
             flags |= FD_CLOEXEC;
-            (void) fcntl(fd, F_SETFD, &flags);
+            (void) fcntl(fd, F_SETFD, flags);
         }
 #endif
         return fd;
diff -r 99c1e1350370 -r 8cb3a979174a external/mit/xorg-server/dist/Xext/vidmode.c
--- a/external/mit/xorg-server/dist/Xext/vidmode.c      Fri Jul 15 02:12:39 2022 +0000
+++ b/external/mit/xorg-server/dist/Xext/vidmode.c      Fri Jul 15 02:18:56 2022 +0000
@@ -277,8 +277,8 @@
 
     /*
      * Older servers sometimes had server privates that the VidMode
-     * extention made available. So to be compatiable pretend that
-     * there are no server privates to pass to the client
+     * extension made available. So to be compatible pretend that
+     * there are no server privates to pass to the client.
      */
     rep.privsize = 0;
 
diff -r 99c1e1350370 -r 8cb3a979174a external/mit/xorg-server/dist/Xext/xres.c
--- a/external/mit/xorg-server/dist/Xext/xres.c Fri Jul 15 02:12:39 2022 +0000
+++ b/external/mit/xorg-server/dist/Xext/xres.c Fri Jul 15 02:18:56 2022 +0000
@@ -72,7 +72,7 @@
     HashTable     visitedResources;
 
     /* Used by AddSubResourceSizeSpec when AddResourceSizeValue is
-       handling crossreferences */
+       handling cross-references */
     HashTable     visitedSubResources;
 
     /* used when ConstructResourceBytesCtx is passed to
@@ -442,7 +442,7 @@
            client id spec
 
     @param sendClient Which client wishes to receive this answer. Used for
-                      byte endianess.
+                      byte endianness.
     @param client     Which client are we considering.
     @param mask       The client id spec mask indicating which information
                       we want about this client.
@@ -609,7 +609,7 @@
     return rc;
 }
 
-/** @brief Swaps xXResResourceIdSpec endianess */
+/** @brief Swaps xXResResourceIdSpec endianness */
 static void
 SwapXResResourceIdSpec(xXResResourceIdSpec *spec)
 {
@@ -617,7 +617,7 @@
     swapl(&spec->type);
 }
 
-/** @brief Swaps xXResResourceSizeSpec endianess */
+/** @brief Swaps xXResResourceSizeSpec endianness */
 static void
 SwapXResResourceSizeSpec(xXResResourceSizeSpec *size)
 {
@@ -627,7 +627,7 @@
     swapl(&size->useCount);
 }
 
-/** @brief Swaps xXResResourceSizeValue endianess */
+/** @brief Swaps xXResResourceSizeValue endianness */
 static void
 SwapXResResourceSizeValue(xXResResourceSizeValue *rep)
 {
diff -r 99c1e1350370 -r 8cb3a979174a external/mit/xorg-server/dist/Xext/xtest.c
--- a/external/mit/xorg-server/dist/Xext/xtest.c        Fri Jul 15 02:12:39 2022 +0000
+++ b/external/mit/xorg-server/dist/Xext/xtest.c        Fri Jul 15 02:18:56 2022 +0000
@@ -57,9 +57,10 @@
 
 #include "extinit.h"
 
-/* XTest events are sent during request processing and may be interruped by
+/* XTest events are sent during request processing and may be interrupted by
  * a SIGIO. We need a separate event list to avoid events overwriting each
- * other's memory */
+ * other's memory.
+ */
 static InternalEvent *xtest_evlist;
 
 /**
diff -r 99c1e1350370 -r 8cb3a979174a external/mit/xorg-server/dist/Xi/xipassivegrab.c
--- a/external/mit/xorg-server/dist/Xi/xipassivegrab.c  Fri Jul 15 02:12:39 2022 +0000
+++ b/external/mit/xorg-server/dist/Xi/xipassivegrab.c  Fri Jul 15 02:18:56 2022 +0000
@@ -114,14 +114,18 @@
         stuff->grab_type != XIGrabtypeKeycode &&
         stuff->grab_type != XIGrabtypeEnter &&
         stuff->grab_type != XIGrabtypeFocusIn &&
-        stuff->grab_type != XIGrabtypeTouchBegin) {
+        stuff->grab_type != XIGrabtypeTouchBegin &&
+        stuff->grab_type != XIGrabtypeGesturePinchBegin &&
+        stuff->grab_type != XIGrabtypeGestureSwipeBegin) {
         client->errorValue = stuff->grab_type;
         return BadValue;
     }
 
     if ((stuff->grab_type == XIGrabtypeEnter ||
          stuff->grab_type == XIGrabtypeFocusIn ||
-         stuff->grab_type == XIGrabtypeTouchBegin) && stuff->detail != 0) {
+         stuff->grab_type == XIGrabtypeTouchBegin ||
+         stuff->grab_type == XIGrabtypeGesturePinchBegin ||
+         stuff->grab_type == XIGrabtypeGestureSwipeBegin) && stuff->detail != 0) {
         client->errorValue = stuff->detail;
         return BadValue;
     }
@@ -217,7 +221,16 @@
             status = GrabWindow(client, dev, stuff->grab_type, &param, &mask);
             break;
         case XIGrabtypeTouchBegin:
-            status = GrabTouch(client, dev, mod_dev, &param, &mask);
+            status = GrabTouchOrGesture(client, dev, mod_dev, XI_TouchBegin,
+                                        &param, &mask);
+            break;
+        case XIGrabtypeGesturePinchBegin:
+            status = GrabTouchOrGesture(client, dev, mod_dev,
+                                        XI_GesturePinchBegin, &param, &mask);
+            break;
+        case XIGrabtypeGestureSwipeBegin:
+            status = GrabTouchOrGesture(client, dev, mod_dev,
+                                        XI_GestureSwipeBegin, &param, &mask);
             break;
         }
 
@@ -307,7 +320,9 @@
         stuff->grab_type != XIGrabtypeKeycode &&
         stuff->grab_type != XIGrabtypeEnter &&
         stuff->grab_type != XIGrabtypeFocusIn &&
-        stuff->grab_type != XIGrabtypeTouchBegin) {
+        stuff->grab_type != XIGrabtypeTouchBegin &&
+        stuff->grab_type != XIGrabtypeGesturePinchBegin &&
+        stuff->grab_type != XIGrabtypeGestureSwipeBegin) {
         client->errorValue = stuff->grab_type;
         return BadValue;
     }
@@ -348,6 +363,12 @@
     case XIGrabtypeTouchBegin:
         tempGrab->type = XI_TouchBegin;
         break;
+    case XIGrabtypeGesturePinchBegin:
+        tempGrab->type = XI_GesturePinchBegin;
+        break;
+    case XIGrabtypeGestureSwipeBegin:
+        tempGrab->type = XI_GestureSwipeBegin;
+        break;
     }
     tempGrab->grabtype = XI2;
     tempGrab->modifierDevice = mod_dev;
diff -r 99c1e1350370 -r 8cb3a979174a external/mit/xorg-server/dist/Xi/xiproperty.c
--- a/external/mit/xorg-server/dist/Xi/xiproperty.c     Fri Jul 15 02:12:39 2022 +0000
+++ b/external/mit/xorg-server/dist/Xi/xiproperty.c     Fri Jul 15 02:18:56 2022 +0000
@@ -414,7 +414,7 @@
  * @param val The property value
  * @param nelem_return The maximum number of elements to return.
  * @param buf_return Pointer to an array of at least @nelem_return values.
- * @return Success or the error code if an error occured.
+ * @return Success or the error code if an error occurred.
  */
 _X_EXPORT int
 XIPropToInt(XIPropertyValuePtr val, int *nelem_return, int **buf_return)
@@ -484,7 +484,7 @@
  * @param val The property value
  * @param nelem_return The maximum number of elements to return.
  * @param buf_return Pointer to an array of at least @nelem_return values.
- * @return Success or the error code if an error occured.
+ * @return Success or the error code if an error occurred.
  */
 _X_EXPORT int
 XIPropToFloat(XIPropertyValuePtr val, int *nelem_return, float **buf_return)
@@ -521,7 +521,7 @@
 /* Registers a new property handler on the given device and returns a unique
  * identifier for this handler. This identifier is required to unregister the
  * property handler again.
- * @return The handler's identifier or 0 if an error occured.
+ * @return The handler's identifier or 0 if an error occurred.
  */
 long
 XIRegisterPropertyHandler(DeviceIntPtr dev,
diff -r 99c1e1350370 -r 8cb3a979174a external/mit/xorg-server/dist/Xi/xiquerydevice.c
--- a/external/mit/xorg-server/dist/Xi/xiquerydevice.c  Fri Jul 15 02:12:39 2022 +0000
+++ b/external/mit/xorg-server/dist/Xi/xiquerydevice.c  Fri Jul 15 02:18:56 2022 +0000
@@ -43,6 +43,9 @@
 #include "xace.h"
 #include "inpututils.h"
 
+#include "exglobals.h"
+#include "privates.h"
+
 #include "xiquerydevice.h"
 
 static Bool ShouldSkipDevice(ClientPtr client, int deviceid, DeviceIntPtr d);
@@ -234,6 +237,9 @@
     if (dev->touch)
         len += sizeof(xXITouchInfo);
 
+    if (dev->gesture)
+        len += sizeof(xXIGestureInfo);
+
     return len;
 }
 
@@ -464,6 +470,46 @@
     swaps(&touch->sourceid);
 }
 
+static Bool ShouldListGestureInfo(ClientPtr client)
+{
+    /* libxcb 14.1 and older are not forwards-compatible with new device classes as it does not
+     * properly ignore unknown device classes. Since breaking libxcb would break quite a lot of
+     * applications, we instead report Gesture device class only if the client advertised support
+     * for XI 2.4. Clients may still not work in cases when a client advertises XI 2.4 support
+     * and then a completely separate module within the client uses broken libxcb to call
+     * XIQueryDevice.
+     */
+    XIClientPtr pXIClient = dixLookupPrivate(&client->devPrivates, XIClientPrivateKey);
+    if (pXIClient->major_version) {
+        return version_compare(pXIClient->major_version, pXIClient->minor_version, 2, 4) >= 0;
+    }
+    return FALSE;
+}
+
+/**
+ * List gesture information
+ *
+ * @return The number of bytes written into info.
+ */
+static int
+ListGestureInfo(DeviceIntPtr dev, xXIGestureInfo * gesture)
+{
+    gesture->type = XIGestureClass;
+    gesture->length = sizeof(xXIGestureInfo) >> 2;
+    gesture->sourceid = dev->gesture->sourceid;
+    gesture->num_touches = dev->gesture->max_touches;
+
+    return gesture->length << 2;
+}
+
+static void
+SwapGestureInfo(DeviceIntPtr dev, xXIGestureInfo * gesture)
+{
+    swaps(&gesture->type);
+    swaps(&gesture->length);
+    swaps(&gesture->sourceid);
+}
+
 int
 GetDeviceUse(DeviceIntPtr dev, uint16_t * attachment)
 {
@@ -567,6 +613,13 @@
         total_len += len;




Home | Main Index | Thread Index | Old Index