Commit Graph

10789 Commits

Author SHA1 Message Date
Jon TURNEY
eecc8e06eb hw/xwin/glx: Improvements to glxWinErrorMessage() reporting in WGL GLX provider
Request the message using languageID 0 (best effort), rather than only using language neutral messages
Always report the numeric error code.
Trim any trailing \r from FormatMessage() output

Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-07-07 18:00:31 +01:00
Jon TURNEY
3873be16d0 hw/xwin/glx: Fix fbconfig dumper formatting for 3 digit index numbers
Some graphics hardware supports hundreds of pixel formats, so adjust
formatting in fbconfig dumper for 3 digit index numbers

Also report the PFD_SUPPORT_DIRECTDRAW, PFD_DIRECT3D_ACCELERATED and
PFD_SUPPORT_COMPOSITION flags introduced with aero

Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2011-07-07 18:00:29 +01:00
Keith Packard
d4096abb59 Merge remote-tracking branch 'whot/for-keith' 2011-07-01 15:45:45 -07:00
Peter Hutterer
87d4f90bfc input: free the EQ allocated memory on shutdown (#38634)
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>
2011-07-01 08:46:28 +10:00
Daniel Stone
e084ac30b3 Input: Reset SD remainder when copying co-ords from MD
In updateSlaveDeviceCoords, pDev->last.valuators was being copied from
the master, but pDev->last.remainder wasn't.  Make sure we copy both, to
avoid minor inconsistencies.

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>
2011-07-01 08:46:28 +10:00
Peter Hutterer
23a7832789 input: add POINTER_NORAW to avoid generation of raw events (#30068)
RawEvents are supposed to be events coming from the driver. When warping the
pointer, this should not generate a raw event.

X.Org Bug 30068 <http://bugs.freedesktop.org/show_bug.cgi?id=30068>

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-07-01 08:46:28 +10:00
Daniel Stone
9444e40d77 Test: Input: Only ever set up to MAX_VALUATORS valuators
Previously, the input tests were working up to sizeof(mask) * 8, which
could be more than the arrays; the latter only being sized as
MAX_VALUATORS.

Hypothetically, if you were switching the stored valuator values to
double instead of uint32_t, and you attempted to set the 39th member of
a MAX_VALUATORS-sized (36) array, you'd probably end up smashing
ev->key_repeat into oblivion and then tripping the check for invalid
flags because you haven't yet put XIPointerEmulated into the valid flags
for XI_Motion.  Probably.

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>
2011-07-01 08:46:28 +10:00
Daniel Stone
1e65a01cf7 Test: Ensure libxservertest gets relinked when necessary
Similar to how we link Xorg, make sure that whenever any of the
component libraries changes, we relink libxservertest and the tests.
Not much use testing anything other than the actual source in your tree.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-07-01 08:46:28 +10:00
Daniel Stone
0f41d6c851 KDrive: Remove useless miPointerUpdateSprite call
miPointerUpdateSprite is already called from mieqProcessInputEvents, so
calling it by hand immediately after isn't massively helpful.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-07-01 08:46:27 +10:00
Daniel Stone
57b767d292 DMX: Remove useless miPointerUpdateSprite call
miPointerUpdateSprite is already called from mieqProcessInputEvents, so
calling it by hand immediately after isn't massively helpful.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-07-01 08:46:27 +10:00
Daniel Stone
cf398755c0 XWin: Remove executable bit from headers
Headers don't really need to be mode 0755.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-07-01 08:46:27 +10:00
Daniel Stone
7d2543a3cb XKB: Add debug key actions for grabs & window tree
Add four new private XKB actions for debugging:
    * PrGrbs: print active grabs to the log file
    * Ungrab: ungrab all currently active grabs
    * ClsGrb: kill clients with active grabs
    * PrWins: dump the current window tree to the log file

To use these, you need to modify your XKB maps, e.g. the following to
have Ctrl+Alt+(F9-F12) mapped to the above:
 - compat/xfree86:
    interpret XF86LogGrabInfo {
        action = Private(type=0x86, data="PrGrbs");
    };
    interpret XF86Ungrab {
        action = Private(type=0x86, data="Ungrab");
    }
    interpret XF86ClearGrab {
        action = Private(type=0x86, data="ClsGrb");
    }
    interpret XF86LogWindowTree {
        action = Private(type=0x86, data="PrWins");
    }

 - symbols/pc:
    key <FK09> {        type="CTRL+ALT", [ Return, XF86LogGrabInfo      ]   };
    key <FK10> {        type="CTRL+ALT", [ Return, XF86Ungrab           ]   };
    key <FK11> {        type="CTRL+ALT", [ Return, XF86ClearGrab        ]   };
    key <FK12> {        type="CTRL+ALT", [ Return, XF86LogWindowTree    ]   };

At the moment, this only works if the grabbing client continues to call
AllowEvents, as the server does no event processing at all when a device
is frozen.

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>
2011-07-01 08:46:20 +10:00
Daniel Stone
ddf735fd4e DIX: Make PrintWindowTree actually useful
Rewrite PrintWindowTree to make it actually tell you what you want to
know.

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>
2011-07-01 08:46:15 +10:00
Matěj Cepl
b27d61e443 Fix UTF-8 encoding
Report to find out all non-UTF-8 files created by

cat extensions |xargs -I XXXX find . -name \*.XXXX |while read FILE ; do
    if ( iconv -f utf8 -t ucs2 $FILE >/dev/null 2>/dev/null ) ; then
        /bin/true
    else
        echo $FILE
    fi
done >>report

Signed-off-by: Matěj Cepl <mcepl@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>

[Daniel: git am failed for me, so I redid it.  The method listed in the
         commit message also failed, so I just used file/grep/iconv.  The
         results are the same though.]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-30 16:38:31 +10:00
Scott James Remnant
2ee85d954c dix: avoid calling deleted block and wakeup handlers
BlockHandler and WakeupHandlers may be removed within a different
BlockHandler or WakeupHandler, especially since config/udev uses
these and removes devices.

Calling the deleted handlers and passing potentially freed data
can result in the X server segfaulting after device removal, or
events that result in device removal such as undocking or suspend/
resume.

Signed-off-by: Scott James Remnant <scott@netsplit.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-30 16:38:29 +10:00
Marcin Slusarz
b573cdd40e dri2: restore Screen->ConfigNotify on close
ConfigNotify is set by DRI2ScreenInit, but not restored to
previous state on close. Fix it.
(I'm preparing a patch for xf86-video-nouveau which detects GPU lockup
after dri2 init and it needs to reinitialize dri2)

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-30 16:38:23 +10:00
Keith Packard
61f87a75f2 Merge remote-tracking branch 'jturney/master' 2011-06-29 20:14:51 -07:00
Keith Packard
0d2153a46c Merge remote-tracking branch 'jbarnes/master' 2011-06-29 20:08:32 -07:00
Gaetan Nadon
b631c39a21 Remove unused check for PERL program
Unable to find any use of the PERL Automake variable.
It was used in hw/xfree86/scanpci around 2005.
Should it ever be needed, use XORG_WITH_PERL macro.

Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-06-29 19:03:46 -07:00
Keith Packard
d5ca33ca2d Merge remote-tracking branch 'kibi/master' 2011-06-29 18:54:33 -07:00
Yaakov Selkowitz
72d914335c Cygwin/X: Left-justify website link in About box
Left-justify website link in About box.  This is a cosmetic fix to make
the About box display correctly when Windows is configured with a
non-default DPI value

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
2011-06-29 19:14:38 +01:00
Jon TURNEY
e78628406f Cygwin/X: Preserve client area size and position on Windows window style change
When the style changes, adjust the window size so the client area remains the same.

Otherwise the window size may change when sizing is reflected from Windows to X, and
some windows are drawn expecting them to be exactly the requested size (e.g. the
gmplayer control window)

Use DeferWindowPos to delay the resize to preserve client area on WM_STYLECHANGING
until after the style change has actually happened in WM_STYLECHANGED

As a consquence of this, we need to be more careful to create windows with exactly
the requested placement and client area initially, so the client area matches what
the X client requested

Also synchronize the X windows idea of the placement of a window which Windows is
allowed to place

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
2011-06-29 19:14:35 +01:00
Jon TURNEY
1d7f3a0031 glx: Move GLX extension string utility functions
Move GLX extension string utility functions from the DRI1 convenience library
into the GLX extension convenience library, so other DDX which don't have DRI
can use them.

This is probably also needed if anyone actually tries to build an Xorg DDX
with only DRI2 support...

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
2011-06-29 19:09:23 +01:00
Jesse Barnes
932513e23b DRI2/GLX: use new swap event types
Use the new event types so we can pass a valid SBC value to clients.
Fix up the completion calls to use CARD32 instead of CARD64 to match
the new field size.

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2011-06-29 11:05:36 -07:00
Jesse Barnes
a3cb7d097a GLX/DRI2: pass drawable correctly for indirect swap events
Pass the right drawable pointer as data to the swap complete function.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2011-06-29 10:56:43 -07:00
Adam Jackson
3e8270b869 glx: Fix fbconfigs with no corresponding visual
There are, in general, more fbconfig depths than visual depths.
fbconfigs need not support Window rendering, however any that do must
have an associated visual ID (which we got right), and any that do not
must not claim GLX_WINDOW_BIT in GLX_DRAWABLE_TYPE (which we got
wrong).

Fixes piglit/glx-fbconfig-sanity, assuming you have a sufficiently
recent piglit, as that test formerly wrongly required pixmap-capable
fbconfigs to have a visual.

v2: Additional check for fbconfigs that didn't have GLX_WINDOW_BIT in
    the first place, from previous patch by Jon TURNEY; also, also clear
    ->visualID.

Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-06-29 18:22:18 +01:00
Jon TURNEY
38d55f06cf Guard use of backtrace() with HAVE_BACKTRACE
Guard the use of backtrace() with HAVE_BACKTRACE, since we already
have the autoconf machinery for setting that.

For the moment, assume dladdr() is available when backtrace() is

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-28 13:07:20 -07:00
Jeremy Huddleston
bea57392c7 XQuartz: Fix Makefile dependencies
automake generates _DEPENDENCIES from _LIBADD, but it strips out variables.
This resulted in not relinking if some components were rebuilt (like
libdix, libos, etc).

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-28 13:07:20 -07:00
Jeremy Huddleston
c8b80a82d9 XQuartz: Make a call to activateIgnoringOtherApps in our NSApplicationActivatedEventType handler
In addition, this change will not call into the X11 activation unless an X11
window was active when we deactivated.  We can't rely on the event and current
key windows because the key window will be nil until activated, and the event
will only reference the window if the window was clicked (whereas it will be
nil if we activated via dock or cmd-tab).

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-28 13:07:19 -07:00
Keith Packard
9d568450b1 Create sdksyms.dep in the right place at configure time
sdksyms moved from hw/xfree86/loader to hw/xfree86, so the
configure-time create of sdksyms.dep needs to reflect that
change. Otherwise, make might be confused by a missing file and (more
importantly to me) hw/xfree86/loader/sdksyms.dep will be left around
after 'make clean' causing 'make distcheck' to fail.
2011-06-28 09:33:25 -07:00
Keith Packard
f968f4ace9 Merge remote-tracking branch 'dbn/no-libxorg' 2011-06-28 09:10:14 -07:00
Peter Hutterer
4dbed26254 xfree86: Only log the serial bytes if debug is on.
Introduced in e3f296d91d, when the ifdef DEBUG
around the whole block was removed, but only two of the three ErrorF
switched to DebugF.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-06-27 12:21:45 -07:00
Dan Nicholson
163441fe53 xfree86: Remove libxorg convenience library to speed up build
libxorg.la served to collect all the Xorg convenience libraries into one
massive archive to link into Xorg. This made things easy for symbol
resolution, but it tremendously slowed down the build since each change
caused libxorg.la to be rebuilt. This is an extremely slow process of
extracting all the objects from the sub-libraries and recombining them.

Instead, the archives are linked directly into Xorg. The order of the
libraries had to be tweaked a bit to make symbols resolve correctly with
the lower level code moving later in the link command.

As a side effect, since the dtrace objects are now being linked
directly into Xorg, we don't need the SPECIAL_DTRACE_OBJECTS hack to
add them twice.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-23 05:28:31 -07:00
Dan Nicholson
6259b30111 xfree86: Move sdksyms generation to ddx toplevel
The symbols in sdksyms.c cover the entire source tree. In order to make
them resolve when libxorg.la goes away, move the objects from libloader
to Xorg. Unfortunately, this means sdksyms needs to get built again for
the test code.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-23 05:28:31 -07:00
Dan Nicholson
7d5c8a12cb Don't use empty source files
When an empty _SOURCES variable is declared, automake will recognize that
only linking is needed.

Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Tested-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-23 05:28:31 -07:00
Keith Packard
8ac651552b Merge remote-tracking branch 'alanc/master' 2011-06-22 11:03:37 -07:00
Gaetan Nadon
945b2ff814 docbook.am: --path is also required for xsltproc
The XSLT processor also needs to know about the entities defined
in xserver.ent. It removes error messages.

Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-06-22 10:49:46 -07:00
Gaetan Nadon
6326b0f074 Update .gitignore as new tests have been added
Refactor to follow the pattern one Makefile, one .gitignore
where needed.

Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-06-22 10:45:25 -07:00
Alan Coopersmith
47b6ba3204 Add xkeyboard-config to See Also of man pages referencing xkb
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-21 17:54:43 -07:00
Alan Coopersmith
cfbe471b58 Xdmx.man: convert section references to substituted forms
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-21 17:54:15 -07:00
Alan Coopersmith
c3278f3c17 Xdmx.man: additional updates to modernize XKB information
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2011-06-21 17:54:14 -07:00
Alan Coopersmith
19e3706713 Xdmx.man: Show actual configured XKB defaults instead of old hardcoded values
Passed through from configure.ac via manpages.am

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2011-06-21 17:54:14 -07:00
Gaetan Nadon
acf2173b32 Install xml versions of specs even if HAVE_XMLTO is false
DocBook/XML input source is also a useful output format that can be viewed
with an XML viewer or editor and by some O/S help system.

Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-20 08:41:52 +10:00
Gaetan Nadon
44890b3e26 Install target dbs alongside generated documents
This matches a change in xorg-sgml-docs whereby the masterdb will look for
the target dbs into the same location as the generated documents.

The target dbs are now installed alongside the generated documents.
Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which
has the potential of installing outside the package prefix and cause
distcheck to fail when user does not have write permission in this package.

Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11

Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-20 08:41:49 +10:00
Rob Clark
a42ef6c940 EXA: fix typo
The incorrect drawable deltas were applied if dst was a redirected
window.  Resulting in a bogus region passed to prepare_access_reg().

Signed-off-by: Rob Clark <rob@ti.com>
Reviewed-by: Michel Dänzer <michel@daenzer.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-20 08:20:30 +10:00
Cyril Brulebois
4edf49d032 dmx/examples: Fix missing key_click_percent assignment.
Thanks to gcc's -Wunused-but-set-variable, stop ignoring the percent
parameter, and add it to the XKeyboardControl structure before the
XChangeKeyboardControl call.

This warning goes away accordingly:
|   CC     xbell-xbell.o
| xbell.c: In function ‘main’:
| xbell.c:74:22: warning: variable ‘percent’ set but not used [-Wunused-but-set-variable]

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
2011-06-16 00:44:43 +02:00
Cyril Brulebois
33dad2b74e hw/dmx: Stop using variables for text widgets.
They are unused in the sense they're not getting any callback set up, so
there's no point in storing them into variables. Keep the initial
alignment of the parameters to try and reduce the diff noise.

Those warnings go away accordingly:
|   CC     xdmxconfig-xdmxconfig.o
| xdmxconfig.c: In function ‘main’:
| xdmxconfig.c:881:29: warning: variable ‘quittext’ set but not used [-Wunused-but-set-variable]
| xdmxconfig.c:880:53: warning: variable ‘abouttext’ set but not used [-Wunused-but-set-variable]

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
2011-06-16 00:44:08 +02:00
Cyril Brulebois
34a9f2a90d xfixes: Remove unused variable.
The last use of pScreen in ProcXFixesSetPictureClipRegion was removed in
aa7096ca6f so remove it entirely.

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
2011-06-16 00:44:03 +02:00
Cyril Brulebois
ad0d0833d4 xfixes: Mark some variables as unused.
Calling Unwrap() is just a way of performing an assignment while keeping a
backup of the original value. In the CursorCloseScreen function, the backup
value doesn't seem to be useful, but Unwrap() is used anyway (probably to stay
in line with other functions). As a consequence, mark those variables as unused.

The following warnings go away accordingly:
|   CC     cursor.lo
| cursor.c: In function 'CursorCloseScreen':
| cursor.c:186:26: warning: variable 'display_proc' set but not used [-Wunused-but-set-variable]
| cursor.c:185:24: warning: variable 'close_proc' set but not used [-Wunused-but-set-variable]

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
2011-06-16 00:44:01 +02:00
Cyril Brulebois
f41ac25d93 miext: Mark some variables as unused.
There's no use for the values set through the various macro calls
(fbGetDrawable and fbGetDrawablePixmap), so mark those variables as unused.

The following warnings go away accordingly:
|   CC     shpacked.lo
| shpacked.c: In function 'shadowUpdatePacked':
| shpacked.c:55:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shpacked.c:55:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shplanar8.lo
| shplanar8.c: In function 'shadowUpdatePlanar4x8':
| shplanar8.c:105:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shplanar8.c:105:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shplanar.lo
| shplanar.c: In function 'shadowUpdatePlanar4':
| shplanar.c:101:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shplanar.c:101:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot16pack_180.lo
| In file included from shrot16pack_180.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate16_180':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot16pack_270.lo
| In file included from shrot16pack_270.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate16_270':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot16pack_270YX.lo
| In file included from shrot16pack_270YX.c:31:0:
| shrotpackYX.h: In function 'shadowUpdateRotate16_270YX':
| shrotpackYX.h:72:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpackYX.h:72:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot16pack_90.lo
| In file included from shrot16pack_90.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate16_90':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot16pack_90YX.lo
| In file included from shrot16pack_90YX.c:31:0:
| shrotpackYX.h: In function 'shadowUpdateRotate16_90YX':
| shrotpackYX.h:72:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpackYX.h:72:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot16pack.lo
| In file included from shrot16pack.c:30:0:
| shrotpack.h: In function 'shadowUpdateRotate16':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot32pack_180.lo
| In file included from shrot32pack_180.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate32_180':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot32pack_270.lo
| In file included from shrot32pack_270.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate32_270':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot32pack_90.lo
| In file included from shrot32pack_90.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate32_90':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot32pack.lo
| In file included from shrot32pack.c:30:0:
| shrotpack.h: In function 'shadowUpdateRotate32':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot8pack_180.lo
| In file included from shrot8pack_180.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate8_180':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot8pack_270.lo
| In file included from shrot8pack_270.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate8_270':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot8pack_90.lo
| In file included from shrot8pack_90.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate8_90':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot8pack.lo
| In file included from shrot8pack.c:30:0:
| shrotpack.h: In function 'shadowUpdateRotate8':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrotate.lo
| shrotate.c: In function 'shadowUpdateRotatePacked':
| shrotate.c:62:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotate.c:62:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shpacked.lo
| shpacked.c: In function 'shadowUpdatePacked':
| shpacked.c:55:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shpacked.c:55:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shplanar8.lo
| shplanar8.c: In function 'shadowUpdatePlanar4x8':
| shplanar8.c:105:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shplanar8.c:105:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shplanar.lo
| shplanar.c: In function 'shadowUpdatePlanar4':
| shplanar.c:101:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shplanar.c:101:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot16pack_180.lo
| In file included from shrot16pack_180.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate16_180':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot16pack_270.lo
| In file included from shrot16pack_270.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate16_270':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot16pack_270YX.lo
| In file included from shrot16pack_270YX.c:31:0:
| shrotpackYX.h: In function 'shadowUpdateRotate16_270YX':
| shrotpackYX.h:72:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpackYX.h:72:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot16pack_90.lo
| In file included from shrot16pack_90.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate16_90':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot16pack_90YX.lo
| In file included from shrot16pack_90YX.c:31:0:
| shrotpackYX.h: In function 'shadowUpdateRotate16_90YX':
| shrotpackYX.h:72:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpackYX.h:72:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot16pack.lo
| In file included from shrot16pack.c:30:0:
| shrotpack.h: In function 'shadowUpdateRotate16':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot32pack_180.lo
| In file included from shrot32pack_180.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate32_180':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot32pack_270.lo
| In file included from shrot32pack_270.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate32_270':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot32pack_90.lo
| In file included from shrot32pack_90.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate32_90':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot32pack.lo
| In file included from shrot32pack.c:30:0:
| shrotpack.h: In function 'shadowUpdateRotate32':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot8pack_180.lo
| In file included from shrot8pack_180.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate8_180':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot8pack_270.lo
| In file included from shrot8pack_270.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate8_270':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot8pack_90.lo
| In file included from shrot8pack_90.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate8_90':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrot8pack.lo
| In file included from shrot8pack.c:30:0:
| shrotpack.h: In function 'shadowUpdateRotate8':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
|   CC     shrotate.lo
| shrotate.c:62:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotate.c:62:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
2011-06-16 00:43:56 +02:00