frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,933 Commits 293 Branches 13 Tags 61 MiB
Commit Graph

635 Commits

Author SHA1 Message Date
Peter Hutterer 4f2cd0ed96 Merge branch 'master' into mpx 
This merge reverts Magnus' device coorindate scaling changes. MPX core event
generation is very different, so we can't scale in GetPointerEvents.

Conflicts:

	Xi/opendev.c
	dix/devices.c
	dix/dixfonts.c
	dix/getevents.c
	dix/resource.c
	dix/window.c
	hw/xfree86/common/xf86Xinput.c
	mi/mipointer.c
	xkb/ddxBeep.c
	xkb/ddxCtrls.c
	xkb/ddxKeyClick.c
	xkb/ddxList.c
	xkb/ddxLoad.c
	xkb/xkb.c
	xkb/xkbAccessX.c
	xkb/xkbEvents.c
	xkb/xkbInit.c
	xkb/xkbPrKeyEv.c
	xkb/xkbUtils.c
 2008-03-04 18:11:10 +10:30
George Sapountzis 3d64290547 clean some "unused" warnings 2008-03-01 19:49:24 +02:00
Eamon Walsh ef60632e20 dix: Modify callers of property and selection API to use new interfaces. 2008-02-29 18:01:37 -05:00
Adam Jackson 4cb4817c10 Remove the duplicate copy of xf86cvt.c 2008-02-29 16:01:15 -05:00
Adam Jackson e65e51a99b Constify the built-in mode tables. 2008-02-29 16:01:14 -05:00
Adam Jackson 6828d8fc2b Clean up DisplayModeRec handling in many places. 
Use xf86DuplicateMode() instead of rolling our own, and change
malloc+memset to calloc.
 2008-02-29 16:01:14 -05:00
Adam Jackson 85617b56e5 Remove some #if 0 guarding code duplicated in xf86Modes.c 2008-02-29 16:01:14 -05:00
Tiago Vignatti 81272f7ec9 Some doc clean up: 
clean up legacy things in os-support/bus/Pci.c.

    Put InitOutput() comment to its right place.
 2008-02-25 17:39:33 -03:00
Tiago Vignatti 9727db88d5 No more "-scanpci" given that we already have it in libpciaccess. 
(Yeah, lets nuke dead code!)
 2008-02-25 17:08:07 -03:00
