Hello community, here is the log from the commit of package xorgxrdp for openSUSE:Factory checked in at 2020-03-14 09:55:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorgxrdp (Old) and /work/SRC/openSUSE:Factory/.xorgxrdp.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorgxrdp" Sat Mar 14 09:55:12 2020 rev:17 rq:784522 version:0.2.13 Changes: -------- --- /work/SRC/openSUSE:Factory/xorgxrdp/xorgxrdp.changes 2019-12-12 23:17:55.130214798 +0100 +++ /work/SRC/openSUSE:Factory/.xorgxrdp.new.3160/xorgxrdp.changes 2020-03-14 09:55:20.331110069 +0100 @@ -1,0 +2,6 @@ +Thu Mar 12 08:21:13 UTC 2020 - Felix Zhang <[email protected]> + +- Update to version 0.2.13 + + Add support for button 8/9 #157 + +------------------------------------------------------------------- Old: ---- xorgxrdp-0.2.12.tar.gz xorgxrdp-0.2.12.tar.gz.asc New: ---- xorgxrdp-0.2.13.tar.gz xorgxrdp-0.2.13.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorgxrdp.spec ++++++ --- /var/tmp/diff_new_pack.85gFWT/_old 2020-03-14 09:55:20.843110445 +0100 +++ /var/tmp/diff_new_pack.85gFWT/_new 2020-03-14 09:55:20.843110445 +0100 @@ -17,7 +17,7 @@ Name: xorgxrdp -Version: 0.2.12 +Version: 0.2.13 Release: 0 Summary: Xorg drivers for xrdp License: X11 ++++++ xorgxrdp-0.2.12.tar.gz -> xorgxrdp-0.2.13.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.12/README.md new/xorgxrdp-0.2.13/README.md --- old/xorgxrdp-0.2.12/README.md 2019-12-11 03:44:27.000000000 +0100 +++ new/xorgxrdp-0.2.13/README.md 2020-03-11 06:31:54.000000000 +0100 @@ -1,6 +1,6 @@ [](https://travis-ci.org/neutrinolabs/xorgxrdp) -*Current Version:* 0.2.12 +*Current Version:* 0.2.13 # xorgxrdp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.12/configure new/xorgxrdp-0.2.13/configure --- old/xorgxrdp-0.2.12/configure 2019-12-11 03:48:23.000000000 +0100 +++ new/xorgxrdp-0.2.13/configure 2020-03-11 07:51:42.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xorgxrdp 0.2.12. +# Generated by GNU Autoconf 2.69 for xorgxrdp 0.2.13. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='xorgxrdp' PACKAGE_TARNAME='xorgxrdp' -PACKAGE_VERSION='0.2.12' -PACKAGE_STRING='xorgxrdp 0.2.12' +PACKAGE_VERSION='0.2.13' +PACKAGE_STRING='xorgxrdp 0.2.13' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1345,7 +1345,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 xorgxrdp 0.2.12 to adapt to many kinds of systems. +\`configure' configures xorgxrdp 0.2.13 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1415,7 +1415,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorgxrdp 0.2.12:";; + short | recursive ) echo "Configuration of xorgxrdp 0.2.13:";; esac cat <<\_ACEOF @@ -1544,7 +1544,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorgxrdp configure 0.2.12 +xorgxrdp configure 0.2.13 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1822,7 +1822,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xorgxrdp $as_me 0.2.12, which was +It was created by xorgxrdp $as_me 0.2.13, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2696,7 +2696,7 @@ # Define the identity of the package. PACKAGE='xorgxrdp' - VERSION='0.2.12' + VERSION='0.2.13' cat >>confdefs.h <<_ACEOF @@ -12522,12 +12522,12 @@ pkg_cv_XRDP_CFLAGS="$XRDP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrdp >= 0.9.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "xrdp >= 0.9.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrdp >= 0.9.13\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xrdp >= 0.9.13") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_XRDP_CFLAGS=`$PKG_CONFIG --cflags "xrdp >= 0.9.0" 2>/dev/null` + pkg_cv_XRDP_CFLAGS=`$PKG_CONFIG --cflags "xrdp >= 0.9.13" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -12539,12 +12539,12 @@ pkg_cv_XRDP_LIBS="$XRDP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrdp >= 0.9.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "xrdp >= 0.9.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrdp >= 0.9.13\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xrdp >= 0.9.13") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_XRDP_LIBS=`$PKG_CONFIG --libs "xrdp >= 0.9.0" 2>/dev/null` + pkg_cv_XRDP_LIBS=`$PKG_CONFIG --libs "xrdp >= 0.9.13" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -12565,14 +12565,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XRDP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xrdp >= 0.9.0" 2>&1` + XRDP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xrdp >= 0.9.13" 2>&1` else - XRDP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xrdp >= 0.9.0" 2>&1` + XRDP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xrdp >= 0.9.13" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$XRDP_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (xrdp >= 0.9.0) were not met: + as_fn_error $? "Package requirements (xrdp >= 0.9.13) were not met: $XRDP_PKG_ERRORS @@ -12604,6 +12604,7 @@ $as_echo "yes" >&6; } fi + XRDP_CFLAGS=`pkg-config xrdp --cflags` fi # Check whether --enable-strict-locations was given. @@ -12786,7 +12787,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the assembler ($NASM $NAFLAGS) works" >&5 $as_echo_n "checking whether the assembler ($NASM $NAFLAGS) works... " >&6; } cat > conftest.asm <<EOF -%line 12789 "configure" +%line 12790 "configure" section .text global _nasmfunc, nasmfunc _nasmfunc: @@ -13002,7 +13003,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the assembler ($NASM $NAFLAGS) works" >&5 $as_echo_n "checking whether the assembler ($NASM $NAFLAGS) works... " >&6; } cat > conftest.asm <<EOF -%line 13005 "configure" +%line 13006 "configure" section .text global _nasmfunc, nasmfunc _nasmfunc: @@ -13658,7 +13659,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xorgxrdp $as_me 0.2.12, which was +This file was extended by xorgxrdp $as_me 0.2.13, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13724,7 +13725,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xorgxrdp config.status 0.2.12 +xorgxrdp config.status 0.2.13 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.12/configure.ac new/xorgxrdp-0.2.13/configure.ac --- old/xorgxrdp-0.2.12/configure.ac 2019-12-11 03:44:27.000000000 +0100 +++ new/xorgxrdp-0.2.13/configure.ac 2020-03-11 07:49:09.000000000 +0100 @@ -2,7 +2,7 @@ AC_PREREQ(2.65) # package version must be x.y.z -AC_INIT([xorgxrdp], [0.2.12], [[email protected]]) +AC_INIT([xorgxrdp], [0.2.13], [[email protected]]) package_version_major=$(echo ${PACKAGE_VERSION}|cut -d. -f1) package_version_minor=$(echo ${PACKAGE_VERSION}|cut -d. -f2) package_version_patchlevel=$(echo ${PACKAGE_VERSION}|cut -d. -f3) @@ -28,7 +28,8 @@ fi if test "x$XRDP_CFLAGS" = "x"; then - PKG_CHECK_MODULES([XRDP], [xrdp >= 0.9.0]) + PKG_CHECK_MODULES([XRDP], [xrdp >= 0.9.13]) + XRDP_CFLAGS=`pkg-config xrdp --cflags` fi AC_ARG_ENABLE([strict-locations], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.12/module/rdp.h new/xorgxrdp-0.2.13/module/rdp.h --- old/xorgxrdp-0.2.12/module/rdp.h 2019-12-11 03:44:00.000000000 +0100 +++ new/xorgxrdp-0.2.13/module/rdp.h 2020-03-11 07:12:14.000000000 +0100 @@ -34,6 +34,7 @@ #include "rdpPri.h" #include "xrdp_client_info.h" +#include "xrdp_constants.h" #define XRDP_MODULE_NAME "XORGXRDP" #define XRDP_DRIVER_NAME "XRDPDEV" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.12/xrdpmouse/Makefile.am new/xorgxrdp-0.2.13/xrdpmouse/Makefile.am --- old/xorgxrdp-0.2.12/xrdpmouse/Makefile.am 2018-12-11 06:18:41.000000000 +0100 +++ new/xorgxrdp-0.2.13/xrdpmouse/Makefile.am 2020-03-11 07:49:09.000000000 +0100 @@ -1,8 +1,8 @@ EXTRA_DIST = AM_CFLAGS = \ - $(XORG_SERVER_CFLAGS) \ $(XRDP_CFLAGS) \ + $(XORG_SERVER_CFLAGS) \ -DPACKAGE_VERSION_MAJOR=@package_version_major@ \ -DPACKAGE_VERSION_MINOR=@package_version_minor@ \ -DPACKAGE_VERSION_PATCHLEVEL=@package_version_patchlevel@ \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.12/xrdpmouse/Makefile.in new/xorgxrdp-0.2.13/xrdpmouse/Makefile.in --- old/xorgxrdp-0.2.12/xrdpmouse/Makefile.in 2019-12-11 03:48:24.000000000 +0100 +++ new/xorgxrdp-0.2.13/xrdpmouse/Makefile.in 2020-03-11 07:51:43.000000000 +0100 @@ -342,8 +342,8 @@ top_srcdir = @top_srcdir@ EXTRA_DIST = AM_CFLAGS = \ - $(XORG_SERVER_CFLAGS) \ $(XRDP_CFLAGS) \ + $(XORG_SERVER_CFLAGS) \ -DPACKAGE_VERSION_MAJOR=@package_version_major@ \ -DPACKAGE_VERSION_MINOR=@package_version_minor@ \ -DPACKAGE_VERSION_PATCHLEVEL=@package_version_patchlevel@ \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.12/xrdpmouse/rdpMouse.c new/xorgxrdp-0.2.13/xrdpmouse/rdpMouse.c --- old/xorgxrdp-0.2.12/xrdpmouse/rdpMouse.c 2018-12-11 06:18:41.000000000 +0100 +++ new/xorgxrdp-0.2.13/xrdpmouse/rdpMouse.c 2020-03-11 06:31:54.000000000 +0100 @@ -128,7 +128,7 @@ pointer->old_cursor_y = pointer->cursor_y; } - for (i = 0; i < 7; i++) + for (i = 0; i < 9; i++) { if ((pointer->button_mask ^ pointer->old_button_mask) & (1 << i)) { @@ -163,69 +163,85 @@ pointer = &(dev->pointer); switch (msg) { - case 100: + case WM_MOUSEMOVE: /* without the minus 2, strange things happen when dragging past the width or height */ pointer->cursor_x = l_bound_by(param1, 0, dev->width - 2); pointer->cursor_y = l_bound_by(param2, 0, dev->height - 2); PtrAddEvent(pointer); break; - case 101: + case WM_LBUTTONUP: pointer->button_mask = pointer->button_mask & (~1); PtrAddEvent(pointer); break; - case 102: + case WM_LBUTTONDOWN: pointer->button_mask = pointer->button_mask | 1; PtrAddEvent(pointer); break; - case 103: + case WM_RBUTTONUP: pointer->button_mask = pointer->button_mask & (~4); PtrAddEvent(pointer); break; - case 104: + case WM_RBUTTONDOWN: pointer->button_mask = pointer->button_mask | 4; PtrAddEvent(pointer); break; - case 105: + case WM_BUTTON3UP: pointer->button_mask = pointer->button_mask & (~2); PtrAddEvent(pointer); break; - case 106: + case WM_BUTTON3DOWN: pointer->button_mask = pointer->button_mask | 2; PtrAddEvent(pointer); break; - case 107: + case WM_BUTTON4UP: pointer->button_mask = pointer->button_mask & (~8); PtrAddEvent(pointer); break; - case 108: + case WM_BUTTON4DOWN: pointer->button_mask = pointer->button_mask | 8; PtrAddEvent(pointer); break; - case 109: + case WM_BUTTON5UP: pointer->button_mask = pointer->button_mask & (~16); PtrAddEvent(pointer); break; - case 110: + case WM_BUTTON5DOWN: pointer->button_mask = pointer->button_mask | 16; PtrAddEvent(pointer); break; - case 111: + case WM_BUTTON6UP: pointer->button_mask = pointer->button_mask & (~32); PtrAddEvent(pointer); break; - case 112: + case WM_BUTTON6DOWN: pointer->button_mask = pointer->button_mask | 32; PtrAddEvent(pointer); break; - case 113: + case WM_BUTTON7UP: pointer->button_mask = pointer->button_mask & (~64); PtrAddEvent(pointer); break; - case 114: + case WM_BUTTON7DOWN: pointer->button_mask = pointer->button_mask | 64; PtrAddEvent(pointer); break; + case WM_BUTTON8UP: + pointer->button_mask = pointer->button_mask & (~128); + PtrAddEvent(pointer); + break; + case WM_BUTTON8DOWN: + pointer->button_mask = pointer->button_mask | 128; + PtrAddEvent(pointer); + break; + case WM_BUTTON9UP: + pointer->button_mask = pointer->button_mask & (~256); + PtrAddEvent(pointer); + break; + case WM_BUTTON9DOWN: + pointer->button_mask = pointer->button_mask | 256; + PtrAddEvent(pointer); + break; } return 0; }
