xserver: Branch 'master' - 2 commits
Keith Packard
keithp at kemper.freedesktop.org
Fri Jun 3 10:43:55 PDT 2011
hw/kdrive/ephyr/man/Xephyr.man | 2 ++
xkb/xkbfmisc.c | 41 ++++++++++++++++++++++++++---------------
2 files changed, 28 insertions(+), 15 deletions(-)
New commits:
commit 5115c2c7216fc10acb8a26deb904ad15ef18ce8a
Author: Cyril Brulebois <kibi at debian.org>
Date: Fri Jun 3 18:09:51 2011 +0200
Xephyr: Mention Xserver's options are also accepted.
Originally reported in the Debian BTS:
http://bugs.debian.org/582650
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Signed-off-by: Jari Aalto <jari.aalto at cante.net>
Signed-off-by: Cyril Brulebois <kibi at debian.org>
diff --git a/hw/kdrive/ephyr/man/Xephyr.man b/hw/kdrive/ephyr/man/Xephyr.man
index 8e7bfd5..12c9f58 100644
--- a/hw/kdrive/ephyr/man/Xephyr.man
+++ b/hw/kdrive/ephyr/man/Xephyr.man
@@ -39,6 +39,8 @@ uses the host X server window as "framebuffer" via fast SHM XImages.
It also has support for "visually" debugging what the server is
painting.
.SH OPTIONS
+The server accepts all the standard options of Xserver(__appmansuffix__)
+and the following additional options:
.TP 8
.BI -screen " width" x height
sets the screen size.
commit 408ed1576dbcf93f4bd27bd3b66917b1bba2226b
Author: Cyril Brulebois <kibi at debian.org>
Date: Fri Jun 3 18:09:48 2011 +0200
xkb: Fix case checks for Latin 8.
Spotted by -Wlogical-op:
| CC xkbfmisc.lo
| xkbfmisc.c: In function '_XkbKSCheckCase':
| xkbfmisc.c:104:3: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op]
| xkbfmisc.c:118:3: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op]
A quick look at the keysymdef.h file (from xproto) suggests the
implementor chose to use interval checks to determine the case, but
since lines weren't sorted by codepoints, checks were quite wrong.
Implement _XkbKSUpper/_XkbKSLower checks based on a grep for
CAPITAL/SMALL (respectively) on the Latin 8 part of the said file.
Reviewed-by: Daniel Stone <daniel at fooishbar.org>
Signed-off-by: Cyril Brulebois <kibi at debian.org>
diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
index dea3473..1ac9d82 100644
--- a/xkb/xkbfmisc.c
+++ b/xkb/xkbfmisc.c
@@ -99,23 +99,34 @@ unsigned set,rtrn;
}
break;
case 18: /* latin 8 */
- if ((ks==XK_Babovedot)||
- ((ks>=XK_Dabovedot)&&(ks<=XK_Wacute))||
- ((ks>=XK_Ygrave)&&(ks<=XK_Fabovedot))||
- (ks==XK_Mabovedot)||
- (ks==XK_Pabovedot)||
- (ks==XK_Sabovedot)||
- (ks==XK_Wdiaeresis)||
- ((ks>=XK_Wcircumflex)&&(ks<=XK_Ycircumflex))) {
+ if ((ks==XK_Wcircumflex)||
+ (ks==XK_Ycircumflex)||
+ (ks==XK_Babovedot)||
+ (ks==XK_Dabovedot)||
+ (ks==XK_Fabovedot)||
+ (ks==XK_Mabovedot)||
+ (ks==XK_Pabovedot)||
+ (ks==XK_Sabovedot)||
+ (ks==XK_Tabovedot)||
+ (ks==XK_Wgrave)||
+ (ks==XK_Wacute)||
+ (ks==XK_Wdiaeresis)||
+ (ks==XK_Ygrave)) {
rtrn|= _XkbKSUpper;
}
- if ((ks==XK_babovedot)||
- (ks==XK_dabovedot)||
- (ks==XK_fabovedot)||
- (ks==XK_mabovedot)||
- ((ks>=XK_wgrave)&&(ks<=XK_wacute))||
- (ks==XK_ygrave)||
- ((ks>=XK_wdiaeresis)&&(ks<=XK_ycircumflex))) {
+ if ((ks==XK_wcircumflex)||
+ (ks==XK_ycircumflex)||
+ (ks==XK_babovedot)||
+ (ks==XK_dabovedot)||
+ (ks==XK_fabovedot)||
+ (ks==XK_mabovedot)||
+ (ks==XK_pabovedot)||
+ (ks==XK_sabovedot)||
+ (ks==XK_tabovedot)||
+ (ks==XK_wgrave)||
+ (ks==XK_wacute)||
+ (ks==XK_wdiaeresis)||
+ (ks==XK_ygrave)) {
rtrn|= _XkbKSLower;
}
break;
More information about the xorg-commit
mailing list