| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |
|
|
|
|
| |
They are not used from the outside.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
was offset to the right and downwards before
Fixes ArcticaProject/nx-libs#892
|
| |
|
|
|
|
|
|
|
|
| |
The problem we are fixing (or better "working around") here has also
been seen in XQuartz, but no-one has found the reason yet.
Point to bugreport so that anyone stumbling over this in future can
check if there's a better fix and possibly implement that one.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backport of this xorg-xserver commit:
commit cfd3443fe81685e91a53063dee58e24a5684dc29
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jan 28 13:34:10 2009 +1000
Xext: rename saver's EventType to SaverEventType.
Avoid namespace clashing with the internal events.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Backport of this xorg-xserver patch:
commit 3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e
Author: Michel Dänzer <daenzer@vmware.com>
Date: Mon Mar 22 18:01:17 2010 +0100
Xext: Fix cursor reference counting hazard.
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>
|
|
|
|
| |
(from nxagent changelog)
|
| |
|
|
|
|
| |
It is better to create the values array once and not on every iteration..
|
|
|
|
|
|
| |
Does not require two parameters. It could be replaced by
RegionDestroy() entirely but we leave it to have a match to
nxagentCreateRegion().
|
|
|
|
|
| |
Now all cleanup code at the end of the function is gone so there's no
need for the gotos anymore. Just return directly.
|
|
|
|
|
| |
move common code into helper function that also takes care of the ugly
alloc/free stuff.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
Otherwise we will never be able to free the list because we do not know
if free() is allowed or not.
|
|
|
|
| |
add else clauses, improve debugging, add comments
|
|
|
|
| |
not a real memleak since it is followed by a FatalError...
|
|
|
|
| |
The FIXME just described what the following function actually implements...
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
We have never built nxwin within this tree. And we never shipped
it. So drop the according logic.
We have also removed CYGWIN stuff in the past so nxwin probably would
not compile/work anyway...
|
|
|
|
|
|
| |
We have no hardware that could blank the screen for us. So let
nxagentSaveScreen return False in some situations to let dix do the
default action.
|
| |
|
|
|
|
|
| |
we moved the auto-disconnect feature to an own timer so there's no
need for a special treatment in screen saver stuff anymore.
|
|
|
|
|
|
| |
Option -timeout used the screensaver facility. This patch changes that
to an own timer that is independent. This effectly means we can drop
most of the derived screensaving stuff in a follow-up commit.
|
| |
|
| |
|
|
|
|
|
|
| |
This was removed by mistake in 39866f5c133230e5731156c2356c8571c971534c.
Fixes ArcticaProject/nx-libs#904
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Clean.c: In function ‘CleanZImage’:
Clean.c:141:23: warning: declaration of ‘j’ shadows a previous local [-Wshadow=local]
register int i, j;
^
Clean.c:88:16: note: shadowed declaration is here
unsigned int j;
^
Clean.c: In function ‘CopyAndCleanImage’:
Clean.c:239:22: warning: declaration of ‘i’ shadows a previous local [-Wshadow=compatible-local]
register int i;
^
Clean.c:192:16: note: shadowed declaration is here
register int i;
^
Clean.c:324:13: warning: declaration of ‘i’ shadows a previous local [-Wshadow=compatible-local]
int i;
^
Clean.c:192:16: note: shadowed declaration is here
register int i;
^
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
commit 08d0481e299c28b64a0db9bb0782ba2b551028fd
Author: Keith Packard <keithp@keithp.com>
Date: Sun Dec 15 01:12:22 2013 -0800
os: Fix -Wshadow errors
Rename variables to avoid shadowing globals
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Based on the following commit. But for mispans.c I think the first
contained fix is wrong (nested loop with variable i) so I took another
approach.
commit f02e27e4fcc34413b2051e5a01edc92172fa8612
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Oct 16 02:16:17 2012 -0500
mi: fix shadow warnings
mibitblt.c: In function 'miGetImage':
mibitblt.c:617:20: warning: declaration of 'pt' shadows a previous local
mibitblt.c:609:17: warning: shadowed declaration is here
mispans.c: In function 'miFillUniqueSpanGroup':
mispans.c:456:33: warning: declaration of 'i' shadows a previous local
mispans.c:382:9: warning: shadowed declaration is here
mispans.c:488:17: warning: declaration of 'i' shadows a previous local
mispans.c:382:9: warning: shadowed declaration is here
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Fixes these warnings:
mi/mispans.c: fix shadowed vars
mispans.c: In function ‘miFillUniqueSpanGroup’:
mispans.c:465:12: warning: declaration of ‘i’ shadows a previous local [-Wshadow=compatible-local]
int i;
^
mispans.c:387:21: note: shadowed declaration is here
register int i;
^
mispans.c:497:10: warning: declaration of ‘i’ shadows a previous local [-Wshadow=compatible-local]
int i;
^
mispans.c:387:21: note: shadowed declaration is here
register int i;
^
mibitblt.c: In function ‘miGetImage’:
mibitblt.c:669:13: warning: declaration of ‘pt’ shadows a previous local [-Wshadow=compatible-local]
xPoint pt;
^~
mibitblt.c:659:18: note: shadowed declaration is here
DDXPointRec pt = {0, 0};
^~
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix this warning:
xkbActions.c: In function ‘_XkbFilterDeviceBtn’:
xkbActions.c:1084:6: warning: declaration of ‘button’ shadows a previous local [-Wshadow=compatible-local]
int button;
^~~~~~
xkbActions.c:1044:6: note: shadowed declaration is here
int button;
^~~~~~
Backport of this xorg-xserver upstream commit:
commit 41dd7cf673e47ab74c5065b8dbf268b2e5facb64
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:34 2011 -0800
_XkbFilterDeviceBtn: move variable declarations to match usage scope
The main body of this function is an if { } else if { } pair of blocks.
Previously there was int button at the top level scope which is used
only in the first block, and a redeclaration of int button inside the
second block. Since there's no overlap in the code paths for the
two uses of button, move the one from the outer block into the first
block to help the programmer more quickly determine they are unrelated
usages, and to silence the gcc warning of:
xkbActions.c: In function '_XkbFilterDeviceBtn':
xkbActions.c:999:6: warning: declaration of 'button' shadows a previous local
xkbActions.c:955:6: warning: shadowed declaration is here
For consistency, move DeviceIntPtr dev declarations as well that are
used in the same way.
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix shadow warning:
xkbLEDs.c: In function ‘XkbFindSrvLedInfo’:
xkbLEDs.c:633:19: warning: declaration of ‘sli’ shadows a previous local [-Wshadow=compatible-local]
XkbSrvLedInfoPtr sli;
^~~
xkbLEDs.c:629:18: note: shadowed declaration is here
XkbSrvLedInfoPtr sli;
^~~
Backport of this xorg-xserver commit:
commit d8eb9b5faa2d2c9350bdaffef8749a9cac3c87b8
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Dec 12 16:49:34 2011 -0800
XkbFindSrvLedInfo: remove extraneous name-clashing sli variable
Variable is already defined outside the outer if statement, and
there's no need to redefine inside the if statement.
No point in setting sli before if (dev->kbdfeed->xkb_sli==NULL)
check - if check is true, we immediately set it, if check is false,
we immediately return without further reference or use of it.
The one thing we do with it inside the inner if statement is store
an allocation in it for a brief moment before writing to the final
destination, which is immediately returned to the caller.
In short, there's no benefit to the variable at all in this block,
it just gives the optimizer more code to figure out how to omit.
Fixes gcc warning:
xkbLEDs.c: In function 'XkbFindSrvLedInfo':
xkbLEDs.c:683:19: warning: declaration of 'sli' shadows a previous local
xkbLEDs.c:679:18: warning: shadowed declaration is here
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
xkb.c: In function ‘ProcXkbSetCompatMap’:
xkb.c:2601:20: warning: declaration of ‘i’ shadows a previous local [-Wshadow=compatible-local]
register unsigned i,bit;
^
xkb.c:2529:23: note: shadowed declaration is here
register unsigned i,bit;
^
xkb.c:2601:22: warning: declaration of ‘bit’ shadows a previous local [-Wshadow=compatible-local]
register unsigned i,bit;
^~~
xkb.c:2529:25: note: shadowed declaration is here
register unsigned i,bit;
^~~
Backport of this xorg upstream commit:
commit 344eea237fc07dedfd733d14f95ed0ad26bb5f81
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Tue Oct 16 02:04:34 2012 -0500
xkb: fix shadow warnings
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
commit 424dbde891486ad6a6c00c61a334031ff18f5556
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Dec 9 10:08:55 2011 -0800
CheckForEmptyMask does not need to declare int n twice
Just use the existing n variable again in the ARGB_CURSOR loop
instead of creating another one.
Fixes gcc -Wshadow warning:
cursor.c: In function 'CheckForEmptyMask':
cursor.c:155:6: warning: declaration of 'n' shadows a previous local
cursor.c:146:9: warning: shadowed declaration is here
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
xp must be declared outside the while loop!
xp was reset in each interation despite being increased at the
iteration's end!
To protect against this happening again replace the while loop by a
for loop that references xp.
Bug introduced by d94f472744355c71987d145727aecace1e8455b6
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Pixmap.c: In function ‘nxagentDisconnectAllPixmaps’:
Pixmap.c:677:19: warning: declaration of ‘r’ shadows a previous local [-Wshadow=compatible-local]
for (int i = 0, r = 1; i < MAXCLIENTS; r = 1, i++)
^
Pixmap.c:652:7: note: shadowed declaration is here
int r = 1;
^
Pixmap.c: In function ‘nxagentReconnectAllPixmaps’:
Pixmap.c:840:19: warning: declaration of ‘result’ shadows a previous local [-Wshadow=compatible-local]
for (int i = 0, result = 1; i < MAXCLIENTS; result = 1, i++)
^~~~~~
Pixmap.c:807:8: note: shadowed declaration is here
Bool result = 1;
^~~~~~
|