← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to intern/ghost/intern/GHOST_WindowManager.cpp

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
intern/ghost/intern/GHOST_WindowManager.cpp
31
31
 
32
32
 
33
33
/**
34
 
 
35
34
 * Copyright (C) 2001 NaN Technologies B.V.
36
 
 * @author      Maarten Gribnau
37
 
 * @date        May 11, 2001
 
35
 * \author      Maarten Gribnau
 
36
 * \date        May 11, 2001
38
37
 */
39
38
 
40
39
#include "GHOST_WindowManager.h"
57
56
}
58
57
 
59
58
 
60
 
GHOST_TSuccess GHOST_WindowManager::addWindow(GHOST_IWindow* window)
 
59
GHOST_TSuccess GHOST_WindowManager::addWindow(GHOST_IWindow *window)
61
60
{
62
61
        GHOST_TSuccess success = GHOST_kFailure;
63
62
        if (window) {
71
70
}
72
71
 
73
72
 
74
 
GHOST_TSuccess GHOST_WindowManager::removeWindow(const GHOST_IWindow* window)
 
73
GHOST_TSuccess GHOST_WindowManager::removeWindow(const GHOST_IWindow *window)
75
74
{
76
75
        GHOST_TSuccess success = GHOST_kFailure;
77
76
        if (window) {
79
78
                        endFullScreen();
80
79
                }
81
80
                else {
82
 
                        std::vector<GHOST_IWindow*>::iterator result = find(m_windows.begin(), m_windows.end(), window);
 
81
                        std::vector<GHOST_IWindow *>::iterator result = find(m_windows.begin(), m_windows.end(), window);
83
82
                        if (result != m_windows.end()) {
84
83
                                setWindowInactive(window);
85
84
                                m_windows.erase(result);
91
90
}
92
91
 
93
92
 
94
 
bool GHOST_WindowManager::getWindowFound(const GHOST_IWindow* window) const
 
93
bool GHOST_WindowManager::getWindowFound(const GHOST_IWindow *window) const
95
94
{
96
95
        bool found = false;
97
96
        if (window) {
98
 
        if (getFullScreen() && (window == m_fullScreenWindow)) {
99
 
            found = true;
100
 
        }
101
 
        else {
102
 
            std::vector<GHOST_IWindow*>::const_iterator result = find(m_windows.begin(), m_windows.end(), window);
103
 
            if (result != m_windows.end()) {
104
 
                found = true;
105
 
            }
106
 
        }
 
97
                if (getFullScreen() && (window == m_fullScreenWindow)) {
 
98
                        found = true;
 
99
                }
 
100
                else {
 
101
                        std::vector<GHOST_IWindow *>::const_iterator result = find(m_windows.begin(), m_windows.end(), window);
 
102
                        if (result != m_windows.end()) {
 
103
                                found = true;
 
104
                        }
 
105
                }
107
106
        }
108
107
        return found;
109
108
}
115
114
}
116
115
 
117
116
 
118
 
GHOST_IWindow* GHOST_WindowManager::getFullScreenWindow(void) const
 
117
GHOST_IWindow *GHOST_WindowManager::getFullScreenWindow(void) const
119
118
{
120
 
    return m_fullScreenWindow;
 
119
        return m_fullScreenWindow;
121
120
}
122
121
 
123
122
 
124
 
GHOST_TSuccess GHOST_WindowManager::beginFullScreen(GHOST_IWindow* window,
 
123
GHOST_TSuccess GHOST_WindowManager::beginFullScreen(GHOST_IWindow *window,
125
124
                bool stereoVisual)
126
125
{
127
126
        GHOST_TSuccess success = GHOST_kFailure;
151
150
                                setActiveWindow(m_activeWindowBeforeFullScreen);
152
151
                        }
153
152
                }
154
 
        success = GHOST_kSuccess;
 
153
                success = GHOST_kSuccess;
155
154
        }
156
155
        return success;
157
156
}
158
157
 
159
158
 
160
 
GHOST_TSuccess GHOST_WindowManager::setActiveWindow(GHOST_IWindow* window)
 
159
GHOST_TSuccess GHOST_WindowManager::setActiveWindow(GHOST_IWindow *window)
161
160
{
162
161
        GHOST_TSuccess success = GHOST_kSuccess;
163
162
        if (window != m_activeWindow) {
172
171
}
173
172
        
174
173
 
175
 
GHOST_IWindow* GHOST_WindowManager::getActiveWindow(void) const
 
174
GHOST_IWindow *GHOST_WindowManager::getActiveWindow(void) const
176
175
{
177
176
        return m_activeWindow;
178
177
}
179
178
 
180
179
 
181
 
void GHOST_WindowManager::setWindowInactive(const GHOST_IWindow* window)
 
180
void GHOST_WindowManager::setWindowInactive(const GHOST_IWindow *window)
182
181
{
183
182
        if (window == m_activeWindow) {
184
183
                m_activeWindow = 0;
192
191
}
193
192
 
194
193
 
195
 
GHOST_IWindow* GHOST_WindowManager::getWindowAssociatedWithOSWindow(void* osWindow)
 
194
GHOST_IWindow *GHOST_WindowManager::getWindowAssociatedWithOSWindow(void *osWindow)
196
195
{
197
 
        std::vector<GHOST_IWindow*>::iterator iter;
 
196
        std::vector<GHOST_IWindow *>::iterator iter;
198
197
 
199
 
        for (iter = m_windows.begin(); iter != m_windows.end(); iter++) {
 
198
        for (iter = m_windows.begin(); iter != m_windows.end(); ++iter) {
200
199
                if ((*iter)->getOSWindow() == osWindow)
201
200
                        return *iter;
202
201
        }
207
206
bool GHOST_WindowManager::getAnyModifiedState()
208
207
{
209
208
        bool isAnyModified = false;
210
 
        std::vector<GHOST_IWindow*>::iterator iter;
 
209
        std::vector<GHOST_IWindow *>::iterator iter;
211
210
        
212
 
        for (iter = m_windows.begin(); iter != m_windows.end(); iter++) {
 
211
        for (iter = m_windows.begin(); iter != m_windows.end(); ++iter) {
213
212
                if ((*iter)->getModifiedState())
214
213
                        isAnyModified = true;
215
214
        }