[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog cygnal/cygnal.cpp gui/fltk.cpp ...
From: |
Bastiaan Jacques |
Subject: |
[Gnash-commit] gnash ChangeLog cygnal/cygnal.cpp gui/fltk.cpp ... |
Date: |
Wed, 23 May 2007 13:59:32 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Bastiaan Jacques <bjacques> 07/05/23 13:59:32
Modified files:
. : ChangeLog
cygnal : cygnal.cpp
gui : fltk.cpp
macros : gnashpkgtool.m4
Log message:
* cygnal/cygnal.cpp: Don't include <libintl.h> directly;
instead,
rely on our own gettext.h to do the right thing.
* gui/fltk.cpp: Update the FLTK GUI to the new Gnash key
handling
API. Make sure the window is listening for key events even if
it
is not the first window to receive key notifications.
* macros/gnashpkgtool.m4: Don't forget to set the found flag
for CFLAGS when --with-pkg-incl is used to find the include
path.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3315&r2=1.3316
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/cygnal.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/fltk.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.40&r2=1.41
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3315
retrieving revision 1.3316
diff -u -b -r1.3315 -r1.3316
--- ChangeLog 23 May 2007 11:38:21 -0000 1.3315
+++ ChangeLog 23 May 2007 13:59:31 -0000 1.3316
@@ -1,3 +1,13 @@
+2007-05-23 Bastiaan Jacques <address@hidden>
+
+ * cygnal/cygnal.cpp: Don't include <libintl.h> directly; instead,
+ rely on our own gettext.h to do the right thing.
+ * gui/fltk.cpp: Update the FLTK GUI to the new Gnash key handling
+ API. Make sure the window is listening for key events even if it
+ is not the first window to receive key notifications.
+ * macros/gnashpkgtool.m4: Don't forget to set the "found" flag
+ for CFLAGS when --with-pkg-incl is used to find the include path.
+
2007-05-23 Tomas Groth Christensen <address@hidden>
* backend/sound_handler_sdl.cpp: Made it a bit more thread-safe by
Index: cygnal/cygnal.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/cygnal.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- cygnal/cygnal.cpp 14 May 2007 09:44:20 -0000 1.10
+++ cygnal/cygnal.cpp 23 May 2007 13:59:31 -0000 1.11
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: cygnal.cpp,v 1.10 2007/05/14 09:44:20 jgilmore Exp $ */
+/* $Id: cygnal.cpp,v 1.11 2007/05/23 13:59:31 bjacques Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -52,7 +52,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <libintl.h>
+#include "gettext.h"
#ifdef ENABLE_NLS
#include <locale.h>
Index: gui/fltk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/fltk.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gui/fltk.cpp 9 May 2007 10:19:58 -0000 1.11
+++ gui/fltk.cpp 23 May 2007 13:59:31 -0000 1.12
@@ -114,6 +114,7 @@
notify_mouse_moved(x, y);
return Window::handle(event);;
}
+ case SHORTCUT:
case KEY:
handleKey(event_key());
return true;
@@ -134,12 +135,6 @@
{ TabKey, gnash::key::TAB },
{ ClearKey, gnash::key::CLEAR },
{ ReturnKey, gnash::key::ENTER },
- { LeftShiftKey, gnash::key::SHIFT },
- { RightShiftKey, gnash::key::SHIFT },
- { LeftCtrlKey, gnash::key::CONTROL },
- { RightCtrlKey, gnash::key::CONTROL },
- { LeftAltKey, gnash::key::ALT },
- { RightAltKey, gnash::key::ALT },
{ CapsLockKey, gnash::key::CAPSLOCK },
{ EscapeKey, gnash::key::ESCAPE },
{ SpaceKey, gnash::key::SPACE },
@@ -170,10 +165,24 @@
#endif
};
+ int modifier = gnash::key::MOD_NONE;
+
+ unsigned long state = event_state();
+
+ if (state & SHIFT) {
+ modifier = modifier | gnash::key::MOD_SHIFT;
+ }
+ if (state & CTRL) {
+ modifier = modifier | gnash::key::MOD_CONTROL;
+ }
+ if (state & ALT) {
+ modifier = modifier | gnash::key::MOD_ALT;
+ }
for (int i = 0; table[i].fltkKey; i++) {
if (key == table[i].fltkKey) {
- notify_key_event((gnash::key::code)table[i].gnashKey, true);
+ notify_key_event((gnash::key::code)table[i].gnashKey, modifier,
+ true);
break;
}
}
Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- macros/gnashpkgtool.m4 8 Apr 2007 23:06:17 -0000 1.40
+++ macros/gnashpkgtool.m4 23 May 2007 13:59:32 -0000 1.41
@@ -14,7 +14,7 @@
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: gnashpkgtool.m4,v 1.40 2007/04/08 23:06:17 rsavoye Exp $
+dnl $Id: gnashpkgtool.m4,v 1.41 2007/05/23 13:59:32 bjacques Exp $
dnl Generic macros for finding and setting include-paths and library-path
dnl for packages. Implements GNASH_PKG_INCLUDES() and GNASH_PKG_LIBS().
@@ -55,6 +55,7 @@
if test x"${with_$1_incl}" != x ; then
if test -f ${with_$1_incl}/$2 ; then
ac_cv_path_$1_incl=-I`(cd ${with_$1_incl}; pwd)`
+ found_$1_incl="yes"
else
AC_MSG_ERROR([${with_$1_incl} directory doesn't contain $2.])
fi
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog cygnal/cygnal.cpp gui/fltk.cpp ...,
Bastiaan Jacques <=