From: Graham Gower <graham.gower@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [PATCH] xkbd_0.8.15.bb: Fix geometry flag to accept negative offsets.
Date: Fri, 17 Sep 2010 15:21:34 +0930 [thread overview]
Message-ID: <4C9301E6.8010901@gmail.com> (raw)
Signed-off-by: Graham Gower <graham.gower@gmail.com>
---
.../xkbd-0.8.15/xkbd-0.8.15-fix-geometry.patch | 37 ++++++++++++++++++++
recipes/xkbd/xkbd_0.8.15.bb | 3 +-
2 files changed, 39 insertions(+), 1 deletions(-)
create mode 100644 recipes/xkbd/xkbd-0.8.15/xkbd-0.8.15-fix-geometry.patch
diff --git a/recipes/xkbd/xkbd-0.8.15/xkbd-0.8.15-fix-geometry.patch b/recipes/xkbd/xkbd-0.8.15/xkbd-0.8.15-fix-geometry.patch
new file mode 100644
index 0000000..65deb8d
--- /dev/null
+++ b/recipes/xkbd/xkbd-0.8.15/xkbd-0.8.15-fix-geometry.patch
@@ -0,0 +1,37 @@
+Fix handling of the -geometry option.
+Author: Gautam Iyer, see http://bugs.gentoo.org/214353
+diff -ruN xkbd-0.8.15/src/xkbd.c xkbd-0.8.15-new/src/xkbd.c
+--- xkbd-0.8.15/src/xkbd.c 2003-09-29 10:29:35.000000000 -0700
++++ xkbd-0.8.15-new/src/xkbd.c 2008-03-23 02:43:20.000000000 -0700
+@@ -307,19 +307,20 @@
+ 0, BlackPixel(display, screen_num),
+ WhitePixel(display, screen_num));
+
++ wret = DisplayWidth(display, screen_num);
++ hret = DisplayHeight(display, screen_num)/4;
++ xret = 0;
++ yret = DisplayHeight(display, screen_num) - hret;
++
+ if (geometry != NULL)
+ {
+- XParseGeometry(geometry, &xret, &yret, &wret, &hret );
+- }
+- else
+- {
+- if (wm_type != WM_MATCHBOX)
+- {
+- wret = DisplayWidth(display, screen_num);
+- hret = DisplayHeight(display, screen_num)/4;
+- xret = 0;
+- yret = DisplayHeight(display, screen_num) - hret;
+- }
++ int flags;
++
++ flags = XParseGeometry(geometry, &xret, &yret, &wret, &hret );
++ if( flags & XNegative )
++ xret += DisplayWidth( display, screen_num ) - wret;
++ if( flags & YNegative )
++ yret += DisplayHeight( display, screen_num ) - hret;
+ }
+
+ /* check for user selected keyboard conf file */
diff --git a/recipes/xkbd/xkbd_0.8.15.bb b/recipes/xkbd/xkbd_0.8.15.bb
index 309d7d8..cda2be9 100644
--- a/recipes/xkbd/xkbd_0.8.15.bb
+++ b/recipes/xkbd/xkbd_0.8.15.bb
@@ -4,9 +4,10 @@ SRC_URI = "http://www.angstrom-distribution.org/unstable/sources/xkbd-${PV}-CVS.
file://fix-circumkey.patch \
file://add-default-common-slides.patch \
file://differentiate-desktop-name.patch \
+ file://xkbd-0.8.15-fix-geometry.patch \
file://xkbd.png"
LICENSE = "GPL"
-PR = "r4"
+PR = "r5"
SECTION = "x11"
DEPENDS = "libxpm libxtst libxft"
--
1.7.1
next reply other threads:[~2010-09-17 5:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-17 5:51 Graham Gower [this message]
2010-09-18 15:37 ` [PATCH] xkbd_0.8.15.bb: Fix geometry flag to accept negative offsets Holger Freyther
2010-09-19 1:11 ` Graham Gower
2010-09-19 10:15 ` Holger Freyther
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C9301E6.8010901@gmail.com \
--to=graham.gower@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox