Age | Commit message (Collapse) | Author | Files | Lines |
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
See http://people.gnome.org/~walters/docs/build-api.txt
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Transposed parameters meant that it was printing the sequence number
rather than the type.
Signed-off-by: Daniel Stone <daniels@collabora.com>
|
|
The high bit of an X11 event id is set to 0 for events generated by the
server, 1 for events sent from another client via SendEvent requests.
Previously xscope printed:
..............EVENT: **INVALID** (150)
Now it prints:
..............EVENT: ConfigureNotify
source: SendEvent
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=66388
Had missed a 4 byte padding field between the transform data and
the start of the filter name fields.
The offset to the strings now matches the 96 bytes specified for
sz_xRRGetCrtcTransformReply in <X11/extensions/randrproto.h> and
the test case now reports:
pending filter name: "bilinear"
instead of:
current filter name: "^@^@^@^@bili"
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Can't use -v, as that's already in use for verbosity level
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Compilers auto-define "sun" on Solaris/SunOS, which causes the variable
name to turn into a constant "1", breaking the parsing of the code.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
All errors currently recognized by xscope fall into two forms,
with or without a 32-bit value to print as a bad value, so use
common implementations for those two forms so we can stop
duplicating that code for every new extension-defined error.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
If you run "xscope -r -v0 > xscope.raw", then you can later run
"xscope -f xscope.raw" to decode the data.
Mainly adding this to aid in testing decoding of new extensions,
so I don't have to re-run the commands over and over, just replay
a log file. (Which may or may not have been edited to include
additional request data for further testing of types & formats
that clients may not make it easy to generate.)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
All versions now perform same check for XtransConn data to decide
whether to use _X11TransClose or regular close, which is needed for
being able to read data from pre-recorded files instead of live sockets.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
|
|
We don't print any other data from packet when Verbose == 0, just had
a few random "data: (6)" type lines sneak through.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Avoids having to try to time a ^C after the signal handler is set up
but before any data is handled.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Prints atoms, cardinals, integers, and windows as formatted values
instead of lists of bytes.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
|
|
Currently used for core protocol window properties, but will be
used for extensions that have similar property handling requests
in the future.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Uses them to display strings instead of just numeric ids for atoms
beyond the builtin set in other requests, such as property lookups.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Used for GC struct members, which are defined in the protocol as 32-bit,
so no need to waste time and memory copying into 64-bit longs everywhere
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Adds a getreqlen inline function to handle the big requests check.
As noted in the comment, it must be called *before* the printreqlen
macro does its own check, since printreqlen "fixes" the buf pointer
when it's done to align all the remaining fields with their correct
positions after skipping over the extra big requests 32-bit length
field after the normal 16-bit length field.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
instead of shifting the whole word as each byte is loaded into place
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
|
|
Clears gcc warning from casting a const char * to char *:
server.c: In function `SaveBytes':
server.c:203: warning: cast discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
|
|
Fixes compiler warning:
"fd.c", line 481: warning: statement not reached
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Performed with util/modular/x-indent-all.sh, followed by manual fixups
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Acked-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Reading through Xtranssock.c reveals that when _X11TransConnect returns the
value TRANS_TRY_CONNECT_AGAIN, it turns off the abstract socket flag, so
that attempting _X11TransConnect might succeed the second time where it
failed the first time.
Now xscope will attempt the connection a second time when it receives the
TRANS_TRY_CONNECT_AGAIN return value on the first connection attempt.
Signed-off-by: Jeff Smith <whydoubt@yahoo.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
In USE_XTRANS mode, MakeConnection() cycles through a selection of
protocol choices until it finds one where it can open a socket to
the server. It then attempts an X11 connection via that socket and
aborts if one isn't possible.
This patch modifies the code to try an alternate protocol if the X11
connection fails.
https://bugs.freedesktop.org/show_bug.cgi?id=46696
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=46691
Use correct write FD to select() on.
FlushFD() contains logic to handle the Xclient or Xserver blocking on
a write() by changing the global read and write fd_set's so that
MainLoop() will select() on the blocking write FD instead of the peer
read FD. Unfortunately, the code contains a logic error so that it
winds up select()ing for write on the peer FD instead of the blocked FD.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Different platforms use different names for the fd_set members,
so use the existing Xpoll.h macros for greater portability.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=46689
Change fd_set debug output to display actual contents of first 32 or 64 bits.
In xscope-1.3.1, MainLoop() contains debug(128,...) code that appears
intended to display the fd_set contents before and after the main
select() call. In most implementations, fd_set will be a struct though
it is printed as an int, thus the actual debug output is unlikely to
usefully reflect the actual fd_set contents.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=46664
The length fields for PolyText16 and ImageText16 represent the number of
16-bit characters in the request but PrintString16() and PrintTString16()
treat the lengths as the number of octets in the string - thus printing
only half of the characters.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Error detected by Solaris Studio 12.3 code analyzer:
WARNING 1 (MRC): missing null-pointer check after malloc: calloc(((ullong)MaxFD),48) at:
InitializeFD() <app/xscope/fd.c : 107>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Makes the dependency on x11proto explicit - it was already needed for
the X11 headers included in various files, but now needs to be at least
7.0.17 for the _X_NORETURN definition in Xfuncproto.h
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
|