summaryrefslogtreecommitdiff
path: root/hw/xquartz
AgeCommit message (Collapse)AuthorFilesLines
2015-07-08dix: Restore PaintWindow screen hookAdam Jackson1-2/+2
Removes the last cpp conditional on ROOTLESS from dix code. Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2015-06-29Merge remote-tracking branch 'airlied/for-keithp'Keith Packard1-2/+0
2015-06-30cursor: drop ARGB_CURSORDave Airlie1-2/+0
I doubt anyone builds with this turned off or has done for a long time. It helps my eyes bleed slightly less when reading the code, I've left the define in place as some drivers use it. Reviewed-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
2015-06-09XQuartz: Silence -Wformat-security for NSRunAlertPanelJeremy Huddleston Sequoia2-11/+10
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2015-06-09XQuartz: Silence -Wunused-functionJeremy Huddleston Sequoia1-0/+2
quartzKeyboard.c:741:1: warning: unused function 'macroman2ucs' [-Wunused-function,Unused Entity Issue] macroman2ucs(unsigned char c) ^ 1 warning generated. Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2015-06-09XQuartz: Silence -Wunused-variableJeremy Huddleston Sequoia1-1/+0
X11Controller.m:939:9: warning: unused variable 'remain' [-Wunused-variable,Unused Entity Issue] int remain; ^ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2015-06-09XQuartz: Silence -Wpointer-bool-conversionJeremy Huddleston Sequoia1-3/+3
X11Controller.m:417:17: error: address of function 'asl_log_descriptor' will always evaluate to 'true' [-Werror,-Wpointer-bool-conversion,Value Conversion Issue] if (asl_log_descriptor) { ~~ ^~~~~~~~~~~~~~~~~~ X11Controller.m:417:17: note: prefix with the address-of operator to silence this warning [Semantic Issue] if (asl_log_descriptor) { ^ & Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2015-06-09XQuartz: GLX: Use __glXEnableExtension to build extensions listJeremy Huddleston Sequoia1-6/+31
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2015-03-31Fix XQuartz buildJon Turney1-0/+2
Fix XQuartz build since commit e036cbfc "Make PseudoramiXExtensionInit() prototype more generally available" Add #include "nonsdk_extinit.h" to xprScreen.c Add #include "nonsdk_extinit.h" to miinitext.c under INXQUARTZ to provide declarations used under INXQUARTZ Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk> Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Tested-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2015-03-16Make PseudoramiXExtensionInit() prototype more generally availableJon TURNEY1-0/+1
Make PseudoramiXExtensionInit() prototype available to hw/xwin Rather than avoiding a reference to it being pulled in to Xorg by sdksyms by hiding this prototype behind the INXQUARTZ define, which is only defined when building Xquartz, introduce nonsdk_extinit.h and move it there. (The only remaining use of INXQUARTZ is in mi/miiniext.c, in order to do PseudoramiXExtensionInit() at the point apparently needed by Xquartz) Also remove duplicate declaration of noPseudoramiXExtension from pseudoramiX.h Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2015-03-13Drop valuator mask argument from GetKeyboardEventsPeter Hutterer1-4/+2
Nothing was using it and if anyone had they would've gotten a warning and noticed that it doesn't actually work. Drop this, it has been unused for years. Input ABI 22 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2014-11-12Drop trailing whitespacesPeter Hutterer2-6/+6
sed -i "s/[ ]\+$//g" **/*.(c|h) happy reviewing... git diff -w is an empty diff. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-10-08xquartz: Remove useless DRIWindowExposuresAdam Jackson2-25/+0
Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2014-08-11XQuartz: Better support turning off "Displays have separate Spaces" on OS X ↵Jeremy Huddleston Sequoia1-6/+17
Mavericks http://xquartz.macosforge.org/trac/ticket/1876 Follow-up to: 1c10b37380d228b35db8a8616a6312ac54f5e59b Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-07-29xquartz: Remove unused DRI{,Post}ValidateTreeAdam Jackson2-59/+0
Cargo-culted from DRI1, not actually used for anything. Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2014-05-31XQuartz: Update logic to account for title bar on every display in MavericksJeremy Huddleston Sequoia1-3/+13
<rdar://problem/14205847> http://xquartz.macosforge.org/trac/ticket/832 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-05-31XQuartz: Dead code removal (ENABLE_DEBUG_LOG)Jeremy Huddleston Sequoia1-16/+0
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-05-31XQuartz: Bump to 2.7.7Jeremy Huddleston Sequoia1-2/+2
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-04-06XQuartz: Ensure we wait for the server thread to terminateJeremy Huddleston Sequoia1-3/+2
AKA: XQuartz 2.7.5 doesn't delete its /tmp/.X$d-lock http://xquartz.macosforge.org/trac/ticket/823 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-03-27Build fbcmap_mi.c once, rather than once for each DDXJon TURNEY1-1/+0
Build fbcmap_mi.c once, rather than once for each DDX, and make it part of libfb or libwfb convenience library. Since 84e8de1271bb11b5b4b9747ae4647f47333a8ab7 we don't have fbcmap.c This is a sort of revert of 17d85387d1e6851d35474b65929e268ca64ef65b v2: Remove libkdrivestubs.la from configure.ac Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2014-03-25miinitext: introduce LoadExtensionList() to replace over LoadExtension()Emil Velikov1-4/+1
Looping around LoadExtension() meant that ExtensionModuleList was reallocated on every extension. Using LoadExtensionList() we pass an array thus the function can do the reallocation in one go, and then loop and setup the ExtensionModuleList. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Keith Packard <keithp@keithp.com> v2: Update ephyr [Keith Packard] v3: Eliminate const warnings in LoadExtensionList [Keith Packard] Signed-off-by: Keith Packard <keithp@keithp.com>
2014-02-14XQuartz: pointer -> void *Jeremy Huddleston Sequoia1-4/+4
Fix build regression from 60014a4a98ff924ae7f6840781f768c1cc93bbab Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-01-12XQuartz: Avoid passing uninitialized pointers to X11ApplicationSetWindowMenu ↵Jeremy Huddleston Sequoia1-0/+9
in AppleWMSetWindowMenu Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-01-12XQuartz: Check for allocated memory before using it in AppleWMSetWindowMenuJeremy Huddleston Sequoia1-0/+7
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-01-12XQuartz: Silence a clang static analysis warning about a memory leakJeremy Huddleston Sequoia1-0/+3
It seems the alanyzer can't comprehend dixSetPrivate(). quartz.c:119:12: warning: Potential leak of memory pointed to by 'displayInfo' return quartzProcs->AddScreen(index, pScreen); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-01-12XQuartz: Silence a clang static analysis warning about a possible memory ↵Jeremy Huddleston Sequoia1-0/+4
leak on exit stub.c:356:9: warning: Potential leak of memory pointed to by 'newargv' asl_log(aslc, NULL, ASL_LEVEL_ERR, ^~~~~~~ stub.c:356:9: warning: Potential leak of memory pointed to by 'newenvp' asl_log(aslc, NULL, ASL_LEVEL_ERR, ^~~~~~~ 2 warnings generated. Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-01-12XQuartz: Validate length in appledri before swappingJeremy Huddleston Sequoia1-0/+6
Avoids potential memory corruption from bad requests Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-01-12XQuartz: Validate screen in AppleDRIQueryDirectRenderingCapable requestsJeremy Huddleston Sequoia1-0/+4
Return an error to the caller rather than crashing the server on invalid screens. Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-01-12XQuartz: Simplify hook_run to quiet static analyzerJeremy Huddleston Sequoia1-21/+6
x-hook.c:96:9: warning: Called function pointer is an uninitalized pointer value (*fun[i])(arg, data[i]); ^~~~~~~~~~~~~~~~~~~~~~~ 1 warning generated. Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-01-12XQuartz: Mark applicationWillTerminate: noreturnJeremy Huddleston Sequoia1-1/+1
X11Controller.m:938:1: warning: method 'applicationWillTerminate:' could be declared with attribute 'noreturn' [-Wmissing-noreturn,Semantic Issue] { ^ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-01-12XQuartz: Fix get_proc_address signatureJeremy Huddleston Sequoia1-2/+2
indirect.c:675:28: warning: incompatible pointer types passing 'glx_gpa_proc (*)(const char *)' to parameter of type 'glx_gpa_proc' (aka 'glx_func_ptr (*)(const char *)') [-Wincompatible-pointer-types,Semantic Issue] __glXsetGetProcAddress(&get_proc_address); ^~~~~~~~~~~~~~~~~ ../../../glx/glxserver.h:122:42: note: passing argument to parameter 'get_proc_address' here [Semantic Issue] void __glXsetGetProcAddress(glx_gpa_proc get_proc_address); ^ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-01-12XQuartz: Fix darwinfb.h header guardJeremy Huddleston Sequoia1-1/+1
./darwinfb.h:28:9: warning: '_DARWIN_FB_H' is used as a header guard here, followed by #define of a different macro [-Wheader-guard,Lexical or Preprocessor Issue] ^~~~~~~~~~~~ ./darwinfb.h:29:9: note: '_DARWIN_DB_H' is defined here; did you mean '_DARWIN_FB_H'? [Lexical or Preprocessor Issue] ^~~~~~~~~~~~ _DARWIN_FB_H Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-01-12XQuartz: Silence some static analyzer warnings by annotating referencing countsJeremy Huddleston Sequoia1-0/+13
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2014-01-12Replace 'pointer' type with 'void *'Keith Packard5-21/+21
This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer' is used throughout the X server for other things, and having duplicate names generates compiler warnings. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2013-12-12XQuartz: Use asl_log_descriptor to log stdout/stderr of child processesJeremy Huddleston Sequoia1-4/+4
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2013-12-10xquartz/glx: Convert to non-glapi dispatchAdam Jackson1-13/+13
CGL doesn't have anything like glXGetProcAddress, and the old code just called down to dlsym in any case. It's a little mind-warping since dlopening a framework actually loads multiple dylibs, but that's just how OSX rolls. Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2013-11-10XQuartz: Don't sleep forever on exit if usleep() returns an errorJeremy Huddleston Sequoia1-1/+1
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2013-11-10XQuartz: Update Info.plist copyright yearsJeremy Huddleston Sequoia1-2/+2
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2013-10-31XQuartz: Bump bundle version to 2.7.6Jeremy Huddleston Sequoia1-2/+2
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2013-10-06XQuartz: Dont't set screen on __GLXConfigJeremy Huddleston Sequoia1-2/+0
Fixes regression introduced by c3c976f54c3c282d6fa6c8360688e036bc43d210 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2013-10-04Merge remote-tracking branch 'ajax/xserver-next'Keith Packard3-4/+0
2013-09-16XQuartz: pbproxy: Fix build with -DDEBUGJeremy Huddleston Sequoia1-2/+1
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2013-09-16XQuartz: Fix build with moved pseudoramiXJeremy Huddleston Sequoia2-0/+2
Regression from: e716baedc4d8e52a60f43ef21aba771b340d8c8b Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2013-09-11glx: Remove pixmapMode from __GLXconfigAdam Jackson2-2/+0
This has never been filled in with anything meaningful afaict, and you can't get to it from the client in any event. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10mipointer: Remove EnqueueEvent from miPointerScreenFuncRecAdam Jackson1-1/+0
No DDX overrode this, and we never actually called through that slot anyway. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-09-10mipointer: Flatten calls to mieqSwitchScreenAdam Jackson1-1/+0
No DDX was overriding this. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-08-30Move pseudoramiX code where it can be shared between Xwin and XquartzJon TURNEY3-528/+2
Move pseudoramiX code to a separate top-level directory. Link Xwin and Xquartz with libPseudoramiX I'm not sure moving this to a top-level directory is appropriate, but I'm not sure where else it fits. Future work: pseudoramiX can probably be consolidated with the rrxinerama code (which I think provides fake xinerama data when real XINERAMA is disabled and we only have one screen) v2: fix distcheck Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net> Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
2013-03-18Full support of sRGB capable fbconfigs.Tomasz Lis1-0/+3
Changes to correctly initialize the sRGB capability attribute and transfer it between XServer and the client. Modifications include extension string, transferring visual config attribs and fbconfig attribs. Also, attribute is initialized in the modules which do not really use it (xquartz and xwin). This version advertises both ARB and EXT strings, and initializes the capability to default value of FALSE. It has corrected required GLX version and does not influence swrast. The sRGB capable attribute is attached only to those configs which do have this capability. Both ARB and EXT versions share the same GLX extension enabling bit. Signed-off-by: Tomasz Lis <tomasz.lis@intel.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2013-02-14XQuartz: Ensure <dix-config.h> is included in capabilities.cJeremy Huddleston Sequoia1-0/+4
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-12-18XQuartz: Don't add the 15bit visual any moreJeremy Huddleston Sequoia2-7/+14
Mountain Lion only supports 32bit backing stores, so don't use 15bit visuals until libXplugin adapts Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>