| OLD | NEW |
| 1 | |
| 2 /* | 1 /* |
| 3 * Copyright 2011 Google Inc. | 2 * Copyright 2011 Google Inc. |
| 4 * | 3 * |
| 5 * 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 |
| 6 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 7 */ | 6 */ |
| 8 #include "X11/Xlib.h" | |
| 9 #include "X11/keysym.h" | |
| 10 | 7 |
| 11 #include "SkApplication.h" | 8 #include "SkApplication.h" |
| 12 #include "SkEvent.h" | 9 #include "SkEvent.h" |
| 13 #include "SkWindow.h" | 10 #include "SkWindow.h" |
| 14 #include "SkTypes.h" | |
| 15 | |
| 16 #include <signal.h> | |
| 17 #include <sys/time.h> | |
| 18 | |
| 19 SkOSWindow* gWindow; | |
| 20 | 11 |
| 21 int main(int argc, char** argv){ | 12 int main(int argc, char** argv){ |
| 22 gWindow = create_sk_window(NULL, argc, argv); | 13 SkOSWindow* window = create_sk_window(NULL, argc, argv); |
| 23 | 14 |
| 24 // drain any events that occurred before gWindow was assigned. | 15 // drain any events that occurred before |window| was assigned. |
| 25 while (SkEvent::ProcessEvent()); | 16 while (SkEvent::ProcessEvent()); |
| 26 | 17 |
| 27 // Start normal Skia sequence | 18 // Start normal Skia sequence |
| 28 application_init(); | 19 application_init(); |
| 29 | 20 |
| 30 gWindow->loop(); | 21 window->loop(); |
| 31 | 22 |
| 32 delete gWindow; | 23 delete window; |
| 33 application_term(); | 24 application_term(); |
| 34 return 0; | 25 return 0; |
| 35 } | 26 } |
| 36 | |
| 37 // SkEvent handlers | |
| OLD | NEW |