dec05eba/12to11
1
0
Fork 0
forked from 12to11/12to11
Code Pull requests Activity
12to11/Imakefile
oldosfan 4d2e85d002 Implement wp_viewporter support and fix scaling for fractional values 
* 12to11.c (XLMain): Initialize wp_viewporter.
* Imakefile (ETAGS): Remove unused variable.
(SRCS, OBJS): Add wp_viewporter.c and wp_viewporter.o.
(GENHEADERS): Remove unnecessary headers.
(viewporter): New scanner target.
* README: Document support for wp_viewporter.
* compositor.h (struct _ViewportExt): New forward declaration.
(struct _DrawParams): New fields for cropping and stretching.
(struct _RenderFuncs): Describe how composite works.
(struct _BufferFuncs): Make update_buffer_for_damage take
DrawParams as an argument.
(struct _State): New fields for viewporting.
(struct _Surface): New field `viewport' and associated input
delta.
(struct _XdgRoleImplementationFuncs): New field
`is_window_mapped'.  Do not commit while unmapped.
* dmabuf.c (XLInitDmabuf): Remove outdated comment.
* dnd.c (HandleMotion): Use TruncateWindowToSurface.
* egl.c (struct _EglBuffer): Add 3x3 reverse transformation
matrix.
(struct _CompositeProgram): Rename `scale' to `source'.
(Index): New macro.
(PickBetterVisual, FindVisual): Compensate for EGL picking a
non-RGBA visual.
(EglCompileCompositeProgram): Look for source, not scale.
(ComputeTransformMatrix): New function.
(Composite): Compute transformation matrix and draw using that.
(BufferFromDmaBuf, BufferFromShm): Copy identity transform and
stop setting scale.
(ReverseTransformToBox): New function.
(UpdateShmBufferIncrementally): Accept DrawParams and invert
damage according to that.
(UpdateBuffer, UpdateBufferForDamage): Pass draw params to the
incremental buffer update function.
* fns.c (XLExtendRegion): New function.
* frame_clock.c (CurrentHighPrecisionTimestamp): Delete
function.
(HighPrecisionTimestamp, HighPrecisionTimestamp32): New
functions.
(PostEndFrame): Handle X server time truncation to 32 bits.
(XLFrameClockFreeze): Remove trailing whitespace.
* picture_renderer.c (GetSourceX, GetSourceY, CompareStretch):
New functions.
(MaybeApplyTransform): Check more values before applying
transformations.  Then, handle stretch and offset.
* positioner.c (GetAdjustmentOffset, ApplyConstraintAdjustment)
(XLPositionerCalculateGeometry): Scale coordinates using new
functions.
* renderer.c (RenderUpdateBufferForDamage): Accept DrawParams
instead of scale.
* shaders.txt (Composite Rectangle Fragment Shader RGBA)
(Composite Rectangle Fragment Shader RGBX)
(Composite Rectangle Fragment Shader External): Stop
transforming texcoords.
(Composite Rectangle Vertex Shader): Transform texcoords in the
vertex shader instead.
* subcompositor.c (IsViewported, SetViewported,
ClearViewported): New functions.
(struct _View): New fields for tracking viewports and fractional
offsets.
(ViewAttachBuffer): Do not garbage upon buffer size change if a
viewport is set.
(ViewMoveFractional): New function.
(ViewDamage): Describe what the damage is and is not transformed
by.
(GetContentScale): New function.
(ViewWidth, ViewHeight): Apply viewport.
(ViewSetScale): Use ViewAfterSizeUpdate instead of duplicating
code.
(ViewSetViewport, ViewClearViewport): New functions.
(ViewComputeTransform): Compute transform for viewports.  New
arg draw; use it to determine whether or not to include a
fractional offset.
(IntersectBoxes): Fix intersection calculation.
(SubcompositorUpdate): Don't keep calling ViewWidth and
ViewHeight in a loop.
(SubcompositorExpose): Adjust for changes to buffer damage
uploading.
* subsurface.c (MoveFractional): New function.  Handle
fractional offsets after scaling.
(MaybeUpdateOutputs, AfterParentCommit, Setup, Rescale): Use
that function to move the subsurface instead.
* surface.c (ApplyScale): Update comment.
(ApplyViewport, CheckViewportValues): New functions.
(HandleScaleChanged): Apply the viewport as well upon scale
change.
(ApplyDamage): Improve damage calculation for viewported
surfaces.
(SavePendingState, InternalCommit): Save and commit viewport
state; check old values upon buffer commit.
(InitState): Initialize viewport to initial values.
(XLSurfaceRunFrameCallbacks): Handle overflows of 32-bit time at
the 49-day mark.
(SurfaceToWindow, ScaleToWindow, WindowToSurface, ScaleToSurface)
(TruncateScaleToWindow, TruncateScaleToWindow)
(TruncateWindowToSurface, TruncateScaleToSurface): New functions
for handling scale.
* xdg_popup.c (MoveWindow, IsWindowMapped, XLGetXdgPopup):
* xdg_surface.c (IsRoleMapped, Commit, Subframe)
(GetResizeDimensions, XLXdgRoleCalcNewWindowSize):
* xdg_toplevel.c (IsWindowMapped, NoteConfigureTime, SendStates)
(RecordStateSize, HandleWindowGeometryChange, NoteWindowPreResize)
(XLGetXdgToplevel): Use them instead of manually multiplying
with the factor.
2022-09-30 01:17:47 +00:00

