← Back to branch summary

~unity-team/unity/7.1

« back to all changes in this revision

Viewing changes to plugins/unityshell/src/unityshell.h

  • Committer: Daniel van Vugt
  • Date: 2012-09-13 10:56:42 UTC
  • mfrom: (2684 unity)
  • mto: This revision was merged to the branch mainline in revision 2698.
  • Revision ID: daniel.van.vugt@canonical.com-20120913105642-9on2ald55h54j1zn
Merge latest lp:unity and fix conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/unityshell/src/unityshell.h
55
55
#include "UnityshellPrivate.h"
56
56
#include "UnityShowdesktopHandler.h"
57
57
#include "ThumbnailGenerator.h"
58
 
#ifndef USE_MODERN_COMPIZ_GL
59
 
#include "ScreenEffectFramebufferObject.h"
60
 
#endif
61
58
 
62
59
#include "compizminimizedwindowhandler.h"
63
60
#include "BGHash.h"
97
94
  void nuxEpilogue();
98
95
 
99
96
  /* nux draw wrapper */
100
 
#ifdef USE_MODERN_COMPIZ_GL
101
97
  void paintDisplay();
102
 
#else
103
 
  void paintDisplay(const CompRegion& region, const GLMatrix& transform, unsigned int mask);
104
 
#endif
105
98
  void paintPanelShadow(const CompRegion &clip);
106
99
  void setPanelShadowMatrix(const GLMatrix& matrix);
107
100
 
248
241
 
249
242
  void InitGesturesSupport();
250
243
 
 
244
  void DrawTopPanelBackground();
 
245
  bool TopPanelBackgroundTextureNeedsUpdate() const;
 
246
  void UpdateTopPanelBackgroundTexture();
 
247
 
251
248
  nux::animation::TickSource tick_source_;
252
249
  nux::animation::AnimationController animation_controller_;
253
250
 
311
308
 
312
309
  BGHash _bghash;
313
310
 
314
 
#ifdef USE_MODERN_COMPIZ_GL
315
311
  ::GLFramebufferObject *oldFbo;
316
 
#else
317
 
  ScreenEffectFramebufferObject::Ptr _fbo;
318
 
  GLuint                             _active_fbo;
319
 
#endif
320
312
 
321
313
  bool   queryForShader ();
322
314
 
323
 
  int dash_monitor_;
 
315
  int overlay_monitor_;
324
316
  CompScreen::GrabHandle grab_index_;
325
317
  CompWindowList         fullscreen_windows_;
326
318
  bool                   painting_tray_;
337
329
 
338
330
  bool scale_just_activated_;
339
331
 
340
 
#ifndef USE_MODERN_COMPIZ_GL
341
 
  ScreenEffectFramebufferObject::GLXGetProcAddressProc glXGetProcAddressP;
342
 
#endif
343
 
 
344
332
  UBusManager ubus_manager_;
345
333
  glib::SourceManager sources_;
346
334
  unity::ThumbnailGenerator thumb_generator;
347
335
 
348
 
  Window scale_highlighted_window_;
349
 
 
350
336
  WindowMinimizeSpeedController* minimize_speed_controller;
351
337
  friend class UnityWindow;
352
338
};
386
372
 
387
373
  /* basic window draw function */
388
374
  bool glDraw(const GLMatrix& matrix,
389
 
#ifndef USE_MODERN_COMPIZ_GL
390
 
              GLFragment::Attrib& attrib,
391
 
#else
392
375
              const GLWindowPaintAttrib& attrib,
393
 
#endif
394
376
              const CompRegion& region,
395
377
              unsigned intmask);
396
378
 
425
407
  //! Emited when CompWindowNotifyBeforeDestroy is received
426
408
  sigc::signal<void> being_destroyed;
427
409
 
428
 
  void scaleSelectWindow();
429
410
  void scalePaintDecoration(const GLWindowPaintAttrib &,
430
411
                            const GLMatrix &,
431
412
                            const CompRegion &,