Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/d51af2004b541c1d003fd11e202a10c981d418b6
...commit
http://git.netsurf-browser.org/netsurf.git/commit/d51af2004b541c1d003fd11e202a10c981d418b6
...tree
http://git.netsurf-browser.org/netsurf.git/tree/d51af2004b541c1d003fd11e202a10c981d418b6
The branch, svenw/cocoa has been updated
via d51af2004b541c1d003fd11e202a10c981d418b6 (commit)
via 4051cd95a4c0443d814b9df6938d5bcdb0b6d077 (commit)
from 42bf8a713d8ba06785407671cf5753694289c6b8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=d51af2004b541c1d003fd11e202a10c981d418b6
commit d51af2004b541c1d003fd11e202a10c981d418b6
Author: Sven Weidauer <[email protected]>
Commit: Sven Weidauer <[email protected]>
Set screen scale factor to 1
diff --git a/frontends/cocoa/plotter.m b/frontends/cocoa/plotter.m
index 1e01a47..f911677 100644
--- a/frontends/cocoa/plotter.m
+++ b/frontends/cocoa/plotter.m
@@ -84,7 +84,7 @@ static nserror plot_line(const struct redraw_context *ctx,
const plot_style_t *p
[path lineToPoint:cocoa_point(line->x1, line->y1)];
cocoa_plot_path_set_stroke_pattern(path, pstyle);
- const bool horizontal = y0 == y1;
+ const bool horizontal = line->y0 == line->y1;
const bool vertical = line->x0 == line->x1;
const bool oddThickness = pstyle->stroke_width != 0 ?
(pstyle->stroke_width % 2) != 0 : true;
@@ -319,10 +319,9 @@ static CGFloat cocoa_half_pixel;
void cocoa_update_scale_factor(void)
{
- const CGFloat scale = [[NSScreen mainScreen] backingScaleFactor];
- cocoa_scale_factor = scale == 1.0 ? 1.0 : 1.0 / scale;
+ cocoa_scale_factor = 1.0;
cocoa_half_pixel = 0.5 * cocoa_scale_factor;
- browser_set_dpi(points_per_inch * scale);
+ browser_set_dpi(points_per_inch);
}
static inline void cocoa_center_pixel(bool x, bool y)
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=4051cd95a4c0443d814b9df6938d5bcdb0b6d077
commit 4051cd95a4c0443d814b9df6938d5bcdb0b6d077
Author: Sven Weidauer <[email protected]>
Commit: Sven Weidauer <[email protected]>
Set deployment target independent of base SDK, with default value of 10.7.
diff --git a/frontends/cocoa/Makefile b/frontends/cocoa/Makefile
index c5d329b..0febfbb 100644
--- a/frontends/cocoa/Makefile
+++ b/frontends/cocoa/Makefile
@@ -19,16 +19,14 @@ else
endif
endif
-ifeq ($(SDK_VERSION),)
- # if no SDK_VERSION has been specified select one from those available
- SDK_PARAM := $(shell xcodebuild -showsdks | awk '/^$$/{p=0};p; /(OS X|macOS)
SDKs:/{p=1}' | head -1 | cut -f3)
- SDK_VERSION := $(MACOSX_VERSION)
-else
- SDK_PARAM := -sdk macosx$(SDK_VERSION)
+SDK_PARAM := $(shell xcodebuild -showsdks | awk '/^$$/{p=0};p; /(OS X|macOS)
SDKs:/{p=1}' | head -1 | cut -f3)
+
+ifeq ($(DEPLOYMENT_TARGET),)
+ DEPLOYMENT_TARGET := 10.7
endif
SDK_PATH ?= $(shell xcodebuild -version $(SDK_PARAM) Path)
-SDK_FLAGS := -isysroot $(SDK_PATH) -mmacosx-version-min=$(SDK_VERSION)
+SDK_FLAGS := -isysroot $(SDK_PATH) -mmacosx-version-min=$(DEPLOYMENT_TARGET)
CFLAGS := $(SDK_FLAGS) $(CFLAGS)
LDFLAGS := $(SDK_FLAGS) -Wl,-syslibroot,$(SDK_PATH) $(LDFLAGS)
CXXFLAGS := $(SDK_FLAGS) $(CXXFLAGS)
@@ -41,7 +39,7 @@ LDFLAGS += -L/usr/X11/lib
LDFLAGS += -lm -lcurl
LDFLAGS += -lssl -lcrypto
-CFLAGS += -Dnscocoa -D_BSD_SOURCE -D_POSIX_C_SOURCE -std=c99 -g -Os -fobjc-arc
+CFLAGS += -Dnscocoa -D_BSD_SOURCE -D_POSIX_C_SOURCE -std=c99 -fobjc-arc
CFLAGS += -I/usr/X11/include
CFLAGS += -include cocoa/Prefix.pch
@@ -61,6 +59,11 @@ ifneq ($(UNIVERSAL),)
CXXFLAGS += $(UNIVERSAL_FLAGS)
endif
+
+ifeq ($(VARIANT),debug)
+ CFLAGS += -g
+endif
+
# ----------------------------------------------------------------------------
# Source file setup
# ----------------------------------------------------------------------------
@@ -220,7 +223,7 @@ NetSurf.app/Contents/Info.plist:
$(FRONTEND_RESOURCES_DIR)/NetSurf-Info.plist $(
$(Q)$(MKDIR) -p NetSurf.app/Contents
$(Q)sed -e 's/$${EXECUTABLE_NAME}/$(EXETARGET)/' \
-e 's/$${PRODUCT_NAME.*}/$(EXETARGET)/' \
- -e 's/$${MACOSX_DEPLOYMENT_TARGET}/$(MACOSX_VERSION)/' \
+ -e 's/$${MACOSX_DEPLOYMENT_TARGET}/$(DEPLOYMENT_TARGET)/' \
-e 's/$${NETSURF_VERSION}/$(VERSION_FULL)/' \
-e 's/$${NETSURF_SHORT_VERSION}/$(VERSION_MAJ).$(VERSION_MIN)/'
\
< $(FRONTEND_RESOURCES_DIR)/NetSurf-Info.plist >
NetSurf.app/Contents/Info.plist
diff --git a/frontends/cocoa/Makefile.defaults
b/frontends/cocoa/Makefile.defaults
index 8f5792b..49e570c 100644
--- a/frontends/cocoa/Makefile.defaults
+++ b/frontends/cocoa/Makefile.defaults
@@ -26,5 +26,3 @@ NETSURF_USE_IMAGEIO := YES
MACOSX_VERSION := $(shell sw_vers -productVersion | awk -F '.' '{print $$1 "."
$$2}')
-# Optimisation levels
-CFLAGS += -O2
-----------------------------------------------------------------------
Summary of changes:
frontends/cocoa/Makefile | 21 ++++++++++++---------
frontends/cocoa/Makefile.defaults | 2 --
frontends/cocoa/plotter.m | 7 +++----
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/frontends/cocoa/Makefile b/frontends/cocoa/Makefile
index c5d329b..0febfbb 100644
--- a/frontends/cocoa/Makefile
+++ b/frontends/cocoa/Makefile
@@ -19,16 +19,14 @@ else
endif
endif
-ifeq ($(SDK_VERSION),)
- # if no SDK_VERSION has been specified select one from those available
- SDK_PARAM := $(shell xcodebuild -showsdks | awk '/^$$/{p=0};p; /(OS X|macOS)
SDKs:/{p=1}' | head -1 | cut -f3)
- SDK_VERSION := $(MACOSX_VERSION)
-else
- SDK_PARAM := -sdk macosx$(SDK_VERSION)
+SDK_PARAM := $(shell xcodebuild -showsdks | awk '/^$$/{p=0};p; /(OS X|macOS)
SDKs:/{p=1}' | head -1 | cut -f3)
+
+ifeq ($(DEPLOYMENT_TARGET),)
+ DEPLOYMENT_TARGET := 10.7
endif
SDK_PATH ?= $(shell xcodebuild -version $(SDK_PARAM) Path)
-SDK_FLAGS := -isysroot $(SDK_PATH) -mmacosx-version-min=$(SDK_VERSION)
+SDK_FLAGS := -isysroot $(SDK_PATH) -mmacosx-version-min=$(DEPLOYMENT_TARGET)
CFLAGS := $(SDK_FLAGS) $(CFLAGS)
LDFLAGS := $(SDK_FLAGS) -Wl,-syslibroot,$(SDK_PATH) $(LDFLAGS)
CXXFLAGS := $(SDK_FLAGS) $(CXXFLAGS)
@@ -41,7 +39,7 @@ LDFLAGS += -L/usr/X11/lib
LDFLAGS += -lm -lcurl
LDFLAGS += -lssl -lcrypto
-CFLAGS += -Dnscocoa -D_BSD_SOURCE -D_POSIX_C_SOURCE -std=c99 -g -Os -fobjc-arc
+CFLAGS += -Dnscocoa -D_BSD_SOURCE -D_POSIX_C_SOURCE -std=c99 -fobjc-arc
CFLAGS += -I/usr/X11/include
CFLAGS += -include cocoa/Prefix.pch
@@ -61,6 +59,11 @@ ifneq ($(UNIVERSAL),)
CXXFLAGS += $(UNIVERSAL_FLAGS)
endif
+
+ifeq ($(VARIANT),debug)
+ CFLAGS += -g
+endif
+
# ----------------------------------------------------------------------------
# Source file setup
# ----------------------------------------------------------------------------
@@ -220,7 +223,7 @@ NetSurf.app/Contents/Info.plist:
$(FRONTEND_RESOURCES_DIR)/NetSurf-Info.plist $(
$(Q)$(MKDIR) -p NetSurf.app/Contents
$(Q)sed -e 's/$${EXECUTABLE_NAME}/$(EXETARGET)/' \
-e 's/$${PRODUCT_NAME.*}/$(EXETARGET)/' \
- -e 's/$${MACOSX_DEPLOYMENT_TARGET}/$(MACOSX_VERSION)/' \
+ -e 's/$${MACOSX_DEPLOYMENT_TARGET}/$(DEPLOYMENT_TARGET)/' \
-e 's/$${NETSURF_VERSION}/$(VERSION_FULL)/' \
-e 's/$${NETSURF_SHORT_VERSION}/$(VERSION_MAJ).$(VERSION_MIN)/'
\
< $(FRONTEND_RESOURCES_DIR)/NetSurf-Info.plist >
NetSurf.app/Contents/Info.plist
diff --git a/frontends/cocoa/Makefile.defaults
b/frontends/cocoa/Makefile.defaults
index 8f5792b..49e570c 100644
--- a/frontends/cocoa/Makefile.defaults
+++ b/frontends/cocoa/Makefile.defaults
@@ -26,5 +26,3 @@ NETSURF_USE_IMAGEIO := YES
MACOSX_VERSION := $(shell sw_vers -productVersion | awk -F '.' '{print $$1 "."
$$2}')
-# Optimisation levels
-CFLAGS += -O2
diff --git a/frontends/cocoa/plotter.m b/frontends/cocoa/plotter.m
index 1e01a47..f911677 100644
--- a/frontends/cocoa/plotter.m
+++ b/frontends/cocoa/plotter.m
@@ -84,7 +84,7 @@ static nserror plot_line(const struct redraw_context *ctx,
const plot_style_t *p
[path lineToPoint:cocoa_point(line->x1, line->y1)];
cocoa_plot_path_set_stroke_pattern(path, pstyle);
- const bool horizontal = y0 == y1;
+ const bool horizontal = line->y0 == line->y1;
const bool vertical = line->x0 == line->x1;
const bool oddThickness = pstyle->stroke_width != 0 ?
(pstyle->stroke_width % 2) != 0 : true;
@@ -319,10 +319,9 @@ static CGFloat cocoa_half_pixel;
void cocoa_update_scale_factor(void)
{
- const CGFloat scale = [[NSScreen mainScreen] backingScaleFactor];
- cocoa_scale_factor = scale == 1.0 ? 1.0 : 1.0 / scale;
+ cocoa_scale_factor = 1.0;
cocoa_half_pixel = 0.5 * cocoa_scale_factor;
- browser_set_dpi(points_per_inch * scale);
+ browser_set_dpi(points_per_inch);
}
static inline void cocoa_center_pixel(bool x, bool y)
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
