reflexion 0.2.1 → 0.3.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (123) hide show
  1. checksums.yaml +4 -4
  2. data/.doc/ext/reflex/application.cpp +1 -1
  3. data/.doc/ext/reflex/capture_event.cpp +1 -1
  4. data/.doc/ext/reflex/contact_event.cpp +1 -1
  5. data/.doc/ext/reflex/draw_event.cpp +1 -1
  6. data/.doc/ext/reflex/ellipse_shape.cpp +1 -1
  7. data/.doc/ext/reflex/event.cpp +1 -1
  8. data/.doc/ext/reflex/filter.cpp +1 -1
  9. data/.doc/ext/reflex/focus_event.cpp +1 -1
  10. data/.doc/ext/reflex/frame_event.cpp +1 -1
  11. data/.doc/ext/reflex/image_view.cpp +1 -1
  12. data/.doc/ext/reflex/key_event.cpp +74 -69
  13. data/.doc/ext/reflex/line_shape.cpp +1 -1
  14. data/.doc/ext/reflex/motion_event.cpp +1 -1
  15. data/.doc/ext/reflex/pointer.cpp +7 -16
  16. data/.doc/ext/reflex/pointer_event.cpp +1 -1
  17. data/.doc/ext/reflex/polygon_shape.cpp +1 -1
  18. data/.doc/ext/reflex/rect_shape.cpp +1 -1
  19. data/.doc/ext/reflex/reflex.cpp +58 -50
  20. data/.doc/ext/reflex/screen.cpp +1 -1
  21. data/.doc/ext/reflex/scroll_event.cpp +1 -1
  22. data/.doc/ext/reflex/selector.cpp +2 -2
  23. data/.doc/ext/reflex/shape.cpp +1 -1
  24. data/.doc/ext/reflex/style.cpp +1 -1
  25. data/.doc/ext/reflex/style_length.cpp +5 -3
  26. data/.doc/ext/reflex/timer.cpp +1 -1
  27. data/.doc/ext/reflex/timer_event.cpp +1 -1
  28. data/.doc/ext/reflex/update_event.cpp +1 -1
  29. data/.doc/ext/reflex/view.cpp +17 -9
  30. data/.doc/ext/reflex/wheel_event.cpp +1 -1
  31. data/.doc/ext/reflex/window.cpp +1 -1
  32. data/.github/workflows/release-gem.yml +1 -1
  33. data/.github/workflows/test.yml +3 -0
  34. data/ChangeLog.md +17 -0
  35. data/Gemfile.lock +1 -1
  36. data/LICENSE +1 -1
  37. data/Rakefile +1 -2
  38. data/VERSION +1 -1
  39. data/ext/reflex/application.cpp +1 -1
  40. data/ext/reflex/capture_event.cpp +1 -1
  41. data/ext/reflex/contact_event.cpp +1 -1
  42. data/ext/reflex/defs.h +2 -0
  43. data/ext/reflex/draw_event.cpp +1 -1
  44. data/ext/reflex/ellipse_shape.cpp +1 -1
  45. data/ext/reflex/event.cpp +1 -1
  46. data/ext/reflex/extconf.rb +4 -4
  47. data/ext/reflex/filter.cpp +1 -1
  48. data/ext/reflex/focus_event.cpp +1 -1
  49. data/ext/reflex/frame_event.cpp +1 -1
  50. data/ext/reflex/image_view.cpp +1 -1
  51. data/ext/reflex/key_event.cpp +74 -69
  52. data/ext/reflex/line_shape.cpp +1 -1
  53. data/ext/reflex/motion_event.cpp +1 -1
  54. data/ext/reflex/pointer.cpp +7 -17
  55. data/ext/reflex/pointer_event.cpp +1 -1
  56. data/ext/reflex/polygon_shape.cpp +1 -1
  57. data/ext/reflex/rect_shape.cpp +1 -1
  58. data/ext/reflex/reflex.cpp +58 -50
  59. data/ext/reflex/screen.cpp +1 -1
  60. data/ext/reflex/scroll_event.cpp +1 -1
  61. data/ext/reflex/selector.cpp +2 -2
  62. data/ext/reflex/shape.cpp +1 -1
  63. data/ext/reflex/style.cpp +1 -1
  64. data/ext/reflex/style_length.cpp +5 -3
  65. data/ext/reflex/timer.cpp +1 -1
  66. data/ext/reflex/timer_event.cpp +1 -1
  67. data/ext/reflex/update_event.cpp +1 -1
  68. data/ext/reflex/view.cpp +18 -9
  69. data/ext/reflex/wheel_event.cpp +1 -1
  70. data/ext/reflex/window.cpp +1 -1
  71. data/include/reflex/defs.h +204 -187
  72. data/include/reflex/pointer.h +3 -5
  73. data/include/reflex/reflex.h +1 -0
  74. data/include/reflex/ruby/application.h +2 -2
  75. data/include/reflex/ruby/event.h +26 -26
  76. data/include/reflex/ruby/exception.h +3 -3
  77. data/include/reflex/ruby/filter.h +2 -2
  78. data/include/reflex/ruby/image_view.h +2 -2
  79. data/include/reflex/ruby/pointer.h +2 -2
  80. data/include/reflex/ruby/reflex.h +1 -1
  81. data/include/reflex/ruby/screen.h +2 -2
  82. data/include/reflex/ruby/selector.h +2 -2
  83. data/include/reflex/ruby/shape.h +10 -10
  84. data/include/reflex/ruby/style.h +4 -4
  85. data/include/reflex/ruby/timer.h +3 -3
  86. data/include/reflex/ruby/view.h +2 -2
  87. data/include/reflex/ruby/window.h +2 -2
  88. data/include/reflex/view.h +3 -1
  89. data/lib/reflex/extension.rb +4 -0
  90. data/lib/reflex/pointer.rb +1 -1
  91. data/lib/reflex/pointer_event.rb +2 -2
  92. data/reflex.gemspec +4 -4
  93. data/src/body.cpp +12 -6
  94. data/src/event.cpp +17 -31
  95. data/src/event.h +3 -3
  96. data/src/filter.cpp +3 -1
  97. data/src/ios/event.mm +20 -27
  98. data/src/osx/application.mm +6 -5
  99. data/src/osx/event.mm +1 -2
  100. data/src/pointer.cpp +12 -32
  101. data/src/pointer.h +0 -2
  102. data/src/selector.cpp +3 -1
  103. data/src/shape.cpp +5 -3
  104. data/src/style.cpp +14 -8
  105. data/src/view.cpp +47 -24
  106. data/src/win32/application.cpp +48 -35
  107. data/src/win32/device.cpp +18 -0
  108. data/src/win32/event.cpp +219 -0
  109. data/src/win32/event.h +50 -0
  110. data/src/win32/opengl.cpp +54 -27
  111. data/src/win32/opengl.h +15 -13
  112. data/src/win32/reflex.cpp +10 -16
  113. data/src/win32/screen.cpp +61 -0
  114. data/src/win32/screen.h +21 -0
  115. data/src/win32/window.cpp +445 -240
  116. data/src/window.cpp +28 -30
  117. data/src/window.h +3 -12
  118. data/test/test_pointer.rb +8 -10
  119. data/test/test_pointer_event.rb +8 -9
  120. data/test/test_window.rb +24 -21
  121. metadata +15 -12
  122. data/src/win32/defs.cpp +0 -303
  123. data/src/win32/defs.h +0 -34
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 99978c547d86b5998ac78e2e7450a8cb998c892d693ed40a40f91e1975c9ccdc
4
- data.tar.gz: f6ca834ae895ab7cf613292369040a633f6f893766c6321be61e2c6064f1ea33
3
+ metadata.gz: f0787ee344f23edde4f87bfb7d5d129a30bbc8ce0723bcf4d0da918196bfbc9f
4
+ data.tar.gz: 6153596e926fce9e12d27a843871e12025d39722a27f8d473811426a69285464
5
5
  SHA512:
6
- metadata.gz: 85d60b283c9af932e962bf9fc8f9d89ab659416342a325d50b7ccf8bb0f12e3e6e1fea650b9d1f3f919faf511b0915d4e2c716ec2d35219fd3824a43aecf0645
7
- data.tar.gz: 11c8346eab634a5528fcb0c684e328b4f39271f580a79575abfaef07545e3611e5715d3786aee7da511f7989555dd72bf460bda5d44e5e51cb21f51abd75c6a3
6
+ metadata.gz: 6f0f485cab308f5246c44ee0e12c55541ccc7c0247403b6e1bcc676946ab1a9be2260d7d28316a8c12c4630230168ee1b9c93b1a1f398b828b93ead6acc8e8e3
7
+ data.tar.gz: a39e8b85065a9eacb9bb36db287066f9e53ab5e40f47e9f05d67915dfdea4296120aa8a81953104926440448432642ae0ac763688d53ac0b47792e5cd3153e78
@@ -4,7 +4,7 @@
4
4
  #include "defs.h"
5
5
 
6
6
 
7
- RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::Application)
7
+ RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::Application)
8
8
 
9
9
  #define THIS to<Reflex::Application*>(self)
10
10
 
@@ -5,7 +5,7 @@
5
5
  #include "defs.h"
6
6
 
7
7
 
8
- RUCY_DEFINE_VALUE_FROM_TO(Reflex::CaptureEvent)
8
+ RUCY_DEFINE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::CaptureEvent)
9
9
 
10
10
  #define THIS to<Reflex::CaptureEvent*>(self)
11
11
 
@@ -7,7 +7,7 @@
7
7
  #include "defs.h"
8
8
 
9
9
 
10
- RUCY_DEFINE_VALUE_FROM_TO(Reflex::ContactEvent)
10
+ RUCY_DEFINE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::ContactEvent)
11
11
 
12
12
  #define THIS to<Reflex::ContactEvent*>(self)
13
13
 
@@ -6,7 +6,7 @@
6
6
  #include "defs.h"
7
7
 
8
8
 
9
- RUCY_DEFINE_VALUE_FROM_TO(Reflex::DrawEvent)
9
+ RUCY_DEFINE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::DrawEvent)
10
10
 
