Merge remote-tracking branch 'origin/firebreath-1.7'

cmake/Mac.cmake

@@ -101,7 +101,7 @@ MACRO(add_mac_plugin PROJECT_NAME PLIST_TEMPLATE STRINGS_TEMPLATE LOCALIZED_TEMP
 
     string(REPLACE " " "\ " FB_ESC_ROOT_DIR ${FB_ROOT_DIR})
     set_target_properties(${PROJECT_NAME} PROPERTIES
-        OUTPUT_NAME ${FBSTRING_PluginName}
+        OUTPUT_NAME ${FBSTRING_PluginFileName}
         BUNDLE 1
         BUNDLE_EXTENSION plugin
         XCODE_ATTRIBUTE_WRAPPER_EXTENSION plugin  #sets the extension to .plugin

cmake/X11.cmake

@@ -35,10 +35,10 @@ MACRO(find_firebreath_x11_deps)
     if (NOT FB_GUI_DISABLED)
         if (NOT GTK_INCLUDE_DIRS)
             pkg_check_modules(GTK REQUIRED gtk+-2.0)
-            set (GTK_INCLUDE_DIRS ${GTK_INCLUDE_DIRS} CACHE INTERNAL "GTK include dirs" PARENT_SCOPE)
-            set (GTK_LIBRARIES ${GTK_LIBRARIES} CACHE INTERNAL "GTK include dirs" PARENT_SCOPE)
-            set (GTK_LIBRARY_DIRS ${GTK_LIBRARY_DIRS} CACHE INTERNAL "GTK include dirs" PARENT_SCOPE)
-            set (GTK_LDFLAGS ${GTK_LDFLAGS} CACHE INTERNAL "GTK include dirs" PARENT_SCOPE)
+            set (GTK_INCLUDE_DIRS ${GTK_INCLUDE_DIRS} PARENT_SCOPE)
+            set (GTK_LIBRARIES ${GTK_LIBRARIES} PARENT_SCOPE)
+            set (GTK_LIBRARY_DIRS ${GTK_LIBRARY_DIRS} PARENT_SCOPE)
+            set (GTK_LDFLAGS ${GTK_LDFLAGS} PARENT_SCOPE)
         endif()
         set (FB_INCLUDE_DIRS ${FB_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS})
         set (PLUGIN_INTERNAL_DEPS ${PLUGIN_INTERNAL_DEPS} ${GTK_LIBRARIES} PARENT_SCOPE)
@@ -65,7 +65,7 @@ MACRO(add_x11_plugin PROJNAME INSOURCES)
     add_library(${PROJNAME} SHARED ${SOURCES})
 
     set_target_properties ("${PROJNAME}" PROPERTIES
-        OUTPUT_NAME np${PLUGIN_NAME}
+        OUTPUT_NAME ${FBSTRING_PluginFileName}
         PROJECT_LABEL "${PROJNAME}"
         LINK_FLAGS "${NPAPI_LINK_FLAGS}"
         PREFIX ""

fbgen/src/Mac/bundle_template/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>${FBSTRING_PluginName}</string>
+	<string>${FBSTRING_PluginFileName}</string>
 	<key>CFBundleGetInfoString</key>
     <string>${FBSTRING_PluginName} ${FBSTRING_PLUGIN_VERSION}, ${FBSTRING_LegalCopyright}</string>
 	<key>CFBundleIdentifier</key>

fbgen/src/Mac/bundle_template/InfoPlist.strings

@@ -1,4 +1,4 @@
 /* Localized versions of Info.plist keys */
 
-CFBundleName = "${FBSTRING_PluginName}.plugin";
+CFBundleName = "${FBSTRING_PluginName}";
 NSHumanReadableCopyright = "${FBSTRING_LegalCopyright}";

fbgen/src/PluginConfig.cmake

@@ -34,14 +34,18 @@ endif ( FB_PLATFORM_ARCH_32 )
 
 # these are the pieces that are relevant to using it from Javascript
 set(ACTIVEX_PROGID "@{COMPANY_ident}.@{PLUGIN_ident}")
-set(MOZILLA_PLUGINID "@{COMPANY_domain}/@{PLUGIN_ident}")
+if ( FB_PLATFORM_ARCH_32 )
+    set(MOZILLA_PLUGINID "@{COMPANY_domain}/@{PLUGIN_ident}")  # No 32bit postfix to maintain backward compatability.
+else ( FB_PLATFORM_ARCH_32 )
+    set(MOZILLA_PLUGINID "@{COMPANY_domain}/@{PLUGIN_ident}_${FB_PLATFORM_ARCH_NAME}")
+endif ( FB_PLATFORM_ARCH_32 )
 
 # strings
 set(FBSTRING_CompanyName "@{COMPANY_name}")
 set(FBSTRING_PluginDescription "@{PLUGIN_desc}")
 set(FBSTRING_PLUGIN_VERSION "1.0.0.0")
 set(FBSTRING_LegalCopyright "Copyright @{YEAR} @{COMPANY_name}")
-set(FBSTRING_PluginFileName "np${PLUGIN_NAME}.dll")
+set(FBSTRING_PluginFileName "np${PLUGIN_NAME}")
 set(FBSTRING_ProductName "@{PLUGIN_name}")
 set(FBSTRING_FileExtents "")
 if ( FB_PLATFORM_ARCH_32 )

fbgen/src/Win/WiX/TemplateInstaller.wxs

@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Product Id="*" Name="${FBSTRING_PluginName}" Language="1033" Version="${FBSTRING_PLUGIN_VERSION}" Manufacturer="${FBSTRING_CompanyName}" UpgradeCode="{${FBControl_WixUpgradeCode_GUID}}">
         <Package InstallerVersion="200" Compressed="yes" Description="Installer for the ${FBSTRING_PluginName} plugin" InstallScope="perUser" />
-        <Upgrade Id="{@{GUIDS_INSTUPGR}}">
+        <Upgrade Id="{${FBControl_WixUpgradeCode_GUID}}">
             <UpgradeVersion
                 Property="OLD_VERSION_FOUND"
                 Minimum="0.0.1" IncludeMinimum="yes"

gen_templates/config.h

@@ -8,7 +8,7 @@
 #define FBSTRING_CompanyName "${FBSTRING_CompanyName}"
 #define FBSTRING_PLUGIN_VERSION "${FBSTRING_PLUGIN_VERSION}"
 #define FBSTRING_LegalCopyright "${FBSTRING_LegalCopyright}"
-#define FBSTRING_PluginFileName "${FBSTRING_PluginFileName}.dll"
+#define FBSTRING_PluginFileName "${FBSTRING_PluginFileName}"
 #define FBSTRING_ProductName "${FBSTRING_ProductName}"
 #define FBSTRING_PluginName "${FBSTRING_PluginName}"
 

src/PluginAuto/X11/PluginWindowX11.cpp

@@ -30,6 +30,9 @@ Copyright 2009 Richard Bateman, Firebreath development team
 
 #endif
 
+// These match the numbers used in WebKit (WebFrameView.m).
+const int cScrollbarPixelsPerLineStep = 40;
+
 FB::PluginWindowX11* FB::createPluginWindowX11(const FB::WindowContextX11& ctx)
 {
     return new FB::PluginWindowX11(ctx);
@@ -269,16 +272,16 @@ gboolean PluginWindowX11::EventCallback(GtkWidget *widget, GdkEvent *event)
             switch (scroll->direction)
             {
             case GDK_SCROLL_UP:
-                dy -= 3;
+                dy -= cScrollbarPixelsPerLineStep;
                 break;
             case GDK_SCROLL_DOWN:
-                dy += 3;
+                dy += cScrollbarPixelsPerLineStep;
                 break;
             case GDK_SCROLL_LEFT:
-                dx -= 3;
+                dx -= cScrollbarPixelsPerLineStep;
                 break;
             case GDK_SCROLL_RIGHT:
-                dx += 3;
+                dx += cScrollbarPixelsPerLineStep;
                 break;
             }
             MouseScrollEvent evt(scroll->x, scroll->y, -dx, -dy, getModifierState(scroll->state));