xserver: Branch 'master' - 2 commits

[Daniel Stone]

 GL/symlink-mesa.sh |   22 +++++++++++-----------
 xkb/xkbUtils.c     |    8 ++++----
 2 files changed, 15 insertions(+), 15 deletions(-)

New commits:
diff-tree d7c89c7c1c8c1e110345d9d8d300adbf5fe5804a (from d6ea96b13e2ea01c51998c41ae2a3677bdedf61c)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Mon Oct 2 02:15:36 2006 +0300

    symlink-mesa.sh: expand *.{c,h}

diff --git a/GL/symlink-mesa.sh b/GL/symlink-mesa.sh
index 88dddfc..c14c683 100755
--- a/GL/symlink-mesa.sh
+++ b/GL/symlink-mesa.sh
@@ -62,7 +62,7 @@ symlink_mesa_glapi() {
     src_dir src/mesa/glapi
     dst_dir mesa/glapi
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }
@@ -71,7 +71,7 @@ symlink_mesa_main() {
     src_dir src/mesa/main
     dst_dir mesa/main
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }
@@ -80,7 +80,7 @@ symlink_mesa_math() {
     src_dir src/mesa/math
     dst_dir mesa/math
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }
@@ -89,7 +89,7 @@ symlink_mesa_ac() {
     src_dir src/mesa/array_cache
     dst_dir mesa/array_cache
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }
@@ -98,7 +98,7 @@ symlink_mesa_swrast() {
     src_dir src/mesa/swrast
     dst_dir mesa/swrast
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }
@@ -107,7 +107,7 @@ symlink_mesa_ss() {
     src_dir src/mesa/swrast_setup
     dst_dir mesa/swrast_setup
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }
@@ -116,7 +116,7 @@ symlink_mesa_tnl() {
     src_dir src/mesa/tnl
     dst_dir mesa/tnl
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }
@@ -125,7 +125,7 @@ symlink_mesa_shader() {
     src_dir src/mesa/shader
     dst_dir mesa/shader
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }
@@ -134,7 +134,7 @@ symlink_mesa_shader_grammar() {
     src_dir src/mesa/shader/grammar
     dst_dir mesa/shader/grammar
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }
@@ -143,7 +143,7 @@ symlink_mesa_shader_slang() {
     src_dir src/mesa/shader/slang
     dst_dir mesa/shader/slang
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }
@@ -152,7 +152,7 @@ symlink_mesa_shader_slang_library() {
     src_dir src/mesa/shader/slang/library
     dst_dir mesa/shader/slang/library
 
-    for src in $REAL_SRC_DIR/*.{c,h}; do
+    for src in $REAL_SRC_DIR/*.c $REAL_SRC_DIR/*.h; do
         action `basename $src`
     done
 }        
diff-tree d6ea96b13e2ea01c51998c41ae2a3677bdedf61c (from 84eb2c0a06de60e88e14bb03fabe661d7cd8f1d3)
Author: Ivan Pascal <pascal at info.tsu.ru>
Date:   Mon Oct 2 02:17:14 2006 +0300

    xkb: fix wrapping when switching between groups
    Use XkbCharToInt as that's what we're doing.

diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index ee0abbe..26ff35e 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -754,12 +754,12 @@ unsigned char	grp;
 
 
     grp= state->locked_group;
-    if (grp>=ctrls->num_groups || grp < 0)
-	state->locked_group= XkbAdjustGroup(grp,ctrls);
+    if (grp>=ctrls->num_groups)
+	state->locked_group= XkbAdjustGroup(XkbCharToInt(grp),ctrls);
 
     grp= state->locked_group+state->base_group+state->latched_group;
-    if (grp>=ctrls->num_groups || grp < 0)
-	 state->group= XkbAdjustGroup(grp,ctrls);
+    if (grp>=ctrls->num_groups)
+	 state->group= XkbAdjustGroup(XkbCharToInt(grp),ctrls);
     else state->group= grp;
     XkbComputeCompatState(xkbi);
     return;