11
11
  #define THIS to<Reflex::DrawEvent*>(self)
12
12
 
@@ -4,7 +4,7 @@
4
4
  #include "defs.h"
5
5
 
6
6
 
7
- RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::EllipseShape)
7
+ RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::EllipseShape)
8
8
 
9
9
  #define THIS to<Reflex::EllipseShape*>(self)
10
10
 
@@ -5,7 +5,7 @@
5
5
  #include "defs.h"
6
6
 
7
7
 
8
- RUCY_DEFINE_VALUE_FROM_TO(Reflex::Event)
8
+ RUCY_DEFINE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::Event)
9
9
 
10
10
  #define THIS to<Reflex::Event*>(self)
11
11
 
@@ -6,7 +6,7 @@
6
6
  #include "defs.h"
7
7
 
8
8
 
9
- RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::Filter)
9
+ RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::Filter)
10
10
 
11
11
  #define THIS to<Reflex::Filter*>(self)
12
12
 
@@ -5,7 +5,7 @@
5
5
  #include "defs.h"
6
6
 
7
7
 
8
- RUCY_DEFINE_VALUE_FROM_TO(Reflex::FocusEvent)
8
+ RUCY_DEFINE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::FocusEvent)
9
9
 
10
10
  #define THIS to<Reflex::FocusEvent*>(self)
11
11
 
@@ -6,7 +6,7 @@
6
6
  #include "defs.h"
7
7
 
8
8
 
9
- RUCY_DEFINE_VALUE_FROM_TO(Reflex::FrameEvent)
9
+ RUCY_DEFINE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::FrameEvent)
10
10
 
11
11
  #define THIS to<Reflex::FrameEvent*>(self)
12
12
 
@@ -6,7 +6,7 @@
6
6
  #include "defs.h"
7
7
 
8
8
 
9
- RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::ImageView)
9
+ RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::ImageView)
10
10
 
11
11
  #define THIS to<Reflex::ImageView*>(self)
12
12
 
@@ -4,7 +4,7 @@
4
4
  #include "defs.h"
5
5
 
6
6
 
7
- RUCY_DEFINE_VALUE_FROM_TO(Reflex::KeyEvent)
7
+ RUCY_DEFINE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::KeyEvent)
8
8
 
9
9
  #define THIS to<Reflex::KeyEvent*>(self)
10
10
 
@@ -119,18 +119,18 @@ VALUE get_key(VALUE self)
119
119
  CASE(LBRACKET): SYMBOL1(lbracket);
120
120
  CASE(RBRACKET): SYMBOL1(rbracket);
121
121
 
122
- #if defined(OSX) || defined(IOS)
123
- CASE(ENTER): SYMBOL1(enter);
122
+ #if defined(OSX) || defined(IOS) || defined(WIN32)
123
+ CASE(ENTER): SYMBOL1(enter);
124
124
  #else
125
- CASE(ENTER): SYMBOL1(enter);
126
- CASE(RETURN): SYMBOL1(_return, "return");
125
+ CASE(ENTER): SYMBOL1(enter);
126
+ CASE(RETURN): SYMBOL1(_return, "return");
127
127
  #endif
128
- CASE(SPACE): SYMBOL1(space);
129
- CASE(TAB): SYMBOL1(tab);
130
- CASE(DELETE): SYMBOL2(_delete, "delete");
131
- CASE(BACKSPACE): SYMBOL1(backspace);
132
- //CASE(INSERT): SYMBOL1(insert);
133
- CASE(ESCAPE): SYMBOL1(escape);
128
+ CASE(SPACE): SYMBOL1(space);
129
+ CASE(TAB): SYMBOL1(tab);
130
+ CASE(DELETE): SYMBOL2(_delete, "delete");
131
+ CASE(BACKSPACE): SYMBOL1(backspace);
132
+ CASE(INSERT): SYMBOL1(insert);
133
+ CASE(ESCAPE): SYMBOL1(escape);
134
134
 
135
135
  CASE(LEFT): SYMBOL1(left);
136
136
  CASE(RIGHT): SYMBOL1(right);
@@ -141,27 +141,25 @@ VALUE get_key(VALUE self)
141
141
  CASE(PAGEUP): SYMBOL1(pageup);
142
142
  CASE(PAGEDOWN): SYMBOL1(pagedown);
143
143
 
144
- #if defined(OSX) || defined(IOS)
144
+ #if !defined(OSX) && !defined(IOS)
145
+ CASE(SHIFT):
146
+ #endif
145
147
  CASE(LSHIFT):
146
148
  CASE(RSHIFT): SYMBOL1(shift);
149
+ #if !defined(OSX) && !defined(IOS)
150
+ CASE(CONTROL):
151
+ #endif
147
152
  CASE(LCONTROL):
148
153
  CASE(RCONTROL): SYMBOL1(control);
154
+ CASE(ALT):
155
+ CASE(LALT):
156
+ CASE(RALT): SYMBOL1(alt);
157
+ CASE(LWIN):
158
+ CASE(RWIN): SYMBOL1(win);
149
159
  CASE(LCOMMAND):