Tiago Vignatti f19f7b8e53 Clean some garbage caused when pciaccess was merged: 
FindPCIVideoInfo() function isn't need anymore.

    xf86scanpci() is being called only once so we don't need permanent
    (static) variables there.

    restorePciState() is not used for now (until we find why multiple
    cards aren't working).
 2008-02-25 17:07:07 -03:00
Adam Jackson 347db49ebe s/via/openchrome/ in the autoconfig logic. 
Xorg's via driver is effectively dead anyway.
 2008-02-22 16:05:33 -05:00
Peter Hutterer 67a78e84a8 Revert "xfree86: plug a memory leak in xf86LoadModules." 
This reverts commit 3abce3ea2b and
6cbaf15e61.

The memory returned to xf86LoadModule was allocated in doLoadModule, which
calls the respective module's PreInit. As it turns out, input and output
drivers store a pointer to the module elswhere, so freeing it in
xf86LoadModule is a bad idea.

For further reference: hw/xfree86/common/xf86Helper.c
    Input drivers: xf86InputDriverList[blah]->module = module;
    Output drivers: xf86DriverList[blah]->module = module;

Unloading the module would not look pretty then.
 2008-02-19 21:31:50 +10:30
Peter Hutterer 74628d6397 dix: change GetEventList to return length of list and set parameter in place. 
Changing DDXs to use new prototype too.
 2008-02-19 16:53:15 +10:30
Peter Hutterer 6cbaf15e61 xfree86: guard against NULL-pointer dereferences in xf86LoadModules. 
Should have been part of 3abce3ea2b, but I
forgot to git-update-index before I committed.

Thanks to Bill Crawford for pointing it out.
 2008-02-19 12:05:13 +10:30
Peter Hutterer 3fe64d8d27 Move input event list initialisation and storage from DDX to DIX. 
Rather than letting the DDX allocate the events, allocate them once in the DIX
and just pass it around when needed.

DDX should call GetEventList() to obtain this list and then pass it into
Get{Pointer|Keyboard}Events.
 2008-02-18 18:46:01 +10:30
Arjan van de Ven 3abce3ea2b xfree86: plug a memory leak in xf86LoadModules. 
LoadModule() returns the only reference to a fresh piece of memory (a
ModuleDescPtr). Sadly, xf86LoadModules dropped the return value on the floor
leaking memory for each module it loaded.

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
 2008-02-18 18:14:40 +10:30
Arjan van de Ven 1bec6ad897 xfree86: plug memory leak in xf86LogInit() 
xf86LogInit allocates a piece of memory, stores it in lf. LogInit() will then
effectively strdup it, but lf is never freed again.

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
 2008-02-18 18:14:20 +10:30
Adam Jackson f750ce53ac Remove some braindamage from ModuleDesc. 
Yay dead code elimination.
 2008-02-14 08:22:57 +11:00
Adam Jackson e91ff09568 Friends don't let friends call xf86AddModuleInfo. 
That code only existed to leak memory.  It can go now, thanks.
 2008-02-14 08:21:44 +11:00
Adam Jackson 0bdd20a045 Eradicate the VTInit code. 
"This option should rarely be used."  Never sounds like a better idea.
 2008-02-14 07:52:46 +11:00
Adam Jackson 24089b0624 Don't bother warning people about the keyboard driver rename, just do it. 2008-02-14 07:52:33 +11:00
Adam Jackson 2aaf6ac134 Don't even attempt to parse -bpp in xfree86 DDX option parsing. 
This hasn't been valid since 1999.  Get with the times, man.
 2008-02-14 07:52:26 +11:00
Peter Hutterer 10617dc0fb xfree86: stick two more checks in for num_valuators < MAX_VALUATORS 2008-02-01 14:24:04 +10:30
Matthieu Herrb c68f063be6 xfree86: don't call xalloc from signal handlers when posting events. 
Reviewed-by: Peter Hutterer <peter@cs.unisa.edu.au>
 2008-02-01 14:14:17 +10:30
Peter Hutterer e5e531ce96 Merge branch 'master' into mpx 
Conflicts:

	dix/events.c
 2008-01-31 16:36:17 +10:30
Peter Hutterer 5b8641a5fd xfree86: fix AlwaysCore handling. (Bug #14256) 
Assume AlwaysCore being set by default, just like the other options.

X.Org Bug 14256 <http://bugs.freedesktop.org/show_bug.cgi?id=14256>
 2008-01-29 10:01:42 +10:30
Peter Hutterer 0ac1755977 Merge branch 'master' into mpx 
Conflicts:

	Xext/sampleEVI.c
 2008-01-26 13:55:07 +10:30
Peter Hutterer ba315ae5dd Xi: add XACE hooks for device creation (ChangeDeviceHierarchy) 
AddInputDevice checks for permissions already, so all we do is modify a few
callers to let AID sort it out.
 2008-01-21 23:44:07 +10:30
Peter Hutterer 883811c2be dix: remove inputInfo.pointer reference in TryClientEvents. 
Unfortunately, this requires a change in the TCE API, and thus a change in all
callers. Tough luck.
 2008-01-18 18:48:46 +10:30
Matthieu Herrb bbde5b62a1 Fix for CVE-2007-5760 - XFree86 Misc extension out of bounds array index 2008-01-17 15:26:41 +01:00
Peter Hutterer 38bf01bd1c Merge branch 'master' into mpx 2008-01-10 13:38:46 +10:30
David Nusinow 30375cd6d1 Don't log DPMS enabling as being from xorg.conf if it's not 2008-01-07 20:57:30 -05:00
David Nusinow 260505e3c5 Log enabling of DPMS even when it's not set in xorg.conf 2008-01-06 16:37:13 -05:00
Peter Hutterer 8da83836b6 Merge branch 'master' into mpx 
Conflicts:

	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c
 2008-01-03 17:04:54 +10:30
Adam Jackson 85365ddf16 EDID 1.4: If given a native pixel format, use it when inferring virtual. 2007-12-28 17:38:52 -05:00
Dave Airlie 7ef7727b80 entity sharing: make !shareable entity non-fatal. 
Just because the entity isn't shareable, we should bring down the server.
Just ignore the extra screen and keep going.
 2007-12-20 10:11:26 +10:00
Eamon Walsh a2df51f8e9 Bump video driver ABI and extension ABI for devPrivates rework. 2007-12-14 00:53:54 -05:00
Eamon Walsh 86b2e59bfb Merge branch 'master' into XACE-SELINUX 
Conflicts:

	configure.ac

This is the last pull before merging to master.
 2007-12-14 00:32:24 -05:00
Eamon Walsh c8feb73f58 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	Xext/EVI.c
	Xext/bigreq.c
	Xext/cup.c
	Xext/dpms.c
	Xext/fontcache.c
	Xext/mitmisc.c
	Xext/xcmisc.c
	Xext/xf86bigfont.c
	Xext/xtest.c
	configure.ac
	dbe/dbe.c
	hw/darwin/darwin.h
	hw/darwin/darwinEvents.c
	hw/darwin/iokit/xfIOKit.h
	hw/darwin/iokit/xfIOKitCursor.c
	hw/darwin/quartz/fullscreen/fullscreen.c
	hw/darwin/quartz/fullscreen/quartzCursor.c
	hw/darwin/quartz/quartz.c
	hw/darwin/quartz/quartzCommon.h
	hw/darwin/quartz/quartzCursor.c
	hw/darwin/quartz/xpr/dri.c
	hw/darwin/quartz/xpr/dristruct.h
	hw/darwin/quartz/xpr/xprCursor.c
	hw/darwin/quartz/xpr/xprFrame.c
	hw/xfree86/modes/xf86RandR12.c
	include/cursor.h
	miext/rootless/rootlessCommon.h
	miext/rootless/rootlessScreen.c
	miext/rootless/rootlessWindow.c
	render/picturestr.h

Trying to pick up the pieces from the darwin churn here...
 2007-12-13 18:38:25 -05:00
Adam Jackson 1768af38c7 Add infrastructure for validating modes by memory bandwidth. 2007-12-13 15:06:18 -05:00
Adam Jackson 8cedbb0a53 Clean up some #if 0. 2007-12-13 10:57:35 -05:00
Aaron Plattner a125ce4a84 Fix dist by including modeline2c.awk. 
This was broken by commit cb44b6121c, which
removed modeline2c.pl from EXTRA_DIST without adding modeline2c.awk.
 2007-12-12 12:24:29 -08:00
Aaron Plattner 6715923437 Get rid of xf86DefModes.c. 
It's out of date and not included in the build.  Instead, xf86DefModeSet.c is
built from vesamodes and extramodes using modeline2c.awk and *that's* what gets
built.
 2007-12-12 10:59:15 -08:00
Andrew Oakley cb44b6121c Fix commit aa0dfb3f42 
From bugzilla bug 13467¹:

Currently the xserver fails to build without this (now deleted) file, as the
Makefile tries to distribute it.  The patch simply removes the reference to
modeline2c.pl.

1] http://bugs.freedesktop.org/show_bug.cgi?id=13467

Signed-off-by: James Cloos <cloos@jhcloos.com>
 2007-12-05 20:23:05 -05:00
Adam Jackson 13af2d1efc Restore xf86getsecs() as not having an ANSI equivalent. 2007-12-04 17:36:21 -05:00
James Cloos aa0dfb3f42 Remove Perl dependency from the build 
From bugzilla bug 13467¹:

The modeline2c script is the only part of the Xorg server that requires Perl.
[This] is a simpler replacement that works with any normal AWK.

1] http://bugs.freedesktop.org/show_bug.cgi?id=13467

