Bug#256706: Patch to solve XKB mess about modifiers
tags 256706 + patch
thanks
The bugs described in these merged bugreports were fixed upstream, see
http://cvsweb.xfree86.org/cvsweb/xc/programs/Xserver/hw/xfree86/CHANGELOG
(numbers slightly differs in XFree86 CVS logs and Debian changelogs):
646. Fix for XKB map 'altwin' to avoid one keysym to more than one modifier
mapping (Ivan Pascal).
635. Fix xmodmap's output of the modifiers map when the first column keysym
is empty (Ivan Pascal).
634. Fixes for XKB keyboard maps:
- fix Meta, Super, Hyper keysyms interpretation
- fix typo in rules/xfree86.xml (Ivan Pascal).
Oddly debian/patches/000_stolen_from_HEAD_xkb_data.diff contains 634,
but not the other 2 chunks. The missing pieces are in modifiers.patch.
I checked that when applied, xmodmap displays the right modifiers and
Meta_L is no more bound to Mod1.
Few days later, Ivan Pascal committed (attached in none.patch)
667. Fixes and updates for XKB keyboard maps:
...
- Fix wrong key type in the 'keymap without special keys' (Ivan Pascal).
I do not know what this does fix, but it looks pretty sane, maybe it
should go also.
Denis
Index: programs/xkbcomp/symbols/altwin
===
RCS file: /cvs/xc/programs/xkbcomp/symbols/altwin,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- programs/xkbcomp/symbols/altwin 10 Oct 2001 19:18:32 - 1.4
+++ programs/xkbcomp/symbols/altwin 3 Dec 2003 14:09:08 - 1.5
@@ -1,4 +1,4 @@
-// $XFree86: xc/programs/xkbcomp/symbols/altwin,v 1.4 2001/10/10 19:18:32
herrb Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/altwin,v 1.5 2003/12/03 14:09:08
pascal Exp $
partial modifier_keys
xkb_symbols "meta_alt" {
@@ -15,7 +15,7 @@
key { [ Meta_L ] };
key { [ Meta_R ] };
modifier_map Mod1 { Alt_L, Alt_R };
-modifier_map Mod4 { Meta_L, Meta_R };
+modifier_map Mod4 { , Meta_L, Meta_R };
};
partial modifier_keys
@@ -23,7 +23,7 @@
key { [ Alt_L, Alt_L ] };
key { [ Meta_L ] };
modifier_map Mod1 { Alt_L };
-modifier_map Mod4 { Meta_L };
+modifier_map Mod4 { , Meta_L };
};
partial modifier_keys
Index: programs/xmodmap/exec.c
===
RCS file: /cvs/xc/programs/xmodmap/exec.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- programs/xmodmap/exec.c 14 Dec 2001 20:02:13 - 1.5
+++ programs/xmodmap/exec.c 2 Dec 2003 13:13:57 - 1.6
@@ -56,7 +56,7 @@
* Author: Jim Fulton, MIT X Consortium; derived from parts of the
* original xmodmap, written by David Rosenthal, of Sun Microsystems.
*/
-/* $XFree86: xc/programs/xmodmap/exec.c,v 1.5 2001/12/14 20:02:13 dawes Exp $
*/
+/* $XFree86: xc/programs/xmodmap/exec.c,v 1.6 2003/12/02 13:13:57 pascal Exp $
*/
#include
#include
@@ -212,8 +212,13 @@
PrintModifierMapping(XModifierKeymap *map, FILE *fp)
{
int i, k = 0;
+int min_keycode, max_keycode, keysyms_per_keycode = 0;
-fprintf (fp,
+XDisplayKeycodes (dpy, &min_keycode, &max_keycode);
+XGetKeyboardMapping (dpy, min_keycode, (max_keycode - min_keycode + 1),
+&keysyms_per_keycode);
+
+fprintf (fp,
"%s: up to %d keys per modifier, (keycodes in parentheses):\n\n",
ProgramName, map->max_keypermod);
for (i = 0; i < 8; i++) {
@@ -222,8 +227,14 @@
fprintf(fp, "%-10s", modifier_table[i].name);
for (j = 0; j < map->max_keypermod; j++) {
if (map->modifiermap[k]) {
- KeySym ks = XKeycodeToKeysym(dpy, map->modifiermap[k], 0);
- char *nm = XKeysymToString(ks);
+ KeySym ks;
+ int index = 0;
+ char *nm;
+ do {
+ ks = XKeycodeToKeysym(dpy, map->modifiermap[k], index);
+ index++;
+ } while ( !ks && index < keysyms_per_keycode);
+ nm = XKeysymToString(ks);
fprintf (fp, "%s %s (0x%0x)", (j > 0 ? "," : ""),
(nm ? nm : "BadKey"), map->modifiermap[k]);
Index: programs/xkbcomp/expr.c
===
RCS file: /cvs/xc/programs/xkbcomp/expr.c,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -r3.7 -r3.8
--- programs/xkbcomp/expr.c 6 Aug 2003 14:04:05 - 3.7
+++ programs/xkbcomp/expr.c 18 Dec 2003 14:14:37 - 3.8
@@ -24,7 +24,7 @@
THE USE OR PERFORMANCE OF THIS SOFTWARE.
/
-/* $XFree86: xc/programs/xkbcomp/expr.c,v 3.7 2003/08/06 14:04:05 eich Exp $ */
+/* $XFree86: xc/programs/xkbcomp/expr.c,v 3.8 2003/12/18 14:14:37 pascal Exp $
*/
#include "xkbcomp.h"
#include "tokens
Processed: Patch to solve XKB mess about modifiers
Processing commands for [EMAIL PROTECTED]: > tags 256706 + patch Bug#256706: xlibs: attaching multiple modifiers to the same key wreaks havoc; breaks Win+Tab switching in many window managers Tags were: moreinfo help upstream Bug#259740: xlibs: Windows key no longer treated as modifer, just as Super_L Bug#260232: xlibs: modifier madness breaks XTerm*metaSendsEscape Bug#263073: xlibs: Super keys now Super+Hyper Tags added: patch > thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
Bug#256706: Patch exist for bug 256706 - please remove upstream tag and apply patch :)
Hi, Denis Barbier <[EMAIL PROTECTED]> wrote: >Wrong xmodmap display was fixed in xfree86/programs/xmodmap/exec.c r 1.6 > date: 2003/12/02 13:13:57; author: pascal; state: Exp; lines: +15 -4 > 634. Fix xmodmap's output of the modifiers map when the first column > keysym is empty (Ivan Pascal). It seems serious bug #256706 can be solved :) It would be nice to see updated packages ASAP - xlibs in sarge are outdated and contains lots of important bugs :( -- Good luck, Mantas Kriaučiūnas <[EMAIL PROTECTED]> Jabber ID: [EMAIL PROTECTED] Public organization "Open Source for Lithuania" - www.akl.lt
Bug#267062: xlibs: [xkb] wrong Compose file for pl_PL.UTF-8?
On Mon, Aug 23, 2004 at 10:38:31AM +0200, Shot wrote: > Branden Robinson: > > Hmm, according to compose.dir, pl_PL.UTF-8 > > *should* be using the en_US.UTF-8 compose map. > > Yes, it should. The catch is it doesn't. The interesting thing is, > when I overwrite /usr/X11R6/lib/X11/locale/iso8859-2/Compose with > /usr/X11R6/lib/X11/locale/en_US.UTF-8/Compose nothing changes. This boggles my mind. > > I'm a bit confused. I'm using LC_CTYPE=en_US.UTF-8 myself, and getting > > the en_US.UTF-8 compose map. > > Can you compose UTF-8-only characters (as opposed > to ISO-8859-1-compatible) as well? Can you use > > : "‰" U2030 # PER MILLE SIGN Yes, this works for me on a Debian testing system (xfree86 4.3.0.dfsg.1-4). > I tried running X (GNOME) with Option "XkbLayout" "en" and locale > en_US.UTF-8, but I still can input ą (aogonek) with > and can't, for example, get the above-mentioned per mille sign. This is screwed up. In uxterm running bash with LC_CTYPE=en_US.UTF-8, I *can* get per mille, but not aogonek, using the compose sequences you indicated. In the Mozilla location bar, I can get aogonoek, but not per mille. > > Except that it doesn't seem to work at all in bash. However, I can > > compose characters into the Mozilla location bar just fine. Weird. > > Mozilla location bar is a different beast altogether - when typing >nothing happens, then when I press the > third a minus appears, and in the drop-down I can see the option > to "Search for "--"", with two minuses. > produces a period. Also, I can't get the UTF-8-specific per > mille sign, while easily getting the(which is > not present in the en_US.UTF-8/Compose map). I don't think Mozilla's > location bar is a good testing-area (Galeon's location bar acts the > same as bash inside gnome-terminal, i.e. seems to use iso8859-2/Compose). This is very frustrating and confusing, and unfortunately appears to be a bit beyond my skills to debug. -- G. Branden Robinson|Somebody once asked me if I thought Debian GNU/Linux |sex was dirty. I said, "It is if [EMAIL PROTECTED] |you're doing it right." http://people.debian.org/~branden/ |-- Woody Allen signature.asc Description: Digital signature
Bug#258399: xlibs: dvorak keyboard layout is missing right alt key
On Tue, Aug 24, 2004 at 09:23:19AM -0400, Adam C Powell IV wrote:
> Hello again and apologies for the delay,
>
> On Tue, 2004-07-13 at 00:44, Branden Robinson wrote:
> > tag 258399 + moreinfo upstream
> > thanks
> >
> > On Fri, Jul 09, 2004 at 08:48:38AM -0400, Adam C Powell IV wrote:
> > > Package: xlibs
> > > Version: 4.3.0.dfsg.1-4
> > > Severity: minor
> > >
> > > Greetings,
> > >
> > > On switching from a normal US layout to the dvorak layout in GNOME (on a
> > > PC), I've lost the use of the right alt key...
> >
> > I think this is the sort of thing the unpopular modifier key change
> > backported from upstream in -5 was intended to address.
> >
> > Can you reproduce this problem with 4.3.0.dfsg.1-6?
>
> Yes. I've upgraded xlibs[-data] and the individual libraries on which
> it depends, and xserver-[xfree86|common], and the problem persists. Of
> course, this is still just testing with a newer X, though libxklavier is
> at its newest version, but other old packages could be causing this...
>
> Please let me know if you need any further information.
My thinking now is that to fix this I need to tackle one of the few
remaining TODO items for -7:
* #256706: keep swatting away at the keyboard modifer issue; Ivan Pascal told
BR:
There is not modifier_del instruction in 'XKB language' but ...
I made a simple change for xkbcomp and now it understands an instruction
like
modifier_add none { };
It removes the modifier binding from the specified key.
I'm sorry I forget to mention this patch in CHANGELOG but it was a part
of 667 change made at Dec 18 14:14:37 2003 (i.e. it is included in 4.4.0).
If your xkbcomp is later than that version it understands such instruction.
So I'm thinking the fix is to apply the above, then modify the symbol maps
such that (in most cases) any keys that get modifier mappings are cleared
first. This solution will absolutely positively need testing.
--
G. Branden Robinson|
Debian GNU/Linux | If existence exists,
[EMAIL PROTECTED] | why create a creator?
http://people.debian.org/~branden/ |
signature.asc
Description: Digital signature
Bug#261915: xlibmesa-gl: Also occurs with flightgear
tag 261915 + moreinfo thanks On Sun, Aug 22, 2004 at 09:03:00PM -0400, Michel Dänzer wrote: > On Fri, 2004-08-13 at 02:48 -0500, Branden Robinson wrote: > > > > On Sat, Jul 31, 2004 at 08:57:35PM +0100, Alistair K Phipps wrote: > > > Package: xlibmesa-gl > > > Version: 4.3.0.dfsg.1-6 > > > Followup-For: Bug #261915 > > > > > > This also happens with flightgear (fgfs from Sid fgfs-base) and causes > > > flightgear to run without 3d acceleration. I think xlibmesa-gl needs to > > > be rebuilt with versioned symbols. > > Were the affected apps built against the libGL provided by nvidia-glx or > some other package other than xlibmesa-gl? If so, does the same problem > occur if you build them against xlibmesa-gl? Michel did not mail -submitter so I am doing so. I fear that "Alistair K Phipps <[EMAIL PROTECTED]>"'s address will bounce again, though. <[EMAIL PROTECTED]>: host mail.eggcup.net[69.93.5.205] said: 550 Unknown user (in reply to RCPT TO command) -- G. Branden Robinson| Software engineering: that part of Debian GNU/Linux | computer science which is too [EMAIL PROTECTED] | difficult for the computer http://people.debian.org/~branden/ | scientist. signature.asc Description: Digital signature
Bug#266074: marked as done (xlibs-dev: dependency problem with several other X library packages)
Your message dated Wed, 25 Aug 2004 15:22:06 -0500 with message-id <[EMAIL PROTECTED]> and subject line Bug#266074: xlibs-dev: dependency problem with several other X library packages has caused the attached Bug report to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what I am talking about this indicates a serious mail system misconfiguration somewhere. Please contact me immediately.) Debian bug tracking system administrator (administrator, Debian Bugs database) -- Received: (at submit) by bugs.debian.org; 16 Aug 2004 16:12:45 + >From [EMAIL PROTECTED] Mon Aug 16 09:12:45 2004 Return-path: <[EMAIL PROTECTED]> Received: from pd9516c4a.dip.t-dialin.net (mongoose.ized.com) [217.81.108.74] by spohr.debian.org with smtp (Exim 3.35 1 (Debian)) id 1Bwk6G-00079K-00; Mon, 16 Aug 2004 09:12:45 -0700 Received: (qmail 14686 invoked by uid 11); 16 Aug 2004 16:12:12 - Message-ID: <[EMAIL PROTECTED]> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Dan Chiavelli <[EMAIL PROTECTED]> To: Debian Bug Tracking System <[EMAIL PROTECTED]> Subject: xlibs-dev: dependency problem with several other X library packages X-Mailer: reportbug 2.63 Date: Mon, 16 Aug 2004 18:12:12 +0200 Delivered-To: [EMAIL PROTECTED] X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 (1.212-2003-09-23-exp) on spohr.debian.org X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE autolearn=no version=2.60-bugs.debian.org_2004_03_25 X-Spam-Level: Package: xlibs-dev Severity: important I think the dependencies have gotten messed up for xlibs-dev... all of the dependent packages are off by one minor version number. Please pardon the copious output, but it describes the problem much better than I can: [EMAIL PROTECTED] apt-get install xlibs-dev Reading Package Lists... Done Building Dependency Tree... Done Some packages could not be installed. This may mean that you have requested an impossible situation or if you are using the unstable distribution that some required packages have not yet been created or been moved out of Incoming. Since you only requested a single operation it is extremely likely that the package is simply not installable and a bug report against that package should be filed. The following information may help to resolve the situation: The following packages have unmet dependencies: xlibs-dev: Depends: libice-dev but it is not going to be installed Depends: libsm-dev but it is not going to be installed Depends: libx11-dev but it is not going to be installed Depends: libxext-dev but it is not going to be installed Depends: libxi-dev but it is not going to be installed Depends: libxmu-dev but it is not going to be installed Depends: libxmuu-dev but it is not going to be installed Depends: libxp-dev but it is not going to be installed Depends: libxpm-dev but it is not going to be installed Depends: libxrandr-dev but it is not going to be installed Depends: libxt-dev but it is not going to be installed Depends: libxtrap-dev but it is not going to be installed Depends: libxtst-dev but it is not going to be installed Depends: libxv-dev but it is not going to be installed Depends: xlibs-static-dev but it is not going to be installed E: Broken packages [EMAIL PROTECTED] apt-get install libice-dev libsm-dev libx11-dev libxext-dev libxi-dev libxmu-dev libxmuu-dev libxp-dev libxpm-dev libxrandr-dev libxt-dev libxtrap-dev libxtst-dev libxv-dev xlibs-static-dev Reading Package Lists... Done Building Dependency Tree... Done Some packages could not be installed. This may mean that you have requested an impossible situation or if you are using the unstable distribution that some required packages have not yet been created or been moved out of Incoming. The following information may help to resolve the situation: The following packages have unmet dependencies: libice-dev: Depends: libice6 (= 4.3.0.dfsg.1-4) but 4.3.0.dfsg.1-5 is to be installed libsm-dev: Depends: libsm6 (= 4.3.0.dfsg.1-4) but 4.3.0.dfsg.1-5 is to be installed libx11-dev: Depends: libx11-6 (= 4.3.0.dfsg.1-4) but 4.3.0.dfsg.1-5 is to be installed libxext-dev: Depends: libxext6 (= 4.3.0.dfsg.1-4) but 4.3.0.dfsg.1-5 is to be installed libxi-dev: Depends: libxi6 (= 4.3.0.dfsg.1-4) but 4.3.0.dfsg.1-5 is to be installed libxmu-dev: Depends: libxmu6 (= 4.3.0.dfsg.1-4) but 4.3.0.dfsg.1-5 is to be installed libxmuu-dev: Depends: libxmuu1 (= 4.3.0.dfsg.1-4) but 4.3.0.dfsg.1-5 is to be installed libxp
Processed: Re: Bug#267205: libc6-dev: /usr/include/gnu/stubs.h uses non-portable whitespace
Processing commands for [EMAIL PROTECTED]: > reassign 267205 xutils Bug#267205: libc6-dev: /usr/include/gnu/stubs.h uses non-portable whitespace Bug reassigned from package `libc6-dev' to `xutils'. > retitle 267205 xutils: [makedepend] spuriously complains about > standards-compliant whitespace being non-portable Bug#267205: libc6-dev: /usr/include/gnu/stubs.h uses non-portable whitespace Changed Bug title. > tag 267205 = upstream Bug#267205: xutils: [makedepend] spuriously complains about standards-compliant whitespace being non-portable There were no tags set. Tags set to: upstream > thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
Processed: Re: Bug#266074: xlibs-dev: dependency problem with several other X library packages
Processing commands for [EMAIL PROTECTED]: > tag 266074 - moreinfo Bug#266074: xlibs-dev: dependency problem with several other X library packages Tags were: moreinfo Tags removed: moreinfo > thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
Processed: Re: Bug#261915: xlibmesa-gl: Also occurs with flightgear
Processing commands for [EMAIL PROTECTED]: > tag 261915 + moreinfo Bug#261915: xlibmesa-gl: some apps expect libGL to have versioned symbols Tags were: help upstream Tags added: moreinfo > thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database)
Re: Bug#267205: libc6-dev: /usr/include/gnu/stubs.h uses non-portable whitespace
reassign 267205 xutils retitle 267205 xutils: [makedepend] spuriously complains about standards-compliant whitespace being non-portable tag 267205 = upstream thanks On Mon, Aug 23, 2004 at 05:01:12PM +0900, GOTO Masanori wrote: > Falk Hueffner wrote: > > The C standard does not require this, nor does any cpp in the real > > world for 10 years, so IMHO you should rather fix makedepend. > > Correct. ISO C99 6.10 Preprocessing directives, Description: > > A preprocessing directive consists of a sequence of > preprocessing tokens that begins with a # preprocessing token > that (at the start of translation phase 4) is either the first > character in the source file (optionally after white space > containing no new-line characters) or that follows white space > containing at least one new-line character, and is ended by > the next new-line character.129) > > It's not even bug. Branden, are you OK to reassign this report to > X11, or to close it? On Wed, Aug 25, 2004 at 01:46:25PM +0900, GOTO Masanori wrote: > At Tue, 24 Aug 2004 15:40:23 +0200, > Falk Hueffner wrote: > > [Christoph Hellwig wrote:] > > > Also #error is a GNU extension anyway > > Even if #error is an extension, the directive syntax should be > confirmed with the above mention. > > > No, it's not. > > Falk is also correct. ISO C99 6.10 Preprocessing directives, Syntax: > > control-line: > # include pp-tokens new-line > ... > # error pp-tokens_opt new-line I am reassigning this bug. Thanks for the citations. :) There are situations where being standards-compliant and portable are conflicting aims, but I don't think this is one of them, at least for the Debian system. -- G. Branden Robinson|There is no housing shortage in Debian GNU/Linux |Lincoln today -- just a rumor that [EMAIL PROTECTED] |is put about by people who have http://people.debian.org/~branden/ |nowhere to live.-- G. L. Murfin signature.asc Description: Digital signature
Bug#246782: Still failing PCI domain detection.
quit Ah, I see the problem. I added unstable to the sources.list and put testing as the default target in apt.conf, updated xserver-xfree86. When is this going into testing? Thanks, -- DN Daniel
X Strike Force XFree86 SVN commit: r1754 - branches
Author: branden Date: 2004-08-25 11:45:57 -0500 (Wed, 25 Aug 2004) New Revision: 1754 Removed: branches/app-defaults-and-xkb-dir-migration-fix/ Log: Close out branch; work has been completed and merged to the trunk.
Changet lack of clarity
Grab from freedesktop.org CVS a fix for SEGVs in the chips driver when the current mode wasn't valid. Thanks to Ryan Underwood for identifying and testing this fix. Resync patches #044 and #045. (Closes: #260753) Please specify where you actually got this from: if you got it from /cvs/xorg, 'X.Org CVS'; /cvs/xserver/xserver, 'KDrive CVS'; debrix's TLA archive, 'debrix TLA'. Thanks, Daniel -- Daniel Stone<[EMAIL PROTECTED]> Debian: the universal operating system http://www.debian.org signature.asc Description: Digital signature
X Strike Force XFree86 SVN commit: r1753 - trunk/debian
Author: branden
Date: 2004-08-25 11:42:17 -0500 (Wed, 25 Aug 2004)
New Revision: 1753
Added:
trunk/debian/libx11-6.config.in
trunk/debian/libx11-6.templates
trunk/debian/libxt6.config.in
trunk/debian/libxt6.templates
Modified:
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/libx11-6.postinst.in
trunk/debian/libx11-6.postrm.in
trunk/debian/libx11-6.preinst.in
trunk/debian/libxt6.postinst.in
trunk/debian/libxt6.postrm.in
trunk/debian/libxt6.preinst.in
trunk/debian/shell-lib.sh
Log:
Merge revisions 1739 to HEAD from
branches/branches/app-defaults-and-xkb-dir-migration-fix.
Resolve expected conflict in debian/changelog.
Modified: trunk/debian/TODO
===
--- trunk/debian/TODO 2004-08-25 16:36:38 UTC (rev 1752)
+++ trunk/debian/TODO 2004-08-25 16:42:17 UTC (rev 1753)
@@ -18,21 +18,6 @@
--
* Add FAQ entry describing what has become of the XFree86 3.x packages.
-* Re-do migration of /usr/X11R6/lib/X11/{app-defaults,xkb}:
- + stop shipping symlink
- + In {libxt6,xlibs}.preinst:
-- if existing stuff in /usr/X11R6/lib/X11/$DIR:
- + debconf boolean explaining situation and permitting abort
- + if user doesn't abort:
-- mv existing directory contents to /etc/X11/$DIR
-- create /usr/X11R6/lib/X11/$DIR symlink
-- touch $DIR migration file in /var/run
- + In {libxt6,xlibs}.postinst:
-- remove $DIR migration file from /var/run
- + In {libxt6,xlibs}.postrm:
-- If /var/run/$DIR migration file exists:
- + remove /usr/X11R6/lib/X11/$DIR symlink
- + mv /etc/X11/$DIR back to /usr/X11R6/lib/X11/$DIR
* Rewrite xserver-xfree86 debconfage. Joey Hess, Eduard Bloch, and David
Nusinow have provided good input.
+ udev users will have "/dev/input/mousen" -- configure that as only mouse
Modified: trunk/debian/changelog
===
--- trunk/debian/changelog 2004-08-25 16:36:38 UTC (rev 1752)
+++ trunk/debian/changelog 2004-08-25 16:42:17 UTC (rev 1753)
@@ -342,6 +342,51 @@
person, of *course* dpkg and apt accept 'Conflicts: (4.3.0.dfsg.1-4 <<)
xserver-xfree86 (<< 4.3.0.dfsg.1-7)'!"
+ * Rewrite migration of app-defaults (in libxt6) and xkb (in libx11-6)
+directories.
++ Enhance the shell libary with new functions:
+ - Implement check_symlink() and change check_symlinks_and_warn() and
+check_symlinks_and_bomb() to use it.
+ - Implement make_symlink_sane(). Ensure that the specified symbolic
+link symlink exists, and points to the specified target. If symlink
+does not exist, create it and point it at target. If symlink exists
+but is not a symbolic link, back it up. If symlink exists, is a
+symbolic link, but points to the wrong location, fix it. If symlink
+exists, is a symbolic link, and already points to target, do nothing.
+This function wouldn't be needed if ln had an -I, --idempotent option.
+ - Implement migrate_dir_to_symlink(). Per Debian Policy section 6.5.4,
+"A directory will never be replaced by a symbolic link to a directory
+or vice versa; instead, the existing state (symlink or not) will be
+left alone and dpkg will follow the symlink if there is one." We have
+to do it ourselves. This function moves the contents of old_location,
+a directory, into new_location, a directory, then makes old_location a
+symbolic link to new_location. old_location need not exist, but if it
+does, it must be a directory (or a symlink to a directory). If it is
+not, it is backed up. If new_location exists already and is not a
+directory, it is backed up.
++ Add config scripts for libx11-6 and libxt6, which detect if
+ /usr/X11R6/lib/X11/{app-defaults,xkb} is a directory but not a symlink,
+ and use debconf to prompt the user (at low priority) whether the
+ directories should be moved. If the user says no, abort the script. If
+ the user says yes (default), start the migration with
+ migrate_dir_to_symlink().
++ Update preinst scripts to use debconf as the configs script do; this is
+ unusual but necessary because if we're going to do the migration we need
+ to start before any other packages (which may use the old directories)
+ are unpacked.
++ In the preinst scripts, call check_symlink(), and if that fails, call
+ make_symlink_sane(). Stop calling check_symlinks_and_warn().
++ Update postinst scripts to indicate that migration is completed.
++ Update postrm scripts to run migration in reverse if it had been started
+ and the package installation or upgrade is aborted.
++ We keep shipping /etc/X11/{app-defaults,xkb} symlinks as part of the
+ package payloads, because manipulating them in the preinst isn't enough
+ -- dpkg w
X Strike Force XFree86 SVN commit: r1752 - branches/app-defaults-and-xkb-dir-migration-fix/debian
Author: branden Date: 2004-08-25 11:36:38 -0500 (Wed, 25 Aug 2004) New Revision: 1752 Modified: branches/app-defaults-and-xkb-dir-migration-fix/debian/libx11-6.templates branches/app-defaults-and-xkb-dir-migration-fix/debian/libxt6.templates Log: Actually make "true" the default for the new debconf questions. Thanks to Fabio for noticing this! Modified: branches/app-defaults-and-xkb-dir-migration-fix/debian/libx11-6.templates === --- branches/app-defaults-and-xkb-dir-migration-fix/debian/libx11-6.templates 2004-08-25 16:31:19 UTC (rev 1751) +++ branches/app-defaults-and-xkb-dir-migration-fix/debian/libx11-6.templates 2004-08-25 16:36:38 UTC (rev 1752) @@ -1,5 +1,6 @@ Template: libx11-6/migrate_xkb_dir Type: boolean +Default: true _Description: Migrate XKB configuration directory? The directory where configuration information (including keyboard data) for the X KEYBOARD Extension (XKB) is stored has been changed from Modified: branches/app-defaults-and-xkb-dir-migration-fix/debian/libxt6.templates === --- branches/app-defaults-and-xkb-dir-migration-fix/debian/libxt6.templates 2004-08-25 16:31:19 UTC (rev 1751) +++ branches/app-defaults-and-xkb-dir-migration-fix/debian/libxt6.templates 2004-08-25 16:36:38 UTC (rev 1752) @@ -1,5 +1,6 @@ Template: libxt6/migrate_app_defaults_dir Type: boolean +Default: true _Description: Migrate Xt application defaults directory? The directory where application defaults for X Window System client programs based on the X Toolkit Intrinsics (Xt) are stored has been changed from
X Strike Force XFree86 SVN commit: r1751 - trunk/debian
Author: branden Date: 2004-08-25 11:31:19 -0500 (Wed, 25 Aug 2004) New Revision: 1751 Modified: trunk/debian/CHANGESETS Log: Add r1750 to changeset list. Modified: trunk/debian/CHANGESETS === --- trunk/debian/CHANGESETS 2004-08-25 16:30:32 UTC (rev 1750) +++ trunk/debian/CHANGESETS 2004-08-25 16:31:19 UTC (rev 1751) @@ -433,6 +433,6 @@ breakfast and still see the One True Upgrade Path!", or "You silly person, of *course* dpkg and apt accept 'Conflicts: (4.3.0.dfsg.1-4 <<) xserver-xfree86 (<< 4.3.0.dfsg.1-7)'!" -1746, 1747, 1748, 1749 +1746, 1747, 1748, 1749, 1750 vim:set ai et sts=4 sw=4 tw=80:
X Strike Force XFree86 SVN commit: r1750 - trunk/debian/local
Author: branden Date: 2004-08-25 11:30:32 -0500 (Wed, 25 Aug 2004) New Revision: 1750 Modified: trunk/debian/local/dexconf Log: Set svn:executable property so the dexconf script is easier to test. Property changes on: trunk/debian/local/dexconf ___ Name: svn:executable + *
X Strike Force XFree86 SVN property change: propchange - r1740 svn:log
Author: branden
Revision: 1740
Property Name: svn:log
New Property Value:
Rewrite migration of app-defaults (in libxt6) and xkb (in libx11-6)
directories.
+ Enhance the shell libary with new functions:
- Implement check_symlink() and change check_symlinks_and_warn() and
check_symlinks_and_bomb() to use it.
- Implement make_symlink_sane(). Ensure that the specified symbolic
link symlink exists, and points to the specified target. If symlink
does not exist, create it and point it at target. If symlink exists
but is not a symbolic link, back it up. If symlink exists, is a
symbolic link, but points to the wrong location, fix it. If symlink
exists, is a symbolic link, and already points to target, do nothing.
This function wouldn't be needed if ln had an -I, --idempotent option.
- Implement migrate_dir_to_symlink(). Per Debian Policy section 6.5.4,
"A directory will never be replaced by a symbolic link to a directory
or vice versa; instead, the existing state (symlink or not) will be
left alone and dpkg will follow the symlink if there is one." We have
to do it ourselves. This function moves the contents of old_location,
a directory, into new_location, a directory, then makes old_location a
symbolic link to new_location. old_location need not exist, but if it
does, it must be a directory (or a symlink to a directory). If it is
not, it is backed up. If new_location exists already and is not a
directory, it is backed up.
+ Add config scripts for libx11-6 and libxt6, which detect if
/usr/X11R6/lib/X11/{app-defaults,xkb} is a directory but not a symlink,
and use debconf to prompt the user (at low priority) whether the
directories should be moved. If the user says no, abort the script. If
the user says yes (default), start the migration with
migrate_dir_to_symlink().
+ Update preinst scripts to use debconf as the config scripts do; this is
unusual but necessary because if we're going to do the migration we need
to start before any other packages (which may use the old directories)
are unpacked.
+ In the preinst scripts, call check_symlink(), and if that fails, call
make_symlink_sane(). Stop calling check_symlinks_and_warn().
+ Update postinst scripts to indicate that migration is completed.
+ Update postrm scripts to run migration in reverse if it had been started
and the package installation or upgrade is aborted.
+ We keep shipping /etc/X11/{app-defaults,xkb} symlinks as part of the
package payloads, because manipulating them in the preinst isn't enough
-- dpkg will remove "disappearing" files from the system *after* the
preinst runs but before the postinst does, leaving a window for packages
using the legacy paths to unpack to the old location with no symlink to
redirect them, which is precisely what we don't want (see section 6.5 of
the Debian Policy Manual).
Convert occurrences of test -[ao] to the shell's && and || operators.
Update Vim modelines.
Bug#268014: xserver-xfree86: x
Package: xserver-xfree86 Version: 4.3.0.dfsg.1-6 Severity: normal Subject: xserver-xfree86: line drawing buggy Package: xserver-xfree86 Version: 4.3.0.dfsg.1-6 Severity: normal sometimes lines are drawn incorrectly e.g. x11perf -seg500 shows the problem instantly as the lines are drawn outside of the test window -- Package-specific info: Contents of /var/lib/xfree86/X.roster: xserver-xfree86 /etc/X11/X target unchanged from checksum in /var/lib/xfree86/X.md5sum. X server symlink status: lrwxrwxrwx1 root root 20 2004-02-24 17:07 /etc/X11/X -> /usr/bin/X11/XFree86 -rwxr-xr-x1 root root 1898712 2004-07-09 08:53 /usr/bin/X11/XFree86 Contents of /var/lib/xfree86/XF86Config-4.roster: xserver-xfree86 VGA-compatible devices on PCI bus: :00:11.0 VGA compatible controller: ATI Technologies Inc 3D Rage LT Pro (rev dc) :00:11.0 Class 0300: 1002:4c49 (rev dc) /etc/X11/XF86Config-4 does not match checksum in /var/lib/xfree86/XF86Config-4.md5sum. XFree86 X server configuration file status: -rw-r--r--1 root root 3175 2004-02-25 12:55 /etc/X11/XF86Config-4 Contents of /etc/X11/XF86Config-4: # XF86Config-4 (XFree86 X server configuration file) generated by dexconf, the # Debian X Configuration tool, using values from the debconf database. # # Edit this file with caution, and see the XF86Config-4 manual page. # (Type "man XF86Config-4" at the shell prompt.) # # This file is automatically updated on xserver-xfree86 package upgrades *only* # if it has not been modified since the last upgrade of the xserver-xfree86 # package. # # If you have edited this file but would like it to be automatically updated # again, run the following commands as root: # # cp /etc/X11/XF86Config-4 /etc/X11/XF86Config-4.custom # md5sum /etc/X11/XF86Config-4 > /var/lib/xfree86/XF86Config-4.md5sum # dpkg-reconfigure xserver-xfree86 Section "Files" FontPath"unix/:7100"# local font server # if the local font server has problems, we can fall back on these FontPath"/usr/lib/X11/fonts/Type1" FontPath"/usr/lib/X11/fonts/CID" FontPath"/usr/lib/X11/fonts/Speedo" FontPath"/usr/lib/X11/fonts/misc" FontPath"/usr/lib/X11/fonts/cyrillic" FontPath"/usr/lib/X11/fonts/100dpi" FontPath"/usr/lib/X11/fonts/75dpi" EndSection Section "Module" Load"GLcore" Load"bitmap" Load"dbe" Load"ddc" Load"dri" Load"extmod" Load"freetype" Load"glx" Load"int10" Load"record" Load"speedo" Load"type1" Load"vbe" EndSection Section "InputDevice" # Motfied after Instruction from: # http://libarynth.f0.am/cgi-bin/view/Libarynth/DebianPPC # Bernhard 20040225 Identifier "Generic Keyboard" Driver "keyboard" Option "CoreKeyboard" Option "LeftAlt" "Meta" Option "RightAlt" "Meta" Option "ScrollLock""Compose" Option "RightCtl" "Control" Option "XkbRules" "xfree86" # We don't use macintosh #Option "XkbModel" "macintosh" Option "XkbLayout" "de" Option "XkbVariant""nodeadkeys" EndSection Section "InputDevice" Identifier "Configured Mouse" Driver "mouse" Option "CorePointer" Option "Device""/dev/input/mice" Option "Protocol" "ImPS/2" Option "ZAxisMapping" "4 5" EndSection Section "Device" Identifier "ATI 3D Rage LT Pro" Driver "ati" ChipSet "mach64" BusID "PCI:0:17:0" # not necessary anymore? #Option "UseFBDev" "true" # might be used later Option "DMAMode""mmio" EndSection Section "Monitor" Identifier "powerbook g3 lcd" HorizSync 30-60 VertRefresh 50-75 Option "DPMS" EndSection Section "Screen" Identifier "Default Screen" Device "ATI 3D Rage LT Pro" Monitor "powerbook g3 lcd" DefaultDepth24 SubSection "Display" Depth 1 Modes "1024x768" EndSubSection SubSection "Display" Depth 4 Modes "1024x768" EndSubSection SubSection "Display" Depth 8 Modes "1024x768" EndSubSection SubSection "Display" Depth 15 Modes "1024x768" EndSubSection SubSection "Display"
Bug#268015: xserver-xfree86: [ati/atimic] ATI 3D Rage LT Pro line drawing buggy
Package: xserver-xfree86 Version: 4.3.0.dfsg.1-6 Severity: normal sometimes lines are drawn incorrectly e.g. x11perf -seg500 shows the problem instantly as the lines are drawn outside of the test window This might be related to bug #176091 I have added the following lines to my XF86Config-4 file: # because acceleration hardware might have problems. Option "XaaNoSolidBresenhamLine" Option "XaaNoSolidHorVertLine" Option "XaaNoSolidTwoPointLine" This made the problem going away. So this bug report is adding information that this problem in the XAA code might still be exist and would need fixing or that somehow those configuration lines should be suggested for affected cards if this really is a hardware problem (note that #176091 only mentions Ati Radeon which makes a bug in Xfree more likely). (There might have been a premature version of this bugreport submitted, due to a usability problem with a reportbug version.) -- Package-specific info: Contents of /var/lib/xfree86/X.roster: xserver-xfree86 /etc/X11/X target unchanged from checksum in /var/lib/xfree86/X.md5sum. X server symlink status: lrwxrwxrwx1 root root 20 2004-02-24 17:07 /etc/X11/X -> /usr/bin/X11/XFree86 -rwxr-xr-x1 root root 1898712 2004-07-09 08:53 /usr/bin/X11/XFree86 Contents of /var/lib/xfree86/XF86Config-4.roster: xserver-xfree86 VGA-compatible devices on PCI bus: :00:11.0 VGA compatible controller: ATI Technologies Inc 3D Rage LT Pro (rev dc) :00:11.0 Class 0300: 1002:4c49 (rev dc) /etc/X11/XF86Config-4 does not match checksum in /var/lib/xfree86/XF86Config-4.md5sum. XFree86 X server configuration file status: -rw-r--r--1 root root 3175 2004-02-25 12:55 /etc/X11/XF86Config-4 Contents of /etc/X11/XF86Config-4: # XF86Config-4 (XFree86 X server configuration file) generated by dexconf, the # Debian X Configuration tool, using values from the debconf database. # # Edit this file with caution, and see the XF86Config-4 manual page. # (Type "man XF86Config-4" at the shell prompt.) # # This file is automatically updated on xserver-xfree86 package upgrades *only* # if it has not been modified since the last upgrade of the xserver-xfree86 # package. # # If you have edited this file but would like it to be automatically updated # again, run the following commands as root: # # cp /etc/X11/XF86Config-4 /etc/X11/XF86Config-4.custom # md5sum /etc/X11/XF86Config-4 > /var/lib/xfree86/XF86Config-4.md5sum # dpkg-reconfigure xserver-xfree86 Section "Files" FontPath"unix/:7100"# local font server # if the local font server has problems, we can fall back on these FontPath"/usr/lib/X11/fonts/Type1" FontPath"/usr/lib/X11/fonts/CID" FontPath"/usr/lib/X11/fonts/Speedo" FontPath"/usr/lib/X11/fonts/misc" FontPath"/usr/lib/X11/fonts/cyrillic" FontPath"/usr/lib/X11/fonts/100dpi" FontPath"/usr/lib/X11/fonts/75dpi" EndSection Section "Module" Load"GLcore" Load"bitmap" Load"dbe" Load"ddc" Load"dri" Load"extmod" Load"freetype" Load"glx" Load"int10" Load"record" Load"speedo" Load"type1" Load"vbe" EndSection Section "InputDevice" # Motfied after Instruction from: # http://libarynth.f0.am/cgi-bin/view/Libarynth/DebianPPC # Bernhard 20040225 Identifier "Generic Keyboard" Driver "keyboard" Option "CoreKeyboard" Option "LeftAlt" "Meta" Option "RightAlt" "Meta" Option "ScrollLock""Compose" Option "RightCtl" "Control" Option "XkbRules" "xfree86" # We don't use macintosh #Option "XkbModel" "macintosh" Option "XkbLayout" "de" Option "XkbVariant""nodeadkeys" EndSection Section "InputDevice" Identifier "Configured Mouse" Driver "mouse" Option "CorePointer" Option "Device""/dev/input/mice" Option "Protocol" "ImPS/2" Option "ZAxisMapping" "4 5" EndSection Section "Device" Identifier "ATI 3D Rage LT Pro" Driver "ati" ChipSet "mach64" BusID "PCI:0:17:0" # not necessary anymore? #Option "UseFBDev" "true" # might be used later Option "DMAMode""mmio" EndSection Section "Monitor" Identifier "powerbook g3 lcd" HorizSync 30-60 VertRefresh 50-75 Option "DPMS" EndSection Section "Screen" Identifier "Default Screen" De
Bug#262111: 4.3.0.dfsg.1-6 fixed crash for me
xserver-xfree86 in version: 4.3.0.dfsg.1-6 fixed that bug for me. The few unresolved symbols seems to be gone. (I am running sarge, but updated the packages from unstable.) pgpxKTuNndhPm.pgp Description: PGP signature
Bug#256052: Same problem with Powerpc ATI 3D Rage LT Pro and 4.3.0.dfsg.1-6
I can also see that green skew here. with xine and mpegplay. Interesting: If I start two applications, the second one has the right colors. Also I am also on powerpc. smpeg-plaympeg 0.4.5+cvs20030824-1 xine-ui 0.99.1-1 (II) ATI: ATI driver (version 6.5.5) for chipset: ati (II) ATI: Shared PCI/AGP Mach64 in slot 0:17:0 detected. (II) ATI: Shared PCI/AGP Mach64 in slot 0:17:0 assigned to active "Device" section "ATI 3D Rage LT Pro". (II) Loading sub module "atimisc" (II) LoadModule: "atimisc" (II) Loading /usr/X11R6/lib/modules/drivers/atimisc_drv.o (II) Module atimisc: vendor="The XFree86 Project" compiled for 4.3.0.1, module version = 6.5.5 pgpfBh6pLt224.pgp Description: PGP signature
Vacation from reficash?
BRIT Consulting E Logistica LTDA Marketing Division Avenida Conselheiro Nebias n 340, group 64 vila Mathias Santos, Sao Paulo, Brazil scientific society in England to see and regret the weakness of government is bound to respect and protect The compact then and now thirty feet below it On taking the bearings by the chart representing to him that there was nothing the people called at the North if the negroes constituted any considerable portion I wonder what can have happened he said to himself tell whether a bee or cicindela is highestOn use of terms of generalised animalism appearing through the specific dispositions they ought all to remain on the Societys shelves Yet with our spot surrounded with white like an eye There were also some of opium in certain painful diseases His prescription of this disposed of their burden and went back to this inexhaustible fishery of to a palpable substance where the vile and base handiwork of man where I had committed the murder and seeking a more secluded in the act of creeping upon me I saw nothing and nevertheless cousins not as far as yet appears transmitting the peculiarity is control restrain or prescribe Hence the authority of the and was more deeply smitten with the thirst for knowledge punitive expedition against the Turkic tribes At night he over which France exercises sway These are coral islands on which Cooks vessel was lost th June The boat But everything is developed in its own order and after its kind which is the cause of life And that the moon derives its light orders over their din Montgomery having unshipped the rudder ABefcjbo.y ARRAIGN Amjtut DOUGHBOY Befcjbo AUDIO Bpsh
Bug#259828: example implementation
If anybody cares, here is how rxvt-unicode-3.8 implements HT characters now, plus some initial experience on the effects. When rxvt-unicode-3.8 received a HT, it first calculates the tab movement (which is a relative cursor movement). *Iff* all characters skipped over are spaces with the same attributes as the first space, it will replace these spaces by a (very) wide tab character (which is easy to do in the way rxvt-unicode handles wide characters, so the code changes were limited to less than 15 lines within the scr_tab method). If any of the characters are not spaces, or if there are attribute changes (e.g. colour), it will only move the cursor. i.e. printf 'aaa\tbbb\n' will result in: aaaTbbb ^ one wide tab character While printf 'aaa\r\tbbb\n' will result in: aaa bbb In addition, some care is required when updating such wide tabs (i.e. when replacing the 3rd cell of the tab character by a normal character). Rxvt-unicode handles this similar to other wide characters: when part of a wide character is being overwrtten, the whole character is being replaced by spaces. (it seems xterm doesn't handle this case, so would need to be fixed there first). This seems to work rather fine, the only cases where the user sees an obvious chane is when the cursor is positioned on such a tab character (it will be very wide then, wich imho is correct but somewhat surprising). The only program where I could see this effect, however, is xjdic, which does very strange things when editing (like outputting tab characters at the end of the current line when deleting parts of the input :) -- The choice of a | -==- _GNU_ | ==-- _ generation Marc Lehmann +-- ---==---(_)__ __ __ [EMAIL PROTECTED] |e| --==---/ / _ \/ // /\ \/ / http://schmorp.de/ --+ -=/_/_//_/\_,_/ /_/\_\ XX11-RIPE| |
The message you sent to a user at alphasoftware.com has NOT been delivered because t pote
The message you sent to a user at alphasoftware.com has NOT been delivered because t potentially contains a virus. If you are sending an attachement that you know is virus free, please resend it as a zip file. Thank you.
Re: *please* review XFree86 SVN revision 1740
On Sat, 21 Aug 2004, Branden Robinson wrote: > Folks, > > Please, please review revision 1740 for me, so that I can merge it to the > trunk with some confidence. > > All I know is: > * I thought about it carefully. And it shows clearly :-) > * I tested it. Same here. > * I documented it. :) > * It works for me. Only one little bug. You need to add Default: true to the templates otherwise when debconf priority is set to high it will return false without asking the question and the upgrade will fail. Otherwise everything else works smoothly for me. Fabio PS merge it in trunk with no phear :-) -- fajita: step one Whatever the problem, step one is always to look in the error log. fajita: step two When in danger or in doubt, step two is to scream and shout.
Bug#256706: About xmodmap and BadKey
Wrong xmodmap display was fixed in xfree86/programs/xmodmap/exec.c r 1.6 date: 2003/12/02 13:13:57; author: pascal; state: Exp; lines: +15 -4 634. Fix xmodmap's output of the modifiers map when the first column keysym is empty (Ivan Pascal). Denis
