diff options
| author |   Graham Gower <graham.gower@gmail.com> | 2010-09-16 19:51:34 +0000 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2010-09-17 13:59:50 -0700 |
| commit | 516803115c6842780b2c48d2bea56c52280bbf99 (patch) | |
| tree | fa4f868dae34088dab1816abb5461534f290dc63 /recipes/xkbd | |
| parent | 007c97cab5f7a4d5ee0a62b061e50b919b912455 (diff) | |
| download | openembedded-516803115c6842780b2c48d2bea56c52280bbf99.tar.gz | |
xkbd_0.8.15.bb: Fix geometry flag to accept negative offsets.
Signed-off-by: Graham Gower <graham.gower@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/xkbd')
| -rw-r--r-- | recipes/xkbd/xkbd-0.8.15/xkbd-0.8.15-fix-geometry.patch | 37 | ||||
| -rw-r--r-- | recipes/xkbd/xkbd_0.8.15.bb | 3 |
2 files changed, 39 insertions, 1 deletions
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 0000000000..65deb8db16 --- /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 309d7d8962..cda2be9120 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" |