150
160
  CASE(RCOMMAND): SYMBOL1(command);
151
161
  CASE(LOPTION):
152
162
  CASE(ROPTION): SYMBOL1(option);
153
- #else
154
- CASE(SHIFT):
155
- CASE(LSHIFT):
156
- CASE(RSHIFT): SYMBOL1(shift);
157
- CASE(CONTROL):
158
- CASE(LCONTROL):
159
- CASE(RCONTROL): SYMBOL1(control);
160
- //CASE(LALT):
161
- //CASE(RALT): SYMBOL1(alt);
162
- //CASE(LWIN):
163
- //CASE(RWIN): SYMBOL1(win);
164
- #endif
165
163
  CASE(FUNCTION): SYMBOL1(function);
166
164
 
167
165
  CASE(F1): SYMBOL1(f1);
@@ -184,10 +182,10 @@ VALUE get_key(VALUE self)
184
182
  CASE(F18): SYMBOL1(f18);
185
183
  CASE(F19): SYMBOL1(f19);
186
184
  CASE(F20): SYMBOL1(f20);
187
- //CASE(F21): SYMBOL1(f21);
188
- //CASE(F22): SYMBOL1(f22);
189
- //CASE(F23): SYMBOL1(f23);
190
- //CASE(F24): SYMBOL1(f24);
185
+ CASE(F21): SYMBOL1(f21);
186
+ CASE(F22): SYMBOL1(f22);
187
+ CASE(F23): SYMBOL1(f23);
188
+ CASE(F24): SYMBOL1(f24);
191
189
 
192
190
  CASE(NUM_PLUS): SYMBOL1(plus);
193
191
  CASE(NUM_MINUS): SYMBOL1(minus);
@@ -200,56 +198,63 @@ VALUE get_key(VALUE self)
200
198
  CASE(NUM_ENTER): SYMBOL1(enter);
201
199
 
202
200
  CASE(CAPSLOCK): SYMBOL1(capslock);
203
- //CASE(NUMLOCK): SYMBOL1(numlock);
204
- //CASE(SCROLLLOCK): SYMBOL1(scrolllock);
201
+ CASE(NUMLOCK): SYMBOL1(numlock);
202
+ CASE(SCROLLLOCK): SYMBOL1(scrolllock);
205
203
 
206
- //CASE(PRINTSCREEN): SYMBOL1(printscreen);
207
- //CASE(PAUSE): SYMBOL1(pause);
208
- //CASE(BREAK): SYMBOL2(_break, "break");
204
+ CASE(PRINTSCREEN): SYMBOL1(printscreen);
205
+ CASE(PAUSE): SYMBOL1(pause);
206
+ CASE(BREAK): SYMBOL2(_break, "break");
209
207
  CASE(SECTION): SYMBOL1(section);
210
208
  CASE(HELP): SYMBOL1(help);
211
209
 
212
- CASE(IME_EISU): SYMBOL1(eisu);
213
- CASE(IME_KANA): SYMBOL1(kana);
214
- //CASE(IME_KANJI): SYMBOL1(kanji);
215
- //CASE(IME_JUNJA): SYMBOL1(junja);
216
- //CASE(IME_PROCESS): SYMBOL1(process);
217
- //CASE(IME_ACCEPT): SYMBOL1(accept);
218
- //CASE(IME_FINAL): SYMBOL2(_final, "final");
219
- //CASE(IME_CONVERT): SYMBOL1(convert);
220
- //CASE(IME_NONCONVERT): SYMBOL1(nonconvert);
221
- //CASE(IME_MODECHANGE): SYMBOL1(mode_change);
210
+ CASE(EISU): SYMBOL1(eisu);
211
+ CASE(KANA): SYMBOL1(kana);
212
+ CASE(KANJI): SYMBOL1(kanji);
213
+ CASE(IME_ON): SYMBOL1(ime_on);
214
+ CASE(IME_OFF): SYMBOL1(ime_off);
215
+ CASE(IME_MODECHANGE): SYMBOL1(ime_mode_change);
216
+ CASE(CONVERT): SYMBOL1(convert);
217
+ CASE(NONCONVERT): SYMBOL1(nonconvert);
218
+ CASE(ACCEPT): SYMBOL1(accept);
219
+ CASE(PROCESS): SYMBOL1(process);
222
220
 
223
221
  CASE(VOLUME_UP): SYMBOL1(volume_up);
224
222
  CASE(VOLUME_DOWN): SYMBOL1(volume_down);
225
223
  CASE(MUTE): SYMBOL1(mute);
226
224
 
