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

to stl list

Browse source
This commit is contained in:
fluxgen 2002-02-11 10:58:48 +00:00
parent e65ae97a3c
commit 60fef19adb
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/BaseDisplay.hh
View file

@ -22,18 +22,20 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: BaseDisplay.hh,v 1.10 2002/02/07 14:44:09 fluxgen Exp $ // $Id: BaseDisplay.hh,v 1.11 2002/02/11 10:58:48 fluxgen Exp $
#ifndef _BASEDISPLAY_HH_ #ifndef _BASEDISPLAY_HH_
#define _BASEDISPLAY_HH_ #define _BASEDISPLAY_HH_
#include "LinkedList.hh"
#include "Timer.hh" #include "Timer.hh"
#include "NotCopyable.hh" #include "NotCopyable.hh"
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <list>
#include <vector>
// forward declaration // forward declaration
class ScreenInfo; class ScreenInfo;
@ -229,7 +231,7 @@ public:
#endif // NEWWMSPEC #endif // NEWWMSPEC
inline ScreenInfo *getScreenInfo(int s) inline ScreenInfo *getScreenInfo(int s)
{ return (ScreenInfo *) screenInfoList->find(s); } { return (ScreenInfo *) screenInfoList[s]; }
inline const Bool &hasShapeExtensions(void) const inline const Bool &hasShapeExtensions(void) const
{ return shape.extensions; } { return shape.extensions; }
@ -351,8 +353,12 @@ private:
bool m_startup, m_shutdown; bool m_startup, m_shutdown;
Display *m_display; Display *m_display;
LinkedList<ScreenInfo> *screenInfoList;
LinkedList<BTimer> *timerList; typedef std::vector<ScreenInfo *> ScreenInfoList;
ScreenInfoList screenInfoList;
typedef std::list<BTimer *> TimerList;
TimerList timerList;
char *m_display_name, *m_app_name; char *m_display_name, *m_app_name;
int number_of_screens, m_server_grabs, colors_per_channel; int number_of_screens, m_server_grabs, colors_per_channel;