Bug was posted by Joerg Sonnenberger <joerg@NetBSD.org>.
 2007-12-03 16:57:58 -05:00
Adam Jackson 1faba797cb Death to libcwrapper. 
This has been deprecated since 1.1.  Since we're breaking ABI again anyway,
remove it entirely.
 2007-12-03 14:12:58 -05:00
Adam Jackson a344920ae8 Allow Virtual to be specified globally in the Screen section. 
The Display subsections are optional, and it's confusing to need to create
them just to set a Virtual size.
 2007-11-26 11:53:08 -05:00
Peter Hutterer f9269bebae DeviceIntRec: move lastx/lasty from valuator into DeviceIntRec. 
We free the ValuatorClassRec quite regularly. If a SIGIO is handled while
we're swapping device classes, we can bring the server down when we try to
access lastx/lasty of the master device.
 2007-11-22 17:30:14 +10:30
Eamon Walsh 2d17f47cc7 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	hw/xnest/Pixmap.c
	include/dix.h
 2007-11-19 18:10:46 -05:00
Eamon Walsh 60be452c2e xace: restore the old SaveScreens function and introduce new API, since the 
old version is called from drivers...
 2007-11-19 16:59:34 -05:00
Adam Jackson db9ae86353 Bump DEFAULT_DPI to 96. 
75 is just nonsense.
 2007-11-18 11:57:01 -05:00
