Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xscope for openSUSE:Factory checked in at 2023-06-11 19:54:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xscope (Old) and /work/SRC/openSUSE:Factory/.xscope.new.15902 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xscope" Sun Jun 11 19:54:50 2023 rev:10 rq:1091976 version:1.4.4 Changes: -------- --- /work/SRC/openSUSE:Factory/xscope/xscope.changes 2022-07-11 19:11:23.875782898 +0200 +++ /work/SRC/openSUSE:Factory/.xscope.new.15902/xscope.changes 2023-06-11 19:57:37.984011007 +0200 @@ -1,0 +2,7 @@ +Sat Jun 10 10:57:13 UTC 2023 - Stefan Dirsch <[email protected]> + +- Update to version 1.4.4 + * This release fixes some minor bugs and adds support for decoding + the DAMAGE extension. + +------------------------------------------------------------------- Old: ---- xscope-1.4.3.tar.xz New: ---- xscope-1.4.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xscope.spec ++++++ --- /var/tmp/diff_new_pack.lor8wA/_old 2023-06-11 19:57:38.620014842 +0200 +++ /var/tmp/diff_new_pack.lor8wA/_new 2023-06-11 19:57:38.624014866 +0200 @@ -1,7 +1,7 @@ # # spec file for package xscope # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xscope -Version: 1.4.3 +Version: 1.4.4 Release: 0 Summary: Utility to monitor X11/Client conversations License: MIT ++++++ xscope-1.4.3.tar.xz -> xscope-1.4.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/COPYING new/xscope-1.4.4/COPYING --- old/xscope-1.4.3/COPYING 2022-07-11 01:06:33.000000000 +0200 +++ new/xscope-1.4.4/COPYING 2023-06-03 20:43:26.000000000 +0200 @@ -65,8 +65,7 @@ Copyright © 2000, 2001 Keith Packard, member of The XFree86 Project, Inc. Copyright © 2010 Intel Corporation -Copyright (c) 2002, 2009, 2012, Oracle and/or its affiliates. -All rights reserved. +Copyright (c) 2002, 2023, Oracle and/or its affiliates. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/ChangeLog new/xscope-1.4.4/ChangeLog --- old/xscope-1.4.3/ChangeLog 2022-07-11 01:06:43.000000000 +0200 +++ new/xscope-1.4.4/ChangeLog 2023-06-03 20:43:37.000000000 +0200 @@ -1,3 +1,90 @@ +commit b77d54e21526455b41e406c1cb43c781f4398817 +Author: Alan Coopersmith <[email protected]> +Date: Sat Jun 3 11:40:03 2023 -0700 + + xscope 1.4.4 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 897ba64c8c3b2b9086f61726efc5031b8ec30cf3 +Author: Alan Coopersmith <[email protected]> +Date: Sat Feb 25 09:02:00 2023 -0800 + + Remove "All rights reserved" from Oracle copyright notices + + Oracle no longer includes this term in our copyright & license notices. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 8acbf8a86d4421356dca6d4892e1652043583dfc +Author: Alan Coopersmith <[email protected]> +Date: Tue Feb 7 17:38:30 2023 -0800 + + Add support for DAMAGE extension versions 1.0 & 1.1 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit fe6483c2305ccd2fde0f433a42af2715def33fff +Author: Alan Coopersmith <[email protected]> +Date: Tue Feb 7 17:36:42 2023 -0800 + + PrintField: Don't over-indent when verbose < 3 + + When not printing out the contents of embedded structures, + PrintField was still increasing the indent level, but returning + before returning it to the prior level, leaving the later fields + over-indented. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 67ffde62e837f4b466141366c238ff134cf36edd +Author: Alan Coopersmith <[email protected]> +Date: Tue Feb 7 17:10:59 2023 -0800 + + DataFromClient: Avoid segfault if FlushFD() closed the connection + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 4e297db3cf54a629a2c8f38b068cd4f8434afa4c +Author: Alan Coopersmith <[email protected]> +Date: Wed Jul 13 15:51:58 2022 -0700 + + fd.h: fix build when not building with xtrans + + Always include <X11/Xfuncproto.h> for the definition of _X_NORETURN, + instead of relying on Xtrans.h to include it indirectly for us. + + Fixes: #2 + Fixes: commit cc298d1f559240976344588f9f765ee60ca3d6f3 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 1bc30844ebf6ee3b7b14101f34defbd65ff85134 +Author: Alan Coopersmith <[email protected]> +Date: Wed Jul 13 15:48:24 2022 -0700 + + gitlab CI: build with both --enable-xtrans & --disable-xtrans + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit dff14856677de1e09a72204970bb725a19ebbebd +Author: Alan Coopersmith <[email protected]> +Date: Wed Jul 13 15:46:06 2022 -0700 + + gitlab CI: stop requiring Signed-off-by in commits + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit d0db9898af09e0777bc86ff51adf17ac931aaddc +Author: Alan Coopersmith <[email protected]> +Date: Sun Jul 10 17:31:23 2022 -0700 + + scope.h: remove second include of fd.h + + once is enough + + Signed-off-by: Alan Coopersmith <[email protected]> + commit 228e50fe0578c747029a7af00be18c346100f76c Author: Alan Coopersmith <[email protected]> Date: Sun Jul 10 16:04:26 2022 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/Makefile.am new/xscope-1.4.4/Makefile.am --- old/xscope-1.4.3/Makefile.am 2022-07-11 01:06:33.000000000 +0200 +++ new/xscope-1.4.4/Makefile.am 2023-06-03 20:43:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# Copyright 2008-2009 Sun Microsystems, Inc. All rights reserved. +# Copyright (c) 2008, 2023, Oracle and/or its affiliates. # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -32,8 +32,10 @@ audio.c \ bigreqscope.h \ common.c \ + damagescope.h \ decode11.c \ decode_bigreq.c \ + decode_damage.c \ decode_glx.c \ decode_lbx.c \ decode_randr.c \ @@ -51,6 +53,7 @@ peerinfo.c \ print11.c \ print_bigreq.c \ + print_damage.c \ print_glx.c \ print_lbx.c \ print_randr.c \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/Makefile.in new/xscope-1.4.4/Makefile.in --- old/xscope-1.4.3/Makefile.in 2022-07-11 01:06:37.000000000 +0200 +++ new/xscope-1.4.4/Makefile.in 2023-06-03 20:43:30.000000000 +0200 @@ -15,7 +15,7 @@ @SET_MAKE@ # -# Copyright 2008-2009 Sun Microsystems, Inc. All rights reserved. +# Copyright (c) 2008, 2023, Oracle and/or its affiliates. # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -130,12 +130,13 @@ PROGRAMS = $(bin_PROGRAMS) am_xscope_OBJECTS = audio.$(OBJEXT) common.$(OBJEXT) \ decode11.$(OBJEXT) decode_bigreq.$(OBJEXT) \ - decode_glx.$(OBJEXT) decode_lbx.$(OBJEXT) \ - decode_randr.$(OBJEXT) decode_render.$(OBJEXT) \ - decode_shm.$(OBJEXT) decode_wcp.$(OBJEXT) decodenas.$(OBJEXT) \ - extensions.$(OBJEXT) fd.$(OBJEXT) peerinfo.$(OBJEXT) \ - print11.$(OBJEXT) print_bigreq.$(OBJEXT) print_glx.$(OBJEXT) \ - print_lbx.$(OBJEXT) print_randr.$(OBJEXT) \ + decode_damage.$(OBJEXT) decode_glx.$(OBJEXT) \ + decode_lbx.$(OBJEXT) decode_randr.$(OBJEXT) \ + decode_render.$(OBJEXT) decode_shm.$(OBJEXT) \ + decode_wcp.$(OBJEXT) decodenas.$(OBJEXT) extensions.$(OBJEXT) \ + fd.$(OBJEXT) peerinfo.$(OBJEXT) print11.$(OBJEXT) \ + print_bigreq.$(OBJEXT) print_damage.$(OBJEXT) \ + print_glx.$(OBJEXT) print_lbx.$(OBJEXT) print_randr.$(OBJEXT) \ print_render.$(OBJEXT) print_shm.$(OBJEXT) print_wcp.$(OBJEXT) \ printnas.$(OBJEXT) prtype.$(OBJEXT) scope-transport.$(OBJEXT) \ scope.$(OBJEXT) server.$(OBJEXT) table11.$(OBJEXT) @@ -159,12 +160,13 @@ am__maybe_remake_depfiles = depfiles am__depfiles_remade = ./$(DEPDIR)/audio.Po ./$(DEPDIR)/common.Po \ ./$(DEPDIR)/decode11.Po ./$(DEPDIR)/decode_bigreq.Po \ - ./$(DEPDIR)/decode_glx.Po ./$(DEPDIR)/decode_lbx.Po \ - ./$(DEPDIR)/decode_randr.Po ./$(DEPDIR)/decode_render.Po \ - ./$(DEPDIR)/decode_shm.Po ./$(DEPDIR)/decode_wcp.Po \ - ./$(DEPDIR)/decodenas.Po ./$(DEPDIR)/extensions.Po \ - ./$(DEPDIR)/fd.Po ./$(DEPDIR)/peerinfo.Po \ - ./$(DEPDIR)/print11.Po ./$(DEPDIR)/print_bigreq.Po \ + ./$(DEPDIR)/decode_damage.Po ./$(DEPDIR)/decode_glx.Po \ + ./$(DEPDIR)/decode_lbx.Po ./$(DEPDIR)/decode_randr.Po \ + ./$(DEPDIR)/decode_render.Po ./$(DEPDIR)/decode_shm.Po \ + ./$(DEPDIR)/decode_wcp.Po ./$(DEPDIR)/decodenas.Po \ + ./$(DEPDIR)/extensions.Po ./$(DEPDIR)/fd.Po \ + ./$(DEPDIR)/peerinfo.Po ./$(DEPDIR)/print11.Po \ + ./$(DEPDIR)/print_bigreq.Po ./$(DEPDIR)/print_damage.Po \ ./$(DEPDIR)/print_glx.Po ./$(DEPDIR)/print_lbx.Po \ ./$(DEPDIR)/print_randr.Po ./$(DEPDIR)/print_render.Po \ ./$(DEPDIR)/print_shm.Po ./$(DEPDIR)/print_wcp.Po \ @@ -403,8 +405,10 @@ audio.c \ bigreqscope.h \ common.c \ + damagescope.h \ decode11.c \ decode_bigreq.c \ + decode_damage.c \ decode_glx.c \ decode_lbx.c \ decode_randr.c \ @@ -422,6 +426,7 @@ peerinfo.c \ print11.c \ print_bigreq.c \ + print_damage.c \ print_glx.c \ print_lbx.c \ print_randr.c \ @@ -559,6 +564,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decode11.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decode_bigreq.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decode_damage.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decode_glx.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decode_lbx.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decode_randr.Po@am__quote@ # am--include-marker @@ -571,6 +577,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peerinfo.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print11.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print_bigreq.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print_damage.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print_glx.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print_lbx.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print_randr.Po@am__quote@ # am--include-marker @@ -957,6 +964,7 @@ -rm -f ./$(DEPDIR)/common.Po -rm -f ./$(DEPDIR)/decode11.Po -rm -f ./$(DEPDIR)/decode_bigreq.Po + -rm -f ./$(DEPDIR)/decode_damage.Po -rm -f ./$(DEPDIR)/decode_glx.Po -rm -f ./$(DEPDIR)/decode_lbx.Po -rm -f ./$(DEPDIR)/decode_randr.Po @@ -969,6 +977,7 @@ -rm -f ./$(DEPDIR)/peerinfo.Po -rm -f ./$(DEPDIR)/print11.Po -rm -f ./$(DEPDIR)/print_bigreq.Po + -rm -f ./$(DEPDIR)/print_damage.Po -rm -f ./$(DEPDIR)/print_glx.Po -rm -f ./$(DEPDIR)/print_lbx.Po -rm -f ./$(DEPDIR)/print_randr.Po @@ -1032,6 +1041,7 @@ -rm -f ./$(DEPDIR)/common.Po -rm -f ./$(DEPDIR)/decode11.Po -rm -f ./$(DEPDIR)/decode_bigreq.Po + -rm -f ./$(DEPDIR)/decode_damage.Po -rm -f ./$(DEPDIR)/decode_glx.Po -rm -f ./$(DEPDIR)/decode_lbx.Po -rm -f ./$(DEPDIR)/decode_randr.Po @@ -1044,6 +1054,7 @@ -rm -f ./$(DEPDIR)/peerinfo.Po -rm -f ./$(DEPDIR)/print11.Po -rm -f ./$(DEPDIR)/print_bigreq.Po + -rm -f ./$(DEPDIR)/print_damage.Po -rm -f ./$(DEPDIR)/print_glx.Po -rm -f ./$(DEPDIR)/print_lbx.Po -rm -f ./$(DEPDIR)/print_randr.Po diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/aclocal.m4 new/xscope-1.4.4/aclocal.m4 --- old/xscope-1.4.3/aclocal.m4 2022-07-11 01:06:35.000000000 +0200 +++ new/xscope-1.4.4/aclocal.m4 2023-06-03 20:43:28.000000000 +0200 @@ -1426,7 +1426,7 @@ dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. dnl -dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. +dnl Copyright (c) 2005, 2023, Oracle and/or its affiliates. dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the "Software"), @@ -1463,7 +1463,7 @@ # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.19.3]) +m4_define([vers_have], [1.20.0]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -1793,7 +1793,7 @@ # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-xmlto option, it allows maximum flexibilty in making decisions +# the --with-xmlto option, it allows maximum flexibility in making decisions # as whether or not to use the xmlto package. When DEFAULT is not specified, # --with-xmlto assumes 'auto'. # @@ -2007,7 +2007,7 @@ # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-asciidoc option, it allows maximum flexibilty in making decisions +# the --with-asciidoc option, it allows maximum flexibility in making decisions # as whether or not to use the asciidoc package. When DEFAULT is not specified, # --with-asciidoc assumes 'auto'. # @@ -2077,7 +2077,7 @@ # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-doxygen option, it allows maximum flexibilty in making decisions +# the --with-doxygen option, it allows maximum flexibility in making decisions # as whether or not to use the doxygen package. When DEFAULT is not specified, # --with-doxygen assumes 'auto'. # @@ -2161,7 +2161,7 @@ # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-groff option, it allows maximum flexibilty in making decisions +# the --with-groff option, it allows maximum flexibility in making decisions # as whether or not to use the groff package. When DEFAULT is not specified, # --with-groff assumes 'auto'. # @@ -2269,7 +2269,7 @@ # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-fop option, it allows maximum flexibilty in making decisions +# the --with-fop option, it allows maximum flexibility in making decisions # as whether or not to use the fop package. When DEFAULT is not specified, # --with-fop assumes 'auto'. # @@ -2363,7 +2363,7 @@ # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-ps2pdf option, it allows maximum flexibilty in making decisions +# the --with-ps2pdf option, it allows maximum flexibility in making decisions # as whether or not to use the ps2pdf package. When DEFAULT is not specified, # --with-ps2pdf assumes 'auto'. # @@ -2418,7 +2418,7 @@ # not at the appropriate level. This macro enables a builder to skip all # documentation targets except traditional man pages. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -2451,7 +2451,7 @@ # # This macro enables a builder to skip all developer documentation. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -2484,7 +2484,7 @@ # # This macro enables a builder to skip all functional specification targets. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -2959,7 +2959,11 @@ AC_DEFUN([XORG_COMPILER_BRAND], [ AC_LANG_CASE( [C], [ - AC_REQUIRE([AC_PROG_CC_C99]) + dnl autoconf-2.70 folded AC_PROG_CC_C99 into AC_PROG_CC + dnl and complains that AC_PROG_CC_C99 is obsolete + m4_version_prereq([2.70], + [AC_REQUIRE([AC_PROG_CC])], + [AC_REQUIRE([AC_PROG_CC_C99])]) ], [C++], [ AC_REQUIRE([AC_PROG_CXX]) @@ -2975,7 +2979,7 @@ # Minimum version: 1.16.0 # # Test if the compiler works when passed the given flag as a command line argument. -# If it succeeds, the flag is appeneded to the given variable. If not, it tries the +# If it succeeds, the flag is appended to the given variable. If not, it tries the # next flag in the list until there are no more options. # # Note that this does not guarantee that the compiler supports the flag as some @@ -2991,7 +2995,11 @@ AC_LANG_CASE( [C], [ - AC_REQUIRE([AC_PROG_CC_C99]) + dnl autoconf-2.70 folded AC_PROG_CC_C99 into AC_PROG_CC + dnl and complains that AC_PROG_CC_C99 is obsolete + m4_version_prereq([2.70], + [AC_REQUIRE([AC_PROG_CC])], + [AC_REQUIRE([AC_PROG_CC_C99])]) define([PREFIX], [C]) define([CACHE_PREFIX], [cc]) define([COMPILER], [$CC]) @@ -3132,7 +3140,7 @@ # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) -# Turn some warnings into errors, so we don't accidently get successful builds +# Turn some warnings into errors, so we don't accidentally get successful builds # when there are problems that should be fixed. if test "x$SELECTIVE_WERROR" = "xyes" ; then @@ -3241,23 +3249,35 @@ AC_LANG_CASE([C], AC_SUBST([CWARNFLAGS])) ]) # XORG_STRICT_OPTION +# XORG_DEFAULT_NOCODE_OPTIONS +# --------------------------- +# Minimum version: 1.20.0 +# +# Defines default options for X.Org modules which don't compile code, +# such as fonts, bitmaps, cursors, and docs. +# +AC_DEFUN([XORG_DEFAULT_NOCODE_OPTIONS], [ +AC_REQUIRE([AC_PROG_INSTALL]) +XORG_RELEASE_VERSION +XORG_CHANGELOG +XORG_INSTALL +XORG_MANPAGE_SECTIONS +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], + [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) +]) # XORG_DEFAULT_NOCODE_OPTIONS + # XORG_DEFAULT_OPTIONS # -------------------- # Minimum version: 1.3.0 # -# Defines default options for X.Org modules. +# Defines default options for X.Org modules which compile code. # AC_DEFUN([XORG_DEFAULT_OPTIONS], [ AC_REQUIRE([AC_PROG_INSTALL]) XORG_COMPILER_FLAGS XORG_CWARNFLAGS XORG_STRICT_OPTION -XORG_RELEASE_VERSION -XORG_CHANGELOG -XORG_INSTALL -XORG_MANPAGE_SECTIONS -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], - [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) +XORG_DEFAULT_NOCODE_OPTIONS ]) # XORG_DEFAULT_OPTIONS # XORG_INSTALL() @@ -3344,7 +3364,7 @@ ]) # XORG_CHANGELOG dnl -dnl Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +dnl Copyright (c) 2005, Oracle and/or its affiliates. dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the "Software"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/common.c new/xscope-1.4.4/common.c --- old/xscope-1.4.3/common.c 2022-07-11 01:06:33.000000000 +0200 +++ new/xscope-1.4.4/common.c 2023-06-03 20:43:26.000000000 +0200 @@ -25,7 +25,7 @@ * */ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/config.guess new/xscope-1.4.4/config.guess --- old/xscope-1.4.3/config.guess 2022-07-11 01:06:37.000000000 +0200 +++ new/xscope-1.4.4/config.guess 2023-06-03 20:43:30.000000000 +0200 @@ -1,14 +1,14 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2021 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2021-06-03' +timestamp='2023-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -60,7 +60,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2021 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -437,7 +437,7 @@ # This test works for both compilers. if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then SUN_ARCH=x86_64 @@ -929,6 +929,9 @@ i*:PW*:*) GUESS=$UNAME_MACHINE-pc-pw32 ;; + *:SerenityOS:*:*) + GUESS=$UNAME_MACHINE-pc-serenity + ;; *:Interix*:*) case $UNAME_MACHINE in x86) @@ -963,6 +966,12 @@ GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC ;; + x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-pc-managarm-mlibc" + ;; + *:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" + ;; *:Minix:*:*) GUESS=$UNAME_MACHINE-unknown-minix ;; @@ -1033,7 +1042,7 @@ k1om:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; - loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + loongarch32:Linux:*:* | loongarch64:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; m32r*:Linux:*:*) @@ -1148,16 +1157,27 @@ ;; x86_64:Linux:*:*) set_cc_for_build + CPU=$UNAME_MACHINE LIBCABI=$LIBC if test "$CC_FOR_BUILD" != no_compiler_found; then - if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_X32 >/dev/null - then - LIBCABI=${LIBC}x32 - fi + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __i386__ + ABI=x86 + #else + #ifdef __ILP32__ + ABI=x32 + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + x86) CPU=i686 ;; + x32) LIBCABI=${LIBC}x32 ;; + esac fi - GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI + GUESS=$CPU-pc-linux-$LIBCABI ;; xtensa*:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC @@ -1364,8 +1384,11 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. GUESS=i586-pc-haiku ;; - x86_64:Haiku:*:*) - GUESS=x86_64-unknown-haiku + ppc:Haiku:*:*) # Haiku running on Apple PowerPC + GUESS=powerpc-apple-haiku + ;; + *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) + GUESS=$UNAME_MACHINE-unknown-haiku ;; SX-4:SUPER-UX:*:*) GUESS=sx4-nec-superux$UNAME_RELEASE @@ -1522,6 +1545,9 @@ i*86:rdos:*:*) GUESS=$UNAME_MACHINE-pc-rdos ;; + i*86:Fiwix:*:*) + GUESS=$UNAME_MACHINE-pc-fiwix + ;; *:AROS:*:*) GUESS=$UNAME_MACHINE-unknown-aros ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/config.sub new/xscope-1.4.4/config.sub --- old/xscope-1.4.3/config.sub 2022-07-11 01:06:37.000000000 +0200 +++ new/xscope-1.4.4/config.sub 2023-06-03 20:43:30.000000000 +0200 @@ -1,14 +1,14 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2021 Free Software Foundation, Inc. +# Copyright 1992-2023 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2021-08-14' +timestamp='2023-01-21' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -76,7 +76,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2021 Free Software Foundation, Inc. +Copyright 1992-2023 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -145,7 +145,7 @@ nto-qnx* | linux-* | uclinux-uclibc* \ | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ - | storm-chaos* | os2-emx* | rtmk-nova*) + | storm-chaos* | os2-emx* | rtmk-nova* | managarm-*) basic_machine=$field1 basic_os=$maybe_os ;; @@ -1020,6 +1020,11 @@ ;; # Here we normalize CPU types with a missing or matching vendor + armh-unknown | armh-alt) + cpu=armv7l + vendor=alt + basic_os=${basic_os:-linux-gnueabihf} + ;; dpx20-unknown | dpx20-bull) cpu=rs6000 vendor=bull @@ -1070,7 +1075,7 @@ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) cpu=i586 ;; - pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*) + pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*) cpu=i686 ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) @@ -1121,7 +1126,7 @@ xscale-* | xscalee[bl]-*) cpu=`echo "$cpu" | sed 's/^xscale/arm/'` ;; - arm64-*) + arm64-* | aarch64le-*) cpu=aarch64 ;; @@ -1202,7 +1207,7 @@ | k1om \ | le32 | le64 \ | lm32 \ - | loongarch32 | loongarch64 | loongarchx32 \ + | loongarch32 | loongarch64 \ | m32c | m32r | m32rle \ | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ @@ -1304,7 +1309,7 @@ if test x$basic_os != x then -# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just +# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just # set os. case $basic_os in gnu/linux*) @@ -1336,6 +1341,10 @@ kernel=linux os=`echo "$basic_os" | sed -e 's|linux|gnu|'` ;; + managarm*) + kernel=managarm + os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'` + ;; *) kernel= os=$basic_os @@ -1748,7 +1757,8 @@ | skyos* | haiku* | rdos* | toppers* | drops* | es* \ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ - | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*) + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ + | fiwix* | mlibc* ) ;; # This one is extra strict with allowed versions sco3.2v2 | sco3.2v[4-9]* | sco5v6*) @@ -1756,6 +1766,9 @@ ;; none) ;; + kernel* ) + # Restricted further below + ;; *) echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 exit 1 @@ -1766,16 +1779,26 @@ # (given a valid OS), if there is a kernel. case $kernel-$os in linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ - | linux-musl* | linux-relibc* | linux-uclibc* ) + | linux-musl* | linux-relibc* | linux-uclibc* | linux-mlibc* ) ;; uclinux-uclibc* ) ;; - -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) + managarm-mlibc* | managarm-kernel* ) + ;; + -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* ) # These are just libc implementations, not actual OSes, and thus # require a kernel. echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 exit 1 ;; + -kernel* ) + echo "Invalid configuration \`$1': \`$os' needs explicit kernel." 1>&2 + exit 1 + ;; + *-kernel* ) + echo "Invalid configuration \`$1': \`$kernel' does not support \`$os'." 1>&2 + exit 1 + ;; kfreebsd*-gnu* | kopensolaris*-gnu*) ;; vxworks-simlinux | vxworks-simwindows | vxworks-spe) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/configure new/xscope-1.4.4/configure --- old/xscope-1.4.3/configure 2022-07-11 01:06:36.000000000 +0200 +++ new/xscope-1.4.4/configure 2023-06-03 20:43:29.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for xscope 1.4.3. +# Generated by GNU Autoconf 2.71 for xscope 1.4.4. # # Report bugs to <https://gitlab.freedesktop.org/xorg/app/xscope/issues>. # @@ -612,8 +612,8 @@ # Identity of this package. PACKAGE_NAME='xscope' PACKAGE_TARNAME='xscope' -PACKAGE_VERSION='1.4.3' -PACKAGE_STRING='xscope 1.4.3' +PACKAGE_VERSION='1.4.4' +PACKAGE_STRING='xscope 1.4.4' PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xscope/issues' PACKAGE_URL='' @@ -1354,7 +1354,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xscope 1.4.3 to adapt to many kinds of systems. +\`configure' configures xscope 1.4.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1425,7 +1425,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xscope 1.4.3:";; + short | recursive ) echo "Configuration of xscope 1.4.4:";; esac cat <<\_ACEOF @@ -1544,7 +1544,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xscope configure 1.4.3 +xscope configure 1.4.4 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1931,7 +1931,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xscope $as_me 1.4.3, which was +It was created by xscope $as_me 1.4.4, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3207,7 +3207,7 @@ # Define the identity of the package. PACKAGE='xscope' - VERSION='1.4.3' + VERSION='1.4.4' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -4744,7 +4744,6 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5 printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; } if test ${ac_cv_c_undeclared_builtin_options+y} @@ -7380,7 +7379,7 @@ # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) -# Turn some warnings into errors, so we don't accidently get successful builds +# Turn some warnings into errors, so we don't accidentally get successful builds # when there are problems that should be fixed. if test "x$SELECTIVE_WERROR" = "xyes" ; then @@ -11235,6 +11234,8 @@ + + cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` _ACEOF @@ -11437,6 +11438,7 @@ + # Check whether --enable-xtrans was given. if test ${enable_xtrans+y} then : @@ -12698,7 +12700,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xscope $as_me 1.4.3, which was +This file was extended by xscope $as_me 1.4.4, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12766,7 +12768,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -xscope config.status 1.4.3 +xscope config.status 1.4.4 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/configure.ac new/xscope-1.4.4/configure.ac --- old/xscope-1.4.3/configure.ac 2022-07-11 01:06:33.000000000 +0200 +++ new/xscope-1.4.4/configure.ac 2023-06-03 20:43:26.000000000 +0200 @@ -1,5 +1,5 @@ dnl -dnl Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. +dnl Copyright (c) 2008, Oracle and/or its affiliates. dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the "Software"), @@ -24,7 +24,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xscope], [1.4.3], +AC_INIT([xscope], [1.4.4], [https://gitlab.freedesktop.org/xorg/app/xscope/issues], [xscope]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/damagescope.h new/xscope-1.4.4/damagescope.h --- old/xscope-1.4.3/damagescope.h 1970-01-01 01:00:00.000000000 +0100 +++ new/xscope-1.4.4/damagescope.h 2023-06-03 20:43:26.000000000 +0200 @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2023, Oracle and/or its affiliates. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef _DAMAGESCOPE_H_ +#define _DAMAGESCOPE_H_ + +#define DAMAGEREQUESTHEADER "DAMAGEREQUEST" +#define DAMAGEREPLYHEADER "DAMAGEREPLY" +#define DAMAGEEVENTHEADER "DAMAGEEVENT" + +/* + Aliases for types for Damage to x11.h types - used for types we don't + have specialized printing routines for now, but may want to someday. +*/ +#define DAMAGE CARD32 /* XID */ +#define REGION CARD32 /* XID */ + +/* + To aid in making the choice between level 1 and level 2, we + define the following define, which does not print relatively + unimportant fields. +*/ + +#define printfield(a,b,c,d,e) if (Verbose > 1) PrintField(a,b,c,d,e) + +/* Damage 1.0 */ +extern void DamageQueryVersion(FD fd, const unsigned char *buf); +extern void DamageQueryVersionReply(FD fd, const unsigned char *buf); + +extern void DamageCreate(FD fd, const unsigned char *buf); +extern void DamageDestroy(FD fd, const unsigned char *buf); +extern void DamageSubtract(FD fd, const unsigned char *buf); + +extern void DamageNotifyEvent(const unsigned char *buf); + +extern void DamageBadDamageError(FD fd, const unsigned char *buf); + +/* Damage 1.1 addition */ +extern void DamageAdd(FD fd, const unsigned char *buf); + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/decode11.c new/xscope-1.4.4/decode11.c --- old/xscope-1.4.3/decode11.c 2022-07-11 01:06:33.000000000 +0200 +++ new/xscope-1.4.4/decode11.c 2023-06-03 20:43:26.000000000 +0200 @@ -25,7 +25,7 @@ * */ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/decode_damage.c new/xscope-1.4.4/decode_damage.c --- old/xscope-1.4.3/decode_damage.c 1970-01-01 01:00:00.000000000 +0100 +++ new/xscope-1.4.4/decode_damage.c 2023-06-03 20:43:26.000000000 +0200 @@ -0,0 +1,165 @@ +/* + * Copyright (c) 2023, Oracle and/or its affiliates. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + + +#include <stdio.h> +#include <X11/X.h> +#include <X11/Xproto.h> +#include "scope.h" +#include "x11.h" +#include "damagescope.h" +#include "extensions.h" + +static unsigned char DAMAGERequest, DAMAGEError, DAMAGEEvent; + +#define DAMAGENError 1 /* as of DAMAGE 1.1 */ + +static void +damage_decode_req(FD fd, const unsigned char *buf) +{ + short Major = IByte(&buf[0]); + short Minor = IByte(&buf[1]); + + switch (Minor) { +/* Damage 1.0 requests */ + case 0: + DamageQueryVersion(fd, buf); + ExtendedReplyExpected(fd, Major, Minor); + break; + case 1: + DamageCreate(fd, buf); + break; + case 2: + DamageDestroy(fd, buf); + break; + case 3: + DamageSubtract(fd, buf); + break; +/* Damage 1.1 addition */ + case 4: + DamageAdd(fd, buf); + break; + + default: + ExtendedRequest(fd, buf); + ExtendedReplyExpected(fd, Major, Minor); + break; + } +} + +static void +damage_decode_reply(FD fd, const unsigned char *buf, short RequestMinor) +{ + switch (RequestMinor) { +/* Damage 1.0 replies */ + case 0: + DamageQueryVersionReply(fd, buf); + break; + + default: + UnknownReply(buf); + break; + } +} + +static void +damage_decode_event(FD fd, const unsigned char *buf) +{ + short event = IByte(&buf[0]) - DAMAGEEvent; + + switch (event) { +/* Damage 1.0 events */ + case 0: + DamageNotifyEvent(buf); + break; + + default: + UnknownEvent(buf); + break; + } +} + +static void +damage_decode_error(FD fd, const unsigned char *buf) +{ + short error = IByte(&buf[1]) - DAMAGEError; + + switch (error) { +/* Damage 1.0 error */ + case 0: + DamageBadDamageError(fd, buf); + break; + + default: + UnknownError(buf); + break; + } +} + +void +InitializeDAMAGE(const unsigned char *buf) +{ + TYPE p; + + DAMAGERequest = (unsigned char) (buf[9]); + DAMAGEEvent = (unsigned char) (buf[10]); + DAMAGEError = (unsigned char) (buf[11]); + + DefineEValue(&TD[REQUEST], (unsigned long) DAMAGERequest, "DamageRequest"); + DefineEValue(&TD[REPLY], (unsigned long) DAMAGERequest, "DamageReply"); + DefineEValue(&TD[EVENT], (unsigned long) DAMAGEEvent, "DamageNotify"); + + DefineEValue(&TD[ERROR], (unsigned long) DAMAGEError + 0, "BadDamage"); + + p = DefineType(DAMAGEREQUEST, ENUMERATED, "DAMAGEREQUEST", + (PrintProcType) PrintENUMERATED); + DefineEValue(p, 0L, "DamageQueryVersion"); + DefineEValue(p, 1L, "DamageCreate"); + DefineEValue(p, 2L, "DamageDestroy"); + DefineEValue(p, 3L, "DamageSubtract"); + DefineEValue(p, 4L, "DamageAdd"); + + p = DefineType(DAMAGEREPLY, ENUMERATED, "DAMAGEREPLY", + (PrintProcType) PrintENUMERATED); + DefineEValue(p, 0L, "QueryVersion"); + + p = DefineType(DAMAGEEVENT, ENUMERATED, "DAMAGEEVENT", + (PrintProcType) PrintENUMERATED); + DefineEValue(p, 0L, "DamageNotify"); + + p = DefineType(DAMAGEREPORTLEVEL, ENUMERATED, "DAMAGEREPORTLEVEL", + (PrintProcType) PrintENUMERATED); + DefineEValue(p, 0L, "ReportRawRectangles"); + DefineEValue(p, 1L, "ReportDeltaRectangles"); + DefineEValue(p, 2L, "ReportBoundingBox"); + DefineEValue(p, 3L, "ReportNonEmpty"); + DefineEValue(p, 0x80L, "ReportRawRectangles & DamageNotifyMore"); + DefineEValue(p, 0x81L, "ReportDeltaRectangles & DamageNotifyMore"); + DefineEValue(p, 0x82L, "ReportBoundingBox & DamageNotifyMore"); + DefineEValue(p, 0x83L, "ReportNonEmpty & DamageNotifyMore"); + + InitializeExtensionDecoder(DAMAGERequest, damage_decode_req, + damage_decode_reply); + InitializeExtensionEventDecoder(DAMAGEEvent, damage_decode_event); + InitializeExtensionErrorDecoder(DAMAGEError, damage_decode_error); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/decode_randr.c new/xscope-1.4.4/decode_randr.c --- old/xscope-1.4.3/decode_randr.c 2022-07-11 01:06:33.000000000 +0200 +++ new/xscope-1.4.4/decode_randr.c 2023-06-03 20:43:26.000000000 +0200 @@ -1,6 +1,6 @@ /* * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/decode_render.c new/xscope-1.4.4/decode_render.c --- old/xscope-1.4.3/decode_render.c 2022-07-11 01:06:33.000000000 +0200 +++ new/xscope-1.4.4/decode_render.c 2023-06-03 20:43:26.000000000 +0200 @@ -1,6 +1,6 @@ /* * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/extensions.c new/xscope-1.4.4/extensions.c --- old/xscope-1.4.3/extensions.c 2022-07-11 01:06:33.000000000 +0200 +++ new/xscope-1.4.4/extensions.c 2023-06-03 20:43:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2023, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -37,6 +37,7 @@ static const struct extension_decoders decodable_extensions[] = { {"BIG-REQUESTS", InitializeBIGREQ}, + {"DAMAGE", InitializeDAMAGE}, {"LBX", InitializeLBX}, {"MIT-SHM", InitializeMITSHM}, {"NCD-WinCenterPro", InitializeWCP}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/extensions.h new/xscope-1.4.4/extensions.h --- old/xscope-1.4.3/extensions.h 2022-07-11 01:06:33.000000000 +0200 +++ new/xscope-1.4.4/extensions.h 2023-06-03 20:43:26.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2023, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -47,6 +47,7 @@ /* X11 Extension decoders in decode_*.c */ extern void InitializeBIGREQ(const unsigned char *buf); +extern void InitializeDAMAGE(const unsigned char *buf); extern void InitializeGLX(const unsigned char *buf); extern void InitializeLBX(const unsigned char *buf); extern void InitializeMITSHM(const unsigned char *buf); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/fd.c new/xscope-1.4.4/fd.c --- old/xscope-1.4.3/fd.c 2022-07-11 01:06:33.000000000 +0200 +++ new/xscope-1.4.4/fd.c 2023-06-03 20:43:26.000000000 +0200 @@ -25,7 +25,7 @@ * */ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/fd.h new/xscope-1.4.4/fd.h --- old/xscope-1.4.3/fd.h 2022-07-11 01:06:33.000000000 +0200 +++ new/xscope-1.4.4/fd.h 2023-06-03 20:43:26.000000000 +0200 @@ -25,7 +25,7 @@ * */ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -65,6 +65,7 @@ typedef void *XtransConnInfo; #endif #include <sys/select.h> +#include <X11/Xfuncproto.h> typedef int FD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/man/xscope.man new/xscope-1.4.4/man/xscope.man --- old/xscope-1.4.3/man/xscope.man 2022-07-11 01:06:33.000000000 +0200 +++ new/xscope-1.4.4/man/xscope.man 2023-06-03 20:43:26.000000000 +0200 @@ -26,7 +26,7 @@ of each request, reply, error, or event that is communicated between them. .I Xscope can decode the core X11 protocol and several extensions, including -BIG-REQUESTS, LBX, MIT-SHM, NCD-WinCenterPro, RANDR, and RENDER. +BIG-REQUESTS, DAMAGE, LBX, MIT-SHM, NCD-WinCenterPro, RANDR, and RENDER. This information can be useful in debugging and performance tuning of X11 servers and clients. .PP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/print_damage.c new/xscope-1.4.4/print_damage.c --- old/xscope-1.4.3/print_damage.c 1970-01-01 01:00:00.000000000 +0100 +++ new/xscope-1.4.4/print_damage.c 2023-06-03 20:43:26.000000000 +0200 @@ -0,0 +1,132 @@ +/* + * Copyright (c) 2023, Oracle and/or its affiliates. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include "scope.h" +#include "x11.h" +#include "damagescope.h" + +/* Print the portion of the damage request header common to all requests */ +static inline void +DamageRequestHeader(FD fd, const unsigned char *buf) +{ + PrintField(buf, 0, 1, REQUEST, REQUESTHEADER); /* DamageRequest */ + PrintField(buf, 1, 1, DAMAGEREQUEST, DAMAGEREQUESTHEADER); /* minor op */ + if (Verbose > 1) + PrintField(SBf, 0, 4, CARD32, "sequence number"); +} + +void +DamageQueryVersion(FD fd, const unsigned char *buf) +{ + DamageRequestHeader(fd, buf); + if (Verbose < 1) + return; + + printreqlen(buf, fd, CONST2(2)); + PrintField(buf, 4, 4, CARD32, "major-version"); + PrintField(buf, 8, 4, CARD32, "minor-version"); +} + +void +DamageQueryVersionReply(FD fd, const unsigned char *buf) +{ + PrintField(RBf, 0, 1, REPLY, REPLYHEADER); /* DamageRequest reply */ + PrintField(RBf, 1, 1, DAMAGEREPLY, + DAMAGEREPLYHEADER); /* DamageQueryVersion reply */ + if (Verbose < 1) + return; + printfield(buf, 2, 2, CARD16, "sequence number"); + printfield(buf, 4, 4, DVALUE4(0), "reply length"); + PrintField(buf, 8, 4, CARD32, "major-version"); + PrintField(buf, 12, 4, CARD32, "minor-version"); +} + +void +DamageCreate(FD fd, const unsigned char *buf) +{ + DamageRequestHeader(fd, buf); + if (Verbose < 1) + return; + + printreqlen(buf, fd, CONST2(3)); + PrintField(buf, 4, 4, DRAWABLE, "drawable"); + PrintField(buf, 8, 4, DAMAGE, "damage"); + PrintField(buf, 12, 1, DAMAGEREPORTLEVEL, "level"); +} + +void +DamageDestroy(FD fd, const unsigned char *buf) +{ + DamageRequestHeader(fd, buf); + if (Verbose < 1) + return; + + printreqlen(buf, fd, CONST2(1)); + PrintField(buf, 4, 4, DAMAGE, "damage"); +} + +void +DamageSubtract(FD fd, const unsigned char *buf) +{ + DamageRequestHeader(fd, buf); + if (Verbose < 1) + return; + + printreqlen(buf, fd, CONST2(3)); + PrintField(buf, 4, 4, DAMAGE, "damage"); + PrintField(buf, 8, 4, REGION, "repair"); + PrintField(buf, 12, 4, REGION, "parts"); +} + +void +DamageAdd(FD fd, const unsigned char *buf) +{ + DamageRequestHeader(fd, buf); + if (Verbose < 1) + return; + + printreqlen(buf, fd, CONST2(2)); + PrintField(buf, 4, 4, DRAWABLE, "drawable"); + PrintField(buf, 8, 4, REGION, "region"); +} + +void +DamageNotifyEvent(const unsigned char *buf) +{ + PrintField(buf, 0, 1, EVENT, EVENTHEADER); /* DamageNotify */ + if (Verbose < 1) + return; + PrintField(buf, 1, 1, DAMAGEREPORTLEVEL, "level"); + printfield(buf, 2, 2, CARD16, "sequence number"); + PrintField(buf, 4, 4, DRAWABLE, "drawable"); + PrintField(buf, 8, 4, DAMAGE, "damage"); + PrintField(buf, 12, 4, TIMESTAMP, "timestamp"); + PrintField(buf, 16, 8, RECTANGLE, "area"); + PrintField(buf, 24, 8, RECTANGLE, "geometry"); +} + +void +DamageBadDamageError(FD fd, const unsigned char *buf) +{ + printErrorWithValue(buf, DAMAGE, "bad damage"); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/print_randr.c new/xscope-1.4.4/print_randr.c --- old/xscope-1.4.3/print_randr.c 2022-07-11 01:06:33.000000000 +0200 +++ new/xscope-1.4.4/print_randr.c 2023-06-03 20:43:26.000000000 +0200 @@ -1,6 +1,6 @@ /* * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/print_render.c new/xscope-1.4.4/print_render.c --- old/xscope-1.4.3/print_render.c 2022-07-11 01:06:33.000000000 +0200 +++ new/xscope-1.4.4/print_render.c 2023-06-03 20:43:26.000000000 +0200 @@ -1,6 +1,6 @@ /* * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/prtype.c new/xscope-1.4.4/prtype.c --- old/xscope-1.4.3/prtype.c 2022-07-11 01:06:33.000000000 +0200 +++ new/xscope-1.4.4/prtype.c 2023-06-03 20:43:26.000000000 +0200 @@ -25,7 +25,7 @@ * */ /* - * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2012, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -743,10 +743,10 @@ break; case RECORD: - ModifyIndentLevel(1); fprintf(stdout, "\n"); if (Verbose < 3) return; + ModifyIndentLevel(1); (*TD[FieldType].PrintProc) (&buf[start]); ModifyIndentLevel(-1); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/scope.c new/xscope-1.4.4/scope.c --- old/xscope-1.4.3/scope.c 2022-07-11 01:06:33.000000000 +0200 +++ new/xscope-1.4.4/scope.c 2023-06-03 20:43:26.000000000 +0200 @@ -25,7 +25,7 @@ * */ /* - * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2012, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -1138,6 +1138,9 @@ FDinfo[ServerFD].bufstart = 0; FlushFD(ServerFD); + if (FDinfo[ServerFD].buffer == NULL) /* connection closed in FlushFD */ + return; + /* also report the bytes to standard out */ ReportFromClient(fd, FDinfo[ServerFD].buffer, n); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/scope.h new/xscope-1.4.4/scope.h --- old/xscope-1.4.3/scope.h 2022-07-11 01:06:33.000000000 +0200 +++ new/xscope-1.4.4/scope.h 2023-06-03 20:43:26.000000000 +0200 @@ -25,7 +25,7 @@ * */ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -99,8 +99,6 @@ /* */ /* ********************************************** */ -#include "fd.h" - #define BUFFER_SIZE (1024 * 32) struct fdinfo { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/server.c new/xscope-1.4.4/server.c --- old/xscope-1.4.3/server.c 2022-07-11 01:06:33.000000000 +0200 +++ new/xscope-1.4.4/server.c 2023-06-03 20:43:26.000000000 +0200 @@ -25,7 +25,7 @@ * */ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/table11.c new/xscope-1.4.4/table11.c --- old/xscope-1.4.3/table11.c 2022-07-11 01:06:33.000000000 +0200 +++ new/xscope-1.4.4/table11.c 2023-06-03 20:43:26.000000000 +0200 @@ -25,7 +25,7 @@ * */ /* - * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2012, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xscope-1.4.3/x11.h new/xscope-1.4.4/x11.h --- old/xscope-1.4.3/x11.h 2022-07-11 01:06:33.000000000 +0200 +++ new/xscope-1.4.4/x11.h 2023-06-03 20:43:26.000000000 +0200 @@ -25,7 +25,7 @@ * */ /* - * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2023, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -279,6 +279,12 @@ #define CONNECTION 174 #define SETofPROVIDER_CAPS 175 +#define DAMAGEREQUEST 176 +#define DAMAGEREPLY 177 +#define DAMAGEEVENT 178 +#define DAMAGEERROR 179 +#define DAMAGEREPORTLEVEL 180 + #define MaxTypes 256 /* ************************************************************ */