227
- //CASE(SLEEP): SYMBOL1(sleep);
228
- //CASE(EXEC): SYMBOL1(exec);
229
- //CASE(PRINT): SYMBOL1(print);
230
- //CASE(APPS): SYMBOL1(apps);
231
- //CASE(SELECT): SYMBOL1(select);
232
- //CASE(CLEAR): SYMBOL1(clear);
233
- //CASE(PLAY): SYMBOL1(play);
234
- //CASE(ZOOM): SYMBOL1(zoom);
235
-
236
- //CASE(BROWSER_BACK): SYMBOL1(browser_back);
237
- //CASE(BROWSER_FORWARD): SYMBOL1(browser_forward);
238
- //CASE(BROWSER_REFRESH): SYMBOL1(browser_refresh);
239
- //CASE(BROWSER_STOP): SYMBOL1(browser_stop);
240
- //CASE(BROWSER_SEARCH): SYMBOL1(browser_search);
241
- //CASE(BROWSER_FAVORITES): SYMBOL1(browser_favorites);
242
- //CASE(BROWSER_HOME): SYMBOL1(browser_home);
243
-
244
- //CASE(MEDIA_NEXT_TRACK): SYMBOL1(media_next);
245
- //CASE(MEDIA_PREV_TRACK): SYMBOL1(media_prev);
246
- //CASE(MEDIA_STOP): SYMBOL1(media_stop);
247
- //CASE(MEDIA_PLAY_PAUSE): SYMBOL1(media_play_stop);
248
-
249
- //CASE(LAUNCH_MAIL): SYMBOL1(launch_mail);
250
- //CASE(LAUNCH_MEDIA_SELECT): SYMBOL1(launch_media_select);
251
- //CASE(LAUNCH_APP1): SYMBOL1(launch_app1);
252
- //CASE(LAUNCH_APP2): SYMBOL1(launch_app2);
225
+ CASE(SLEEP): SYMBOL1(sleep);
226
+ CASE(EXEC): SYMBOL1(exec);
227
+ CASE(PRINT): SYMBOL1(print);
228
+ CASE(APPS): SYMBOL1(apps);
229
+ CASE(SELECT): SYMBOL1(select);
230
+ CASE(CLEAR): SYMBOL1(clear);
231
+
232
+ CASE(NAVIGATION_VIEW): SYMBOL1(navigation_view);
233
+ CASE(NAVIGATION_MENU): SYMBOL1(navigation_menu);
234
+ CASE(NAVIGATION_UP): SYMBOL1(navigation_up);
235
+ CASE(NAVIGATION_DOWN): SYMBOL1(navigation_down);
236
+ CASE(NAVIGATION_LEFT): SYMBOL1(navigation_left);
237
+ CASE(NAVIGATION_RIGHT): SYMBOL1(navigation_right);
238
+ CASE(NAVIGATION_ACCEPT): SYMBOL1(navigation_accept);
239
+ CASE(NAVIGATION_CANCEL): SYMBOL1(navigation_cancel);
240
+
241
+ CASE(BROWSER_BACK): SYMBOL1(browser_back);
242
+ CASE(BROWSER_FORWARD): SYMBOL1(browser_forward);
243
+ CASE(BROWSER_REFRESH): SYMBOL1(browser_refresh);
244
+ CASE(BROWSER_STOP): SYMBOL1(browser_stop);
245
+ CASE(BROWSER_SEARCH): SYMBOL1(browser_search);
246
+ CASE(BROWSER_FAVORITES): SYMBOL1(browser_favorites);
247
+ CASE(BROWSER_HOME): SYMBOL1(browser_home);
248
+
249
+ CASE(MEDIA_PREV_TRACK): SYMBOL1(media_prev);
250
+ CASE(MEDIA_NEXT_TRACK): SYMBOL1(media_next);
251
+ CASE(MEDIA_PLAY_PAUSE): SYMBOL1(media_play_pause);
252
+ CASE(MEDIA_STOP): SYMBOL1(media_stop);
253
+
254
+ CASE(LAUNCH_MAIL): SYMBOL1(launch_mail);
255
+ CASE(LAUNCH_MEDIA_SELECT): SYMBOL1(launch_media_select);
256
+ CASE(LAUNCH_APP1): SYMBOL1(launch_app1);
257
+ CASE(LAUNCH_APP2): SYMBOL1(launch_app2);
253
258
 
254
259
  #undef CASE
255
260
  #undef SYMBOL1
@@ -5,7 +5,7 @@
5
5
  #include "defs.h"
6
6
 
7
7
 
8
- RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::LineShape)
8
+ RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::LineShape)
9
9
 
10
10
  #define THIS to<Reflex::LineShape*>(self)
11
11
 
@@ -5,7 +5,7 @@
5
5
  #include "defs.h"
6
6
 
7
7
 
8
- RUCY_DEFINE_VALUE_FROM_TO(Reflex::MotionEvent)
8
+ RUCY_DEFINE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::MotionEvent)
9
9
 
10
10
  #define THIS to<Reflex::MotionEvent*>(self)
11
11
 
@@ -5,7 +5,7 @@
5
5
  #include "defs.h"
6
6
 
7
7
 
8
- RUCY_DEFINE_VALUE_FROM_TO(Reflex::Pointer)
8
+ RUCY_DEFINE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::Pointer)
9
9
 
10
10
  #define THIS to<Reflex::Pointer*>(self)
11
11
 
@@ -20,7 +20,7 @@ VALUE alloc(VALUE klass)
20
20
 
21
21
  static