Adam Jackson d15339a92c Bug #9725: Don't look in root's $HOME for config files, that's just confusing. 2007-11-17 22:12:10 -05:00
Adam Jackson 6bc50de021 Simplify system resource range setup. 
osRes only existed to get copied into Acc.  Waste of effort.
 2007-11-15 15:03:58 -05:00
Adam Jackson e1ff14a924 Delete some dead code in X -configure. 2007-11-15 14:45:49 -05:00
Adam Jackson c67b9c5fc3 Clean up some garbage in driver enumeration. 2007-11-15 14:24:36 -05:00
Adam Jackson 0706e5e790 Eliminate some redundancy in autoconfiguration. 
We already synthesize Monitor and Module sections for you, no need to
specify them explicitly in the fake config buffer.
 2007-11-15 14:15:09 -05:00
Adam Jackson 2c01a49bf0 Don't sleep(1) at exit on any platform. 2007-11-15 13:32:59 -05:00
Adam Jackson cecac79445 Don't sleep(1) at server exit. 2007-11-14 14:46:22 -05:00
Peter Hutterer 184a7b8917 Merge branch 'mpx' into mdsd 
Conflicts:

	Xi/opendev.c
 2007-11-08 09:34:35 +10:30
Peter Hutterer 0b729051c0 Merge branch 'master' into mpx 
Conflicts:

	Xi/extinit.c
	Xi/grabdev.c
	Xi/setmode.c
	Xi/ungrdev.c
	dix/devices.c
	dix/events.c
	dix/getevents.c
	include/dix.h
	mi/midispcur.c
	mi/misprite.c
	xkb/xkbActions.c
	xkb/xkbEvents.c
	xkb/xkbPrKeyEv.c
 2007-11-07 15:37:23 +10:30
Eamon Walsh a52c9b2a59 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	dix/dispatch.c
	dix/property.c
	hw/xfree86/common/xf86VidMode.c
	include/xkbsrv.h
	render/glyph.c
	xkb/xkbActions.c
 2007-11-05 19:08:36 -05:00
Daniel Stone dda10c9066 Remove all traces of external RGB database (and Speedo) 
Remove all references to an external RGB database (which hasn't been enabled
for a very long time).  Also get rid of some references to Speedo fonts.
 2007-11-05 16:28:35 +00:00
Daniel Stone 733d42065f XFree86: Remove usage of alloca 
Replace with heap allocations.
 2007-11-05 14:34:42 +00:00
Aaron Plattner f2e310132f Add CreatePixmap allocation hints. 
These hints allow an acceleration architecture to optimize allocation of certain
types of pixmaps, such as pixmaps that will serve as backing pixmaps for
redirected windows.
 2007-11-04 16:11:28 -08:00
