nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cosmetic

Browse source
This commit is contained in:
Mathias Gumz 2010-05-01 14:29:41 +02:00
parent b3361eae02
commit 35f17d22b5
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Screen.cc
View file

@ -1961,6 +1961,7 @@ void BScreen::initXinerama() {
if (m_xinerama_headinfo) if (m_xinerama_headinfo)
delete [] m_xinerama_headinfo; delete [] m_xinerama_headinfo;
m_xinerama_headinfo = new XineramaHeadInfo[number]; m_xinerama_headinfo = new XineramaHeadInfo[number];
m_xinerama_num_heads = number; m_xinerama_num_heads = number;
for (int i=0; i < number; i++) { for (int i=0; i < number; i++) {
@ -1974,7 +1975,8 @@ void BScreen::initXinerama() {
fbdbg<<"BScreen::initXinerama(): number of heads ="<<number<<endl; fbdbg<<"BScreen::initXinerama(): number of heads ="<<number<<endl;
/* Reallocate to the new number of heads. */ /* Reallocate to the new number of heads. */
int ha_num = numHeads() ? numHeads() : 1, ha_oldnum = m_head_areas.size(); int ha_num = numHeads() ? numHeads() : 1;
int ha_oldnum = m_head_areas.size();
if (ha_num > ha_oldnum) { if (ha_num > ha_oldnum) {
m_head_areas.resize(ha_num); m_head_areas.resize(ha_num);
for (int i = ha_oldnum; i < ha_num; i++) for (int i = ha_oldnum; i < ha_num; i++)
@ -2012,18 +2014,18 @@ void BScreen::clearHeads() {
} }
int BScreen::getHead(int x, int y) const { int BScreen::getHead(int x, int y) const {
if (!hasXinerama()) return 0;
#ifdef XINERAMA
for (int i=0; i < m_xinerama_num_heads; i++) { #ifdef XINERAMA
if (x >= m_xinerama_headinfo[i].x && if (hasXinerama()) {
x < (m_xinerama_headinfo[i].x + m_xinerama_headinfo[i].width) && for (int i=0; i < m_xinerama_num_heads; i++) {
y >= m_xinerama_headinfo[i].y && if (x >= m_xinerama_headinfo[i].x &&
y < (m_xinerama_headinfo[i].y + m_xinerama_headinfo[i].height)) { x < (m_xinerama_headinfo[i].x + m_xinerama_headinfo[i].width) &&
return i+1; y >= m_xinerama_headinfo[i].y &&
y < (m_xinerama_headinfo[i].y + m_xinerama_headinfo[i].height)) {
return i+1;
}
} }
} }
#endif // XINERAMA #endif // XINERAMA
return 0; return 0;
} }
@ -2119,7 +2121,7 @@ pair<int,int> BScreen::clampToHead(int head, int x, int y, int w, int h) const {
// if there are multiple heads, head=0 is not valid // if there are multiple heads, head=0 is not valid
// a better way would be to search the closest head // a better way would be to search the closest head
if (head == 0 && numHeads() != 0) if (head == 0 && numHeads() != 0)
head = 1; head = 1;
int hx = getHeadX(head); int hx = getHeadX(head);
int hy = getHeadY(head); int hy = getHeadY(head);