129 lines
5 KiB
Text
Raw Blame History

#include "libraries.def"
#ifndef HasPosixThreads
#error "Posix threads are required"
#endif
SYS_LIBRARIES = MathLibrary ThreadsLibraries
DEPLIBS = $(DEPXLIB) $(DEPEXTENSIONLIB) $(DEPXRANDRLIB) $(DEPXRENDERLIB) \
$(DEPXFIXESLIB) $(DEPXILIB) $(DEPXKBFILELIB)
LOCAL_LIBRARIES = $(XLIB) $(EXTENSIONLIB) $(XCBLIB) $(XCB) $(XCB_SHM) \
$(XRANDRLIB) $(PIXMAN) $(XRENDERLIB) $(XILIB) $(XKBFILELIB) $(XFIXESLIB) \
$(XCB_DRI3) $(XCB_SHAPE) $(WAYLAND_SERVER)
INCLUDES := $(DRMINCLUDES) $(PIXMANINCLUDES)
SRCS = 12to11.c run.c alloc.c fns.c output.c compositor.c \
surface.c region.c shm.c atoms.c subcompositor.c positioner.c \
xdg_wm.c xdg_surface.c xdg_toplevel.c frame_clock.c xerror.c \
ewmh.c timer.c subsurface.c seat.c data_device.c xdg_popup.c \
dmabuf.c buffer.c select.c xdata.c xsettings.c dnd.c \
icon_surface.c primary_selection.c renderer.c \
picture_renderer.c explicit_synchronization.c transform.c \
wp_viewporter.c
OBJS = 12to11.o run.o alloc.o fns.o output.o compositor.o \
surface.o region.o shm.o atoms.o subcompositor.o positioner.o \
xdg_wm.o xdg_surface.o xdg_toplevel.o frame_clock.o xerror.o \
ewmh.o timer.o subsurface.o seat.o data_device.o xdg_popup.o \
dmabuf.o buffer.o select.o xdata.o xsettings.o dnd.o \
icon_surface.o primary_selection.o renderer.o \
picture_renderer.o explicit_synchronization.o transform.o \
wp_viewporter.o
GENHEADERS = transfer_atoms.h
#ifdef HaveEglSupport
EGL_SRCS = egl.c
EGL_OBJS = egl.o
LOCAL_LIBRARIES ::= $(LOCAL_LIBRARIES) $(EGL) $(GLES)
SRCS ::= $(SRCS) $(EGL_SRCS)
OBJS ::= $(OBJS) $(EGL_OBJS)
DEFINES ::= $(DEFINES) -DHaveEglSupport
shaders.h: shaders.txt shaders.awk
awk -f shaders.awk shaders.txt > $@
depend:: shaders.h
$(EGL_OBJS): shaders.h
cleandir::
$(RM) shaders.h
#endif
OPTIMIZE = -O0
ANALYZE = -fanalyzer
CDEBUGFLAGS := -fno-common -Wall -Warith-conversion -Wdate-time \
-Wdisabled-optimization -Wdouble-promotion -Wduplicated-cond \
-Wextra -Wformat-signedness -Winit-self -Winvalid-pch \
-Wlogical-op -Wmissing-declarations -Wmissing-include-dirs \
-Wmissing-prototypes -Wnested-externs -Wnull-dereference \
-Wold-style-definition -Wopenmp-simd -Wpacked -Wpointer-arith \
-Wstrict-prototypes -Wsuggest-attribute=format \
-Wsuggest-attribute=noreturn -Wsuggest-final-methods \
-Wsuggest-final-types -Wuninitialized -Wunknown-pragmas \
-Wunused-macros -Wvariadic-macros \
-Wvector-operation-performance -Wwrite-strings \
-Warray-bounds=2 -Wattribute-alias=2 -Wformat=2 \
-Wformat-truncation=2 -Wimplicit-fallthrough=5 \
-Wshift-overflow=2 -Wuse-after-free=3 -Wvla-larger-than=4031 \
-Wredundant-decls -Wno-missing-field-initializers \
-Wno-override-init -Wno-sign-compare -Wno-type-limits \
-Wno-unused-parameter -Wno-format-nonliteral -g3 $(OPTIMIZE) \
$(ANALYZE)
short_types.txt: media_types.txt
XCOMM Remove all data types starting with application/vnd.
XCOMM no program really uses them in clipboard data, and they
XCOMM waste a lot of space on disk.
sed '/application\/vnd/d' media_types.txt > $@
transfer_atoms.h: short_types.txt mime0.awk mime1.awk mime2.awk mime3.awk \
mime4.awk
awk -f mime0.awk short_types.txt > $@
awk -f mime1.awk short_types.txt >> $@
awk -f mime2.awk short_types.txt >> $@
awk -f mime3.awk short_types.txt >> $@
awk -f mime4.awk short_types.txt >> $@
/* Now, define generated files. */
#define ScannerTarget(name) @@\
name.h: name.xml @@\
$(WAYLAND_SCANNER) server-header $< $@ @@\
@@\
name.c: name.xml name.h @@\
$(WAYLAND_SCANNER) private-code $< $@ @@\
@@\
GENHEADERS := $(GENHEADERS) name.h @@\
OBJS := $(OBJS) name.o @@\
SRCS := $(SRCS) name.c @@\
GENSRCS := $(GENSRCS) name.c @@\
ScannerTarget(linux-dmabuf-unstable-v1)
ScannerTarget(xdg-shell)
ScannerTarget(primary-selection-unstable-v1)
ScannerTarget(linux-explicit-synchronization-unstable-v1)
ScannerTarget(viewporter)
/* Make OBJS depend on scanner headers, and depend on both them and SRCS. */
$(OBJS): $(GENHEADERS)
/* depend somehow does not depend on SRCS, even though some of OBJS
are generated. */
depend:: $(GENHEADERS) $(SRCS)
cleandir::
$(RM) $(GENHEADERS) $(GENSRCS) transfer_atoms.h short_types.txt
/* Undefine _BSD_SOURCE and _SVID_SOURCE, since both are deprecated
and are also superseeded by _GNU_SOURCE. */
EXTRA_DEFINES := -D_GNU_SOURCE -U_BSD_SOURCE -U_SVID_SOURCE
ComplexProgramTarget(12to11)
View git blame Copy permalink