Received: by mail.netbsd.org (Postfix, from userid 605) id 7883384E04; Sat, 16 Mar 2019 08:50:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F381B84D2C for ; Sat, 16 Mar 2019 08:50:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id mjUARdCuw1T9 for ; Sat, 16 Mar 2019 08:50:48 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 5210E84C82 for ; Sat, 16 Mar 2019 08:50:48 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4C824FB16; Sat, 16 Mar 2019 08:50:48 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1552726248169570" MIME-Version: 1.0 Date: Sat, 16 Mar 2019 08:50:48 +0000 From: "Benny Siegert" Subject: CVS commit: pkgsrc/x11/xosd To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20190316085048.4C824FB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1552726248169570 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Sat Mar 16 08:50:48 UTC 2019 Modified Files: pkgsrc/x11/xosd: Makefile distinfo Added Files: pkgsrc/x11/xosd/patches: patch-src_libxosd_intern.h patch-src_libxosd_xosd.c Log Message: xosd: place text correctly when using offset monitors. From Aran Clauson in PR pkg/53994. Upstream seems dead. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/xosd/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/xosd/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xosd/patches/patch-src_libxosd_intern.h \ pkgsrc/x11/xosd/patches/patch-src_libxosd_xosd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1552726248169570 Content-Disposition: inline Content-Length: 3990 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/xosd/Makefile diff -u pkgsrc/x11/xosd/Makefile:1.13 pkgsrc/x11/xosd/Makefile:1.14 --- pkgsrc/x11/xosd/Makefile:1.13 Sun Dec 9 21:05:37 2018 +++ pkgsrc/x11/xosd/Makefile Sat Mar 16 08:50:47 2019 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2018/12/09 21:05:37 adam Exp $ +# $NetBSD: Makefile,v 1.14 2019/03/16 08:50:47 bsiegert Exp $ .include "Makefile.common" COMMENT= Library to display shaped text on your X display +PKGREVISION= 1 CONFIGURE_ENV+= XOSD_XMMS_PLUGIN=NO CONFIGURE_ARGS+= --disable-gdk_pixbuftest Index: pkgsrc/x11/xosd/distinfo diff -u pkgsrc/x11/xosd/distinfo:1.14 pkgsrc/x11/xosd/distinfo:1.15 --- pkgsrc/x11/xosd/distinfo:1.14 Wed Nov 4 03:29:10 2015 +++ pkgsrc/x11/xosd/distinfo Sat Mar 16 08:50:47 2019 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2015/11/04 03:29:10 agc Exp $ +$NetBSD: distinfo,v 1.15 2019/03/16 08:50:47 bsiegert Exp $ SHA1 (xosd-2.2.14.tar.gz) = 1d459a62239c9fe842d835bb7f60eb2edd7c979f RMD160 (xosd-2.2.14.tar.gz) = 8a39756c5a46f2897be9bbd47dd86770f42ed648 @@ -7,3 +7,5 @@ Size (xosd-2.2.14.tar.gz) = 418331 bytes SHA1 (patch-aa) = b555bbb0777dcf0d2475496ae8725b1b2c202fb5 SHA1 (patch-ab) = 5502dc0f546a5afe199e746995efd90b0056a34b SHA1 (patch-ac) = 3c42659ff34b26710fd1ad3329a1f203710155f5 +SHA1 (patch-src_libxosd_intern.h) = 56f45d50d5c79913b6972bb1d603432dbf56f869 +SHA1 (patch-src_libxosd_xosd.c) = 5343cc73338eb12ccdb56ce3e907ddf36252db4b Added files: Index: pkgsrc/x11/xosd/patches/patch-src_libxosd_intern.h diff -u /dev/null pkgsrc/x11/xosd/patches/patch-src_libxosd_intern.h:1.1 --- /dev/null Sat Mar 16 08:50:48 2019 +++ pkgsrc/x11/xosd/patches/patch-src_libxosd_intern.h Sat Mar 16 08:50:48 2019 @@ -0,0 +1,14 @@ +$NetBSD: patch-src_libxosd_intern.h,v 1.1 2019/03/16 08:50:48 bsiegert Exp $ + +Support for y-offset monitors, http://gnats.netbsd.org/53994 + +--- src/libxosd/intern.h.orig 2004-11-04 19:50:45.000000000 +0000 ++++ src/libxosd/intern.h +@@ -107,6 +107,7 @@ struct xosd + int screen_width; /* CONST x11 */ + int screen_height; /* CONST x11 */ + int screen_xpos; /* CONST x11 */ ++ int screen_ypos; /* CONST x11 */ + int height; /* CACHE (font) */ + int line_height; /* CACHE (font) */ + xosd_pos pos; /* CONF */ Index: pkgsrc/x11/xosd/patches/patch-src_libxosd_xosd.c diff -u /dev/null pkgsrc/x11/xosd/patches/patch-src_libxosd_xosd.c:1.1 --- /dev/null Sat Mar 16 08:50:48 2019 +++ pkgsrc/x11/xosd/patches/patch-src_libxosd_xosd.c Sat Mar 16 08:50:48 2019 @@ -0,0 +1,38 @@ +$NetBSD: patch-src_libxosd_xosd.c,v 1.1 2019/03/16 08:50:48 bsiegert Exp $ + +Support for y-offset monitors, http://gnats.netbsd.org/53994 + +--- src/libxosd/xosd.c.orig 2004-11-17 19:27:11.000000000 +0000 ++++ src/libxosd/xosd.c +@@ -326,13 +326,13 @@ event_loop(void *osdv) + } + switch (osd->pos) { + case XOSD_bottom: +- y = osd->screen_height - osd->height - osd->voffset; ++ y = osd->screen_height + osd->screen_ypos - osd->height - osd->voffset; + break; + case XOSD_middle: +- y = (osd->screen_height - osd->height) / 2 - osd->voffset; ++ y = (osd->screen_height + osd->screen_ypos - osd->height) / 2 - osd->voffset; + break; + case XOSD_top: +- y = osd->voffset; ++ y = osd->screen_ypos + osd->voffset; + } + XMoveWindow(osd->display, osd->window, x, y); + } +@@ -746,12 +746,14 @@ xosd_create(int number_lines) + osd->screen_width = screeninfo[0].width; + osd->screen_height = screeninfo[0].height; + osd->screen_xpos = screeninfo[0].x_org; ++ osd->screen_ypos = screeninfo[0].y_org; + } else + #endif + { + osd->screen_width = XDisplayWidth(osd->display, osd->screen); + osd->screen_height = XDisplayHeight(osd->display, osd->screen); + osd->screen_xpos = 0; ++ osd->screen_ypos = 0; + } + #ifdef HAVE_XINERAMA + if (screeninfo) --_----------=_1552726248169570--