summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-06-20Hoist setting of g_fClipboardStarted flag up one levelJon TURNEY2-7/+5
Hoist the setting of g_fClipboardStarted flag up one level. Also move up the clearing of the g_fClipboardLaunched at the end of clipboard function.
2013-06-20winProcEstablishConnection doesn't need to check if clipboard startedJon TURNEY1-8/+0
winProcEstablishConnection doesn't need to check if clipboard has already been started. It should be clear that we start the thread only once when the wrapper tells us to, as the wrapper unhooks itself thereafter.
2013-06-20Hoist clipboard thread restart up one levelJon TURNEY4-39/+43
Hoist clipboard thread restart up one level. Note that currently g_fClipboardLaunched is set the first time in the winProcEstablishConnection wrapper, and subsequent times when the clipboard thread restarts itself. Try to clarify this and just set g_fClipboardLaunched before starting the thread.
2013-06-20Push winClipboardShutdown() into winclipboardinit.cJon TURNEY4-42/+34
Push winClipboardShutdown() into winclipboardinit.c This lets us make g_ptClipboardProc static
2013-06-20Remove unused CLIPBOARD_MANAGER atomJon TURNEY1-2/+1
We are not an X clipboard manager, so remove the unused CLIPBOARD_MANAGER atom
2013-06-20Remove pthread_cleanup function winClipboardThreadExit()Jon TURNEY1-17/+0
It's never used anymore as the pthread_exit() calls which used to cause it to be invoked have been removed. Taking the server down if the clipboard thread happens to exit is kind of rude, anyhow.
2013-06-20Remove unused extern g_fUseUnicode from winclipboardwndproc.cJon TURNEY1-1/+0
2013-06-20Remove unneeded forward declaration of winProcessXEventsTimeout()Jon TURNEY1-10/+0
Remove unneeded forward declaration of winProcessXEventsTimeout(), the actual definition immediately follows.
2013-06-20Remove prototype for non-existent winDeinitClipboard()Jon TURNEY1-3/+0
2013-06-20Remove unused externs from winclipboardwrappers.cJon TURNEY1-2/+0
2013-06-20Remove unused winProcQueryTreeOrig variableJon TURNEY3-3/+0
Unused since 47c7b6d3e626497747ae2780f259a15b8e6c846f "Remove no-longer needed tricks used to prevent the clipboard client from being killed"
2013-06-18Check for python at configure time when building XWin with AIGLXJon TURNEY2-2/+6
Check for python at configure time when building XWin with AIGLX, it's used to generate the wrapper code for native GL functions.
2013-06-18Ensure yacc and lex are found by ./configureJon TURNEY1-0/+10
We really need yacc and lex to be available to successfully build tarballs made by cygport directly from a git tag and not by 'make dist'. DO NOT UPSTREAM THIS PATCH.
2013-06-16Improve NET_WM_ICON validationJon TURNEY1-8/+19
Check that we don't overrun the end of the property data while converting icons Also, some warning fixes in winXIconToHICON()
2013-06-16Avoid a null deference if CreateDIBSection() fails in NetWMToWinIconAlpha()Jon TURNEY1-0/+4
2013-05-04Merge branch 'cygwin-patches-for-1.14' into cygwin-release-1.14xserver-cygwin-1.14.1-1Jon TURNEY9-48/+79
2013-05-04Merge tag 'xorg-server-1.14.1' into cygwin-release-1.14Jon TURNEY6-7/+12
XOrg Server Version 1.14.1
2013-05-04Fix a potential crash on startupYaakov Selkowitz1-4/+1
Change btn_labels in winMouseProc() from a dynamic allocation of potentially the wrong size (if GetSystemMetrics(SM_CMOUSEBUTTONS) is less than 5) to a fixed one on stack, of the required size for all the labels we create.
2013-04-17xserver 1.14.1xorg-server-1.14.1Peter Hutterer1-3/+3
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-04-17xf86: fix flush input to work with Linux evdev devices.Dave Airlie1-1/+2
So when we VT switch back and attempt to flush the input devices, we don't succeed because evdev won't return part of an event, since we were only asking for 4 bytes, we'd only get -EINVAL back. This could later cause events to be flushed that we shouldn't have gotten. This is a fix for CVE-2013-1940. Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 6ca03b9161d33b1d2b55a3a1a913cf88deb2343f)
2013-04-10Fix version reporting on cygwin64Jon TURNEY1-12/+19
DWORD is a long int on 32-bit, but just an int on 64-bit, so cast to (int) and use %d to output Checking for Wow32 isn't interesting on Win64 This is a follow-up patch to "Tidy up OS version detection and reporting"
2013-04-10Fix several format/type cast issues with debug output in winwindowswm.cJon TURNEY1-3/+3
Serveral pieces of debug outut under CYGMULTIWINDOW_DEBUG cast a pointer to an (int) and then use a %08x printf format. Use "%p" format for 64-bit portability.
2013-04-10Fix several format/type cast issues with debug output in ↵Jon TURNEY1-7/+7
winwin32rootlesswndproc.c Serveral pieces of debug outut under CYGMULTIWINDOW_DEBUG cast a pointer to an (int) and then use a %08x printf format. Use "%p" format for 64-bit portability.
2013-04-10Fix numerous format/type cast issues with debug output in winwin32rootless.cJon TURNEY1-22/+22
Numerous pieces of debug outut under CYGMULTIWINDOW_DEBUG cast a pointer to an (int) and then use a %08x printf format. Use "%p" format for 64-bit portability.
2013-04-10Fix implicit-function-declaration warning in XwinExtensionInit() when ↵Yaakov Selkowitz1-0/+3
compiled with XWIN_GLX_WINDOWS defined InitOutput.c: In function ‘XwinExtensionInit’: InitOutput.c:170:9: error: implicit declaration of function ‘glxWinPushNativeProvider’ [-Werror=implicit-function-declaration] glxWinPushNativeProvider(); ^ InitOutput.c:170:9: warning: nested extern declaration of ‘glxWinPushNativeProvider’ [-Wnested-externs]
2013-04-10Fix implicit-function-declaration warning in DrawableGone() by adding a ↵Yaakov Selkowitz1-0/+2
prototype for FlushContext() glxext.c: In function 'DrawableGone': glxext.c:142:13: error: implicit declaration of function 'FlushContext' [-Werror=implicit-function-declaration] FlushContext(c); ^ This is a follow-up patch to "glx: Flush context which is being made non-current due to the drawable going away"
2013-04-10Bodge around issues with using XSendEvent() to send a ClientMessageJon TURNEY1-0/+21
The XEvent type suffers from the XSERVER64 issues noted previously: certain members are long int in Xlib, but are made int in the server by XSERVER64. Bodge around this problem by defining our own type with the correct memory layout to match Xlib's idea of XClientMessageEvent for use in SendXMessage()
2013-04-09Fix -Werror=implicit-function-declaration when configured --enable-debugJon TURNEY1-0/+1
/jhbuild/checkout/xorg/xserver/hw/xwin/winclipboardwndproc.c: In function ‘winClipboardWindowProc’: /jhbuild/checkout/xorg/xserver/hw/xwin/winclipboardwndproc.c:159:5: error: implicit declaration of function ‘winDebugWin32Message’ [-Werror=implicit-function-declaration] winDebugWin32Message("winClipboardWindowProc", hwnd, message, wParam, ^
2013-04-08Fix an issue in winSetSpansNativeGDI() identifed by -Warray-boundsxserver-cygwin-1.14.0-2Jon TURNEY1-23/+29
The BITMAPINFO local only has room for a single RBGQUAD in bmiColors, but we access two (black and white for a mono-color DIB). Fix by changing to a dynamic allocation big enough for a BITMAPINFO and a RGBQUAD.
2013-04-08Fix -Warray-bounds warning in winXCursorToHCURSOR()Jon TURNEY1-12/+16
Rewrite winXCursorToHCURSOR() so access to BITMAPINFO bmiColors member doesn't trigger an -Warray-bounds warning. Note that the underlying storage is allocated as a BITMAPV4HEADER, so has sufficent room for the extra RGBQUADs bmiColors after the BITMAPINFO bmiHeader.
2013-04-08More casting to store WIN_WID_PROP XID as HANDLE-type Window propertyJon TURNEY1-1/+1
Follow up to "Make AIGLX work in non-toplevel windows"
2013-04-08Fix implicit-function-declaration warnings by including wmutil/keyboard.h ↵Jon TURNEY3-0/+3
where needed This is a follow-up patch to "Move keyboard event utility functions to wmutil library"
2013-04-08Fix int-to-pointer-cast warning in ExecAndLogThreadJon TURNEY1-1/+1
/jhbuild/checkout/xorg/xserver/hw/xwin/winprefs.c: In function ‘ExecAndLogThread’: /jhbuild/checkout/xorg/xserver/hw/xwin/winprefs.c:406:12: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] return (void *) status; ^ This is a follow up patch to "Log std and stderr for process started from the notifcation area icon"
2013-04-08Bodge around some prototype issuesJon TURNEY3-0/+5
2013-04-08Bring PseudoramiXExtensionInit() prototype into scope, and make the use ↵Jon TURNEY3-4/+2
match the prototype Don't wrap prototype with INXQUARTZ as pseudoramiX is now always built Wrap it in SDKSYMS so it is not included in sdksyms Remove duplicate declaration of noPseudoramiXExtension This is a follow up patch to "Move pseudoramiX code where it can be shared..."
2013-04-08Add ability to annotate symbols so they are not processes by sdksymsJon TURNEY1-2/+2
SDKSYMS is defined when generating sdksyms XXX: It's sometimes asserted that X_EXPORT does this but I don't see the mechanism
2013-04-08Add prototype for dix_main()Jon TURNEY4-3/+36
/jhbuild/checkout/xorg/xserver/hw/xwin/InitOutput.c: In function ‘main’: /jhbuild/checkout/xorg/xserver/hw/xwin/InitOutput.c:214:5: error: implicit declaration of function ‘dix_main’ [-Werror=implicit-function-declaration] return dix_main(argc, argv, envp); ^ Follow up patch to "Allow DDX to provide a main()"
2013-04-08Tidy-up of winmsg.hJon TURNEY5-41/+18
- winVMsg() has no uses, so remove - winMsgVerb() has only one use, with default verbosity, so remove - winMsg() is identical to LogMessage() - add prototype for winError() which makes it possible to include winmsg.h in wmutil/ files to prototype winDebug() and winError()
2013-04-08Fix implicit-function-declaration in XkbDDXCompileKeymapByNames()Jon TURNEY2-0/+5
/jhbuild/checkout/xorg/xserver/xkb/ddxLoad.c: In function 'XkbDDXCompileKeymapByNames': /jhbuild/checkout/xorg/xserver/xkb/ddxLoad.c:121:5: error: implicit declaration of function 'Win32TempDir' [-Werror=implicit-function-declaration] strcpy(tmpname, Win32TempDir()); ^ Follow up to "Use spawnl() rather than pipe() & fork() to invoke xkbcomp"
2013-04-08Fix implicit-function-declaration warning in OsSigHandler()Jon TURNEY1-0/+1
/jhbuild/checkout/xorg/xserver/os/osinit.c: In function 'OsSigHandler': /jhbuild/checkout/xorg/xserver/os/osinit.c:125:5: error: implicit declaration of function 'pthread_self' [-Werror=implicit-function-declaration] ErrorF("Fatal signal received in thread 0x%x\n", pthread_self()); ^ Follow-up patch to "Add -notrapsignals"
2013-04-08Remove obsolete window control IDsJon TURNEY2-59/+0
Remove unused window control IDs and the unused, cygwin-specific handling of those window control IDs for for ChangeLog, UG and CG buttons in the About Dialog.
2013-04-08Work-around problems with using Xlib client macros in the server in a 64-bit ↵Jon TURNEY3-10/+10
build. sizeof(XID) is always 4 in the server, but is 8 in a 64-bit client and coverted to a 32-bit protocol value (it's 4 in a 32-bit client) (See the _XSERVER64 define) This affects the size of members of the _XPrivDisplay type used by some macros in Xlib.h and so means those macros will not give correct answers when we try to use them in server code. Switch to using the equivalent functions, which work correctly, as the code in libX11 is not affected by the types used in the server. A better solution would be to xcb-ize all this code, which also avoids server/client namespace and header clashes.
2013-04-08Update manifest to target all architectures, not just x86Jon TURNEY2-1/+3
Also: Write explicit dependencies for Xwin.rc. XWin.exe.manifest and X.ico are included the resource compiler output, so add a dependency on them to cause it to be recompiled if they change. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2013-04-08Win32 Windows properties are of pointer type HANDLE, not an integer type.Jon TURNEY3-6/+6
Win32 Windows properties are of pointer type HANDLE, not an integer type, but we use the Windows property WINDOW_WID_PROP to store the X window XID. Add casting to show it doesn't matter that an XID is smaller than a pointer on Cygwin64.
2013-04-08winMultiWindowGetTransientFor() returns an XID not a WindowPtrJon TURNEY3-7/+7
winMultiWindowGetTransientFor() accesses the WM_TRANSIENT_FOR property, which is an X window XID (which we compare with WINDOW_WID_PROP) and not a WindowPtr.
2013-04-08Fix some debugging printing of a pointers for Cygwin64Jon TURNEY3-4/+4
2013-04-08Change winIconIsOverride() to take a HICON parameterJon TURNEY3-6/+3
Change winIconIsOverride() to take a HICON parameter, so some unneccessary casting, which wasn't portable to Cygwin64, can be removed.
2013-04-08Fix uses of CreateDialogParam() for Cygwin64Jon TURNEY1-13/+12
dwInitParam parameter is LPARAM, not int Return type of DLGPROC is INT_PTR, not WINBOOL Also: Reporting the value of g_hDlgDepthChange is completely uninteresting, we are just interested in GetLastError() if it is NULL
2013-04-08deprecated interface cygwin_conv_to_win32_path() doesn't exist on cygwin64Jon TURNEY1-12/+0
2013-04-08Fix a Cygwin64 portability issue with casting HINSTANCE result of ↵Jon TURNEY1-12/+13
ShellExecute() to an integer Fix a Cygwin64 portability issue with casting HINSTANCE result of ShellExecute() to an integer: Since HINSTANCE is a pointer type, use INT_PTR rather than int.