From nobody Sun Dec 24 09:56:00 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SybyT2TL3z54NHx; Sun, 24 Dec 2023 09:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SybyT0cf7z3L17; Sun, 24 Dec 2023 09:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703411761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NQPyLXK3IRHAFiNEcK2cT1NX1u76VPoTrCDl9qe9UTo=; b=WeHpPVDvwofLPUa3u7TF0g6D62ociwaRfL58/xXz4BEBZ6TVzIH+WVrKtoAUv2RZ28Nwyf mCxOVbY7RVfE8yz6qjP8sKddsnB/+EFXR4mv/oONeaDbG0NyV9nif3cSS/6YOMqGVTLel7 bSkG0MtXUbzdm3wvumg2xkX6CPUu3BPdzYD7XCdjHHhIS9N4dL82m8PArCFwUq1v3YJqpG LviDhj3IK2V2VrLiLRMkfsubOFCKBN4rPwHODCOFzqgRG4VcQHQqXeZgRVg0qDo77rTzoR Ug5jo+NNJQhbr6zq17SfRnAC8aogKwBOvPkGYsAHtuH+nhkBLjcfIE+SCRty5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703411761; a=rsa-sha256; cv=none; b=UeHFZMh9wfrmMNNX96sXKZVqBdcS8DmCs4PESjm9RtpbgB+zKuvTuNwIOdf+WrgirssX/3 8dqTgRH5donW9GPyUY+9lYiP4V/Gup0v50w9NKv4CWGTdNW6J97HCuRMN1u+Hu8ut+aW+9 MUpELVLtPqToOb0nGkis6JhlV3vszwdLMw2od53//Ro3O7kc1VdfuDv02JmxtPdxUviS7i Mi/ZB6BVgPs+z6/2wAbD9Yt6qYb5iHm6dKhX1pjkWfWxoJ1JBaFZhWtPKf2ReU8+sxsS4+ v19B6UOEhFB+UsddE673pYsNuj8VwHy5/FLrS4K9JbQG8/dKRBSq6vGGrOTG8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703411761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NQPyLXK3IRHAFiNEcK2cT1NX1u76VPoTrCDl9qe9UTo=; b=wMWo60ipcmrsHm84NK3qr7mO2ePMnlDCLUnW0oRZjvk9y1M0BWuui8vhxPYlAOAuftrAKm 0pkcHxuwwDr5GUwKP4WIsFPDS8rMgmm51j1JeYRmKk5S3t2ZzDSzeNUbEFkREl16aICHRc fX7hSoleAxsza2Y5VuTDa5gWmA1SSAZYyfNtM3u7RRcQFrbk3bdYRqZoiRvV1EuucpPpCj z+ygiLFsdfHCXG2HihPi9mwvfsGIHGYU0HHsoF/dJbJ1ZKOkm03w08LddQqQ8/dyu4Te71 S4/BPbCAbvxqKgchsofdk8Gof+LL+dEIJ62brx9JuPoUjURdCw0C9UEJkfpVig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SybyS6g9nz8Ct; Sun, 24 Dec 2023 09:56:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO9u05S038507; Sun, 24 Dec 2023 09:56:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO9u0Dg038504; Sun, 24 Dec 2023 09:56:00 GMT (envelope-from git) Date: Sun, 24 Dec 2023 09:56:00 GMT Message-Id: <202312240956.3BO9u0Dg038504@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Roman Bogorodskiy Subject: git: 08ff7700f244 - main - x11/xidle: fix double triggering on screen unlock List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: novel X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08ff7700f244f5157f03dbb1a67ade35d32ed4c4 Auto-Submitted: auto-generated The branch main has been updated by novel: URL: https://cgit.FreeBSD.org/ports/commit/?id=08ff7700f244f5157f03dbb1a67ade35d32ed4c4 commit 08ff7700f244f5157f03dbb1a67ade35d32ed4c4 Author: Roman Bogorodskiy AuthorDate: 2023-12-24 09:46:21 +0000 Commit: Roman Bogorodskiy CommitDate: 2023-12-24 09:46:21 +0000 x11/xidle: fix double triggering on screen unlock A problem reported that xidle triggers twice: the first one when it reaches idle timeout and locks the screen (which is expected), and the second time immediately when the screen is unlocked (which is undesired). The problem is that, apparently, the XScreenServer extension, which xidle uses, sends ScreenSaverOn on locking and ScreenSaverOff on unlocking. Currently, xidle doesn't filter events by locking state, so it locks the screen again when the ScreenSaverOff event comes in. The fix is to run a screensaver only on the ScreenSaverOn event. PR: 275761 --- x11/xidle/Makefile | 1 + x11/xidle/files/patch-xidle.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/x11/xidle/Makefile b/x11/xidle/Makefile index eb849d523729..120112006b86 100644 --- a/x11/xidle/Makefile +++ b/x11/xidle/Makefile @@ -1,5 +1,6 @@ PORTNAME= xidle PORTVERSION= 26052015 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= LOCAL/novel diff --git a/x11/xidle/files/patch-xidle.c b/x11/xidle/files/patch-xidle.c new file mode 100644 index 000000000000..edfd04993062 --- /dev/null +++ b/x11/xidle/files/patch-xidle.c @@ -0,0 +1,11 @@ +--- xidle.c.orig 2023-12-17 16:06:14 UTC ++++ xidle.c +@@ -426,7 +426,7 @@ main(int argc, char **argv) + * Was for real or due to terminal + * switching or a locking program? + */ +- if (timeout > 0 && se->forced == False) ++ if (timeout > 0 && se->forced == False && se->state == ScreenSaverOn) + action(&x, args); + } + break;