summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-11-02fb: Delete a bunch more left-oversfbdeleteSøren Sandmann Pedersen2-381/+0
All of these definitions were unused since compositing moved to pixman. Reviewed-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Signed-off-by: Søren Sandmann <ssp@redhat.com>
2010-11-02wfb: Delete unused renamingsSøren Sandmann Pedersen1-15/+0
These functions haven't existed in a while. Reviewed-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Signed-off-by: Søren Sandmann <ssp@redhat.com>
2010-11-02fb: Delete fbCompositeGeneral()Søren Sandmann Pedersen2-35/+0
This function was an unused and trivial wrapper around fbComposite(). Reviewed-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Signed-off-by: Søren Sandmann <ssp@redhat.com>
2010-11-01render: Delete renderedge.[ch]Søren Sandmann Pedersen6-204/+2
The functions in these files have not been used since trap rasterization was moved to pixman. They survived until now to preserve the server abi. Reviewed-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Signed-off-by: Søren Sandmann <ssp@redhat.com>
2010-11-01Delete unused fbWalkCompositeRegion()Søren Sandmann Pedersen3-124/+0
This function has not been used since most of the compositing was moved to pixman. The only reason it has survived until now is that it was part of the server ABI. Reviewed-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Signed-off-by: Søren Sandmann <ssp@redhat.com>
2010-10-20Revert "Set DamageSetReportAfterOp to true for the damage extension" (#30260)Aaron Plattner1-1/+0
This commit breaks the Compiz "Wallpaper" plugin. This reverts commit 8d7b7a0d71e0b89321b3341b781bc8845386def6. Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-10-19Merge remote branch 'whot/for-keith'Keith Packard2-16/+25
2010-10-20xfree86: set mask for valuators 0/1 when emulating core events (#30267)Peter Hutterer1-0/+4
EventToCore as of the commit below won't generate core motion events if the valuator mask for x/y isn't set. For DGA, we work around this check by forcibly setting the mask in the event we pass down. commit de8be07cc0a8163b6ef04455706fd5ca2cebe587 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Tue Aug 17 12:08:52 2010 +1000 dix: don't create core motion events for non-x/y valuators. X.Org Bug 30267 <http://bugs.freedesktop.org/show_bug.cgi?id=30267> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Tested-by: Andrew Randrianasulu <randrik@mail.ru> Tested-by: Andy Furniss Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2010-10-20xkb: always fill the symsPerKey array, regardless of client flags (#30527)Peter Hutterer1-14/+19
Even if a client does not modify the symbols, symsPerKey and mapWidths must be filled from the current configuration. Both arrays are then passed into other functions (pending the right flag), thus they must contain valid values regardless of the XkbKeySymsMask flag in req->present. X.Org Bug 30527 <http://bugs.freedesktop.org/show_bug.cgi?id=30527> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2010-10-20xkb: init mapWidth and symsPerKey arrays to 0.Peter Hutterer1-2/+2
Helps debugging greatly, random 8 or 16 bit values can sometimes look like valid values, causing much excitement on the client front. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2010-10-19kdrive: Fix linking with tslib, with -Wl, --as-needed. #30600Michał Górny1-1/+1
Change the library order in TSLIB_LIBS variable, placing ${TSLIB_LIBS} after the local static libraries. This fixes linking with -Wl,--as-needed. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=30600 Signed-off-by: Michał Górny <mgorny@gentoo.org> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-10-19kdrive: Fix tslib check fallback to set TSLIB_LIBS. #30599Michał Górny1-1/+4
If pkg-config is unable to find tslib but the fallback check does find it, the compilation continues with tslib support enabled though TSLIB_LIBS are unset. Thus, the compilation fails with a linking error on tslib functions. This patch sets TSLIB_LIBS to '-lts' whenever the tslib fallback check succeeds. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=30599 Signed-off-by: Michał Górny <mgorny@gentoo.org> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-10-19Cygwin/X: Move duplicate extern variable declarations from various .c files ↵Jon TURNEY25-213/+94
to a new header file For the global variables defined in winglobals.c, remove duplicate extern declarations from the beginning of various .c files, and move most of them into a new header file, winglobals.h Leave some clipboard related variables alone for the moment, they need treating more carefully, to avoid mixing client and server type definitions. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2010-10-19Cygwin/X: Remove g_hwndKeyboardFocusJon TURNEY2-9/+0
It's set but it's value is never used Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2010-10-19Cygwin/X: Make g_hmodCommonControls staticJon TURNEY3-4/+6
Make g_hmodCommonControls static, it's only used in InitOutput.c Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2010-10-19Cygwin/X: Make g_hmodDirectDraw staticJon TURNEY4-20/+24
Add winReleaseDDProcAddresses() for releasing the direct draw module handle, so g_hmodDirectDraw can be made static Remove unneeded duplicate extern definitions of g_fpDirectDrawCreate and g_fpDirectDrawCreateClipper, and move the definition from winglobals.c to winengine.c Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2010-10-19Cygwin/X: Make g_hhookKeyboardLL staticJon TURNEY2-8/+1
Make g_hhookKeyboardLL static, it's only used in winkeyhook.c Also remove unused externs Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2010-10-19Cygwin/X: Fix typos in commentsJon TURNEY3-4/+4
Fix a few typos in comments Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
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>