Attached are updated patches that apply to the latest X.Org in unstable. Cheers, Christopher Martin
On Sunday 06 November 2005 15:09, Christopher Martin wrote: > Any chance that the changes I suggested below (in previous posts to this > bug number) will be reviewed in time to make the 6.9.0 release upload? > The problems I describe are still relevant. Let me know if I can supply > any further information, or answer any questions. > > Thanks, > Christopher Martin > > On May 20, 2005 11:07, Christopher Martin wrote: > > These patches, for the etch-targeted X.Org server, improve dpi handling > > in several ways. > > > > The first, fallback_dpi.patch, is a new one-line patch that changes the > > xserver's final fallback dpi value from 75 to 100. I've written > > extensively (to this bug report) on why this is a very important and > > quite safe change that would be great to have in the X.Org packages. In > > summary, since a default fallback value will always be required, we > > should make it a good one. This has ramifications for the choosing of > > default font sizes (in KDE, for instance). > > > > The other two items, 905_debian_xdm.diff.diff and xserverrc.diff, are > > diffs to existing Debian patches and files. They remove the forcing of > > 100 dpi on startup, when using startx or xdm. With the pending debconf > > reforms, and the near-ubiquity of DDC, it no longer makes sense to > > force a specific dpi value on startup as the default behaviour. In > > conjunction with > > fallback_dpi.patch, users for whom dpi auto-calculation fails will > > notice no difference, since X would in this case fall back to 100 dpi > > anyway. I've made more general arguments about dpi handling in my > > previous posts to #237877. > > > > I'm putting forth these diffs while the X.Org packages are young and > > experimental, since this is the perfect time to try these sorts of > > changes. I hope you'll apply them.
--- xorg.orig/debian/patches/debian/905_debian_xdm.diff +++ xorg.patched/debian/patches/debian/905_debian_xdm.diff @@ -12,8 +12,7 @@ * config/Xres.cpp: report OS name in greeter widget * config/Xserv.ws.cpp: - add comments to help local admins - - run local server with DPI setting forced to 100 and TCP listening - turned off for security + - run local server with TCP listening turned off for security * config/Xsession: replace guts with simple call to Debian's Xsession script * config/xdm-conf.cpp: @@ -124,7 +123,7 @@ +XCOMM Examples for multiple local X displays: +XCOMM :0 local BINDIR/X :0 vt9 -depth 15 -nolisten tcp +XCOMM :1 local BINDIR/X :1 vt10 -depth 8 -nolisten tcp -+:0 local BINDIR/X DEFAULTVT -dpi 100 -nolisten tcp ++:0 local BINDIR/X DEFAULTVT -nolisten tcp Index: xc/programs/xdm/config/Xsession.cpp =================================================================== --- xc/programs/xdm/config/Xsession.cpp.orig 2005-12-24 16:46:49.000000000 -0500
--- xorg.orig/xc/programs/Xserver/hw/xfree86/common/xf86Priv.h +++ xorg.patched/xc/programs/Xserver/hw/xfree86/common/xf86Priv.h @@ -125,7 +125,7 @@ #define DEFAULT_LOG_VERBOSE 3 #endif #ifndef DEFAULT_DPI -#define DEFAULT_DPI 75 +#define DEFAULT_DPI 100 #endif #define DEFAULT_UNRESOLVED TRUE
--- xorg.orig/debian/local/xserverrc +++ xorg.patched/debian/local/xserverrc @@ -2,4 +2,4 @@ # $Id: xserverrc 189 2005-06-11 00:04:27Z branden $ -exec /usr/bin/X11/X -dpi 100 -nolisten tcp +exec /usr/bin/X11/X -nolisten tcp