Mark Vytlacil 41c3069f7c XFree86: Input: Save/restore errno around SIGIO (bug #10683) 
Make sure errno is saved and restored from the SIGIO handler, so errors
from system calls in input handlers don't break the interrupted code.
 2007-11-04 16:46:21 +00:00
Kristian Høgsberg 7a0555e9bb Fix crash in xf86InitOrigins() 
In a multihead setup, if only the first screen can be
initialized, but the second screen is mentioned first in the
ServerLayout section, the xf86InitOrigins() function will crash
because the screen referred to in the e.g. "RightOf" part is
non-existent.
 2007-11-02 12:06:09 -04:00
Kristian Høgsberg 692654b430 Set up visuals for the existing X visuals. 
This makes the root visual a GLX capable visual again and adds a GLX visual
for the COMPOSITE ARGB visual cleanly (as opposed to the hack we had before).
 2007-10-29 18:14:18 -04:00
Peter Hutterer 8ead41388e xfree86: wrap keyboard devices for XKB. 
Call ProcessOtherEvents first, then for all keyboard devices let them be
wrapped by XKB. This way all XI events will go through XKB.

Note that the VCK is still not wrapped, so core events will bypass XKB.

(cherry picked from commit d627061b48)
 2007-10-28 17:31:07 +02:00
Daniel Stone 6d59bb5709 XFree86 Misc/VidMode: Remove ridiculous debug ErrorFs 
When we're building with --enable-debug, don't emit an ErrorF every time a
function gets called.
 2007-10-26 09:12:38 +03:00
Eamon Walsh b633d54b94 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	GL/glx/glxscreens.c
	hw/xnest/Screen.c
	render/glyph.c
	render/glyphstr.h
	render/render.c
 2007-10-25 12:19:30 -04:00
David Nusinow d808d653d1 Define PCI_TXT_IDS_DIR more cleanly 2007-10-22 21:30:04 -04:00
David Nusinow be9b0e558d Add a note as to why the text file based PCI ID scheme is present at all 2007-10-21 23:49:14 -04:00
David Nusinow b79b965bd9 Fix compilation issue on FreeBSD (bug #12841) 
Hide getline call by checking for glibc. If not, use fgetln instead. Even
though this section is now #ifdef'ed for linux only, this should help make
it more portable if non-linux folks end up wanting it.
 2007-10-21 23:46:54 -04:00
David Nusinow 7f5e71fa73 Make PCI text file directory configurable 2007-10-21 23:41:49 -04:00
Eric Anholt 7e1cada6c6 Disable debian pci-id-list autoconfig code on non-linux. 
It contains static paths, fails to build on non-glibc, and apparently just
exists to support distributions managing binary drivers and open-source drivers
together.  Also restores previous code for fallback to vesa if nothing is
detected.
 2007-10-19 15:16:19 -07:00
Kristian Høgsberg 8e3c1dfc48 Introduce a new "GlxVisuals" option that controls which visuals are added. 
Right now we default to "all" which gives us a situation much like before,
but when the "typical" option is implemented, we can change the default and
reduce the number of visuals the GLX module bloats the X server with.
 2007-10-18 21:03:43 -04:00
Eamon Walsh c3f7b86255 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	os/access.c
 2007-10-17 15:00:54 -04:00
Keith Packard feac075952 Make config file preferred mode override monitor preferred mode. 
Add a new even-more-preferred bit to each mode which is used to make config
file preferences selected instead of the monitor preferred mode.
 2007-10-17 11:42:28 +08:00
Peter Hutterer 5fe9bfd23f xfree86: NIDR: don't call PairDevices explicitly. 
set isMaster to FALSE explicitly.

Pairing isn't necessary, attachment should be done in EnableDevices.
 2007-10-16 18:23:48 +09:30
Peter Hutterer 271d4c3d62 xfree86: remove XI86_SHARED_POINTER flag. 
Not needed anymore. By default, all devices are slaves of first master device.
 2007-10-16 15:50:07 +09:30
Peter Hutterer e9f149fb56 Fix up detritus from removing GetPairedPointer/Keyboard. 2007-10-16 14:24:20 +09:30
Ben Byer 3d4eb17b38 mass change from #ifdef i386 to #ifdef __i386__ to conform to ANSI 2007-10-14 18:07:03 -07:00
David Nusinow eaf0e2a21c Fix another compiler warning 2007-10-11 22:31:24 -04:00
David Nusinow a5089af726 Fix a warning about the control logic in xchomp() 2007-10-11 22:24:31 -04:00
David Nusinow cdf29ff45a Remove some unused variables 2007-10-11 22:23:34 -04:00
David Nusinow 3367091f7f Separate choosing driver from the file-based implementation 
This clears the implementation out of the way to prepare for development
of a symbol-based resolution scheme
 2007-10-11 22:21:38 -04:00
David Nusinow ea2d4dc468 When there's no xorg.conf, use the video driver autoloading function 2007-10-11 20:26:02 -04:00
David Nusinow 8825d36a38 Allow the user to not have a screen section 
If none is present, a default one will be created. This will be attached
to either the first device section in the xorg.conf (allowing you to
specify something like using EXA without having a screen section) or a
default screen section if none is present in the file.
 2007-10-09 22:49:07 -04:00
David Nusinow 8665cf3327 Don't require that the screen explicitly attach the device section 
This will allow the screen to not explicitly have a device section. If
this is the case and there is a device section in the xorg.conf, the first
one will be used. If there is no device section at all, a default one will
be created that loads the automatically determined module.
 2007-10-09 22:45:15 -04:00
David Nusinow 37898b824f Use the best guess heuristic as a fallback for autoloading 
This prevents breaking the current behavior
 2007-10-09 22:13:15 -04:00
David Nusinow 847fbbf4d2 Fix autoloading of drivers for pci-rework 2007-10-09 22:13:15 -04:00
David Nusinow 6033d8150b First pass at improved video driver autoloading 
This is what we're currently shipping in Debian. Enables the ability for
drivers to ship a text file listing PCI ID's they support, and have the
server read them on startup when no driver is specified. This works, but
isn't the final solution.
 2007-10-09 22:13:15 -04:00
David Nusinow 81d7b81146 Load intel instead of i810 when autoconfiguring 2007-10-09 22:13:15 -04:00
Peter Hutterer 45ec6cd1fb xfree86: fix DGA to use the correct devices. 
DGAStealXXXEvent modified to take in device argument.

The evdev driver only sends one valuator when only one axis changed. We need
to check for DGA either way (xf86PostMotionEventP), otherwise we lose purely
horizontal/vertical movements.

Note that DGA does not do XI events.
 2007-10-02 13:19:07 +09:30
Peter Hutterer 122ae65ed9 xfree86: xf86DGA: some cleanup to use the correct devices instead of VCP/VCK. 2007-10-02 10:50:59 +09:30
Peter Hutterer 54ce7436b2 xfree86: update all pointers when calling xf86SwitchMode 
Center the frame around the first pointer found and then update all pointers
on the same screen to move to the edges (if necessary).

Note: xf86WarpCursor needs to be modified, is using deprecated
miPointerWarpCursor and will kill the server when called with
inputInfo.pointer.
 2007-10-02 10:49:46 +09:30
Peter Hutterer 113011221a Xi, xfree86: Remove leftovers of the XI wrapper code. 2007-10-01 21:42:01 +09:30
Eamon Walsh 5c03d13181 xace: add new hooks + access controls: XInput extension. 
Introduces new dix API to lookup a device, dixLookupDevice(), which
replaces LookupDeviceIntRec and LookupDevice.
 2007-09-28 08:02:00 -04:00
Peter Hutterer e2cb851566 xfree86: pass in the XKB event processing proc instead of the XI one. 
We need to pass ProcessPointerEvent or ProcessKeyboardEvent to
XkbSetExtension, otherwise we lose the xkb layer.
 2007-09-26 18:01:17 +09:30