Author: titmuss
Date: Fri Apr 25 14:02:13 2008
New Revision: 2372
URL: http://svn.slimdevices.com?rev=2372&root=Jive&view=rev
Log:
Bug: N/A
Description:
Added mouse move event.
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
7.2/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
7.2/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Menu.lua
7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive.h
7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_event.c
7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c
7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_window.c
7.2/trunk/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.c
7.2/trunk/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.pkg
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua?rev=2372&root=Jive&r1=2371&r2=2372&view=diff
==============================================================================
---
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
(original)
+++
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
Fri Apr 25 14:02:13 2008
@@ -64,7 +64,7 @@
-- listener to restart screensaver timer
Framework:addListener(
- EVENT_KEY_PRESS | EVENT_KEY_HOLD | EVENT_SCROLL | EVENT_MOTION,
+ EVENT_KEY_PRESS | EVENT_KEY_HOLD | EVENT_SCROLL |
EVENT_MOUSE_ALL | EVENT_MOTION,
function(event)
-- restart timer if it is running
self.timer:setInterval(self.timeout)
@@ -192,7 +192,7 @@
end)
-- key or scroll events quit the screensaver
- window:addListener(EVENT_KEY_PRESS | EVENT_KEY_HOLD | EVENT_SCROLL,
+ window:addListener(EVENT_KEY_PRESS | EVENT_KEY_HOLD | EVENT_SCROLL |
EVENT_MOUSE_ALL,
function(event)
-- close all screensaver windows
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua?rev=2372&root=Jive&r1=2371&r2=2372&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua Fri Apr
25 14:02:13 2008
@@ -180,6 +180,7 @@
module.EVENT_MOUSE_UP = jive.ui.EVENT_MOUSE_UP
module.EVENT_MOUSE_PRESS = jive.ui.EVENT_MOUSE_PRESS
module.EVENT_MOUSE_HOLD = jive.ui.EVENT_MOUSE_HOLD
+ module.EVENT_MOUSE_MOVE = jive.ui.EVENT_MOUSE_MOVE
module.EVENT_MOUSE_DRAG = jive.ui.EVENT_MOUSE_DRAG
module.EVENT_WINDOW_PUSH = jive.ui.EVENT_WINDOW_PUSH
module.EVENT_WINDOW_POP = jive.ui.EVENT_WINDOW_POP
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Menu.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Menu.lua?rev=2372&root=Jive&r1=2371&r2=2372&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Menu.lua (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/ui/Menu.lua Fri Apr 25
14:02:13 2008
@@ -65,6 +65,7 @@
local EVENT_FOCUS_LOST = jive.ui.EVENT_FOCUS_LOST
local EVENT_MOUSE_PRESS = jive.ui.EVENT_MOUSE_PRESS
local EVENT_MOUSE_DOWN = jive.ui.EVENT_MOUSE_DOWN
+local EVENT_MOUSE_MOVE = jive.ui.EVENT_MOUSE_MOVE
local EVENT_MOUSE_DRAG = jive.ui.EVENT_MOUSE_DRAG
local EVENT_CONSUME = jive.ui.EVENT_CONSUME
@@ -208,6 +209,7 @@
end
elseif evtype == EVENT_MOUSE_DOWN or
+ evtype == EVENT_MOUSE_MOVE or
evtype == EVENT_MOUSE_DRAG then
if self.scrollbar:mouseInside(event) then
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive.h
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive.h?rev=2372&root=Jive&r1=2371&r2=2372&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive.h (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive.h Fri Apr 25 14:02:13 2008
@@ -66,42 +66,43 @@
typedef enum {
- JIVE_EVENT_NONE = 0x000000,
-
- JIVE_EVENT_SCROLL = 0x000001,
- JIVE_EVENT_ACTION = 0x000002,
+ JIVE_EVENT_NONE = 0x00000000,
+
+ JIVE_EVENT_SCROLL = 0x00000001,
+ JIVE_EVENT_ACTION = 0x00000002,
- JIVE_EVENT_KEY_DOWN = 0x000010,
- JIVE_EVENT_KEY_UP = 0x000020,
- JIVE_EVENT_KEY_PRESS = 0x000040,
- JIVE_EVENT_KEY_HOLD = 0x000080,
-
- JIVE_EVENT_MOUSE_DOWN = 0x000100,
- JIVE_EVENT_MOUSE_UP = 0x000200,
- JIVE_EVENT_MOUSE_PRESS = 0x000400,
- JIVE_EVENT_MOUSE_HOLD = 0x000800,
+ JIVE_EVENT_KEY_DOWN = 0x00000010,
+ JIVE_EVENT_KEY_UP = 0x00000020,
+ JIVE_EVENT_KEY_PRESS = 0x00000040,
+ JIVE_EVENT_KEY_HOLD = 0x00000080,
+
+ JIVE_EVENT_MOUSE_DOWN = 0x00000100,
+ JIVE_EVENT_MOUSE_UP = 0x00000200,
+ JIVE_EVENT_MOUSE_PRESS = 0x00000400,
+ JIVE_EVENT_MOUSE_HOLD = 0x00000800,
+ JIVE_EVENT_MOUSE_MOVE = 0x01000000,
+ JIVE_EVENT_MOUSE_DRAG = 0x00100000,
- JIVE_EVENT_WINDOW_PUSH = 0x001000,
- JIVE_EVENT_WINDOW_POP = 0x002000,
- JIVE_EVENT_WINDOW_ACTIVE = 0x004000,
- JIVE_EVENT_WINDOW_INACTIVE = 0x008000,
-
- JIVE_EVENT_SHOW = 0x010000,
- JIVE_EVENT_HIDE = 0x020000,
- JIVE_EVENT_FOCUS_GAINED = 0x040000,
- JIVE_EVENT_FOCUS_LOST = 0x080000,
-
- JIVE_EVENT_MOUSE_DRAG = 0x100000,
- JIVE_EVENT_WINDOW_RESIZE = 0x200000,
- JIVE_EVENT_SWITCH = 0x400000,
- JIVE_EVENT_MOTION = 0x800000,
+ JIVE_EVENT_WINDOW_PUSH = 0x00001000,
+ JIVE_EVENT_WINDOW_POP = 0x00002000,
+ JIVE_EVENT_WINDOW_ACTIVE = 0x00004000,
+ JIVE_EVENT_WINDOW_INACTIVE = 0x00008000,
+
+ JIVE_EVENT_SHOW = 0x00010000,
+ JIVE_EVENT_HIDE = 0x00020000,
+ JIVE_EVENT_FOCUS_GAINED = 0x00040000,
+ JIVE_EVENT_FOCUS_LOST = 0x00080000,
+
+ JIVE_EVENT_WINDOW_RESIZE = 0x00200000,
+ JIVE_EVENT_SWITCH = 0x00400000,
+ JIVE_EVENT_MOTION = 0x00800000,
JIVE_EVENT_KEY_ALL = ( JIVE_EVENT_KEY_DOWN |
JIVE_EVENT_KEY_UP | JIVE_EVENT_KEY_PRESS | JIVE_EVENT_KEY_HOLD ),
- JIVE_EVENT_MOUSE_ALL = ( JIVE_EVENT_MOUSE_DOWN |
JIVE_EVENT_MOUSE_PRESS | JIVE_EVENT_MOUSE_HOLD | JIVE_EVENT_MOUSE_DRAG ),
+ JIVE_EVENT_MOUSE_ALL = ( JIVE_EVENT_MOUSE_DOWN |
JIVE_EVENT_MOUSE_PRESS | JIVE_EVENT_MOUSE_HOLD | JIVE_EVENT_MOUSE_MOVE |
JIVE_EVENT_MOUSE_DRAG ),
JIVE_EVENT_ALL_INPUT = ( JIVE_EVENT_KEY_ALL |
JIVE_EVENT_MOUSE_ALL | JIVE_EVENT_SCROLL),
JIVE_EVENT_VISIBLE_ALL = ( JIVE_EVENT_SHOW | JIVE_EVENT_HIDE ),
- JIVE_EVENT_ALL = 0xFFFFFF,
+ JIVE_EVENT_ALL = 0x7FFFFFFF,
} JiveEventType;
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_event.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_event.c?rev=2372&root=Jive&r1=2371&r2=2372&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_event.c (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_event.c Fri Apr 25
14:02:13 2008
@@ -60,6 +60,8 @@
case JIVE_EVENT_MOUSE_UP:
case JIVE_EVENT_MOUSE_PRESS:
case JIVE_EVENT_MOUSE_HOLD:
+ case JIVE_EVENT_MOUSE_MOVE:
+ case JIVE_EVENT_MOUSE_DRAG:
event->u.mouse.x = lua_tointeger(L, 3);
event->u.mouse.y = lua_tointeger(L, 4);
break;
@@ -146,6 +148,7 @@
case JIVE_EVENT_MOUSE_UP:
case JIVE_EVENT_MOUSE_PRESS:
case JIVE_EVENT_MOUSE_HOLD:
+ case JIVE_EVENT_MOUSE_MOVE:
case JIVE_EVENT_MOUSE_DRAG:
lua_pushinteger(L, event->u.mouse.x);
lua_pushinteger(L, event->u.mouse.y);
@@ -247,6 +250,9 @@
case JIVE_EVENT_MOUSE_HOLD:
lua_pushfstring(L, "MOUSE_HOLD x=%d,y=%d", event->u.mouse.x,
event->u.mouse.y);
break;
+ case JIVE_EVENT_MOUSE_MOVE:
+ lua_pushfstring(L, "MOUSE_MOVE x=%d,y=%d", event->u.mouse.x,
event->u.mouse.y);
+ break;
case JIVE_EVENT_MOUSE_DRAG:
lua_pushfstring(L, "MOUSE_DRAG x=%d,y=%d", event->u.mouse.x,
event->u.mouse.y);
break;
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c?rev=2372&root=Jive&r1=2371&r2=2372&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_framework.c Fri Apr 25
14:02:13 2008
@@ -1026,12 +1026,19 @@
break;
case SDL_MOUSEMOTION:
- if (event->motion.state & SDL_BUTTON(1) && mouse_state !=
MOUSE_STATE_SENT) {
- jevent.type = JIVE_EVENT_MOUSE_DRAG;
+ if (event->motion.state & SDL_BUTTON(1)) {
+ if (mouse_state != MOUSE_STATE_SENT) {
+ jevent.type = JIVE_EVENT_MOUSE_DRAG;
+ jevent.u.mouse.x = event->motion.x;
+ jevent.u.mouse.y = event->motion.y;
+
+ mouse_state = MOUSE_STATE_DRAG;
+ }
+ }
+ else {
+ jevent.type = JIVE_EVENT_MOUSE_MOVE;
jevent.u.mouse.x = event->motion.x;
jevent.u.mouse.y = event->motion.y;
-
- mouse_state = MOUSE_STATE_DRAG;
}
break;
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_window.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_window.c?rev=2372&root=Jive&r1=2371&r2=2372&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_window.c (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/jive_window.c Fri Apr 25
14:02:13 2008
@@ -352,8 +352,8 @@
case JIVE_EVENT_MOUSE_UP:
case JIVE_EVENT_MOUSE_PRESS:
case JIVE_EVENT_MOUSE_HOLD:
+ case JIVE_EVENT_MOUSE_MOVE:
case JIVE_EVENT_MOUSE_DRAG:
-
/* Forward mouse events to the enclosed widgets */
if (jive_getmethod(L, 1, "iterate")) {
lua_pushvalue(L, 1); // widget
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.c?rev=2372&root=Jive&r1=2371&r2=2372&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.c (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.c Fri Apr 25
14:02:13 2008
@@ -2187,6 +2187,8 @@
tolua_constant(tolua_S,"EVENT_MOUSE_UP",JIVE_EVENT_MOUSE_UP);
tolua_constant(tolua_S,"EVENT_MOUSE_PRESS",JIVE_EVENT_MOUSE_PRESS);
tolua_constant(tolua_S,"EVENT_MOUSE_HOLD",JIVE_EVENT_MOUSE_HOLD);
+ tolua_constant(tolua_S,"EVENT_MOUSE_MOVE",JIVE_EVENT_MOUSE_MOVE);
+ tolua_constant(tolua_S,"EVENT_MOUSE_DRAG",JIVE_EVENT_MOUSE_DRAG);
tolua_constant(tolua_S,"EVENT_WINDOW_PUSH",JIVE_EVENT_WINDOW_PUSH);
tolua_constant(tolua_S,"EVENT_WINDOW_POP",JIVE_EVENT_WINDOW_POP);
tolua_constant(tolua_S,"EVENT_WINDOW_ACTIVE",JIVE_EVENT_WINDOW_ACTIVE);
@@ -2195,7 +2197,6 @@
tolua_constant(tolua_S,"EVENT_HIDE",JIVE_EVENT_HIDE);
tolua_constant(tolua_S,"EVENT_FOCUS_GAINED",JIVE_EVENT_FOCUS_GAINED);
tolua_constant(tolua_S,"EVENT_FOCUS_LOST",JIVE_EVENT_FOCUS_LOST);
- tolua_constant(tolua_S,"EVENT_MOUSE_DRAG",JIVE_EVENT_MOUSE_DRAG);
tolua_constant(tolua_S,"EVENT_WINDOW_RESIZE",JIVE_EVENT_WINDOW_RESIZE);
tolua_constant(tolua_S,"EVENT_SWITCH",JIVE_EVENT_SWITCH);
tolua_constant(tolua_S,"EVENT_MOTION",JIVE_EVENT_MOTION);
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.pkg
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.pkg?rev=2372&root=Jive&r1=2371&r2=2372&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.pkg (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.pkg Fri Apr 25
14:02:13 2008
@@ -76,41 +76,42 @@
typedef enum {
- JIVE_EVENT_NONE @ EVENT_NONE = 0x000000,
-
- JIVE_EVENT_SCROLL @ EVENT_SCROLL = 0x000001,
- JIVE_EVENT_ACTION @ EVENT_ACTION = 0x000002,
+ JIVE_EVENT_NONE @ EVENT_NONE = 0x00000000,
+
+ JIVE_EVENT_SCROLL @ EVENT_SCROLL = 0x00000001,
+ JIVE_EVENT_ACTION @ EVENT_ACTION = 0x00000002,
- JIVE_EVENT_KEY_DOWN @ EVENT_KEY_DOWN = 0x000010,
- JIVE_EVENT_KEY_UP @ EVENT_KEY_UP = 0x000020,
- JIVE_EVENT_KEY_PRESS @ EVENT_KEY_PRESS = 0x000040,
- JIVE_EVENT_KEY_HOLD @ EVENT_KEY_HOLD = 0x000080,
-
- JIVE_EVENT_MOUSE_DOWN @ EVENT_MOUSE_DOWN = 0x000100,
- JIVE_EVENT_MOUSE_UP @ EVENT_MOUSE_UP = 0x000200,
- JIVE_EVENT_MOUSE_PRESS @ EVENT_MOUSE_PRESS = 0x000400,
- JIVE_EVENT_MOUSE_HOLD @ EVENT_MOUSE_HOLD = 0x000800,
+ JIVE_EVENT_KEY_DOWN @ EVENT_KEY_DOWN = 0x00000010,
+ JIVE_EVENT_KEY_UP @ EVENT_KEY_UP = 0x00000020,
+ JIVE_EVENT_KEY_PRESS @ EVENT_KEY_PRESS = 0x00000040,
+ JIVE_EVENT_KEY_HOLD @ EVENT_KEY_HOLD = 0x00000080,
+
+ JIVE_EVENT_MOUSE_DOWN @ EVENT_MOUSE_DOWN = 0x00000100,
+ JIVE_EVENT_MOUSE_UP @ EVENT_MOUSE_UP = 0x00000200,
+ JIVE_EVENT_MOUSE_PRESS @ EVENT_MOUSE_PRESS = 0x00000400,
+ JIVE_EVENT_MOUSE_HOLD @ EVENT_MOUSE_HOLD = 0x00000800,
+ JIVE_EVENT_MOUSE_MOVE @ EVENT_MOUSE_MOVE = 0x01000000,
+ JIVE_EVENT_MOUSE_DRAG @ EVENT_MOUSE_DRAG = 0x00100000,
- JIVE_EVENT_WINDOW_PUSH @ EVENT_WINDOW_PUSH = 0x001000,
- JIVE_EVENT_WINDOW_POP @ EVENT_WINDOW_POP = 0x002000,
- JIVE_EVENT_WINDOW_ACTIVE @ EVENT_WINDOW_ACTIVE = 0x004000,
- JIVE_EVENT_WINDOW_INACTIVE @ EVENT_WINDOW_INACTIVE = 0x008000,
-
- JIVE_EVENT_SHOW @ EVENT_SHOW = 0x010000,
- JIVE_EVENT_HIDE @ EVENT_HIDE = 0x020000,
- JIVE_EVENT_FOCUS_GAINED @ EVENT_FOCUS_GAINED = 0x040000,
- JIVE_EVENT_FOCUS_LOST @ EVENT_FOCUS_LOST = 0x080000,
-
- JIVE_EVENT_MOUSE_DRAG @ EVENT_MOUSE_DRAG = 0x100000,
- JIVE_EVENT_WINDOW_RESIZE @ EVENT_WINDOW_RESIZE = 0x200000,
- JIVE_EVENT_SWITCH @ EVENT_SWITCH = 0x400000,
- JIVE_EVENT_MOTION @ EVENT_MOTION = 0x800000,
+ JIVE_EVENT_WINDOW_PUSH @ EVENT_WINDOW_PUSH = 0x00001000,
+ JIVE_EVENT_WINDOW_POP @ EVENT_WINDOW_POP = 0x00002000,
+ JIVE_EVENT_WINDOW_ACTIVE @ EVENT_WINDOW_ACTIVE = 0x00004000,
+ JIVE_EVENT_WINDOW_INACTIVE @ EVENT_WINDOW_INACTIVE = 0x00008000,
+
+ JIVE_EVENT_SHOW @ EVENT_SHOW = 0x00010000,
+ JIVE_EVENT_HIDE @ EVENT_HIDE = 0x00020000,
+ JIVE_EVENT_FOCUS_GAINED @ EVENT_FOCUS_GAINED = 0x00040000,
+ JIVE_EVENT_FOCUS_LOST @ EVENT_FOCUS_LOST = 0x00080000,
+
+ JIVE_EVENT_WINDOW_RESIZE @ EVENT_WINDOW_RESIZE = 0x00200000,
+ JIVE_EVENT_SWITCH @ EVENT_SWITCH = 0x00400000,
+ JIVE_EVENT_MOTION @ EVENT_MOTION = 0x00800000,
JIVE_EVENT_KEY_ALL @ EVENT_KEY_ALL = ( JIVE_EVENT_KEY_DOWN
| JIVE_EVENT_KEY_UP | JIVE_EVENT_KEY_PRESS | JIVE_EVENT_KEY_HOLD ),
JIVE_EVENT_MOUSE_ALL @ EVENT_MOUSE_ALL = (
JIVE_EVENT_MOUSE_DOWN | JIVE_EVENT_MOUSE_PRESS | JIVE_EVENT_MOUSE_HOLD ),
JIVE_EVENT_ALL_INPUT @ EVENT_ALL_INPUT = ( JIVE_EVENT_KEY_ALL
| JIVE_EVENT_MOUSE_ALL | JIVE_EVENT_SCROLL),
JIVE_EVENT_VISIBLE_ALL @ EVENT_VISIBLE_ALL = (
JIVE_EVENT_SHOW | JIVE_EVENT_HIDE ),
- JIVE_EVENT_ALL @ EVENT_ALL = 0xFFFFFF,
+ JIVE_EVENT_ALL @ EVENT_ALL = 0xFFFFFFFF,
} EventType;
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
