~canonical-dx-team/unity/unity.fix-ql-losing-focus

« back to all changes in this revision

Viewing changes to src/unity.h

Committer: Michael Terry
Date: 2010-12-17 14:07:11 UTC
mfrom: (724 unity)
mto: This revision was merged to the branch mainline in revision 743.
Revision ID: mike@mterry.name-20101217140711-qlij3bxdjuq1xoph

merge from upstream

files added:
plugin-unityshell.png

resources/progress_bar_fill.png

resources/progress_bar_trough.png

src/PanelMenuView.cpp

src/PanelMenuView.h

src/PlacesController.cpp

src/PlacesController.h

src/PlacesView.cpp

src/PlacesView.h

src/UBusMessages.h

src/WindowButtons.cpp

src/WindowButtons.h

src/WindowManager.cpp

src/WindowManager.h

tests/TestPlaces.cpp

files modified:
CMakeLists.txt

libunity/perf-logger-utility.h

libunity/ubus-server.c

po/unity.pot

services/panel-service.c

src/BamfLauncherIcon.cpp

src/BamfLauncherIcon.h

src/IndicatorObjectEntryProxy.h

src/IndicatorObjectEntryProxyRemote.cpp

src/IndicatorObjectFactory.h

src/IndicatorObjectFactoryRemote.cpp

src/IndicatorObjectFactoryRemote.h

src/Launcher.cpp

src/Launcher.h

src/LauncherController.cpp

src/LauncherController.h

src/LauncherDragWindow.cpp

src/LauncherDragWindow.h

src/LauncherIcon.cpp

src/LauncherIcon.h

src/PanelHomeButton.cpp

src/PanelIndicatorObjectEntryView.cpp

src/PanelIndicatorObjectEntryView.h

src/PanelIndicatorObjectView.cpp

src/PanelIndicatorObjectView.h

src/PanelView.cpp

src/PanelView.h

src/PluginAdapter.cpp

src/PluginAdapter.h

src/SimpleLauncherIcon.cpp

src/TrashLauncherIcon.cpp

src/unity.cpp

src/unity.h

tests/CMakeLists.txt

unityshell.xml.in

Show diffs side-by-side

added added

removed removed

src/unity.h

#include "Launcher.h"

#include "LauncherController.h"

#include "PanelView.h"

#include "PlacesController.h"

#include "IntrospectionDBusInterface.h"

#include <Nux/WindowThread.h>

#include <sigc++/sigc++.h>

/* base screen class */

class UnityScreen :

public Introspectable,

public sigc::trackable,

public ScreenInterface,

CompositeScreen *cScreen;

GLScreen *gScreen;

/* prepares nux for drawing */

void

nuxPrologue ();

103

104

const gchar* GetName ();

104

105

106

void AddProperties (GVariantBuilder *builder);

106

107

108

private:

108

109

110

static gboolean

110

111

initPluginActions (gpointer data);

111

112

113

static void

113

114

initLauncher (nux::NThread* thread, void* InitData);

114

115

116

void

116

117

damageNuxRegions();

117

118

void

118

119

void

119

120

onRedrawRequested ();

120

121

static void

121

122

static void

122

123

launcherWindowConfigureCallback(int WindowWidth, int WindowHeight, nux::Geometry& geo, void* user_data);

123

124

static void

125

static void

125

126

panelWindowConfigureCallback(int WindowWidth, int WindowHeight, nux::Geometry& geo, void* user_data);

126

127

static void

128

static void

128

129

initUnity(nux::NThread* thread, void* InitData);

129

130

static gboolean

131

static gboolean

131

132

strutHackTimeout (gpointer data);

132

133

134

Launcher *launcher;

134

135

LauncherController *controller;

135

136

PanelView *panelView;

137

PlacesController *placesController;

136

138

nux::WindowThread *wt;

137

139

nux::BaseWindow *launcherWindow;

138

140

nux::BaseWindow *panelWindow;

162

164

163

165

CompWindow *window;

164

166

GLWindow *gWindow;

165

167

166

168

/* basic window draw function */

167

bool

169

bool

168

170

glDraw (const GLMatrix &matrix,

169

171

GLFragment::Attrib &attrib,

170

172

const CompRegion &region,

173

175

void windowNotify (CompWindowNotify n);

174

176

175

177

void moveNotify (int x, int y, bool immediate);

176

178

177

179

void resizeNotify (int x, int y, int w, int h);

180

181

void stateChangeNotify (unsigned int lastState);

178

182

};

179

183

180

184

#define EX_SCREEN (screen) \

Older »