[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog gui/kde.cpp gui/kdesup.h plugin...
From: |
Bastiaan Jacques |
Subject: |
[Gnash-commit] gnash ChangeLog gui/kde.cpp gui/kdesup.h plugin... |
Date: |
Tue, 20 Mar 2007 16:22:39 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Bastiaan Jacques <bjacques> 07/03/20 16:22:39
Modified files:
. : ChangeLog
gui : kde.cpp kdesup.h
plugin/klash : klash_part.cpp
Log message:
When embedding a Gnash into Konqueror, skip window creation. This also
fixes a problem with scaling. Patch by Antti Ajanki <address@hidden>.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2646&r2=1.2647
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kdesup.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/klash_part.cpp?cvsroot=gnash&r1=1.10&r2=1.11
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2646
retrieving revision 1.2647
diff -u -b -r1.2646 -r1.2647
--- ChangeLog 20 Mar 2007 15:57:56 -0000 1.2646
+++ ChangeLog 20 Mar 2007 16:22:38 -0000 1.2647
@@ -1,3 +1,9 @@
+2007-03-20 Antti Ajanki <address@hidden>
+
+ * gui/{kde.cpp, kdesup.h}, plugin/klash/klash_part.cpp: When
+ embedding a Gnash into Konqueror, skip window creation. This also
+ fixes a problem with scaling.
+
2007-03-20 Ann Barcomb <address@hidden>
* doc/C/actionscript/new_as_class.xml: Change documentation to
Index: gui/kde.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/kde.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gui/kde.cpp 18 Mar 2007 22:35:39 -0000 1.9
+++ gui/kde.cpp 20 Mar 2007 16:22:38 -0000 1.10
@@ -27,6 +27,7 @@
#include <qwidget.h>
#include <qmessagebox.h>
#include <qcursor.h>
+#include <qxembed.h>
#include "gnash.h"
#include "movie_definition.h"
@@ -67,7 +68,11 @@
KdeGui::init(int argc, char **argv[])
{
_qapp = new QApplication(argc, *argv);
- _qwidget = new qwidget(_xid, this);
+ _qwidget = new qwidget(this);
+ if (_xid) {
+ QXEmbed::initialize();
+ QXEmbed::embedClientIntoWindow(_qwidget, _xid);
+ }
// GNASH_REPORT_FUNCTION;
_glue.init (argc, argv);
@@ -238,11 +243,9 @@
_godfather->notify_mouse_moved(position.x(), position.y());
}
-qwidget::qwidget(WId embed, KdeGui* godfather)
+qwidget::qwidget(KdeGui* godfather)
: QGLWidget(0, "hi")
{
- create (embed);
-
_qmenu.insertItem("Play Movie", this, SLOT(menuitem_play_callback()));
_qmenu.insertItem("Pause Movie", this, SLOT(menuitem_pause_callback()));
_qmenu.insertItem("Stop Movie", this, SLOT(menuitem_stop_callback()));
Index: gui/kdesup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/kdesup.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gui/kdesup.h 17 Jan 2007 12:16:28 -0000 1.11
+++ gui/kdesup.h 20 Mar 2007 16:22:38 -0000 1.12
@@ -63,7 +63,7 @@
{
Q_OBJECT
public:
- qwidget(WId embed, KdeGui* godfather);
+ qwidget(KdeGui* godfather);
void setInterval(unsigned int interval);
protected:
void contextMenuEvent(QContextMenuEvent *event);
Index: plugin/klash/klash_part.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/klash_part.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- plugin/klash/klash_part.cpp 1 Feb 2007 18:46:58 -0000 1.10
+++ plugin/klash/klash_part.cpp 20 Mar 2007 16:22:39 -0000 1.11
@@ -536,12 +536,7 @@
#undef Unsorted
#undef Bool
-KlashEmbed::KlashEmbed (KlashView * view) : QXEmbed (view), m_view (view) {
- setProtocol (QXEmbed::XPLAIN);
- int scr = DefaultScreen (qt_xdisplay ());
- embed (XCreateSimpleWindow (qt_xdisplay(), view->winId (), 0, 0, width(),
height(), 1, BlackPixel (qt_xdisplay(), scr), BlackPixel (qt_xdisplay(), scr)));
- XClearWindow (qt_xdisplay(), embeddedWinId ());
-}
+KlashEmbed::KlashEmbed (KlashView * view) : QXEmbed (view), m_view (view) {}
KlashEmbed::~KlashEmbed () {}
@@ -557,7 +552,7 @@
}
WId KlashView::embedId () {
- return m_embed->embeddedWinId ();
+ return m_embed->winId ();
}
#include "klash_part.moc"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog gui/kde.cpp gui/kdesup.h plugin...,
Bastiaan Jacques <=