22
22
  VALUE initialize(VALUE self, VALUE
23
- id, VALUE types, VALUE action, VALUE position, VALUE modifiers, VALUE drag, VALUE click_count, VALUE view_index, VALUE time)
23
+ id, VALUE types, VALUE action, VALUE position, VALUE modifiers, VALUE click_count, VALUE drag, VALUE time)
24
24
  {
25
25
  CHECK;
26
26
 
@@ -30,9 +30,8 @@ VALUE initialize(VALUE self, VALUE
30
30
  (Reflex::Pointer::Action) to<int>(action),
31
31
  to<Rays::Point>(position),
32
32
  to<uint>(modifiers),
33
- to<bool>(drag),
34
33
  to<uint>(click_count),
35
- to<uint>(view_index),
34
+ to<bool>(drag),
36
35
  to<double>(time));
37
36
  return self;
38
37
  }
@@ -80,13 +79,6 @@ VALUE get_modifiers(VALUE self)
80
79
  return value(THIS->modifiers());
81
80
  }
82
81
 
83
- static
84
- VALUE is_drag(VALUE self)
85
- {
86
- CHECK;
87
- return value(THIS->is_drag());
88
- }
89
-
90
82
  static
91
83
  VALUE get_click_count(VALUE self)
92
84
  {
@@ -95,10 +87,10 @@ VALUE get_click_count(VALUE self)
95
87
  }
96
88
 
97
89
  static
98
- VALUE get_view_index(VALUE self)
90
+ VALUE is_drag(VALUE self)
99
91
  {
100
92
  CHECK;
101
- return value(THIS->view_index());
93
+ return value(THIS->is_drag());
102
94
  }
103
95
 
104
96
  static
@@ -132,16 +124,15 @@ Init_reflex_pointer ()
132
124
 
133
125
  cPointer = rb_define_class_under(mReflex, "Pointer", rb_cObject);
134
126
  rb_define_alloc_func(cPointer, alloc);
135
- rb_define_private_method(cPointer, "initialize", RUBY_METHOD_FUNC(initialize), 9);
127
+ rb_define_private_method(cPointer, "initialize", RUBY_METHOD_FUNC(initialize), 8);
136
128
  rb_define_private_method(cPointer, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
137
129
  rb_define_method(cPointer, "id", RUBY_METHOD_FUNC(get_id), 0);
138
130
  rb_define_private_method(cPointer, "get_types", RUBY_METHOD_FUNC(get_types), 0);
139
131
  rb_define_private_method(cPointer, "get_action", RUBY_METHOD_FUNC(get_action), 0);
140
132
  rb_define_method(cPointer, "position", RUBY_METHOD_FUNC(get_position), 0);
141
133
  rb_define_method(cPointer, "modifiers", RUBY_METHOD_FUNC(get_modifiers), 0);
142
- cPointer.define_method("drag?", is_drag);
143
134
  rb_define_method(cPointer, "click_count", RUBY_METHOD_FUNC(get_click_count), 0);
144
- rb_define_method(cPointer, "view_index", RUBY_METHOD_FUNC(get_view_index), 0);
135
+ cPointer.define_method("drag?", is_drag);
145
136
  rb_define_method(cPointer, "time", RUBY_METHOD_FUNC(get_time), 0);
146
137
  rb_define_method(cPointer, "prev", RUBY_METHOD_FUNC(get_prev), 0);
147
138
  rb_define_method(cPointer, "down", RUBY_METHOD_FUNC(get_down), 0);
@@ -7,7 +7,7 @@
7
7
  #include "defs.h"
8
8
 
9
9
 
10
- RUCY_DEFINE_VALUE_FROM_TO(Reflex::PointerEvent)
10
+ RUCY_DEFINE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::PointerEvent)
11
11
 
12
12
  #define THIS to<Reflex::PointerEvent*>(self)
13
13
 
@@ -5,7 +5,7 @@
5
5
  #include "defs.h"
6
6
 
7
7
 
8
- RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::PolygonShape)
8
+ RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::PolygonShape)
9
9
 
10
10
  #define THIS to<Reflex::PolygonShape*>(self)
11
11
 
@@ -4,7 +4,7 @@
4
4
  #include "defs.h"
5
5
 
6
6
 
7
- RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::RectShape)
7
+ RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::RectShape)
8
8
 
9
9
  #define THIS to<Reflex::RectShape*>(self)
10
10
 
@@ -113,7 +113,7 @@ Init_reflex ()
113
113
  DEFINE_CONST(KEY_TAB);
114
114
  DEFINE_CONST(KEY_DELETE);
115
115
  DEFINE_CONST(KEY_BACKSPACE);
116
- //DEFINE_CONST(KEY_INSERT);
116
+ DEFINE_CONST(KEY_INSERT);
117
117
  DEFINE_CONST(KEY_ESCAPE);
118
118
 
119
119
  DEFINE_CONST(KEY_LEFT);
@@ -131,10 +131,11 @@ Init_reflex ()
131
131
  DEFINE_CONST(KEY_CONTROL);
132
132
  DEFINE_CONST(KEY_LCONTROL);
133
133
  DEFINE_CONST(KEY_RCONTROL);
