Changeset View
Changeset View
Standalone View
Standalone View
src/platforms/xcb/kwindowsystem.cpp
Show First 20 Lines • Show All 227 Lines • ▼ Show 20 Line(s) | 226 | case XCB_CONFIGURE_NOTIFY: | |||
---|---|---|---|---|---|
228 | break; | 228 | break; | ||
229 | } | 229 | } | ||
230 | 230 | | |||
231 | if (eventWindow == m_appRootWindow) { | 231 | if (eventWindow == m_appRootWindow) { | ||
232 | int old_current_desktop = currentDesktop(); | 232 | int old_current_desktop = currentDesktop(); | ||
233 | xcb_window_t old_active_window = activeWindow(); | 233 | xcb_window_t old_active_window = activeWindow(); | ||
234 | int old_number_of_desktops = numberOfDesktops(); | 234 | int old_number_of_desktops = numberOfDesktops(); | ||
235 | bool old_showing_desktop = showingDesktop(); | 235 | bool old_showing_desktop = showingDesktop(); | ||
236 | unsigned long m[ 5 ]; | 236 | NET::Properties props; | ||
237 | NETRootInfo::event(ev, m, 5); | 237 | NET::Properties2 props2; | ||
238 | NETRootInfo::event(ev, &props, &props2); | ||||
238 | 239 | | |||
239 | if ((m[ PROTOCOLS ] & CurrentDesktop) && currentDesktop() != old_current_desktop) { | 240 | if ((props & CurrentDesktop) && currentDesktop() != old_current_desktop) { | ||
240 | emit s_q->currentDesktopChanged(currentDesktop()); | 241 | emit s_q->currentDesktopChanged(currentDesktop()); | ||
241 | } | 242 | } | ||
242 | if ((m[ PROTOCOLS ] & DesktopViewport) && mapViewport() && currentDesktop() != old_current_desktop) { | 243 | if ((props & DesktopViewport) && mapViewport() && currentDesktop() != old_current_desktop) { | ||
243 | emit s_q->currentDesktopChanged(currentDesktop()); | 244 | emit s_q->currentDesktopChanged(currentDesktop()); | ||
244 | } | 245 | } | ||
245 | if ((m[ PROTOCOLS ] & ActiveWindow) && activeWindow() != old_active_window) { | 246 | if ((props & ActiveWindow) && activeWindow() != old_active_window) { | ||
246 | emit s_q->activeWindowChanged(activeWindow()); | 247 | emit s_q->activeWindowChanged(activeWindow()); | ||
247 | } | 248 | } | ||
248 | if (m[ PROTOCOLS ] & DesktopNames) { | 249 | if (props & DesktopNames) { | ||
249 | emit s_q->desktopNamesChanged(); | 250 | emit s_q->desktopNamesChanged(); | ||
250 | } | 251 | } | ||
251 | if ((m[ PROTOCOLS ] & NumberOfDesktops) && numberOfDesktops() != old_number_of_desktops) { | 252 | if ((props & NumberOfDesktops) && numberOfDesktops() != old_number_of_desktops) { | ||
252 | emit s_q->numberOfDesktopsChanged(numberOfDesktops()); | 253 | emit s_q->numberOfDesktopsChanged(numberOfDesktops()); | ||
253 | } | 254 | } | ||
254 | if ((m[ PROTOCOLS ] & DesktopGeometry) && mapViewport() && numberOfDesktops() != old_number_of_desktops) { | 255 | if ((props & DesktopGeometry) && mapViewport() && numberOfDesktops() != old_number_of_desktops) { | ||
255 | emit s_q->numberOfDesktopsChanged(numberOfDesktops()); | 256 | emit s_q->numberOfDesktopsChanged(numberOfDesktops()); | ||
256 | } | 257 | } | ||
257 | if (m[ PROTOCOLS ] & WorkArea) { | 258 | if (props & WorkArea) { | ||
258 | emit s_q->workAreaChanged(); | 259 | emit s_q->workAreaChanged(); | ||
259 | } | 260 | } | ||
260 | if (m[ PROTOCOLS ] & ClientListStacking) { | 261 | if (props & ClientListStacking) { | ||
261 | updateStackingOrder(); | 262 | updateStackingOrder(); | ||
262 | emit s_q->stackingOrderChanged(); | 263 | emit s_q->stackingOrderChanged(); | ||
263 | } | 264 | } | ||
264 | if ((m[ PROTOCOLS2 ] & WM2ShowingDesktop) && showingDesktop() != old_showing_desktop) { | 265 | if ((props2 & WM2ShowingDesktop) && showingDesktop() != old_showing_desktop) { | ||
265 | emit s_q->showingDesktopChanged(showingDesktop()); | 266 | emit s_q->showingDesktopChanged(showingDesktop()); | ||
266 | } | 267 | } | ||
267 | } else if (windows.contains(eventWindow)) { | 268 | } else if (windows.contains(eventWindow)) { | ||
268 | NETWinInfo ni(QX11Info::connection(), eventWindow, m_appRootWindow, NET::Properties(), NET::Properties2()); | 269 | NETWinInfo ni(QX11Info::connection(), eventWindow, m_appRootWindow, NET::Properties(), NET::Properties2()); | ||
269 | NET::Properties dirtyProperties; | 270 | NET::Properties dirtyProperties; | ||
270 | NET::Properties2 dirtyProperties2; | 271 | NET::Properties2 dirtyProperties2; | ||
271 | ni.event(ev, &dirtyProperties, &dirtyProperties2); | 272 | ni.event(ev, &dirtyProperties, &dirtyProperties2); | ||
272 | if (eventType == XCB_PROPERTY_NOTIFY) { | 273 | if (eventType == XCB_PROPERTY_NOTIFY) { | ||
▲ Show 20 Lines • Show All 944 Lines • Show Last 20 Lines |