[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog configure.ac gui/gtk.cpp gui/gt...
From: |
Bastiaan Jacques |
Subject: |
[Gnash-commit] gnash ChangeLog configure.ac gui/gtk.cpp gui/gt... |
Date: |
Sun, 22 Oct 2006 17:45:43 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Bastiaan Jacques <bjacques> 06/10/22 17:45:43
Modified files:
. : ChangeLog configure.ac
gui : gtk.cpp gtksup.h gui.cpp gui.h
libbase : log.h
Log message:
* libbase/log.h: size_t cannot be long long, so don't check for
it.
* configure.ac: Don't check for long long as it's unused.
* gui/gui{.h,.cpp}: Add setCursor() to be used to set the mouse
cursor.
* gui/{gtk.cpp, gtksup.h}: Implement setCursor() for GtkGui.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1345&r2=1.1346
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.175&r2=1.176
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtksup.h?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.h?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.29&r2=1.30
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1345
retrieving revision 1.1346
diff -u -b -r1.1345 -r1.1346
--- ChangeLog 22 Oct 2006 17:27:41 -0000 1.1345
+++ ChangeLog 22 Oct 2006 17:45:42 -0000 1.1346
@@ -1,3 +1,14 @@
+2006-10-22 Bastiaan Jacques <address@hidden>
+
+ * libbase/log.h: size_t cannot be long long, so don't check for it.
+ * configure.ac: Don't check for long long as it's unused.
+ * gui/gui{.h,.cpp}: Add setCursor() to be used to set the mouse cursor.
+ * gui/{gtk.cpp, gtksup.h}: Implement setCursor() for GtkGui.
+ * configure.ac: Have the description of --enable-write make sense.
+ * gui/{gui.h, sdl.cpp}: Gui::init() should return true on success.
+ Document this in gui.h and implement it in sdl.cpp.
+ * gui/Player.cpp: Remove obsolete comment.
+
2006-10-22 Rob Savoye <address@hidden>
* gui/Makefile.am: Don't link with -no-undefined to reduce
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -b -r1.175 -r1.176
--- configure.ac 22 Oct 2006 16:07:41 -0000 1.175
+++ configure.ac 22 Oct 2006 17:45:42 -0000 1.176
@@ -33,7 +33,7 @@
dnl also makes it possible to release a modified version which carries
dnl forward this exception.
-dnl $Id: configure.ac,v 1.175 2006/10/22 16:07:41 bjacques Exp $
+dnl $Id: configure.ac,v 1.176 2006/10/22 17:45:42 bjacques Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, 0.7.1-cvs)
@@ -496,7 +496,6 @@
AC_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(long long)
if test x"$gui" = xkde; then
KDE_SET_PREFIX
Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- gui/gtk.cpp 21 Oct 2006 09:54:44 -0000 1.41
+++ gui/gtk.cpp 22 Oct 2006 17:45:42 -0000 1.42
@@ -367,6 +367,35 @@
return true;
}
+void
+GtkGui::setCursor(gnash_cursor_type newcursor)
+{
+ //GNASH_REPORT_FUNCTION;
+
+ GdkCursorType cursortype;
+
+ switch(newcursor) {
+ case CURSOR_HAND:
+ cursortype = GDK_HAND2;
+ break;
+ default:
+ cursortype = GDK_LAST_CURSOR;
+ }
+
+ GdkCursor* gdkcursor = NULL;
+
+ if (cursortype != GDK_LAST_CURSOR) {
+ gdkcursor = gdk_cursor_new(cursortype);
+ }
+
+ gdk_window_set_cursor (_window->window, gdkcursor);
+
+ if (gdkcursor) {
+ gdk_cursor_unref(gdkcursor);
+ }
+}
+
+
bool
GtkGui::setupEvents()
{
Index: gui/gtksup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtksup.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- gui/gtksup.h 18 Oct 2006 21:39:53 -0000 1.24
+++ gui/gtksup.h 22 Oct 2006 17:45:42 -0000 1.25
@@ -137,6 +137,8 @@
void set_invalidated_region(const rect& bounds);
+ virtual void setCursor(gnash_cursor_type newcursor);
+
private:
GtkWidget *_window;
GdkPixbuf *_window_icon_pixbuf;
Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- gui/gui.cpp 19 Oct 2006 09:17:06 -0000 1.37
+++ gui/gui.cpp 22 Oct 2006 17:45:42 -0000 1.38
@@ -313,6 +313,11 @@
return true;
}
+void
+Gui::setCursor(gnash_cursor_type /*newcursor*/)
+{
+}
+
// end of namespace
}
Index: gui/gui.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- gui/gui.h 22 Oct 2006 16:07:42 -0000 1.29
+++ gui/gui.h 22 Oct 2006 17:45:42 -0000 1.30
@@ -57,6 +57,13 @@
namespace gnash
{
+
+/// Enumerates mouse cursor types.
+enum gnash_cursor_type {
+ CURSOR_HAND,
+ CURSOR_NORMAL
+};
+
/// Parent class from which all GUI implementations will depend.
class DSOEXPORT Gui {
public:
@@ -141,6 +148,11 @@
return false;
}
+
+ /// Sets the current mouse cursor for the Gui window.
+ virtual void setCursor(gnash_cursor_type newcursor);
+
+
/// \brief
/// Render the current buffer. For OpenGL, this means that the buffer is
/// swapped.
Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- libbase/log.h 20 Oct 2006 10:26:47 -0000 1.29
+++ libbase/log.h 22 Oct 2006 17:45:43 -0000 1.30
@@ -35,7 +35,7 @@
//
//
-/* $Id: log.h,v 1.29 2006/10/20 10:26:47 strk Exp $ */
+/* $Id: log.h,v 1.30 2006/10/22 17:45:43 bjacques Exp $ */
#ifndef GNASH_LOG_H
#define GNASH_LOG_H
@@ -52,9 +52,7 @@
#define TIMESTAMP_LENGTH 24 // timestamp length
#define TIMESTAMP_FORMAT "%Y-%m-%d %H:%M:%S " // timestamp format
-#if SIZEOF_SIZE_T == SIZEOF_LONG_LONG
- #define SIZET_FMT "%lld"
-#elif SIZEOF_SIZE_T == SIZEOF_INT // try "int" first
+#if SIZEOF_SIZE_T == SIZEOF_INT // try "int" first
#define SIZET_FMT "%d"
#elif SIZEOF_SIZE_T == SIZEOF_LONG
#define SIZET_FMT "%ld"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog configure.ac gui/gtk.cpp gui/gt...,
Bastiaan Jacques <=