134
- //DEFINE_CONST(KEY_LALT);
135
- //DEFINE_CONST(KEY_RALT);
136
- //DEFINE_CONST(KEY_LWIN);
137
- //DEFINE_CONST(KEY_RWIN);
134
+ DEFINE_CONST(KEY_ALT);
135
+ DEFINE_CONST(KEY_LALT);
136
+ DEFINE_CONST(KEY_RALT);
137
+ DEFINE_CONST(KEY_LWIN);
138
+ DEFINE_CONST(KEY_RWIN);
138
139
  DEFINE_CONST(KEY_COMMAND);
139
140
  DEFINE_CONST(KEY_LCOMMAND);
140
141
  DEFINE_CONST(KEY_RCOMMAND);
@@ -163,10 +164,10 @@ Init_reflex ()
163
164
  DEFINE_CONST(KEY_F18);
164
165
  DEFINE_CONST(KEY_F19);
165
166
  DEFINE_CONST(KEY_F20);
166
- //DEFINE_CONST(KEY_F21);
167
- //DEFINE_CONST(KEY_F22);
168
- //DEFINE_CONST(KEY_F23);
169
- //DEFINE_CONST(KEY_F24);
167
+ DEFINE_CONST(KEY_F21);
168
+ DEFINE_CONST(KEY_F22);
169
+ DEFINE_CONST(KEY_F23);
170
+ DEFINE_CONST(KEY_F24);
170
171
 
171
172
  DEFINE_CONST(KEY_NUM_0);
172
173
  DEFINE_CONST(KEY_NUM_1);
@@ -190,56 +191,63 @@ Init_reflex ()
190
191
  DEFINE_CONST(KEY_NUM_ENTER);
191
192
 
192
193
  DEFINE_CONST(KEY_CAPSLOCK);
193
- //DEFINE_CONST(KEY_NUMLOCK);
194
- //DEFINE_CONST(KEY_SCROLLLOCK);
194
+ DEFINE_CONST(KEY_NUMLOCK);
195
+ DEFINE_CONST(KEY_SCROLLLOCK);
195
196
 
196
- //DEFINE_CONST(KEY_PRINTSCREEN);
197
- //DEFINE_CONST(KEY_PAUSE);
198
- //DEFINE_CONST(KEY_BREAK);
197
+ DEFINE_CONST(KEY_PRINTSCREEN);
198
+ DEFINE_CONST(KEY_PAUSE);
199
+ DEFINE_CONST(KEY_BREAK);
199
200
  DEFINE_CONST(KEY_SECTION);
200
201
  DEFINE_CONST(KEY_HELP);
201
202
 
202
- DEFINE_CONST(KEY_IME_EISU);
203
- DEFINE_CONST(KEY_IME_KANA);
204
- //DEFINE_CONST(KEY_IME_KANJI);
205
- //DEFINE_CONST(KEY_IME_JUNJA);
206
- //DEFINE_CONST(KEY_IME_PROCESS);
207
- //DEFINE_CONST(KEY_IME_ACCEPT);
208
- //DEFINE_CONST(KEY_IME_FINAL);
209
- //DEFINE_CONST(KEY_IME_CONVERT);
210
- //DEFINE_CONST(KEY_IME_NONCONVERT);
211
- //DEFINE_CONST(KEY_IME_MODECHANGE);
203
+ DEFINE_CONST(KEY_EISU);
204
+ DEFINE_CONST(KEY_KANA);
205
+ DEFINE_CONST(KEY_KANJI);
206
+ DEFINE_CONST(KEY_IME_ON);
207
+ DEFINE_CONST(KEY_IME_OFF);
208
+ DEFINE_CONST(KEY_IME_MODECHANGE);
209
+ DEFINE_CONST(KEY_CONVERT);
210
+ DEFINE_CONST(KEY_NONCONVERT);
211
+ DEFINE_CONST(KEY_ACCEPT);
212
+ DEFINE_CONST(KEY_PROCESS);
212
213
 
213
214
  DEFINE_CONST(KEY_VOLUME_UP);
214
215
  DEFINE_CONST(KEY_VOLUME_DOWN);
215
216
  DEFINE_CONST(KEY_MUTE);
216
217
 
