Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
711fd244
You need to sign in or sign up before continuing.
Unverified
Commit
711fd244
authored
Feb 26, 2018
by
Mihai Moldovan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'uli42-pr/update_dbe' into 3.6.x
Attribiutes GH PR #647:
https://github.com/ArcticaProject/nx-libs/pull/647
parents
3d8f8d7a
f1f2a360
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
72 additions
and
141 deletions
+72
-141
Imakefile
nx-X11/programs/Xserver/dbe/Imakefile
+8
-0
dbe.c
nx-X11/programs/Xserver/dbe/dbe.c
+51
-93
dbestruct.h
nx-X11/programs/Xserver/dbe/dbestruct.h
+0
-6
midbe.c
nx-X11/programs/Xserver/dbe/midbe.c
+13
-41
midbe.h
nx-X11/programs/Xserver/dbe/midbe.h
+0
-1
No files found.
nx-X11/programs/Xserver/dbe/Imakefile
View file @
711fd244
...
@@ -6,6 +6,14 @@
...
@@ -6,6 +6,14 @@
INCLUDES = -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) $(EXTRAINCLUDES) `pkg-config --cflags-only-I pixman-1`
INCLUDES = -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) $(EXTRAINCLUDES) `pkg-config --cflags-only-I pixman-1`
LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
#if defined(NXAgentServer) && NXAgentServer
NX_DEFINES = -DNXAGENT_SERVER
#endif
DEFINES = \
$(NX_DEFINES) \
$(NULL)
NormalLibraryObjectRule()
NormalLibraryObjectRule()
NormalLibraryTarget(dbe,$(OBJS))
NormalLibraryTarget(dbe,$(OBJS))
...
...
nx-X11/programs/Xserver/dbe/dbe.c
View file @
711fd244
...
@@ -80,39 +80,6 @@ static Bool firstRegistrationPass = TRUE;
...
@@ -80,39 +80,6 @@ static Bool firstRegistrationPass = TRUE;
/******************************************************************************
/******************************************************************************
*
*
* DBE DIX Procedure: DbeValidateBuffer
*
* Description:
*
* This function is called from VALIDATE_DRAWABLE_AND_GC and from
* various places in dispatch.c if the server has been compiled with
* the flags -DNEED_DBE_BUF_BITS and -DNEED_DBE_BUF_VALIDATE.
* When pWin->dstBuffer changes, this function will be called with pWin
* as the first argument, the drawable ID that was specified as the
* second argument (could be a back buffer id), and True for the third
* argument.
* When pWin->srcBuffer changes, the third argument will be False, and
* the first two arguments are as described for dstBuffer.
*
* This function should prepare the hardware to access the specified
* buffer for reads (if dstbuf is False) or writes (if dstbuf is True).
*
*****************************************************************************/
void
DbeValidateBuffer
(
pWin
,
drawID
,
dstbuf
)
WindowPtr
pWin
;
XID
drawID
;
Bool
dstbuf
;
{
DbeScreenPrivPtr
pDbeScreenPriv
=
DBE_SCREEN_PRIV_FROM_WINDOW
(
pWin
);
if
(
pDbeScreenPriv
->
ValidateBuffer
)
(
*
pDbeScreenPriv
->
ValidateBuffer
)(
pWin
,
drawID
,
dstbuf
);
}
/******************************************************************************
*
* DBE DIX Procedure: DbeRegisterFunction
* DBE DIX Procedure: DbeRegisterFunction
*
*
* Description:
* Description:
...
@@ -122,9 +89,7 @@ DbeValidateBuffer(pWin, drawID, dstbuf)
...
@@ -122,9 +89,7 @@ DbeValidateBuffer(pWin, drawID, dstbuf)
*****************************************************************************/
*****************************************************************************/
void
void
DbeRegisterFunction
(
pScreen
,
funct
)
DbeRegisterFunction
(
ScreenPtr
pScreen
,
Bool
(
*
funct
)
(
/* ??? */
))
ScreenPtr
pScreen
;
Bool
(
*
funct
)();
{
{
int
i
;
int
i
;
...
@@ -158,8 +123,7 @@ DbeRegisterFunction(pScreen, funct)
...
@@ -158,8 +123,7 @@ DbeRegisterFunction(pScreen, funct)
*
*
*****************************************************************************/
*****************************************************************************/
static
DbeWindowPrivPtr
static
DbeWindowPrivPtr
DbeAllocWinPriv
(
pScreen
)
DbeAllocWinPriv
(
ScreenPtr
pScreen
)
ScreenPtr
pScreen
;
{
{
DbeWindowPrivPtr
pDbeWindowPriv
;
DbeWindowPrivPtr
pDbeWindowPriv
;
DbeScreenPrivPtr
pDbeScreenPriv
;
DbeScreenPrivPtr
pDbeScreenPriv
;
...
@@ -228,7 +192,7 @@ DbeFallbackAllocWinPriv(pScreen)
...
@@ -228,7 +192,7 @@ DbeFallbackAllocWinPriv(pScreen)
*****************************************************************************/
*****************************************************************************/
static
int
static
int
DbeAllocWinPrivPrivIndex
()
DbeAllocWinPrivPrivIndex
(
void
)
{
{
return
winPrivPrivCount
++
;
return
winPrivPrivCount
++
;
...
@@ -248,10 +212,7 @@ DbeAllocWinPrivPrivIndex()
...
@@ -248,10 +212,7 @@ DbeAllocWinPrivPrivIndex()
*****************************************************************************/
*****************************************************************************/
static
Bool
static
Bool
DbeAllocWinPrivPriv
(
pScreen
,
index
,
amount
)
DbeAllocWinPrivPriv
(
register
ScreenPtr
pScreen
,
int
index
,
unsigned
int
amount
)
register
ScreenPtr
pScreen
;
int
index
;
unsigned
int
amount
;
{
{
DbeScreenPrivPtr
pDbeScreenPriv
;
DbeScreenPrivPtr
pDbeScreenPriv
;
unsigned
int
oldamount
;
unsigned
int
oldamount
;
...
@@ -302,9 +263,7 @@ DbeAllocWinPrivPriv(pScreen, index, amount)
...
@@ -302,9 +263,7 @@ DbeAllocWinPrivPriv(pScreen, index, amount)
*****************************************************************************/
*****************************************************************************/
static
void
static
void
DbeStubScreen
(
pDbeScreenPriv
,
nStubbedScreens
)
DbeStubScreen
(
DbeScreenPrivPtr
pDbeScreenPriv
,
int
*
nStubbedScreens
)
DbeScreenPrivPtr
pDbeScreenPriv
;
int
*
nStubbedScreens
;
{
{
/* Stub DIX. */
/* Stub DIX. */
pDbeScreenPriv
->
SetupBackgroundPainter
=
NULL
;
pDbeScreenPriv
->
SetupBackgroundPainter
=
NULL
;
...
@@ -326,7 +285,6 @@ DbeStubScreen(pDbeScreenPriv, nStubbedScreens)
...
@@ -326,7 +285,6 @@ DbeStubScreen(pDbeScreenPriv, nStubbedScreens)
pDbeScreenPriv
->
EndIdiom
=
NULL
;
pDbeScreenPriv
->
EndIdiom
=
NULL
;
pDbeScreenPriv
->
WinPrivDelete
=
NULL
;
pDbeScreenPriv
->
WinPrivDelete
=
NULL
;
pDbeScreenPriv
->
ResetProc
=
NULL
;
pDbeScreenPriv
->
ResetProc
=
NULL
;
pDbeScreenPriv
->
ValidateBuffer
=
NULL
;
(
*
nStubbedScreens
)
++
;
(
*
nStubbedScreens
)
++
;
...
@@ -351,8 +309,7 @@ DbeStubScreen(pDbeScreenPriv, nStubbedScreens)
...
@@ -351,8 +309,7 @@ DbeStubScreen(pDbeScreenPriv, nStubbedScreens)
*****************************************************************************/
*****************************************************************************/
static
int
static
int
ProcDbeGetVersion
(
client
)
ProcDbeGetVersion
(
ClientPtr
client
)
ClientPtr
client
;
{
{
/* REQUEST(xDbeGetVersionReq); */
/* REQUEST(xDbeGetVersionReq); */
xDbeGetVersionReply
rep
;
xDbeGetVersionReply
rep
;
...
@@ -401,8 +358,7 @@ ProcDbeGetVersion(client)
...
@@ -401,8 +358,7 @@ ProcDbeGetVersion(client)
*****************************************************************************/
*****************************************************************************/
static
int
static
int
ProcDbeAllocateBackBufferName
(
client
)
ProcDbeAllocateBackBufferName
(
ClientPtr
client
)
ClientPtr
client
;
{
{
REQUEST
(
xDbeAllocateBackBufferNameReq
);
REQUEST
(
xDbeAllocateBackBufferNameReq
);
WindowPtr
pWin
;
WindowPtr
pWin
;
...
@@ -419,11 +375,17 @@ ProcDbeAllocateBackBufferName(client)
...
@@ -419,11 +375,17 @@ ProcDbeAllocateBackBufferName(client)
REQUEST_SIZE_MATCH
(
xDbeAllocateBackBufferNameReq
);
REQUEST_SIZE_MATCH
(
xDbeAllocateBackBufferNameReq
);
/* The window must be valid. */
/* The window must be valid. */
#ifndef NXAGENT_SERVER
status
=
dixLookupWindow
(
&
pWin
,
stuff
->
window
,
client
,
DixWriteAccess
);
if
(
status
!=
Success
)
return
status
;
#else
if
(
!
(
pWin
=
SecurityLookupWindow
(
stuff
->
window
,
client
,
if
(
!
(
pWin
=
SecurityLookupWindow
(
stuff
->
window
,
client
,
DixWriteAccess
)))
DixWriteAccess
)))
{
{
return
(
BadWindow
);
return
(
BadWindow
);
}
}
#endif
/* The window must be InputOutput. */
/* The window must be InputOutput. */
if
(
pWin
->
drawable
.
class
!=
InputOutput
)
if
(
pWin
->
drawable
.
class
!=
InputOutput
)
...
@@ -636,8 +598,7 @@ ProcDbeAllocateBackBufferName(client)
...
@@ -636,8 +598,7 @@ ProcDbeAllocateBackBufferName(client)
*****************************************************************************/
*****************************************************************************/
static
int
static
int
ProcDbeDeallocateBackBufferName
(
client
)
ProcDbeDeallocateBackBufferName
(
ClientPtr
client
)
ClientPtr
client
;
{
{
REQUEST
(
xDbeDeallocateBackBufferNameReq
);
REQUEST
(
xDbeDeallocateBackBufferNameReq
);
DbeWindowPrivPtr
pDbeWindowPriv
;
DbeWindowPrivPtr
pDbeWindowPriv
;
...
@@ -708,8 +669,7 @@ ProcDbeDeallocateBackBufferName(client)
...
@@ -708,8 +669,7 @@ ProcDbeDeallocateBackBufferName(client)
*****************************************************************************/
*****************************************************************************/
static
int
static
int
ProcDbeSwapBuffers
(
client
)
ProcDbeSwapBuffers
(
ClientPtr
client
)
ClientPtr
client
;
{
{
REQUEST
(
xDbeSwapBuffersReq
);
REQUEST
(
xDbeSwapBuffersReq
);
WindowPtr
pWin
;
WindowPtr
pWin
;
...
@@ -750,12 +710,21 @@ ProcDbeSwapBuffers(client)
...
@@ -750,12 +710,21 @@ ProcDbeSwapBuffers(client)
/* Check all windows to swap. */
/* Check all windows to swap. */
/* Each window must be a valid window - BadWindow. */
/* Each window must be a valid window - BadWindow. */
#ifndef NXAGENT_SERVER
error
=
dixLookupWindow
(
&
pWin
,
dbeSwapInfo
[
i
].
window
,
client
,
DixWriteAccess
);
if
(
error
!=
Success
)
{
free
(
swapInfo
);
return
error
;
}
#else
if
(
!
(
pWin
=
SecurityLookupWindow
(
dbeSwapInfo
[
i
].
window
,
client
,
if
(
!
(
pWin
=
SecurityLookupWindow
(
dbeSwapInfo
[
i
].
window
,
client
,
DixWriteAccess
)))
DixWriteAccess
)))
{
{
free
(
swapInfo
);
free
(
swapInfo
);
return
(
BadWindow
);
return
(
BadWindow
);
}
}
#endif
/* Each window must be double-buffered - BadMatch. */
/* Each window must be double-buffered - BadMatch. */
if
(
DBE_WINDOW_PRIV
(
pWin
)
==
NULL
)
if
(
DBE_WINDOW_PRIV
(
pWin
)
==
NULL
)
...
@@ -839,8 +808,7 @@ ProcDbeSwapBuffers(client)
...
@@ -839,8 +808,7 @@ ProcDbeSwapBuffers(client)
*****************************************************************************/
*****************************************************************************/
static
int
static
int
ProcDbeBeginIdiom
(
client
)
ProcDbeBeginIdiom
(
ClientPtr
client
)
ClientPtr
client
;
{
{
/* REQUEST(xDbeBeginIdiomReq); */
/* REQUEST(xDbeBeginIdiomReq); */
DbeScreenPrivPtr
pDbeScreenPriv
;
DbeScreenPrivPtr
pDbeScreenPriv
;
...
@@ -883,8 +851,7 @@ ProcDbeBeginIdiom(client)
...
@@ -883,8 +851,7 @@ ProcDbeBeginIdiom(client)
*****************************************************************************/
*****************************************************************************/
static
int
static
int
ProcDbeGetVisualInfo
(
client
)
ProcDbeGetVisualInfo
(
ClientPtr
client
)
ClientPtr
client
;
{
{
REQUEST
(
xDbeGetVisualInfoReq
);
REQUEST
(
xDbeGetVisualInfoReq
);
DbeScreenPrivPtr
pDbeScreenPriv
;
DbeScreenPrivPtr
pDbeScreenPriv
;
...
@@ -915,12 +882,21 @@ ProcDbeGetVisualInfo(client)
...
@@ -915,12 +882,21 @@ ProcDbeGetVisualInfo(client)
for
(
i
=
0
;
i
<
stuff
->
n
;
i
++
)
for
(
i
=
0
;
i
<
stuff
->
n
;
i
++
)
{
{
#ifndef NXAGENT_SERVER
register
int
rc
=
dixLookupDrawable
(
pDrawables
+
i
,
drawables
[
i
],
client
,
0
,
DixReadAccess
);
if
(
rc
!=
Success
)
{
free
(
pDrawables
);
return
rc
;
}
#else
if
(
!
(
pDrawables
[
i
]
=
(
DrawablePtr
)
SecurityLookupDrawable
(
if
(
!
(
pDrawables
[
i
]
=
(
DrawablePtr
)
SecurityLookupDrawable
(
drawables
[
i
],
client
,
DixReadAccess
)))
drawables
[
i
],
client
,
DixReadAccess
)))
{
{
free
(
pDrawables
);
free
(
pDrawables
);
return
(
BadDrawable
);
return
(
BadDrawable
);
}
}
#endif
}
}
}
}
...
@@ -1062,8 +1038,7 @@ ProcDbeGetVisualInfo(client)
...
@@ -1062,8 +1038,7 @@ ProcDbeGetVisualInfo(client)
*****************************************************************************/
*****************************************************************************/
static
int
static
int
ProcDbeGetBackBufferAttributes
(
client
)
ProcDbeGetBackBufferAttributes
(
ClientPtr
client
)
ClientPtr
client
;
{
{
REQUEST
(
xDbeGetBackBufferAttributesReq
);
REQUEST
(
xDbeGetBackBufferAttributesReq
);
xDbeGetBackBufferAttributesReply
rep
;
xDbeGetBackBufferAttributesReply
rep
;
...
@@ -1110,8 +1085,7 @@ ProcDbeGetBackBufferAttributes(client)
...
@@ -1110,8 +1085,7 @@ ProcDbeGetBackBufferAttributes(client)
*****************************************************************************/
*****************************************************************************/
static
int
static
int
ProcDbeDispatch
(
client
)
ProcDbeDispatch
(
ClientPtr
client
)
ClientPtr
client
;
{
{
REQUEST
(
xReq
);
REQUEST
(
xReq
);
...
@@ -1166,8 +1140,7 @@ ProcDbeDispatch(client)
...
@@ -1166,8 +1140,7 @@ ProcDbeDispatch(client)
*****************************************************************************/
*****************************************************************************/
static
int
static
int
SProcDbeGetVersion
(
client
)
SProcDbeGetVersion
(
ClientPtr
client
)
ClientPtr
client
;
{
{
REQUEST
(
xDbeGetVersionReq
);
REQUEST
(
xDbeGetVersionReq
);
...
@@ -1201,8 +1174,7 @@ SProcDbeGetVersion(client)
...
@@ -1201,8 +1174,7 @@ SProcDbeGetVersion(client)
*****************************************************************************/
*****************************************************************************/
static
int
static
int
SProcDbeAllocateBackBufferName
(
client
)
SProcDbeAllocateBackBufferName
(
ClientPtr
client
)
ClientPtr
client
;
{
{
REQUEST
(
xDbeAllocateBackBufferNameReq
);
REQUEST
(
xDbeAllocateBackBufferNameReq
);
...
@@ -1236,8 +1208,7 @@ SProcDbeAllocateBackBufferName(client)
...
@@ -1236,8 +1208,7 @@ SProcDbeAllocateBackBufferName(client)
*****************************************************************************/
*****************************************************************************/
static
int
static
int
SProcDbeDeallocateBackBufferName
(
client
)
SProcDbeDeallocateBackBufferName
(
ClientPtr
client
)
ClientPtr
client
;
{
{
REQUEST
(
xDbeDeallocateBackBufferNameReq
);
REQUEST
(
xDbeDeallocateBackBufferNameReq
);
...
@@ -1273,8 +1244,7 @@ SProcDbeDeallocateBackBufferName(client)
...
@@ -1273,8 +1244,7 @@ SProcDbeDeallocateBackBufferName(client)
*****************************************************************************/
*****************************************************************************/
static
int
static
int
SProcDbeSwapBuffers
(
client
)
SProcDbeSwapBuffers
(
ClientPtr
client
)
ClientPtr
client
;
{
{
REQUEST
(
xDbeSwapBuffersReq
);
REQUEST
(
xDbeSwapBuffersReq
);
unsigned
int
i
;
unsigned
int
i
;
...
@@ -1325,8 +1295,7 @@ SProcDbeSwapBuffers(client)
...
@@ -1325,8 +1295,7 @@ SProcDbeSwapBuffers(client)
*****************************************************************************/
*****************************************************************************/
static
int
static
int
SProcDbeBeginIdiom
(
client
)
SProcDbeBeginIdiom
(
ClientPtr
client
)
ClientPtr
client
;
{
{
REQUEST
(
xDbeBeginIdiomReq
);
REQUEST
(
xDbeBeginIdiomReq
);
...
@@ -1354,8 +1323,7 @@ SProcDbeBeginIdiom(client)
...
@@ -1354,8 +1323,7 @@ SProcDbeBeginIdiom(client)
*****************************************************************************/
*****************************************************************************/
static
int
static
int
SProcDbeGetVisualInfo
(
client
)
SProcDbeGetVisualInfo
(
ClientPtr
client
)
ClientPtr
client
;
{
{
REQUEST
(
xDbeGetVisualInfoReq
);
REQUEST
(
xDbeGetVisualInfoReq
);
...
@@ -1387,8 +1355,7 @@ SProcDbeGetVisualInfo(client)
...
@@ -1387,8 +1355,7 @@ SProcDbeGetVisualInfo(client)
*****************************************************************************/
*****************************************************************************/
static
int
static
int
SProcDbeGetBackBufferAttributes
(
client
)
SProcDbeGetBackBufferAttributes
(
ClientPtr
client
)
ClientPtr
client
;
{
{
REQUEST
(
xDbeGetBackBufferAttributesReq
);
REQUEST
(
xDbeGetBackBufferAttributesReq
);
...
@@ -1413,8 +1380,7 @@ SProcDbeGetBackBufferAttributes(client)
...
@@ -1413,8 +1380,7 @@ SProcDbeGetBackBufferAttributes(client)
*****************************************************************************/
*****************************************************************************/
static
int
static
int
SProcDbeDispatch
(
client
)
SProcDbeDispatch
(
ClientPtr
client
)
ClientPtr
client
;
{
{
REQUEST
(
xReq
);
REQUEST
(
xReq
);
...
@@ -1468,9 +1434,7 @@ SProcDbeDispatch(client)
...
@@ -1468,9 +1434,7 @@ SProcDbeDispatch(client)
*****************************************************************************/
*****************************************************************************/
static
Bool
static
Bool
DbeSetupBackgroundPainter
(
pWin
,
pGC
)
DbeSetupBackgroundPainter
(
WindowPtr
pWin
,
GCPtr
pGC
)
WindowPtr
pWin
;
GCPtr
pGC
;
{
{
void
*
gcvalues
[
4
];
void
*
gcvalues
[
4
];
int
ts_x_origin
,
ts_y_origin
;
int
ts_x_origin
,
ts_y_origin
;
...
@@ -1543,9 +1507,7 @@ DbeSetupBackgroundPainter(pWin, pGC)
...
@@ -1543,9 +1507,7 @@ DbeSetupBackgroundPainter(pWin, pGC)
*
*
*****************************************************************************/
*****************************************************************************/
static
int
static
int
DbeDrawableDelete
(
pDrawable
,
id
)
DbeDrawableDelete
(
void
*
pDrawable
,
XID
id
)
void
*
pDrawable
;
XID
id
;
{
{
return
(
Success
);
return
(
Success
);
...
@@ -1564,9 +1526,7 @@ DbeDrawableDelete(pDrawable, id)
...
@@ -1564,9 +1526,7 @@ DbeDrawableDelete(pDrawable, id)
*
*
*****************************************************************************/
*****************************************************************************/
static
int
static
int
DbeWindowPrivDelete
(
pDbeWinPriv
,
id
)
DbeWindowPrivDelete
(
void
*
pDbeWinPriv
,
XID
id
)
void
*
pDbeWinPriv
;
XID
id
;
{
{
DbeScreenPrivPtr
pDbeScreenPriv
;
DbeScreenPrivPtr
pDbeScreenPriv
;
DbeWindowPrivPtr
pDbeWindowPriv
=
(
DbeWindowPrivPtr
)
pDbeWinPriv
;
DbeWindowPrivPtr
pDbeWindowPriv
=
(
DbeWindowPrivPtr
)
pDbeWinPriv
;
...
@@ -1673,8 +1633,7 @@ DbeWindowPrivDelete(pDbeWinPriv, id)
...
@@ -1673,8 +1633,7 @@ DbeWindowPrivDelete(pDbeWinPriv, id)
*
*
*****************************************************************************/
*****************************************************************************/
static
void
static
void
DbeResetProc
(
extEntry
)
DbeResetProc
(
ExtensionEntry
*
extEntry
)
ExtensionEntry
*
extEntry
;
{
{
int
i
;
int
i
;
ScreenPtr
pScreen
;
ScreenPtr
pScreen
;
...
@@ -1729,8 +1688,7 @@ DbeResetProc(extEntry)
...
@@ -1729,8 +1688,7 @@ DbeResetProc(extEntry)
*****************************************************************************/
*****************************************************************************/
static
Bool
static
Bool
DbeDestroyWindow
(
pWin
)
DbeDestroyWindow
(
WindowPtr
pWin
)
WindowPtr
pWin
;
{
{
DbeScreenPrivPtr
pDbeScreenPriv
;
DbeScreenPrivPtr
pDbeScreenPriv
;
DbeWindowPrivPtr
pDbeWindowPriv
;
DbeWindowPrivPtr
pDbeWindowPriv
;
...
@@ -1812,7 +1770,7 @@ DbeDestroyWindow(pWin)
...
@@ -1812,7 +1770,7 @@ DbeDestroyWindow(pWin)
*****************************************************************************/
*****************************************************************************/
void
void
DbeExtensionInit
()
DbeExtensionInit
(
void
)
{
{
ExtensionEntry
*
extEntry
;
ExtensionEntry
*
extEntry
;
register
int
i
,
j
;
register
int
i
,
j
;
...
...
nx-X11/programs/Xserver/dbe/dbestruct.h
View file @
711fd244
...
@@ -36,7 +36,6 @@
...
@@ -36,7 +36,6 @@
/* INCLUDES */
/* INCLUDES */
#define NEED_DBE_PROTOCOL
#include <nx-X11/extensions/Xdbeproto.h>
#include <nx-X11/extensions/Xdbeproto.h>
#include "windowstr.h"
#include "windowstr.h"
...
@@ -220,11 +219,6 @@ typedef struct _DbeScreenPrivRec
...
@@ -220,11 +219,6 @@ typedef struct _DbeScreenPrivRec
void
(
*
ResetProc
)(
void
(
*
ResetProc
)(
ScreenPtr
/*pScreen*/
ScreenPtr
/*pScreen*/
);
);
void
(
*
ValidateBuffer
)(
WindowPtr
/*pWin*/
,
XID
/*bufId*/
,
Bool
/*dstbuffer*/
);
/* Device-specific private information.
/* Device-specific private information.
*/
*/
...
...
nx-X11/programs/Xserver/dbe/midbe.c
View file @
711fd244
...
@@ -53,24 +53,16 @@
...
@@ -53,24 +53,16 @@
#include "regionstr.h"
#include "regionstr.h"
#include "gcstruct.h"
#include "gcstruct.h"
#include "inputstr.h"
#include "inputstr.h"
#include "midbe.h"
#include <stdio.h>
#include <stdio.h>
/* DEFINES */
/* TYPEDEFS */
/* GLOBALS */
static
int
miDbePrivPrivGeneration
=
0
;
static
int
miDbePrivPrivGeneration
=
0
;
static
int
miDbeWindowPrivPrivIndex
=
-
1
;
static
int
miDbeWindowPrivPrivIndex
=
-
1
;
RESTYPE
dbeDrawableResType
;
static
RESTYPE
dbeDrawableResType
;
RESTYPE
dbeWindowPrivResType
;
static
RESTYPE
dbeWindowPrivResType
;
int
dbeScreenPrivIndex
=
-
1
;
static
int
dbeScreenPrivIndex
=
-
1
;
int
dbeWindowPrivIndex
=
-
1
;
static
int
dbeWindowPrivIndex
=
-
1
;
/******************************************************************************
/******************************************************************************
...
@@ -90,9 +82,7 @@ int dbeWindowPrivIndex = -1;
...
@@ -90,9 +82,7 @@ int dbeWindowPrivIndex = -1;
*****************************************************************************/
*****************************************************************************/
static
Bool
static
Bool
miDbeGetVisualInfo
(
pScreen
,
pScrVisInfo
)
miDbeGetVisualInfo
(
ScreenPtr
pScreen
,
XdbeScreenVisualInfo
*
pScrVisInfo
)
ScreenPtr
pScreen
;
XdbeScreenVisualInfo
*
pScrVisInfo
;
{
{
register
int
i
,
j
,
k
;
register
int
i
,
j
,
k
;
register
int
count
;
register
int
count
;
...
@@ -154,10 +144,7 @@ miDbeGetVisualInfo(pScreen, pScrVisInfo)
...
@@ -154,10 +144,7 @@ miDbeGetVisualInfo(pScreen, pScrVisInfo)
*****************************************************************************/
*****************************************************************************/
static
int
static
int
miDbeAllocBackBufferName
(
pWin
,
bufId
,
swapAction
)
miDbeAllocBackBufferName
(
WindowPtr
pWin
,
XID
bufId
,
int
swapAction
)
WindowPtr
pWin
;
XID
bufId
;
int
swapAction
;
{
{
ScreenPtr
pScreen
;
ScreenPtr
pScreen
;
DbeWindowPrivPtr
pDbeWindowPriv
;
DbeWindowPrivPtr
pDbeWindowPriv
;
...
@@ -268,8 +255,7 @@ miDbeAllocBackBufferName(pWin, bufId, swapAction)
...
@@ -268,8 +255,7 @@ miDbeAllocBackBufferName(pWin, bufId, swapAction)
*****************************************************************************/
*****************************************************************************/
static
void
static
void
miDbeAliasBuffers
(
pDbeWindowPriv
)
miDbeAliasBuffers
(
DbeWindowPrivPtr
pDbeWindowPriv
)
DbeWindowPrivPtr
pDbeWindowPriv
;
{
{
int
i
;
int
i
;
MiDbeWindowPrivPrivPtr
pDbeWindowPrivPriv
=
MiDbeWindowPrivPrivPtr
pDbeWindowPrivPriv
=
...
@@ -295,10 +281,7 @@ miDbeAliasBuffers(pDbeWindowPriv)
...
@@ -295,10 +281,7 @@ miDbeAliasBuffers(pDbeWindowPriv)
*****************************************************************************/
*****************************************************************************/
static
int
static
int
miDbeSwapBuffers
(
client
,
pNumWindows
,
swapInfo
)
miDbeSwapBuffers
(
ClientPtr
client
,
int
*
pNumWindows
,
DbeSwapInfoPtr
swapInfo
)
ClientPtr
client
;
int
*
pNumWindows
;
DbeSwapInfoPtr
swapInfo
;
{
{
DbeScreenPrivPtr
pDbeScreenPriv
;
DbeScreenPrivPtr
pDbeScreenPriv
;
GCPtr
pGC
;
GCPtr
pGC
;
...
@@ -477,9 +460,7 @@ miDbeSwapBuffers(client, pNumWindows, swapInfo)
...
@@ -477,9 +460,7 @@ miDbeSwapBuffers(client, pNumWindows, swapInfo)
*****************************************************************************/
*****************************************************************************/
static
void
static
void
miDbeWinPrivDelete
(
pDbeWindowPriv
,
bufId
)
miDbeWinPrivDelete
(
DbeWindowPrivPtr
pDbeWindowPriv
,
XID
bufId
)
DbeWindowPrivPtr
pDbeWindowPriv
;
XID
bufId
;
{
{
MiDbeWindowPrivPrivPtr
pDbeWindowPrivPriv
;
MiDbeWindowPrivPrivPtr
pDbeWindowPrivPriv
;
...
@@ -526,10 +507,7 @@ miDbeWinPrivDelete(pDbeWindowPriv, bufId)
...
@@ -526,10 +507,7 @@ miDbeWinPrivDelete(pDbeWindowPriv, bufId)
*****************************************************************************/
*****************************************************************************/
static
Bool
static
Bool
miDbePositionWindow
(
pWin
,
x
,
y
)
miDbePositionWindow
(
WindowPtr
pWin
,
int
x
,
int
y
)
WindowPtr
pWin
;
int
x
;
int
y
;
{
{
ScreenPtr
pScreen
;
ScreenPtr
pScreen
;
DbeScreenPrivPtr
pDbeScreenPriv
;
DbeScreenPrivPtr
pDbeScreenPriv
;
...
@@ -767,8 +745,7 @@ miDbePositionWindow(pWin, x, y)
...
@@ -767,8 +745,7 @@ miDbePositionWindow(pWin, x, y)
*****************************************************************************/
*****************************************************************************/
static
void
static
void
miDbeResetProc
(
pScreen
)
miDbeResetProc
(
ScreenPtr
pScreen
)
ScreenPtr
pScreen
;
{
{
DbeScreenPrivPtr
pDbeScreenPriv
;
DbeScreenPrivPtr
pDbeScreenPriv
;
...
@@ -792,9 +769,7 @@ miDbeResetProc(pScreen)
...
@@ -792,9 +769,7 @@ miDbeResetProc(pScreen)
*****************************************************************************/
*****************************************************************************/
Bool
Bool
miDbeInit
(
pScreen
,
pDbeScreenPriv
)
miDbeInit
(
ScreenPtr
pScreen
,
DbeScreenPrivPtr
pDbeScreenPriv
)
ScreenPtr
pScreen
;
DbeScreenPrivPtr
pDbeScreenPriv
;
{
{
/* Copy resource types created by DIX */
/* Copy resource types created by DIX */
dbeDrawableResType
=
pDbeScreenPriv
->
dbeDrawableResType
;
dbeDrawableResType
=
pDbeScreenPriv
->
dbeDrawableResType
;
...
@@ -839,9 +814,6 @@ miDbeInit(pScreen, pDbeScreenPriv)
...
@@ -839,9 +814,6 @@ miDbeInit(pScreen, pDbeScreenPriv)
pDbeScreenPriv
->
ResetProc
=
miDbeResetProc
;
pDbeScreenPriv
->
ResetProc
=
miDbeResetProc
;
pDbeScreenPriv
->
WinPrivDelete
=
miDbeWinPrivDelete
;
pDbeScreenPriv
->
WinPrivDelete
=
miDbeWinPrivDelete
;
/* The mi implementation doesn't need buffer validation. */
pDbeScreenPriv
->
ValidateBuffer
=
(
void
(
*
)())
NoopDDA
;
return
(
TRUE
);
return
(
TRUE
);
}
/* miDbeInit() */
}
/* miDbeInit() */
nx-X11/programs/Xserver/dbe/midbe.h
View file @
711fd244
/******************************************************************************
/******************************************************************************
*
* Copyright (c) 1994, 1995 Hewlett-Packard Company
* Copyright (c) 1994, 1995 Hewlett-Packard Company
*
*
* Permission is hereby granted, free of charge, to any person obtaining
* Permission is hereby granted, free of charge, to any person obtaining
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment