Author: richard
Date: Tue Feb 24 06:15:22 2009
New Revision: 4434
URL: http://svn.slimdevices.com/jive?rev=4434&view=rev
Log:
r4...@harrypotter (orig r4432): richard | 2009-02-24 13:51:47 +0000
Bug: N/A
Description:
Add support for Print Screen key, to take screenshots.
r4...@harrypotter (orig r4433): richard | 2009-02-24 14:13:25 +0000
Bug: N/A
Description:
Also use sysreq key for screenshots.
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/InputToActionMap.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive.h
7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_framework.c
7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.c
7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.pkg
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Feb 24 06:15:22 2009
@@ -4,7 +4,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:4138
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4426
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4433
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/InputToActionMap.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/InputToActionMap.lua?rev=4434&r1=4433&r2=4434&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/InputToActionMap.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/InputToActionMap.lua
Tue Feb 24 06:15:22 2009
@@ -78,6 +78,7 @@
[KEY_REW] = "jump_rew",
[KEY_VOLUME_UP] = "volume_up",
[KEY_VOLUME_DOWN] = "volume_down",
+ [KEY_PRINT] = "take_screenshot",
}
--Hmm, this won't work yet since we still look for KEY_PRESS in a lot of
places, and would get double responses
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua?rev=4434&r1=4433&r2=4434&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
Tue Feb 24 06:15:22 2009
@@ -221,6 +221,7 @@
module.KEY_PAGE_DOWN = jive.ui.KEY_PAGE_DOWN
module.KEY_VOLUME_UP = jive.ui.KEY_VOLUME_UP
module.KEY_VOLUME_DOWN = jive.ui.KEY_VOLUME_DOWN
+ module.KEY_PRINT = jive.ui.KEY_PRINT
module.FRAME_RATE = jive.ui.FRAME_RATE
end
Modified: 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive.h
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive.h?rev=4434&r1=4433&r2=4434&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive.h (original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive.h Tue Feb 24
06:15:22 2009
@@ -144,6 +144,7 @@
JIVE_KEY_VOLUME_DOWN = 0x2000,
JIVE_KEY_PAGE_UP = 0x4000,
JIVE_KEY_PAGE_DOWN = 0x8000,
+ JIVE_KEY_PRINT = 0x10000,
} JiveKey;
Modified: 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_framework.c
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_framework.c?rev=4434&r1=4433&r2=4434&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_framework.c
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_framework.c Tue
Feb 24 06:15:22 2009
@@ -89,6 +89,8 @@
{ SDLK_AudioLowerVolume,JIVE_KEY_VOLUME_DOWN },
{ SDLK_PAGEUP, JIVE_KEY_PAGE_UP },
{ SDLK_PAGEDOWN, JIVE_KEY_PAGE_DOWN },
+ { SDLK_PRINT, JIVE_KEY_PRINT },
+ { SDLK_SYSREQ, JIVE_KEY_PRINT },
{ SDLK_UNKNOWN, JIVE_KEY_NONE },
};
Modified: 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.c
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.c?rev=4434&r1=4433&r2=4434&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.c
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.c Tue Feb
24 06:15:22 2009
@@ -2228,6 +2228,7 @@
tolua_constant(tolua_S,"KEY_VOLUME_DOWN",JIVE_KEY_VOLUME_DOWN);
tolua_constant(tolua_S,"KEY_PAGE_UP",JIVE_KEY_PAGE_UP);
tolua_constant(tolua_S,"KEY_PAGE_DOWN",JIVE_KEY_PAGE_DOWN);
+ tolua_constant(tolua_S,"KEY_PRINT",JIVE_KEY_PRINT);
tolua_cclass(tolua_S,"Surface","Surface","",tolua_jive_jive_ui_Surface_free00);
tolua_beginmodule(tolua_S,"Surface");
tolua_function(tolua_S,"newRGB",tolua_jive_jive_ui_Surface_newRGB00);
Modified: 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.pkg
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.pkg?rev=4434&r1=4433&r2=4434&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.pkg
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/lua_jiveui.pkg Tue
Feb 24 06:15:22 2009
@@ -139,6 +139,7 @@
JIVE_KEY_FWD @ KEY_FWD = 0x0800,
JIVE_KEY_VOLUME_UP @ KEY_VOLUME_UP = 0x1000,
JIVE_KEY_VOLUME_DOWN @ KEY_VOLUME_DOWN = 0x2000,
+ JIVE_KEY_PRINT @ KEY_PRINT = 0x10000,
} Key;
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
