summaryrefslogtreecommitdiff
path: root/Xext/xres.c
Commit message (Collapse)AuthorAgeFilesLines
* Introduce a consistent coding styleKeith Packard2012-03-271-90/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is strictly the application of the script 'x-indent-all.sh' from util/modular. Compared to the patch that Daniel posted in January, I've added a few indent flags: -bap -psl -T PrivatePtr -T pmWait -T _XFUNCPROTOBEGIN -T _XFUNCPROTOEND -T _X_EXPORT The typedefs were needed to make the output of sdksyms.sh match the previous output, otherwise, the code is formatted badly enough that sdksyms.sh generates incorrect output. The generated code was compared with the previous version and found to be essentially identical -- "assert" line numbers and BUILD_TIME were the only differences found. The comparison was done with this script: dir1=$1 dir2=$2 for dir in $dir1 $dir2; do (cd $dir && find . -name '*.o' | while read file; do dir=`dirname $file` base=`basename $file .o` dump=$dir/$base.dump objdump -d $file > $dump done) done find $dir1 -name '*.dump' | while read dump; do otherdump=`echo $dump | sed "s;$dir1;$dir2;"` diff -u $dump $otherdump done Signed-off-by: Keith Packard <keithp@keithp.com> Acked-by: Daniel Stone <daniel@fooishbar.org> Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com> (cherry picked from commit 9838b7032ea9792bec21af424c53c07078636d21)
* xres.c: Preserve constness of string returned by LookupResourceNameAlan Coopersmith2011-12-121-2/+2
| | | | | | | | | | | | MakeAtom now accepts a const char * so we don't need to cast down to char * anymore. Fixes gcc warning of: xres.c: In function 'ProcXResQueryClientResources': xres.c:155:6: warning: cast discards qualifiers from pointer target type Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
* Use correct swap{l,s} (or none at all for CARD8)Matt Turner2011-09-211-10/+2
| | | | | | | | | | | | | Swapping the wrong size was never caught because swap{l,s} are macros. It's clear in the case of Xext/xres.c, that the author believed client_major/minor to be CARD16 from looking at the code in the first hunk. v2: dmx.c fixes from Keith. Reviewed-by: Peter Harris <pharris@opentext.com> Signed-off-by: Matt Turner <mattst88@gmail.com>
* Use internal temp variable for swap macrosMatt Turner2011-09-211-37/+23
| | | | | | | | Also, fix whitespace, mainly around swaps(&rep.sequenceNumber) Reviewed-by: Peter Harris <pharris@opentext.com> Signed-off-by: Matt Turner <mattst88@gmail.com>
* Eliminate boilerplate around client->noClientException.Jamey Sharp2010-05-131-4/+4
| | | | | | | | Just let Dispatch() check for a noClientException, rather than making every single dispatch procedure take care of it. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
* Replace X-allocation functions with their C89 counterpartsMikhail Gusarov2010-05-131-4/+4
| | | | | | | | | | | 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>
* input: define server-supported protocol versions in one single file.Peter Hutterer2009-09-211-2/+3
| | | | | | | | | | | | | include/protocol-versions.h specifies each extension version as supported by the server and sent back on the wire to the client. This fixes up several issues with the server potentially reporting a higher version of the protocol if recompiled against a newer version of the protocol. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Rémi Cardona <remi@gentoo.org> Acked-by: Julien Cristau <jcristau@debian.org>
* Xext: switch to byte counting functionsPeter Hutterer2009-07-141-2/+2
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Remove #define NEED_EVENTS and NEED_REPLIESPeter Hutterer2008-12-121-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>
* xalloc+memset(0) -> xcallocAdam Jackson2008-10-061-3/+1
|
* Remove all empty extension reset hooks, replace with NULL.Adam Jackson2008-07-241-5/+1
|
* Merge branch 'master' into mpxPeter Hutterer2008-04-221-1/+1
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: Xext/EVI.c Xext/appgroup.c Xext/cup.c Xext/mitmisc.c Xext/sampleEVI.c dix/window.c
| * Fix off-by-one error in ProcXResQueryClients().Michel Dänzer2008-04-091-1/+1
| | | | | | | | | | Fixes memory corruption reported at http://bugs.freedesktop.org/show_bug.cgi?id=14004 .
* | Merge branch 'master' into mpxPeter Hutterer2008-01-031-21/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: XTrap/xtrapddmi.c Xext/security.c Xext/xprint.c Xext/xtest.c Xext/xvdisp.c Xi/exevents.c Xi/grabdevb.c Xi/grabdevk.c Xi/opendev.c Xi/ungrdev.c Xi/ungrdevb.c Xi/ungrdevk.c dix/cursor.c dix/devices.c dix/dixutils.c dix/events.c dix/getevents.c dix/main.c dix/window.c hw/xfree86/ramdac/xf86Cursor.c include/dix.h include/input.h include/inputstr.h mi/midispcur.c mi/miinitext.c mi/misprite.c render/animcur.c xfixes/cursor.c xkb/xkbAccessX.c
| * Report serverClient resources in the X-Resource extension.Adam Jackson2007-12-231-7/+3
| |
| * registry: Fix some mistakes in the reversion of prior commits.Eamon Walsh2007-11-201-0/+1
| |
| * Revert "registry: Register Resource extension protocol names."Eamon Walsh2007-11-201-13/+1
| | | | | | | | | | | | This reverts commit 5c8b1a91726817816d20faefad21c7a68ab634cc. Moving all the names into dix/registry.c
| * Remove some duplicate include statements.Eamon Walsh2007-11-201-1/+0
| |
| * Merge branch 'master' into XACE-SELINUXEamon Walsh2007-11-051-4/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dix/dispatch.c dix/property.c hw/xfree86/common/xf86VidMode.c include/xkbsrv.h render/glyph.c xkb/xkbActions.c
| * | registry: Register Resource extension protocol names.Eamon Walsh2007-10-151-1/+13
| | |
| * | dix: Add a new "registry" mechanism for registering string names of things.Eamon Walsh2007-10-111-14/+7
| | | | | | | | | | | | | | | Supports protocol requests, events, and errors, and resource names. Modify XRES extension to use it.
* | | Xext: Scruffy the janitor don't like no "register" keywords.Peter Hutterer2007-11-211-2/+2
| |/ |/|
* | Xext: Remove usage of allocaDaniel Stone2007-11-051-4/+4
|/ | | | Replace with heap allocations.
* Improve XRes to;Matthew Allum2006-07-311-1/+63
| | | | | | | - Better estimate general pixmap memory usage. - Account for pixmaps shared between clients. - Account for window background and border pixmaps, and GC stripple and tile pixmaps.
* Remove RCS tags. Fix Xprint makefile braindamage.Adam Jackson2006-07-211-2/+0
|
* Fix XSERVER64 should be _XSERVER64Dave Airlie2006-02-161-2/+2
|
* Add <string.h>, <stdlib.h>, and <stdio.h> to clear undefined functionAlan Coopersmith2006-02-111-1/+3
| | | | warnings after the removal of libcwrapper headers.
* Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".Daniel Stone2005-07-031-2/+2
|
* Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.Daniel Stone2005-07-031-0/+4
| | | | | | | | Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings. Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all source files in the xserver/xorg tree, predicated on defines of HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to <X11/fonts/foo.h>.
* Change all misc.h and os.h references to <X11/foo.h>.Daniel Stone2005-07-011-3/+3
|
* Fix includes right throughout the Xserver tree:Daniel Stone2005-04-201-4/+4
| | | | | | | change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h; change "foo.h", "extensions/foo.h" and "X11/foo.h" to <X11/extensions/foo.h> for extension headers, e.g. Xv.h; change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
* Use snprintf.Matthieu Herrb2004-12-151-2/+2
|
* Merging XORG-CURRENT into trunkEgbert Eich2004-04-231-1/+2
|
* Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004xf86-4_4_99_1Egbert Eich2004-03-141-11/+13
|
* Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004xf86-4_4_0STSF-CURRENTEgbert Eich2004-03-031-1/+1
|
* readding XFree86's cvs IDsxf86-4_3_99_903Egbert Eich2004-02-261-1/+1
|
* Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004Egbert Eich2004-02-261-1/+1
|
* XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16Kaleb Keithley2003-11-251-9/+6
|
* Initial revisionKaleb Keithley2003-11-141-0/+335
View Lorry Controller Status