← Back to branch summary

~ubuntu-branches/ubuntu/vivid/virtualbox-ose/vivid

« back to all changes in this revision

Viewing changes to src/VBox/Additions/x11/x11include/xorg-server-1.5.3/xaawrap.h

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-09-14 18:25:07 UTC
  • mfrom: (0.4.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090914182507-c98g07mq16hjmn6d
Tags: 3.0.6-dfsg-1ubuntu1
https://launchpad.net/bugs/429697
https://launchpad.net/bugs/267097
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/379878
* Merge from debian unstable (LP: #429697), remaining changes:
  - Enable DKMS support on virtualbox host and guest modules (LP: #267097)
    - Drop virtualbox-ose{-guest,}-modules-* package templates
    - Recommend *-source instead of *-modules packages
    - Replace error messages related to missing/mismatched
      kernel module accordingly
  - Autoload kernel module
    - LOAD_VBOXDRV_MODULE=1 in virtualbox-ose.default
  - Disable update action
    - patches/u01-disable-update-action.dpatch
  - Virtualbox should go in Accessories, not in System tools (LP: #288590)
    - virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add apport hook
    - virtualbox-ose.files/source_virtualbox-ose.py
    - virtualbox-ose.install
  - Add launchpad integration
    - control
    - lpi-bug.xpm
    - patches/u02-lp-integration.dpatch
  - virtualbox, virtualbox-* (names of the upstream proprietary packages)
    conflict with virtualbox-ose (LP: #379878)
* Make debug package depend on normal or guest utils package
* Drop patches/22-pulseaudio-stubs.dpatch (applied upstream)
* Rename Ubuntu specific patches to uXX-*.dpatch
* Fix lintian warnings in maintainer scripts

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Additions/x11/x11include/xorg-server-1.5.3/xaawrap.h
1
 
 
2
 
#define XAA_SCREEN_PROLOGUE(pScreen, field)\
3
 
  ((pScreen)->field = \
4
 
   ((XAAScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAGetScreenKey()))->field)
5
 
 
6
 
#define XAA_SCREEN_EPILOGUE(pScreen, field, wrapper)\
7
 
    ((pScreen)->field = wrapper)
8
 
 
9
 
 
10
 
#define XAA_GC_FUNC_PROLOGUE(pGC)\
11
 
    XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&(pGC)->devPrivates, XAAGetGCKey()); \
12
 
    (pGC)->funcs = pGCPriv->wrapFuncs;\
13
 
    if(pGCPriv->flags)\
14
 
        (pGC)->ops = pGCPriv->wrapOps
15
 
 
16
 
#define XAA_GC_FUNC_EPILOGUE(pGC)\
17
 
    pGCPriv->wrapFuncs = (pGC)->funcs;\
18
 
    (pGC)->funcs = &XAAGCFuncs;\
19
 
    if(pGCPriv->flags) {\
20
 
        pGCPriv->wrapOps = (pGC)->ops;\
21
 
        (pGC)->ops = (pGCPriv->flags & OPS_ARE_ACCEL) ? pGCPriv->XAAOps :\
22
 
                                &XAAPixmapOps;\
23
 
    }
24
 
 
25
 
 
26
 
#define XAA_GC_OP_PROLOGUE(pGC)\
27
 
    XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&(pGC)->devPrivates, XAAGetGCKey()); \
28
 
    GCFuncs *oldFuncs = pGC->funcs;\
29
 
    pGC->funcs = pGCPriv->wrapFuncs;\
30
 
    pGC->ops = pGCPriv->wrapOps
31
 
 
32
 
#define XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC)\
33
 
    XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&(pGC)->devPrivates, XAAGetGCKey()); \
34
 
    GCFuncs *oldFuncs = pGC->funcs;\
35
 
    if(!REGION_NUM_RECTS(pGC->pCompositeClip)) return; \
36
 
    pGC->funcs = pGCPriv->wrapFuncs;\
37
 
    pGC->ops = pGCPriv->wrapOps
38
 
 
39
 
    
40
 
#define XAA_GC_OP_EPILOGUE(pGC)\
41
 
    pGCPriv->wrapOps = pGC->ops;\
42
 
    pGC->funcs = oldFuncs;\
43
 
    pGC->ops   = pGCPriv->XAAOps
44
 
 
45
 
 
46
 
#define XAA_PIXMAP_OP_PROLOGUE(pGC, pDraw)\
47
 
    XAAGCPtr pGCPriv = (XAAGCPtr)dixLookupPrivate(&(pGC)->devPrivates, XAAGetGCKey()); \
48
 
    XAAPixmapPtr pixPriv = XAA_GET_PIXMAP_PRIVATE((PixmapPtr)(pDraw));\
49
 
    GCFuncs *oldFuncs = pGC->funcs;\
50
 
    pGC->funcs = pGCPriv->wrapFuncs;\
51
 
    pGC->ops = pGCPriv->wrapOps
52
 
 
53
 
    
54
 
#define XAA_PIXMAP_OP_EPILOGUE(pGC)\
55
 
    pGCPriv->wrapOps = pGC->ops;\
56
 
    pGC->funcs = oldFuncs;\
57
 
    pGC->ops   = &XAAPixmapOps;\
58
 
    pixPriv->flags |= DIRTY
59
 
 
60
 
#ifdef HAVE_XORG_CONFIG_H
61
 
#include <xorg-config.h>
62
 
#endif
63
 
 
64
 
#ifdef RENDER
65
 
#define XAA_RENDER_PROLOGUE(pScreen,field)\
66
 
    (GetPictureScreen(pScreen)->field = \
67
 
     ((XAAScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XAAGetScreenKey()))->field)
68
 
 
69
 
#define XAA_RENDER_EPILOGUE(pScreen, field, wrapper)\
70
 
    (GetPictureScreen(pScreen)->field = wrapper)
71
 
#endif
72
 
 
73
 
/* This also works fine for drawables */
74
 
 
75
 
#define SYNC_CHECK(pGC) {\
76
 
     XAAInfoRecPtr infoRec =\
77
 
((XAAScreenPtr)dixLookupPrivate(&(pGC)->pScreen->devPrivates, XAAGetScreenKey()))->AccelInfoRec;        \
78
 
    if(infoRec->NeedToSync) {\
79
 
        (*infoRec->Sync)(infoRec->pScrn);\
80
 
        infoRec->NeedToSync = FALSE;\
81
 
    }}