Less confusing, and compatible with libXrandr.tags/v1.8.90
@@ -290,11 +290,11 @@ int vncRandRDisableOutput(int scrIdx, int outputIdx) | |||
#endif | |||
} | |||
intptr_t vncRandRGetOutputId(int scrIdx, int outputIdx) | |||
unsigned int vncRandRGetOutputId(int scrIdx, int outputIdx) | |||
{ | |||
#ifdef RANDR | |||
rrScrPrivPtr rp = rrGetScrPriv(screenInfo.screens[scrIdx]); | |||
return (intptr_t)rp->outputs[outputIdx]; | |||
return rp->outputs[outputIdx]->id; | |||
#else | |||
return 0; | |||
#endif |
@@ -65,7 +65,7 @@ int vncRandRDisableOutput(int scrIdx, int outputIdx); | |||
int vncRandRReconfigureOutput(int scrIdx, int outputIdx, int x, int y, | |||
int width, int height); | |||
intptr_t vncRandRGetOutputId(int scrIdx, int outputIdx); | |||
unsigned int vncRandRGetOutputId(int scrIdx, int outputIdx); | |||
void vncRandRGetOutputDimensions(int scrIdx, int outputIdx, | |||
int *x, int *y, int *width, int *height); | |||
@@ -201,7 +201,7 @@ ScreenSet XserverDesktop::computeScreenLayout() | |||
OutputIdMap newIdMap; | |||
for (int i = 0;i < vncRandRGetOutputCount(screenIndex);i++) { | |||
intptr_t outputId; | |||
unsigned int outputId; | |||
int x, y, width, height; | |||
/* Disabled? */ | |||
@@ -654,7 +654,7 @@ unsigned int XserverDesktop::setScreenLayout(int fb_width, int fb_height, | |||
/* Next, reconfigure all known outputs, and turn off the other ones */ | |||
for (int i = 0;i < vncRandRGetOutputCount(screenIndex);i++) { | |||
intptr_t output; | |||
unsigned int output; | |||
ScreenSet::const_iterator iter; | |||
@@ -702,7 +702,7 @@ unsigned int XserverDesktop::setScreenLayout(int fb_width, int fb_height, | |||
ScreenSet::const_iterator iter; | |||
for (iter = layout.begin();iter != layout.end();++iter) { | |||
OutputIdMap::const_iterator oi; | |||
intptr_t output; | |||
unsigned int output; | |||
int i; | |||
/* Does this screen have an output already? */ |
@@ -133,7 +133,7 @@ private: | |||
rfb::Timer queryConnectTimer; | |||
#ifdef RANDR | |||
typedef std::map<intptr_t, rdr::U32> OutputIdMap; | |||
typedef std::map<unsigned int, rdr::U32> OutputIdMap; | |||
OutputIdMap outputIdMap; | |||
#endif | |||