16930ead5Smrgcommit e26102f28f08e5432b1ad44bbaef7f32aff199f6 26930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 36930ead5SmrgDate: Sat Feb 3 14:23:58 2024 -0800 46930ead5Smrg 56930ead5Smrg xkbcomp 1.4.7 66930ead5Smrg 76930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 86930ead5Smrg 96930ead5Smrgcommit ff32f542c94f1b30ba2ba58193adb3774a5c50e6 106930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 116930ead5SmrgDate: Sat Oct 7 11:09:44 2023 -0700 126930ead5Smrg 136930ead5Smrg GenerateListing: close outFile before returning 146930ead5Smrg 156930ead5Smrg Found by Oracle Parfait static analyzer: 166930ead5Smrg 176930ead5Smrg Error: File Leak 186930ead5Smrg File Leak [file-ptr-leak]: 196930ead5Smrg Leaked File outFile 206930ead5Smrg at line 497 of app/xkbcomp/listing.c in function 'GenerateListing'. 216930ead5Smrg outFile initialized at line 432 with fopen 226930ead5Smrg 236930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 246930ead5Smrg 256930ead5Smrgcommit 1f1ea56ca22a85164c4362650b004e202f4007fd 266930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 276930ead5SmrgDate: Mon Feb 6 13:13:21 2023 -0800 286930ead5Smrg 296930ead5Smrg configure: raise minimum autoconf requirement to 2.70 306930ead5Smrg 316930ead5Smrg Needed for builds on NetBSD to work correctly, since it depends on 326930ead5Smrg AC_USE_SYSTEM_EXTENSIONS defining _OPENBSD_SOURCE to expose the 336930ead5Smrg prototype for reallocarray() in the system headers. 346930ead5Smrg 356930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 366930ead5Smrg 376930ead5Smrgcommit 6ce2c46869ced346839eb7e0c3f83170025495c6 386930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 396930ead5SmrgDate: Fri Jan 27 09:02:26 2023 -0800 406930ead5Smrg 416930ead5Smrg xkbcomp.h: include config.h before any other headers 426930ead5Smrg 436930ead5Smrg Ensures flags set by AC_USE_SYSTEM_EXTENSIONS are correctly 446930ead5Smrg propogated when including system headers. 456930ead5Smrg 466930ead5Smrg Closes: #22 xkbcomp from git compile error 476930ead5Smrg Fixes: 81e46ca ("Use asprintf() if the platform supports it") 486930ead5Smrg 496930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 506930ead5Smrg 516930ead5Smrgcommit 772470d0e4fef8e0a3d6eaf4c563fa7b1f6d6d19 526930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 536930ead5SmrgDate: Sun Dec 11 15:32:03 2022 -0800 546930ead5Smrg 556930ead5Smrg Replace calloc(strlen())+strcpy() pairs with strdup() calls 566930ead5Smrg 576930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 586930ead5Smrg 596930ead5Smrgcommit 6db8fd556e2562e9a0a821c0d6fd4f7cdcf6266c 606930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 616930ead5SmrgDate: Sun Dec 11 15:18:26 2022 -0800 626930ead5Smrg 636930ead5Smrg Mark more pointers as const 646930ead5Smrg 656930ead5Smrg Some suggested by cppcheck, others by manual code inspection 666930ead5Smrg 676930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 686930ead5Smrg 696930ead5Smrgcommit 299c9762b1dbe53f3297c54e5526aeae767d1a10 706930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 716930ead5SmrgDate: Sun Dec 11 10:24:13 2022 -0800 726930ead5Smrg 736930ead5Smrg Use unsigned ints when shifting to create bitmasks 746930ead5Smrg 756930ead5Smrg symbols.c:1057:28: portability: Shifting signed 32-bit value by 31 bits 766930ead5Smrg is implementation-defined behaviour. See condition at line 1049. 776930ead5Smrg [shiftTooManyBitsSigned] 786930ead5Smrg radio_groups |= (1 << (tmp.uval - 1)); 796930ead5Smrg ^ 806930ead5Smrg symbols.c:1049:41: note: Assuming that condition 'tmp.uval>32' is not redundant 816930ead5Smrg if ((tmp.uval < 1) || (tmp.uval > XkbMaxRadioGroups)) 826930ead5Smrg ^ 836930ead5Smrg symbols.c:1057:28: note: Shift 846930ead5Smrg radio_groups |= (1 << (tmp.uval - 1)); 856930ead5Smrg ^ 866930ead5Smrg symbols.c:1057:28: warning: Either the condition 'tmp.uval>32' is redundant 876930ead5Smrg or there is signed integer overflow for expression '1<<(tmp.uval-1)'. 886930ead5Smrg [integerOverflowCond] 896930ead5Smrg radio_groups |= (1 << (tmp.uval - 1)); 906930ead5Smrg ^ 916930ead5Smrg symbols.c:1049:41: note: Assuming that condition 'tmp.uval>32' is not redundant 926930ead5Smrg if ((tmp.uval < 1) || (tmp.uval > XkbMaxRadioGroups)) 936930ead5Smrg ^ 946930ead5Smrg symbols.c:1057:28: note: Integer overflow 956930ead5Smrg radio_groups |= (1 << (tmp.uval - 1)); 966930ead5Smrg ^ 976930ead5Smrg 986930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 996930ead5Smrg 1006930ead5Smrgcommit e4cba31313b44e40efcc0c260a33c3ec83e4b772 1016930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 1026930ead5SmrgDate: Sun Dec 11 10:20:05 2022 -0800 1036930ead5Smrg 1046930ead5Smrg Stop building more unused functions 1056930ead5Smrg 1066930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1076930ead5Smrg 1086930ead5Smrgcommit 3e486c4578f3f6a81fc0f9afba6551dfa8c7b63b 1096930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 1106930ead5SmrgDate: Sun Dec 11 10:02:13 2022 -0800 1116930ead5Smrg 1126930ead5Smrg Only build debug infrastructure if DEBUG is defined 1136930ead5Smrg 1146930ead5Smrg It's only used when DEBUG is defined, so don't build it when 1156930ead5Smrg we're not using it. 1166930ead5Smrg 1176930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1186930ead5Smrg 1196930ead5Smrgcommit a3bbf780252e55bb1dcab717289ef09e00d11223 1206930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 1216930ead5SmrgDate: Sun Dec 11 09:55:55 2022 -0800 1226930ead5Smrg 1236930ead5Smrg Remove unused "no indent" (NOI) debug functions 1246930ead5Smrg 1256930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1266930ead5Smrg 1276930ead5Smrgcommit 0493c7216dd39baeb420583be71af095576dbf74 1286930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 1296930ead5SmrgDate: Sun Dec 11 09:50:55 2022 -0800 1306930ead5Smrg 1316930ead5Smrg Mark more functions and variables static 1326930ead5Smrg 1336930ead5Smrg Stop exporting things that aren't used outside the file 1346930ead5Smrg that defines them. 1356930ead5Smrg 1366930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1376930ead5Smrg 1386930ead5Smrgcommit 4119707089b5c14f53bd5ff0b86ee7e575ac9316 1396930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 1406930ead5SmrgDate: Sun Dec 11 09:22:57 2022 -0800 1416930ead5Smrg 1426930ead5Smrg XkbAddDirectoryToPath: don't leak existing paths on realloc() failure 1436930ead5Smrg 1446930ead5Smrg Found by cppcheck: 1456930ead5Smrg 1466930ead5Smrg xkbpath.c:217:9: error: Common realloc mistake: 'includePath' nulled 1476930ead5Smrg but not freed upon failure [memleakOnRealloc] 1486930ead5Smrg includePath = (char **) realloc(includePath, szPath * sizeof(char *)); 1496930ead5Smrg ^ 1506930ead5Smrg 1516930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1526930ead5Smrg 1536930ead5Smrgcommit 0d22aac7bb50ff1f7588f78ec25e9fb62a7b2e5e 1546930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 1556930ead5SmrgDate: Sun Dec 11 09:17:56 2022 -0800 1566930ead5Smrg 1576930ead5Smrg FindKeypadVMod: check xkb is not NULL before dereference, not after 1586930ead5Smrg 1596930ead5Smrg As found by cppcheck: 1606930ead5Smrg 1616930ead5Smrg vmod.c:232:26: warning: Either the condition 'xkb' is redundant or there 1626930ead5Smrg is possible null pointer dereference: xkb. [nullPointerRedundantCheck] 1636930ead5Smrg name = XkbInternAtom(xkb->dpy, "NumLock", False); 1646930ead5Smrg ^ 1656930ead5Smrg vmod.c:233:10: note: Assuming that condition 'xkb' is not redundant 1666930ead5Smrg if ((xkb) && LookupVModIndex((XPointer) xkb, None, name, TypeInt, &rtrn)) 1676930ead5Smrg ^ 1686930ead5Smrg vmod.c:232:26: note: Null pointer dereference 1696930ead5Smrg name = XkbInternAtom(xkb->dpy, "NumLock", False); 1706930ead5Smrg ^ 1716930ead5Smrg 1726930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1736930ead5Smrg 1746930ead5Smrgcommit c7a5d1468c75adb2139d2c2facc73854f13b5ba3 1756930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 1766930ead5SmrgDate: Sun Dec 11 08:57:56 2022 -0800 1776930ead5Smrg 1786930ead5Smrg Remove #ifdef sgi sections 1796930ead5Smrg 1806930ead5Smrg They just included an additional malloc.h header, but SGI Irix 1816930ead5Smrg has been unsupported for a decade now. 1826930ead5Smrg 1836930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1846930ead5Smrg 1856930ead5Smrgcommit e6821a8a7b16e5a8e4c478c9544798fae59a21d1 1866930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 1876930ead5SmrgDate: Sat Dec 10 16:20:58 2022 -0800 1886930ead5Smrg 1896930ead5Smrg Handle -Wstringop-truncation warning in HandleOverlayDef() 1906930ead5Smrg 1916930ead5Smrg In function ‘HandleOverlayDef’, 1926930ead5Smrg inlined from ‘HandleSectionBody’ at geometry.c:2778:18, 1936930ead5Smrg inlined from ‘HandleSectionDef’ at geometry.c:2818:10, 1946930ead5Smrg inlined from ‘HandleGeometryFile’ at geometry.c:2864:18: 1956930ead5Smrg geometry.c:2573:9: warning: ‘strncpy’ output may be truncated copying 1966930ead5Smrg 4 bytes from a string of length 4 [-Wstringop-truncation] 1976930ead5Smrg 2573 | strncpy(key->over, keyDef->over, XkbKeyNameLength); 1986930ead5Smrg | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1996930ead5Smrg geometry.c:2574:9: warning: ‘strncpy’ output may be truncated copying 2006930ead5Smrg 4 bytes from a string of length 4 [-Wstringop-truncation] 2016930ead5Smrg 2574 | strncpy(key->under, keyDef->under, XkbKeyNameLength); 2026930ead5Smrg | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2036930ead5Smrg 2046930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 2056930ead5Smrg 2066930ead5Smrgcommit 81e46cab5f4bdd69fa0a644dba86f6902cece175 2076930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 2086930ead5SmrgDate: Sat Dec 10 16:10:01 2022 -0800 2096930ead5Smrg 2106930ead5Smrg Use asprintf() if the platform supports it 2116930ead5Smrg 2126930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 2136930ead5Smrg 2146930ead5Smrgcommit a1551b78e9ac0e2075ca241c0e8ae361758f26b4 2156930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 2166930ead5SmrgDate: Sat Dec 10 15:39:39 2022 -0800 2176930ead5Smrg 2186930ead5Smrg Replace && with & for bitwise comparison 2196930ead5Smrg 2206930ead5Smrg Clears up gcc warning: 2216930ead5Smrg 2226930ead5Smrg keytypes.c: In function ‘SetPreserve’: 2236930ead5Smrg keytypes.c:757:26: warning: promoted ~unsigned is always non-zero 2246930ead5Smrg [-Wsign-compare] 2256930ead5Smrg || (new.preVMods && (~new.indexVMods))) 2266930ead5Smrg ^~ 2276930ead5Smrg 2286930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 2296930ead5Smrg 2306930ead5Smrgcommit e4e821d5083072e796d6489ddcacf895a43c66f1 2316930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 2326930ead5SmrgDate: Sat Dec 10 15:37:56 2022 -0800 2336930ead5Smrg 2346930ead5Smrg Fix 106 missing-field-initializers warnings in misc.c 2356930ead5Smrg 2366930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 2376930ead5Smrg 2386930ead5Smrgcommit 1fb639c97fc28b8ed66b5553eafbbeed07e4cb09 2396930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 2406930ead5SmrgDate: Sat Dec 10 15:33:17 2022 -0800 2416930ead5Smrg 2426930ead5Smrg Replace malloc()+bzero() pairs with calloc() calls 2436930ead5Smrg 2446930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 2456930ead5Smrg 2466930ead5Smrgcommit 8e58b7949ab96180d60fb13f7820d6cc01c228ae 2476930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 2486930ead5SmrgDate: Sat Dec 10 15:21:49 2022 -0800 2496930ead5Smrg 2506930ead5Smrg Remove unnecessary casts from bzero() calls 2516930ead5Smrg 2526930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 2536930ead5Smrg 2546930ead5Smrgcommit bdbfa354dd4d93657104ccd7c9e892ed45197dd8 2556930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 2566930ead5SmrgDate: Sat Dec 10 15:16:05 2022 -0800 2576930ead5Smrg 2586930ead5Smrg Remove unnecessary casts from memcpy() calls 2596930ead5Smrg 2606930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 2616930ead5Smrg 2626930ead5Smrgcommit f1757a005f471044da3f8e946a091b067996d270 2636930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 2646930ead5SmrgDate: Sat Dec 10 14:30:21 2022 -0800 2656930ead5Smrg 2666930ead5Smrg Replace Opaque with direct usage of void * 2676930ead5Smrg 2686930ead5Smrg Only one use was left after deleting the *alloc/free() wrappers 2696930ead5Smrg 2706930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 2716930ead5Smrg 2726930ead5Smrgcommit 5655379ce89ab55f25a536972aaa310480de9432 2736930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 2746930ead5SmrgDate: Sat Dec 10 14:23:11 2022 -0800 2756930ead5Smrg 2766930ead5Smrg Remove unnecessary checks for NULL pointers before calling free() 2776930ead5Smrg 2786930ead5Smrg Not needed in C89 and later 2796930ead5Smrg 2806930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 2816930ead5Smrg 2826930ead5Smrgcommit 2ac6a7f029d8855fbb4e8024aab0511727ac3a67 2836930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 2846930ead5SmrgDate: Sat Dec 10 14:10:32 2022 -0800 2856930ead5Smrg 2866930ead5Smrg Replace uFree() with direct free() calls 2876930ead5Smrg 2886930ead5Smrg All these wrappers did was mess with types and add a test for 2896930ead5Smrg NULL pointers that isn't needed in C89 and later. 2906930ead5Smrg 2916930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 2926930ead5Smrg 2936930ead5Smrgcommit 8d85bd1e2f9473958b235caf7af9913b518f73dd 2946930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 2956930ead5SmrgDate: Sat Dec 10 14:07:18 2022 -0800 2966930ead5Smrg 2976930ead5Smrg Replace uTypedRecalloc() with direct recallocarray() calls 2986930ead5Smrg 2996930ead5Smrg Retains uRecalloc() as a fallback for platforms without recallocarray() 3006930ead5Smrg 3016930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 3026930ead5Smrg 3036930ead5Smrgcommit e02e32f71f6c24fcc69bdaf58f6f9e973a017896 3046930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 3056930ead5SmrgDate: Sat Dec 10 13:49:56 2022 -0800 3066930ead5Smrg 3076930ead5Smrg Replace uTypedRealloc() with direct reallocarray() calls 3086930ead5Smrg 3096930ead5Smrg Falls back to realloc() if platform doesn't offer reallocarray(). 3106930ead5Smrg Also removes uRealloc() since it had no other uses. 3116930ead5Smrg 3126930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 3136930ead5Smrg 3146930ead5Smrgcommit 75af06f5f8ffc41fabd100253aad222cb4ab8662 3156930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 3166930ead5SmrgDate: Sat Dec 10 13:44:17 2022 -0800 3176930ead5Smrg 3186930ead5Smrg Replace uCalloc() and uTypedCalloc() with direct calloc() calls 3196930ead5Smrg 3206930ead5Smrg All these wrappers did was mess with types. 3216930ead5Smrg 3226930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 3236930ead5Smrg 3246930ead5Smrgcommit 265ea3a77418df2744575f1168f89a33f01e72d4 3256930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 3266930ead5SmrgDate: Sat Dec 10 13:39:10 2022 -0800 3276930ead5Smrg 3286930ead5Smrg Replace uAlloc() and uTypedAlloc() with direct malloc() calls 3296930ead5Smrg 3306930ead5Smrg All these wrappers did was mess with types. 3316930ead5Smrg 3326930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 3336930ead5Smrg 3346930ead5Smrgcommit 81e51cf1ff494131827df487a0f538c3b07e0407 3356930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 3366930ead5SmrgDate: Sat Dec 10 13:34:09 2022 -0800 3376930ead5Smrg 3386930ead5Smrg Delete unused uTmpAlloc/uTmpFree wrappers around alloca() 3396930ead5Smrg 3406930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 3416930ead5Smrg 3426930ead5Smrgcommit 77b1efa1c83ad64d49d1e9c085d2a496580ce6f9 3436930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 3446930ead5SmrgDate: Sat Dec 10 13:26:39 2022 -0800 3456930ead5Smrg 3466930ead5Smrg Use C99 struct initializers 3476930ead5Smrg 3486930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 3496930ead5Smrg 3506930ead5Smrgcommit 64761ee9424f755b84ab0ce02d13eda32d215a14 3516930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 3526930ead5SmrgDate: Sat Dec 10 11:38:04 2022 -0800 3536930ead5Smrg 3546930ead5Smrg Variable scope reductions 3556930ead5Smrg 3566930ead5Smrg Some found by cppcheck, some found by manual code inspection 3576930ead5Smrg 3586930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 3596930ead5Smrg 3606930ead5Smrgcommit 9737af15196380a1687d18a17d297ee17b45a83f 3616930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 3626930ead5SmrgDate: Sat Dec 10 11:03:40 2022 -0800 3636930ead5Smrg 3646930ead5Smrg Remove register keyword from variable declarations 3656930ead5Smrg 3666930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 3676930ead5Smrg 3686930ead5Smrgcommit b67c058e2ccc27472b238a6b5dc5e4cd20f6d2bd 3696930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 3706930ead5SmrgDate: Sat Dec 10 09:08:33 2022 -0800 3716930ead5Smrg 3726930ead5Smrg Eliminate 20 -Wimplicit-fallthrough warnings 3736930ead5Smrg 3746930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 3756930ead5Smrg 3766930ead5Smrgcommit 634f60a9b25b5d03c78e90574adce3e38f378333 3776930ead5SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 3786930ead5SmrgDate: Thu Jul 28 17:30:21 2022 -0700 3796930ead5Smrg 3806930ead5Smrg gitlab CI: stop requiring Signed-off-by in commits 3816930ead5Smrg 3826930ead5Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 3836930ead5Smrg 3846930ead5Smrgcommit 931c469b2b91603c5c196abf65a39c7dab8609d7 3856930ead5SmrgAuthor: Leandro Nini <drfiemost@email.it> 3866930ead5SmrgDate: Sat Dec 10 07:49:56 2022 +0000 3876930ead5Smrg 3886930ead5Smrg Avoid possibly dereferencing null pointer 3896930ead5Smrg 3906930ead5Smrg This addresses issue #21 3916930ead5Smrg 3926930ead5Smrg Signed-off-by: Leandro Nini <drfiemost@email.it> 3936930ead5Smrg 394a57d84feSmrgcommit 7bac6a25bb44d39710f1b2b5fdad56d7f4c01c39 395a57d84feSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 396a57d84feSmrgDate: Wed Dec 7 17:53:16 2022 -0800 397a57d84feSmrg 398a57d84feSmrg xkbcomp 1.4.6 399a57d84feSmrg 400a57d84feSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 401a57d84feSmrg 402a57d84feSmrgcommit 7cdd50a7471ab67591ceb2e8734483220c5a9205 403a57d84feSmrgAuthor: Matt Turner <mattst88@gmail.com> 404a57d84feSmrgDate: Tue Nov 29 12:00:20 2022 -0500 405a57d84feSmrg 406a57d84feSmrg configure: Use AC_SYS_LARGEFILE to enable large file support 407a57d84feSmrg 408a57d84feSmrg Signed-off-by: Matt Turner <mattst88@gmail.com> 409a57d84feSmrg 410a57d84feSmrgcommit 76eed4986b8c94008853c2215408a100b7e95ecb 411a57d84feSmrgAuthor: Benno Schulenberg <bensberg@telfort.nl> 412a57d84feSmrgDate: Mon Jul 11 09:16:55 2022 +0200 413a57d84feSmrg 414a57d84feSmrg suppress four more warnings when 'warningLevel' is zero 415a57d84feSmrg 416a57d84feSmrg This addresses issue #20 some more. 417a57d84feSmrg 418a57d84feSmrg Reported-by: Vincent Lefevre 419a57d84feSmrg 420a57d84feSmrg Signed-off-by: Benno Schulenberg <bensberg@telfort.nl> 421a57d84feSmrg 422a57d84feSmrgcommit c230cee968c7e7956a04e4d73bd6f23260f435db 423a57d84feSmrgAuthor: Benno Schulenberg <bensberg@telfort.nl> 424a57d84feSmrgDate: Sun Jul 10 17:31:52 2022 +0200 425a57d84feSmrg 426a57d84feSmrg suppress the "Could not resolve" warning when 'warningLevel' is zero 427a57d84feSmrg 428a57d84feSmrg Two years ago, commit c8cfca25ab changed an error to a warning 429a57d84feSmrg but forgot to add a check for 'warningLevel'. 430a57d84feSmrg 431a57d84feSmrg This partially addresses issue #20. 432a57d84feSmrg 433a57d84feSmrg Reported-by: Vincent Lefevre 434a57d84feSmrg 435a57d84feSmrg Signed-off-by: Benno Schulenberg <bensberg@telfort.nl> 436a57d84feSmrg 437a57d84feSmrgcommit 97311ebd18e0dbc545d18d1a4b8b94b59c1fbd08 438a57d84feSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 439a57d84feSmrgDate: Sat Apr 2 11:58:18 2022 -0700 440a57d84feSmrg 441a57d84feSmrg man page: remove out-of-date COPYRIGHT section 442a57d84feSmrg 443a57d84feSmrg The information previously listed here didn't match what is present in 444a57d84feSmrg the source code or the COPYING file, and the X(7) man page doesn't list 445a57d84feSmrg any license information as this had claimed. 446a57d84feSmrg 447a57d84feSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 448a57d84feSmrg 449a57d84feSmrgcommit f3f71746ebee5404ccb736b53cddca557cc62060 450a57d84feSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 451a57d84feSmrgDate: Mon Dec 6 14:54:08 2021 -0800 452a57d84feSmrg 453a57d84feSmrg gitlab CI: update to new templates 454a57d84feSmrg 455a57d84feSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 456a57d84feSmrg 457a57d84feSmrgcommit 3aa424c245090ac594b85ce0ba0a438c921101d6 458a57d84feSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 459a57d84feSmrgDate: Mon Dec 6 14:44:55 2021 -0800 460a57d84feSmrg 461a57d84feSmrg Build xz tarballs instead of bzip2 462a57d84feSmrg 463a57d84feSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 464a57d84feSmrg 465a57d84feSmrgcommit 97390d9e15c0c7ac8c69de42e1be1028ae846aad 466a57d84feSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 467a57d84feSmrgDate: Sun Nov 28 11:35:20 2021 -0800 468a57d84feSmrg 469a57d84feSmrg Fix "upercase" typo 470a57d84feSmrg 471a57d84feSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 472a57d84feSmrg 473bfe6082cSmrgcommit f8b240e897ed68b90c116ce4c2f8814e71e5aa97 474bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 475bfe6082cSmrgDate: Wed Mar 17 15:39:53 2021 +1000 476bfe6082cSmrg 477bfe6082cSmrg xkbcomp 1.4.5 478bfe6082cSmrg 479bfe6082cSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 480bfe6082cSmrg 481bfe6082cSmrgcommit da810f10d732a312ccee88652141c1d165efc114 482bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 483bfe6082cSmrgDate: Thu Jan 21 13:24:00 2021 +1000 484bfe6082cSmrg 485bfe6082cSmrg keycodes: compress the high keycode warning 486bfe6082cSmrg 487bfe6082cSmrg No point spending 3 lines on this, especially given that this warning is 488bfe6082cSmrg always triggered. 489bfe6082cSmrg 490bfe6082cSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 491bfe6082cSmrg 492bfe6082cSmrgcommit 80398db098b2a2214c5bef28d09cefd58beac43d 493bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 494bfe6082cSmrgDate: Thu Jan 21 13:20:40 2021 +1000 495bfe6082cSmrg 496bfe6082cSmrg keycodes: downgrade the >255 keycode warning to an info 497bfe6082cSmrg 498bfe6082cSmrg This warning will be triggered all the time now that xkeyboard-config has 499bfe6082cSmrg started adding keycodes > 255. Downgrade to an info, there's nothing the user 500bfe6082cSmrg can do about this warning anyway. 501bfe6082cSmrg 502bfe6082cSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 503bfe6082cSmrg 504bfe6082cSmrgcommit 1955a2645670eeea83d6d163653749249cd839f2 505bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 506bfe6082cSmrgDate: Thu Jan 21 13:16:53 2021 +1000 507bfe6082cSmrg 508bfe6082cSmrg Downgrade the warning for missing symbols to info 509bfe6082cSmrg 510bfe6082cSmrg In the interest of maintainability, it's easier to include as many keycodes as 511bfe6082cSmrg possible and then have the symbols mapping specific to the layout. This is 512bfe6082cSmrg particularly true for evdev where the kernel takes care of device-specifics 513bfe6082cSmrg and every keyboard has the same set of keycodes anyway. 514bfe6082cSmrg 515bfe6082cSmrg So let's downgrade this from a warning to a mere info, virtually every 516bfe6082cSmrg keyboard right now triggers this warning for a number of keys. 517bfe6082cSmrg 518bfe6082cSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 519bfe6082cSmrg 520bfe6082cSmrgcommit 9510dedad875099c32993246188050ea73ab1a9f 521bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 522bfe6082cSmrgDate: Thu Jan 21 13:08:25 2021 +1000 523bfe6082cSmrg 524bfe6082cSmrg Replace WARN[1-9], ERROR[1-9], etc. with their unnumbered version 525bfe6082cSmrg 526bfe6082cSmrg Those macros date back to when varargs weren't a thing but they've 527bfe6082cSmrg been #defined to the same value for 17 years now. 528bfe6082cSmrg 529bfe6082cSmrg Patch generated with: 530bfe6082cSmrg for action in WARN INFO ERROR ACTION FATAL WSGO; do 531bfe6082cSmrg sed -i "s/${action}[1-9]/${action}/g" `git ls-files` 532bfe6082cSmrg done 533bfe6082cSmrg 534bfe6082cSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 535bfe6082cSmrg 536bfe6082cSmrgcommit ff6a19ed8898ee8c79b2b2a2f87806353d89f5d4 537bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 538bfe6082cSmrgDate: Thu Jan 21 13:46:01 2021 +1000 539bfe6082cSmrg 540bfe6082cSmrg gitlab CI: add basic build test 541bfe6082cSmrg 542bfe6082cSmrg Copied from xorgproto 543bfe6082cSmrg 544bfe6082cSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 545bfe6082cSmrg 546bfe6082cSmrgcommit 3b3d25dd32ba48fd6d15ca98baf7109af21e1d97 547bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 548bfe6082cSmrgDate: Thu Jan 21 13:24:51 2021 +1000 549bfe6082cSmrg 550bfe6082cSmrg Remove trailing whitespaces 551bfe6082cSmrg 552bfe6082cSmrg Let's clean this up so I don't have to fight vim and git in removing them. 553bfe6082cSmrg 554bfe6082cSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 555bfe6082cSmrg 556bfe6082cSmrgcommit 790b998647ec171133bf196a3d84c5153cd64840 557bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 558bfe6082cSmrgDate: Thu Nov 5 14:24:24 2020 +1000 559bfe6082cSmrg 560bfe6082cSmrg xkbcomp 1.4.4 561bfe6082cSmrg 562bfe6082cSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 563bfe6082cSmrg 564bfe6082cSmrgcommit a0a4f112c5858ac2b932247dba2d85061bb59145 5656930ead5SmrgAuthor: Miroslav Koškár <mk@mkoskar.com> 566bfe6082cSmrgDate: Mon Jul 6 07:48:48 2020 +0200 567bfe6082cSmrg 568bfe6082cSmrg Fix lockdevbtn to be XkbSA_LockDeviceBtn action 569bfe6082cSmrg 570bfe6082cSmrgcommit 101d5f2bce9ee13521fe9cb47b7cfd00d01f5914 571bfe6082cSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 572bfe6082cSmrgDate: Thu Jul 23 10:25:08 2020 -0700 573bfe6082cSmrg 574bfe6082cSmrg Fix spelling/wording issues 575bfe6082cSmrg 576bfe6082cSmrg Found by using: 577bfe6082cSmrg codespell --builtin clear,rare,usage,informal,code,names 578bfe6082cSmrg 579bfe6082cSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 580bfe6082cSmrg 581bfe6082cSmrgcommit c8cfca25ab2ed65013448f7502bae933c66390ae 582bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 583bfe6082cSmrgDate: Fri Jun 5 14:23:09 2020 +1000 584bfe6082cSmrg 585bfe6082cSmrg Don't pretend unresolved symbols are an error 586bfe6082cSmrg 587bfe6082cSmrg Whenever xkeyboard-config is newer than xorgproto, or libX11 just hasn't yet 588bfe6082cSmrg been rebuilt against the protocol we end up with some unresolved symbols. 589bfe6082cSmrg That's not an error, it just happens. Let's downgrade this to a warning 590bfe6082cSmrg instead. 591bfe6082cSmrg 592bfe6082cSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 593bfe6082cSmrg 594bfe6082cSmrgcommit dcaa947c488b4cb458946ab9c19579f7c866cbd4 595bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 596bfe6082cSmrgDate: Wed Jul 17 15:07:14 2019 +1000 597bfe6082cSmrg 598bfe6082cSmrg For -R and after chdir, add the current directory to the path 599bfe6082cSmrg 600bfe6082cSmrg This restores the behavior pre 1aecdffaa0db7bbf85bc0aae9043e9437b25c30d, at 601bfe6082cSmrg least when -R is given. For a normal invocation without -R we don't add the 602bfe6082cSmrg current directory, because 1aecdff isn't totally wrong about whether that's a 603bfe6082cSmrg good idea. 604bfe6082cSmrg 605bfe6082cSmrg Fixes https://gitlab.freedesktop.org/xorg/app/xkbcomp/issues/3 606bfe6082cSmrg 607bfe6082cSmrgcommit d373c9b434c603bf6a5eb442b6427992d23ef874 608bfe6082cSmrgAuthor: Matt Turner <mattst88@gmail.com> 609bfe6082cSmrgDate: Thu Feb 20 09:47:30 2020 -0800 610bfe6082cSmrg 611bfe6082cSmrg xkbcomp 1.4.3 612bfe6082cSmrg 613bfe6082cSmrg Signed-off-by: Matt Turner <mattst88@gmail.com> 614bfe6082cSmrg 615bfe6082cSmrgcommit e200d0d41ef3158ea717206c1490e499a0c07f1b 616bfe6082cSmrgAuthor: Dimitry Andric <dimitry@andric.com> 617bfe6082cSmrgDate: Wed Feb 19 21:24:59 2020 +0100 618bfe6082cSmrg 619bfe6082cSmrg Don't compare with string literals 620bfe6082cSmrg 621bfe6082cSmrg xkbcomp.c:228:37: error: result of comparison against a string literal is unspecified (use an explicit string comparison function instead) [-Werror,-Wstring-compare] 622bfe6082cSmrg if ((argv[i][0] != '-') || (uStringEqual(argv[i], "-"))) 623bfe6082cSmrg ^~~~~~~~~~~~~~~~~~~~~~~~~~ 624bfe6082cSmrg ./utils.h:195:30: note: expanded from macro 'uStringEqual' 625bfe6082cSmrg ^~~~~~~~~~~~~~~~~~~~~ 626bfe6082cSmrg ./utils.h:198:38: note: expanded from macro 'uStringCompare' 627bfe6082cSmrg (s1)!=(s2):strcmp(s1,s2)) 628bfe6082cSmrg ^ ~~~~ 629bfe6082cSmrg 630bfe6082cSmrg Don't attempt to do this macro trickery, and simply use strcmp instead, 631bfe6082cSmrg where it applies. 632bfe6082cSmrg 633bfe6082cSmrg Bug: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244235 634bfe6082cSmrg 635bfe6082cSmrgcommit 29fda8e50e4a4a127348e63fcf9f47600beab93c 636bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 637bfe6082cSmrgDate: Thu Jun 13 12:29:19 2019 +1000 638bfe6082cSmrg 639bfe6082cSmrg Error out if we have no default path 640bfe6082cSmrg 641bfe6082cSmrg The path is set through configure.ac/Makefile.am and always defined anyway. 642bfe6082cSmrg Let's not re-define it here with a different value than our default. 643bfe6082cSmrg 644bfe6082cSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 645bfe6082cSmrg 646bfe6082cSmrgcommit ff0e59084d6b9f2e7085fc88ba68916150085afb 647bfe6082cSmrgAuthor: Andreas Wettstein <wettstein509@solnet.ch> 648bfe6082cSmrgDate: Sat Feb 15 17:34:41 2014 +0100 649bfe6082cSmrg 650bfe6082cSmrg xkbcomp Fix missing support for "affect" and incorrect modifier handling for ISOLock 651bfe6082cSmrg 652bfe6082cSmrg Add missing support for "affect" flag to selectively affect locking or 653bfe6082cSmrg unlocking for for modifier locking, control locking, and ISOLock. 654bfe6082cSmrg Fix some incorrect masking and modifier handling for ISOLock. 655bfe6082cSmrg 656bfe6082cSmrg Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch> 657bfe6082cSmrg Reviewed-By: Ran Benita <ran234@gmail.com> 658bfe6082cSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 659bfe6082cSmrg 660bfe6082cSmrgcommit 9edd61b91a02bda31fc6edd2c32c553e872b6ea2 6616930ead5SmrgAuthor: Miroslav Koškár <mk@mkoskar.com> 662bfe6082cSmrgDate: Fri Jan 18 20:01:01 2019 +0100 663bfe6082cSmrg 664bfe6082cSmrg Fix invalid error report on F_Accel field 665bfe6082cSmrg 666bfe6082cSmrg F_Accel is valid MovePtr field yet following error is reported: 667bfe6082cSmrg 668bfe6082cSmrg > Error: Field accel is not defined for an action of type MovePtr 669bfe6082cSmrg > Action definition ignored 670bfe6082cSmrg 671bfe6082cSmrg Signed-off-by: Miroslav Koškár <mk@mkoskar.com> 672bfe6082cSmrg 673bfe6082cSmrgcommit 7ffec6583ae92fe81402870eb89dea21ca34e933 674bfe6082cSmrgAuthor: Andreas Boll <andreas.boll.dev@gmail.com> 675bfe6082cSmrgDate: Mon Feb 11 21:44:51 2019 +0100 676bfe6082cSmrg 677bfe6082cSmrg configure: Remove unused AC_SUBST([REQUIRED_MODULES]) 678bfe6082cSmrg 679bfe6082cSmrg v2: Add square brackets back. 680bfe6082cSmrg 681bfe6082cSmrg Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com> 682bfe6082cSmrg 683bfe6082cSmrgcommit 4683410b6b072bd55dbdc661c76a5ba30bae608e 684bfe6082cSmrgAuthor: Andreas Boll <andreas.boll.dev@gmail.com> 685bfe6082cSmrgDate: Mon Feb 11 21:31:19 2019 +0100 686bfe6082cSmrg 687bfe6082cSmrg pkgconfig: Remove unneeded Requires.private 688bfe6082cSmrg 689bfe6082cSmrg Fixes "pkg-config --exists xkbcomp" without installed pkg-config files 690bfe6082cSmrg for x11, xkbfile, and xproto >= 7.0.17. 691bfe6082cSmrg 692bfe6082cSmrg xkbcomp works fine without those pkg-config files. 693bfe6082cSmrg 694bfe6082cSmrg https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=913359 695bfe6082cSmrg 696bfe6082cSmrg Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com> 697bfe6082cSmrg 698bfe6082cSmrgcommit 1fdbacbe34742328b2a95742982b6017f60a1342 699bfe6082cSmrgAuthor: Adam Jackson <ajax@redhat.com> 700bfe6082cSmrgDate: Wed Oct 17 11:44:37 2018 -0400 701bfe6082cSmrg 702bfe6082cSmrg Suppress high-keycode warnings at the default warning level 703bfe6082cSmrg 704bfe6082cSmrg We expect evdev to have keycodes above 255, there's no reason to warn 705bfe6082cSmrg about this. 706bfe6082cSmrg 707bfe6082cSmrg Signed-off-by: Adam Jackson <ajax@redhat.com> 708bfe6082cSmrg 709bfe6082cSmrgcommit 32d8d53fc1b622d97b3b8eb7b8b5e8354eda60a5 710bfe6082cSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 711bfe6082cSmrgDate: Wed Nov 21 17:11:16 2018 -0800 712bfe6082cSmrg 713bfe6082cSmrg Update configure.ac bug URL for gitlab migration 714bfe6082cSmrg 715bfe6082cSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 716bfe6082cSmrg 717b60292e0Smrgcommit 2abe23d23d3755335c10ff573e4e1f93b682e9d9 718b60292e0SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 719b60292e0SmrgDate: Fri Jun 8 09:10:03 2018 +1000 720b60292e0Smrg 721b60292e0Smrg xkbcomp 1.4.2 722b60292e0Smrg 723b60292e0Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 724b60292e0Smrg 725b60292e0Smrgcommit 5bc2849273a224a2df593b7e8df31f0bde666482 726b60292e0SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 727b60292e0SmrgDate: Thu Jun 7 11:25:01 2018 +1000 728b60292e0Smrg 729b60292e0Smrg Ignore xkb_keycodes.maximum of > 255 730b60292e0Smrg 731b60292e0Smrg Continuation from 7fdfabd75 "keycodes: Ignore high keycodes" 732b60292e0Smrg 733b60292e0Smrg A keymap with a key > 255 will have a xkb_keycodes.maximum of that keycode. 734b60292e0Smrg Let's not throw a fatal error on that, just crop it back to the maximum of 735b60292e0Smrg 255. This doesn't set the "high_keycode_warned" on purpose so we get this for 736b60292e0Smrg the first key that actually matters. 737b60292e0Smrg 738b60292e0Smrg Reproducible with xkeyboard-config 2.24 which has a maximum of 374. 739b60292e0Smrg 740b60292e0Smrg https://bugzilla.redhat.com/show_bug.cgi?id=1587998 741b60292e0Smrg 742b60292e0Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 743b60292e0Smrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 744b60292e0Smrg 7455c4ee2b5Smrgcommit 34842845b191082fd1cfff3b7038332cdcadb825 7465c4ee2b5SmrgAuthor: Adam Jackson <ajax@redhat.com> 7475c4ee2b5SmrgDate: Thu Mar 1 11:15:18 2018 -0500 7485c4ee2b5Smrg 7495c4ee2b5Smrg xkbcomp 1.4.1 7505c4ee2b5Smrg 7515c4ee2b5Smrg Signed-off-by: Adam Jackson <ajax@redhat.com> 7525c4ee2b5Smrg 7535c4ee2b5Smrgcommit 993d4916a92b56b5043cf0b90f550568c817ad2b 7545c4ee2b5SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 7555c4ee2b5SmrgDate: Tue Feb 13 13:48:46 2018 +1000 7565c4ee2b5Smrg 7575c4ee2b5Smrg pkgconfig: add the exec_prefix substitution 7585c4ee2b5Smrg 7595c4ee2b5Smrg bindir gets replaced with: 7605c4ee2b5Smrg bindir=${exec_prefix}/bin 7615c4ee2b5Smrg but exec_prefix isn't set so we end up with an invalid bindir. 7625c4ee2b5Smrg 7635c4ee2b5Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 7645c4ee2b5Smrg Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk> 7655c4ee2b5Smrg 7665c4ee2b5Smrgcommit 3e2a6ad4edfbf21c3f76f8319f0039b7f589944f 7675c4ee2b5SmrgAuthor: Adam Jackson <ajax@redhat.com> 7685c4ee2b5SmrgDate: Mon Nov 6 12:54:41 2017 -0500 7695c4ee2b5Smrg 7705c4ee2b5Smrg pkgconfig: Add our bindir to xkbcomp.pc 7715c4ee2b5Smrg 7725c4ee2b5Smrg Reviewed-by: Daniel Stone <daniels@collabora.com> 7735c4ee2b5Smrg Signed-off-by: Adam Jackson <ajax@redhat.com> 7745c4ee2b5Smrg 775f757b1e9Smrgcommit 3fcd5f4490adee266eb4c0110d058c7f4e515e36 776f757b1e9SmrgAuthor: Daniel Stone <daniels@collabora.com> 777f757b1e9SmrgDate: Mon May 1 15:59:28 2017 +0100 778f757b1e9Smrg 779f757b1e9Smrg xkbcomp 1.4.0 780f757b1e9Smrg 781f757b1e9Smrg Signed-off-by: Daniel Stone <daniels@collabora.com> 782f757b1e9Smrg 783f757b1e9Smrgcommit 7fdfabd753a39dbdcfcfa65ec33d0192448119d8 784f757b1e9SmrgAuthor: Daniel Stone <daniels@collabora.com> 785f757b1e9SmrgDate: Thu Apr 6 15:52:10 2017 +0100 786f757b1e9Smrg 787f757b1e9Smrg keycodes: Ignore high keycodes 788f757b1e9Smrg 789f757b1e9Smrg Rather than throwing a fatal error when a keycode definition exceeds the 790f757b1e9Smrg declared maximum (i.e. 255), just ignore the definition and continue. 791f757b1e9Smrg 792f757b1e9Smrg This allows xkeyboard-config to start shipping datasets including high 793f757b1e9Smrg keycodes, which will work in xkbcommon as it ignores explicit range 794f757b1e9Smrg declarations. 795f757b1e9Smrg 796f757b1e9Smrg Signed-off-by: Daniel Stone <daniels@collabora.com> 797f757b1e9Smrg Reviewed-by: Ran Benita <ran234@gmail.com> 798f757b1e9Smrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 799f757b1e9Smrg Reported-by: Christian Kellner <gicmo@gnome.org> 800f757b1e9Smrg 801f757b1e9Smrgcommit 9f1e3e8c8914b349b9b52501bb4acadedb31081d 802f757b1e9SmrgAuthor: Mihail Konev <k.mvc@ya.ru> 803f757b1e9SmrgDate: Thu Jan 26 14:00:21 2017 +1000 804f757b1e9Smrg 805f757b1e9Smrg autogen: add default patch prefix 806f757b1e9Smrg 807f757b1e9Smrg Signed-off-by: Mihail Konev <k.mvc@ya.ru> 808f757b1e9Smrg 809f757b1e9Smrgcommit 6f16a2e38667bea33e0cb566734a87c2b92c9391 810f757b1e9SmrgAuthor: Emil Velikov <emil.l.velikov@gmail.com> 811f757b1e9SmrgDate: Mon Mar 9 12:00:52 2015 +0000 812f757b1e9Smrg 813f757b1e9Smrg autogen.sh: use quoted string variables 814f757b1e9Smrg 815f757b1e9Smrg Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent 816f757b1e9Smrg fall-outs, when they contain space. 817f757b1e9Smrg 818f757b1e9Smrg Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> 819f757b1e9Smrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 820f757b1e9Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 821f757b1e9Smrg 822f757b1e9Smrgcommit bbc55549ee44830747eccfadd61df3ed38a99202 823f757b1e9SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 824f757b1e9SmrgDate: Tue Jan 24 10:32:07 2017 +1000 825f757b1e9Smrg 826f757b1e9Smrg autogen.sh: use exec instead of waiting for configure to finish 827f757b1e9Smrg 828f757b1e9Smrg Syncs the invocation of configure with the one from the server. 829f757b1e9Smrg 830f757b1e9Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 831f757b1e9Smrg Reviewed-by: Emil Velikov <emil.velikov@collabora.com> 832f757b1e9Smrg 833f757b1e9Smrgcommit 8995ac58e15595de9158c2d8df9e02b0c925e8f4 834f757b1e9SmrgAuthor: Ran Benita <ran234@gmail.com> 835f757b1e9SmrgDate: Wed Jan 6 21:32:52 2016 +0100 836f757b1e9Smrg 837f757b1e9Smrg When a file contains several maps, look for a default map 838f757b1e9Smrg 839f757b1e9Smrg Rather than always taking the first one in the file. This is exactly the 840f757b1e9Smrg intended use of the 'default' flag. 841f757b1e9Smrg 842f757b1e9Smrg Note that pretty much the same code is duplicated in xkbcomp.c when 843f757b1e9Smrg compiling a single file from the command line, but there it is 844f757b1e9Smrg implemented correctly (look for XkbLC_Default). 845f757b1e9Smrg 846f757b1e9Smrg https://bugs.freedesktop.org/show_bug.cgi?id=69950 847f757b1e9Smrg 848f757b1e9Smrg Signed-off-by: Ran Benita <ran234@gmail.com> 849f757b1e9Smrg Tested-by: Benno Schulenberg <bensberg@justemail.net> 850f757b1e9Smrg Acked-by: Sergey Udaltsov <sergey.udaltsov@gmail.com> 851f757b1e9Smrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 852f757b1e9Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 853f757b1e9Smrg 854f757b1e9Smrgcommit bf4d7d059daf5c6f81d70f8d3e5e2a87265381b7 855f757b1e9SmrgAuthor: Benno Schulenberg <bensberg@justemail.net> 856f757b1e9SmrgDate: Thu Sep 11 22:04:21 2014 +0200 857f757b1e9Smrg 858f757b1e9Smrg When overriding a key, adjust also its number of levels (#57242). 859f757b1e9Smrg 860f757b1e9Smrg Specifying an explicit key type when overriding a key should adjust 861f757b1e9Smrg the number of levels to that of the specified type. This gets rid of 862f757b1e9Smrg the age-old warning of the right Alt key being ONE_LEVEL but having 863f757b1e9Smrg two symbols assigned. 864f757b1e9Smrg 865f757b1e9Smrg Fixes bug #57242 <http://bugs.freedesktop.org/show_bug.cgi?id=57242>. 866f757b1e9Smrg 867f757b1e9Smrg Signed-off-by: Benno Schulenberg <bensberg@justemail.net> 868f757b1e9Smrg Reviewed-by: Ran Benita <ran234@gmail.com> 869f757b1e9Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 870f757b1e9Smrg 8713fb1fa07Smrgcommit f909259b1da70bc145f19e5ce595c8e945a2a808 8723fb1fa07SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 8733fb1fa07SmrgDate: Thu Nov 5 12:19:22 2015 +1000 8743fb1fa07Smrg 8753fb1fa07Smrg xkbcomp 1.3.1 8763fb1fa07Smrg 8773fb1fa07Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 8783fb1fa07Smrg 8793fb1fa07Smrgcommit 26d1c57a938ce5c0d4fd9d645ace25308e6a7070 8803fb1fa07SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 8813fb1fa07SmrgDate: Tue Nov 3 09:01:19 2015 +1000 8823fb1fa07Smrg 8833fb1fa07Smrg symbols: increase the warning level for shortening a key type 8843fb1fa07Smrg 8853fb1fa07Smrg Any use of the german keyboard layout or anything else using 8863fb1fa07Smrg level3(ralt_switch) produces the warning 8873fb1fa07Smrg Type "ONE_LEVEL" has 1 levels, but <RALT> has 2 symbols 8883fb1fa07Smrg Ignoring extra symbols 8893fb1fa07Smrg This warning is meaningless, the default definition for RALT comes from 8903fb1fa07Smrg pc(pc105) including altwin(meta_alt) which defines it as TWO_LEVEL 8913fb1fa07Smrg and { Alt_R, Meta_R }. Including level3(ralt_switch) correctly sets it as 8923fb1fa07Smrg ONE_LEVEL but now we get the warning. That makes users file bug reports and we 8933fb1fa07Smrg can't be having that, can we? 8943fb1fa07Smrg 8953fb1fa07Smrg Up the warning level for this case to one past the default. The warning is 8963fb1fa07Smrg only useful when you're testing a new keyboard layout or trying to fix an 8973fb1fa07Smrg actual bug with missing symbols. And then you can run xkbcomp with -w10. 8983fb1fa07Smrg No need to spam the log on every server startup. 8993fb1fa07Smrg 9003fb1fa07Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 9013fb1fa07Smrg Reviewed-by: Hans de Goede <hdegoede@redhat.com> 9023fb1fa07Smrg 9033fb1fa07Smrgcommit 511adde23a0518db0379b444580b63edcb9138a8 9043fb1fa07SmrgAuthor: Matthew Green <mrg@NetBSD.org> 9053fb1fa07SmrgDate: Tue Jul 28 17:53:48 2015 +0200 9063fb1fa07Smrg 9073fb1fa07Smrg Adjust a NUL-string assignment to avoid const issues. 9083fb1fa07Smrg 9093fb1fa07Smrg Signed-off-by: Thomas Klausner <wiz@NetBSD.org> 9103fb1fa07Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 9113fb1fa07Smrg 9123fb1fa07Smrgcommit 1ae525b3d236b59e6437b2b5433d460e18370973 9133fb1fa07SmrgAuthor: Jon TURNEY <jon.turney@dronecode.org.uk> 9143fb1fa07SmrgDate: Tue Mar 17 15:19:10 2015 +0000 9153fb1fa07Smrg 9163fb1fa07Smrg Define WIN32_LEAN_AND_MEAN when building on Win32 9173fb1fa07Smrg 9183fb1fa07Smrg w32api/rpcnndr.h (included by windows.h) uses TypeString as the name of a structure member. 9193fb1fa07Smrg 9203fb1fa07Smrg xkbcomp.h defines it as a macro for a constant. 9213fb1fa07Smrg 9223fb1fa07Smrg Define WIN32_LEAN_AND_MEAN to avoid this clash. 9233fb1fa07Smrg 9243fb1fa07Smrg Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> 9253fb1fa07Smrg Reviewed-by: David Macek <david.macek.0@gmail.com> 9263fb1fa07Smrg 9273fb1fa07Smrgcommit fc3e6ddb2c8e922ea80f2dc5cbc1df2102e30d99 9283fb1fa07SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 9293fb1fa07SmrgDate: Tue Mar 3 16:24:50 2015 -0800 9303fb1fa07Smrg 9313fb1fa07Smrg Stop including <X11/Xalloca.h> in parseutils.c 9323fb1fa07Smrg 9333fb1fa07Smrg I can not find any point in our git history at which alloca() or the 9343fb1fa07Smrg Xalloca.h macros ALLOCATE_LOCAL() & DEALLOCATE_LOCAL() were actually 9353fb1fa07Smrg used in this source file. 9363fb1fa07Smrg 9373fb1fa07Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 9383fb1fa07Smrg 939c82dfdfbSmrgcommit 1e8ee9d0aad072f04186df84752f5636340574e0 940c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 941c82dfdfbSmrgDate: Fri Nov 21 08:18:41 2014 +1000 942c82dfdfbSmrg 943c82dfdfbSmrg xkbcomp 1.3.0 944c82dfdfbSmrg 945c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 946c82dfdfbSmrg 947c82dfdfbSmrgcommit 978998a1fe0a78829452f5432efe1b74c5049de4 948c82dfdfbSmrgAuthor: Vincent Lefevre <vincent@vinc17.net> 949c82dfdfbSmrgDate: Mon Oct 27 10:50:30 2014 +0100 950c82dfdfbSmrg 951c82dfdfbSmrg xkbcomp: Improved -w option parsing 952c82dfdfbSmrg 953c82dfdfbSmrg This patch improves -w option parsing even further, for cases like 954c82dfdfbSmrg "xkbcomp -w6 4.xkb out.xkb" (which were not handled by the fix of 955c82dfdfbSmrg the warning level is still optional (set to 0 if not present), and 956c82dfdfbSmrg errors like "xkbcomp -wfoo in out" are detected and reported. 957c82dfdfbSmrg 958c82dfdfbSmrg https://bugs.freedesktop.org/show_bug.cgi?id=66344 959c82dfdfbSmrg 960c82dfdfbSmrg Signed-off-by: Vincent Lefevre <vincent@vinc17.net> 961c82dfdfbSmrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 962c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 963c82dfdfbSmrg 964c82dfdfbSmrgcommit d4e02a09258063c6d024c3ccd42d6b22212e6e18 965c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 966c82dfdfbSmrgDate: Sat Mar 8 19:04:24 2014 -0800 967c82dfdfbSmrg 968c82dfdfbSmrg Initialize nMatch even if WIN32 is defined 969c82dfdfbSmrg 970c82dfdfbSmrg Flagged by cppcheck 1.64: 971c82dfdfbSmrg Checking app/xkbcomp/listing.c: WIN32... 972c82dfdfbSmrg [app/xkbcomp/listing.c:335]: (error) Uninitialized variable: nMatch 973c82dfdfbSmrg 974c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 975c82dfdfbSmrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 976c82dfdfbSmrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 977c82dfdfbSmrg 978c82dfdfbSmrgcommit 7606a46b922dfdb0627f1af6ab1432ae88c79d66 979c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 980c82dfdfbSmrgDate: Sat Mar 8 19:01:12 2014 -0800 981c82dfdfbSmrg 982c82dfdfbSmrg Remove useless assignment to 'outline' variable 983c82dfdfbSmrg 984c82dfdfbSmrg Flagged by cppcheck 1.64: 985c82dfdfbSmrg [app/xkbcomp/geometry.c:2426] -> [app/xkbcomp/geometry.c:2427]: 986c82dfdfbSmrg (performance) Variable 'outline' is reassigned a value before 987c82dfdfbSmrg the old one has been used. 988c82dfdfbSmrg 989c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 990c82dfdfbSmrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 991c82dfdfbSmrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 992c82dfdfbSmrg 993c82dfdfbSmrgcommit 6c2d3b0891f7be6ef4895be75188aa1c6f530bfc 994c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 995c82dfdfbSmrgDate: Sat Mar 8 18:50:22 2014 -0800 996c82dfdfbSmrg 997c82dfdfbSmrg Don't dereference the pointer whose allocation failed 998c82dfdfbSmrg 999c82dfdfbSmrg Flagged by cppcheck 1.64: 1000c82dfdfbSmrg [app/xkbcomp/keycodes.c:264] -> [app/xkbcomp/keycodes.c:262]: 1001c82dfdfbSmrg (warning) Possible null pointer dereference: new - otherwise it 1002c82dfdfbSmrg is redundant to check it against null. 1003c82dfdfbSmrg [app/xkbcomp/keytypes.c:600] -> [app/xkbcomp/keytypes.c:597]: 1004c82dfdfbSmrg (warning) Possible null pointer dereference: old - otherwise it 1005c82dfdfbSmrg is redundant to check it against null. 1006c82dfdfbSmrg 1007c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1008c82dfdfbSmrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 1009c82dfdfbSmrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 1010c82dfdfbSmrg 1011c82dfdfbSmrgcommit 50ebe95a32dc59b1de899ef08f72462055b04065 1012c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 1013c82dfdfbSmrgDate: Sat Mar 8 18:46:11 2014 -0800 1014c82dfdfbSmrg 1015c82dfdfbSmrg Remove useless checks for NULL before free in OverlayKeyCreate() 1016c82dfdfbSmrg 1017c82dfdfbSmrg There is no need to ensure the pointers passed to free are not NULL, 1018c82dfdfbSmrg especially right after passing them to strncpy without checking for 1019c82dfdfbSmrg NULL. 1020c82dfdfbSmrg 1021c82dfdfbSmrg Flagged by cppcheck 1.64: 1022c82dfdfbSmrg [app/xkbcomp/parseutils.c:557] -> [app/xkbcomp/parseutils.c:559]: 1023c82dfdfbSmrg (warning) Possible null pointer dereference: over - otherwise it 1024c82dfdfbSmrg is redundant to check it against null. 1025c82dfdfbSmrg [app/xkbcomp/parseutils.c:558] -> [app/xkbcomp/parseutils.c:561]: 1026c82dfdfbSmrg (warning) Possible null pointer dereference: under - otherwise it 1027c82dfdfbSmrg is redundant to check it against null. 1028c82dfdfbSmrg 1029c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1030c82dfdfbSmrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 1031c82dfdfbSmrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 1032c82dfdfbSmrg 1033c82dfdfbSmrgcommit 31b90ee4ffc774e0da540277907fc5540c0b012c 1034c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 1035c82dfdfbSmrgDate: Mon Feb 3 07:24:22 2014 +1000 1036c82dfdfbSmrg 1037c82dfdfbSmrg man: replace default include directory with the one from configure 1038c82dfdfbSmrg 1039c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 1040c82dfdfbSmrg Reviewed-by: Gaetan Nadon <memsize@videotron.ca> 1041c82dfdfbSmrg 1042c82dfdfbSmrgcommit e3e6e938535532bfad175c1635256ab7fb3ac943 1043c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 1044c82dfdfbSmrgDate: Sun Oct 20 12:36:31 2013 -0700 1045c82dfdfbSmrg 1046c82dfdfbSmrg Fix many const char * warnings from gcc 1047c82dfdfbSmrg 1048c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1049c82dfdfbSmrg Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> 1050c82dfdfbSmrg 1051c82dfdfbSmrgcommit 2458580ac95c550217b3376c46eecb2cca646241 1052c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 1053c82dfdfbSmrgDate: Sun Oct 20 11:52:43 2013 -0700 1054c82dfdfbSmrg 1055c82dfdfbSmrg Convert remaining sprintf calls to snprintf 1056c82dfdfbSmrg 1057c82dfdfbSmrg Most were fixed length or length checked anyway, this just saves time 1058c82dfdfbSmrg doublechecking that. (A few could be replaced by asprintf, but we 1059c82dfdfbSmrg don't have a copy guaranteed to be reachable from this program yet.) 1060c82dfdfbSmrg 1061c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1062c82dfdfbSmrg Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> 1063c82dfdfbSmrg 1064c82dfdfbSmrgcommit 3ed68e06cb45fb526b09e4c7b7c3d60de552b2b3 1065c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 1066c82dfdfbSmrgDate: Sun Oct 20 12:49:31 2013 -0700 1067c82dfdfbSmrg 1068c82dfdfbSmrg Remove unused uASSERT macro 1069c82dfdfbSmrg 1070c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1071c82dfdfbSmrg Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> 1072c82dfdfbSmrg 1073c82dfdfbSmrgcommit c936bd4315a7dc78de074ac89c5a4d12813421be 1074c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 1075c82dfdfbSmrgDate: Sun Oct 20 11:58:56 2013 -0700 1076c82dfdfbSmrg 1077c82dfdfbSmrg Remove unused function entry/exit tracking framework 1078c82dfdfbSmrg 1079c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1080c82dfdfbSmrg Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> 1081c82dfdfbSmrg 1082c82dfdfbSmrgcommit 839ccda42d8b088d94324cd77c4be954859914d3 1083c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 1084c82dfdfbSmrgDate: Wed Aug 28 15:20:56 2013 +1000 1085c82dfdfbSmrg 1086c82dfdfbSmrg compat: don't warn about redefinition when nothing is defined yet 1087c82dfdfbSmrg 1088c82dfdfbSmrg info->groupCompat[i] is bzero'd on init, define is 0. Don't warn when that 1089c82dfdfbSmrg is the case, otherwise any "group 2 = ..." statement will cause an error. 1090c82dfdfbSmrg 1091c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 1092c82dfdfbSmrg 1093c82dfdfbSmrgcommit 24d18e0a844041ef82441adb16aa18cc4b4814ae 1094c82dfdfbSmrgAuthor: Benno Schulenberg <bensberg@justemail.net> 1095c82dfdfbSmrgDate: Wed Aug 28 20:03:30 2013 +0200 1096c82dfdfbSmrg 1097c82dfdfbSmrg Making sure that a copied string is always null-terminated (#66345). 1098c82dfdfbSmrg 1099c82dfdfbSmrg A more minimalistic and formally correct solution. 1100c82dfdfbSmrg This amends and extends the previous fix for bug #66345, 1101c82dfdfbSmrg fixing not just yyGetKeyName() but also yyGetString(). 1102c82dfdfbSmrg 1103c82dfdfbSmrg Signed-off-by: Benno Schulenberg <bensberg@justemail.net> 1104c82dfdfbSmrg 1105c82dfdfbSmrg Fixes a typo from cdcd552 (should be sizeof - 1, not sizeof -i). 1106c82dfdfbSmrg Code flows that i is at most sizeof(scanBuf) - 1, so last is not needed. 1107c82dfdfbSmrg 1108c82dfdfbSmrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 1109c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 1110c82dfdfbSmrg 1111c82dfdfbSmrgcommit 0ebdf47fd4bc434ac3d2339544c022a869510738 1112c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 1113c82dfdfbSmrgDate: Thu Jul 11 13:53:31 2013 +1000 1114c82dfdfbSmrg 1115c82dfdfbSmrg Parse -w1 flag correctly (#66344) 1116c82dfdfbSmrg 1117c82dfdfbSmrg if the flag is "-w", then argv[i][1] is 'w' and unlikely to be a digit. 1118c82dfdfbSmrg Access [2] instead, which is either \0 or an actual digit. 1119c82dfdfbSmrg 1120c82dfdfbSmrg X.Org Bug 66344 <http://bugs.freedesktop.org/show_bug.cgi?id=66344> 1121c82dfdfbSmrg 1122c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 1123c82dfdfbSmrg Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1124c82dfdfbSmrg Reviewed-by: Matt Dew <marcoz@osource.org> 1125c82dfdfbSmrg 1126c82dfdfbSmrgcommit cdcd552041fc1325a2a81e3374fadb0dd15950dc 1127c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 1128c82dfdfbSmrgDate: Thu Jul 11 13:26:18 2013 +1000 1129c82dfdfbSmrg 1130c82dfdfbSmrg Always terminate the scanBuf string (#66345) 1131c82dfdfbSmrg 1132c82dfdfbSmrg If a key name exceeds 4 characters, the content of scanBuf is not 1133c82dfdfbSmrg null-terminated, giving error messages like 1134c82dfdfbSmrg 1135c82dfdfbSmrg syntax error: line 7 of test.xkb 1136c82dfdfbSmrg last scanned symbol is: FOOBARm 1137c82dfdfbSmrg Errors encountered in test.xkb; not compiled. 1138c82dfdfbSmrg 1139c82dfdfbSmrg (last character of the preceding 'maximum' statement in this case) 1140c82dfdfbSmrg 1141c82dfdfbSmrg X.Org Bug 66345 <http://bugs.freedesktop.org/show_bug.cgi?id=66345> 1142c82dfdfbSmrg 1143c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 1144c82dfdfbSmrg 1145c82dfdfbSmrgcommit 1cd5c50c54b06de2238d6d7675d0a3c65a21414d 1146c82dfdfbSmrgAuthor: Laura <lmemsm@gmail.com> 1147c82dfdfbSmrgDate: Fri Mar 15 11:21:26 2013 +0000 1148c82dfdfbSmrg 1149c82dfdfbSmrg Add #include <stdlib.h> to xkbscan.c 1150c82dfdfbSmrg 1151c82dfdfbSmrg This fixes an issue with _exit not declared when building xkbcomp 1152c82dfdfbSmrg version 1.2.4 natively on Windows using MinGW32 (version 4.7.2) 1153c82dfdfbSmrg from www.mingw.org. 1154c82dfdfbSmrg 1155c82dfdfbSmrg https://bugs.freedesktop.org/show_bug.cgi?id=62365 1156c82dfdfbSmrg 1157c82dfdfbSmrg Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1158c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1159c82dfdfbSmrg 1160c82dfdfbSmrgcommit ed582f4fccd4e23abcfba8b3b03649fea6414f44 1161c82dfdfbSmrgAuthor: Thomas Klausner <wiz@NetBSD.org> 1162c82dfdfbSmrgDate: Sun Jun 2 22:22:36 2013 +0200 1163c82dfdfbSmrg 1164c82dfdfbSmrg Protect config.h like usual. 1165c82dfdfbSmrg 1166c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 1167c82dfdfbSmrg 1168c82dfdfbSmrgcommit c66de126ad10a7220ab74e52fb7cc81b6d8b0993 1169c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 1170c82dfdfbSmrgDate: Tue May 21 15:19:35 2013 +1000 1171c82dfdfbSmrg 1172c82dfdfbSmrg man: document -help/-?, -em1, -emp, -eml 1173c82dfdfbSmrg 1174c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 1175c82dfdfbSmrg Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1176c82dfdfbSmrg 1177c82dfdfbSmrgcommit a4ff0f0eee046be846cc0f46edaba48b765e50d3 1178c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 1179c82dfdfbSmrgDate: Tue Apr 9 11:29:15 2013 +1000 1180c82dfdfbSmrg 1181c82dfdfbSmrg Use DEBUG, not DEBUG_ON to determine whether debugging is enabled 1182c82dfdfbSmrg 1183c82dfdfbSmrg Nothing else looks at DEBUG_ON. 1184c82dfdfbSmrg 1185c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 1186c82dfdfbSmrg Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1187c82dfdfbSmrg 1188c82dfdfbSmrgcommit 705b9bbb426410f9510601c7010da51184919b36 1189c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 1190c82dfdfbSmrgDate: Tue Jan 22 22:39:19 2013 -0800 1191c82dfdfbSmrg 1192c82dfdfbSmrg config: Add missing AC_CONFIG_SRCDIR 1193c82dfdfbSmrg 1194c82dfdfbSmrg Regroup AC statements under the Autoconf initialization section. 1195c82dfdfbSmrg Regroup AM statements under the Automake initialization section. 1196c82dfdfbSmrg 1197c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1198c82dfdfbSmrg 1199c82dfdfbSmrgcommit ed1b90216e59e6b3ac6ac5fd2faca8e056c76caa 1200c82dfdfbSmrgAuthor: Colin Walters <walters@verbum.org> 1201c82dfdfbSmrgDate: Wed Jan 16 13:02:57 2013 -0500 1202c82dfdfbSmrg 1203c82dfdfbSmrg autogen.sh: Honor NOCONFIGURE=1 1204c82dfdfbSmrg 1205c82dfdfbSmrg See http://people.gnome.org/~walters/docs/build-api.txt 1206c82dfdfbSmrg 1207c82dfdfbSmrg Signed-off-by: Adam Jackson <ajax@redhat.com> 1208c82dfdfbSmrg 1209c82dfdfbSmrgcommit 0522fab51eec0aa3e623aa17c5b7ea3aa6dfec45 1210c82dfdfbSmrgAuthor: Adam Jackson <ajax@redhat.com> 1211c82dfdfbSmrgDate: Wed Jan 16 13:01:21 2013 -0500 1212c82dfdfbSmrg 1213c82dfdfbSmrg configure: Drop AM_MAINTAINER_MODE 1214c82dfdfbSmrg 1215c82dfdfbSmrg Signed-off-by: Adam Jackson <ajax@redhat.com> 1216c82dfdfbSmrg 1217c82dfdfbSmrgcommit e4f767913338052527538d429931e8abd8c3fb88 1218c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 1219c82dfdfbSmrgDate: Fri Jan 4 18:37:45 2013 -0800 1220c82dfdfbSmrg 1221c82dfdfbSmrg unifdef -U__UNIXOS2__ 1222c82dfdfbSmrg 1223c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1224c82dfdfbSmrg 1225c82dfdfbSmrgcommit bd1103ef3cfef9cfed645566f944a69e7ca568b4 1226c82dfdfbSmrgAuthor: Ryan Pavlik <rpavlik@iastate.edu> 1227c82dfdfbSmrgDate: Wed Oct 26 12:17:44 2011 -0500 1228c82dfdfbSmrg 1229c82dfdfbSmrg Include Xwindows.h rather than windows.h 1230c82dfdfbSmrg 1231c82dfdfbSmrg Include the specially wrapped windows.h in Xwindows.h, rather than 1232c82dfdfbSmrg including it directly to avoid compilation errors due to clashing 1233c82dfdfbSmrg definitions 1234c82dfdfbSmrg 1235c82dfdfbSmrg Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu> 1236c82dfdfbSmrg Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> 1237c82dfdfbSmrg Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> 1238c82dfdfbSmrg 1239c82dfdfbSmrgcommit a68c5b7b29eb1433b1be73b50c4248e10eab8e64 1240c82dfdfbSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1241c82dfdfbSmrgDate: Thu Nov 1 16:37:03 2012 +1100 1242c82dfdfbSmrg 1243c82dfdfbSmrg Reset scan state when opening a new file 1244c82dfdfbSmrg 1245c82dfdfbSmrg When we opened a new file after encountering a parse error, we weren't 1246c82dfdfbSmrg resetting our scan state, and continued to read out of the old buffer 1247c82dfdfbSmrg rather than that of the new file. 1248c82dfdfbSmrg 1249c82dfdfbSmrg Fixes a regression introduced in 9887842e ('Use fread() instead of 1250c82dfdfbSmrg getc()'). 1251c82dfdfbSmrg 1252c82dfdfbSmrg Test case: 1253c82dfdfbSmrg xkbcomp -lfhlpR "path/to/xkeyboard-config.git/symbols/*" 1254c82dfdfbSmrg The Makefiles in that tree would cause parse errors, the resulting directory 1255c82dfdfbSmrg file is incomplete (down from ~12000 to ~230 lines). 1256c82dfdfbSmrg 1257c82dfdfbSmrg Reported-by: Peter Hutterer <peter.hutterer@who-t.net> 1258c82dfdfbSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 1259c82dfdfbSmrg 1260c82dfdfbSmrgcommit e119cbec7e750ffc4d4bd08b577db2c697035a30 1261c82dfdfbSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1262c82dfdfbSmrgDate: Wed Oct 31 12:40:49 2012 +1100 1263c82dfdfbSmrg 1264c82dfdfbSmrg Add parsing support for multiple keysyms per level 1265c82dfdfbSmrg 1266c82dfdfbSmrg Parse, but ignore, level definitions in the form of: 1267c82dfdfbSmrg key <FOO> { [ normal_sym, { M, U, L, T, I, S, Y, M } ] }; 1268c82dfdfbSmrg 1269c82dfdfbSmrg normal_sym will be carried, but the latter will be turned into NoSymbol. 1270c82dfdfbSmrg 1271c82dfdfbSmrg http://bugs.freedesktop.org/show_bug.cgi?id=25025 1272c82dfdfbSmrg 1273c82dfdfbSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 1274c82dfdfbSmrg 12751d8c7986Smrgcommit f2eff337176551f643e35c54c1e1ca0a78df69c6 12761d8c7986SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 12771d8c7986SmrgDate: Thu Mar 22 22:02:56 2012 -0700 12781d8c7986Smrg 12791d8c7986Smrg xkbcomp 1.2.4 12801d8c7986Smrg 12811d8c7986Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 12821d8c7986Smrg 12831d8c7986Smrgcommit b4fafc4fa7edc4c04c3c0affae0d7f79a63e8d2f 12841d8c7986SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 12851d8c7986SmrgDate: Wed Dec 28 20:57:55 2011 -0800 12861d8c7986Smrg 12871d8c7986Smrg Delete redundant redeclarations of extern Atoms in symbols.c 12881d8c7986Smrg 12891d8c7986Smrg Fixes gcc warnings of: 12901d8c7986Smrg 12911d8c7986Smrg symbols.c:43: warning: redundant redeclaration of 'tok_ONE_LEVEL' 12921d8c7986Smrg tokens.h:99: warning: previous declaration of 'tok_ONE_LEVEL' was here 12931d8c7986Smrg symbols.c:44: warning: redundant redeclaration of 'tok_TWO_LEVEL' 12941d8c7986Smrg tokens.h:100: warning: previous declaration of 'tok_TWO_LEVEL' was here 12951d8c7986Smrg symbols.c:45: warning: redundant redeclaration of 'tok_KEYPAD' 12961d8c7986Smrg tokens.h:102: warning: previous declaration of 'tok_KEYPAD' was here 12971d8c7986Smrg 12981d8c7986Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 12991d8c7986Smrg 13001d8c7986Smrgcommit 3835cae3cb1ad1073cbb2711f938beb878b4986c 13011d8c7986SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 13021d8c7986SmrgDate: Wed Dec 28 20:53:45 2011 -0800 13031d8c7986Smrg 13041d8c7986Smrg Make sure to leave room for trailing nil byte in yyGetNumber 13051d8c7986Smrg 13061d8c7986Smrg ...though really, by the time you've added 1023 digits to the number 13071d8c7986Smrg you want to parse, you've got much bigger problems than an off-by-one 13081d8c7986Smrg error in your buffer count. 13091d8c7986Smrg 13101d8c7986Smrg Fixes parfait warnings: 13111d8c7986Smrg Buffer overflow (CWE 120): In array dereference of (*buf)[nInBuf] with index 'nInBuf' 13121d8c7986Smrg Array size is 1024 bytes, nInBuf >= 1 and nInBuf <= 1024 13131d8c7986Smrg at line 625 of xkbscan.c in function 'yyGetNumber'. 13141d8c7986Smrg Buffer overflow (CWE 120): In array dereference of (*buf)[nInBuf] with index 'nInBuf' 13151d8c7986Smrg Array size is 1024 bytes, nInBuf <= 1025 13161d8c7986Smrg at line 632 of xkbscan.c in function 'yyGetNumber'. 13171d8c7986Smrg 13181d8c7986Smrg [ This bug was found by the Parfait 0.4.2 bug checking tool. 13191d8c7986Smrg For more information see http://labs.oracle.com/projects/parfait/ ] 13201d8c7986Smrg 13211d8c7986Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 13221d8c7986Smrg 13231d8c7986Smrgcommit 1447071942dbbbfc37b08417c74c8a1d302c1626 13241d8c7986SmrgAuthor: Andreas Wettstein <wettstein509@solnet.ch> 13251d8c7986SmrgDate: Fri Dec 2 20:10:06 2011 +0000 13261d8c7986Smrg 13271d8c7986Smrg include resets group compatibility modifiers #43091 13281d8c7986Smrg 13291d8c7986Smrg This change makes sure that include does not overwrite previous 13301d8c7986Smrg compatibility modifier settings when the included files does not 13311d8c7986Smrg explicitly specify them. 13321d8c7986Smrg 13331d8c7986Smrg Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch> 13341d8c7986Smrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 13351d8c7986Smrg 13361d8c7986Smrgcommit 5fd14db5b2cc0c2c43f7a1ddefd6f9991eb1dcc2 13371d8c7986SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com> 13381d8c7986SmrgDate: Fri Nov 11 11:18:43 2011 -0800 13391d8c7986Smrg 13401d8c7986Smrg Silence -Wparentheses-equality 13411d8c7986Smrg 13421d8c7986Smrg warning: equality comparison with extraneous parentheses [-Wparentheses-equality] 13431d8c7986Smrg 13441d8c7986Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 13451d8c7986Smrg 13461d8c7986Smrgcommit 6099655a4bbe1fd3e26b8afd2b91888ad2766086 13471d8c7986SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com> 13481d8c7986SmrgDate: Fri Nov 11 11:17:38 2011 -0800 13491d8c7986Smrg 13501d8c7986Smrg Silence -Wshadow warnings 13511d8c7986Smrg 13521d8c7986Smrg warning: declaration shadows a local variable [-Wshadow] 13531d8c7986Smrg 13541d8c7986Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 13551d8c7986Smrg 13561d8c7986Smrgcommit b7e88debd937be147d3581b9c8720c0bfe354052 13571d8c7986SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com> 13581d8c7986SmrgDate: Fri Nov 11 11:13:42 2011 -0800 13591d8c7986Smrg 13601d8c7986Smrg Correct our zeroing out of the row in InitRowInfo 13611d8c7986Smrg 13621d8c7986Smrg geometry.c:369:20: warning: argument to 'sizeof' in '__builtin___memset_chk' call is the same 13631d8c7986Smrg pointer type 'RowInfo *' (aka 'struct _RowInfo *') as the destination; expected 'RowInfo' 13641d8c7986Smrg (aka 'struct _RowInfo') or an explicit length [-Wsizeof-pointer-memaccess] 13651d8c7986Smrg bzero(row, sizeof(RowInfo *)); 13661d8c7986Smrg ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~ 13671d8c7986Smrg 13681d8c7986Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 13691d8c7986Smrg 13701d8c7986Smrgcommit 33b5c9413463613d341d15184b34a4f4c4e70e56 13711d8c7986SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com> 13721d8c7986SmrgDate: Fri Nov 11 11:12:22 2011 -0800 13731d8c7986Smrg 13741d8c7986Smrg Fix -Wformat warnings 13751d8c7986Smrg 13761d8c7986Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 13771d8c7986Smrg 13781d8c7986Smrgcommit b9f6482d5fc413222334c2370ef8b9693f4b50fd 13791d8c7986SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com> 13801d8c7986SmrgDate: Fri Nov 11 11:07:30 2011 -0800 13811d8c7986Smrg 13821d8c7986Smrg Add missing _X_NORETURN to uFatalError 13831d8c7986Smrg 13841d8c7986Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 13851d8c7986Smrg 13861d8c7986Smrgcommit 8ea06128c70b07c265a217222f2a245aad4bfce4 13871d8c7986SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com> 13881d8c7986SmrgDate: Fri Nov 11 11:06:02 2011 -0800 13891d8c7986Smrg 13901d8c7986Smrg Include strings.h for strcasecmp and string.h for strdup 13911d8c7986Smrg 13921d8c7986Smrg Our minimum requirement for X11 is currently Unix98. Unix98 provides 13931d8c7986Smrg strcasecmp in <strings.h>. This commit fixes implicit declarations 13941d8c7986Smrg of this function on systems that closely adhere to the standard. 13951d8c7986Smrg 13961d8c7986Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 13971d8c7986Smrg 13981d8c7986Smrgcommit 89c8317ad84386f69d31f38dcddbc7ff0abffb31 13991d8c7986SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 14001d8c7986SmrgDate: Tue Jul 5 08:23:37 2011 +1000 14011d8c7986Smrg 14021d8c7986Smrg Add .pc file for version export 14031d8c7986Smrg 14041d8c7986Smrg Exports xkbcomp version and the xkb base directory. 14051d8c7986Smrg 14061d8c7986Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 14071d8c7986Smrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 14081d8c7986Smrg Reviewed-by: Gaetan Nadon <memsize@videotron.ca> 14091d8c7986Smrg 14101d8c7986Smrgcommit cdb8677f370b34a3a523a32ae0023c7e8c0c965c 14111d8c7986SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 14121d8c7986SmrgDate: Wed Jun 22 10:41:33 2011 +1000 14131d8c7986Smrg 14141d8c7986Smrg Print version number on -version. 14151d8c7986Smrg 14161d8c7986Smrg This commit isn't playing the WARN/M/M1 macro game. Version numbers to to 14171d8c7986Smrg stdout, full stop. 14181d8c7986Smrg 14191d8c7986Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 14201d8c7986Smrg Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 14211d8c7986Smrg 1422690143ccSmrgcommit cef4ba4b8fdc9a5439f71437c08cf690a750bd6b 1423690143ccSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1424690143ccSmrgDate: Tue Jun 21 16:04:45 2011 +0100 1425690143ccSmrg 1426690143ccSmrg Bump to 1.2.3 1427690143ccSmrg 1428690143ccSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 1429690143ccSmrg 1430690143ccSmrgcommit 3caab5aa37decb7b5dc1642a0452efc3e1f5100e 1431690143ccSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1432690143ccSmrgDate: Tue Jun 21 15:55:59 2011 +0100 1433690143ccSmrg 1434690143ccSmrg Interp: Allow explicit Any/NoSymbol mappings 1435690143ccSmrg 1436690143ccSmrg Brown paper bag in full effect. 1437690143ccSmrg 1438690143ccSmrg The previous fix, while crushing the previous problem where an unknown 1439690143ccSmrg keysym for an interp def would lead to every key matching it, also 1440690143ccSmrg ignored explicit Any+AnyOfOrNone(All) mappings. 1441690143ccSmrg 1442690143ccSmrg Such as the one xkeyboard-config relied on for Control to actually 1443690143ccSmrg update the modifier state. 1444690143ccSmrg 1445690143ccSmrg Fix this by allowing mappings explicitly declared as Any/NoSymbol, while 1446690143ccSmrg ignoring only those with failed keysym lookups. Unfortunately, due to 1447690143ccSmrg the structure of the parser, it's a deeply inelegant fix. 1448690143ccSmrg 1449690143ccSmrg Verified with a quick check of all layouts (albeit using default 1450690143ccSmrg variants only) in xkeyboard-config that this results in no changes to 1451690143ccSmrg the output at all, compared to xkbcomp 1.1.1. 1452690143ccSmrg 1453690143ccSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 1454690143ccSmrg 1455690143ccSmrgcommit b34af8b0aec3a1dfc58f9732996274cbf2646a53 1456690143ccSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1457690143ccSmrgDate: Tue Jun 21 15:55:28 2011 +0100 1458690143ccSmrg 1459690143ccSmrg Constify LookupKeysym input argument 1460690143ccSmrg 1461690143ccSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 1462690143ccSmrg 1463690143ccSmrgcommit e68a8ef1067f98056237d8067052e2a0d9896133 1464690143ccSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1465690143ccSmrgDate: Tue Jun 21 14:06:05 2011 +0100 1466690143ccSmrg 1467690143ccSmrg Bump to 1.2.2 1468690143ccSmrg 1469690143ccSmrg Emergency bugfix for the syminterp declarations. They've been broken 1470690143ccSmrg since the beginning of time, but I guess we just haven't added new 1471690143ccSmrg interpreted symbols since around then. 1472690143ccSmrg 1473690143ccSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 1474690143ccSmrg 1475690143ccSmrgcommit 2a473b906943ffd807ad81960c47530ee7ae9a60 1476690143ccSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1477690143ccSmrgDate: Tue Jun 21 14:03:53 2011 +0100 1478690143ccSmrg 1479690143ccSmrg Interp: Ignore NoSymbol definitions 1480690143ccSmrg 1481690143ccSmrg A NoSymbol syminterp leads to a Any+AnyOfOrAll(None) definition, which 1482690143ccSmrg is never what anyone would actually ever want in a sym interp. The 1483690143ccSmrg failure mode here was: 1484690143ccSmrg interpret XF86SomeKeysymYouDontHaveYet { 1485690143ccSmrg action=Something() 1486690143ccSmrg } 1487690143ccSmrg leading to: 1488690143ccSmrg interpret Any+AnyOfOrAll(None) { 1489690143ccSmrg action=Something() 1490690143ccSmrg } 1491690143ccSmrg leading to every single non-action key triggering your shiny new action 1492690143ccSmrg that was only supposed to come from a new keysym. 1493690143ccSmrg 1494690143ccSmrg At least you could VT switch or zap, I guess. 1495690143ccSmrg 1496690143ccSmrg Later, more invasive, revisions will bring a more useful error message. 1497690143ccSmrg 1498690143ccSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 1499690143ccSmrg 1500690143ccSmrgcommit a2816345e58c88f5806a5c6df310c7d9c62264f0 1501690143ccSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1502690143ccSmrgDate: Tue Jun 21 14:03:12 2011 +0100 1503690143ccSmrg 1504690143ccSmrg Interp: Don't make modifier lookup failure fatal 1505690143ccSmrg 1506690143ccSmrg If we can't look up a modifier in a SymInterp declaration, don't make 1507690143ccSmrg that fatal enough to kill the entire file, just ignore it and move on. 1508690143ccSmrg 1509690143ccSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 1510690143ccSmrg 1511690143ccSmrgcommit c7a42b364f0ca06d9859945fa11664d0e0ea2742 1512690143ccSmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 1513690143ccSmrgDate: Tue Mar 8 08:16:35 2011 -0500 1514690143ccSmrg 1515690143ccSmrg config: move pre-processor flags to AM_CPPFLAGS 1516690143ccSmrg 1517690143ccSmrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 1518690143ccSmrg 1519690143ccSmrgcommit 7899a1f4745c8d111dab4dd3abc2b59b40ecdcbc 1520690143ccSmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 1521690143ccSmrgDate: Tue Mar 8 08:02:54 2011 -0500 1522690143ccSmrg 1523690143ccSmrg config: let Automake handle Yacc dist and cleaning 1524690143ccSmrg 1525690143ccSmrg BUILT_SOURCES and MAINTAINERCLEANFILES are already handled by Automake. 1526690143ccSmrg 1527690143ccSmrg Automake generates all the rules to handle building, 1528690143ccSmrg distribution and cleaning. 1529690143ccSmrg 1530690143ccSmrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 1531690143ccSmrg 1532690143ccSmrgcommit 137418c63d01d5db0dcaed257d7a26865efa53ae 1533690143ccSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 1534690143ccSmrgDate: Tue Jun 7 23:47:32 2011 -0700 1535690143ccSmrg 1536690143ccSmrg Replace repeated checks for gcc with _X_ATTRIBUTE_PRINTF from xproto 1537690143ccSmrg 1538690143ccSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1539690143ccSmrg Reviewed-by: Mark Kettenis <kettenis@openbsd.org> 1540690143ccSmrg 1541690143ccSmrgcommit a2877e92bd9f9c1532b5cd12cc484ff3cdbc6a0a 1542690143ccSmrgAuthor: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> 1543690143ccSmrgDate: Fri Apr 1 20:26:30 2011 +1100 1544690143ccSmrg 1545690143ccSmrg xkbcomp: Stop possible overflow in yyGetnumber. #31647 1546690143ccSmrg 1547690143ccSmrg Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=31647 1548690143ccSmrg 1549690143ccSmrg Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> 1550690143ccSmrg Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> 1551690143ccSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 1552690143ccSmrg 1553690143ccSmrgcommit 0b8527a3836cde77269461e22844857bf33e0aea 1554690143ccSmrgAuthor: Julien Cristau <jcristau@debian.org> 1555690143ccSmrgDate: Sun Feb 13 13:03:05 2011 +0100 1556690143ccSmrg 1557690143ccSmrg Inline the oiText macro in the only place it's used 1558690143ccSmrg 1559690143ccSmrg Gets rid of a compiler warning: 1560690143ccSmrg geometry.c: In function 'HandleOverlayDef': 1561690143ccSmrg geometry.c:2578: warning: the address of 'ol' will always evaluate as 'true' 1562690143ccSmrg 1563690143ccSmrg X.Org bug#34219 <https://bugs.freedesktop.org/show_bug.cgi?id=34219> 1564690143ccSmrg 1565690143ccSmrg Signed-off-by: Julien Cristau <jcristau@debian.org> 1566690143ccSmrg Reviewed-by: Dirk Wallenstein <halsmit@t-online.de> 1567690143ccSmrg 156807d2e718Smrgcommit c8375bcb7eb9f86ca1534cdf1143e91372d0499e 156907d2e718SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 157007d2e718SmrgDate: Fri Feb 11 09:06:04 2011 +1000 157107d2e718Smrg 157207d2e718Smrg xkbcomp 1.2.1 157307d2e718Smrg 157407d2e718Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 157507d2e718Smrg 157607d2e718Smrgcommit ab5371cefe2b7438b74338f71ff890e0e868b3df 157707d2e718SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 157807d2e718SmrgDate: Wed Jan 19 10:06:56 2011 -0500 157907d2e718Smrg 158007d2e718Smrg config: move man pages into their own directory 158107d2e718Smrg 158207d2e718Smrg Use services provided by XORG_MANPAGE_SECTIONS. 158307d2e718Smrg Use standard Makefile for man pages. 158407d2e718Smrg 158507d2e718Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 158607d2e718Smrg 158707d2e718Smrgcommit 9ce8e2f42ab7695b5165ff0a3d892df96a3c3f01 158807d2e718SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 158907d2e718SmrgDate: Thu Jan 13 11:15:47 2011 -0500 159007d2e718Smrg 159107d2e718Smrg man: remove trailing spaces and tabs 159207d2e718Smrg 159307d2e718Smrg Using s/[ \t]*$// 159407d2e718Smrg 159507d2e718Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 159607d2e718Smrg 159707d2e718Smrgcommit 5ecf21cc130d7a45cb5e82e9c2c3025edee5d74f 159807d2e718SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 159907d2e718SmrgDate: Wed Jan 12 16:28:02 2011 -0500 160007d2e718Smrg 160107d2e718Smrg config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS 160207d2e718Smrg 160307d2e718Smrg This silences an Autoconf warning 160407d2e718Smrg 160507d2e718Smrgcommit e27e8c2a15ddcf51b2ea58f8eced7f035aa1301e 160607d2e718SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 160707d2e718SmrgDate: Wed Jan 12 15:29:50 2011 -0500 160807d2e718Smrg 160907d2e718Smrg config: replace deprecated AC_HELP_STRING with AS_HELP_STRING 161007d2e718Smrg 161107d2e718Smrg This silences an Automake warning. 161207d2e718Smrg 161307d2e718Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 161407d2e718Smrg 161507d2e718Smrgcommit f524cfae6951442c9a9da65ef317b9c04199500f 161607d2e718SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 161707d2e718SmrgDate: Tue Jan 4 00:05:18 2011 -0800 161807d2e718Smrg 161907d2e718Smrg Remove out-of-date copies of README.config & README.enhancing 162007d2e718Smrg 162107d2e718Smrg The up-to-date master copies of those documents are found in the 162207d2e718Smrg xorg-docs module, and posted on the X.Org website. 162307d2e718Smrg 162407d2e718Smrg Also, x-docs.org no longer carries X11 docs, so point to X.Org's 162507d2e718Smrg website instead in the README. 162607d2e718Smrg 162707d2e718Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 162807d2e718Smrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 162907d2e718Smrg 163007d2e718Smrgcommit cc55d8f5ab021861308b071aab9c03016be15187 163107d2e718SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 163207d2e718SmrgDate: Sun Oct 31 20:35:24 2010 -0400 163307d2e718Smrg 163407d2e718Smrg config: replace AC_CHECK_FILE with test -f as it fails to cross-compile 163507d2e718Smrg 163607d2e718Smrg Testing for the presence of xkbparse.c is legitimate as this is a build 163707d2e718Smrg file, but the Autoconf macro assumes it is testing on the host system 163807d2e718Smrg and fails. 163907d2e718Smrg 164007d2e718Smrg Tested-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org> 164107d2e718Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 164207d2e718Smrg 164307d2e718Smrgcommit 1d59f5b0387b18028017cfab4e55b703417dd735 164407d2e718SmrgAuthor: Dirk Wallenstein <halsmit@t-online.de> 164507d2e718SmrgDate: Fri Oct 29 13:08:25 2010 +0200 164607d2e718Smrg 164707d2e718Smrg man: Improve description of device selection option 164807d2e718Smrg 164907d2e718Smrg The device selection option takes effect when loading keymaps, too. 165007d2e718Smrg 165107d2e718Smrg Signed-off-by: Dirk Wallenstein <halsmit@t-online.de> 165207d2e718Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 165307d2e718Smrg 165407d2e718Smrgcommit 281c7744f682c1ba4f44c0ee22f9bf7188c14fe6 165507d2e718SmrgAuthor: Dirk Wallenstein <halsmit@t-online.de> 165607d2e718SmrgDate: Fri Oct 29 11:35:10 2010 +0200 165707d2e718Smrg 165807d2e718Smrg Allow uploading a keymap to a single device 165907d2e718Smrg 166007d2e718Smrg Signed-off-by: Dirk Wallenstein <halsmit@t-online.de> 166107d2e718Smrg Reviewed-by: Julien Cristau <jcristau@debian.org> 166207d2e718Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 166307d2e718Smrg 166483e5f723Smrgcommit 851a5f6e0c1b2a98d4714d95e40198ab5dc61607 166583e5f723SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 166683e5f723SmrgDate: Sat Oct 30 09:59:52 2010 -0700 166783e5f723Smrg 166883e5f723Smrg xkbcomp 1.2.0 166983e5f723Smrg 167083e5f723Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 167183e5f723Smrg 167283e5f723Smrgcommit 87576c9ebf0f28d66833bb28a8199df1aa01f693 167383e5f723SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 167483e5f723SmrgDate: Thu Sep 23 20:29:57 2010 -0700 167583e5f723Smrg 167683e5f723Smrg config: Remove unnecessary calls from configure.ac 167783e5f723Smrg 167883e5f723Smrg AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now 167983e5f723Smrg PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables 168083e5f723Smrg 168183e5f723Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 168283e5f723Smrg 168383e5f723Smrgcommit d083293a4e227e9dd27f74cde391fde4c5824b0c 168483e5f723SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 168583e5f723SmrgDate: Thu Sep 23 20:29:14 2010 -0700 168683e5f723Smrg 168783e5f723Smrg config: upgrade to util-macros 1.8 for additional man page support 168883e5f723Smrg 168983e5f723Smrg Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS 169083e5f723Smrg The value of MAN_SUBST is the same for all X.Org packages. 169183e5f723Smrg 169283e5f723Smrg Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS 169383e5f723Smrg The existing statement can now be removed from the configuration file. 169483e5f723Smrg 169583e5f723Smrg Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) 169683e5f723Smrg Enables silent rule and use platform appropriate version of sed. 169783e5f723Smrg 169883e5f723Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 169983e5f723Smrg 170083e5f723Smrgcommit 8f13f1af68fc55b7567a4eb4462a0c911722a3c4 170183e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 170283e5f723SmrgDate: Tue Jul 20 18:45:18 2010 -0400 170383e5f723Smrg 170483e5f723Smrg config: update AC_PREREQ statement to 2.60 170583e5f723Smrg 170683e5f723Smrg Unrelated to the previous patches, the new value simply reflects 170783e5f723Smrg the reality that the minimum level for autoconf to configure 170883e5f723Smrg all x.org modules is 2.60 dated June 2006. 170983e5f723Smrg 171083e5f723Smrg ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz 171183e5f723Smrg 171283e5f723Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 171383e5f723Smrg 171483e5f723Smrgcommit 988eb0e121c0f2c992031002acb7274c2026764b 171583e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 171683e5f723SmrgDate: Mon Jul 12 10:53:34 2010 +0100 171783e5f723Smrg 171883e5f723Smrg config: allow to build tarball when yacc is missing 171983e5f723Smrg 172083e5f723Smrg Autoconf does not handle this scenario as well as Automake does. 172183e5f723Smrg If xkbparse.c is already there, do not abort the configuration 172283e5f723Smrg if yacc is missing as it is not needed. 172383e5f723Smrg 172483e5f723Smrg If both xkbparse.c and yacc are missing, abort configuration. 172583e5f723Smrg Yacc is a required tool to build the package. 172683e5f723Smrg 172783e5f723Smrg Reported-by: Julien Cristau <jcristau@debian.org> 172883e5f723Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 172983e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 173083e5f723Smrg 173183e5f723Smrgcommit 446d226f85433aeb45834b65f966397ad6fbb17f 173283e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 173383e5f723SmrgDate: Mon Jul 12 10:37:49 2010 +0100 173483e5f723Smrg 173583e5f723Smrg limits.h is mandated by C89, no need to check for it 173683e5f723Smrg 173783e5f723Smrg Alan Coopersmith pointed out that C89 mandates limits.h, so for once in 173883e5f723Smrg X's life, checking for a system header is just being unnecessarily 173983e5f723Smrg paranoid. 174083e5f723Smrg 174183e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 174283e5f723Smrg 174383e5f723Smrgcommit 61b3d4b024d8146cb0e7659aa958045ceb72c482 174483e5f723SmrgAuthor: Julien Cristau <jcristau@debian.org> 174583e5f723SmrgDate: Mon Jul 12 10:28:32 2010 +0100 174683e5f723Smrg 174783e5f723Smrg Fix signedness issue with getc() return value 174883e5f723Smrg 174983e5f723Smrg getc() and ungetc() return and take, respectively, an int rather than a 175083e5f723Smrg char to allow for error values as well. Oops. 175183e5f723Smrg 175283e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 175383e5f723Smrg 175483e5f723Smrgcommit a281386fa887e6bf4110840779aed46dd0ac89b6 175583e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 175683e5f723SmrgDate: Fri Jul 9 19:34:29 2010 +0100 175783e5f723Smrg 175883e5f723Smrg Fix parsing of 0x1a2b3c4d-style symbols 175983e5f723Smrg 176083e5f723Smrg Raw keysyms were not getting parsed correctly, due to forgetting to add 176183e5f723Smrg the code to libX11, forgetting to add the backwards-compat code for old 176283e5f723Smrg libX11s, and then stuffing the lexing up anyway. Yeesh. 176383e5f723Smrg 176483e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 176583e5f723Smrg 176683e5f723Smrgcommit 0b04ecbb7a6afb223c91d3b15baab0bc48542281 176783e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 176883e5f723SmrgDate: Tue Jun 15 19:26:19 2010 +0100 176983e5f723Smrg 177083e5f723Smrg Fix gcc warnings 177183e5f723Smrg 177283e5f723Smrg It was right too: printf was being misused in some spots. 177383e5f723Smrg 177483e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 177583e5f723Smrg 177683e5f723Smrgcommit 41b0857c8c1179b87a26888588cbfff28f8bb0d6 177783e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 177883e5f723SmrgDate: Tue Jun 8 15:11:19 2010 +0100 177983e5f723Smrg 178083e5f723Smrg Don't malloc() and free() most scanned symbols 178183e5f723Smrg 178283e5f723Smrg Use a constant buffer. Sigh. 178383e5f723Smrg 178483e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 178583e5f723Smrg 178683e5f723Smrgcommit 7f7a57c75beb5e1dfb53351e490ef00a324b2727 178783e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 178883e5f723SmrgDate: Tue Jun 8 12:14:00 2010 +0100 178983e5f723Smrg 179083e5f723Smrg Fix compilation with DEBUG 179183e5f723Smrg 179283e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 179383e5f723Smrg 179483e5f723Smrgcommit 9887842e33174a6e98675b912e419c711dd20c0f 179583e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 179683e5f723SmrgDate: Mon Jun 7 22:45:13 2010 +0100 179783e5f723Smrg 179883e5f723Smrg Use fread() instead of getc() 179983e5f723Smrg 180083e5f723Smrg So, it turns out that if you're parsing a fairly large amount of data, 180183e5f723Smrg using getc() to get all the input rather than, say, read(), is some kind 180283e5f723Smrg of remarkably daft and unperformant idea. 180383e5f723Smrg 180483e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 180583e5f723Smrg 180683e5f723Smrgcommit 02de53d767b20bab1517b4e8a3e7eb3b9e7f15be 180783e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 180883e5f723SmrgDate: Mon Jun 7 22:43:01 2010 +0100 180983e5f723Smrg 181083e5f723Smrg Lazy keysym parsing (avoid XStringToKeysym) 181183e5f723Smrg 181283e5f723Smrg Instead of calling XStringToKeysym on every keysym we parse, store it as 181383e5f723Smrg a string until we need to store it in an actual keymap. 181483e5f723Smrg 181583e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 181683e5f723Smrg 181783e5f723Smrgcommit 07cc4d60dea2b4c947fed45b082edae4a53b186a 181883e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 181983e5f723SmrgDate: Wed Jun 2 15:23:58 2010 -0400 182083e5f723Smrg 182183e5f723Smrg config: add check for yacc to insure it is installed #27973 182283e5f723Smrg 182383e5f723Smrg Unlike other macros AC_PROG_YACC sets the YACC variable to "yacc" 182483e5f723Smrg as a last resort, even if no programs have been found. Improve error 182583e5f723Smrg checking by issuing an error message if yacc is not found. The module 182683e5f723Smrg cannot build anyway. 182783e5f723Smrg 182883e5f723Smrg Reported-by: Peter Hutterer <peter.hutterer@who-t.net> 182983e5f723Smrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 183083e5f723Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 183183e5f723Smrg 183283e5f723Smrgcommit 7888738047e9f1545aa1905b4a2a0654686f49a8 183383e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 183483e5f723SmrgDate: Thu Feb 11 10:08:07 2010 -0500 183583e5f723Smrg 183683e5f723Smrg config: move CWARNFLAGS from configure.ac to Makefile.am 183783e5f723Smrg 183883e5f723Smrg Compiler warning flags should be explicitly set in the makefile 183983e5f723Smrg rather than being merged with other packages compiler flags. 184083e5f723Smrg 184183e5f723Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 184283e5f723Smrg 184383e5f723Smrgcommit ba906359da32644b40b3a8a71e77d3cabca56efe 184483e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 184583e5f723SmrgDate: Thu Nov 26 09:19:54 2009 -0500 184683e5f723Smrg 184783e5f723Smrg Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES 184883e5f723Smrg 184983e5f723Smrg Now that the INSTALL file is generated. 185083e5f723Smrg Allows running make maintainer-clean. 185183e5f723Smrg 185283e5f723Smrgcommit 667f0a0e5d3143533cbbe5979ef82c13cfa62c3a 185383e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 185483e5f723SmrgDate: Wed Oct 28 14:09:08 2009 -0400 185583e5f723Smrg 185683e5f723Smrg INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 185783e5f723Smrg 185883e5f723Smrg Add missing INSTALL file. Use standard GNU file on building tarball 185983e5f723Smrg README may have been updated 186083e5f723Smrg Remove AUTHORS file as it is empty and no content available yet. 186183e5f723Smrg Remove NEWS file as it is empty and no content available yet. 186283e5f723Smrg 186383e5f723Smrgcommit 4b7c8a8ef337614c831b2555afeb6d89dbc14fb1 186483e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 186583e5f723SmrgDate: Tue Oct 27 15:07:25 2009 -0400 186683e5f723Smrg 186783e5f723Smrg Deploy the new XORG_DEFAULT_OPTIONS #24242 186883e5f723Smrg 186983e5f723Smrg This macro aggregate a number of existing macros that sets commmon 187083e5f723Smrg X.Org components configuration options. It shields the configuration file from 187183e5f723Smrg future changes. 187283e5f723Smrg 187383e5f723Smrgcommit 5fa9ef7e5e87f875dd92cc33403cebf6c60c557f 187483e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 187583e5f723SmrgDate: Mon Oct 26 22:08:39 2009 -0400 187683e5f723Smrg 187783e5f723Smrg Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 187883e5f723Smrg 187983e5f723Smrg ChangeLog filename is known to Automake and requires no further 188083e5f723Smrg coding in the makefile. 188183e5f723Smrg 188283e5f723Smrgcommit b3a52787e0dad42ea7e8da26926b9533b1ecab84 188383e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 188483e5f723SmrgDate: Thu Oct 22 12:34:15 2009 -0400 188583e5f723Smrg 188683e5f723Smrg .gitignore: use common defaults with custom section # 24239 188783e5f723Smrg 188883e5f723Smrg Using common defaults will reduce errors and maintenance. 188983e5f723Smrg Only the very small or inexistent custom section need periodic maintenance 189083e5f723Smrg when the structure of the component changes. Do not edit defaults. 189183e5f723Smrg 189283e5f723Smrgcommit fa7e3ff7b49f76294aa14aa8bf1b8adbceb5d340 189383e5f723SmrgAuthor: Jeremy Huddleston <jeremyhu@freedesktop.org> 189483e5f723SmrgDate: Wed Oct 21 12:47:21 2009 -0700 189583e5f723Smrg 189683e5f723Smrg This is not a GNU project, so declare it foreign. 189783e5f723Smrg 189883e5f723Smrg On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: 189983e5f723Smrg > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: 190083e5f723Smrg > > I noticed an INSTALL file in xlsclients and libXvMC today, and it 190183e5f723Smrg > > was quite annoying to work around since 'autoreconf -fvi' replaces 190283e5f723Smrg > > it and git wants to commit it. Should these files even be in git? 190383e5f723Smrg > > Can I nuke them for the betterment of humanity and since they get 190483e5f723Smrg > > created by autoreconf anyways? 190583e5f723Smrg > 190683e5f723Smrg > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 190783e5f723Smrg 190883e5f723Smrg As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with 190983e5f723Smrg AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation 191083e5f723Smrg of the INSTALL file. It is also part of the 24206 solution. 191183e5f723Smrg 191283e5f723Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org> 191383e5f723Smrg 19145fac8b10Smrgcommit a5160032d7e46473b8702b87a546071fc0c0978c 19155fac8b10SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 19165fac8b10SmrgDate: Sat Oct 3 21:12:47 2009 +1000 19175fac8b10Smrg 19185fac8b10Smrg xkbcomp 1.1.1 19195fac8b10Smrg 19205fac8b10Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 19215fac8b10Smrg 19225fac8b10Smrgcommit a36ca5ba61e2b97398a79713922644fee1a263d1 19235fac8b10SmrgAuthor: Rami Ylimaki <ext-rami.ylimaki@nokia.com> 19245fac8b10SmrgDate: Wed Aug 5 17:16:16 2009 +0300 19255fac8b10Smrg 19265fac8b10Smrg xkbcomp: Remove output file if closing fails. 19275fac8b10Smrg 19285fac8b10Smrg Without the fix xkbcomp may leave a truncated file in the filesystem 19295fac8b10Smrg if there is not enough disk space. Using the truncated file leads to 19305fac8b10Smrg problems. 19315fac8b10Smrg 19325fac8b10Smrg Signed-off-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com> 19335fac8b10Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 19345fac8b10Smrg 193534345a63Smrgcommit 2cc1dc9a327a5100043d3d54e899b98b81cdf5f5 193634345a63SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 193734345a63SmrgDate: Thu Jul 9 08:34:21 2009 +1000 193834345a63Smrg 193934345a63Smrg Bump to 1.1.0. 194034345a63Smrg 194134345a63Smrgcommit eeaa4aec798ef045d0b3b9de3c25932b85b9ac3d 194234345a63SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 194334345a63SmrgDate: Mon May 11 09:39:03 2009 -0700 194434345a63Smrg 194534345a63Smrg Use temporary buffer for generating Uxxx names to avoid overflow 194634345a63Smrg 194734345a63Smrg Instead of sprintf()'ing a 4 character string to a char [4] buffer, 194834345a63Smrg and leaving the trailing '\0' to overwrite into the next entry, 194934345a63Smrg snprintf() to a 5 character temp buffer and memcpy the 4 characters 195034345a63Smrg to the right place. 195134345a63Smrg 195234345a63Smrg Fixes parfait errors: 195334345a63Smrg Error: Buffer overflow at xkbcomp-1.0.4/misc.c:393 195434345a63Smrg in function 'ComputeKbdDefaults' [Standard C Library pattern matching] 195534345a63Smrg In sprintf related dereference of xkb->names->keys[i].name 195634345a63Smrg with index not less than '4' 195734345a63Smrg Destination array size is 4 bytes, data to be written is 4 bytes 195834345a63Smrg Error: Buffer overflow at xkbcomp-1.0.4/misc.c:402 195934345a63Smrg in function 'ComputeKbdDefaults' [Standard C Library pattern matching] 196034345a63Smrg In sprintf related dereference of xkb->names->keys[i].name 196134345a63Smrg with index not less than '4' 196234345a63Smrg Destination array size is 4 bytes, data to be written is 4 bytes 196334345a63Smrg 196434345a63Smrg [This bug was found by the Parfait bug checking tool. 196534345a63Smrg For more information see http://research.sun.com/projects/parfait ] 196634345a63Smrg 196734345a63Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> 196834345a63Smrg 196934345a63Smrgcommit 2fd42dae8840089727f95211abdb86316e566afd 197034345a63SmrgAuthor: Dan Nicholson <dbn.lists@gmail.com> 197134345a63SmrgDate: Sat Mar 7 16:36:51 2009 -0800 197234345a63Smrg 197334345a63Smrg Allow the default XKB config root to be set from configure 197434345a63Smrg 197534345a63Smrg The default was hardcoded in the Makefile as $(datadir)/share/X11/xkb. 197634345a63Smrg This could cause a problem if you are installing xkbcomp to an alternate 197734345a63Smrg location but want to continue using the system's XKB data. 197834345a63Smrg 197934345a63Smrg Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> 198034345a63Smrg 198134345a63Smrgcommit 3b816fe819bd849acdbabcfba769041bd3eab753 198234345a63SmrgAuthor: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> 198334345a63SmrgDate: Thu Jan 22 02:45:20 2009 -0200 198434345a63Smrg 198534345a63Smrg Correct a remaining of a wrong change to make some DEBUG_VAR's static. 198634345a63Smrg 198734345a63Smrgcommit f099da35386cf63d4935ba2613409ff28b3d7ea5 198834345a63SmrgAuthor: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> 198934345a63SmrgDate: Wed Jan 21 20:43:28 2009 -0200 199034345a63Smrg 199134345a63Smrg Correct make distcheck and most gcc and sparse warnings. 199234345a63Smrg 199334345a63Smrg Remaining warnings are due to macros that check address or vectors 199434345a63Smrg on the stack and auto generated yacc code. 199534345a63Smrg 199634345a63Smrg Compiled with default flags and also as: 199734345a63Smrg % make CFLAGS=-DENTRY_TRACKING_ON -DDEBUG_ON -DASSERTIONS_ON 199834345a63Smrg to ensure the "simplification" of code like: 199934345a63Smrg foo.c: 200034345a63Smrg <hash>define DEBUG_VAR foo_VAR 200134345a63Smrg <hash>include "foo.h" 200234345a63Smrg ... 200334345a63Smrg foo.h: 200434345a63Smrg <hash>ifdef DEBUG_VAR_NOT_LOCAL 200534345a63Smrg extern 200634345a63Smrg <hash>endif 200734345a63Smrg int DEBUG_VAR; 200834345a63Smrg ... 200934345a63Smrg did not change the author's "intended" logic. 201034345a63Smrg 201134345a63Smrgcommit 82cebb165b22d5409c9d4d31554a8da0c867e0d3 201234345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 201334345a63SmrgDate: Wed Sep 10 17:48:29 2008 +0930 201434345a63Smrg 201534345a63Smrg Check for NULL strings before calling strdup. 201634345a63Smrg 201734345a63Smrg Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> 201834345a63Smrg 201934345a63Smrgcommit a82e1dcc8ad095581402d05e5d1ae1bbf3646954 202034345a63SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 202134345a63SmrgDate: Fri Sep 5 15:07:13 2008 -0700 202234345a63Smrg 202334345a63Smrg sprintf -> snprintf conversions 202434345a63Smrg 202534345a63Smrgcommit d2d06305e1834548edd8a647564efa222a511b53 202634345a63SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 202734345a63SmrgDate: Fri Sep 5 14:44:51 2008 -0700 202834345a63Smrg 202934345a63Smrg Remove #if 0'd typedef that appears nowhere else. 203034345a63Smrg 203134345a63Smrgcommit acd277d7fd48ccfd8ef2ca052b4e144ee95a5d94 203234345a63SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 203334345a63SmrgDate: Fri Sep 5 14:32:15 2008 -0700 203434345a63Smrg 203534345a63Smrg Remove X_NOT_POSIX #ifdefs 203634345a63Smrg 203734345a63Smrg POSIX.1-1990 is well below the current minimum bar 203834345a63Smrg 203934345a63Smrgcommit 37b62a26716d3abf2ae07dd88cf54bc04d980bd8 204034345a63SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 204134345a63SmrgDate: Fri Sep 5 14:22:33 2008 -0700 204234345a63Smrg 204334345a63Smrg Check for strdup & strcasecmp before assuming we need to provide our own 204434345a63Smrg 204534345a63Smrgcommit 36fecff588199a3a6c007f09ff709f3148d40f77 204634345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 204734345a63SmrgDate: Tue Aug 19 16:33:03 2008 +0930 204834345a63Smrg 204934345a63Smrg Don't overwrite previously assigned type indices with useless ones. 205034345a63Smrg 205134345a63Smrg The default type for a key with no levels is ONE_LEVEL. 205234345a63Smrg Let's not overwrite the kt_index with this default type if we have previously 205334345a63Smrg assigned a real type. 205434345a63Smrg 205534345a63Smrg Reproduceable by running setxkbmap -layout "ru(phonetic),us", the first group 205634345a63Smrg is assigned ONE_LEVEL and shift stops working. 205734345a63Smrg 205834345a63Smrg Red Hat Bug #436626 <https://bugzilla.redhat.com/show_bug.cgi?id=436626> 205934345a63Smrg 206034345a63Smrgcommit d0dfd26e81aef53e9adf5fd6372d69e2ac7a8f9c 206134345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 206234345a63SmrgDate: Tue Aug 19 14:36:13 2008 +0930 206334345a63Smrg 206434345a63Smrg Remove unused merge parameter from HandleKeyNameVar. 206534345a63Smrg 206634345a63Smrgcommit 391ea45b2cadc7faeb6acb5d9ec7b405d67d46fd 206734345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 206834345a63SmrgDate: Tue Aug 19 14:35:39 2008 +0930 206934345a63Smrg 207034345a63Smrg Don't pass useless handlers around in HandleIncludeKeycodes. 207134345a63Smrg 207234345a63Smrg What use is a handler if we only ever use one function anyway? 207334345a63Smrg 207434345a63Smrgcommit f05f20fd203afdadbcd571023ed31638ccda1f88 207534345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 207634345a63SmrgDate: Thu Aug 21 17:28:22 2008 +0930 207734345a63Smrg 207834345a63Smrg More comments. 207934345a63Smrg 208034345a63Smrgcommit 1aad2a5d8ede9fe5212a4e6087fbe34aa170ac54 208134345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 208234345a63SmrgDate: Mon Aug 18 16:28:44 2008 +0930 208334345a63Smrg 208434345a63Smrg Remove useless longestPath variable. 208534345a63Smrg 208634345a63Smrgcommit 7aef93914e1d6446f64aa42eafa18375c2cb4bed 208734345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 208834345a63SmrgDate: Mon Aug 18 14:05:33 2008 +0930 208934345a63Smrg 209034345a63Smrg Silence valgrind warnings. 209134345a63Smrg 209234345a63Smrg "Conditional jump or move depends on uninitialised value(s)" 209334345a63Smrg 209434345a63Smrgcommit eb18e9176841b3ea64c497f1919686e134713eb6 209534345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 209634345a63SmrgDate: Mon Aug 11 18:01:48 2008 +0930 209734345a63Smrg 209834345a63Smrg Add some explanatory comments 209934345a63Smrg 210034345a63Smrgcommit 9b877d83947708259252275e14f6995dcf7c29ce 210134345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 210234345a63SmrgDate: Mon Aug 11 16:20:22 2008 +0930 210334345a63Smrg 210434345a63Smrg If we're not using XkbDesc, don't require it as a parameter. 210534345a63Smrg 210634345a63Smrgcommit ca32570cf16494fb8e0577de8b05ba18cb927ce1 210734345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 210834345a63SmrgDate: Mon Aug 11 15:47:09 2008 +0930 210934345a63Smrg 211034345a63Smrg Indent fixes. 211134345a63Smrg 211234345a63Smrg indent -cbi 0 -nprs -nut -npcs -i4 -bli 0 *.c *.h 211334345a63Smrg 211434345a63Smrgcommit 12e8f5e5b3f33dbd1290c76dd0d6a4cf832993d7 211534345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 211634345a63SmrgDate: Mon Aug 11 15:40:03 2008 +0930 211734345a63Smrg 211834345a63Smrg Add a few explanatory comments. 211934345a63Smrg 212034345a63Smrgcommit de48206e7fe2206542313a2d1d1ea3c40b06114b 212134345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 212234345a63SmrgDate: Mon Aug 11 15:14:31 2008 +0930 212334345a63Smrg 212434345a63Smrg Remove RCS tags. 212534345a63Smrg 212634345a63Smrgcommit 8eb2e1fcd08a05f296a31dbadde1ec3cc84d8e28 212734345a63SmrgAuthor: Matthieu Herrb <matthieu.herrb@laas.fr> 212834345a63SmrgDate: Mon May 12 23:25:47 2008 +0200 212934345a63Smrg 213034345a63Smrg Minimal man page addition for new -i option. 213134345a63Smrg 213234345a63Smrgcommit 12df85eb5b08d5fb815b0965714f120b05c6c670 213334345a63SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 213434345a63SmrgDate: Fri May 9 21:09:44 2008 +0300 213534345a63Smrg 213634345a63Smrg Bump to 1.0.5 213734345a63Smrg 2138f46a6179Smrgcommit 1aecdffaa0db7bbf85bc0aae9043e9437b25c30d 2139f46a6179SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 2140f46a6179SmrgDate: Thu Apr 17 00:52:29 2008 +0300 2141f46a6179Smrg 2142f46a6179Smrg Don't scan paths which make NO SENSE WHATSOEVER TO SCAN 2143f46a6179Smrg 2144f46a6179Smrg Hey, I wonder if we have XKB files in our directory! I wonder if we 2145f46a6179Smrg haven't bothered with a structure, and let's try to open a file called 2146f46a6179Smrg 'misc' in someone's home directory! What a surprise, it's not a valid 2147f46a6179Smrg XKB file! Let's fail miserably! 2148f46a6179Smrg 2149f46a6179Smrg SURPRISINGLY, THIS IS NOT USEFUL BEHAVIOUR. 2150f46a6179Smrg 2151f46a6179Smrgcommit a3a05fd489a9a35942a4419c537634e796dbebd1 2152f46a6179SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 2153f46a6179SmrgDate: Thu Apr 17 00:50:07 2008 +0300 2154f46a6179Smrg 2155f46a6179Smrg xkbcomp: Take a device ID argument 2156f46a6179Smrg 2157f46a6179Smrg Allows the user to set maps (or whatever) on arbitrary devices. 2158f46a6179Smrg 2159f46a6179Smrgcommit be084fbeba28312fc5102e98d64726464032c3e8 2160f46a6179SmrgAuthor: Adam Jackson <ajax@redhat.com> 2161f46a6179SmrgDate: Thu Mar 6 17:13:42 2008 -0500 2162f46a6179Smrg 2163f46a6179Smrg xkbcomp 1.0.4 2164f46a6179Smrg 2165f46a6179Smrgcommit c1cc023fc50ce3a4a23f4682ebefd2301fd13170 2166f46a6179SmrgAuthor: Adam Jackson <ajax@redhat.com> 2167f46a6179SmrgDate: Fri Feb 29 15:30:34 2008 -0500 2168f46a6179Smrg 2169f46a6179Smrg Bug #7645: Fix a conditional that always evaluates to FALSE. 2170f46a6179Smrg 2171f46a6179Smrg Since it's if (0 || foo), simplify to if (foo). 2172f46a6179Smrg 2173f46a6179Smrgcommit 3f8bd7e68d0028bce5075124a32cc004166486c6 2174f46a6179SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 2175f46a6179SmrgDate: Tue Jan 22 16:05:14 2008 -0800 2176f46a6179Smrg 2177f46a6179Smrg Bug 14185: MAINTAINERCLEANFILES multiply defined in Makefile.am 2178f46a6179Smrg 2179f46a6179Smrg <http://bugs.freedesktop.org/show_bug.cgi?id=14185> 2180f46a6179Smrg 2181f46a6179Smrgcommit 2421069a3686f7bff702383675fdb77be108021e 2182f46a6179SmrgAuthor: Matthieu Herrb <matthieu@bluenote.herrb.com> 2183f46a6179SmrgDate: Sun Jan 6 11:40:30 2008 +0100 2184f46a6179Smrg 2185f46a6179Smrg Revert "Also mark xkbparse.h as a generated file." 2186f46a6179Smrg Apparently only yacc generates it. 2187f46a6179Smrg 2188f46a6179Smrg This reverts commit 3e5b0d615b94c66a2b5a8b3d2e4a04713a442002. 2189f46a6179Smrg 2190f46a6179Smrgcommit 3e5b0d615b94c66a2b5a8b3d2e4a04713a442002 2191f46a6179SmrgAuthor: Matthieu Herrb <matthieu@bluenote.herrb.com> 2192f46a6179SmrgDate: Sun Jan 6 11:17:07 2008 +0100 2193f46a6179Smrg 2194f46a6179Smrg Also mark xkbparse.h as a generated file. 2195f46a6179Smrg 2196f46a6179Smrgcommit 686e8b6d33602f5fb7de7a768e532a4ac8090c26 2197f46a6179SmrgAuthor: James Cloos <cloos@jhcloos.com> 2198f46a6179SmrgDate: Thu Dec 6 16:37:18 2007 -0500 2199f46a6179Smrg 2200f46a6179Smrg Replace static ChangeLog with dist-hook to generate from git log 2201f46a6179Smrg 2202f46a6179Smrgcommit 6aae208fe5bd8f71757c294a441d7c599a1ec4a1 2203f46a6179SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 2204f46a6179SmrgDate: Sun Sep 23 20:15:47 2007 +0200 2205f46a6179Smrg 2206f46a6179Smrg Ignore *.o and ylwrap. 2207f46a6179Smrg 2208f46a6179Smrgcommit 829cb75130d1edd88fa1d33e277f49167daedacf 2209f46a6179SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 2210f46a6179SmrgDate: Sun Sep 23 20:15:13 2007 +0200 2211f46a6179Smrg 2212f46a6179Smrg Fixed a bunch of const correctness bugs. 2213f46a6179Smrg 2214f46a6179Smrgcommit e8ffa513a109209849b11a3c608356cc28314a8e 2215f46a6179SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 2216f46a6179SmrgDate: Sun Sep 23 17:50:41 2007 +0200 2217f46a6179Smrg 2218f46a6179Smrg Fixed an invalid memory access. 2219f46a6179Smrg 2220f46a6179Smrg Some keynames are less than 3 characters long (not counting the 2221f46a6179Smrg terminator). We're now also initializing all of the keyName array. 2222f46a6179Smrg 2223f46a6179Smrgcommit dfa65b0c8df6a6aab4f86c32a0acb41f44201e7c 2224f46a6179SmrgAuthor: Daniel Drake <ddrake@brontes3d.com> 2225f46a6179SmrgDate: Mon May 21 13:41:00 2007 -0800 2226f46a6179Smrg 2227f46a6179Smrg Bug #11025: xkbcomp COPYING file 2228f46a6179Smrg 2229f46a6179Smrg X.Org Bugzilla #11025 <https://bugs.freedesktop.org/show_bug.cgi?id=11025> 2230f46a6179Smrg 2231f46a6179Smrgcommit 3ca028cf767258fd62fb7a1b0eb22d13d333a3ae 2232f46a6179SmrgAuthor: James Cloos <cloos@jhcloos.com> 2233f46a6179SmrgDate: Mon Sep 3 05:51:25 2007 -0400 2234f46a6179Smrg 2235f46a6179Smrg Add *~ to .gitignore to skip patch/emacs droppings 2236f46a6179Smrg 2237f46a6179Smrgcommit b00e474ca8dbbb0166f2108e4b08cc3f9c36c735 2238f46a6179SmrgAuthor: James Cloos <cloos@jhcloos.com> 2239f46a6179SmrgDate: Thu Aug 23 19:24:52 2007 -0400 2240f46a6179Smrg 2241f46a6179Smrg Rename .cvsignore to .gitignore 2242f46a6179Smrg 2243f46a6179Smrgcommit 313a2748d3dff872e067d515d6deabe1bbd56fbe 2244f46a6179SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 2245f46a6179SmrgDate: Wed Nov 8 16:30:57 2006 +0200 2246f46a6179Smrg 2247f46a6179Smrg bump to 1.0.3 2248f46a6179Smrg 2249f46a6179Smrgcommit 337ed258a1cd3f5a16fa69ef15e98781e76f63a1 2250f46a6179SmrgAuthor: Etsushi Kato <ek.kato@gmail.com> 2251f46a6179SmrgDate: Wed Nov 8 16:29:16 2006 +0200 2252f46a6179Smrg 2253f46a6179Smrg compat: avoid use of uninitialised variable (bug #8846) 2254f46a6179Smrg si.interp.match may be unused, so just clobber it, which means we don't 2255f46a6179Smrg end up with stuff like LevelOneOnlyMask wandering in. 2256f46a6179Smrg 2257f46a6179Smrgcommit d920bbadb94684287f70e50ded2a35d65186c188 2258f46a6179SmrgAuthor: Andriy Gapon <avg@icyb.net.ua> 2259f46a6179SmrgDate: Sun Oct 29 02:59:53 2006 +0300 2260f46a6179Smrg 2261f46a6179Smrg parser: accept negative numbers in geometry co-ordinates (bug #8763) 2262f46a6179Smrg Accept negative co-ordinates for geometry, per the spec. 2263f46a6179Smrg 2264f46a6179Smrgcommit 0e8fd676de161ba52bb4544f8641be756bc580a1 2265f46a6179SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2266f46a6179SmrgDate: Wed Apr 26 23:41:58 2006 +0000 2267f46a6179Smrg 2268f46a6179Smrg Bump to 1.0.2 2269f46a6179Smrg 2270f46a6179Smrgcommit 58c77c8db1bfdc739fac7b100fb813028d0449c7 2271f46a6179SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 2272f46a6179SmrgDate: Mon Apr 3 11:28:43 2006 +0000 2273f46a6179Smrg 2274f46a6179Smrg Bug #4851: Fix up have-no-file test. 2275f46a6179Smrg 2276f46a6179Smrgcommit 02d32f8dbc79116d33ef428d5b064009cdd6a06e 2277f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 2278f46a6179SmrgDate: Wed Dec 21 02:29:51 2005 +0000 2279f46a6179Smrg 2280f46a6179Smrg Update package version for X11R7 release. 2281f46a6179Smrg 2282f46a6179Smrgcommit 836db774d1f08a050af8717c4c8501f337f36281 2283f46a6179SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2284f46a6179SmrgDate: Mon Dec 19 16:22:44 2005 +0000 2285f46a6179Smrg 2286f46a6179Smrg Stub COPYING files 2287f46a6179Smrg 2288f46a6179Smrgcommit e9f680c5654cd93d30b16bc4b626ae5b25f84e87 2289f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 2290f46a6179SmrgDate: Thu Dec 15 00:24:08 2005 +0000 2291f46a6179Smrg 2292f46a6179Smrg Update package version number for final X11R7 release candidate. 2293f46a6179Smrg 2294f46a6179Smrgcommit b158f550fce661d67604f4a23d33a9f3b7bc22a1 2295f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 2296f46a6179SmrgDate: Tue Dec 6 22:48:22 2005 +0000 2297f46a6179Smrg 2298f46a6179Smrg Change *man_SOURCES ==> *man_PRE to fix autotools warnings. 2299f46a6179Smrg 2300f46a6179Smrgcommit f1370c50b199c3c8b2760ebf0228d741855390d7 2301f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 2302f46a6179SmrgDate: Sat Dec 3 05:49:24 2005 +0000 2303f46a6179Smrg 2304f46a6179Smrg Update package version number for X11R7 RC3 release. 2305f46a6179Smrg 2306f46a6179Smrgcommit 8eb3737f5bce19b89c80d9ab256204f0fa62529b 2307f46a6179SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 2308f46a6179SmrgDate: Mon Nov 28 22:01:43 2005 +0000 2309f46a6179Smrg 2310f46a6179Smrg Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 2311f46a6179Smrg update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) 2312f46a6179Smrg 2313f46a6179Smrgcommit f19c3028c34a0dba4ffb9ae19c13421e7ff0ff12 2314f46a6179SmrgAuthor: Eric Anholt <anholt@freebsd.org> 2315f46a6179SmrgDate: Mon Nov 21 10:35:01 2005 +0000 2316f46a6179Smrg 2317f46a6179Smrg Another pass at .cvsignores for apps. 2318f46a6179Smrg 2319f46a6179Smrgcommit 3ada747f1cb5400404e4b63430f7a817dbf0c4cb 2320f46a6179SmrgAuthor: Eric Anholt <anholt@freebsd.org> 2321f46a6179SmrgDate: Sun Nov 20 22:08:53 2005 +0000 2322f46a6179Smrg 2323f46a6179Smrg Add/improve .cvsignore files for apps. 2324f46a6179Smrg 2325f46a6179Smrgcommit 4eeb611f17bdc01f7a6cb4db3f0997ce5ecc6361 2326f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 2327f46a6179SmrgDate: Wed Oct 19 02:47:54 2005 +0000 2328f46a6179Smrg 2329f46a6179Smrg Update package version number for RC1 release. 2330f46a6179Smrg 2331f46a6179Smrgcommit 958d09064c96cb50df6f92bfb8d4754c87451920 2332f46a6179SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 2333f46a6179SmrgDate: Mon Oct 17 23:56:23 2005 +0000 2334f46a6179Smrg 2335f46a6179Smrg Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to 2336f46a6179Smrg work better with BSD make 2337f46a6179Smrg 2338f46a6179Smrgcommit 950fba3262905c58891773a8795305e685dc1cb3 2339f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 2340f46a6179SmrgDate: Sat Oct 15 19:32:52 2005 +0000 2341f46a6179Smrg 2342f46a6179Smrg Have generated files be cleaned by maintainer in order to pass 2343f46a6179Smrg check-tarball test. 2344f46a6179Smrg 2345f46a6179Smrgcommit a83e4bb777d6f9b1b42a7fb3ff84a5e0d7e123c7 2346f46a6179SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 2347f46a6179SmrgDate: Fri Oct 14 00:25:46 2005 +0000 2348f46a6179Smrg 2349f46a6179Smrg Use sed to fill in variables in man page 2350f46a6179Smrg 2351f46a6179Smrgcommit 8c0d310c1acccc424dae29554a5075f9b339e95f 23526930ead5SmrgAuthor: Kristian Høgsberg <krh@redhat.com> 2353f46a6179SmrgDate: Thu Sep 1 19:37:02 2005 +0000 2354f46a6179Smrg 2355f46a6179Smrg Define DFLT_XKB_CONFIG_ROOT to $(datadir)/X11/xkb so we look in the right 2356f46a6179Smrg place. 2357f46a6179Smrg 2358f46a6179Smrgcommit fabda6a820bdccae85a7c22ad0b30f089952606b 2359f46a6179SmrgAuthor: Keith Packard <keithp@keithp.com> 2360f46a6179SmrgDate: Tue Aug 2 18:03:01 2005 +0000 2361f46a6179Smrg 2362f46a6179Smrg Mark generated files as BUILT_SOURCES and CLEANFILES to ensure they are 2363f46a6179Smrg regenerated after 'make clean' and to make parallel builds work right. 2364f46a6179Smrg 2365f46a6179Smrgcommit 35e0b7ef41ffe1f17ad8f21dbda10267961231ea 2366f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 2367f46a6179SmrgDate: Fri Jul 29 21:22:35 2005 +0000 2368f46a6179Smrg 2369f46a6179Smrg Various changes preparing packages for RC0: 2370f46a6179Smrg - Verify and update package version numbers as needed 2371f46a6179Smrg - Implement versioning scheme 2372f46a6179Smrg - Change bug address to point to bugzilla bug entry form 2373f46a6179Smrg - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to 2374f46a6179Smrg reenable it) 2375f46a6179Smrg - Fix makedepend to use pkgconfig and pass distcheck 2376f46a6179Smrg - Update build script to build macros first 2377f46a6179Smrg - Update modular Xorg version 2378f46a6179Smrg 2379f46a6179Smrgcommit e447fee50a8014b5281a5abfcc5e468f8cc130ca 2380f46a6179SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 2381f46a6179SmrgDate: Fri Jul 22 15:08:19 2005 +0000 2382f46a6179Smrg 2383f46a6179Smrg Use YACC to compile xkbparse.y. 2384f46a6179Smrg 2385f46a6179Smrgcommit 34cd161f5947b4dc185356bc65653717f56ced00 2386f46a6179SmrgAuthor: Adam Jackson <ajax@nwnk.net> 2387f46a6179SmrgDate: Wed Jul 20 19:31:57 2005 +0000 2388f46a6179Smrg 2389f46a6179Smrg Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global 2390f46a6179Smrg configure cache, you cache it, and the cached value is probably wrong. 2391f46a6179Smrg 2392f46a6179Smrgcommit 8335e5fa471e25675c6a369ec2348883953fcdd0 23936930ead5SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 2394f46a6179SmrgDate: Sat Jul 16 20:56:47 2005 +0000 2395f46a6179Smrg 2396f46a6179Smrg Add xkbcomp data to symlink.sh. Some fixes to xkbcomp/Makefile.am 2397f46a6179Smrg 2398f46a6179Smrgcommit d7b3354575f31caa9044b6c5f7aee4f010f6192a 23996930ead5SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 2400f46a6179SmrgDate: Fri Jul 15 18:02:35 2005 +0000 2401f46a6179Smrg 2402f46a6179Smrg Build system for xkbcomp 2403f46a6179Smrg 2404f46a6179Smrgcommit 59e48918e7c252926bb5e51a077bcbc8a7eec829 2405f46a6179SmrgAuthor: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> 2406f46a6179SmrgDate: Mon Nov 15 15:06:52 2004 +0000 2407f46a6179Smrg 2408f46a6179Smrg Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added 2409f46a6179Smrg mingw (Win32) port 2410f46a6179Smrg 2411f46a6179Smrgcommit 0336e043fab6f2a8828d90bc9eef2e23878f6dd1 2412f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 2413f46a6179SmrgDate: Fri Sep 3 23:41:22 2004 +0000 2414f46a6179Smrg 2415f46a6179Smrg Update formatted docs. 2416f46a6179Smrg 2417f46a6179Smrgcommit 20240438ef9d3a6c66443ca9f095a2766ef6ed4e 2418f46a6179SmrgAuthor: Egbert Eich <eich@suse.de> 2419f46a6179SmrgDate: Fri Apr 23 19:54:50 2004 +0000 2420f46a6179Smrg 2421f46a6179Smrg Merging XORG-CURRENT into trunk 2422f46a6179Smrg 2423f46a6179Smrgcommit a3729a9f9fcda07b233f434266148c8751684347 2424f46a6179SmrgAuthor: Egbert Eich <eich@suse.de> 2425f46a6179SmrgDate: Sun Mar 14 08:35:25 2004 +0000 2426f46a6179Smrg 2427f46a6179Smrg Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 2428f46a6179Smrg 2429f46a6179Smrgcommit 37a1152a4024fb799fe1272ce378e6c7c97ee951 2430f46a6179SmrgAuthor: Egbert Eich <eich@suse.de> 2431f46a6179SmrgDate: Wed Mar 3 12:13:08 2004 +0000 2432f46a6179Smrg 2433f46a6179Smrg Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 2434f46a6179Smrg 2435f46a6179Smrgcommit 55f40d0286d0e2e4b1602f983b749352188c3ec4 2436f46a6179SmrgAuthor: Egbert Eich <eich@suse.de> 2437f46a6179SmrgDate: Thu Feb 26 13:36:25 2004 +0000 2438f46a6179Smrg 2439f46a6179Smrg readding XFree86's cvs IDs 2440f46a6179Smrg 2441f46a6179Smrgcommit 2a95cda1d358fc309c78dc5201a1dbacaba9d0bf 2442f46a6179SmrgAuthor: Egbert Eich <eich@suse.de> 2443f46a6179SmrgDate: Thu Feb 26 09:24:08 2004 +0000 2444f46a6179Smrg 2445f46a6179Smrg Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 2446f46a6179Smrg 2447f46a6179Smrgcommit dbba2cffbc57e5bbdec8f24417a8a5dcfef7c2a2 2448f46a6179SmrgAuthor: Egbert Eich <eich@suse.de> 2449f46a6179SmrgDate: Thu Jan 29 08:09:12 2004 +0000 2450f46a6179Smrg 2451f46a6179Smrg Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004 2452f46a6179Smrg 2453f46a6179Smrgcommit 8aa5bcfe58d3776746d7b0d627f2fb8744fb0817 2454f46a6179SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 2455f46a6179SmrgDate: Fri Dec 19 20:55:58 2003 +0000 2456f46a6179Smrg 2457f46a6179Smrg XFree86 4.3.99.902 (RC 2) 2458f46a6179Smrg 2459f46a6179Smrgcommit 37ebbbe7b11febaf548006a9b73db0eebf79881a 2460f46a6179SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 2461f46a6179SmrgDate: Tue Nov 25 19:29:13 2003 +0000 2462f46a6179Smrg 2463f46a6179Smrg XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks 2464f46a6179Smrg 2465f46a6179Smrgcommit 287ac4c6af61d8f9f95cd3b3219c979e1329a2fe 2466f46a6179SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 2467f46a6179SmrgDate: Fri Nov 14 16:49:22 2003 +0000 2468f46a6179Smrg 2469f46a6179Smrg XFree86 4.3.0.1 2470f46a6179Smrg 2471f46a6179Smrgcommit 262961d88faf67f69f4630acb8234a4f2c5a6e80 2472f46a6179SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 2473f46a6179SmrgDate: Fri Nov 14 16:49:22 2003 +0000 2474f46a6179Smrg 2475f46a6179Smrg Initial revision 2476f46a6179Smrg 2477f46a6179Smrgcommit 2af3aabf0e7eb1514d39b29a6b58fcd0d4de41d1 2478f46a6179SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 2479f46a6179SmrgDate: Fri Nov 14 15:54:54 2003 +0000 2480f46a6179Smrg 2481f46a6179Smrg R6.6 is the Xorg base-line 2482