Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(461)

Side by Side Diff: tools/viewer/sk_app/Window.h

Issue 2004633002: Add drawer with state information (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Format_old Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2016 Google Inc. 2 * Copyright 2016 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef Window_DEFINED 8 #ifndef Window_DEFINED
9 #define Window_DEFINED 9 #define Window_DEFINED
10 10
11 #include "DisplayParams.h" 11 #include "DisplayParams.h"
12 #include "SkRect.h" 12 #include "SkRect.h"
13 #include "SkTouchGesture.h" 13 #include "SkTouchGesture.h"
14 #include "SkTypes.h" 14 #include "SkTypes.h"
15 15
16 class SkCanvas; 16 class SkCanvas;
17 17
18 namespace sk_app { 18 namespace sk_app {
19 19
20 class WindowContext; 20 class WindowContext;
21 21
22 class Window { 22 class Window {
23 public: 23 public:
24 static Window* CreateNativeWindow(void* platformData); 24 static Window* CreateNativeWindow(void* platformData);
25 25
26 virtual ~Window() {}; 26 virtual ~Window() {};
27 27
28 virtual void setTitle(const char*) = 0; 28 virtual void setTitle(const char*) = 0;
29 virtual void show() = 0; 29 virtual void show() = 0;
30 virtual void onStateUpdated(const char* stateJsonStr) {} // do nothing in d efault
djsollen 2016/05/24 17:32:40 the public API should be consistent with the one i
liyuqian 2016/05/24 20:18:05 Done.
djsollen 2016/05/26 18:08:40 should this be called setState()?
30 31
31 // Shedules an invalidation event for window if one is not currently pending . 32 // Shedules an invalidation event for window if one is not currently pending .
32 // Make sure that either onPaint or markInvalReceived is called when the cli ent window consumes 33 // Make sure that either onPaint or markInvalReceived is called when the cli ent window consumes
33 // the the inval event. They unset fIsContentInvalided which allow future on Inval. 34 // the the inval event. They unset fIsContentInvalided which allow future on Inval.
34 void inval(); 35 void inval();
35 36
36 virtual bool scaleContentToFit() const { return false; } 37 virtual bool scaleContentToFit() const { return false; }
37 virtual bool supportsContentRect() const { return false; } 38 virtual bool supportsContentRect() const { return false; }
38 virtual SkRect getContentRect() { return SkRect::MakeEmpty(); } 39 virtual SkRect getContentRect() { return SkRect::MakeEmpty(); }
39 40
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 kDown_InputState, 104 kDown_InputState,
104 kUp_InputState, 105 kUp_InputState,
105 kMove_InputState // only valid for mouse 106 kMove_InputState // only valid for mouse
106 }; 107 };
107 108
108 // return value of 'true' means 'I have handled this event' 109 // return value of 'true' means 'I have handled this event'
109 typedef bool(*OnCharFunc)(SkUnichar c, uint32_t modifiers, void* userData); 110 typedef bool(*OnCharFunc)(SkUnichar c, uint32_t modifiers, void* userData);
110 typedef bool(*OnKeyFunc)(Key key, InputState state, uint32_t modifiers, void * userData); 111 typedef bool(*OnKeyFunc)(Key key, InputState state, uint32_t modifiers, void * userData);
111 typedef bool(*OnMouseFunc)(int x, int y, InputState state, uint32_t modifier s, void* userData); 112 typedef bool(*OnMouseFunc)(int x, int y, InputState state, uint32_t modifier s, void* userData);
112 typedef bool(*OnTouchFunc)(int owner, InputState state, float x, float y, vo id* userData); 113 typedef bool(*OnTouchFunc)(int owner, InputState state, float x, float y, vo id* userData);
114 typedef void(*OnSetFunc)(const SkString& stateName, const SkString& stateVal ue, void* userData);
djsollen 2016/05/24 17:32:40 I find this naming very confusing as both the user
liyuqian 2016/05/24 20:18:05 Let's discuss.
113 typedef void(*OnPaintFunc)(SkCanvas*, void* userData); 115 typedef void(*OnPaintFunc)(SkCanvas*, void* userData);
114 116
115 void registerCharFunc(OnCharFunc func, void* userData) { 117 void registerCharFunc(OnCharFunc func, void* userData) {
116 fCharFunc = func; 118 fCharFunc = func;
117 fCharUserData = userData; 119 fCharUserData = userData;
118 } 120 }
119 121
120 void registerKeyFunc(OnKeyFunc func, void* userData) { 122 void registerKeyFunc(OnKeyFunc func, void* userData) {
121 fKeyFunc = func; 123 fKeyFunc = func;
122 fKeyUserData = userData; 124 fKeyUserData = userData;
123 } 125 }
124 126
125 void registerMouseFunc(OnMouseFunc func, void* userData) { 127 void registerMouseFunc(OnMouseFunc func, void* userData) {
126 fMouseFunc = func; 128 fMouseFunc = func;
127 fMouseUserData = userData; 129 fMouseUserData = userData;
128 } 130 }
129 131
130 void registerPaintFunc(OnPaintFunc func, void* userData) { 132 void registerPaintFunc(OnPaintFunc func, void* userData) {
131 fPaintFunc = func; 133 fPaintFunc = func;
132 fPaintUserData = userData; 134 fPaintUserData = userData;
133 } 135 }
134 136
135 void registerTouchFunc(OnTouchFunc func, void* userData) { 137 void registerTouchFunc(OnTouchFunc func, void* userData) {
136 fTouchFunc = func; 138 fTouchFunc = func;
137 fTouchUserData = userData; 139 fTouchUserData = userData;
138 } 140 }
139 141
142 void registerSetFunc(OnSetFunc func, void* userData) {
143 fSetFunc = func;
144 fSetUserData = userData;
145 }
146
140 bool onChar(SkUnichar c, uint32_t modifiers); 147 bool onChar(SkUnichar c, uint32_t modifiers);
141 bool onKey(Key key, InputState state, uint32_t modifiers); 148 bool onKey(Key key, InputState state, uint32_t modifiers);
142 bool onMouse(int x, int y, InputState state, uint32_t modifiers); 149 bool onMouse(int x, int y, InputState state, uint32_t modifiers);
143 bool onTouch(int owner, InputState state, float x, float y); // multi-owner = multi-touch 150 bool onTouch(int owner, InputState state, float x, float y); // multi-owner = multi-touch
151 void onSet(const SkString& stateName, const SkString& stateValue);
djsollen 2016/05/26 18:08:40 onStateChange()
144 void onPaint(); 152 void onPaint();
145 void onResize(uint32_t width, uint32_t height); 153 void onResize(uint32_t width, uint32_t height);
146 154
147 uint32_t width() { return fWidth; } 155 uint32_t width() { return fWidth; }
148 uint32_t height() { return fHeight; } 156 uint32_t height() { return fHeight; }
149 157
150 virtual const DisplayParams& getDisplayParams(); 158 virtual const DisplayParams& getDisplayParams();
151 void setDisplayParams(const DisplayParams& params); 159 void setDisplayParams(const DisplayParams& params);
152 160
153 protected: 161 protected:
154 Window(); 162 Window();
155 163
156 uint32_t fWidth; 164 uint32_t fWidth;
157 uint32_t fHeight; 165 uint32_t fHeight;
158 166
159 OnCharFunc fCharFunc; 167 OnCharFunc fCharFunc;
160 void* fCharUserData; 168 void* fCharUserData;
161 OnKeyFunc fKeyFunc; 169 OnKeyFunc fKeyFunc;
162 void* fKeyUserData; 170 void* fKeyUserData;
163 OnMouseFunc fMouseFunc; 171 OnMouseFunc fMouseFunc;
164 void* fMouseUserData; 172 void* fMouseUserData;
165 OnTouchFunc fTouchFunc; 173 OnTouchFunc fTouchFunc;
166 void* fTouchUserData; 174 void* fTouchUserData;
175 OnSetFunc fSetFunc;
176 void* fSetUserData;
167 OnPaintFunc fPaintFunc; 177 OnPaintFunc fPaintFunc;
168 void* fPaintUserData; 178 void* fPaintUserData;
169 179
170 WindowContext* fWindowContext = nullptr; 180 WindowContext* fWindowContext = nullptr;
171 181
172 virtual void onInval() = 0; 182 virtual void onInval() = 0;
173 183
174 // Uncheck fIsContentInvalided to allow future inval/onInval. 184 // Uncheck fIsContentInvalided to allow future inval/onInval.
175 void markInvalProcessed(); 185 void markInvalProcessed();
176 186
177 bool fIsContentInvalidated = false; // use this to avoid duplicate invalida te events 187 bool fIsContentInvalidated = false; // use this to avoid duplicate invalida te events
178 }; 188 };
179 189
180 } // namespace sk_app 190 } // namespace sk_app
181 #endif 191 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698