Menu
▾
▴
openvrml-commit — Changes to OpenVRML's source revision repository
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(128) |
Dec
(65) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(48) |
Feb
(132) |
Mar
(95) |
Apr
(47) |
May
(54) |
Jun
(2) |
Jul
(57) |
Aug
(109) |
Sep
(131) |
Oct
(186) |
Nov
(105) |
Dec
(78) |
| 2007 |
Jan
(125) |
Feb
(105) |
Mar
(52) |
Apr
(104) |
May
(63) |
Jun
(116) |
Jul
(76) |
Aug
|
Sep
(18) |
Oct
(93) |
Nov
(110) |
Dec
(169) |
| 2008 |
Jan
(90) |
Feb
(64) |
Mar
(41) |
Apr
(23) |
May
(6) |
Jun
(18) |
Jul
(10) |
Aug
(61) |
Sep
(139) |
Oct
(50) |
Nov
(55) |
Dec
(2) |
| 2009 |
Jan
|
Feb
(1) |
Mar
(62) |
Apr
(22) |
May
(17) |
Jun
(19) |
Jul
(40) |
Aug
(21) |
Sep
|
Oct
(40) |
Nov
(23) |
Dec
|
| 2010 |
Jan
(14) |
Feb
(40) |
Mar
(9) |
Apr
(11) |
May
(19) |
Jun
(4) |
Jul
(10) |
Aug
(22) |
Sep
(15) |
Oct
|
Nov
(2) |
Dec
|
| 2011 |
Jan
(13) |
Feb
(10) |
Mar
|
Apr
(13) |
May
|
Jun
|
Jul
(2) |
Aug
(4) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(33) |
May
(20) |
Jun
|
Jul
(8) |
Aug
(7) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Braden M. <br...@us...> - 2007-02-04 09:56:45
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28821 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Use g_object_connect to set up GtkVrmlBrowser event handlers. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.113 retrieving revision 1.1310.2.114 diff -C2 -d -r1.1310.2.113 -r1.1310.2.114 *** ChangeLog 4 Feb 2007 09:46:17 -0000 1.1310.2.113 --- ChangeLog 4 Feb 2007 09:56:43 -0000 1.1310.2.114 *************** *** 1,4 **** --- 1,10 ---- 2007-02-04 Braden McDaniel <br...@en...> + * src/openvrml-gtkplug/gtkvrmlbrowser.cpp + (gtk_vrml_browser_init(GtkVrmlBrowser *)): Use g_object_connect to + set up GtkVrmlBrowser event handlers. + + 2007-02-04 Braden McDaniel <br...@en...> + Allow the GtkVrmlBrowser widget to take focus. |
|
From: Braden M. <br...@us...> - 2007-02-04 09:56:45
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-gtkplug In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28821/src/openvrml-gtkplug Modified Files: Tag: OpenVRML-0_16-BRANCH gtkvrmlbrowser.cpp Log Message: Use g_object_connect to set up GtkVrmlBrowser event handlers. Index: gtkvrmlbrowser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-gtkplug/gtkvrmlbrowser.cpp,v retrieving revision 1.2.2.9 retrieving revision 1.2.2.10 diff -C2 -d -r1.2.2.9 -r1.2.2.10 *** gtkvrmlbrowser.cpp 4 Feb 2007 09:46:18 -0000 1.2.2.9 --- gtkvrmlbrowser.cpp 4 Feb 2007 09:56:43 -0000 1.2.2.10 *************** *** 258,289 **** NULL); ! g_signal_connect(G_OBJECT(vrml_browser), ! "destroy_event", ! G_CALLBACK(gtk_vrml_browser_destroy), ! 0); ! g_signal_connect(G_OBJECT(vrml_browser), ! "expose_event", ! G_CALLBACK(gtk_vrml_browser_expose_event), ! 0); ! g_signal_connect(G_OBJECT(vrml_browser), ! "configure_event", ! G_CALLBACK(gtk_vrml_browser_configure_event), ! 0); ! g_signal_connect(G_OBJECT(vrml_browser), ! "key_press_event", ! G_CALLBACK(gtk_vrml_browser_key_press_event), ! 0); ! g_signal_connect(G_OBJECT(vrml_browser), ! "button_press_event", ! G_CALLBACK(gtk_vrml_browser_button_press_event), ! 0); ! g_signal_connect(G_OBJECT(vrml_browser), ! "button_release_event", ! G_CALLBACK(gtk_vrml_browser_button_release_event), ! 0); ! g_signal_connect(G_OBJECT(vrml_browser), ! "motion_notify_event", ! G_CALLBACK(gtk_vrml_browser_motion_notify_event), ! 0); } --- 258,292 ---- NULL); ! g_object_connect( ! G_OBJECT(vrml_browser), ! ! "signal::destroy_event", ! G_CALLBACK(gtk_vrml_browser_destroy), ! 0, ! ! "signal::expose_event", ! G_CALLBACK(gtk_vrml_browser_expose_event), ! 0, ! ! "signal::configure_event", ! G_CALLBACK(gtk_vrml_browser_configure_event), ! 0, ! ! "signal::key_press_event", ! G_CALLBACK(gtk_vrml_browser_key_press_event), ! 0, ! ! "signal::button_press_event", ! G_CALLBACK(gtk_vrml_browser_button_press_event), ! 0, ! ! "signal::button_release_event", ! G_CALLBACK(gtk_vrml_browser_button_release_event), ! 0, ! ! "signal::motion_notify_event", ! G_CALLBACK(gtk_vrml_browser_motion_notify_event), ! 0, ! NULL); } |
|
From: Braden M. <br...@us...> - 2007-02-04 09:46:54
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24775 Modified Files: ChangeLog Log Message: Allow the GtkVrmlBrowser widget to take focus. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1437 retrieving revision 1.1438 diff -C2 -d -r1.1437 -r1.1438 *** ChangeLog 4 Feb 2007 09:30:27 -0000 1.1437 --- ChangeLog 4 Feb 2007 09:46:32 -0000 1.1438 *************** *** 1,4 **** --- 1,15 ---- 2007-02-04 Braden McDaniel <br...@en...> + Allow the GtkVrmlBrowser widget to take focus. + + * src/openvrml-gtkplug/gtkvrmlbrowser.cpp + (gtk_vrml_browser_init(GtkVrmlBrowser *)): Added + GDK_FOCUS_CHANGE_MASK to the event mask; set the widget's + can-focus property to "true". + (gtk_vrml_browser_button_press_event(GtkWidget *, GdkEventButton*, + gpointer)): Grab the focus. + + 2007-02-04 Braden McDaniel <br...@en...> + Factored GladeXML creation out of main. |
|
From: Braden M. <br...@us...> - 2007-02-04 09:46:54
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-gtkplug In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24747/src/openvrml-gtkplug Modified Files: Tag: OpenVRML-0_16-BRANCH gtkvrmlbrowser.cpp Log Message: Allow the GtkVrmlBrowser widget to take focus. Index: gtkvrmlbrowser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-gtkplug/gtkvrmlbrowser.cpp,v retrieving revision 1.2.2.8 retrieving revision 1.2.2.9 diff -C2 -d -r1.2.2.8 -r1.2.2.9 *** gtkvrmlbrowser.cpp 23 Jan 2007 04:08:08 -0000 1.2.2.8 --- gtkvrmlbrowser.cpp 4 Feb 2007 09:46:18 -0000 1.2.2.9 *************** *** 248,255 **** gtk_widget_add_events(GTK_WIDGET(vrml_browser), GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK ! | GDK_POINTER_MOTION_MASK); g_signal_connect(G_OBJECT(vrml_browser), --- 248,260 ---- gtk_widget_add_events(GTK_WIDGET(vrml_browser), GDK_EXPOSURE_MASK + | GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK ! | GDK_FOCUS_CHANGE_MASK); ! ! g_object_set(G_OBJECT(vrml_browser), ! "can-focus", true, ! NULL); g_signal_connect(G_OBJECT(vrml_browser), *************** *** 396,399 **** --- 401,406 ---- using openvrml::gl::viewer; + gtk_widget_grab_focus(widget); + viewer::event_info info; info.event = viewer::event_mouse_click; |
|
From: Braden M. <br...@us...> - 2007-02-04 09:46:54
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-gtkplug In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24775/src/openvrml-gtkplug Modified Files: gtkvrmlbrowser.cpp Log Message: Allow the GtkVrmlBrowser widget to take focus. Index: gtkvrmlbrowser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-gtkplug/gtkvrmlbrowser.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** gtkvrmlbrowser.cpp 23 Jan 2007 04:08:39 -0000 1.10 --- gtkvrmlbrowser.cpp 4 Feb 2007 09:46:32 -0000 1.11 *************** *** 249,256 **** gtk_widget_add_events(GTK_WIDGET(vrml_browser), GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK ! | GDK_POINTER_MOTION_MASK); g_signal_connect(G_OBJECT(vrml_browser), --- 249,261 ---- gtk_widget_add_events(GTK_WIDGET(vrml_browser), GDK_EXPOSURE_MASK + | GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK ! | GDK_FOCUS_CHANGE_MASK); ! ! g_object_set(G_OBJECT(vrml_browser), ! "can-focus", true, ! NULL); g_signal_connect(G_OBJECT(vrml_browser), *************** *** 397,400 **** --- 402,407 ---- using openvrml::gl::viewer; + gtk_widget_grab_focus(widget); + viewer::event_info info; info.event = viewer::event_mouse_click; |
|
From: Braden M. <br...@us...> - 2007-02-04 09:46:54
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24747 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Allow the GtkVrmlBrowser widget to take focus. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.112 retrieving revision 1.1310.2.113 diff -C2 -d -r1.1310.2.112 -r1.1310.2.113 *** ChangeLog 4 Feb 2007 09:30:09 -0000 1.1310.2.112 --- ChangeLog 4 Feb 2007 09:46:17 -0000 1.1310.2.113 *************** *** 1,4 **** --- 1,15 ---- 2007-02-04 Braden McDaniel <br...@en...> + Allow the GtkVrmlBrowser widget to take focus. + + * src/openvrml-gtkplug/gtkvrmlbrowser.cpp + (gtk_vrml_browser_init(GtkVrmlBrowser *)): Added + GDK_FOCUS_CHANGE_MASK to the event mask; set the widget's + can-focus property to "true". + (gtk_vrml_browser_button_press_event(GtkWidget *, GdkEventButton*, + gpointer)): Grab the focus. + + 2007-02-04 Braden McDaniel <br...@en...> + Factored GladeXML creation out of main. |
|
From: Braden M. <br...@us...> - 2007-02-04 09:30:29
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19624/src/openvrml-player Modified Files: player.cpp Log Message: Factored GladeXML creation out of main. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** player.cpp 24 Jan 2007 00:06:46 -0000 1.3 --- player.cpp 4 Feb 2007 09:30:27 -0000 1.4 *************** *** 70,73 **** --- 70,74 ---- G_GNUC_INTERNAL ssize_t write_command(const std::string & command); G_GNUC_INTERNAL GSource * curl_source_new(CURLM * multi_handle); + G_GNUC_INTERNAL GladeXML * xml_new(GnomeProgram & program); *************** *** 146,169 **** GNOME_PARAM_NONE); ! const gchar * const gladedir = g_getenv("OPENVRML_PLAYER_GLADEDIR"); ! string glade_file_str; ! const gchar * glade_file = 0; ! if (gladedir) { ! glade_file_str = string(gladedir) + "/openvrml-player.glade"; ! glade_file = glade_file_str.c_str(); ! } ! ! if (!glade_file) { ! static const gboolean only_if_exists = true; ! glade_file = gnome_program_locate_file(program, ! GNOME_FILE_DOMAIN_APP_DATADIR, ! "/glade/openvrml-player.glade", ! only_if_exists, ! 0); ! } ! ! g_return_val_if_fail(glade_file, EXIT_FAILURE); ! ! GladeXML * const xml = glade_xml_new(glade_file, 0, 0); glade_xml_signal_autoconnect(xml); --- 147,151 ---- GNOME_PARAM_NONE); ! GladeXML * const xml = xml_new(*program); glade_xml_signal_autoconnect(xml); *************** *** 310,313 **** --- 292,322 ---- namespace { + GladeXML * xml_new(GnomeProgram & program) + { + using std::string; + + const gchar * const gladedir = g_getenv("OPENVRML_PLAYER_GLADEDIR"); + string glade_file_str; + const gchar * glade_file = 0; + if (gladedir) { + glade_file_str = string(gladedir) + "/openvrml-player.glade"; + glade_file = glade_file_str.c_str(); + } + + if (!glade_file) { + static const gboolean only_if_exists = true; + glade_file = + gnome_program_locate_file(&program, + GNOME_FILE_DOMAIN_APP_DATADIR, + "/glade/openvrml-player.glade", + only_if_exists, + 0); + } + + g_return_val_if_fail(glade_file, 0); + + return glade_xml_new(glade_file, 0, 0); + } + typedef std::list<GPollFD> poll_fds_t; |
|
From: Braden M. <br...@us...> - 2007-02-04 09:30:28
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19624 Modified Files: ChangeLog Log Message: Factored GladeXML creation out of main. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1436 retrieving revision 1.1437 diff -C2 -d -r1.1436 -r1.1437 *** ChangeLog 4 Feb 2007 07:55:43 -0000 1.1436 --- ChangeLog 4 Feb 2007 09:30:27 -0000 1.1437 *************** *** 1,4 **** --- 1,12 ---- 2007-02-04 Braden McDaniel <br...@en...> + Factored GladeXML creation out of main. + + * src/openvrml-player/player.cpp + (main(int, char *[])): Factored GladeXML creation out of main. + (xml_new(GnomeProgram &)): Moved GladeXML creation to here. + + 2007-02-04 Braden McDaniel <br...@en...> + Use pkg-config to check for FreeType. |
|
From: Braden M. <br...@us...> - 2007-02-04 09:30:19
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19386 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Factored GladeXML creation out of main. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.111 retrieving revision 1.1310.2.112 diff -C2 -d -r1.1310.2.111 -r1.1310.2.112 *** ChangeLog 4 Feb 2007 07:55:31 -0000 1.1310.2.111 --- ChangeLog 4 Feb 2007 09:30:09 -0000 1.1310.2.112 *************** *** 1,4 **** --- 1,12 ---- 2007-02-04 Braden McDaniel <br...@en...> + Factored GladeXML creation out of main. + + * src/openvrml-player/player.cpp + (main(int, char *[])): Factored GladeXML creation out of main. + (xml_new(GnomeProgram &)): Moved GladeXML creation to here. + + 2007-02-04 Braden McDaniel <br...@en...> + Use pkg-config to check for FreeType. |
|
From: Braden M. <br...@us...> - 2007-02-04 09:30:19
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19386/src/openvrml-player Modified Files: Tag: OpenVRML-0_16-BRANCH player.cpp Log Message: Factored GladeXML creation out of main. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** player.cpp 24 Jan 2007 00:06:34 -0000 1.1.2.2 --- player.cpp 4 Feb 2007 09:30:12 -0000 1.1.2.3 *************** *** 70,73 **** --- 70,74 ---- G_GNUC_INTERNAL ssize_t write_command(const std::string & command); G_GNUC_INTERNAL GSource * curl_source_new(CURLM * multi_handle); + G_GNUC_INTERNAL GladeXML * xml_new(GnomeProgram & program); *************** *** 146,169 **** GNOME_PARAM_NONE); ! const gchar * const gladedir = g_getenv("OPENVRML_PLAYER_GLADEDIR"); ! string glade_file_str; ! const gchar * glade_file = 0; ! if (gladedir) { ! glade_file_str = string(gladedir) + "/openvrml-player.glade"; ! glade_file = glade_file_str.c_str(); ! } ! ! if (!glade_file) { ! static const gboolean only_if_exists = true; ! glade_file = gnome_program_locate_file(program, ! GNOME_FILE_DOMAIN_APP_DATADIR, ! "/glade/openvrml-player.glade", ! only_if_exists, ! 0); ! } ! ! g_return_val_if_fail(glade_file, EXIT_FAILURE); ! ! GladeXML * const xml = glade_xml_new(glade_file, 0, 0); glade_xml_signal_autoconnect(xml); --- 147,151 ---- GNOME_PARAM_NONE); ! GladeXML * const xml = xml_new(*program); glade_xml_signal_autoconnect(xml); *************** *** 310,313 **** --- 292,322 ---- namespace { + GladeXML * xml_new(GnomeProgram & program) + { + using std::string; + + const gchar * const gladedir = g_getenv("OPENVRML_PLAYER_GLADEDIR"); + string glade_file_str; + const gchar * glade_file = 0; + if (gladedir) { + glade_file_str = string(gladedir) + "/openvrml-player.glade"; + glade_file = glade_file_str.c_str(); + } + + if (!glade_file) { + static const gboolean only_if_exists = true; + glade_file = + gnome_program_locate_file(&program, + GNOME_FILE_DOMAIN_APP_DATADIR, + "/glade/openvrml-player.glade", + only_if_exists, + 0); + } + + g_return_val_if_fail(glade_file, 0); + + return glade_xml_new(glade_file, 0, 0); + } + typedef std::list<GPollFD> poll_fds_t; |
|
From: Braden M. <br...@us...> - 2007-02-04 07:55:46
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14798 Modified Files: ChangeLog configure.ac openvrml.pc.in Log Message: Use pkg-config to check for FreeType. Index: configure.ac =================================================================== RCS file: /cvsroot/openvrml/openvrml/configure.ac,v retrieving revision 1.108 retrieving revision 1.109 diff -C2 -d -r1.108 -r1.109 *** configure.ac 3 Feb 2007 07:41:20 -0000 1.108 --- configure.ac 4 Feb 2007 07:55:43 -0000 1.109 *************** *** 37,40 **** --- 37,41 ---- # REQUIRE_FONTCONFIG="fontconfig" + REQUIRE_FREETYPE="freetype2" REQUIRE_FIREFOX_JS="firefox-js" REQUIRE_MOZILLA_JS="mozilla-js >= 1.2.1" *************** *** 81,90 **** PKG_CHECK_MODULES([FONTCONFIG], [$REQUIRE_FONTCONFIG], , [have_fontconfig=no]) ! AC_PATH_PROG([FREETYPE_CONFIG], [freetype-config]) # # FreeType >= 2.2 uses const in callback function signatures. This # doesn't cause an error in C; but it does in C++. # ! AS_IF([test -n "${FREETYPE_CONFIG}"], [AC_MSG_CHECKING([if FreeType callback function signatures use const]) AC_CACHE_VAL([ov_cv_ft_const], --- 82,91 ---- PKG_CHECK_MODULES([FONTCONFIG], [$REQUIRE_FONTCONFIG], , [have_fontconfig=no]) ! PKG_CHECK_MODULES([FREETYPE], [$REQUIRE_FREETYPE], , [have_freetype=no]) # # FreeType >= 2.2 uses const in callback function signatures. This # doesn't cause an error in C; but it does in C++. # ! AS_IF([test X$have_freetype != Xno], [AC_MSG_CHECKING([if FreeType callback function signatures use const]) AC_CACHE_VAL([ov_cv_ft_const], *************** *** 198,208 **** [AC_HELP_STRING([--disable-render-text-node], [disable support for rendering Text nodes])]) ! if test "X$enable_render_text_node" = "Xno"; then ! FONTCONFIG_CFLAGS="" ! FONTCONFIG_LIBS="" ! FREETYPE_CFLAGS="" ! FREETYPE_LIBS="" ! else ! if test "X$have_fontconfig" = "Xno" -o -z "$FREETYPE_CONFIG"; then AC_MSG_FAILURE([fontconfig and FreeType are required for rendering Text nodes.]) fi --- 199,204 ---- [AC_HELP_STRING([--disable-render-text-node], [disable support for rendering Text nodes])]) ! if test X$enable_render_text_node != Xno; then ! if test X$have_fontconfig = Xno -o X$have_freetype = Xno; then AC_MSG_FAILURE([fontconfig and FreeType are required for rendering Text nodes.]) fi *************** *** 210,216 **** OPENVRML_PKG_REQUIRES="${OPENVRML_PKG_REQUIRES}," fi ! OPENVRML_PKG_REQUIRES="${OPENVRML_PKG_REQUIRES} ${REQUIRE_FONTCONFIG}" ! FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` ! FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` AC_DEFINE([OPENVRML_ENABLE_RENDER_TEXT_NODE], [1], [Defined if support for rendering Text nodes is enabled.]) --- 206,210 ---- OPENVRML_PKG_REQUIRES="${OPENVRML_PKG_REQUIRES}," fi ! OPENVRML_PKG_REQUIRES="${OPENVRML_PKG_REQUIRES} ${REQUIRE_FONTCONFIG} ${REQUIRE_FREETYPE}" AC_DEFINE([OPENVRML_ENABLE_RENDER_TEXT_NODE], [1], [Defined if support for rendering Text nodes is enabled.]) *************** *** 218,225 **** [const for FreeType callback function signatures.]) fi - AC_SUBST([FONTCONFIG_CFLAGS]) - AC_SUBST([FONTCONFIG_LIBS]) - AC_SUBST([FREETYPE_CFLAGS]) - AC_SUBST([FREETYPE_LIBS]) # --- 212,215 ---- Index: openvrml.pc.in =================================================================== RCS file: /cvsroot/openvrml/openvrml/openvrml.pc.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** openvrml.pc.in 28 Aug 2005 21:27:33 -0000 1.10 --- openvrml.pc.in 4 Feb 2007 07:55:43 -0000 1.11 *************** *** 8,11 **** Version: @PACKAGE_VERSION@ Requires: @OPENVRML_PKG_REQUIRES@ ! Libs: -L${libdir} -lopenvrml @FREETYPE_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @JNI_LIBS@ -lboost_thread Cflags: -I${includedir} --- 8,11 ---- Version: @PACKAGE_VERSION@ Requires: @OPENVRML_PKG_REQUIRES@ ! Libs: -L${libdir} -lopenvrml @JPEG_LIBS@ @PNG_LIBS@ @JNI_LIBS@ -lboost_thread Cflags: -I${includedir} Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1435 retrieving revision 1.1436 diff -C2 -d -r1.1435 -r1.1436 *** ChangeLog 3 Feb 2007 08:22:39 -0000 1.1435 --- ChangeLog 4 Feb 2007 07:55:43 -0000 1.1436 *************** *** 1,2 **** --- 1,12 ---- + 2007-02-04 Braden McDaniel <br...@en...> + + Use pkg-config to check for FreeType. + + * configure.ac: Use pkg-config to check for FreeType; add + freetype2 to OPENVRML_PKG_REQUIRES if Text node rendering is + enabled. + * openvrml.pc.in: Removed FREETYPE_LIBS from Libs; this is now + covered by Requires. + 2007-02-03 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-02-04 07:55:33
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14780 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog configure.ac openvrml.pc.in Log Message: Use pkg-config to check for FreeType. Index: configure.ac =================================================================== RCS file: /cvsroot/openvrml/openvrml/configure.ac,v retrieving revision 1.92.2.16 retrieving revision 1.92.2.17 diff -C2 -d -r1.92.2.16 -r1.92.2.17 *** configure.ac 3 Feb 2007 07:41:07 -0000 1.92.2.16 --- configure.ac 4 Feb 2007 07:55:31 -0000 1.92.2.17 *************** *** 37,40 **** --- 37,41 ---- # REQUIRE_FONTCONFIG="fontconfig" + REQUIRE_FREETYPE="freetype2" REQUIRE_FIREFOX_JS="firefox-js" REQUIRE_MOZILLA_JS="mozilla-js >= 1.2.1" *************** *** 81,90 **** PKG_CHECK_MODULES([FONTCONFIG], [$REQUIRE_FONTCONFIG], , [have_fontconfig=no]) ! AC_PATH_PROG([FREETYPE_CONFIG], [freetype-config]) # # FreeType >= 2.2 uses const in callback function signatures. This # doesn't cause an error in C; but it does in C++. # ! AS_IF([test -n "${FREETYPE_CONFIG}"], [AC_MSG_CHECKING([if FreeType callback function signatures use const]) AC_CACHE_VAL([ov_cv_ft_const], --- 82,91 ---- PKG_CHECK_MODULES([FONTCONFIG], [$REQUIRE_FONTCONFIG], , [have_fontconfig=no]) ! PKG_CHECK_MODULES([FREETYPE], [$REQUIRE_FREETYPE], , [have_freetype=no]) # # FreeType >= 2.2 uses const in callback function signatures. This # doesn't cause an error in C; but it does in C++. # ! AS_IF([test X$have_freetype != Xno], [AC_MSG_CHECKING([if FreeType callback function signatures use const]) AC_CACHE_VAL([ov_cv_ft_const], *************** *** 198,208 **** [AC_HELP_STRING([--disable-render-text-node], [disable support for rendering Text nodes])]) ! if test "X$enable_render_text_node" = "Xno"; then ! FONTCONFIG_CFLAGS="" ! FONTCONFIG_LIBS="" ! FREETYPE_CFLAGS="" ! FREETYPE_LIBS="" ! else ! if test "X$have_fontconfig" = "Xno" -o -z "$FREETYPE_CONFIG"; then AC_MSG_FAILURE([fontconfig and FreeType are required for rendering Text nodes.]) fi --- 199,204 ---- [AC_HELP_STRING([--disable-render-text-node], [disable support for rendering Text nodes])]) ! if test X$enable_render_text_node != Xno; then ! if test X$have_fontconfig = Xno -o X$have_freetype = Xno; then AC_MSG_FAILURE([fontconfig and FreeType are required for rendering Text nodes.]) fi *************** *** 210,216 **** OPENVRML_PKG_REQUIRES="${OPENVRML_PKG_REQUIRES}," fi ! OPENVRML_PKG_REQUIRES="${OPENVRML_PKG_REQUIRES} ${REQUIRE_FONTCONFIG}" ! FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` ! FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` AC_DEFINE([OPENVRML_ENABLE_RENDER_TEXT_NODE], [1], [Defined if support for rendering Text nodes is enabled.]) --- 206,210 ---- OPENVRML_PKG_REQUIRES="${OPENVRML_PKG_REQUIRES}," fi ! OPENVRML_PKG_REQUIRES="${OPENVRML_PKG_REQUIRES} ${REQUIRE_FONTCONFIG} ${REQUIRE_FREETYPE}" AC_DEFINE([OPENVRML_ENABLE_RENDER_TEXT_NODE], [1], [Defined if support for rendering Text nodes is enabled.]) *************** *** 218,225 **** [const for FreeType callback function signatures.]) fi - AC_SUBST([FONTCONFIG_CFLAGS]) - AC_SUBST([FONTCONFIG_LIBS]) - AC_SUBST([FREETYPE_CFLAGS]) - AC_SUBST([FREETYPE_LIBS]) # --- 212,215 ---- Index: openvrml.pc.in =================================================================== RCS file: /cvsroot/openvrml/openvrml/openvrml.pc.in,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -C2 -d -r1.10 -r1.10.2.1 *** openvrml.pc.in 28 Aug 2005 21:27:33 -0000 1.10 --- openvrml.pc.in 4 Feb 2007 07:55:31 -0000 1.10.2.1 *************** *** 8,11 **** Version: @PACKAGE_VERSION@ Requires: @OPENVRML_PKG_REQUIRES@ ! Libs: -L${libdir} -lopenvrml @FREETYPE_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @JNI_LIBS@ -lboost_thread Cflags: -I${includedir} --- 8,11 ---- Version: @PACKAGE_VERSION@ Requires: @OPENVRML_PKG_REQUIRES@ ! Libs: -L${libdir} -lopenvrml @JPEG_LIBS@ @PNG_LIBS@ @JNI_LIBS@ -lboost_thread Cflags: -I${includedir} Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.110 retrieving revision 1.1310.2.111 diff -C2 -d -r1.1310.2.110 -r1.1310.2.111 *** ChangeLog 3 Feb 2007 08:22:23 -0000 1.1310.2.110 --- ChangeLog 4 Feb 2007 07:55:31 -0000 1.1310.2.111 *************** *** 1,2 **** --- 1,12 ---- + 2007-02-04 Braden McDaniel <br...@en...> + + Use pkg-config to check for FreeType. + + * configure.ac: Use pkg-config to check for FreeType; add + freetype2 to OPENVRML_PKG_REQUIRES if Text node rendering is + enabled. + * openvrml.pc.in: Removed FREETYPE_LIBS from Libs; this is now + covered by Requires. + 2007-02-03 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-02-03 08:22:45
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32316 Modified Files: ChangeLog Log Message: Fixed PROTO eventIn and eventOut lookup functions to try the "set_" prefix and "_changed" suffix (respectively) when looking up event_listener and event_emitter objects. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1434 retrieving revision 1.1435 diff -C2 -d -r1.1434 -r1.1435 *** ChangeLog 3 Feb 2007 07:41:20 -0000 1.1434 --- ChangeLog 3 Feb 2007 08:22:39 -0000 1.1435 *************** *** 1,4 **** --- 1,18 ---- 2007-02-03 Braden McDaniel <br...@en...> + Fixed PROTO eventIn and eventOut lookup functions to try the + "set_" prefix and "_changed" suffix (respectively) when looking up + event_listener and event_emitter objects. + + * src/libopenvrml/openvrml/browser.cpp + (proto_node::do_event_listener(const std::string &)): Prepend + "set_" to the eventIn name if the passed value is not found in the + eventIn map. + (proto_node::do_event_emitter(const std::string &)): Append + "_changed" to the eventOut name if the passed value is not found + in the eventOut map. + + 2007-02-03 Braden McDaniel <br...@en...> + * configure.ac: Require GLib >= 2.6 since openvrml-gtkplug and openvrml-player use GOption. |
|
From: Braden M. <br...@us...> - 2007-02-03 08:22:45
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32316/src/libopenvrml/openvrml Modified Files: browser.cpp Log Message: Fixed PROTO eventIn and eventOut lookup functions to try the "set_" prefix and "_changed" suffix (respectively) when looking up event_listener and event_emitter objects. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.202 retrieving revision 1.203 diff -C2 -d -r1.202 -r1.203 *** browser.cpp 22 Jan 2007 23:38:01 -0000 1.202 --- browser.cpp 3 Feb 2007 08:22:39 -0000 1.203 *************** *** 1893,1896 **** --- 1893,1899 ---- eventin_map_t::iterator pos = this->eventin_map.find(id); if (pos == this->eventin_map.end()) { + pos = this->eventin_map.find("set_" + id); + } + if (pos == this->eventin_map.end()) { throw unsupported_interface(this->type(), node_interface::eventin_id, *************** *** 1914,1917 **** --- 1917,1923 ---- eventout_map_t::iterator pos = this->eventout_map.find(id); if (pos == this->eventout_map.end()) { + pos = this->eventout_map.find(id + "_changed"); + } + if (pos == this->eventout_map.end()) { throw unsupported_interface(this->type(), node_interface::eventout_id, |
|
From: Braden M. <br...@us...> - 2007-02-03 08:22:26
|
Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32287/src/libopenvrml/openvrml Modified Files: Tag: OpenVRML-0_16-BRANCH browser.cpp Log Message: Fixed PROTO eventIn and eventOut lookup functions to try the "set_" prefix and "_changed" suffix (respectively) when looking up event_listener and event_emitter objects. Index: browser.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/browser.cpp,v retrieving revision 1.190.2.8 retrieving revision 1.190.2.9 diff -C2 -d -r1.190.2.8 -r1.190.2.9 *** browser.cpp 3 Jan 2007 23:43:23 -0000 1.190.2.8 --- browser.cpp 3 Feb 2007 08:22:24 -0000 1.190.2.9 *************** *** 1893,1896 **** --- 1893,1899 ---- eventin_map_t::iterator pos = this->eventin_map.find(id); if (pos == this->eventin_map.end()) { + pos = this->eventin_map.find("set_" + id); + } + if (pos == this->eventin_map.end()) { throw unsupported_interface(this->type(), node_interface::eventin_id, *************** *** 1914,1917 **** --- 1917,1923 ---- eventout_map_t::iterator pos = this->eventout_map.find(id); if (pos == this->eventout_map.end()) { + pos = this->eventout_map.find(id + "_changed"); + } + if (pos == this->eventout_map.end()) { throw unsupported_interface(this->type(), node_interface::eventout_id, |
|
From: Braden M. <br...@us...> - 2007-02-03 08:22:26
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32287 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog Log Message: Fixed PROTO eventIn and eventOut lookup functions to try the "set_" prefix and "_changed" suffix (respectively) when looking up event_listener and event_emitter objects. Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.109 retrieving revision 1.1310.2.110 diff -C2 -d -r1.1310.2.109 -r1.1310.2.110 *** ChangeLog 3 Feb 2007 07:41:07 -0000 1.1310.2.109 --- ChangeLog 3 Feb 2007 08:22:23 -0000 1.1310.2.110 *************** *** 1,4 **** --- 1,18 ---- 2007-02-03 Braden McDaniel <br...@en...> + Fixed PROTO eventIn and eventOut lookup functions to try the + "set_" prefix and "_changed" suffix (respectively) when looking up + event_listener and event_emitter objects. + + * src/libopenvrml/openvrml/browser.cpp + (proto_node::do_event_listener(const std::string &)): Prepend + "set_" to the eventIn name if the passed value is not found in the + eventIn map. + (proto_node::do_event_emitter(const std::string &)): Append + "_changed" to the eventOut name if the passed value is not found + in the eventOut map. + + 2007-02-03 Braden McDaniel <br...@en...> + * configure.ac: Require GLib >= 2.6 since openvrml-gtkplug and openvrml-player use GOption. |
|
From: Braden M. <br...@us...> - 2007-02-03 07:41:21
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16326 Modified Files: ChangeLog configure.ac Log Message: Require GLib >= 2.6 since openvrml-gtkplug and openvrml-player use GOption. Index: configure.ac =================================================================== RCS file: /cvsroot/openvrml/openvrml/configure.ac,v retrieving revision 1.107 retrieving revision 1.108 diff -C2 -d -r1.107 -r1.108 *** configure.ac 24 Jan 2007 01:11:10 -0000 1.107 --- configure.ac 3 Feb 2007 07:41:20 -0000 1.108 *************** *** 112,116 **** [mozilla_js_pkg=$REQUIRE_MOZILLA_JS], [have_js=no])]) ! PKG_CHECK_MODULES([GTK], [gtk+-2.0 gthread-2.0], , [have_gtk=no]) PKG_CHECK_MODULES([GLADE], [libglade-2.0], , [have_libglade=no]) PKG_CHECK_MODULES([GNOMEUI], [libgnomeui-2.0], , [have_gnomeui=no]) --- 112,121 ---- [mozilla_js_pkg=$REQUIRE_MOZILLA_JS], [have_js=no])]) ! # ! # openvrml-gtkplug and openvrml-player both use GOption, which was ! # introduced in GLib 2.6. ! # ! PKG_CHECK_MODULES([GTK], [gtk+-2.0 gthread-2.0 glib-2.0 >= 2.6], , ! [have_gtk=no]) PKG_CHECK_MODULES([GLADE], [libglade-2.0], , [have_libglade=no]) PKG_CHECK_MODULES([GNOMEUI], [libgnomeui-2.0], , [have_gnomeui=no]) Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1433 retrieving revision 1.1434 diff -C2 -d -r1.1433 -r1.1434 *** ChangeLog 24 Jan 2007 01:11:10 -0000 1.1433 --- ChangeLog 3 Feb 2007 07:41:20 -0000 1.1434 *************** *** 1,7 **** 2007-01-23 Braden McDaniel <br...@en...> ! * configure.ac: Fail if pkg-config doesn't fine libglade-2.0, ! libgnomeui-2.0, or libcurl openvrml-player is configured to be ! built. 2007-01-23 Braden McDaniel <br...@en...> --- 1,12 ---- + 2007-02-03 Braden McDaniel <br...@en...> + + * configure.ac: Require GLib >= 2.6 since openvrml-gtkplug and + openvrml-player use GOption. + 2007-01-23 Braden McDaniel <br...@en...> ! * configure.ac: Fail if pkg-config doesn't find libglade-2.0, ! libgnomeui-2.0, or libcurl when openvrml-player is configured to ! be built. 2007-01-23 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-02-03 07:41:10
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16299 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog configure.ac Log Message: Require GLib >= 2.6 since openvrml-gtkplug and openvrml-player use GOption. Index: configure.ac =================================================================== RCS file: /cvsroot/openvrml/openvrml/configure.ac,v retrieving revision 1.92.2.15 retrieving revision 1.92.2.16 diff -C2 -d -r1.92.2.15 -r1.92.2.16 *** configure.ac 24 Jan 2007 01:10:54 -0000 1.92.2.15 --- configure.ac 3 Feb 2007 07:41:07 -0000 1.92.2.16 *************** *** 112,116 **** [mozilla_js_pkg=$REQUIRE_MOZILLA_JS], [have_js=no])]) ! PKG_CHECK_MODULES([GTK], [gtk+-2.0 gthread-2.0], , [have_gtk=no]) PKG_CHECK_MODULES([GLADE], [libglade-2.0], , [have_libglade=no]) PKG_CHECK_MODULES([GNOMEUI], [libgnomeui-2.0], , [have_gnomeui=no]) --- 112,121 ---- [mozilla_js_pkg=$REQUIRE_MOZILLA_JS], [have_js=no])]) ! # ! # openvrml-gtkplug and openvrml-player both use GOption, which was ! # introduced in GLib 2.6. ! # ! PKG_CHECK_MODULES([GTK], [gtk+-2.0 gthread-2.0 glib-2.0 >= 2.6], , ! [have_gtk=no]) PKG_CHECK_MODULES([GLADE], [libglade-2.0], , [have_libglade=no]) PKG_CHECK_MODULES([GNOMEUI], [libgnomeui-2.0], , [have_gnomeui=no]) Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.108 retrieving revision 1.1310.2.109 diff -C2 -d -r1.1310.2.108 -r1.1310.2.109 *** ChangeLog 24 Jan 2007 01:10:54 -0000 1.1310.2.108 --- ChangeLog 3 Feb 2007 07:41:07 -0000 1.1310.2.109 *************** *** 1,7 **** 2007-01-23 Braden McDaniel <br...@en...> ! * configure.ac: Fail if pkg-config doesn't fine libglade-2.0, ! libgnomeui-2.0, or libcurl openvrml-player is configured to be ! built. 2007-01-23 Braden McDaniel <br...@en...> --- 1,12 ---- + 2007-02-03 Braden McDaniel <br...@en...> + + * configure.ac: Require GLib >= 2.6 since openvrml-gtkplug and + openvrml-player use GOption. + 2007-01-23 Braden McDaniel <br...@en...> ! * configure.ac: Fail if pkg-config doesn't find libglade-2.0, ! libgnomeui-2.0, or libcurl when openvrml-player is configured to ! be built. 2007-01-23 Braden McDaniel <br...@en...> |
|
From: Braden M. <br...@us...> - 2007-01-24 01:11:13
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18514 Modified Files: ChangeLog configure.ac Log Message: Fail if pkg-config doesn't fine libglade-2.0, libgnomeui-2.0, or libcurl openvrml-player is configured to be built. Index: configure.ac =================================================================== RCS file: /cvsroot/openvrml/openvrml/configure.ac,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -d -r1.106 -r1.107 *** configure.ac 24 Jan 2007 00:06:46 -0000 1.106 --- configure.ac 24 Jan 2007 01:11:10 -0000 1.107 *************** *** 306,310 **** AS_IF([test X$enable_player != Xno], [AS_IF([test X$enable_gtkplug = Xno], ! [AC_MSG_FAILURE([OpenVRML Player cannot be built without the GtkPlug application])])]) AM_CONDITIONAL([ENABLE_PLAYER], [test X$enable_player != Xno]) --- 306,317 ---- AS_IF([test X$enable_player != Xno], [AS_IF([test X$enable_gtkplug = Xno], ! [AC_MSG_FAILURE([OpenVRML Player cannot be built without the GtkPlug application])]) ! AS_IF([test X$have_libglade = Xno], ! [AC_MSG_FAILURE([libglade is required to build OpenVRML Player])]) ! AS_IF([test X$have_gnomeui = Xno], ! [AC_MSG_FAILURE([libgnomeui is required to build OpenVRML Player])]) ! AS_IF([test X$have_libcurl = Xno], ! [AC_MSG_FAILURE([libcurl is required to build OpenVRML Player])]) ! ]) AM_CONDITIONAL([ENABLE_PLAYER], [test X$enable_player != Xno]) Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1432 retrieving revision 1.1433 diff -C2 -d -r1.1432 -r1.1433 *** ChangeLog 24 Jan 2007 00:06:46 -0000 1.1432 --- ChangeLog 24 Jan 2007 01:11:10 -0000 1.1433 *************** *** 1,4 **** --- 1,10 ---- 2007-01-23 Braden McDaniel <br...@en...> + * configure.ac: Fail if pkg-config doesn't fine libglade-2.0, + libgnomeui-2.0, or libcurl openvrml-player is configured to be + built. + + 2007-01-23 Braden McDaniel <br...@en...> + openvrml-player needs libgnomeui; not just libgnome. |
|
From: Braden M. <br...@us...> - 2007-01-24 01:10:55
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv18147 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog configure.ac Log Message: Fail if pkg-config doesn't fine libglade-2.0, libgnomeui-2.0, or libcurl openvrml-player is configured to be built. Index: configure.ac =================================================================== RCS file: /cvsroot/openvrml/openvrml/configure.ac,v retrieving revision 1.92.2.14 retrieving revision 1.92.2.15 diff -C2 -d -r1.92.2.14 -r1.92.2.15 *** configure.ac 24 Jan 2007 00:06:34 -0000 1.92.2.14 --- configure.ac 24 Jan 2007 01:10:54 -0000 1.92.2.15 *************** *** 306,310 **** AS_IF([test X$enable_player != Xno], [AS_IF([test X$enable_gtkplug = Xno], ! [AC_MSG_FAILURE([OpenVRML Player cannot be built without the GtkPlug application])])]) AM_CONDITIONAL([ENABLE_PLAYER], [test X$enable_player != Xno]) --- 306,317 ---- AS_IF([test X$enable_player != Xno], [AS_IF([test X$enable_gtkplug = Xno], ! [AC_MSG_FAILURE([OpenVRML Player cannot be built without the GtkPlug application])]) ! AS_IF([test X$have_libglade = Xno], ! [AC_MSG_FAILURE([libglade is required to build OpenVRML Player])]) ! AS_IF([test X$have_gnomeui = Xno], ! [AC_MSG_FAILURE([libgnomeui is required to build OpenVRML Player])]) ! AS_IF([test X$have_libcurl = Xno], ! [AC_MSG_FAILURE([libcurl is required to build OpenVRML Player])]) ! ]) AM_CONDITIONAL([ENABLE_PLAYER], [test X$enable_player != Xno]) Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.107 retrieving revision 1.1310.2.108 diff -C2 -d -r1.1310.2.107 -r1.1310.2.108 *** ChangeLog 24 Jan 2007 00:06:34 -0000 1.1310.2.107 --- ChangeLog 24 Jan 2007 01:10:54 -0000 1.1310.2.108 *************** *** 1,4 **** --- 1,10 ---- 2007-01-23 Braden McDaniel <br...@en...> + * configure.ac: Fail if pkg-config doesn't fine libglade-2.0, + libgnomeui-2.0, or libcurl openvrml-player is configured to be + built. + + 2007-01-23 Braden McDaniel <br...@en...> + openvrml-player needs libgnomeui; not just libgnome. |
|
From: Braden M. <br...@us...> - 2007-01-24 00:06:49
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25299 Modified Files: ChangeLog configure.ac Log Message: openvrml-player needs libgnomeui; not just libgnome. Index: configure.ac =================================================================== RCS file: /cvsroot/openvrml/openvrml/configure.ac,v retrieving revision 1.105 retrieving revision 1.106 diff -C2 -d -r1.105 -r1.106 *** configure.ac 23 Jan 2007 10:06:19 -0000 1.105 --- configure.ac 24 Jan 2007 00:06:46 -0000 1.106 *************** *** 114,118 **** PKG_CHECK_MODULES([GTK], [gtk+-2.0 gthread-2.0], , [have_gtk=no]) PKG_CHECK_MODULES([GLADE], [libglade-2.0], , [have_libglade=no]) ! PKG_CHECK_MODULES([GNOME], [libgnome-2.0], , [have_gnome=no]) PKG_CHECK_MODULES([CURL], [libcurl], , [have_libcurl=no]) AC_PATH_XTRA --- 114,118 ---- PKG_CHECK_MODULES([GTK], [gtk+-2.0 gthread-2.0], , [have_gtk=no]) PKG_CHECK_MODULES([GLADE], [libglade-2.0], , [have_libglade=no]) ! PKG_CHECK_MODULES([GNOMEUI], [libgnomeui-2.0], , [have_gnomeui=no]) PKG_CHECK_MODULES([CURL], [libcurl], , [have_libcurl=no]) AC_PATH_XTRA Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1431 retrieving revision 1.1432 diff -C2 -d -r1.1431 -r1.1432 *** ChangeLog 23 Jan 2007 10:06:19 -0000 1.1431 --- ChangeLog 24 Jan 2007 00:06:46 -0000 1.1432 *************** *** 1,4 **** --- 1,17 ---- 2007-01-23 Braden McDaniel <br...@en...> + openvrml-player needs libgnomeui; not just libgnome. + + * configure.ac: Check for libgnomeui; export GNOMEUI_CFLAGS and + GNOMEUI_LIBS. + * src/openvrml-player/Makefile.am + (AM_CXXFLAGS): Use GNOMEUI_CFLAGS. + (AM_LDFLAGS): Use GNOMEUI_LIBS. + * src/openvrml-player/player.cpp + (main(int, char *[])): Call gnome_program_init with + LIBGNOMEUI_MODULE. + + 2007-01-23 Braden McDaniel <br...@en...> + Added openvrml-player, a stand-alone container for openvrml-gtkplug; libcurl is used for resource fetching. |
|
From: Braden M. <br...@us...> - 2007-01-24 00:06:48
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25299/src/openvrml-player Modified Files: Makefile.am player.cpp Log Message: openvrml-player needs libgnomeui; not just libgnome. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** player.cpp 23 Jan 2007 10:06:19 -0000 1.2 --- player.cpp 24 Jan 2007 00:06:46 -0000 1.3 *************** *** 30,35 **** # include <curl/curl.h> # include <libgnomevfs/gnome-vfs.h> ! # include <libgnome/libgnome.h> ! # include <gtk/gtk.h> # include <glade/glade.h> --- 30,34 ---- # include <curl/curl.h> # include <libgnomevfs/gnome-vfs.h> ! # include <libgnomeui/libgnomeui.h> # include <glade/glade.h> *************** *** 141,145 **** gnome_program_init(app_id, PACKAGE_VERSION, ! LIBGNOME_MODULE, argc, argv, --- 140,144 ---- gnome_program_init(app_id, PACKAGE_VERSION, ! LIBGNOMEUI_MODULE, argc, argv, Index: Makefile.am =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 23 Jan 2007 10:06:19 -0000 1.2 --- Makefile.am 24 Jan 2007 00:06:46 -0000 1.3 *************** *** 5,10 **** -DOPENVRML_PLAYER_PKGDATADIR_=\"$(datadir)/openvrml-player\" \ -DOPENVRML_LIBEXECDIR_=\"$(libexecdir)\" ! AM_CXXFLAGS = @GNOME_CFLAGS@ @GLADE_CFLAGS@ @CURL_CFLAGS@ ! AM_LDFLAGS = -export-dynamic @GNOME_LIBS@ @GLADE_LIBS@ @CURL_LIBS@ gladedir = $(datadir)/openvrml-player/glade --- 5,10 ---- -DOPENVRML_PLAYER_PKGDATADIR_=\"$(datadir)/openvrml-player\" \ -DOPENVRML_LIBEXECDIR_=\"$(libexecdir)\" ! AM_CXXFLAGS = @GNOMEUI_CFLAGS@ @GLADE_CFLAGS@ @CURL_CFLAGS@ ! AM_LDFLAGS = -export-dynamic @GNOMEUI_LIBS@ @GLADE_LIBS@ @CURL_LIBS@ gladedir = $(datadir)/openvrml-player/glade |
|
From: Braden M. <br...@us...> - 2007-01-24 00:06:38
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25273/src/openvrml-player Modified Files: Tag: OpenVRML-0_16-BRANCH Makefile.am player.cpp Log Message: openvrml-player needs libgnomeui; not just libgnome. Index: player.cpp =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** player.cpp 23 Jan 2007 09:54:58 -0000 1.1.2.1 --- player.cpp 24 Jan 2007 00:06:34 -0000 1.1.2.2 *************** *** 30,35 **** # include <curl/curl.h> # include <libgnomevfs/gnome-vfs.h> ! # include <libgnome/libgnome.h> ! # include <gtk/gtk.h> # include <glade/glade.h> --- 30,34 ---- # include <curl/curl.h> # include <libgnomevfs/gnome-vfs.h> ! # include <libgnomeui/libgnomeui.h> # include <glade/glade.h> *************** *** 141,145 **** gnome_program_init(app_id, PACKAGE_VERSION, ! LIBGNOME_MODULE, argc, argv, --- 140,144 ---- gnome_program_init(app_id, PACKAGE_VERSION, ! LIBGNOMEUI_MODULE, argc, argv, Index: Makefile.am =================================================================== RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/Makefile.am,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Makefile.am 23 Jan 2007 09:54:57 -0000 1.1.2.1 --- Makefile.am 24 Jan 2007 00:06:34 -0000 1.1.2.2 *************** *** 5,10 **** -DOPENVRML_PLAYER_PKGDATADIR_=\"$(datadir)/openvrml-player\" \ -DOPENVRML_LIBEXECDIR_=\"$(libexecdir)\" ! AM_CXXFLAGS = @GNOME_CFLAGS@ @GLADE_CFLAGS@ @CURL_CFLAGS@ ! AM_LDFLAGS = -export-dynamic @GNOME_LIBS@ @GLADE_LIBS@ @CURL_LIBS@ gladedir = $(datadir)/openvrml-player/glade --- 5,10 ---- -DOPENVRML_PLAYER_PKGDATADIR_=\"$(datadir)/openvrml-player\" \ -DOPENVRML_LIBEXECDIR_=\"$(libexecdir)\" ! AM_CXXFLAGS = @GNOMEUI_CFLAGS@ @GLADE_CFLAGS@ @CURL_CFLAGS@ ! AM_LDFLAGS = -export-dynamic @GNOMEUI_LIBS@ @GLADE_LIBS@ @CURL_LIBS@ gladedir = $(datadir)/openvrml-player/glade |
|
From: Braden M. <br...@us...> - 2007-01-24 00:06:37
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25273 Modified Files: Tag: OpenVRML-0_16-BRANCH ChangeLog configure.ac Log Message: openvrml-player needs libgnomeui; not just libgnome. Index: configure.ac =================================================================== RCS file: /cvsroot/openvrml/openvrml/configure.ac,v retrieving revision 1.92.2.13 retrieving revision 1.92.2.14 diff -C2 -d -r1.92.2.13 -r1.92.2.14 *** configure.ac 23 Jan 2007 09:54:57 -0000 1.92.2.13 --- configure.ac 24 Jan 2007 00:06:34 -0000 1.92.2.14 *************** *** 114,118 **** PKG_CHECK_MODULES([GTK], [gtk+-2.0 gthread-2.0], , [have_gtk=no]) PKG_CHECK_MODULES([GLADE], [libglade-2.0], , [have_libglade=no]) ! PKG_CHECK_MODULES([GNOME], [libgnome-2.0], , [have_gnome=no]) PKG_CHECK_MODULES([CURL], [libcurl], , [have_libcurl=no]) AC_PATH_XTRA --- 114,118 ---- PKG_CHECK_MODULES([GTK], [gtk+-2.0 gthread-2.0], , [have_gtk=no]) PKG_CHECK_MODULES([GLADE], [libglade-2.0], , [have_libglade=no]) ! PKG_CHECK_MODULES([GNOMEUI], [libgnomeui-2.0], , [have_gnomeui=no]) PKG_CHECK_MODULES([CURL], [libcurl], , [have_libcurl=no]) AC_PATH_XTRA Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1310.2.106 retrieving revision 1.1310.2.107 diff -C2 -d -r1.1310.2.106 -r1.1310.2.107 *** ChangeLog 23 Jan 2007 09:54:57 -0000 1.1310.2.106 --- ChangeLog 24 Jan 2007 00:06:34 -0000 1.1310.2.107 *************** *** 1,4 **** --- 1,17 ---- 2007-01-23 Braden McDaniel <br...@en...> + openvrml-player needs libgnomeui; not just libgnome. + + * configure.ac: Check for libgnomeui; export GNOMEUI_CFLAGS and + GNOMEUI_LIBS. + * src/openvrml-player/Makefile.am + (AM_CXXFLAGS): Use GNOMEUI_CFLAGS. + (AM_LDFLAGS): Use GNOMEUI_LIBS. + * src/openvrml-player/player.cpp + (main(int, char *[])): Call gnome_program_init with + LIBGNOMEUI_MODULE. + + 2007-01-23 Braden McDaniel <br...@en...> + Added openvrml-player, a stand-alone container for openvrml-gtkplug; libcurl is used for resource fetching. |
|
From: Braden M. <br...@us...> - 2007-01-23 10:06:24
|
Update of /cvsroot/openvrml/openvrml/src/openvrml-player In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6069/src/openvrml-player Added Files: .cvsignore Makefile.am openvrml-player.glade player.cpp Log Message: Added openvrml-player, a stand-alone container for openvrml-gtkplug; libcurl is used for resource fetching. --- NEW FILE: player.cpp --- // -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 78 -*- // // Copyright 2006 Braden McDaniel // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation; either version 2 of the License, or // (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // # include <map> # include <memory> # include <list> # include <stdexcept> # include <string> # include <vector> # include <boost/concept_check.hpp> # include <boost/lexical_cast.hpp> # include <boost/multi_index/detail/scope_guard.hpp> # include <boost/ref.hpp> # include <curl/curl.h> # include <libgnomevfs/gnome-vfs.h> # include <libgnome/libgnome.h> # include <gtk/gtk.h> # include <glade/glade.h> # ifdef HAVE_CONFIG_H # include <config.h> # endif using namespace boost::multi_index::detail; // for scope_guard extern "C" { void openvrml_player_watch_child(GPid pid, gint status, gpointer data); gboolean openvrml_player_request_data_available(GIOChannel * source, GIOCondition condition, gpointer data); gboolean openvrml_player_curl_prepare(GSource * source, gint * timeout); gboolean openvrml_player_curl_check(GSource * source); gboolean openvrml_player_curl_dispatch(GSource * source, GSourceFunc callback, gpointer user_data); void openvrml_player_curl_finalize(GSource * source); gboolean openvrml_player_curl_source_callback(gpointer data); size_t openvrml_player_curl_write(void * ptr, size_t size, size_t nmemb, void * stream); void openvrml_player_on_about_activated(GtkWindow * window); void openvrml_player_on_filechooserdialog_file_activated( GtkFileChooser * chooser, gpointer user_data); void openvrml_player_quit(); } namespace { G_GNUC_INTERNAL const char app_name[] = "OpenVRML Player"; G_GNUC_INTERNAL const char app_id[] = "openvrml-player"; G_GNUC_INTERNAL GIOChannel * command_channel; G_GNUC_INTERNAL GIOChannel * request_channel; G_GNUC_INTERNAL guint request_channel_watch_id; G_GNUC_INTERNAL ssize_t write_command(const std::string & command); G_GNUC_INTERNAL GSource * curl_source_new(CURLM * multi_handle); class G_GNUC_INTERNAL curl_stream_data { CURL * const handle_; std::vector<char> url_; bool initialized_; public: curl_stream_data(CURL * handle, const char * url); CURL * handle() const; const char * url() const; void initialize(); bool initialized() const; }; typedef std::map<CURL *, curl_stream_data> stream_data_map_t; struct curl_source_callback_data { GSource * curl_source; stream_data_map_t stream_data_map; }; struct request_data { std::stringstream request_line; curl_source_callback_data * source_callback_data; }; } int main(int argc, char * argv[]) { using std::string; using std::vector; using boost::lexical_cast; using boost::ref; if (!gnome_vfs_init()) { g_printerr("GnomeVFS initialization failed"); return EXIT_FAILURE; } if (curl_global_init(CURL_GLOBAL_ALL) != 0) { g_printerr("libcurl initialization failed"); return EXIT_FAILURE; } gchar ** remaining_args = 0; GOptionEntry option_entries[] = { { G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &remaining_args, "a URI for a VRML or X3D world", "[URI]" }, { 0, '\0', 0, G_OPTION_ARG_NONE, 0, 0, 0 } }; GOptionContext * const option_context = g_option_context_new("- render VRML/X3D worlds"); static const gchar * const translation_domain = 0; g_option_context_add_main_entries(option_context, option_entries, translation_domain); GnomeProgram * const program = gnome_program_init(app_id, PACKAGE_VERSION, LIBGNOME_MODULE, argc, argv, GNOME_PARAM_GOPTION_CONTEXT, option_context, GNOME_PARAM_NONE); const gchar * const gladedir = g_getenv("OPENVRML_PLAYER_GLADEDIR"); string glade_file_str; const gchar * glade_file = 0; if (gladedir) { glade_file_str = string(gladedir) + "/openvrml-player.glade"; glade_file = glade_file_str.c_str(); } if (!glade_file) { static const gboolean only_if_exists = true; glade_file = gnome_program_locate_file(program, GNOME_FILE_DOMAIN_APP_DATADIR, "/glade/openvrml-player.glade", only_if_exists, 0); } g_return_val_if_fail(glade_file, EXIT_FAILURE); GladeXML * const xml = glade_xml_new(glade_file, 0, 0); glade_xml_signal_autoconnect(xml); // // The OPENVRML_GTKPLUG environment variable overrides the default // path to the child process executable. To allow OPENVRML_GTKPLUG // to include arguments (rather than just be a path to an // executable), it is parsed with g_shell_parse_argv. This is // particularly useful in case we want to run the child process in // a harness like valgrind. // gint openvrml_gtkplug_cmd_argc = 0; gchar ** openvrml_gtkplug_cmd_argv = 0; scope_guard openvrml_gtkplug_cmd_argv_guard = make_guard(g_strfreev, ref(openvrml_gtkplug_cmd_argv)); boost::ignore_unused_variable_warning(openvrml_gtkplug_cmd_argv_guard); const gchar * const openvrml_gtkplug_cmd = g_getenv("OPENVRML_GTKPLUG"); if (!openvrml_gtkplug_cmd) { openvrml_gtkplug_cmd_argc = 1; openvrml_gtkplug_cmd_argv = static_cast<gchar **>(g_malloc0(sizeof (gchar *) * 2)); if (!openvrml_gtkplug_cmd_argv) { throw std::bad_alloc(); } openvrml_gtkplug_cmd_argv[0] = g_strdup(OPENVRML_LIBEXECDIR_ "/openvrml-gtkplug"); if (!openvrml_gtkplug_cmd_argv[0]) { throw std::bad_alloc(); } } else { GError * error = 0; scope_guard error_guard = make_guard(g_error_free, ref(error)); gboolean succeeded = g_shell_parse_argv(openvrml_gtkplug_cmd, &openvrml_gtkplug_cmd_argc, &openvrml_gtkplug_cmd_argv, &error); if (!succeeded) { throw std::runtime_error(error ? error->message : "g_shell_parse_argv failure"); } error_guard.dismiss(); } GtkWidget * const socket = glade_xml_get_widget(xml, "socket"); string socket_id_arg = lexical_cast<string>(gtk_socket_get_id(GTK_SOCKET(socket))); const char * socket_id_arg_c_str = socket_id_arg.c_str(); vector<char> socket_id_arg_vec( socket_id_arg_c_str, socket_id_arg_c_str + socket_id_arg.length() + 1); const gint child_argv_size = openvrml_gtkplug_cmd_argc + 2; gchar ** const child_argv = static_cast<gchar **>(g_malloc(sizeof (gchar *) * child_argv_size)); if (!argv) { throw std::bad_alloc(); } scope_guard child_argv_guard = make_guard(g_free, child_argv); boost::ignore_unused_variable_warning(child_argv_guard); gint i; for (i = 0; i < openvrml_gtkplug_cmd_argc; ++i) { child_argv[i] = openvrml_gtkplug_cmd_argv[i]; } child_argv[i++] = &socket_id_arg_vec.front(); child_argv[i] = 0; gchar * const working_dir = g_get_current_dir(); if (!working_dir) { throw std::bad_alloc(); }; scope_guard working_dir_guard = make_guard(g_free, working_dir); boost::ignore_unused_variable_warning(working_dir_guard); gchar ** envp = 0; GPid child_pid; gint standard_input, standard_output; gint * const standard_error = 0; GError * error = 0; scope_guard error_guard = make_guard(g_error_free, ref(error)); gboolean succeeded = g_spawn_async_with_pipes(working_dir, child_argv, envp, G_SPAWN_DO_NOT_REAP_CHILD, 0, 0, &child_pid, &standard_input, &standard_output, standard_error, &error); if (!succeeded) { throw std::runtime_error(error ? error->message : "g_spawn_async_with_pipes failure"); } g_child_watch_add(child_pid, openvrml_player_watch_child, 0); // // Don't dismiss "error_guard" yet; we reuse "error" below. // ::command_channel = g_io_channel_unix_new(standard_input); if (!::command_channel) { throw std::bad_alloc(); } GIOStatus status = g_io_channel_set_encoding(::command_channel, 0, // binary (no encoding) &error); if (status != G_IO_STATUS_NORMAL) { throw std::runtime_error(error ? error->message : "g_io_channel_set_encoding failure"); } error_guard.dismiss(); ::request_channel = g_io_channel_unix_new(standard_output); if (!::request_channel) { throw std::bad_alloc(); } CURLM * const multi_handle = curl_multi_init(); g_return_val_if_fail(multi_handle, EXIT_FAILURE); GSource * const curl_source = curl_source_new(multi_handle); scope_guard curl_source_guard = make_guard(g_source_unref, curl_source); boost::ignore_unused_variable_warning(curl_source_guard); curl_source_callback_data callback_data; callback_data.curl_source = curl_source; g_source_set_callback(curl_source, openvrml_player_curl_source_callback, &callback_data, 0); g_source_attach(curl_source, 0); request_data req_data; req_data.source_callback_data = &callback_data; ::request_channel_watch_id = g_io_add_watch(::request_channel, G_IO_IN, openvrml_player_request_data_available, &req_data); GtkWidget * const window = glade_xml_get_widget(xml, "window"); gtk_widget_show(window); gtk_main(); curl_multi_cleanup(multi_handle); curl_global_cleanup(); } namespace { typedef std::list<GPollFD> poll_fds_t; struct CURLSource { GSource source; CURLM * multi_handle; size_t outstanding_handles; fd_set read_fds; fd_set write_fds; fd_set exc_fds; int max_fd; poll_fds_t * poll_fds; }; GSource * curl_source_new(CURLM * const multi_handle) { g_return_val_if_fail(multi_handle, 0); static GSourceFuncs curl_source_funcs = { openvrml_player_curl_prepare, openvrml_player_curl_check, openvrml_player_curl_dispatch, openvrml_player_curl_finalize }; CURLSource * const source = static_cast<CURLSource *>( static_cast<void *>( g_source_new(&curl_source_funcs, sizeof (CURLSource)))); source->multi_handle = multi_handle; source->outstanding_handles = 0; FD_ZERO(&source->read_fds); FD_ZERO(&source->write_fds); FD_ZERO(&source->exc_fds); source->max_fd = -1; source->poll_fds = new poll_fds_t; return static_cast<GSource *>(static_cast<void *>(source)); } G_GNUC_INTERNAL void reset_fds(CURLSource & curl_source) { FD_ZERO(&curl_source.read_fds); FD_ZERO(&curl_source.write_fds); FD_ZERO(&curl_source.exc_fds); curl_source.max_fd = -1; const CURLMcode result = curl_multi_fdset(curl_source.multi_handle, &curl_source.read_fds, &curl_source.write_fds, &curl_source.exc_fds, &curl_source.max_fd); if (result != CURLM_OK) { g_critical("%s", curl_multi_strerror(result)); } if (curl_source.max_fd < 0) { return; } // // Resize the list of fds to be polled; initialize any new entries. // const poll_fds_t::size_type prev_size = curl_source.poll_fds->size(); curl_source.poll_fds->resize(curl_source.max_fd + 1); if (curl_source.poll_fds->size() > prev_size) { poll_fds_t::iterator pos = curl_source.poll_fds->begin(); std::advance(pos, prev_size); for (gint fd = prev_size; pos != curl_source.poll_fds->end(); ++pos, ++fd) { pos->fd = fd; pos->events = 0; pos->revents = 0; } } for (poll_fds_t::iterator pos = curl_source.poll_fds->begin(); pos != curl_source.poll_fds->end(); ++pos) { gushort events = 0; if (FD_ISSET(pos->fd, &curl_source.read_fds)) { events |= G_IO_IN | G_IO_HUP | G_IO_ERR; } if (FD_ISSET(pos->fd, &curl_source.write_fds)) { events |= G_IO_OUT | G_IO_ERR; } if (FD_ISSET(pos->fd, &curl_source.exc_fds)) { events |= G_IO_ERR; } // // No change. // if (events == pos->events) { continue; } // // Changed; but already in the list of fds to poll. Just update // the event flags. // if (events && pos->events) { pos->events = events; continue; } pos->events = events; if (events) { g_source_add_poll(&curl_source.source, &(*pos)); } else { g_source_remove_poll(&curl_source.source, &(*pos)); pos->revents = 0; } } } } gboolean openvrml_player_curl_prepare(GSource * const source, gint * const timeout_) { CURLSource * const curl_source = static_cast<CURLSource *>(static_cast<void *>(source)); reset_fds(*curl_source); long t; *timeout_ = (curl_multi_timeout(curl_source->multi_handle, &t) == CURLM_OK) ? gint(t) : -1; return *timeout_ != -1; } gboolean openvrml_player_curl_check(GSource * const source) { CURLSource * const curl_source = static_cast<CURLSource *>(static_cast<void *>(source)); FD_ZERO(&curl_source->read_fds); FD_ZERO(&curl_source->write_fds); FD_ZERO(&curl_source->exc_fds); bool events_pending = false; for (poll_fds_t::const_iterator pos = curl_source->poll_fds->begin(); pos != curl_source->poll_fds->end(); ++pos) { gushort revents = pos->revents; if (revents == 0) { continue; } events_pending = true; if (revents & (G_IO_IN | G_IO_PRI)) { FD_SET(pos->fd, &curl_source->read_fds); } if (revents & G_IO_OUT) { FD_SET(pos->fd, &curl_source->write_fds); } if (revents & (G_IO_ERR | G_IO_HUP)) { FD_SET(pos->fd, &curl_source->exc_fds); } } const bool ready_for_dispatch = events_pending || curl_source->outstanding_handles > 0; return ready_for_dispatch; } gboolean openvrml_player_curl_dispatch(GSource * const source, const GSourceFunc callback, const gpointer user_data) { CURLSource * const curl_source = static_cast<CURLSource *>(static_cast<void *>(source)); int running_handles; CURLMcode perform_result; do { perform_result = curl_multi_perform(curl_source->multi_handle, &running_handles); } while (perform_result == CURLM_CALL_MULTI_PERFORM); if (running_handles == 0) { reset_fds(*curl_source); } if (callback) { (*callback)(user_data); } return true; } void openvrml_player_curl_finalize(GSource * const source) { CURLSource * const curl_source = static_cast<CURLSource *>(static_cast<void *>(source)); reset_fds(*curl_source); delete curl_source->poll_fds; } gboolean openvrml_player_curl_source_callback(const gpointer data) { curl_source_callback_data * const callback_data = static_cast<curl_source_callback_data *>(data); CURLSource * const curl_source = static_cast<CURLSource *>( static_cast<void *>(callback_data->curl_source)); CURLMsg * msg; int msgs_in_queue; while ((msg = curl_multi_info_read(curl_source->multi_handle, &msgs_in_queue))) { if (msg->msg == CURLMSG_DONE) { const stream_data_map_t::size_type num_erased = callback_data->stream_data_map.erase(msg->easy_handle); g_assert(num_erased == 1); g_assert(curl_source->outstanding_handles > 0); --curl_source->outstanding_handles; std::ostringstream command; command << "destroy-stream " << ptrdiff_t(msg->easy_handle) << '\n'; const ssize_t bytes_written = ::write_command(command.str()); g_return_val_if_fail( bytes_written == ssize_t(command.str().length()), false); // // Note that the call to curl_multi_remove_handle invalidates the // data pointed to by msg. Save the easy_handle in a temporary // variable so we can use it with curl_easy_cleanup below. // CURL * const easy_handle = msg->easy_handle; const CURLMcode multi_remove_result = curl_multi_remove_handle(curl_source->multi_handle, easy_handle); if (multi_remove_result != CURLM_OK) { g_critical("%s", curl_multi_strerror(multi_remove_result)); } curl_easy_cleanup(easy_handle); } } return true; } gboolean openvrml_player_request_data_available(GIOChannel * const source, GIOCondition, const gpointer data) { using std::string; using std::vector; using boost::ref; request_data & req_data = *static_cast<request_data *>(data); gchar c; do { gsize bytes_read; GError * error = 0; scope_guard error_guard = make_guard(g_error_free, ref(error)); const GIOStatus status = g_io_channel_read_chars(source, &c, 1, &bytes_read, &error); if (status == G_IO_STATUS_ERROR) { if (error) { g_warning(error->message); } return false; } if (status == G_IO_STATUS_EOF) { return false; } if (status == G_IO_STATUS_AGAIN) { continue; } g_return_val_if_fail(status == G_IO_STATUS_NORMAL, false); g_assert(bytes_read == 1); if (c != '\n') { req_data.request_line.put(c); } error_guard.dismiss(); } while (g_io_channel_get_buffer_condition(source) & G_IO_IN); if (c == '\n') { string request_type; req_data.request_line >> request_type; if (request_type == "get-url") { typedef std::map<CURL *, curl_stream_data> stream_data_map_t; string url, target; req_data.request_line >> url >> target; CURL * const handle = curl_easy_init(); g_assert(req_data.source_callback_data); stream_data_map_t::iterator pos = req_data.source_callback_data->stream_data_map.insert( std::make_pair(handle, curl_stream_data(handle, url.c_str()))) .first; g_assert(pos != req_data.source_callback_data->stream_data_map.end()); curl_stream_data & stream_data = pos->second; CURLcode setopt_result; setopt_result = curl_easy_setopt(handle, CURLOPT_URL, stream_data.url()); if (setopt_result != CURLE_OK) { g_critical("%s", curl_easy_strerror(setopt_result)); return false; } setopt_result = curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, openvrml_player_curl_write); if (setopt_result != CURLE_OK) { g_critical("%s", curl_easy_strerror(setopt_result)); return false; } setopt_result = curl_easy_setopt(handle, CURLOPT_WRITEDATA, &stream_data); g_assert(setopt_result == CURLE_OK); CURLSource * const curl_source = static_cast<CURLSource *>( static_cast<void *>( req_data.source_callback_data->curl_source)); const CURLMcode add_handle_result = curl_multi_add_handle(curl_source->multi_handle, handle); if (add_handle_result != CURLM_OK) { g_critical("%s", curl_multi_strerror(add_handle_result)); return false; } ++curl_source->outstanding_handles; std::ostringstream command; command << "get-url-result " << url << ' ' << 0 << '\n'; const ssize_t bytes_written = write_command(command.str()); g_return_val_if_fail( bytes_written == ssize_t(command.str().length()), false); if (req_data.source_callback_data->stream_data_map.size() == 1) { int running_handles; CURLMcode perform_result; do { perform_result = curl_multi_perform(curl_source->multi_handle, &running_handles); } while (perform_result == CURLM_CALL_MULTI_PERFORM); } } req_data.request_line.clear(); } return true; } size_t openvrml_player_curl_write(void * const ptr, const size_t size, const size_t nmemb, void * const stream) { curl_stream_data & stream_data = *static_cast<curl_stream_data *>(stream); if (!stream_data.initialized()) { using boost::ref; const char * type = 0; CURLcode result = curl_easy_getinfo(stream_data.handle(), CURLINFO_CONTENT_TYPE, &type); boost::ignore_unused_variable_warning(result); GnomeVFSFileInfo * info = 0; scope_guard info_guard = make_guard(gnome_vfs_file_info_unref, ref(info)); if (!type) { info = gnome_vfs_file_info_new(); GnomeVFSResult get_file_info_result = gnome_vfs_get_file_info(stream_data.url(), info, GNOME_VFS_FILE_INFO_GET_MIME_TYPE); if (get_file_info_result != GNOME_VFS_OK) { g_critical("%s", gnome_vfs_result_to_string(get_file_info_result)); } type = gnome_vfs_file_info_get_mime_type(info); } else { info_guard.dismiss(); } std::ostringstream command; command << "new-stream " << ptrdiff_t(stream_data.handle()) << ' ' << (type ? type : "application/octet-stream") << ' ' << stream_data.url() << '\n'; write_command(command.str()); stream_data.initialize(); } std::ostringstream command; command << "write " << ptrdiff_t(stream_data.handle()) << ' ' << size * nmemb << '\n'; const char * data; for (data = static_cast<char *>(ptr); data != static_cast<char *>(ptr) + size * nmemb; ++data) { command.put(*data); } const ssize_t bytes_written = ::write_command(command.str()); g_assert(bytes_written == ssize_t(command.str().length())); return size_t(data - static_cast<char *>(ptr)); } void openvrml_player_on_about_activated(GtkWindow * const parent) { const gchar website[] = "http://openvrml.org"; const gchar * authors[] = { "Braden McDaniel <br...@en...>", 0 }; const gchar copyright[] = "Copyright 2006"; const gchar license[] = "This program is free software; you can redistribute it and/or modify it under " "the terms of the GNU General Public License as published by the Free Software " "Foundation; either version 2 of the License, or (at your option) any later " "version.\n\n" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " "FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " "details.\n\n" "You should have received a copy of the GNU General Public License along with " "this program; if not, write to the Free Software Foundation, Inc., 59 Temple " "Place, Suite 330, Boston, MA 02111-1307 USA"; gtk_show_about_dialog(parent, "name", app_name, "version", PACKAGE_VERSION, "website", website, "authors", authors, "copyright", copyright, "license", license, "wrap-license", true, NULL); } void openvrml_player_on_filechooserdialog_file_activated( GtkFileChooser * const chooser, gpointer) { gtk_widget_hide(GTK_WIDGET(chooser)); const gchar * const uri = gtk_file_chooser_get_uri(chooser); std::ostringstream command; command << "load-url " << uri << std::endl; ::write_command(command.str()); } void openvrml_player_quit() { gboolean succeeded = g_source_remove(::request_channel_watch_id); g_assert(succeeded); GError * error = 0; const gboolean flush = false; GIOStatus status = g_io_channel_shutdown(::request_channel, flush, &error); if (status != G_IO_STATUS_NORMAL) { if (error) { g_printerr(error->message); g_error_free(error); } } g_io_channel_unref(::request_channel); error = 0; status = g_io_channel_shutdown(::command_channel, flush, &error); if (status != G_IO_STATUS_NORMAL) { if (error) { g_printerr(error->message); g_error_free(error); } } g_io_channel_unref(::command_channel); } void openvrml_player_watch_child(const GPid pid, gint /* status */, gpointer /* data */) { g_spawn_close_pid(pid); gtk_main_quit(); } namespace { ssize_t write_command(const std::string & command) { g_assert(::command_channel); gsize bytes_written; GError * error = 0; GIOStatus status = g_io_channel_write_chars(::command_channel, command.data(), command.length(), &bytes_written, &error); if (status != G_IO_STATUS_NORMAL) { if (error) { g_printerr(error->message); g_error_free(error); } return -1; } do { status = g_io_channel_flush(::command_channel, &error); } while (status == G_IO_STATUS_AGAIN); if (status != G_IO_STATUS_NORMAL) { if (error) { g_printerr(error->message); g_error_free(error); } return -1; } return bytes_written; } curl_stream_data::curl_stream_data(CURL * const handle, const char * const url): handle_(handle), url_(url, url + strlen(url) + 1), // Get the trailing null. initialized_(false) {} CURL * curl_stream_data::handle() const { return this->handle_; } const char * curl_stream_data::url() const { return &this->url_.front(); } void curl_stream_data::initialize() { this->initialized_ = true; } bool curl_stream_data::initialized() const { return this->initialized_; } } // namespace --- NEW FILE: .cvsignore --- Makefile Makefile.in openvrml-player --- NEW FILE: openvrml-player.glade --- <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> <glade-interface> <widget class="GtkWindow" id="window"> <property name="default-width">640</property> <property name="default-height">480</property> <signal name="delete-event" handler="openvrml_player_quit"/> <child> <widget class="GtkVBox" id="vbox1"> <property name="visible">True</property> <child> <widget class="GtkMenuBar" id="menubar1"> <property name="visible">True</property> <child> <widget class="GtkMenuItem" id="menuitem1"> <property name="visible">True</property> <property name="label" translatable="yes">_File</property> <property name="use_underline">True</property> <child> <widget class="GtkMenu" id="menu1"> <property name="visible">True</property> <child> <widget class="GtkImageMenuItem" id="imagemenuitem2"> <property name="visible">True</property> <property name="label" translatable="yes">gtk-open</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <signal name="activate" handler="gtk_widget_show" object="filechooserdialog"/> </widget> </child> <child> <widget class="GtkSeparatorMenuItem" id="separatormenuitem1"> <property name="visible">True</property> </widget> </child> <child> <widget class="GtkImageMenuItem" id="imagemenuitem5"> <property name="visible">True</property> <property name="label" translatable="yes">gtk-quit</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <signal name="activate" handler="openvrml_player_quit"/> </widget> </child> </widget> </child> </widget> </child> <child> <widget class="GtkMenuItem" id="menuitem4"> <property name="visible">True</property> <property name="label" translatable="yes">_Help</property> <property name="use_underline">True</property> <child> <widget class="GtkMenu" id="menu3"> <property name="visible">True</property> <child> <widget class="GtkImageMenuItem" id="imagemenuitem10"> <property name="visible">True</property> <property name="label" translatable="yes">gtk-about</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <signal name="activate" handler="openvrml_player_on_about_activated" object="window"/> </widget> </child> </widget> </child> </widget> </child> </widget> <packing> <property name="expand">False</property> </packing> </child> <child> <widget class="GtkHBox" id="hbox1"> <property name="visible">True</property> <child> <widget class="GtkEntry" id="entry1"> <property name="visible">True</property> </widget> </child> </widget> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> <child> <widget class="GtkSocket" id="socket"> <property name="visible">True</property> </widget> </child> <child> <widget class="GtkStatusbar" id="statusbar1"> <property name="visible">True</property> </widget> <packing> <property name="expand">False</property> <property name="position">3</property> </packing> </child> </widget> </child> </widget> <widget class="GtkFileChooserDialog" id="filechooserdialog"> <property name="border_width">5</property> <property name="has_separator">False</property> <signal name="delete-event" handler="gtk_widget_hide_on_delete"/> <signal name="file-activated" handler="openvrml_player_on_filechooserdialog_file_activated"/> <child internal-child="vbox"> <widget class="GtkVBox" id="dialog-vbox2"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK</property> <property name="spacing">2</property> <child> <placeholder/> </child> <child internal-child="action_area"> <widget class="GtkHButtonBox" id="dialog-action_area2"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK</property> <property name="layout_style">GTK_BUTTONBOX_END</property> <child> <placeholder/> </child> <child> <placeholder/> </child> </widget> <packing> <property name="expand">False</property> <property name="pack_type">GTK_PACK_END</property> </packing> </child> </widget> </child> </widget> </glade-interface> --- NEW FILE: Makefile.am --- AM_CPPFLAGS = \ -DG_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \ -DGNOME_DISABLE_DEPRECATED \ -DOPENVRML_PLAYER_PKGDATADIR_=\"$(datadir)/openvrml-player\" \ -DOPENVRML_LIBEXECDIR_=\"$(libexecdir)\" AM_CXXFLAGS = @GNOME_CFLAGS@ @GLADE_CFLAGS@ @CURL_CFLAGS@ AM_LDFLAGS = -export-dynamic @GNOME_LIBS@ @GLADE_LIBS@ @CURL_LIBS@ gladedir = $(datadir)/openvrml-player/glade if ENABLE_PLAYER bin_PROGRAMS = openvrml-player glade_DATA = openvrml-player.glade endif openvrml_player_SOURCES = player.cpp EXTRA_DIST = \ $(openvrml_player_SOURCES) \ $(glade_DATA) |
