diff --git a/selbox.c b/selbox.c index 63ff89e..c40f913 100644 --- a/selbox.c +++ b/selbox.c @@ -66,17 +66,17 @@ static void selPaintLine(rfbSelectData* m,int line,Bool invert) invert?m->backColour:m->colour); } -static void selSelect(rfbSelectData* m,int index) +static void selSelect(rfbSelectData* m,int _index) { int delta; - if(index==m->selected || index<0 || index>=m->listSize) + if(_index==m->selected || _index<0 || _index>=m->listSize) return; if(m->selected>=0) selPaintLine(m,m->selected-m->displayStart,FALSE); - if(indexdisplayStart || index>=m->displayStart+m->pageH) { + if(_indexdisplayStart || _index>=m->displayStart+m->pageH) { /* targetLine is the screen line in which the selected line will be displayed. targetLine = m->pageH/2 doesn't look so nice */ @@ -84,11 +84,11 @@ static void selSelect(rfbSelectData* m,int index) int lineStart,lineEnd; /* scroll */ - if(indexpageH-targetLine>=m->listSize) - targetLine = index+m->pageH-m->listSize; - delta = index-(m->displayStart+targetLine); + if(_indexpageH-targetLine>=m->listSize) + targetLine = _index+m->pageH-m->listSize; + delta = _index-(m->displayStart+targetLine); if(delta>-m->pageH && deltapageH) { if(delta>0) { @@ -109,15 +109,15 @@ static void selSelect(rfbSelectData* m,int index) } m->displayStart += delta; for(delta=lineStart;deltaselected = index; + m->selected = _index; selPaintLine(m,m->selected-m->displayStart,TRUE); if(m->selChangedHook) - m->selChangedHook(index); + m->selChangedHook(_index); /* todo: scrollbars */ }