summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-03-04Tidy up some pointless output which is always emittedcygwin-patches-for-1.10Jon TURNEY8-18/+17
Conflicts: hw/xwin/winclipboardthread.c hw/xwin/winclipboardwrappers.c
2011-03-04Don't bother reporting XORG_VERSION_CURRENTJon TURNEY2-3/+3
Don't bother reporting XORG_VERSION_CURRENT, when we also report the version number broken down into it's components XORG_VERSION_MAJOR, XORG_VERSION_MINOR, etc. as well. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-03-04Tidy up OS version detection and reportingJon TURNEY4-23/+77
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-03-04When XDMCP -from is specified, only register the requested addressJon TURNEY1-1/+1
When XDMCP -from is specified, only register the requested address, rather than the requested address, and any others we have of different address families to the requested address. e.g. if we have 4 interfaces with both IPv4 and IPv6 addresses (which are not IPv6 mapped IPV4 addresses), using -from with one of those IPv4 addresses means only that IPv4 address, and all IPv6 addresses are used in the connection data in XDMCP REQUEST packet. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-03-04Consolidate XInitThreads/XSupportsLocale() in a single place.Jon TURNEY4-45/+18
If XSupportsLocale() fails, set a known good locale.
2011-03-04Report XLocaleNotSupported result from X*TextPropertyToTextList()Jon TURNEY1-1/+4
Fix formatting for unknown results reported for X*TextPropertyToTextList()
2011-03-04Cygwin/X: Linkage bodge for swrast, part 2Jon TURNEY2-421/+537
Update the generated files glpapitable.h and glapioffsets.h to match the versions in mesa 7.8 These offsets must match those used in the libGL we link with for GL function dispatch to operate correctly Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-03-03Cygwin/X: Decorate function pointers retrieved via GetProcAddress with WINAPIJon TURNEY2-2/+2
Decorate function pointers retrieved via GetProcAddress with WINAPI, to ensure stdcall convention is used when calling them. This fixes a crash currently seen when compiled -O2 and the -screen option uses a size and monitor number e.g. -screen 0 1280x1000@2 Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-03-03Avoid logging VENDOR_CONTACTJon TURNEY1-2/+2
The presence of the list email address in the log causes the emails containing a log to be bounced from the list email Also, avoid logging an extra blank line if BUILDERSTRING is empty
2011-03-03Don't assume we'll always have converted the selection after 2 attemptsRoland Cassard1-19/+4
Rather than knowing we have to call winProcessXEventsTimeout() for up to 2 WIN_XEVENTS_CONVERT messages, process all messages in winProcessXEventsTimeout() until either: (i) the time out expired, (ii) an error occurred, or (iii) received a WIN_XEVENTS_NOTIFY messaage indicating the data has been to put on the clipboard.
2011-03-03Don't make InputOnly windows visibleJon TURNEY1-6/+11
2011-03-03Use DeferWindowPos to delay resizeJon TURNEY3-17/+56
Use DeferWindowPos to delay resize to preserve client area on WM_STYLECHANGING until after the style change has actually happened in WM_STYLECHANGED Be more careful about the initial window placement, so the client area matches what the X client requested Make sure we synchronize the X windows idea of the placement of a window which Windows is allowed to place
2011-03-03os: Add -displayfd option.Jon TURNEY7-26/+78
This option specifies a file descriptor in the launching process. X will scan for an available display number and write that number back to the launching process, at the same time as SIGUSR1 generation. This means display managers don't need to guess at available display numbers. As a consequence, if X fails to start when using -displayfd, it's not because the display was in use, so there's no point in retrying the X launch on a higher display number. Signed-off-by: Adam Jackson <ajax@redhat.com> Update for current X server Fix null DISPLAY crash when stderr is closed Rearrange init order to avoid null DISPLAY crash and correctly use DISPLAY in default logfile name when logfile isn't specified on command line Don't put '\'n on end of DISPLAY so internal XWin uses work correctly Do a bit more logging about what we are trying to do Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-03-03Cygwin/X: Migitate a race condition in clipboard thread initializationMichel Hummel1-2/+0
Remove the variables g_fClipboardLaunched and g_fClipboardStarted from winInitializeGlobals(), as their re-initialization is handled in the file hw/xwin/InitOutput.c. Re-initializing g_fClipboardLaunched and g_fClipboardStarted during the server reset procedure can lead to the clipboard thread being launched two times and sometimes leads to a crash of the X server...
2011-03-03Cygwin/X: Fix a GDI bitmap resource leak of window iconsJon TURNEY3-12/+24
Ensure any icon created specially for a window is destroyed when the window is destroyed
2011-03-03Cygwin/X: Internal WM workaround for Java AWT bugJon TURNEY1-0/+24
Java applications using AWT on JRE 1.6.0 break with non-reparenting WMs AWT doesn't explicitly know about (See sun bug #6434227) XDecoratedPeer.handleConfigureNotifyEvent() only processes non-synthetic ConfigureNotify events to update window location if it's identified the WM as a non-reparenting WM it knows about (compiz or lookingglass) Rather than tell all sorts of lies to get XWM to recognize us as one of those, simply send a synthetic ConfigureNotify for every non-synthetic one
2011-03-03Cygwin/X: Show any fatal error messageJon TURNEY1-7/+37
Report the fatal error message in the dialog we pop up, rather than just referring the user to the logfile. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-03-03Cygwin/X: Make select() only poll and not block if there are unprocessed ↵Jon TURNEY1-0/+18
Windows messages This is a workaround for select() sometimes not finding /dev/windows ready, even if there are unprocessed Windows messages
2011-03-03Cygwin/X: Store pthread_ids and chain IOError handlers to avoid longjmp ↵Jon TURNEY2-25/+53
across threads Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-03-03Cygwin/X: Make default DPI match native DPIJon TURNEY3-5/+25
Make the default DPI match the current Windows DPI setting. If that setting can't be retrieved, change the fallback DPI value from 75 dpi to 96 dpi. Mark the application as dpiAware in the manifest, which prevents dpi virtualization for high (>96) dpi values on Vista and later. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
2011-03-03Cygwin/X: Left-justify website link in About boxYaakov Selkowitz2-2/+2
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
2011-03-03Cygwin/X: Process one Windows message per wakeup, rather than all of them.Jon TURNEY2-21/+6
This gives the X server a chance to do stuff as well after each message http://cygwin.com/ml/cygwin-xfree/2010-01/msg00056.html Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-03-03Cygwin/X: Improve XWinrc loading and error recoveryYaakov Selkowitz2-19/+65
If $HOME/.XWinrc is present but badly formed, ignore it and try system.XWinrc instead. If neither file is present or both are badly formed, provide a built-in default which gives the user the chance to load their new or fixed configuration without restarting. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
2011-03-03Cygwin/X: Improve choice of display name used by internal clientsJon TURNEY8-20/+88
Choose display name used to connect internal clients and exported into environment of processes started by traymenu so that it uses a transport we know is working This should mean the server can start correctly with -multiwindow and/or -clipboard and any two of -nolisten inet6 -nolisten inet and -nolisten unix (the server will correctly refuse to start if all 3 are used, as it must be listening on at least one socket) Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
2011-03-03Cygwin/X: Linkage bodge for swrast, part 1Jon TURNEY6-10372/+3
Remove glapi.c and glthread.c, which contain GL dispatcher symbols which are defined in libGL, and link with libGL for them instead, as dri_swrast.so is linked with libGL on Cygwin to avoid undefined symbols at link time. Also remove glapitemp.h and glprocs.h which are only referred to by those .c files.
2011-03-03Cygwin/X: Preserve client area size on Windows window style changeJon TURNEY2-5/+51
(This replaces the previous "Hint handling fixes" patch When the style changes, adjust the window size so the client area remains the same. Otherwise the window size may change when sizing is reflected from Windows to X, and some windows are drawn expecting them to be exactly the requested size (e.g. gmplayer control window) As a consquence of this, we need to be more careful to create windows with exactly the requested client area initially. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-03-03Fix the long-broken -silent-dup-error optionJon TURNEY2-86/+16
This is a horrible hack and is probably not suitable for pushing upstream. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
2011-03-03Xming: Fix the annoying menu/tooltip punch-through problem in -multiwindow mode.Yaakov Selkowitz1-0/+1
http://sourceware.org/bugzilla/show_bug.cgi?id=9929 Copyright (C) Colin Harrison 2005-2008 http://www.straightrunning.com/XmingNotes/ http://sourceforge.net/projects/xming/ Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
2011-03-03Cygwin/X: Cause the X server to terminate if clipboard or WM internal client ↵Jon TURNEY2-6/+47
threads exit due to an error Calling FatalError from an internal client thread is a no-no, so these failures are silent at the moment (in the sense that no pop-up occurs to tell the user that we are terminating or why). Really we should either improve the way we try to avoid the internal clipboard client getting killed or perhaps restart it after an interval. Avoiding getting killed by the XDM is horribly heuristic at the moment, as we basically try to guess about what the XDM is doing, so this is always going to be fragile. (Should just check that we can't actually intercept the close request for the client) Restarting the clipboard client thread is complicated by the fact that at the moment the clipboard thread exits on server regeneration and is restarted by hooks installed by InitInput()) (So we either need to make arrangements not restart when server is restarting, or only start once and properly re-cache atoms on server regeneration) Also, I'm just noticing I should be using pthread_kill() to ensure the signal is delivered to the thread which is running the main dispatch loop so that will exit the select() it may be blocked in and notice that DE_TERMINATE is set. Also: http://xkcd.com/292/ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
2011-03-03Disable smart scheduler on CygwinJon TURNEY2-0/+6
The smart scheduler causes serious problems on Cygwin. It creates a SIGALRM every 20ms causes 'sporadic accept() failed' messages in the log and deadlocks in multiwindow mode. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
2011-03-03Revert "Fix bug #5735, Serious flaw in CygwinX clipboard"Yaakov Selkowitz1-46/+2
This commit wreaks havoc with other programs which manage the keyboard, such as MS Office Clipboard or Win32 VNC viewers: http://sourceware.org/bugzilla/show_bug.cgi?id=9910 This reverts commit 70ddd0f39d5118db72a1a4e473cbfb502f1ed9ec. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
2011-03-03Remove any old logfile before try to write to itJon TURNEY1-0/+2
If we are not backing up logfiles, remove the old logfile before trying to write a new logfile, as otherwise the operation may fail if the previous logfile was created by a different user. This looks like a generic problem, but probably isn't seen with the Xfree86 DIX as that uses the logfile backup mechanism. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Acked-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
2011-02-25Version bumped to 1.10xorg-server-1.10.0Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-02-25input: Ensure Valuator axes are aligned as neededKeith Packard1-6/+8
Let the compiler figure out the correct alignment for the axes data for a valuator by using a union to force double alignment of the initial ValuatorClassRec structure in the allocation. Signed-off-by: Keith Packard <keithp@keithp.com> Tested-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Julien Cristau <jcristau@debian.org>
2011-02-25hw/dmx/doc: Add explicit dependency for all doxygen output filesKeith Packard1-24/+39
Instead of listing one of the doxygen output files and depending on sequential execution to ensure that the other files were present before make checked for them, create explicit dependencies so that make will not check for the additional files until after doxygen has been run. This allows parallel make to work correctly in this directory. Signed-off-by: Keith Packard <keithp@keithp.com> Tested-by: Kristian Høgsberg <krh@bitplanet.net>
2011-02-25hw/xwin: Look for gl spec files in $(srcdir) or .Keith Packard1-2/+2
Tarballs include the downloaded gl spec files, which will end up in $(srcdir). But, git-based builds will not have them at all and will need to download them from opengl.org. They'll land in in the build directory instead of $(srcdir), and so we need to allow them to be in either place. This change checks for the files in $(srcdir), linking them to . if present. Otherwise, it downloads them from opengl.org. A suggested better solution is to have Mesa install these files somewhere. Signed-off-by: Keith Packard <keithp@keithp.com> Tested-by: Kristian Høgsberg <krh@bitplanet.net>
2011-02-25dmx: Construct paths in doxygen.conf to fix VPATH buildsDan Nicholson4-10/+12
The paths in doxygen.conf assumed that srcdir=builddir and broke otherwise. Use autoconf to fill in the paths to the srcdir so that the files can be found when users have a separate build directory (as with distcheck). Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Tested-by: Cyril Brulebois <kibi@debian.org> Reviewed-by: Gaetan Nadon <memsize@videotron.ca> Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
2011-02-25xfree86: Allow sdksyms.dep to be included portablyDan Nicholson2-1/+4
Non-GNU makes don't deal with the sinclude or -include variants that allow Makefile stubs to be created and then included during the build. Instead, create an empty file at the end of configure so that the regular include statement can be included. This is how automake handles automatic source dependencies. In order to trick automake into not processing the include statement, a variable is used. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-02-24Version bumped to 1.9.99.903 (1.10 RC3)xorg-server-1.9.99.903Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-02-24Merge remote branch 'jeremyhu/master'Keith Packard10-245/+893
2011-02-24xfree86: Bump video ABI to 10.0Keith Packard1-1/+1
RandR 1.4 revert changed things Signed-off-by: Keith Packard <keithp@keithp.com>
2011-02-24EXA/mixed: ModifyPixmapHeader pitch fixes. (bug #33929)Michel Dänzer1-4/+5
If there's a GPU copy and a non-zero devKind was passed in, set the GPU copy pitch to that instead of to a possibly bogus value derived from the new width. This is e.g. used by the radeon driver's drmmode_xf86crtc_resize hook, fixes https://bugs.freedesktop.org/show_bug.cgi?id=33929 . On the other hand, the system memory copy doesn't need the pitch to be aligned beyond the PixmapBytePad of the width. Signed-off-by: Michel Dänzer <daenzer@vmware.com> Acked-by: Cyril Brulebois <kibi@debian.org> Tested-by: Cyril Brulebois <kibi@debian.org> Reported-by: Thierry Vignaud <thierry.vignaud@gmail.com> Tested-by: Thierry Vignaud <thierry.vignaud@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-02-24XQuartz: Localization UpdatesJeremy Huddleston9-245/+891
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-02-24XQuartz: Add LSApplicationCategoryType key to Info.plistJeremy Huddleston1-0/+2
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-02-24Merge remote branch 'kibi/master'Keith Packard1-1/+1
2011-02-24Removing unused codeAlexandr Shadchin2-13/+1
In OpenBSD removed support PCCONS in 2002 year http://marc.info/?l=openbsd-cvs&m=102435816424294&w=2 Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com> Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-02-24Merge remote branch 'ajax/for-keithp'Keith Packard8-113/+57
2011-02-24record: avoid crash when calling RecordFlushReplyBuffer recursivelyErkki Seppälä1-1/+5
RecordFlushReplyBuffer can call itself recursively through WriteClient->CallCallbacks->_CallCallbacks->RecordFlushAllContexts when the recording client's buffer cannot be completely emptied in one WriteClient. When a such a recursion occurs, it will not be broken out of which results in segmentation fault when the stack is exhausted. This patch adds a counter (a flag, really) that guards against this situation, to break out of the recursion. One alternative to this change would be to change _CallCallbacks to check the corresponding counter before the callback loop, but that might affect existing behavior, which may be relied upon. Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi> Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-02-23Revert "Replace huge argument list in xf86CrtcSetModeTransform with struct"Keith Packard3-115/+65
This reverts commit 8b35118c03590a7ad3786d3284bafb3f40fcb8cc.
2011-02-23Revert "Require RandR protocol version 1.4 or newer"Keith Packard1-1/+1
This reverts commit c8bc25fd7629df10f2825b7cc713b031ae78f223.
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 12:16:00 +0000