summaryrefslogtreecommitdiff
path: root/hw/vfb
Commit message (Collapse)AuthorAgeFilesLines
...
* input: free the EQ allocated memory on shutdown (#38634)Peter Hutterer2011-07-011-0/+1
| | | | | | | | | | | | mieqFini() already does the right thing, but it needs to be called by the various DDXs and the XTest Extension. X.Org Bug 38634 <http://bugs.freedesktop.org/show_bug.cgi?id=38634> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> Acked-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* man: refactor common code in the man pages makefilesGaetan Nadon2011-01-181-9/+1
| | | | | | | | | | | | | | | Create a manpages.am makefile snippet in the root dir. Each man page makefile includes manpages.am. Now all man pages in xserver are generated the same way using the same method as all of other xorg modules. All ".man.pre" files in git are ".man" now. Links are no longer created between different file types. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Rémi Cardona <remi@gentoo.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
* Xvfb: build Xvfb man pages using XORG_MANPAGE_SECTIONSGaetan Nadon2011-01-184-27/+18
| | | | | | | | | | | | Nothing requires the use of a C preprocessor Using standard file extensions (.man) means no need for .gitignore Use standard directory and makefile Fix trailing whitespaces Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Rémi Cardona <remi@gentoo.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
* dix: Remove the backing store leftoversAdam Jackson2010-11-301-7/+0
| | | | | | Reviewed-by: Keith Packard <keithp@keithp.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
* input: Purge Register*Device() functions.Peter Hutterer2010-09-011-2/+0
| | | | | | | | | | | | | | | RegisterPointerDevice() and RegisterKeyboardDevice() were already mapped to RegisterOtherDevice() and obsolete. RegisterOtherDevice() was called for all devices and the two assignments can simply be moved into AddInputDevice(). Purge RegisterOtherDevice() and pretend it never happened. *lalalalala* Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
* Remove unnecessary parentheses around return values in functionsMikhail Gusarov2010-06-101-1/+1
| | | | | | | | | | | This patch was generated by the following Perl code: perl -i -pe 's/([^_])return\s*\(\s*([^(]+?)\s*\)s*;(\s+(\n))?/$1return $2;$4/g;' Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Keith Packard <keithp@keithp.com>
* Replace deprecated bzero with memsetMikhail Gusarov2010-06-061-1/+1
| | | | | | | | Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Marcin Baczyński <marbacz@gmail.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
* Change the devPrivates API to require dixRegisterPrivateKeyKeith Packard2010-06-051-2/+5
| | | | | | | | | | This patch only changes the API, not the implementation of the devPrivates infrastructure. This will permit a new devPrivates implementation to be layed into the server without requiring simultaneous changes in every devPrivates user. Signed-off-by: Keith Packard <keithp@keithp.com> Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com>
* vfb: Remove dead variable and header fileAdam Jackson2010-05-213-161/+0
| | | | | | Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Keith Packard <keithp@keithp.com>
* Quit using clientErrorValue in dix/colormap.c.Jamey Sharp2010-05-131-1/+1
| | | | | | | And that's it! No more clientErrorValue kludge. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Keith Packard <keithp@keithp.com>
* Replace X-allocation functions with their C89 counterpartsMikhail Gusarov2010-05-131-9/+9
| | | | | | | | | | | The only remaining X-functions used in server are XNF*, the rest is converted to plain alloc/calloc/realloc/free/strdup. X* functions are still exported from server and x* macros are still defined in header file, so both ABI and API are not affected by this change. Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
* Make Xvfb independent of MAXSCREENS.Jamey Sharp2010-04-271-5/+11
| | | | | | | | | | | If a -screen option specifies a screen number higher than any previously specified, reallocate the vfb-private array of screen-info structs. If built with a DIX that still has a MAXSCREENS limit, asking for too many screens won't be detected until InitOutput calls AddScreen. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
* Xvfb: Simplify screen option processing.Jamey Sharp2010-04-271-64/+27
| | | | | | | | | | | Inspired by Jon Turney's "Xwin: Simplify screen option processing" patch, which does something similar for the Xwin server. Besides making the code more readable, this eliminates most of Xvfb's references to MAXSCREENS. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
* Delete redundant scrnum field from Xvfb private screen-info struct.Jamey Sharp2010-04-271-4/+2
| | | | | | | | The screen number can be inferred from the position in the vfbScreens array, and it was only used in two places, so it was hardly important. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Tiago Vignatti <tiago.vignatti@nokia.com>
* Track screens' installed colormaps as screen privates.Jamey Sharp2010-04-271-10/+13
| | | | | | | | | | | Several DDXes allow each screen to have at most one (or in some cases, exactly one) installed colormap. These all use the same pattern: Declare a global-lifetime array of MAXSCREENS ColormapPtrs, and index it by screen number. This patch converts most of those to use screen privates instead. Signed-off-by: Jamey Sharp <jamey@minilop.net> Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
* Xvfb: Usage message typo fix.Keith Packard2010-04-211-1/+1
| | | | Signed-off-by: Keith Packard <keithp@keithp.com>
* unifdef -B -DRENDER to always include RENDER codeKeith Packard2010-04-191-4/+0
| | | | | | | | This patch was created with: git ls-files '*.[ch]' | while read f; do unifdef -B -DRENDER -o $f $f; done Signed-off-by: Keith Packard <keithp@keithp.com>
* vfb: add a name and type to the pointer and keyboardJulien Cristau2010-04-161-0/+6
| | | | | | | | | | | | | | | | | Fixes a crash in XIQueryDevice which calls strlen on a NULL pointer. #0 strlen () at ../sysdeps/x86_64/strlen.S:31 #1 0x00000000004c16ed in SizeDeviceInfo (dev=0x969bd0) at ../../Xi/xiquerydevice.c:204 #2 0x00000000004c1a01 in ProcXIQueryDevice (client=0xa57510) at ../../Xi/xiquerydevice.c:98 Debian bug#575905 <http://bugs.debian.org/575905> Reported-by: "Bernhard R. Link" <brlink@debian.org> Signed-off-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Fix .man.N targets for AM_SILENT_RULESYaakov Selkowitz2010-03-221-2/+2
| | | | | | | | | | 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>
* Fix relink targets for silent rulesYaakov Selkowitz2010-03-221-1/+1
| | | | | | | | | 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>
* Use EXEEXT in relink rules for portable DDXsYaakov Selkowitz2010-03-221-1/+1
| | | | | | | | | | | | | 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>
* dix: move config_init into the DDX.Peter Hutterer2010-02-151-0/+5
| | | | | | | | | | | | | The only DDX currently using hotplugging is the xfree86 one and it looks like it'll stay that way for a bit. Move the initialization to the DDX, since Xephyr, Xnest, and friends don't need HAL or udev notifications. Add CloseInput (counterpart to InitInput) to be able to clean up the config initialization from the DDX as well. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
* .gitignore: use common defaults with custom section #24239Gaetan Nadon2009-11-111-2/+3
| | | | | | | | | Using common defaults will reduce errors and maintenance. Only the very small or inexistent custom section need periodic maintenance when the structure of the component changes. Do not edit defaults. Reviewed-By: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Keith Packard <keithp@keithp.com>
* input: Add labels to buttons and valuators - ABI_XINPUT_VERSION 7Peter Hutterer2009-06-181-3/+21
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* vfb: Re-enable 30bpp supportAdam Jackson2009-06-111-0/+6
|
* vfb: Fix depth setup.Adam Jackson2009-05-291-27/+3
| | | | | | | Initialize the depth corresponding to the root window before the pixmap-only depths. Otherwise you end up with the root window depth in the depth list twice, which is mildly confusing for clients and catastrophically confusing for PanoramiXConsolidate().
* Fix most remaining deprecated resource lookups.Eamon Walsh2009-04-291-2/+4
| | | | | Callsites updated to use dixLookupResourceBy{Type,Class}. TODO: Audit access modes to make sure they reflect the usage.
* dix: remove all but main() from main.cPeter Hutterer2009-04-281-0/+1
| | | | | | | | All other functions are pushed into where they seemed to fit. main.c is now linked separately into libmain.a and linked in by the various DDXs. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* input: allow NULL as XkbRMVLOSet in InitKeyboardDeviceStruct.Peter Hutterer2009-04-171-3/+1
| | | | | | | | | | | | | Virtually all callers use XkbGetRulesDefault(&rmlvo); InitKeyboardDeviceStruct(..., rmlvo); Let's save them the trouble and accept NULL as a hint to take the default RMLVO. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Benjamin Close <Benjamin.Close@clearchain.com> Signed-off-by: Daniel Stone <daniel@fooishbar.org>
* Xvfb: add missing include for new xkbsrv.hMagnus Kessler2009-01-271-0/+1
| | | | | | | | Commit 08363c5830bdea34012dcd954b45ccfdc79a3a7e added call to XkbGetRulesDflts defined in xkbsrv.h Signed-off-by: Magnus Kessler <Magnus.Kessler@gmx.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Xvfb: Remove unused function GetLK201Mappings in InitInput.cMagnus Kessler2009-01-251-195/+0
| | | | | | | Silence a gcc warning. After commit 08363c5830bdea34012dcd954b45ccfdc79a3a7e GetLK201Mappings is no longer needed. Signed-off-by: Magnus Kessler <Magnus.Kessler@gmx.net>
* Input: Overhaul keyboard initialisation processDaniel Stone2009-01-221-9/+7
| | | | | | | | | | | XkbInitKeyboardDeviceStruct is now the only valid keyboard initialisation: all the details are hidden behind here. This now makes it impossible to supply a core keymap at startup. If dev->key is valid, dev->key->xkbInfo->desc is also valid. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Xvfb: ANSI cleanupsJulien Cristau2009-01-112-6/+6
|
* Remove #define NEED_EVENTS and NEED_REPLIESPeter Hutterer2008-12-122-2/+0
| | | | | | | | | | | | | | | | A grep on xorg/* revealed there's no consumer of this define. Quote Alan Coopersmith: "The consumer was in past versions of the headers now located in proto/x11proto - for instance, in X11R6.0's xc/include/Xproto.h, all the event definitions were only available if NEED_EVENTS were defined, and all the reply definitions required NEED_REPLIES. Looks like Xproto.h dropped them by X11R6.3, which didn't have the #ifdef's anymore, so these are truly ancient now." Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
* Unifdef AIX.Adam Jackson2008-07-231-5/+0
|
* Fix GLX in Xvfb and kdrive.Adam Jackson2008-07-021-0/+1
|
* Merge branch 'master' into mpxPeter Hutterer2008-05-261-5/+0
|\
| * drop xprint remnants: InitGlobalsGeorge Sapountzis2008-05-211-5/+0
| |
* | Remove GetMotionProc from ValuatorClassRec.Peter Hutterer2008-05-251-1/+1
| | | | | | | | | | | | | | | | | | With the MD/SD device hierarchy we need control over the generation of the motion history as well as the conversion later before posting it to the client. So let's not let the drivers change it. No x.org driver currently uses it anyway, linuxwacom doesn't either so dumping it seems safe enough.
* | mi: remove miPointerUpdate() -> replaced by miPointerUpdateSprite().Peter Hutterer2008-05-161-1/+0
| | | | | | | | | | In the xnest and vfb DDX we don't need the call anyway, it's performed by mieqProcessInputEvent.
* | Merge branch 'master' into dcdc_reworkPeter Hutterer2008-04-071-3/+3
|\ \ | |/ | | | | | | | | | | Conflicts: Xext/xevie.c dix/dispatch.c
| * bug #10008: Make Xvfb.1 document the correct default depthDavid Nusinow2008-03-011-3/+3
| |
* | Merge branch 'master' into mpxPeter Hutterer2008-03-041-9/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merge reverts Magnus' device coorindate scaling changes. MPX core event generation is very different, so we can't scale in GetPointerEvents. Conflicts: Xi/opendev.c dix/devices.c dix/dixfonts.c dix/getevents.c dix/resource.c dix/window.c hw/xfree86/common/xf86Xinput.c mi/mipointer.c xkb/ddxBeep.c xkb/ddxCtrls.c xkb/ddxKeyClick.c xkb/ddxList.c xkb/ddxLoad.c xkb/xkb.c xkb/xkbAccessX.c xkb/xkbEvents.c xkb/xkbInit.c xkb/xkbPrKeyEv.c xkb/xkbUtils.c
| * Use strerror instead of errno values in user strings.Adam Jackson2008-02-141-9/+9
| |
* | Xi: add XACE hooks for device creation (ChangeDeviceHierarchy)Peter Hutterer2008-01-211-2/+2
|/ | | | | AddInputDevice checks for permissions already, so all we do is modify a few callers to let AID sort it out.
* Darwin: Use __APPLE__ instead of __DARWIN__Jeremy Huddleston2007-12-071-1/+1
| | | | (cherry picked from commit 54654815fa5e59b25cfd1fa72610120b72c10175)
* Xvfb: Remove usage of allocaDaniel Stone2007-11-051-6/+6
| | | | Replace with heap allocations
* XVFB: Removed obsolete hack to build on DarwinBen Byer2007-09-191-16/+0
|
* Convert servers to using _DEPENDENCIES to ensure proper rebuilds.Eric Anholt2007-08-311-6/+7
| | | | | | | This cleans up server Makefile.ams a little bit, but also means that people messing with configure.ac need to be careful with whether they put libraries in the _LIBS or _SYS_LIBS targets. Hopefully the comment in configure.ac will clarify the issues.
* Split the xserver/fb/fbcmap.c file into two files.Brian2007-04-031-2/+2
| | | | | | | Now, fbcmap_mi.c contains the fb functions which just wrap mi functions. Previously, these were in fbcmap.c and compiled when XFree86Server was defined. Now, clients of fbcmap should either use fbcmap.c or fbcmap_mi.c and not worry about setting the XFree86Server symbol.