Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pr/big 1.4.2 upgrade v3 #902

Open
wants to merge 42 commits into
base: 3.6.x
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
6b2de64
NXshm.c: call upstream ShmExtensionInit
uli42 May 30, 2019
80f3821
Lift xkb to xorg 1.4.2
uli42 Jul 7, 2018
b1c00e2
dix: remove register keyword
uli42 Nov 1, 2018
e009bb0
Lift dix to 1.4.2
uli42 Nov 1, 2018
82210ad
dix: fix typo in clipAxis.
uli42 Mar 19, 2019
8acbf60
devices.c: replace Ace by XC_security
uli42 Nov 2, 2018
75e8da5
Update include files to match Xi 1.4.2 requirements
uli42 Nov 1, 2018
fe6a118
Xi: reorder function to make future merges easier
uli42 Nov 1, 2018
78d6af3
Xi: remove register keywords
uli42 Nov 1, 2018
2106d60
Lift Xi to xorg 1.4.2
uli42 Nov 1, 2018
23cc44e
main.c: FIXME: comment InitRegions for now
uli42 Nov 2, 2018
ea55e36
update swaprep.h
uli42 Nov 2, 2018
66394a5
update window.h
uli42 Nov 2, 2018
607818b
make dispatch.c compile again
uli42 Nov 2, 2018
ac80d99
Keyboard.c: fix parameter type for LegalModifier
uli42 Nov 2, 2018
21723e6
Pointer.c: needs additional parameter (numAxes)
uli42 Nov 2, 2018
6c37a4e
Keyboard.c: add missing DDXRingBell
uli42 Nov 2, 2018
bd4d6d8
Lift mi to xorg 1.4.2
uli42 Nov 2, 2018
412c630
Lift miext to xorg 1.4.2
uli42 Nov 2, 2018
fffa9a3
nxagent: add Xi to include path
uli42 Jan 31, 2019
e30734f
Events.c Introduce nxagentQueueKeyEvent
uli42 Nov 2, 2018
c864af3
nxagent: introduce global nxagent{Keyboard,Pointer}Device
uli42 Nov 2, 2018
7f8a5bd
Events.c: update/replace all mieqEnqueue calls
uli42 Nov 2, 2018
1540168
Pointer.c: port to the new DIX motion history API
uli42 Nov 2, 2018
0fd3004
mi: remove miPointerUpdate() -> replaced by miPointerUpdateSprite().
uli42 Nov 7, 2018
71f668f
Xext: add missing SecurityExtensionSetup
uli42 Nov 7, 2018
d59c7ed
Lift damageext to xorg 1.4.2
uli42 Nov 6, 2018
c770558
Revert "misc nx-X11/programs/Xserver/{hw/nxagent,miext,render}/: move…
uli42 Nov 3, 2018
227af9c
Lift render to xorg 1.4.2
uli42 Nov 3, 2018
a51493a
Lift fb to xorg 1.4.2
uli42 Nov 3, 2018
a3f5d4d
Make files depending on render compile again
uli42 Nov 6, 2018
cadf97c
Add securitysrv.h
uli42 Mar 20, 2019
35701b3
Lift os to xorg 1.4.2
uli42 Nov 7, 2018
f7103be
dix: add missing InitRegions()
uli42 Apr 30, 2019
17b099d
NXdispatch.c: whitespace fixes
uli42 May 3, 2019
bfd84b4
NXdispatch.c: cleanup/update Dispatch()
uli42 May 3, 2019
074508d
NXglyph.c: update to latest changes in render/glyph.c
uli42 Jun 12, 2019
fcc22c9
xkb: use the correct device instead of an uninitialised "dev".
uli42 Jun 21, 2019
25975f8
Give names to the virtual devices
uli42 Jun 21, 2019
ee35df7
dix: avoid activating the VCP/VCK twice.
uli42 Jun 21, 2019
38282f6
Free xkb devPrivates on CloseDevice
uli42 Jun 21, 2019
bf5690c
fixup! NXdispatch.c: cleanup/update Dispatch()
uli42 Jan 6, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
make dispatch.c compile again
uli42 committed Jan 18, 2020
commit 607818b55cb3f1c2111bd40a454b84099588352b
1 change: 0 additions & 1 deletion nx-X11/programs/Xserver/dix/dispatch.c
Original file line number Diff line number Diff line change
@@ -253,7 +253,6 @@ long SmartScheduleMaxSlice = SMART_SCHEDULE_MAX_SLICE;
long SmartScheduleTime;
static ClientPtr SmartLastClient;
static int SmartLastIndex[SMART_MAX_PRIORITY-SMART_MIN_PRIORITY+1];
int SmartScheduleClient(int *clientReady, int nready);

#ifdef SMART_DEBUG
long SmartLastPrint;
19 changes: 0 additions & 19 deletions nx-X11/programs/Xserver/include/dix.h
Original file line number Diff line number Diff line change
@@ -299,8 +299,6 @@ extern int dixDestroyPixmap(
void * /*value*/,
XID /*pid*/);

extern void CloseDownRetainedResources(void);

extern void InitClient(
ClientPtr /*client*/,
int /*i*/,
@@ -330,17 +328,6 @@ extern int SendConnSetup(
ClientPtr /*client*/,
char* /*reason*/);

extern int DoGetImage(
ClientPtr /*client*/,
int /*format*/,
Drawable /*drawable*/,
int /*x*/,
int /*y*/,
int /*width*/,
int /*height*/,
Mask /*planemask*/,
xGetImageReply ** /*im_return*/);

#if defined(DDXBEFORERESET)
extern void ddxBeforeReset (void);
#endif
@@ -794,10 +781,4 @@ typedef struct {
SelectionCallbackKind kind;
} SelectionInfoRec;

/* strcasecmp.c */
#if NEED_STRCASECMP
#define strcasecmp xstrcasecmp
extern int xstrcasecmp(char *s1, char *s2);
#endif

#endif /* DIX_H */