Commit Graph

2810 Commits

Author SHA1 Message Date
matthieu
3998488de6 Merge commits 838 and 840 from trunk:
Fix bug with suspend and VT switch on VX800 and 64bit systems
(tested by jakemsr@)
Fix segfaults with EXA and XV (Ticket #359) Tested on K8M890 and VN800
2010-08-21 14:00:58 +00:00
matthieu
150faee00c Update to kbproto 1.0.5 2010-08-21 09:35:16 +00:00
matthieu
6da9a8a1d4 update 2010-08-21 08:26:09 +00:00
oga
25b0cbcd49 Fix autoconfiguration on sparc and sparc64.
The code to add sunffb unconditionally on !solaris for __sparc__
systems is incorrect for openbsd. More specifically, due to interactions
between hardware drivers and wsfb in preinit we can't unconditionally
add wsfb to the list of fallbacks, so we only add wsfb if no other
option was found. Additionally sunffb does not need to be
unconditionally added because the bus probing code will find these
devices already.

So, long story short:  make that code chunk conditional on __sparc__ &&
defined(__linux__) instead.

change from !openbsd to __linux__ requested by kettenis@.

Tested by at least myself and stsp@.

ok matthieu@, kettenis@.
2010-08-18 22:37:36 +00:00
todd
b6cbfdde5d sync 2010-08-10 20:56:13 +00:00
todd
28b1eda656 permit sgi/loongson to make a release with no xorg.conf,
broken since xorg.conf was removed for these archs
2010-08-10 20:55:50 +00:00
matthieu
791220ead2 Disable ftgl support explictely. 2010-08-05 06:44:21 +00:00
matthieu
5c91d4a314 Start updating README and xorg.conf file for 4.8. ok miod@.
sparc64 still needs to be checked and updated.
2010-08-05 06:34:19 +00:00
todd
c2b89fcb39 disable video for now; ok deraadt@ 2010-08-04 23:24:11 +00:00
espie
03413d00ed set PATH only on configure run, unbreak autoreconf... 2010-08-04 22:56:00 +00:00
espie
86585fc2ec enforce a consistent path in configure, avoid all kind of trouble with X
picking up ports from /usr/local.

okay matthieu@
2010-08-04 22:50:51 +00:00
matthieu
b1ae736ef2 Commit the right version of the file: we want to remove XkbLayout from
the defaults, no XkbModel.
2010-08-04 22:28:36 +00:00
matthieu
42e5cee579 Fix the fix of the fix.
Previous iteration would again ignore wscons keyboard.encoding setting.
Now no default xkbLayout is set, unless keyboard.encoding=user.
2010-08-04 21:45:32 +00:00
matthieu
7cfab8f596 Don't set xkblayout from wscons setting if specified in xorg.conf.
Problem noticed, and patch provided by  Mike Belopuhov. Thanks.
2010-08-04 19:27:52 +00:00
dcoppa
2cda6f76a0 Pull in some fixes from upstream:
o various memleak fixes
o ensure get_wm_class_from_reply returns a valid C-string

OK matthieu@, deraadt@
2010-08-04 07:47:53 +00:00
matthieu
7d300cd289 Remove some of the obsolete stuff. 2010-08-03 21:26:15 +00:00
matthieu
751444b733 Remove empty .TP 2010-08-03 21:22:32 +00:00
matthieu
c9254707d2 Current pixman lib doesn't build on m68k. Disable it on those machines.
ok deraadt@
2010-08-02 18:45:02 +00:00
todd
3e56f14316 puffy 4.8 2010-08-02 14:29:27 +00:00
matthieu
31f2be4aaf Fix a problem when switching back from a text VT; avoid stealing
the keyboard or other input devices events.
2010-08-01 19:21:01 +00:00
matthieu
fe603b97cb Fix X -keepPriv by calling xf86OpenConsole() early enough on architectures
that don't have a separate /dev/xf86. Problem noticed by kettenis@ and krw@
ok kettenis@.
2010-07-31 17:47:50 +00:00
matthieu
36733264e6 regen 2010-07-31 16:52:52 +00:00
matthieu
67cb53f63e Define AM_CFLAGS and AM_CPPFLAGS like other drivers do. This fixes
build with CFLAGS=-g.
2010-07-31 16:51:57 +00:00
matthieu
7ed82871ab update 2010-07-31 09:31:45 +00:00
matthieu
c6043fcd65 Update to sessreg 1.0.6 2010-07-31 09:18:16 +00:00
matthieu
daf210776f Update to sessreg 1.0.5 2010-07-31 09:14:09 +00:00
matthieu
f256c6eec5 Update to libpciaccess 0.12.
We already had most of the code from this version, it just add
2 bug fixes. no ABI/API change.
2010-07-31 08:05:06 +00:00
matthieu
e8889e891b Update to xset master from X.Org git.
This brings manual page updates regarding the new mouse acceleration
code.
2010-07-31 07:58:30 +00:00
matthieu
ac1a6f7f2c Update to xrandr 1.3.3 2010-07-31 07:46:51 +00:00
matthieu
366b5ebac5 Disable XACE in kdrive too. 2010-07-31 07:40:58 +00:00
matthieu
4fc63f1770 Missed one added file in previous update to xf86-input-keyboard 1.4.0 2010-07-31 07:38:20 +00:00
okan
bd36084da7 revert -r1.45 of group.c (log was: fix window name and class to match
cwmrc(5)).  instead, fix cwmrc(5) to match the old behavior which also
happens to match the example config, of which many have based their
configs; this also nicely matches the output of xprop(1).

clean-up of variable names as a separate commit.

suggested by sthen (and something we should have done initially).

discussed with and ok oga@
2010-07-30 12:28:19 +00:00
dcoppa
184d7c3b41 Cast "pid" as unsigned long to avoid a bus error on sparc64.
OK matthieu@
2010-07-30 05:35:58 +00:00
naddy
988f34c0b9 terminate xf86Msg() string with newline; ok matthieu@ 2010-07-28 19:47:40 +00:00
todd
9e9ad5c8a3 sync 2010-07-27 22:02:14 +00:00
matthieu
32463410d8 update 2010-07-27 21:59:03 +00:00
matthieu
439d2f36f3 Additional fix for the wscons keyboard layout detection code.
If the layout is 'user', fall back to the "us" layout.

Problem spotted by naddy@.
2010-07-27 19:33:03 +00:00
matthieu
0efb2e140a Update to xf86-input-mouse 1.5.0. Tested by many with xserver 1.8
ok oga@, todd@.
2010-07-27 19:08:46 +00:00
matthieu
3fa6fbc913 Update to xf86-input-keyboard 1.4.0. tested by many with xserver 1.8.
ok oga@, todd@.
2010-07-27 19:06:44 +00:00
matthieu
183207fd4d Add 4 files missed in xserver 1.8 update. 2010-07-27 19:05:15 +00:00
matthieu
95d684a05b Update to xserver 1.8. Tested by many. Ok oga@, todd@. 2010-07-27 19:02:24 +00:00
jakemsr
bdc0c150f3 $OpenBSD$ and compare width to width, not width to height 2010-07-26 23:02:06 +00:00
matthieu
ae10e3711f avoid segfault in pci_device_vgaarb_fini() when called without
initializing the library first. (This happens when invalid options
are passed to X for instance). ok kettenis@
2010-07-26 18:48:48 +00:00
sobrado
9e6242225e sort options as usual in our operating system; `usage:' is lower case;
improve usage()'s output; better indentation in usage() function.

ok jakemsr@
2010-07-26 08:09:33 +00:00
matthieu
d437e8db6c update 2010-07-25 19:55:00 +00:00
matthieu
9f50d18e65 kill trailing white space. 2010-07-25 19:53:35 +00:00
matthieu
67355d758b Fix configurations with both a stylus and an eraser.
The previous code was working by luck, since the "device busy" error
when opening the 2nd device was ignored. With xserver 1.8, xinput2 is
a bit less tolerant and causes a segfault. Problem reported by sthen@
Thanks.
2010-07-25 19:52:23 +00:00
matthieu
0f0c4a9fa0 Get rid of unused callbacks. 2010-07-25 14:35:53 +00:00
matthieu
8e75be5a1f LocalDevicePtr and InputInfoPtr are the same. Use the latter everywhere
for consistency. No code change.
2010-07-25 14:15:49 +00:00
matthieu
ef05bb6d86 A batch of font packages updates, only build-system related:
font-adobe-100dpi		1.0.1
font-adobe-75dpi		1.0.1
font-adobe-utopia-100dpi	1.0.2
font-adobe-utopia-75dpi		1.0.2
font-adobe-utopia-type1		1.0.2
font-arabic-misc		1.0.1
font-bh-100dpi			1.0.1
font-bh-75dpi			1.0.1
font-bh-lucidatypewriter-100dpi	1.0.1
font-bh-lucidatypewriter-75dpi	1.0.1
font-bh-ttf			1.0.1
font-bh-type1			1.0.1
font-bitstream-100dpi		1.0.1
font-bitstream-75dpi		1.0.1
font-bitstream-type1		1.0.1
font-cronyx-cyrillic		1.0.1
font-cursor-misc		1.0.1
font-daewoo-misc		1.0.1
font-dec-misc			1.0.1
font-ibm-type1			1.0.1
font-isas-misc			1.0.1
font-jis-misc			1.0.1
font-micro-misc			1.0.1
font-misc-cyrillic		1.0.1
font-misc-ethiopic		1.0.1
font-misc-meltho		1.0.1
font-mutt-misc			1.0.1
font-screen-cyrillic		1.0.2
font-sony-misc			1.0.1
font-sun-misc			1.0.1
font-winitzki-cyrillic		1.0.1
font-xfree86-type1		1.0.2
2010-07-25 12:04:56 +00:00