8b328d4ee3
Commit 31bf81772e changed the clientState field
from a signed int to a signed int 2-bit bitfield. The ClientState enum that is
expected to be assigned to this field has four values: ClientStateInitial (0),
ClientStateRunning (1), ClientStateRetained (2), and ClientStateGone (3).
However, because this bitfield is signed, ClientStateRetained becomes -2 when
assigned, and ClientStateGone becomes -1. This causes warnings:
test.c:54:10: error: case label value exceeds maximum value for type [-Werror]
test.c:55:10: error: case label value exceeds maximum value for type [-Werror]
The code here is a switch statement:
53 switch (client->clientState) {
54 case ClientStateGone:
55 case ClientStateRetained:
56 [...]
57 break;
58
59 default:
60 [...]
61 break;
62 }
It also causes bizarre problems like this:
client->clientState = ClientStateGone;
assert(client->clientState == ClientStateGone); // this assert fails
Also change the signedness of nearby bitfields to match.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Colin Harrison <colin.harrison at virgin.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
195 lines
5.6 KiB
C
195 lines
5.6 KiB
C
/***********************************************************
|
|
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
|
|
|
|
All Rights Reserved
|
|
|
|
Permission to use, copy, modify, and distribute this software and its
|
|
documentation for any purpose and without fee is hereby granted,
|
|
provided that the above copyright notice appear in all copies and that
|
|
both that copyright notice and this permission notice appear in
|
|
supporting documentation, and that the name of Digital not be
|
|
used in advertising or publicity pertaining to distribution of the
|
|
software without specific, written prior permission.
|
|
|
|
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
|
|
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
|
|
DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
|
|
ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
|
|
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
|
|
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|
SOFTWARE.
|
|
|
|
******************************************************************/
|
|
|
|
#ifndef DIXSTRUCT_H
|
|
#define DIXSTRUCT_H
|
|
|
|
#include "client.h"
|
|
#include "dix.h"
|
|
#include "resource.h"
|
|
#include "cursor.h"
|
|
#include "gc.h"
|
|
#include "pixmap.h"
|
|
#include "privates.h"
|
|
#include <X11/Xmd.h>
|
|
|
|
/*
|
|
* direct-mapped hash table, used by resource manager to store
|
|
* translation from client ids to server addresses.
|
|
*/
|
|
|
|
extern _X_EXPORT CallbackListPtr ClientStateCallback;
|
|
|
|
typedef struct {
|
|
ClientPtr client;
|
|
xConnSetupPrefix *prefix;
|
|
xConnSetup *setup;
|
|
} NewClientInfoRec;
|
|
|
|
typedef void (*ReplySwapPtr) (ClientPtr /* pClient */ ,
|
|
int /* size */ ,
|
|
void * /* pbuf */ );
|
|
|
|
extern _X_EXPORT void
|
|
ReplyNotSwappd(ClientPtr /* pClient */ ,
|
|
int /* size */ ,
|
|
void * /* pbuf */ ) _X_NORETURN;
|
|
|
|
typedef enum { ClientStateInitial,
|
|
ClientStateRunning,
|
|
ClientStateRetained,
|
|
ClientStateGone
|
|
} ClientState;
|
|
|
|
#ifdef XFIXES
|
|
typedef struct _saveSet {
|
|
struct _Window *windowPtr;
|
|
Bool toRoot;
|
|
Bool map;
|
|
} SaveSetElt;
|
|
#define SaveSetWindow(ss) ((ss).windowPtr)
|
|
#define SaveSetToRoot(ss) ((ss).toRoot)
|
|
#define SaveSetShouldMap(ss) ((ss).map)
|
|
#define SaveSetAssignWindow(ss,w) ((ss).windowPtr = (w))
|
|
#define SaveSetAssignToRoot(ss,tr) ((ss).toRoot = (tr))
|
|
#define SaveSetAssignMap(ss,m) ((ss).map = (m))
|
|
#else
|
|
typedef struct _Window *SaveSetElt;
|
|
|
|
#define SaveSetWindow(ss) (ss)
|
|
#define SaveSetToRoot(ss) FALSE
|
|
#define SaveSetShouldMap(ss) TRUE
|
|
#define SaveSetAssignWindow(ss,w) ((ss) = (w))
|
|
#define SaveSetAssignToRoot(ss,tr)
|
|
#define SaveSetAssignMap(ss,m)
|
|
#endif
|
|
|
|
typedef struct _Client {
|
|
pointer requestBuffer;
|
|
pointer osPrivate; /* for OS layer, including scheduler */
|
|
Mask clientAsMask;
|
|
short index;
|
|
unsigned char majorOp, minorOp;
|
|
unsigned int swapped:1;
|
|
unsigned int local:1;
|
|
unsigned int big_requests:1; /* supports large requests */
|
|
unsigned int clientGone:1;
|
|
unsigned int closeDownMode:2;
|
|
unsigned int clientState:2;
|
|
char smart_priority;
|
|
short noClientException; /* this client died or needs to be killed */
|
|
int priority;
|
|
ReplySwapPtr pSwapReplyFunc;
|
|
XID errorValue;
|
|
int sequence;
|
|
int ignoreCount; /* count for Attend/IgnoreClient */
|
|
int numSaved;
|
|
SaveSetElt *saveSet;
|
|
int (**requestVector) (ClientPtr /* pClient */ );
|
|
CARD32 req_len; /* length of current request */
|
|
unsigned int replyBytesRemaining;
|
|
PrivateRec *devPrivates;
|
|
unsigned short xkbClientFlags;
|
|
unsigned short mapNotifyMask;
|
|
unsigned short newKeyboardNotifyMask;
|
|
unsigned short vMajor, vMinor;
|
|
KeyCode minKC, maxKC;
|
|
|
|
int smart_start_tick;
|
|
int smart_stop_tick;
|
|
int smart_check_tick;
|
|
|
|
DeviceIntPtr clientPtr;
|
|
ClientIdPtr clientIds;
|
|
} ClientRec;
|
|
|
|
/*
|
|
* Scheduling interface
|
|
*/
|
|
extern _X_EXPORT long SmartScheduleTime;
|
|
extern _X_EXPORT long SmartScheduleInterval;
|
|
extern _X_EXPORT long SmartScheduleSlice;
|
|
extern _X_EXPORT long SmartScheduleMaxSlice;
|
|
extern _X_EXPORT Bool SmartScheduleDisable;
|
|
extern _X_EXPORT void
|
|
SmartScheduleStartTimer(void);
|
|
extern _X_EXPORT void
|
|
SmartScheduleStopTimer(void);
|
|
|
|
#define SMART_MAX_PRIORITY (20)
|
|
#define SMART_MIN_PRIORITY (-20)
|
|
|
|
extern _X_EXPORT void
|
|
SmartScheduleInit(void);
|
|
|
|
/* This prototype is used pervasively in Xext, dix */
|
|
#define DISPATCH_PROC(func) int func(ClientPtr /* client */)
|
|
|
|
typedef struct _WorkQueue {
|
|
struct _WorkQueue *next;
|
|
Bool (*function) (ClientPtr /* pClient */ ,
|
|
pointer /* closure */
|
|
);
|
|
ClientPtr client;
|
|
pointer closure;
|
|
} WorkQueueRec;
|
|
|
|
extern _X_EXPORT TimeStamp currentTime;
|
|
extern _X_EXPORT TimeStamp lastDeviceEventTime[MAXDEVICES];
|
|
|
|
extern _X_EXPORT int
|
|
CompareTimeStamps(TimeStamp /*a */ ,
|
|
TimeStamp /*b */ );
|
|
|
|
extern _X_EXPORT TimeStamp
|
|
ClientTimeToServerTime(CARD32 /*c */ );
|
|
|
|
typedef struct _CallbackRec {
|
|
CallbackProcPtr proc;
|
|
pointer data;
|
|
Bool deleted;
|
|
struct _CallbackRec *next;
|
|
} CallbackRec, *CallbackPtr;
|
|
|
|
typedef struct _CallbackList {
|
|
int inCallback;
|
|
Bool deleted;
|
|
int numDeleted;
|
|
CallbackPtr list;
|
|
} CallbackListRec;
|
|
|
|
/* proc vectors */
|
|
|
|
extern _X_EXPORT int (*InitialVector[3]) (ClientPtr /*client */ );
|
|
|
|
extern _X_EXPORT int (*ProcVector[256]) (ClientPtr /*client */ );
|
|
|
|
extern _X_EXPORT int (*SwappedProcVector[256]) (ClientPtr /*client */ );
|
|
|
|
extern _X_EXPORT ReplySwapPtr ReplySwapVector[256];
|
|
|
|
extern _X_EXPORT int
|
|
ProcBadRequest(ClientPtr /*client */ );
|
|
|
|
#endif /* DIXSTRUCT_H */
|