summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-03-22Xext: Fix cursor reference counting hazard.HEADmasterMichel Dänzer1-1/+1
Make sure the reference count of the new cursor is increased before the old one is decreased, otherwise bad things will happen if they're one and the same and the reference count is 1 initially. Not sure this can actually happen here, but better safe than sorry. Signed-off-by: Michel Dänzer <daenzer@vmware.com> Reviewed-by: Roland Scheidegger <sroland@vmware.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-03-21Merge remote branch 'jeremyhu/master'Keith Packard9-120/+106
2010-03-22Cygwin/X: Make X -> XWin symlink during installYaakov Selkowitz1-0/+3
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
2010-03-22New header for XF86Bigfont server functionsYaakov Selkowitz5-5/+38
Xext/xf86bigfont.c contains three non-static functions which are called elsewhere in the server. This creates a new header containing these declarations in order to fix several warnings: xf86bigfont.c:285: warning: no previous prototype for `XF86BigfontFreeFontShm' dixfonts.c:502: warning: implicit declaration of function `XF86BigfontFreeFontS$ dixfonts.c:502: warning: nested extern declaration of `XF86BigfontFreeFontShm' log.c:436: warning: implicit declaration of function `XF86BigfontCleanup' log.c:436: warning: nested extern declaration of `XF86BigfontCleanup' Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2010-03-22Xext: fix old-style function definitions in xf86bigfont.cYaakov Selkowitz1-2/+2
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2010-03-22mi: remove deprecated #include <X11/extensions/xf86bigfstr.h> in miinitext.cYaakov Selkowitz1-1/+1
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2010-03-22Catch errors in recursive relink targetsYaakov Selkowitz2-2/+2
If make relink fails in a subdirectory, we need to catch the error otherwise make will continue iterating the 'for' loop. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
2010-03-22Fix .man.N targets for AM_SILENT_RULESYaakov Selkowitz12-25/+25
Add $(AM_V_GEN) for sed-based rules so they appear as expected with automake silent rules, and $(AM_V_at) to completely hide cp/ln/rm commands which are not prone to fail. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Julien Cristau <jcristau@debian.org>
2010-03-22Respect value of SED from configureYaakov Selkowitz3-4/+2
We now use libtool, which calls AC_PROG_SED and sets SED as the path to a fully-functional 'sed' (which may also be called 'gsed' if GNU sed is installed alongside a proprietary version). Therefore we should respect the value of SED so we are sure to use the correct one. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Julien Cristau <jcristau@debian.org>
2010-03-22Fix relink targets for silent rulesYaakov Selkowitz11-11/+11
Add $(AM_V_at) to all relink make targets to silence them when automake silent rules are in use. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Julien Cristau <jcristau@debian.org>
2010-03-22Use EXEEXT in relink rules for portable DDXsYaakov Selkowitz3-3/+3
On Cygwin and MinGW, executables use the .exe suffix. Autoconf and automake set EXEEXT on these platforms, and leave it empty on others where no suffix is used. $(EXEEXT) must be appended to executable names in custom rules for portability: http://www.gnu.org/software/automake/manual/html_node/EXEEXT.html Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Julien Cristau <jcristau@debian.org>
2010-03-22kdrive: Use $(MAKE) in relink rulesYaakov Selkowitz4-4/+4
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Julien Cristau <jcristau@debian.org>
2010-03-22Use libtool -export-dynamic flag for portabilityYaakov Selkowitz1-11/+3
The linker flag required for exporting symbols in executables varies by platform. libtool handles this with a single -export-dynamic flag (not to be confused with the similarly-named ELF linker flag) which tells it to use the correct platform-specific flag at link time. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: Keith Packard <keithp@keithp.com>
2010-03-22Rename xdmx client to dmxinfoYaakov Selkowitz3-5/+5
The DMX Xdmx server and xdmx client cannot both be installed on case-insensitive file systems. The client is undocumented and so renaming it is the best option. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Keith Packard <keithp@keithp.com>
2010-03-22Cygwin/X: Fix windres rule for automake silent rulesYaakov Selkowitz1-1/+1
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Rémi Cardona <rem@gentoo.org> Reviewed-by: Keith Packard <keithp@keithp.com>
2010-03-22Cygwin/X: Fix make dist after 11252ed82e1f361b99e86521ac9314f868bd1a3aYaakov Selkowitz1-0/+1
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Acked-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Keith Packard <keithp@keithp.com>
2010-03-21XQuartz: Constrain the pointer to the updated display bounds on display ↵Jeremy Huddleston1-2/+11
reconfigure. http://xquartz.macosforge.org/trac/ticket/346
2010-03-21XQuartz: pbproxy: Make standalone xpbproxy respect the launchd prefixJeremy Huddleston2-4/+6
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2010-03-21XQuartz: xpbproxy: Cleanup xpbproxy threadingJeremy Huddleston5-99/+80
Confine xpbproxy to a single thread Runs inside its own CFRunLoop Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2010-03-21XQuartz: Minor cleanupJeremy Huddleston1-7/+7
Move RandRInit to where it will need to be (not yet implemented) Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-03-21XQuartz: GLX: Fix Availability for Tiger ppc workaroundJeremy Huddleston1-1/+1
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2010-03-21Revert "XQuartz: Explicitly pass a bellProc to make XBell() work again."Jeremy Huddleston1-7/+1
I'm not quite sure why this was necessary, but DDXRingBell is being called from CoreKeyboardBell, so we don't need a separate bellProc which would result in multiple rings. This reverts commit 9071b0d69748cfa7ecca17b4cb0e431bbb0ef2a4. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-03-21Bump to 1.7.99.902 -- 1.8 RC2Keith Packard1-2/+2
2010-03-21Merge commit 'fa5103a02bd509e4a102afdad2ab26cb22210367'Keith Packard5-19/+134
2010-03-21dix: if owner-events is true for passive grabs, add the window mask (#25400)Peter Hutterer1-0/+36
A client requesting a GrabModeSync button grab, owner-events true, with only the ButtonRelease mask set would never receive the press event even if the grab window had the ButtonPress mask set. The protocol requires that if owner-events is true, then the delivery mask is the combination of the grab mask + the window event mask. X.Org Bug 25400 <http://bugs.freedesktop.org/show_bug.cgi?id=25400> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Tested-by: Jim Ramsay <i.am@jimramsay.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-03-21Merge remote branch 'jturney/master'Keith Packard21-271/+40
2010-03-21common: xf86Configure: alloc_strlen: Allocated memory does not have space ↵Oliver McFadden1-1/+1
for the terminating NUL of the string buffer_alloc: Called allocating function "realloc" which allocated memory dictated by parameter "len + strlen(displaySize_string)" alloc_strlen: Allocated memory does not have space for the terminating NUL of the string var_assign: Assigned "ptr->mon_comment" to storage allocated by "realloc(ptr->mon_comment, len + strlen(displaySize_string))" Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-03-21fb: fbFinishScreenInit: leaked_storage: Variable "(visuals|depths)" goes out ↵Oliver McFadden1-0/+4
of scope Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-03-21exa: exaFinishAccess: Overrun of static array "pExaScr->access" of size 6 at ↵Oliver McFadden1-2/+2
position 6 with index variable "i" Signed-off-by: Oliver McFadden <oliver.mcfadden@nokia.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-03-16Cygwin/X: Allow the default log location to be configurableYaakov Selkowitz7-15/+22
Allow the default log location to be configurable (e.g. /var/log), and use separate logs for each display instance (e.g. XWin.0.log). Make the type of g_pszLogFile const char*, per os/log.c:LogInit(). Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2010-03-16Xming: Warning fixesColin Harrison5-5/+5
Fix warnings due to prototypes not specifying function arguments Fix warning with RegQueryValueEx() Tidy up an include Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2010-03-16Xming: Dead code removalColin Harrison5-239/+0
Remove some dead code, mostly code made obsolete by mandatory XKB Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2010-03-16Cygwin/X: Tidy up some cosmetic issues in log stringsJon TURNEY6-9/+9
Tidy up some cosmetic issues in log strings: - Add missing '\n' - Fix some strings starting with '\n' - Remove '\f' from some log strings These all just look daft in a log with timestamps. Also clarify log message about screen origin coordinates Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2010-03-16Cygwin/X: Fix thinko in mount option checkingJon TURNEY1-3/+4
Fix a thinko in mount option checking. Use symbolic names for values assigned to binary flag for clarity. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2010-03-16dri2: No need to blit from front on DRI2GetBuffers if they're just being reused.Francisco Jerez1-19/+23
It can be quite an expensive operation, so we're better off not doing it unless it's totally required. Signed-off-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Kristian Høgsberg <krh@bitplanet.net> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
2010-03-16Import linked list helpers from the intel DDX.Francisco Jerez2-0/+98
Borrowed from i830.h, except for list_for_each_entry(). Signed-off-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Kristian Høgsberg <krh@bitplanet.net> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
2010-03-16Add a ConfigNotify hook.Francisco Jerez2-0/+13
Executed from the ConfigureWindow request, right before sending ConfigureNotify to the clients. This commit breaks the ScreenRec ABI. Signed-off-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Kristian Høgsberg <krh@bitplanet.net> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
2010-03-15hw/xfree86: move reference counting out of the UseHWCursor[ARGB] functionsRoland Scheidegger1-0/+6
The problem is that the xf86_use_hw_cursor(_argb) functions may get this correctly now, some drivers will replace these generic versions with their own functions. It is pretty insane to expect them to do reference counting of the cursor (as an example, look at driver/xf86-video-vmware to see how that looks like as a workaround). There are even places in xserver itself which replace these two functions. The segfaults if no reference counting is done are caused because the reference count of the cursor reached zero, hence the cursor was freed, however xf86CursorEnableDisableFBAccess() brought it back to life from the dead (from the SavedCursor). This patch hence adds reference counting in xf86CursorSetCursor. As per Michel Daenzer's suggestion, also free the cursor upon xf86CursorCloseScreen. In theory with this it should be possible to remove the reference counting in the UseHwCursor functions I think, though it should also be safe to keep them. Signed-off-by: Roland Scheidegger <sroland@vmware.com> Reviewed-by: Michel Dänzer <michel@daenzer.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-03-15hw/xfree86: fix refcounting in xf86_use_hw_cursorRoland Scheidegger1-2/+2
This is the same fix as was done in fcdc1d78cca3b8bb6b77d53eda7e21d649df6943 for xf86_use_hw_cursor_argb. Signed-off-by: Roland Scheidegger <sroland@vmware.com> Reviewed-by: Michel Dänzer <michel@daenzer.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-03-15Merge remote branch 'jeremyhu/master'Keith Packard4-12/+16
2010-03-15XQuartz: remove undefined XSERVER_CFLAGS variableGaetan Nadon4-5/+5
This is a variable local to configure.ac which is not AC_SUBST() It is undefined in any generated Makefile. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-03-11XQuartz: Use an empty xkb keymap by defaultJeremy Huddleston2-11/+11
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-03-11XQuartz: Include os.h for OsAbort()Jeremy Huddleston1-0/+4
Fixes regression from 5b9a52be7e975e59e0bbc6b43539ecaff96b2ecd Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-03-11XQuartz: GLX: Fix prototype for swapBuffersJeremy Huddleston1-1/+1
This was a regression introduced by 04a54f69a8085ab3fe11a8713bd8b6b16ed1db27 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-03-12Xext: Link to external libraries when necessary.Eamon Walsh2-1/+5
Although the DDX should be linked to the necessary libraries, we may also need to pull them in directly to the module to ensure the symbols are resolved at runtime. Should fix this bug with XSELINUX: /usr/bin/X: symbol lookup error: /usr/lib64/xorg/modules/extensions/libextmod.so: undefined symbol: is_selinux_enabled -v2: use _LIBADD instead of _LIBS; remove SELINUX_LIBS from XSERVER_SYS_LIBS as it should only be needed in extmod. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-03-12Record: Avoid duplicates from replaying frozen eventsDaniel Stone3-28/+32
Reintroduce a check which used to be there in the old ProcessKeyboardEvent/ProcessPointerEvent codepath, which avoids us recording events subject to a grab twice: once when it's first processed in EnqueueEvent, and then again when it's thawed and being replayed. This required a tiny amount of code motion to expose syncEvents. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-03-11Revert "dix: Use DeliverGrabbedEvent for implicit passive grabs (#25400)"Peter Hutterer1-1/+62
Several users have pointed out that this commit introduces regressions, most notably perhaps fluxbox which essentially stops working after a few clicks. This reverts commit cf72b5437d2d620521279077a29c5df6d0fbb576. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-03-11xfree86: fix xf86Config.c build error in --enable-debug mode. (#26971)Peter Hutterer1-1/+1
xf86Config.c: In function 'configInputDevices': xf86Config.c:1514: error: request for member 'lay_identifier' in something not a structure or union make[5]: *** [xf86Config.lo] Error 1 Introduced with e1165632bdfbd720889ed1adf5f7ab338032c0ee. X.Org Bug 26971 <http://bugs.freedesktop.org/show_bug.cgi?id=26971> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Dan Nicholson <dbn.lists@gmail.com>
2010-03-11xfree86: don't warn about nonexisting core pointer/keyboard in config.Peter Hutterer1-16/+8
In the vast majority of cases there is no xorg.conf that specifies a core pointer/keyboard. Skip this warning, since we'll get another notification about how the server relies on the config backend for input devices anyway. Leave the warning in for the error case (AEI off). Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Fernando Carrijo <fcarrijo@yahoo.com.br> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
2010-03-11os: remove INTERNAL_MALLOC define.Peter Hutterer1-3/+0
There doesn't seem to be anything that defines it and given that the counterpart (the X internal malloc) was removed in 01cfba75229f4b9bf1e4fe80814931acdacde14c it's unlikely to work anyway. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-14 09:00:40 +0000