summaryrefslogtreecommitdiff
path: root/hw
AgeCommit message (Collapse)AuthorFilesLines
2009-10-20Remove unused LinuxFindPci and LinuxGetPciCfgHEADmasterMikhail Gusarov3-138/+0
These two functions are not referenced from inside xserver. Remove now-empty klinux.h too. Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-19Fix make dist after 78c87bdad1feab91c2a39e01513b4b0826665f06Yaakov Selkowitz1-1/+0
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-18kdrive: fix Xfake build by removing the old keysym stuffPeter Hutterer1-135/+2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-15Define ddxBeforeReset stubs in platform-neutral DDXsYaakov Selkowitz4-0/+26
XWin uses ddxBeforeReset, which is called in DIX. Other DDXs need to define these in order to avoid an undefined symbol error at link time when building alongside XWin. Xnest and Xvfb already provide empty stubs; this does the same for Xdmx and the platform-neutral KDrive servers. Also add a prototype to avoid a warning in all DDXs. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-15Remove duplicates from Xfake_LDADDYaakov Selkowitz1-2/+1
KDRIVE_LIBS already contains the libs in XSERVER_LIBS, so linking against both leads to multiple-definition errors when linking on Cygwin. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-14Cygwin/X: Avoid a potential null pointer dereference before input initializationJon TURNEY1-0/+4
Avoid a null pointer dereference if WM_MOUSEMOVE occurred before the input device had been initialized (a timing sensitive bug occassionally seen during initialization) Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2009-10-14Cygwin/X: Make -logverbose affect the verbosity of logging to the log fileJon TURNEY1-1/+1
Make -logverbose affect the verbosity of logging to the log file, not just the verbosity of logging to the console Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2009-10-14Xming: Fix various 'ISO C90 forbids mixed declarations and code' warningsColin Harrison3-38/+40
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-10-14Xming: Remove unused X-boxed icon resourceColin Harrison3-2/+0
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-10-14Xming: update .rc fileColin Harrison1-6/+6
Remove the obsolete DISCARDABLE flag in the .rc file Replace the obsolete DIALOG resource with DIALOGEX in the .rc file Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-10-13Merge remote branch 'mattst88/master'Keith Packard6-25/+111
* mattst88/master: [alpha] assume we have __NR_pciconfig_iobase [alpha] don't return from void functions Fix undefined symbols on alpha Fix breakage on alpha caused by c7680befe5ae Revert "alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus"
2009-10-13[alpha] assume we have __NR_pciconfig_iobaseMatt Turner1-4/+0
The code path if we didn't have support has been broken since before we switched to git. The pciconfig_iobase syscall has been supported since 2000. Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-10-13[alpha] don't return from void functionsMatt Turner1-6/+12
Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-10-13Rootless: Abstract some of the Xplugin specific stuff which has crept into ↵Jeremy Huddleston2-3/+50
rootlessWindow.c The rootless extension now directly calls some Xplugin functions, and relies on types defined in Xplugin.h, which isn't very abstracted :-) This patch is a start at abstracting some of the Xplugin specific stuff which has crept into rootlessWindow.c. This has been done in a pretty mindless fashion, without much thought as to if the additions to the generic rootless interface are the correct ones There is some confusion as to if RootlesscolormapCallback() returns a Bool or xp_error_enum value (not so abstact), but I have no way of checking, of finding out if Xplugin actually checks the result :-) Based on patches from Colin Harrison, Jon Turney and Yaakov Selkowitz Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-10-08Cast small-int values through intptr_t when passed as pointersJamey Sharp2-4/+6
On 64-bit systems, int and pointers don't have the same size, so GCC gives warnings about casts between int and pointer types. However, in the cases covered by this patch, it's always a value that fits in int being stored temporarily as a pointer and then converted back later, which is safe. Casting through the pointer-sized integer type intptr_t convinces the compiler that this is OK. Signed-off-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2009-10-08Resource leakage: 0 is a valid file descriptorMartin Ettl3-5/+5
When testing if an fd is valid, the required construct is >= 0, not > 0. [Daniel: Fixed up the Linux MTRR case as well.] Signed-off-by: Martin Ettl <ettl.martin@gmx.de> Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2009-10-07Fix undefined symbols on alphaMichael Cree1-6/+6
Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-10-06Use $(AM_V_GEN) to silence more commands when AM_SILENT_RULES is activeAlan Coopersmith1-4/+4
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Eric Anholt <eric@anholt.net> Acked-by: Dan Nicholson <dbn.lists@gmail.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-06Add platform tests for Dtrace linker magicAlan Coopersmith1-1/+1
Replaces special handling for Xquartz DDX and scales better to handling the multiple platforms that now have some level of Dtrace support available. Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2009-10-06xfree86: remove log-spamming DebugFPeter Hutterer1-10/+0
All input drivers use xf86PostKeyEventP indirectly now and have been since it exists. I guess that qualifies it as tested - no need to spam the logs. Reported-by: Felix Wenk Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2009-10-06Fix breakage on alpha caused by c7680befe5aeMatt Turner1-23/+39
Pinpointed by by Michael Cree. Commit c7680befe5ae removed Jensen support, but at the same time broke support for dense memory systems. Signed-off-by: Matt Turner <mattst88@gmail.com>
2009-10-06Revert "alpha: kill xf86SlowBCopyToBus and xf86SlowBCopyFromBus"Peter Hutterer4-9/+77
The vesa driver still uses slowbcopy_frombus and slowbcopy_tobus. This reverts commit 5ef53a94ce4e48e11de26290cd677266308640c8. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-06xfree86: remove log-spamming DebugFPeter Hutterer1-10/+0
All input drivers use xf86PostKeyEventP indirectly now and have been since it exists. I guess that qualifies it as tested - no need to spam the logs. Reported-by: Felix Wenk Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Daniel Stone <daniel@fooishbar.org>
2009-10-02XQuartz: Fix a possible minor memory leakJeremy Huddleston1-0/+1
2009-10-02XQuartz: Send mouse location with scroll events.Jeremy Huddleston1-1/+1
This fixes the problem where (0, 0) was sent as the mouse location with scroll button events causing the event to not reach the client.
2009-10-02rotate: drop unwrapping inside block handler.Dave Airlie1-7/+3
Keith has shown half the block handlers wrappers are wrong, also dynamic wrapping/unwrapping from what I can see will happen after the drivers, so its really accidental ABI, that we can't change now without modifing drivers. So be safe for 1.7. Signed-off-by: Dave Airlie <airlied@redhat.com> Declared-as-sane-by: Keith Packard <keithp@keithp.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-10-01XQuartz: Update version strings to be X11R7.5 and the bundle 2.5.0Jeremy Huddleston2-3/+3
Is fink really _still_ relying on this X11R7.x version string?
2009-10-01xfree86: fix xorg.conf manpage formatting errorJulien Cristau1-1/+1
2009-10-01Re-fix DGA removal.Keith Packard4-18/+38
Removing DGA ended up breaking any drivers calling into the old xf86DiDGAInit function as it tried to see if DGA was already enabled and ended up crashing if the VT wasn't completely initialized. Oops. Also, if the driver initializes DGA itself, have the DiDGA initialization overwrite that information as the DiDGA code will call ReInit on mode detect. Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-30XQuartz: Set the proper bitmap for key repeats...Jeremy Huddleston1-7/+41
XkbSetRepeatKeys lies and doesn't do what it says it will...
2009-09-29XQuartz: Cleaned up keymap setting for easier maintenanceJeremy Huddleston1-61/+52
(cherry picked from commit b9dfed9e88389cbd29406a20d38ee4297638649b)
2009-09-29XQuartz: Remove the redundant xquartz_resetenv_displayJeremy Huddleston2-8/+1
unsetenv(DISPLAY) takes care of this for us anyway (cherry picked from commit d2263645d839c9edeedea0835d26f1f41b37f70e)
2009-09-29XQuartz: Query the BundleIdentifier from the bundle in X11.bin rather than ↵Jeremy Huddleston1-32/+45
using the configure option. This lets X11.bin drop into any .app ... the Info.plist and Xquartz binary need to have it hardcoded still. (cherry picked from commit 9ad16b8e50b13eb6d0cd20386d07aa8d7320f671)
2009-09-29ephyr: if -parent is given, check for a trailing -screen. (#24144)Peter Hutterer2-1/+20
If -parent is given, don't open up a new window if -screen is given as well. The commandline option -screen allows to set the depth of the embedded Xephry instance, even though width and height are autoscaled on -parent. This patch checks for a -screen parameter after -parent and - if one is found - delays initializing the screen. The parent window id is stored temporarily but re-set after a -screen argument. The following command is thus valid: Xephyr -parent 1234 -screen 640x480@8 -screen 1024x768 It embeds the first 8-bit screen into window 1234 and opens up a new window for the second screen. Multiple parent arguments are possible, the screens are embedded in-order. X.Org Bug 24144 <http://bugs.freedesktop.org/show_bug.cgi?id=24144> Tested-by: Vic Lee Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-27XQuartz: Fix QuartzSetCursor to match the expected prototype.Jeremy Huddleston1-2/+2
(cherry picked from commit dadab5a2279a19dcf709402d7f22f0cd48670db0)
2009-09-27XQuartz: Fix a bunch of compilation warnings about styleJeremy Huddleston15-49/+53
(cherry picked from commit 54000bdcbca52a2de31f7c1a1147de6d8e9dbbb8)
2009-09-27XQuartz: Nuke TSMJeremy Huddleston1-16/+0
It's deprecated in SnowLeopard. Ben and I both have no idea what it is for. It says something about unicode input, but urxvt seems fine taking in unicode, so /shrug... bye. (cherry picked from commit 29cb904e4de2411a9b6dbe68694954788f0525f7)
2009-09-27XQuartz: Fix inverse map from mode_switch to altJeremy Huddleston1-0/+4
(cherry picked from commit de6cee11e1c335a0e5f708e7641e81d3cfe52529)
2009-09-27XQuartz: Force a keymap resync on the first keypress to workaround XKB ↵Jeremy Huddleston1-0/+11
mucking with our keymap. We need to find a better way to work with XKB on this. (cherry picked from commit ceaa5c779ceed3de5ea53727649613be3133b24e)
2009-09-27XQuartz: Transition from xEvent based mieq to InternalEventJeremy Huddleston14-439/+147
(cherry picked from commit a3dbde2de87ee4f577748a8c447501a3ea462559)
2009-09-28xfree86: use the DDC size if either width or height of DisplaySize is bogus.Peter Hutterer1-1/+1
If either width or height of DisplaySize is invalid, assume that the configuration is invalid and use the DDC-reported values instead. See Comment 9, Bug 9758. http://bugs.freedesktop.org/show_bug.cgi?id=9758#c9 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Dave Airlie <airlied@redhat.com>
2009-09-28xfree86: Hurd fixSamuel Thibault1-1/+1
I hadn't paid attention that the parameters order had changed, here is a trivial patch, please apply. Signed-off-by: Julien Cristau <jcristau@debian.org>
2009-09-26XQuartz: Stop checking version numbers of the bundle because ↵Jeremy Huddleston1-14/+0
CFBundleGetVersionNumber is gimpish (cherry picked from commit 9f5bdd89608ec12012592ff395b82e954fbb4da8)
2009-09-26XQuartz: Add pressure/tilt property labelsJeremy Huddleston1-0/+3
(cherry picked from commit 84ea67130ef6b4086042aad6036ce66f93ea3e56)
2009-09-26XQuartz: Fix a brain-o array indexing problemJeremy Huddleston1-3/+3
/bop Peter (cherry picked from commit 494a6b046a258ad83dc98eb92b7c3d8f1d2626bb)
2009-09-26XQuartz: Nuke duplicate locks that make painful headachesJeremy Huddleston1-2/+0
(cherry picked from commit 1dd56322bd1722f2427fb2d833c5608248b60cf0)
2009-09-26XQuartz: Use internal xshm header for new xextprotoJeremy Huddleston1-2/+1
(cherry picked from commit 1755239330c0bdac820d88a3e06ff391d65f29be) (cherry picked from commit 697be460d0e555e2c75eed6889293650e02d423c)
2009-09-26dmx: undefine MITSHM, move undefs to miinitext.c.Kevin E Martin1-13/+0
This patch undefines MITSHM for dmx - we don't support the required screen->ModifyPixmapHeaders. All undefines are moved from dmx-config to miinitext.c, where they belong. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-26dmx: reshuffle linker order to avoid errors when MITSHM is undefined.Kevin E Martin1-4/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-26dmx: core events are always in screen coordinates when passed to GPE.Peter Hutterer1-4/+4
This fixes input in dmx, the pointer appears at the right positions to the clients now. Also mark the spot where we pass in the button state as valuator to GPE with a FIXME. (??) Tested-by: Kevin Martin Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>