Revision: 4437
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4437&view=rev
Author: ossman_
Date: 2011-05-20 14:55:10 +0000 (Fri, 20 May 2011)
Log Message:
-----------
Add support for multimedia keys.
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/config.h.cmake.in
trunk/vncviewer/Viewport.cxx
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2011-05-20 14:53:32 UTC (rev 4436)
+++ trunk/CMakeLists.txt 2011-05-20 14:55:10 UTC (rev 4437)
@@ -191,6 +191,9 @@
# FLTK STR #2636
check_cxx_source_compiles("#include <FL/Fl.H>\nint main(int c, char** v) {
Fl::add_clipboard_notify(NULL, NULL); return 0; }" HAVE_FLTK_CLIPBOARD)
+ # FLTK STR #2638
+ check_cxx_source_compiles("#include <FL/Enumerations.H>\nint main(int c,
char** v) { return FL_Volume_Down; }" HAVE_FLTK_MEDIAKEYS)
+
set(CMAKE_REQUIRED_INCLUDES)
set(CMAKE_REQUIRED_LIBRARIES)
endif()
Modified: trunk/config.h.cmake.in
===================================================================
--- trunk/config.h.cmake.in 2011-05-20 14:53:32 UTC (rev 4436)
+++ trunk/config.h.cmake.in 2011-05-20 14:55:10 UTC (rev 4437)
@@ -13,6 +13,7 @@
#cmakedefine HAVE_GNUTLS_SIGN_ALGORITHM_T
#cmakedefine HAVE_FLTK_DEAD_KEYS
#cmakedefine HAVE_FLTK_CLIPBOARD
+#cmakedefine HAVE_FLTK_MEDIAKEYS
#cmakedefine ENABLE_NLS 1
/* MS Visual Studio 2008 and newer doesn't know ssize_t */
Modified: trunk/vncviewer/Viewport.cxx
===================================================================
--- trunk/vncviewer/Viewport.cxx 2011-05-20 14:53:32 UTC (rev 4436)
+++ trunk/vncviewer/Viewport.cxx 2011-05-20 14:55:10 UTC (rev 4437)
@@ -34,6 +34,10 @@
#include <rfb/keysymdef.h>
#endif
+#ifndef XF86XK_ModeLock
+#include <rfb/XF86keysym.h>
+#endif
+
#include "Viewport.h"
#include "CConn.h"
#include "OptionsDialog.h"
@@ -442,6 +446,40 @@
return XK_KP_Decimal;
case FL_KP + '/':
return XK_KP_Divide;
+#ifdef HAVE_FLTK_MEDIAKEYS
+ case FL_Volume_Down:
+ return XF86XK_AudioLowerVolume;
+ case FL_Volume_Mute:
+ return XF86XK_AudioMute;
+ case FL_Volume_Up:
+ return XF86XK_AudioRaiseVolume;
+ case FL_Media_Play:
+ return XF86XK_AudioPlay;
+ case FL_Media_Stop:
+ return XF86XK_AudioStop;
+ case FL_Media_Prev:
+ return XF86XK_AudioPrev;
+ case FL_Media_Next:
+ return XF86XK_AudioNext;
+ case FL_Home_Page:
+ return XF86XK_HomePage;
+ case FL_Mail:
+ return XF86XK_Mail;
+ case FL_Search:
+ return XF86XK_Search;
+ case FL_Back:
+ return XF86XK_Back;
+ case FL_Forward:
+ return XF86XK_Forward;
+ case FL_Stop:
+ return XF86XK_Stop;
+ case FL_Refresh:
+ return XF86XK_Refresh;
+ case FL_Sleep:
+ return XF86XK_Sleep;
+ case FL_Favorites:
+ return XF86XK_Favorites;
+#endif
case XK_ISO_Level3_Shift:
// FLTK tends to let this one leak through on X11...
return XK_ISO_Level3_Shift;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its
next-generation tools to help Windows* and Linux* C/C++ and Fortran
developers boost performance applications - including clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
