summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-10-19Cygwin/X: Drop several unneeded includes of winprefs.hJon TURNEY3-3/+0
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2010-10-19Xming: Remove uses of register keywordColin Harrison1-15/+13
I'm pretty sure the compiler has a better idea how to optimize this Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2010-10-19Xming: Casts to remove warnings on event pointersColin Harrison2-3/+3
winkeybd.c: In function ‘winSendKeyEvent’: winkeybd.c:489: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible pointer type winmouse.c: In function ‘winMouseButtonsSendEvent’: winmouse.c:247: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible pointer type winmouse.c: In function ‘winEnqueueMotion’: winmouse.c:380: warning: passing argument 2 of ‘mieqEnqueue’ from incompatible pointer type Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2010-10-19Xming: Warning fix in winDeviceCursorCleanup()Colin Harrison1-1/+1
return statement with an expression in a function whose return-type is void Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2010-10-19Cygwin/X: Reformat the keyboard layout mapping tableJon TURNEY1-223/+43
Also remove the out-of-date listing of keyboard layout IDs and which ones have known mappings XXX: layout zh_TW doesn't exist anymore This patch brought to you by C-u M-x align-regexp Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2010-10-19Cygwin/X: Clarify XKB options in XWin man pageJon TURNEY1-4/+4
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2010-10-19Xming: Warning fix in winApplyHints()Colin Harrison1-1/+1
winmultiwindowwm.c: In function ‘winApplyHints’: winmultiwindowwm.c:1587: warning: ISO C90 forbids mixed declarations and code Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2010-10-19Xming: Fix warnings in ProcWindowsWMFrameSetTitle()Colin Harrison1-1/+1
winwindowswm.c: In function ‘ProcWindowsWMFrameSetTitle’: winwindowswm.c:516: warning: pointer targets in passing argument 1 of ‘strncpy’ differ in signedness winwindowswm.c:516: warning: pointer targets in passing argument 2 of ‘strncpy’ differ in signedness winwindowswm.c:528: warning: pointer targets in passing argument 2 of ‘SetWindowTextA’ differ in signedness Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2010-10-19Xming: Fix warnings in windialogs.cColin Harrison1-7/+7
windialogs.c: In function ‘winDisplayExitDialog’: windialogs.c:327: warning: passing argument 3 of ‘PostMessageA’ makes integer from pointer without a cast windialogs.c: In function ‘winDisplayAboutDialog’: windialogs.c:597: warning: passing argument 3 of ‘PostMessageA’ makes integer from pointer without a cast windialogs.c: In function ‘winAboutDlgProc’: windialogs.c:697: warning: comparison between pointer and integer windialogs.c:701: warning: format ‘%d’ expects type ‘int’, but argument 2 has type ‘HINSTANCE’ windialogs.c:716: warning: assignment makes integer from pointer without a cast windialogs.c:736: warning: assignment makes integer from pointer without a cast windialogs.c:756: warning: assignment makes integer from pointer without a cast Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2010-10-19Xming: Fix warnings in winNameCompare(), winNormalizeName()Colin Harrison1-6/+6
winconfig.c: In function ‘winNameCompare’: winconfig.c:715: warning: array subscript has type ‘char’ winconfig.c:715: warning: array subscript has type ‘char’ winconfig.c:716: warning: array subscript has type ‘char’ winconfig.c:716: warning: array subscript has type ‘char’ winconfig.c:730: warning: array subscript has type ‘char’ winconfig.c:730: warning: array subscript has type ‘char’ winconfig.c:731: warning: array subscript has type ‘char’ winconfig.c:731: warning: array subscript has type ‘char’ winconfig.c: In function ‘winNormalizeName’: winconfig.c:1092: warning: array subscript has type ‘char’ winconfig.c:1093: warning: array subscript has type ‘char’ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2010-10-19Xming: Fix warnings in winClipboardFlushXEvents()Colin Harrison1-3/+3
winclipboardxevents.c: In function ‘winClipboardFlushXEvents’: winclipboardxevents.c:225: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 2 has type ‘DWORD’ winclipboardxevents.c:266: warning: format ‘%08x’ expects type ‘unsigned int’, but argument 2 has type ‘DWORD’ winclipboardxevents.c:619: warning: pointer targets in passing argument 1 of ‘strcat’ differ in signedness winclipboardxevents.c:659: warning: pointer targets in passing argument 1 of ‘strlen’ differ in signedness winclipboardxevents.c:669: warning: pointer targets in passing argument 3 of ‘MultiByteToWideChar’ differ in signedness winclipboardxevents.c:690: warning: pointer targets in passing argument 3 of ‘MultiByteToWideChar’ differ in signedness winclipboardxevents.c:698: warning: pointer targets in passing argument 1 of ‘strdup’ differ in signedness Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2010-10-19Xming: Fix warning in winClipboardErrorHandler()Colin Harrison1-1/+1
winclipboardthread.c: In function ‘winClipboardErrorHandler’: winclipboardthread.c:444: warning: format ‘%d’ expects type ‘int’, but argument 3 has type ‘long unsigned int’ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2010-10-19Cygwin/X: Turn off the bad-function-cast warning for XWin codeJon TURNEY1-1/+2
Turn off the bad-function-cast warning for the XWin code, it's near impossible to write code which uses Win32 API calls that doesn't trigger this warning For example, SendMessage(WM_SETICON) returns an LRESULT, but we are supposed to know this is safe to cast this result to a HICON, which gcc considers a non-matching type. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2010-10-19Cygwin/X: Remove execute permission from source filesJon TURNEY17-0/+0
Remove execute permission from source files Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2010-10-19Cygwin/X: unifdef XFree86ServerJon TURNEY5-152/+1
Remove XFree86Server define, which was always on anyhow, and the code which was guarded by !XFree86Server This completes the process of removal started in 2006 :-) Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2010-10-19Cygwin/X: Use normal apostrophe in XWin DDX help textJon TURNEY1-1/+1
Use U+0027 APOSTROPHE in XWin DDX help text, rather than U+2019 RIGHT SINGLE QUOTATION MARK Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2010-10-19Cygwin/X: Cleanup some VENDOR_STRING/VENDOR_CONTACT cruftJon TURNEY2-13/+7
Cleanup some VENDOR_STRING/VENDOR_CONTACT cruft Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2010-10-18Merge remote branch 'whot/for-keith'Keith Packard4-35/+28
2010-10-18randr: Remove mirandrAdam Jackson3-203/+0
This isn't used anywhere, not least because it's completely nonfunctional. Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-10-18modes: improve aspect ratio match for classic driversOlivier Fourdan1-5/+59
After we infer the aspect ratio for the screen, we pick the largest mode matching that aspect ratio from the best mode pool available. We then clamp virtual size to that mode, and run the resulting mode list through the driver's ValidMode hook. In doing so we might filter away our initial guess. If this happens we shrink the default mode to the next largest mode from _any_ mode pool. This is usually wrong, and we should instead pick the next aspect-matched mode from the best available mode pool (as always, user then driver then default). Reviewed-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-10-18composite: Move the backfill comment to a more appropriate indent levelAdam Jackson1-4/+4
Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-10-18composite: Don't backfill non-MapWindow allocationsAdam Jackson1-3/+7
Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-10-18composite: Don't backfill non-bg-None windowsAdam Jackson1-1/+23
If there's a defined background then backfilling is a waste of effort, since exposure processing will paint that in for us. But note that we have to backfill if any children are bg=None to preserve semantics with non-composited servers. Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-10-18ddc: Don't probe for DDC/CI or EEPROMAdam Jackson1-4/+0
For whatever reason, some (broken) monitors will crash if you do this. We're not actually using this information for anything, so let's just not do it. Originally reported as http://bugzilla.redhat.com/620333 Reviewed-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-10-18xfree86: Drop linux libc5 support from the SIGIO codeAdam Jackson1-9/+0
Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-10-18dri1: Remove "buffers" from the config logicAdam Jackson4-98/+0
This was only ever used from the glint driver, which has since lost its DRI support. Reviewed-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-10-18xfree86: Remove %M expansion from config parserAdam Jackson3-26/+6
This was to distinguish XFree86 3.x files from XFree86 4.x files. It never really made sense to be looking for xorg.conf-4. Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: Jesse Adkins <jesserayadkins@gmail.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-10-18xfree86: Remove an open-coded strtoul()Adam Jackson1-48/+1
Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-10-18config: Remove atimisc workaroundAdam Jackson1-18/+0
Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Mark Kettenis <kettenis@openbsd.org> Reviewed-by: Jesse Adkins <jesserayadkins@gmail.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-10-18config: Don't look for .o drivers anymoreAdam Jackson1-1/+1
This hasn't worked since we switched to dlloader. Reviewed-by: Jesse Adkins <jesserayadkins@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-10-18fix a sign problem with valuator data.Joe Shaw2-2/+2
Without this patch, any negative valuator value is wrong when returned from XQueryDeviceState(). This is a regression from at least xserver 1.4. Valuator data is set in dix/getevents.c:set_valuators() by copying signed int values into an unsigned int field DeviceEvent.valuators.data. That data is converted into a double with an implicit cast by assignment to axisVal[i] in Xi/exevents.c:UpdateDeviceState(). That double is converted back to a signed int in queryst.c:ProcXQueryDeviceState(). If the original value in set_valuators() is negative, the double value will be > 2^31 and the conversion back to a signed int is undefined. (Although I consistently see the value -2^31.) Fix this by changing the definition of DeviceEvent.valuators.data from uint32_t to int32_t. Signed-off-by: Joe Shaw <joeshaw@litl.com> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-10-18dix: update comments for GetPointerEvents and friendsPeter Hutterer1-16/+6
All these now generate InternalEvents, point this out. Remove XKB/XI references, that's just confusing. This comment referred to the old-style event generation code from server 1.4 to including 1.6 but is now just confusing to newcomers. Remove comment about SwitchCoreKeyboard() for the same reason. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
2010-10-15os: Clean up various xtrans bits that we've never supportedAdam Jackson3-137/+13
Or at least, not supported since xserver 1.0. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-10-15xfree86: rename parameter names to xf86ScaleAxis.Peter Hutterer2-17/+20
Maybe it's just me but every time I look at it I get confused again and need to work it out from scratch. Rename the parameters to something self-explanatory, to/from and min/max. No functional change. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2010-10-13test: Fix make distcheck when not building unit testsJeremy Huddleston1-2/+1
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-10-13Comparison between pointer and integer in latest dix/dispatch.cColin Harrison1-1/+1
Signed-off-by: Keith Packard <keithp@keithp.com>
2010-10-13event_size is currently never assigned to in mieqProcessInputEvents().Jon TURNEY1-0/+4
event_size is never assigned to in mieqProcessInputEvents(), so realloc() is always called. This is benign, but I'm guessing not intended. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-10-13dix: optimize CallCallbacksAdam Jackson2-9/+9
Move the basic sanity checking to an inline wrapper, which avoids the function call overhead if the callback list is empty. On an XACEful server on a 2.4GHz Core 2 Duo: 1 2 Operation -------- ----------------- ----------------- 20000000.0 25100000.0 ( 1.25) X protocol NoOperation Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-10-13xwin: Remove some undue paranoia about UNDRAWABLE_WINDOWAdam Jackson3-38/+0
mi will throw away rendering to input-only windows. Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-10-13dix: Remove the memory of the multibuffer extensionAdam Jackson5-28/+4
Drop DRAWABLE_BUFFER and related checks, mbuf was the only thing that used them and it was killed in 0ba82562. Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Keith Packard <keithp@keithp.com> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-10-13Remove leftover fbSaveAreas & fbRestoreAreas defines from wfbrename.hAlan Coopersmith1-2/+0
The fb functions they try to rename were deleted in 2007 by commit ae7f71a8b3d6756161e55d998d6eec37d2695c98 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Tested-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-10-13Use GetCurrentRootWindow or equivalent instead of spriteTrace[0].Jamey Sharp3-11/+6
Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-10-13Move replay-window check from ComputeFreezes to CheckDeviceGrabs.Jamey Sharp2-28/+20
This just simplifies ComputeFreezes, eliminating some duplicated code and a goto. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-10-13CheckDeviceGrabs: Delete redundant pWin->optional test.Jamey Sharp1-4/+2
CheckPassiveGrabsOnWindow returns FALSE if pWin->optional is NULL, because wPassiveGrabs uses wUseDefault, so don't bother checking at the caller. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-10-13Let CheckPassiveGrabsOnWindow callers check if device is already grabbed.Jamey Sharp1-11/+11
CheckDeviceGrabs checked all the ancestors of the window containing this device's pointer even if no new grabs could possibly apply due to the device already being grabbed. ActivateFocusInGrab and ActivateEnterGrab already checked whether they should break an existing grab, and then set up an event that was completely ignored if they didn't actually break the grab. In both cases, just do what we would have done eventually anyway--return FALSE from CheckPassiveGrabsOnWindow's caller--but do it sooner. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-10-05vbe: Fix copying the mode info blockAdam Jackson1-63/+3
Just use memcpy, seriously. Reviewed-by: Rémi Cardona <remi@gentoo.org> Signed-off-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-10-05edid: Fix the HDTV sync pulse adjustmentAdam Jackson1-2/+2
Simple typo, should have been adjusting the horizontal timings consistently since we're not trying to mangle vertical at all. Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Patrick E. Kane <pekane52@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-10-04xfree86: Do not call dlclose(NULL) [regression after ab7f057]Chris Wilson1-1/+2
During unwind following an error when attempting to a load a module, we attempt to call dlclose on a potentially NULL handle. This is a side-effect of removing the abstraction layer in ab7f057. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Adam Jackson <ajax@redhat.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-10-01Bump version to 1.9.99.1 (1.10 development series)Keith Packard1-2/+2
Make the 1.10 development series distinguishable from the 1.9 branch. Signed-off-by: Keith Packard <keithp@keithp.com>
2010-09-30remove doltAdrian Bunk3-184/+0
With libtool 2.2.10 the difference in build time is so small (< 5% with -j8 builds) that it isn't worth having this hack. Signed-off-by: Adrian Bunk <bunk@stusta.de> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Keith Packard <keithp@keithp.com>