217
- //DEFINE_CONST(KEY_SLEEP);
218
- //DEFINE_CONST(KEY_EXEC);
219
- //DEFINE_CONST(KEY_PRINT);
220
- //DEFINE_CONST(KEY_APPS);
221
- //DEFINE_CONST(KEY_SELECT);
222
- //DEFINE_CONST(KEY_CLEAR);
223
- //DEFINE_CONST(KEY_PLAY);
224
- //DEFINE_CONST(KEY_ZOOM);
225
-
226
- //DEFINE_CONST(KEY_BROWSER_BACK);
227
- //DEFINE_CONST(KEY_BROWSER_FORWARD);
228
- //DEFINE_CONST(KEY_BROWSER_REFRESH);
229
- //DEFINE_CONST(KEY_BROWSER_STOP);
230
- //DEFINE_CONST(KEY_BROWSER_SEARCH);
231
- //DEFINE_CONST(KEY_BROWSER_FAVORITES);
232
- //DEFINE_CONST(KEY_BROWSER_HOME);
233
-
234
- //DEFINE_CONST(KEY_MEDIA_NEXT_TRACK);
235
- //DEFINE_CONST(KEY_MEDIA_PREV_TRACK);
236
- //DEFINE_CONST(KEY_MEDIA_STOP);
237
- //DEFINE_CONST(KEY_MEDIA_PLAY_PAUSE);
238
-
239
- //DEFINE_CONST(KEY_LAUNCH_MAIL);
240
- //DEFINE_CONST(KEY_LAUNCH_MEDIA_SELECT);
241
- //DEFINE_CONST(KEY_LAUNCH_APP1);
242
- //DEFINE_CONST(KEY_LAUNCH_APP2);
218
+ DEFINE_CONST(KEY_SLEEP);
219
+ DEFINE_CONST(KEY_EXEC);
220
+ DEFINE_CONST(KEY_PRINT);
221
+ DEFINE_CONST(KEY_APPS);
222
+ DEFINE_CONST(KEY_SELECT);
223
+ DEFINE_CONST(KEY_CLEAR);
224
+
225
+ DEFINE_CONST(KEY_NAVIGATION_VIEW);
226
+ DEFINE_CONST(KEY_NAVIGATION_MENU);
227
+ DEFINE_CONST(KEY_NAVIGATION_UP);
228
+ DEFINE_CONST(KEY_NAVIGATION_DOWN);
229
+ DEFINE_CONST(KEY_NAVIGATION_LEFT);
230
+ DEFINE_CONST(KEY_NAVIGATION_RIGHT);
231
+ DEFINE_CONST(KEY_NAVIGATION_ACCEPT);
232
+ DEFINE_CONST(KEY_NAVIGATION_CANCEL);
233
+
234
+ DEFINE_CONST(KEY_BROWSER_BACK);
235
+ DEFINE_CONST(KEY_BROWSER_FORWARD);
236
+ DEFINE_CONST(KEY_BROWSER_REFRESH);
237
+ DEFINE_CONST(KEY_BROWSER_STOP);
238
+ DEFINE_CONST(KEY_BROWSER_SEARCH);
239
+ DEFINE_CONST(KEY_BROWSER_FAVORITES);
240
+ DEFINE_CONST(KEY_BROWSER_HOME);
241
+
242
+ DEFINE_CONST(KEY_MEDIA_PREV_TRACK);
243
+ DEFINE_CONST(KEY_MEDIA_NEXT_TRACK);
244
+ DEFINE_CONST(KEY_MEDIA_PLAY_PAUSE);
245
+ DEFINE_CONST(KEY_MEDIA_STOP);
246
+
247
+ DEFINE_CONST(KEY_LAUNCH_MAIL);
248
+ DEFINE_CONST(KEY_LAUNCH_MEDIA_SELECT);
249
+ DEFINE_CONST(KEY_LAUNCH_APP1);
250
+ DEFINE_CONST(KEY_LAUNCH_APP2);
243
251
 
244
252
  DEFINE_CONST(MOD_SHIFT);
245
253
  DEFINE_CONST(MOD_CONTROL);
@@ -5,7 +5,7 @@
5
5
  #include "defs.h"
6
6
 
7
7
 
8
- RUCY_DEFINE_VALUE_FROM_TO(Reflex::Screen)
8
+ RUCY_DEFINE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::Screen)
9
9
 
10
10
  #define THIS to<Reflex::Screen*>(self)
11
11
 
@@ -5,7 +5,7 @@
5
5
  #include "defs.h"
6
6
 
7
7
 
8
- RUCY_DEFINE_VALUE_FROM_TO(Reflex::ScrollEvent)
8
+ RUCY_DEFINE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::ScrollEvent)
9
9
 
10
10
  #define THIS to<Reflex::ScrollEvent*>(self)
11
11
 
@@ -5,7 +5,7 @@
5
5
  #include "defs.h"
6
6
 
7
7
 
8
- RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(Reflex::Selector)
8
+ RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(REFLEX_EXPORT, Reflex::Selector)
9
9
 
10
10
  #define THIS to< Reflex::Selector*>(self)
11
11
  #define C_THIS to<const Reflex::Selector*>(self)
@@ -131,7 +131,7 @@ namespace Rucy
131
131
  {
132
132
 
133
133
 
134
- template <> Reflex::Selector
134
+ template <> REFLEX_EXPORT Reflex::Selector
135
135
  value_to<Reflex::Selector> (int argc, const Value* argv, bool convert)
136
136
  {
137
137
  if (argc == 1 && argv->is_array())
@@ -8,7 +8,7 @@
8
8
  #include "selector.h"
9
9
 
10
10
 
11
- RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::Shape)
11
+ RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::Shape)
12
12
 
13
13
  #define THIS to<Reflex::Shape*>(self)
14
14
 
@@ -8,7 +8,7 @@
8
8
  #include "selector.h"
9
9
 
10
10
 
11
- RUCY_DEFINE_VALUE_FROM_TO(Reflex::Style)
11
+ RUCY_DEFINE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::Style)
12
12
 
13
13
  #define THIS to< Reflex::Style*>(self)
14
14
  #define C_THIS to<const Reflex::Style*>(self)