The following builds for me: basebmp, basegfx, comphelper, dtrans, i18npool, i18nutil, l10ntools, o3tl, psprint_config, regexp, rsc, sax, sot, tools, ucbhelper, unotools, vcl The rest still needs fixing ;-) Conflicts: canvas/prj/build.lst canvas/source/cairo/cairo_textlayout.cxx canvas/source/directx/dx_winstuff.hxx canvas/source/tools/image.cxx canvas/source/vcl/canvashelper.cxx comphelper/inc/comphelper/documentconstants.hxx comphelper/inc/comphelper/optionalvalue.hxx comphelper/inc/comphelper/querydeep.hxx comphelper/prj/build.lst comphelper/qa/complex/makefile.mk comphelper/qa/string/test_string_noadditional.cxx comphelper/source/misc/componentmodule.cxx comphelper/source/misc/mimeconfighelper.cxx comphelper/source/misc/querydeep.cxx comphelper/source/misc/uieventslogger.cxx comphelper/source/property/TypeGeneration.cxx comphelper/test/uno_iterators/uno_iterators.cxx comphelper/util/makefile.mk cppcanvas/source/mtfrenderer/implrenderer.cxx dtrans/prj/build.lst dtrans/source/generic/dtrans.cxx dtrans/source/win32/dtobj/FmtFilter.cxx i18npool/prj/build.lst i18npool/source/localedata/data/localedata_others.map i18npool/source/localedata/data/makefile.mk i18npool/source/localedata/localedata.cxx i18npool/source/localedata/saxparser.cxx i18npool/source/registerservices/registerservices.cxx i18npool/source/search/textsearch.cxx l10ntools/inc/cfgmerge.hxx l10ntools/inc/export.hxx l10ntools/inc/gsicheck.hxx l10ntools/inc/l10ntools/vosapp.hxx l10ntools/inc/tagtest.hxx l10ntools/inc/xmlparse.hxx l10ntools/layout/layoutparse.cxx l10ntools/layout/tralay.cxx l10ntools/source/cfgmerge.cxx l10ntools/source/export.cxx l10ntools/source/export2.cxx l10ntools/source/gsicheck.cxx l10ntools/source/help/HelpLinker.cxx l10ntools/source/lngex.cxx l10ntools/source/lngmerge.cxx l10ntools/source/merge.cxx l10ntools/source/tagtest.cxx l10ntools/source/xmlparse.cxx padmin/source/fontentry.cxx padmin/source/padialog.cxx padmin/source/padialog.src padmin/source/pamain.cxx rsc/inc/rscarray.hxx rsc/inc/rscclass.hxx rsc/inc/rscclobj.hxx rsc/inc/rsccont.hxx rsc/inc/rscdb.hxx rsc/inc/rscdef.hxx rsc/inc/rscmgr.hxx rsc/inc/rscrange.hxx rsc/inc/rsctop.hxx rsc/inc/vclrsc.hxx rsc/source/parser/rscdb.cxx rsc/source/parser/rscicpx.cxx rsc/source/parser/rscinit.cxx rsc/source/prj/start.cxx rsc/source/res/rscarray.cxx rsc/source/res/rscclass.cxx rsc/source/res/rscclobj.cxx rsc/source/res/rsccont.cxx rsc/source/res/rscmgr.cxx rsc/source/res/rscrange.cxx rsc/source/res/rsctop.cxx rsc/source/rsc/rsc.cxx rsc/source/tools/rscdef.cxx rsc/source/tools/rsctools.cxx sax/source/expatwrap/sax_expat.cxx sax/source/fastparser/facreg.cxx sax/source/tools/fastserializer.cxx sot/inc/sot/filelist.hxx sot/inc/sot/object.hxx sot/source/base/factory.cxx sot/source/base/filelist.cxx sot/source/sdstor/stg.cxx sot/source/sdstor/stgcache.cxx sot/source/sdstor/stgole.cxx sot/source/sdstor/stgstrms.cxx sot/source/sdstor/storage.cxx sot/source/sdstor/ucbstorage.cxx svl/inc/svl/cenumitm.hxx svl/inc/svl/cintitem.hxx svl/inc/svl/cntwall.hxx svl/inc/svl/ctypeitm.hxx svl/inc/svl/custritm.hxx svl/inc/svl/dateitem.hxx svl/inc/svl/filerec.hxx svl/inc/svl/globalnameitem.hxx svl/inc/svl/ilstitem.hxx svl/inc/svl/imageitm.hxx svl/inc/svl/intitem.hxx svl/inc/svl/itempool.hxx svl/inc/svl/itemset.hxx svl/inc/svl/lckbitem.hxx svl/inc/svl/poolitem.hxx svl/inc/svl/ptitem.hxx svl/inc/svl/rectitem.hxx svl/inc/svl/sfontitm.hxx svl/inc/svl/slstitm.hxx svl/inc/svl/srchitem.hxx svl/inc/svl/svarray.hxx svl/inc/svl/svdde.hxx svl/inc/svl/svstdarr.hxx svl/inc/svl/szitem.hxx svl/inc/svl/visitem.hxx svl/inc/svl/zforlist.hxx svl/inc/svl/zformat.hxx svl/prj/build.lst svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx svl/qa/complex/ConfigItems/helper/makefile.mk svl/qa/makefile.mk svl/source/filepicker/pickerhelper.cxx svl/source/filerec/filerec.cxx svl/source/items/cenumitm.cxx svl/source/items/cintitem.cxx svl/source/items/cntwall.cxx svl/source/items/ctypeitm.cxx svl/source/items/custritm.cxx svl/source/items/dateitem.cxx svl/source/items/globalnameitem.cxx svl/source/items/ilstitem.cxx svl/source/items/imageitm.cxx svl/source/items/intitem.cxx svl/source/items/itempool.cxx svl/source/items/itemprop.cxx svl/source/items/itemset.cxx svl/source/items/lckbitem.cxx svl/source/items/poolio.cxx svl/source/items/poolitem.cxx svl/source/items/ptitem.cxx svl/source/items/rectitem.cxx svl/source/items/slstitm.cxx svl/source/items/srchitem.cxx svl/source/items/style.cxx svl/source/items/szitem.cxx svl/source/items/visitem.cxx svl/source/items/whiter.cxx svl/source/memtools/svarray.cxx svl/source/misc/PasswordHelper.cxx svl/source/misc/adrparse.cxx svl/source/misc/lngmisc.cxx svl/source/notify/brdcst.cxx svl/source/notify/listener.cxx svl/source/notify/listenerbase.cxx svl/source/numbers/makefile.mk svl/source/numbers/nbdll.cxx svl/source/numbers/zforfind.cxx svl/source/numbers/zforlist.cxx svl/source/numbers/zformat.cxx svl/source/numbers/zforscan.cxx svl/source/passwordcontainer/passwordcontainer.cxx svl/source/svdde/ddecli.cxx svl/source/svdde/ddeimp.hxx svl/source/svdde/ddemlos2.h svl/source/svdde/ddesvr.cxx svl/source/undo/undo.cxx svl/source/uno/registerservices.cxx svl/util/makefile.mk svtools/bmpmaker/bmpsum.cxx svtools/bmpmaker/g2g.cxx svtools/bmpmaker/makefile.mk svtools/inc/borderhelper.hxx svtools/inc/svtools/accessiblefactory.hxx svtools/inc/svtools/apearcfg.hxx svtools/inc/svtools/brwbox.hxx svtools/inc/svtools/ctrlbox.hxx svtools/inc/svtools/ctrltool.hxx svtools/inc/svtools/editbrowsebox.hxx svtools/inc/svtools/ehdl.hxx svtools/inc/svtools/embedhlp.hxx svtools/inc/svtools/filter.hxx svtools/inc/svtools/ivctrl.hxx svtools/inc/svtools/parhtml.hxx svtools/inc/svtools/printdlg.hxx svtools/inc/svtools/rtftoken.h svtools/inc/svtools/ruler.hxx svtools/inc/svtools/svicnvw.hxx svtools/inc/svtools/svlbitm.hxx svtools/inc/svtools/svlbox.hxx svtools/inc/svtools/svtreebx.hxx svtools/inc/svtools/tabbar.hxx svtools/inc/svtools/table/abstracttablecontrol.hxx svtools/inc/svtools/taskbar.hxx svtools/inc/svtools/textview.hxx svtools/inc/svtools/valueset.hxx svtools/source/brwbox/brwbox1.cxx svtools/source/brwbox/brwbox2.cxx svtools/source/brwbox/datwin.cxx svtools/source/brwbox/datwin.hxx svtools/source/brwbox/makefile.mk svtools/source/config/apearcfg.cxx svtools/source/config/htmlcfg.cxx svtools/source/config/menuoptions.cxx svtools/source/config/miscopt.cxx svtools/source/contnr/cont_pch.cxx svtools/source/contnr/ctrdll.cxx svtools/source/contnr/fileview.cxx svtools/source/contnr/imivctl1.cxx svtools/source/contnr/ivctrl.cxx svtools/source/contnr/makefile.mk svtools/source/contnr/svcontnr.src svtools/source/contnr/svicnvw.cxx svtools/source/contnr/svimpbox.cxx svtools/source/contnr/svimpicn.cxx svtools/source/contnr/svlbitm.cxx svtools/source/contnr/svtreebx.cxx svtools/source/contnr/templwin.cxx svtools/source/contnr/templwin.hxx svtools/source/control/asynclink.cxx svtools/source/control/ctrlbox.cxx svtools/source/control/ctrldll.cxx svtools/source/control/ctrltool.cxx svtools/source/control/filectrl.cxx svtools/source/control/filectrl.src svtools/source/control/headbar.cxx svtools/source/control/inettbc.cxx svtools/source/control/makefile.mk svtools/source/control/prgsbar.cxx svtools/source/control/roadmap.cxx svtools/source/control/ruler.cxx svtools/source/control/scriptedtext.cxx svtools/source/control/stdmenu.cxx svtools/source/control/tabbar.cxx svtools/source/control/taskbar.cxx svtools/source/control/taskbox.cxx svtools/source/control/taskmisc.cxx svtools/source/control/taskstat.cxx svtools/source/control/valueacc.cxx svtools/source/control/valueset.cxx svtools/source/dialogs/addresstemplate.cxx svtools/source/dialogs/addresstemplate.src svtools/source/dialogs/colrdlg.src svtools/source/dialogs/filedlg2.cxx svtools/source/dialogs/filedlg2.hxx svtools/source/dialogs/makefile.mk svtools/source/dialogs/printdlg.cxx svtools/source/dialogs/printdlg.src svtools/source/dialogs/propctrl.cxx svtools/source/dialogs/propctrl.hxx svtools/source/dialogs/property.cxx svtools/source/edit/makefile.mk svtools/source/edit/sychconv.cxx svtools/source/edit/syntaxhighlight.cxx svtools/source/edit/textdoc.cxx svtools/source/edit/texteng.cxx svtools/source/edit/textundo.cxx svtools/source/edit/textview.cxx svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx svtools/source/filter.vcl/filter/dlgejpg.cxx svtools/source/filter.vcl/filter/dlgejpg.hxx svtools/source/filter.vcl/filter/dlgejpg.src svtools/source/filter.vcl/filter/dlgepng.cxx svtools/source/filter.vcl/filter/dlgepng.hxx svtools/source/filter.vcl/filter/dlgepng.src svtools/source/filter.vcl/filter/dlgexpor.cxx svtools/source/filter.vcl/filter/dlgexpor.hxx svtools/source/filter.vcl/filter/dlgexpor.src svtools/source/filter.vcl/filter/filter2.cxx svtools/source/filter.vcl/filter/makefile.mk svtools/source/filter.vcl/filter/sgfbram.cxx svtools/source/filter.vcl/filter/sgvmain.cxx svtools/source/filter.vcl/filter/sgvspln.cxx svtools/source/filter.vcl/filter/strings.src svtools/source/filter.vcl/jpeg/makefile.mk svtools/source/filter.vcl/wmf/emfwr.cxx svtools/source/filter.vcl/wmf/emfwr.hxx svtools/source/filter.vcl/wmf/enhwmf.cxx svtools/source/filter.vcl/wmf/winmtf.hxx svtools/source/filter.vcl/wmf/wmfwr.cxx svtools/source/filter.vcl/wmf/wmfwr.hxx svtools/source/graphic/grfcache.cxx svtools/source/graphic/grfcache.hxx svtools/source/graphic/grfmgr.cxx svtools/source/graphic/makefile.mk svtools/source/inc/accessibletableimp.hxx svtools/source/inc/svimpbox.hxx svtools/source/java/patchjavaerror.src svtools/source/misc/ehdl.cxx svtools/source/misc/errtxt.src svtools/source/misc/helpagentwindow.cxx svtools/source/misc/imagemgr.cxx svtools/source/misc/imagemgr.src svtools/source/misc/imageresourceaccess.cxx svtools/source/misc/imap.cxx svtools/source/misc/langtab.src svtools/source/misc/makefile.mk svtools/source/misc/svtdata.cxx svtools/source/misc/templatefoldercache.cxx svtools/source/misc/transfer2.cxx svtools/source/misc/undo.src svtools/source/plugapp/commtest.cxx svtools/source/plugapp/commtest.src svtools/source/plugapp/makefile.mk svtools/source/plugapp/testtool.src svtools/source/productregistration/productregistration.cxx svtools/source/svhtml/htmlkywd.cxx svtools/source/svhtml/parhtml.cxx svtools/source/svrtf/rtfkey2.cxx svtools/source/svrtf/rtfkeywd.cxx svtools/source/table/defaultinputhandler.cxx svtools/source/table/makefile.mk svtools/source/table/tablecontrol.cxx svtools/source/table/tablecontrol_impl.cxx svtools/source/table/tablecontrol_impl.hxx svtools/source/table/tabledatawindow.cxx svtools/source/table/tablegeometry.cxx svtools/source/table/tablegeometry.hxx svtools/source/toolpanel/makefile.mk svtools/source/toolpanel/toolpaneldrawer.cxx svtools/source/uno/addrtempuno.cxx svtools/source/uno/miscservices.cxx svtools/source/uno/svtxgridcontrol.cxx svtools/source/uno/svtxgridcontrol.hxx svtools/source/uno/toolboxcontroller.cxx svtools/source/uno/treecontrolpeer.cxx svtools/source/uno/unocontroltablemodel.cxx svtools/source/uno/unocontroltablemodel.hxx svtools/source/uno/unoimap.cxx svtools/source/urlobj/inetimg.cxx svtools/util/makefile.mk svtools/workben/browser.cxx svtools/workben/cui/makefile.mk svtools/workben/makefile.mk svtools/workben/stest.cxx svtools/workben/toolpanel/makefile.mk svtools/workben/urange.cxx toolkit/inc/toolkit/awt/vclxdevice.hxx toolkit/inc/toolkit/awt/vclxgraphics.hxx toolkit/inc/toolkit/awt/vclxwindows.hxx toolkit/inc/toolkit/controls/dialogcontrol.hxx toolkit/inc/toolkit/helper/property.hxx toolkit/inc/toolkit/helper/servicenames.hxx toolkit/inc/toolkit/helper/throbberimpl.hxx toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java toolkit/source/awt/asynccallback.cxx toolkit/source/awt/vclxgraphics.cxx toolkit/source/awt/vclxtoolkit.cxx toolkit/source/awt/vclxwindow.cxx toolkit/source/awt/xsimpleanimation.cxx toolkit/source/awt/xthrobber.cxx toolkit/source/controls/dialogcontrol.cxx toolkit/source/controls/grid/defaultgridcolumnmodel.cxx toolkit/source/controls/grid/defaultgriddatamodel.cxx toolkit/source/controls/grid/gridcontrol.cxx toolkit/source/controls/grid/initguard.hxx toolkit/source/controls/unocontrol.cxx toolkit/source/controls/unocontrolcontainer.cxx toolkit/source/controls/unocontrols.cxx toolkit/source/helper/listenermultiplexer.cxx toolkit/source/helper/property.cxx toolkit/source/helper/registerservices.cxx toolkit/source/helper/servicenames.cxx toolkit/source/helper/throbberimpl.cxx toolkit/source/helper/tkresmgr.cxx tools/StaticLibrary_ooopathutils.mk tools/bootstrp/addexes/makefile.mk tools/bootstrp/addexes2/makefile.mk tools/bootstrp/addexes2/mkfilt.cxx tools/bootstrp/command.cxx tools/bootstrp/cppdep.cxx tools/bootstrp/iserver.cxx tools/bootstrp/makefile.mk tools/bootstrp/mkcreate.cxx tools/bootstrp/prj.cxx tools/bootstrp/rscdep.cxx tools/bootstrp/sstring.cxx tools/inc/bootstrp/command.hxx tools/inc/bootstrp/mkcreate.hxx tools/inc/bootstrp/prj.hxx tools/inc/bootstrp/sstring.hxx tools/inc/tools/agapi.hxx tools/inc/tools/agitem.hxx tools/inc/tools/chapi.hxx tools/inc/tools/download.hxx tools/inc/tools/eacopier.hxx tools/inc/tools/fract.hxx tools/inc/tools/fsys.hxx tools/inc/tools/geninfo.hxx tools/inc/tools/globname.hxx tools/inc/tools/inetmime.hxx tools/inc/tools/multisel.hxx tools/inc/tools/poly.hxx tools/inc/tools/postsys.h tools/inc/tools/postwin.h tools/inc/tools/presys.h tools/inc/tools/prewin.h tools/inc/tools/pstm.hxx tools/inc/tools/ref.hxx tools/inc/tools/simplerm.hxx tools/inc/tools/solar.h tools/inc/tools/table.hxx tools/inc/tools/urlkeys.hxx tools/inc/tools/urlobj.hxx tools/prj/build.lst tools/prj/d.lst tools/qa/makefile.mk tools/source/communi/geninfo.cxx tools/source/debug/debug.cxx tools/source/fsys/dirent.cxx tools/source/fsys/tdir.cxx tools/source/fsys/unx.cxx tools/source/fsys/urlobj.cxx tools/source/generic/color.cxx tools/source/generic/config.cxx tools/source/generic/fract.cxx tools/source/inet/inetmime.cxx tools/source/memtools/multisel.cxx tools/source/memtools/table.cxx tools/source/rc/resmgr.cxx tools/source/ref/globname.cxx tools/source/ref/pstm.cxx tools/source/solar/solar.c tools/source/stream/strmos2.cxx tools/source/stream/strmunx.cxx tools/source/stream/strmwnt.cxx tools/source/string/makefile.mk tools/source/testtoolloader/testtoolloader.cxx tools/test/makefile.mk tools/util/makefile.mk tools/win/inc/dll.hxx tools/win/inc/parser.hxx tools/win/inc/shellex.h tools/win/inc/shutil.h tools/win/inc/toolsdll.hxx tools/win/inc/winshell.hxx tools/workben/makefile.mk ucbhelper/source/client/proxydecider.cxx ucbhelper/workben/ucbexplorer/ucbexplorer.hrc unotools/inc/unotools/unotunnelhelper.hxx unotools/source/config/fltrcfg.cxx unotools/source/config/lingucfg.cxx unotools/source/config/misccfg.cxx unotools/source/config/pathoptions.cxx unotools/source/config/searchopt.cxx unotools/source/i18n/localedatawrapper.cxx unotools/source/ucbhelper/localfilehelper.cxx unotools/source/ucbhelper/ucbhelper.cxx unotools/source/ucbhelper/xtempfile.cxx vcl/aqua/inc/salbmp.h vcl/aqua/inc/salgdi.h vcl/aqua/inc/salinst.h vcl/aqua/source/app/salinst.cxx vcl/aqua/source/gdi/aquaprintaccessoryview.mm vcl/aqua/source/gdi/salgdi.cxx vcl/aqua/source/gdi/salprn.cxx vcl/aqua/source/window/salframeview.mm vcl/aqua/source/window/salobj.cxx vcl/inc/vcl/bitmap.hxx vcl/inc/vcl/brdwin.hxx vcl/inc/vcl/button.hxx vcl/inc/vcl/cmdevt.hxx vcl/inc/vcl/cvtgrf.hxx vcl/inc/vcl/dialog.hxx vcl/inc/vcl/dockwin.hxx vcl/inc/vcl/event.hxx vcl/inc/vcl/fixed.hxx vcl/inc/vcl/fldunit.hxx vcl/inc/vcl/floatwin.hxx vcl/inc/vcl/gdimtf.hxx vcl/inc/vcl/glyphcache.hxx vcl/inc/vcl/graphite_adaptors.hxx vcl/inc/vcl/graphite_features.hxx vcl/inc/vcl/graphite_layout.hxx vcl/inc/vcl/ilstbox.hxx vcl/inc/vcl/image.h vcl/inc/vcl/imgctrl.hxx vcl/inc/vcl/impbmpconv.hxx vcl/inc/vcl/impprn.hxx vcl/inc/vcl/jobset.h vcl/inc/vcl/keycodes.hxx vcl/inc/vcl/lstbox.hxx vcl/inc/vcl/mapunit.hxx vcl/inc/vcl/menu.hxx vcl/inc/vcl/msgbox.hxx vcl/inc/vcl/outdev.hxx vcl/inc/vcl/prndlg.hxx vcl/inc/vcl/salatype.hxx vcl/inc/vcl/salbmp.hxx vcl/inc/vcl/salgdi.hxx vcl/inc/vcl/salinst.hxx vcl/inc/vcl/seleng.hxx vcl/inc/vcl/settings.hxx vcl/inc/vcl/smartid.hxx vcl/inc/vcl/status.hxx vcl/inc/vcl/strhelper.hxx vcl/inc/vcl/svapp.hxx vcl/inc/vcl/svdata.hxx vcl/inc/vcl/syschild.hxx vcl/inc/vcl/sysdata.hxx vcl/inc/vcl/taskpanelist.hxx vcl/inc/vcl/toolbox.hxx vcl/inc/vcl/vclevent.hxx vcl/inc/vcl/windata.hxx vcl/inc/vcl/window.hxx vcl/inc/vcl/wintypes.hxx vcl/os2/source/app/salinst.cxx vcl/os2/source/gdi/salgdi.cxx vcl/os2/source/window/salmenu.cxx vcl/os2/source/window/salobj.cxx vcl/prj/build.lst vcl/source/app/dbggui.cxx vcl/source/app/help.cxx vcl/source/app/idlemgr.cxx vcl/source/app/settings.cxx vcl/source/app/svapp.cxx vcl/source/app/svdata.cxx vcl/source/app/svmain.cxx vcl/source/app/svmainhook.cxx vcl/source/app/unohelp.cxx vcl/source/app/vclevent.cxx vcl/source/control/button.cxx vcl/source/control/combobox.cxx vcl/source/control/edit.cxx vcl/source/control/field.cxx vcl/source/control/fixed.cxx vcl/source/control/ilstbox.cxx vcl/source/control/imgctrl.cxx vcl/source/control/makefile.mk vcl/source/control/tabctrl.cxx vcl/source/gdi/bitmap.cxx vcl/source/gdi/bitmap2.cxx vcl/source/gdi/bitmap4.cxx vcl/source/gdi/bmpconv.cxx vcl/source/gdi/cvtsvm.cxx vcl/source/gdi/font.cxx vcl/source/gdi/gdimtf.cxx vcl/source/gdi/image.cxx vcl/source/gdi/impimage.cxx vcl/source/gdi/jobset.cxx vcl/source/gdi/makefile.mk vcl/source/gdi/metaact.cxx vcl/source/gdi/outdev.cxx vcl/source/gdi/outdev3.cxx vcl/source/gdi/outdev4.cxx vcl/source/gdi/outdevnative.cxx vcl/source/gdi/pdfwriter.cxx vcl/source/gdi/pdfwriter_impl.cxx vcl/source/gdi/print3.cxx vcl/source/gdi/salmisc.cxx vcl/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_ftyp.hxx vcl/source/glyphs/glyphcache.cxx vcl/source/glyphs/graphite_cache.cxx vcl/source/glyphs/graphite_layout.cxx vcl/source/glyphs/graphite_textsrc.hxx vcl/source/helper/canvasbitmap.cxx vcl/source/helper/smartid.cxx vcl/source/helper/xconnection.cxx vcl/source/src/btntext.src vcl/source/src/images.src vcl/source/src/print.src vcl/source/window/accel.cxx vcl/source/window/accmgr.cxx vcl/source/window/brdwin.cxx vcl/source/window/btndlg.cxx vcl/source/window/dlgctrl.cxx vcl/source/window/javachild.cxx vcl/source/window/menu.cxx vcl/source/window/msgbox.cxx vcl/source/window/printdlg.cxx vcl/source/window/status.cxx vcl/source/window/syschild.cxx vcl/source/window/toolbox.cxx vcl/source/window/toolbox2.cxx vcl/source/window/window.cxx vcl/source/window/window2.cxx vcl/source/window/wrkwin.cxx vcl/unx/gtk/app/gtkdata.cxx vcl/unx/gtk/app/gtkinst.cxx vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkobject.cxx vcl/unx/headless/svpbmp.hxx vcl/unx/headless/svpgdi.cxx vcl/unx/headless/svpgdi.hxx vcl/unx/headless/svpinst.cxx vcl/unx/headless/svpinst.hxx vcl/unx/headless/svpprn.cxx vcl/unx/headless/svpprn.hxx vcl/unx/headless/svppspgraphics.cxx vcl/unx/headless/svppspgraphics.hxx vcl/unx/headless/svptext.cxx vcl/unx/inc/dtint.hxx vcl/unx/inc/plugins/gtk/gtkdata.hxx vcl/unx/inc/pspgraphics.h vcl/unx/inc/salbmp.h vcl/unx/inc/saldata.hxx vcl/unx/inc/saldisp.hxx vcl/unx/inc/salgdi.h vcl/unx/inc/salinst.h vcl/unx/inc/xfont.hxx vcl/unx/kde/kdedata.cxx vcl/unx/kde4/KDESalGraphics.cxx vcl/unx/source/app/keysymnames.cxx vcl/unx/source/app/saldata.cxx vcl/unx/source/app/saldisp.cxx vcl/unx/source/app/salinst.cxx vcl/unx/source/app/wmadaptor.cxx vcl/unx/source/dtrans/X11_selection.cxx vcl/unx/source/dtrans/X11_service.cxx vcl/unx/source/gdi/makefile.mk vcl/unx/source/gdi/pspgraphics.cxx vcl/unx/source/gdi/salgdi.cxx vcl/unx/source/gdi/salgdi3.cxx vcl/unx/source/gdi/salprnpsp.cxx vcl/unx/source/gdi/xfont.cxx vcl/unx/source/gdi/xlfd_attr.cxx vcl/unx/source/gdi/xlfd_attr.hxx vcl/unx/source/gdi/xlfd_extd.cxx vcl/unx/source/gdi/xlfd_extd.hxx vcl/unx/source/gdi/xlfd_smpl.cxx vcl/unx/source/gdi/xlfd_smpl.hxx vcl/unx/source/printer/ppdparser.cxx vcl/unx/source/printer/printerinfomanager.cxx vcl/unx/source/window/salframe.cxx vcl/unx/source/window/salmenu.cxx vcl/unx/source/window/salobj.cxx vcl/util/makefile2.pmk vcl/win/inc/salbmp.h vcl/win/inc/saldata.hxx vcl/win/inc/salgdi.h vcl/win/inc/salinst.h vcl/win/source/app/saldata.cxx vcl/win/source/app/salinst.cxx vcl/win/source/gdi/salgdi.cxx vcl/win/source/gdi/salgdi3.cxx vcl/win/source/gdi/salprn.cxx vcl/win/source/gdi/winlayout.cxx vcl/win/source/window/salframe.cxx vcl/win/source/window/salobj.cxx vcl/workben/outdevgrind.cxx vos/inc/vos/execabl.hxx vos/inc/vos/macros.hxx vos/inc/vos/pipe.hxx vos/inc/vos/process.hxx vos/inc/vos/refernce.hxx vos/inc/vos/signal.hxx vos/inc/vos/socket.hxx vos/inc/vos/stream.hxx vos/inc/vos/thread.hxx vos/source/pipe.cxx vos/source/process.cxx vos/source/signal.cxx vos/source/thread.cxx vos/source/timer.cxx
722 lines
30 KiB
C++
722 lines
30 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*************************************************************************
|
|
*
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
*
|
|
* Copyright 2000, 2010 Oracle and/or its affiliates.
|
|
*
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
|
*
|
|
* This file is part of OpenOffice.org.
|
|
*
|
|
* OpenOffice.org is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License version 3
|
|
* only, as published by the Free Software Foundation.
|
|
*
|
|
* OpenOffice.org 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 Lesser General Public License version 3 for more details
|
|
* (a copy is included in the LICENSE file that accompanied this code).
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* version 3 along with OpenOffice.org. If not, see
|
|
* <http://www.openoffice.org/license.html>
|
|
* for a copy of the LGPLv3 License.
|
|
*
|
|
************************************************************************/
|
|
|
|
// MARKER(update_precomp.py): autogen include statement, do not remove
|
|
#include "precompiled_canvas.hxx"
|
|
|
|
#include <canvas/debug.hxx>
|
|
#include <tools/diagnose_ex.h>
|
|
#include <canvas/verbosetrace.hxx>
|
|
#include <canvas/canvastools.hxx>
|
|
|
|
#include <vcl/canvastools.hxx>
|
|
#include <vcl/outdev.hxx>
|
|
#include <vcl/window.hxx>
|
|
#include <vcl/bitmapex.hxx>
|
|
|
|
#include <basegfx/range/b2drectangle.hxx>
|
|
#include <basegfx/tools/canvastools.hxx>
|
|
|
|
#include <boost/cast.hpp>
|
|
|
|
#include "spritecanvashelper.hxx"
|
|
#include "canvascustomsprite.hxx"
|
|
|
|
|
|
using namespace ::com::sun::star;
|
|
|
|
#define FPS_BOUNDS Rectangle(0,0,130,90)
|
|
#define INFO_COLOR COL_RED
|
|
|
|
namespace vclcanvas
|
|
{
|
|
namespace
|
|
{
|
|
/** Sprite redraw at original position
|
|
|
|
Used to repaint the whole canvas (background and all
|
|
sprites)
|
|
*/
|
|
void spriteRedraw( OutputDevice& rOutDev,
|
|
const ::canvas::Sprite::Reference& rSprite )
|
|
{
|
|
// downcast to derived vclcanvas::Sprite interface, which
|
|
// provides the actual redraw methods.
|
|
::boost::polymorphic_downcast< Sprite* >(rSprite.get())->redraw(rOutDev,
|
|
true);
|
|
}
|
|
|
|
double calcNumPixel( const ::canvas::Sprite::Reference& rSprite )
|
|
{
|
|
const ::basegfx::B2DSize& rSize(
|
|
::boost::polymorphic_downcast< Sprite* >(rSprite.get())->getSizePixel() );
|
|
|
|
return rSize.getX() * rSize.getY();
|
|
}
|
|
|
|
void repaintBackground( OutputDevice& rOutDev,
|
|
OutputDevice& rBackBuffer,
|
|
const ::basegfx::B2DRange& rArea )
|
|
{
|
|
const ::Point& rPos( ::vcl::unotools::pointFromB2DPoint( rArea.getMinimum()) );
|
|
const ::Size& rSize( ::vcl::unotools::sizeFromB2DSize( rArea.getRange()) );
|
|
|
|
rOutDev.DrawOutDev( rPos, rSize, rPos, rSize, rBackBuffer );
|
|
}
|
|
|
|
void opaqueUpdateSpriteArea( const ::canvas::Sprite::Reference& rSprite,
|
|
OutputDevice& rOutDev,
|
|
const ::basegfx::B2IRange& rArea )
|
|
{
|
|
const Rectangle& rRequestedArea(
|
|
::vcl::unotools::rectangleFromB2IRectangle( rArea ) );
|
|
|
|
// clip output to actual update region (otherwise a)
|
|
// wouldn't save much render time, and b) will clutter
|
|
// scrolled sprite content outside this area)
|
|
rOutDev.EnableMapMode( sal_False );
|
|
rOutDev.SetClipRegion( rRequestedArea );
|
|
|
|
// repaint affected sprite directly to output device (at
|
|
// the actual screen output position)
|
|
::boost::polymorphic_downcast< Sprite* >(
|
|
rSprite.get() )->redraw( rOutDev,
|
|
false ); // rendering
|
|
// directly to
|
|
// frontbuffer
|
|
}
|
|
|
|
/** Repaint sprite at original position
|
|
|
|
Used for opaque updates, which render directly to the
|
|
front buffer.
|
|
*/
|
|
void spriteRedrawStub( OutputDevice& rOutDev,
|
|
const ::canvas::Sprite::Reference& rSprite )
|
|
{
|
|
if( rSprite.is() )
|
|
{
|
|
::boost::polymorphic_downcast< Sprite* >(
|
|
rSprite.get() )->redraw( rOutDev,
|
|
false );
|
|
}
|
|
}
|
|
|
|
/** Repaint sprite at given position
|
|
|
|
Used for generic update, which renders into vdev of
|
|
adapted size.
|
|
*/
|
|
void spriteRedrawStub2( OutputDevice& rOutDev,
|
|
const ::basegfx::B2DPoint& rOutPos,
|
|
const ::canvas::Sprite::Reference& rSprite )
|
|
{
|
|
if( rSprite.is() )
|
|
{
|
|
Sprite* pSprite = ::boost::polymorphic_downcast< Sprite* >(
|
|
rSprite.get() );
|
|
|
|
// calc relative sprite position in rUpdateArea (which
|
|
// need not be the whole screen!)
|
|
const ::basegfx::B2DPoint& rSpriteScreenPos( pSprite->getPosPixel() );
|
|
const ::basegfx::B2DPoint& rSpriteRenderPos( rSpriteScreenPos - rOutPos );
|
|
|
|
pSprite->redraw( rOutDev, rSpriteRenderPos, true );
|
|
}
|
|
}
|
|
|
|
/** Repaint sprite at original position
|
|
|
|
Used for opaque updates from scrollUpdate(), which render
|
|
directly to the front buffer.
|
|
*/
|
|
void spriteRedrawStub3( OutputDevice& rOutDev,
|
|
const ::canvas::SpriteRedrawManager::AreaComponent& rComponent )
|
|
{
|
|
const ::canvas::Sprite::Reference& rSprite( rComponent.second.getSprite() );
|
|
|
|
if( rSprite.is() )
|
|
{
|
|
::boost::polymorphic_downcast< Sprite* >(
|
|
rSprite.get() )->redraw( rOutDev,
|
|
false );
|
|
}
|
|
}
|
|
|
|
void renderInfoText( OutputDevice& rOutDev,
|
|
const ::rtl::OUString& rStr,
|
|
const Point& rPos )
|
|
{
|
|
Font aVCLFont;
|
|
aVCLFont.SetHeight( 20 );
|
|
aVCLFont.SetColor( Color( INFO_COLOR ) );
|
|
|
|
rOutDev.SetTextAlign(ALIGN_TOP);
|
|
rOutDev.SetTextColor( Color( INFO_COLOR ) );
|
|
rOutDev.SetFont( aVCLFont );
|
|
|
|
rOutDev.DrawText( rPos, rStr );
|
|
}
|
|
|
|
}
|
|
|
|
SpriteCanvasHelper::SpriteCanvasHelper() :
|
|
mpRedrawManager( NULL ),
|
|
mpOwningSpriteCanvas( NULL ),
|
|
maVDev(),
|
|
maLastUpdate(),
|
|
mbShowFrameInfo( false ),
|
|
mbShowSpriteBounds( false ),
|
|
mbIsUnsafeScrolling( false )
|
|
{
|
|
#if defined(VERBOSE) && OSL_DEBUG_LEVEL > 0
|
|
// inverse defaults for verbose debug mode
|
|
mbShowSpriteBounds = mbShowFrameInfo = true;
|
|
#endif
|
|
}
|
|
|
|
void SpriteCanvasHelper::init( const OutDevProviderSharedPtr& rOutDev,
|
|
SpriteCanvas& rOwningSpriteCanvas,
|
|
::canvas::SpriteRedrawManager& rManager,
|
|
bool bProtect,
|
|
bool bHaveAlpha )
|
|
{
|
|
mpOwningSpriteCanvas = &rOwningSpriteCanvas;
|
|
mpRedrawManager = &rManager;
|
|
|
|
CanvasHelper::init(rOwningSpriteCanvas,rOutDev,bProtect,bHaveAlpha);
|
|
}
|
|
|
|
void SpriteCanvasHelper::disposing()
|
|
{
|
|
mpRedrawManager = NULL;
|
|
mpOwningSpriteCanvas = NULL;
|
|
|
|
// forward to base
|
|
CanvasHelper::disposing();
|
|
}
|
|
|
|
uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromAnimation(
|
|
const uno::Reference< rendering::XAnimation >& )
|
|
{
|
|
return uno::Reference< rendering::XAnimatedSprite >();
|
|
}
|
|
|
|
uno::Reference< rendering::XAnimatedSprite > SpriteCanvasHelper::createSpriteFromBitmaps(
|
|
const uno::Sequence< uno::Reference< rendering::XBitmap > >& ,
|
|
sal_Int8 )
|
|
{
|
|
return uno::Reference< rendering::XAnimatedSprite >();
|
|
}
|
|
|
|
uno::Reference< rendering::XCustomSprite > SpriteCanvasHelper::createCustomSprite( const geometry::RealSize2D& spriteSize )
|
|
{
|
|
if( !mpRedrawManager || !mpDevice )
|
|
return uno::Reference< rendering::XCustomSprite >(); // we're disposed
|
|
|
|
return uno::Reference< rendering::XCustomSprite >(
|
|
new CanvasCustomSprite( spriteSize,
|
|
*mpDevice,
|
|
mpOwningSpriteCanvas,
|
|
mpOwningSpriteCanvas->getFrontBuffer(),
|
|
mbShowSpriteBounds ) );
|
|
}
|
|
|
|
uno::Reference< rendering::XSprite > SpriteCanvasHelper::createClonedSprite( const uno::Reference< rendering::XSprite >& )
|
|
{
|
|
return uno::Reference< rendering::XSprite >();
|
|
}
|
|
|
|
sal_Bool SpriteCanvasHelper::updateScreen( sal_Bool bUpdateAll,
|
|
bool& io_bSurfaceDirty )
|
|
{
|
|
if( !mpRedrawManager ||
|
|
!mpOwningSpriteCanvas ||
|
|
!mpOwningSpriteCanvas->getFrontBuffer() ||
|
|
!mpOwningSpriteCanvas->getBackBuffer() )
|
|
{
|
|
return sal_False; // disposed, or otherwise dysfunctional
|
|
}
|
|
|
|
// commit to backbuffer
|
|
flush();
|
|
|
|
OutputDevice& rOutDev( mpOwningSpriteCanvas->getFrontBuffer()->getOutDev() );
|
|
BackBufferSharedPtr pBackBuffer( mpOwningSpriteCanvas->getBackBuffer() );
|
|
OutputDevice& rBackOutDev( pBackBuffer->getOutDev() );
|
|
|
|
// actual OutputDevice is a shared resource - restore its
|
|
// state when done.
|
|
tools::OutDevStateKeeper aStateKeeper( rOutDev );
|
|
|
|
const Size aOutDevSize( rBackOutDev.GetOutputSizePixel() );
|
|
const Point aEmptyPoint(0,0);
|
|
|
|
Window* pTargetWindow = NULL;
|
|
if( rOutDev.GetOutDevType() == OUTDEV_WINDOW )
|
|
{
|
|
pTargetWindow = &static_cast<Window&>(rOutDev); // TODO(Q3): Evil downcast.
|
|
|
|
// we're double-buffered, thus no need for paint area-limiting
|
|
// clips. besides that, will interfere with animations (as for
|
|
// Window-invalidate repaints, only parts of the window will
|
|
// be redrawn otherwise)
|
|
const Region aFullWindowRegion( Rectangle(aEmptyPoint,
|
|
aOutDevSize) );
|
|
pTargetWindow->ExpandPaintClipRegion(aFullWindowRegion);
|
|
}
|
|
|
|
// TODO(P1): Might be worthwile to track areas of background
|
|
// changes, too.
|
|
if( !bUpdateAll && !io_bSurfaceDirty )
|
|
{
|
|
if( mbShowFrameInfo )
|
|
{
|
|
// also repaint background below frame counter (fake
|
|
// that as a sprite vanishing in this area)
|
|
mpRedrawManager->updateSprite( ::canvas::Sprite::Reference(),
|
|
::basegfx::B2DPoint(),
|
|
::basegfx::B2DRectangle( 0.0, 0.0,
|
|
FPS_BOUNDS.Right(),
|
|
FPS_BOUNDS.Bottom() ) );
|
|
}
|
|
|
|
// background has not changed, so we're free to optimize
|
|
// repaint to areas where a sprite has changed
|
|
|
|
// process each independent area of overlapping sprites
|
|
// separately.
|
|
mpRedrawManager->forEachSpriteArea( *this );
|
|
}
|
|
else
|
|
{
|
|
// background has changed, so we currently have no choice
|
|
// but repaint everything (or caller requested that)
|
|
|
|
maVDev->SetOutputSizePixel( aOutDevSize );
|
|
maVDev->EnableMapMode( sal_False );
|
|
maVDev->DrawOutDev( aEmptyPoint, aOutDevSize,
|
|
aEmptyPoint, aOutDevSize,
|
|
rBackOutDev );
|
|
|
|
// repaint all active sprites on top of background into
|
|
// VDev.
|
|
mpRedrawManager->forEachSprite(
|
|
::boost::bind(
|
|
&spriteRedraw,
|
|
::boost::ref( maVDev.get() ),
|
|
_1 ) );
|
|
|
|
// flush to screen
|
|
rOutDev.EnableMapMode( sal_False );
|
|
rOutDev.SetClipRegion();
|
|
rOutDev.DrawOutDev( aEmptyPoint, aOutDevSize,
|
|
aEmptyPoint, aOutDevSize,
|
|
*maVDev );
|
|
}
|
|
|
|
// change record vector must be cleared, for the next turn of
|
|
// rendering and sprite changing
|
|
mpRedrawManager->clearChangeRecords();
|
|
|
|
io_bSurfaceDirty = false;
|
|
|
|
if( mbShowFrameInfo )
|
|
{
|
|
renderFrameCounter( rOutDev );
|
|
renderSpriteCount( rOutDev );
|
|
renderMemUsage( rOutDev );
|
|
}
|
|
|
|
#if defined(VERBOSE) && OSL_DEBUG_LEVEL > 0
|
|
static ::canvas::tools::ElapsedTime aElapsedTime;
|
|
|
|
// log time immediately after surface flip
|
|
OSL_TRACE( "SpriteCanvasHelper::updateScreen(): flip done at %f",
|
|
aElapsedTime.getElapsedTime() );
|
|
#endif
|
|
|
|
// sync output with screen, to ensure that we don't queue up
|
|
// render requests (calling code might rely on timing,
|
|
// i.e. assume that things are visible on screen after
|
|
// updateScreen() returns).
|
|
if( pTargetWindow )
|
|
{
|
|
// commit to screen
|
|
pTargetWindow->Sync();
|
|
}
|
|
|
|
return sal_True;
|
|
}
|
|
|
|
void SpriteCanvasHelper::backgroundPaint( const ::basegfx::B2DRange& rUpdateRect )
|
|
{
|
|
ENSURE_OR_THROW( mpOwningSpriteCanvas &&
|
|
mpOwningSpriteCanvas->getBackBuffer() &&
|
|
mpOwningSpriteCanvas->getFrontBuffer(),
|
|
"SpriteCanvasHelper::backgroundPaint(): NULL device pointer " );
|
|
|
|
OutputDevice& rOutDev( mpOwningSpriteCanvas->getFrontBuffer()->getOutDev() );
|
|
BackBufferSharedPtr pBackBuffer( mpOwningSpriteCanvas->getBackBuffer() );
|
|
OutputDevice& rBackOutDev( pBackBuffer->getOutDev() );
|
|
|
|
repaintBackground( rOutDev, rBackOutDev, rUpdateRect );
|
|
}
|
|
|
|
void SpriteCanvasHelper::scrollUpdate( const ::basegfx::B2DRange& rMoveStart,
|
|
const ::basegfx::B2DRange& rMoveEnd,
|
|
const ::canvas::SpriteRedrawManager::UpdateArea& rUpdateArea )
|
|
{
|
|
ENSURE_OR_THROW( mpOwningSpriteCanvas &&
|
|
mpOwningSpriteCanvas->getBackBuffer() &&
|
|
mpOwningSpriteCanvas->getFrontBuffer(),
|
|
"SpriteCanvasHelper::scrollUpdate(): NULL device pointer " );
|
|
|
|
OutputDevice& rOutDev( mpOwningSpriteCanvas->getFrontBuffer()->getOutDev() );
|
|
BackBufferSharedPtr pBackBuffer( mpOwningSpriteCanvas->getBackBuffer() );
|
|
OutputDevice& rBackOutDev( pBackBuffer->getOutDev() );
|
|
|
|
const Size& rTargetSizePixel( rOutDev.GetOutputSizePixel() );
|
|
const ::basegfx::B2IRange aOutputBounds( 0,0,
|
|
rTargetSizePixel.Width(),
|
|
rTargetSizePixel.Height() );
|
|
|
|
// round rectangles to integer pixel. Note: have to be
|
|
// extremely careful here, to avoid off-by-one errors for
|
|
// the destination area: otherwise, the next scroll update
|
|
// would copy pixel that are not supposed to be part of
|
|
// the sprite.
|
|
::basegfx::B2IRange aSourceRect(
|
|
::canvas::tools::spritePixelAreaFromB2DRange( rMoveStart ) );
|
|
const ::basegfx::B2IRange& rDestRect(
|
|
::canvas::tools::spritePixelAreaFromB2DRange( rMoveEnd ) );
|
|
::basegfx::B2IPoint aDestPos( rDestRect.getMinimum() );
|
|
|
|
::std::vector< ::basegfx::B2IRange > aUnscrollableAreas;
|
|
|
|
// Since strictly speaking, this scroll algorithm is plain
|
|
// buggy, the scrolled area might actually lie _below_ another
|
|
// window - we've made this feature configurable via
|
|
// mbIsUnsafeScrolling.
|
|
|
|
// clip to output bounds (cannot properly scroll stuff
|
|
// _outside_ our screen area)
|
|
if( !mbIsUnsafeScrolling ||
|
|
!::canvas::tools::clipScrollArea( aSourceRect,
|
|
aDestPos,
|
|
aUnscrollableAreas,
|
|
aOutputBounds ) )
|
|
{
|
|
// fully clipped scroll area: cannot simply scroll
|
|
// then. Perform normal opaque update (can use that, since
|
|
// one of the preconditions for scrollable update is
|
|
// opaque sprite content)
|
|
|
|
// repaint all affected sprites directly to output device
|
|
::std::for_each( rUpdateArea.maComponentList.begin(),
|
|
rUpdateArea.maComponentList.end(),
|
|
::boost::bind(
|
|
&spriteRedrawStub3,
|
|
::boost::ref( rOutDev ),
|
|
_1 ) );
|
|
}
|
|
else
|
|
{
|
|
// scroll rOutDev content
|
|
rOutDev.CopyArea( ::vcl::unotools::pointFromB2IPoint( aDestPos ),
|
|
::vcl::unotools::pointFromB2IPoint( aSourceRect.getMinimum() ),
|
|
// TODO(Q2): use numeric_cast to check range
|
|
::Size( static_cast<sal_Int32>(aSourceRect.getRange().getX()),
|
|
static_cast<sal_Int32>(aSourceRect.getRange().getY()) ) );
|
|
|
|
const ::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator
|
|
aFirst( rUpdateArea.maComponentList.begin() );
|
|
::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator
|
|
aSecond( aFirst ); ++aSecond;
|
|
|
|
ENSURE_OR_THROW( aFirst->second.getSprite().is(),
|
|
"VCLCanvas::scrollUpdate(): no sprite" );
|
|
|
|
// repaint uncovered areas from sprite. Need to actually
|
|
// clip here, since we're only repainting _parts_ of the
|
|
// sprite
|
|
rOutDev.Push( PUSH_CLIPREGION );
|
|
::std::for_each( aUnscrollableAreas.begin(),
|
|
aUnscrollableAreas.end(),
|
|
::boost::bind( &opaqueUpdateSpriteArea,
|
|
::boost::cref(aFirst->second.getSprite()),
|
|
::boost::ref(rOutDev),
|
|
_1 ) );
|
|
rOutDev.Pop();
|
|
}
|
|
|
|
// repaint uncovered areas from backbuffer - take the
|
|
// _rounded_ rectangles from above, to have the update
|
|
// consistent with the scroll above.
|
|
::std::vector< ::basegfx::B2DRange > aUncoveredAreas;
|
|
::basegfx::computeSetDifference( aUncoveredAreas,
|
|
rUpdateArea.maTotalBounds,
|
|
::basegfx::B2DRange( rDestRect ) );
|
|
::std::for_each( aUncoveredAreas.begin(),
|
|
aUncoveredAreas.end(),
|
|
::boost::bind( &repaintBackground,
|
|
::boost::ref(rOutDev),
|
|
::boost::ref(rBackOutDev),
|
|
_1 ) );
|
|
}
|
|
|
|
void SpriteCanvasHelper::opaqueUpdate( const ::basegfx::B2DRange& rTotalArea,
|
|
const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
|
|
{
|
|
(void)rTotalArea;
|
|
|
|
ENSURE_OR_THROW( mpOwningSpriteCanvas &&
|
|
mpOwningSpriteCanvas->getBackBuffer() &&
|
|
mpOwningSpriteCanvas->getFrontBuffer(),
|
|
"SpriteCanvasHelper::opaqueUpdate(): NULL device pointer " );
|
|
|
|
OutputDevice& rOutDev( mpOwningSpriteCanvas->getFrontBuffer()->getOutDev() );
|
|
|
|
// no need to clip output to actual update region - there will
|
|
// always be ALL sprites contained in the rectangular update
|
|
// area containd in rTotalArea (that's the way
|
|
// B2DConnectedRanges work). If rTotalArea appears to be
|
|
// smaller than the sprite - then this sprite carries a clip,
|
|
// and the update will be constrained to that rect.
|
|
|
|
// repaint all affected sprites directly to output device
|
|
::std::for_each( rSortedUpdateSprites.begin(),
|
|
rSortedUpdateSprites.end(),
|
|
::boost::bind(
|
|
&spriteRedrawStub,
|
|
::boost::ref( rOutDev ),
|
|
_1 ) );
|
|
}
|
|
|
|
void SpriteCanvasHelper::genericUpdate( const ::basegfx::B2DRange& rRequestedArea,
|
|
const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
|
|
{
|
|
ENSURE_OR_THROW( mpOwningSpriteCanvas &&
|
|
mpOwningSpriteCanvas->getBackBuffer() &&
|
|
mpOwningSpriteCanvas->getFrontBuffer(),
|
|
"SpriteCanvasHelper::genericUpdate(): NULL device pointer " );
|
|
|
|
OutputDevice& rOutDev( mpOwningSpriteCanvas->getFrontBuffer()->getOutDev() );
|
|
BackBufferSharedPtr pBackBuffer( mpOwningSpriteCanvas->getBackBuffer() );
|
|
OutputDevice& rBackOutDev( pBackBuffer->getOutDev() );
|
|
|
|
// limit size of update VDev to target outdev's size
|
|
const Size& rTargetSizePixel( rOutDev.GetOutputSizePixel() );
|
|
|
|
// round output position towards zero. Don't want to truncate
|
|
// a fraction of a sprite pixel... Clip position at origin,
|
|
// otherwise, truncation of size below might leave visible
|
|
// areas uncovered by VDev.
|
|
const ::Point aOutputPosition(
|
|
::std::max( sal_Int32( 0 ),
|
|
static_cast< sal_Int32 >(rRequestedArea.getMinX()) ),
|
|
::std::max( sal_Int32( 0 ),
|
|
static_cast< sal_Int32 >(rRequestedArea.getMinY()) ) );
|
|
// round output size towards +infty. Don't want to truncate a
|
|
// fraction of a sprite pixel... Limit coverage of VDev to
|
|
// output device's area (i.e. not only to total size, but to
|
|
// cover _only_ the visible parts).
|
|
const ::Size aOutputSize(
|
|
::std::max( sal_Int32( 0 ),
|
|
::std::min( static_cast< sal_Int32 >(rTargetSizePixel.Width() - aOutputPosition.X()),
|
|
::canvas::tools::roundUp( rRequestedArea.getMaxX() - aOutputPosition.X() ))),
|
|
::std::max( sal_Int32( 0 ),
|
|
::std::min( static_cast< sal_Int32 >(rTargetSizePixel.Height() - aOutputPosition.Y()),
|
|
::canvas::tools::roundUp( rRequestedArea.getMaxY() - aOutputPosition.Y() ))));
|
|
|
|
// early exit for empty output area.
|
|
if( aOutputSize.Width() == 0 &&
|
|
aOutputSize.Height() == 0 )
|
|
{
|
|
return;
|
|
}
|
|
|
|
const Point aEmptyPoint(0,0);
|
|
const Size aCurrOutputSize( maVDev->GetOutputSizePixel() );
|
|
|
|
// adapt maVDev's size to the area that actually needs the
|
|
// repaint.
|
|
if( aCurrOutputSize.Width() < aOutputSize.Width() ||
|
|
aCurrOutputSize.Height() < aOutputSize.Height() )
|
|
{
|
|
// TODO(P1): Come up with a clever tactic to reduce maVDev
|
|
// from time to time. Reduction with threshold (say, if
|
|
// maVDev is more than twice too large) is not wise, as
|
|
// this might then toggle within the same updateScreen(),
|
|
// but for different disjunct sprite areas.
|
|
maVDev->SetOutputSizePixel( aOutputSize );
|
|
}
|
|
|
|
// paint background
|
|
maVDev->EnableMapMode( sal_False );
|
|
maVDev->SetClipRegion();
|
|
maVDev->DrawOutDev( aEmptyPoint, aOutputSize,
|
|
aOutputPosition, aOutputSize,
|
|
rBackOutDev );
|
|
|
|
// repaint all affected sprites on top of background into
|
|
// VDev.
|
|
::std::for_each( rSortedUpdateSprites.begin(),
|
|
rSortedUpdateSprites.end(),
|
|
::boost::bind( &spriteRedrawStub2,
|
|
::boost::ref( maVDev.get() ),
|
|
::boost::cref(
|
|
::vcl::unotools::b2DPointFromPoint(aOutputPosition)),
|
|
_1 ) );
|
|
|
|
// flush to screen
|
|
rOutDev.EnableMapMode( sal_False );
|
|
rOutDev.DrawOutDev( aOutputPosition, aOutputSize,
|
|
aEmptyPoint, aOutputSize,
|
|
*maVDev );
|
|
}
|
|
|
|
void SpriteCanvasHelper::renderFrameCounter( OutputDevice& rOutDev )
|
|
{
|
|
const double denominator( maLastUpdate.getElapsedTime() );
|
|
maLastUpdate.reset();
|
|
|
|
::rtl::OUString text( ::rtl::math::doubleToUString( denominator == 0.0 ? 100.0 : 1.0/denominator,
|
|
rtl_math_StringFormat_F,
|
|
2,'.',NULL,' ') );
|
|
|
|
// pad with leading space
|
|
while( text.getLength() < 6 )
|
|
text = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM (" ")) + text;
|
|
|
|
text += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM (" fps"));
|
|
|
|
renderInfoText( rOutDev,
|
|
text,
|
|
Point(0, 0) );
|
|
}
|
|
|
|
namespace
|
|
{
|
|
template< typename T > struct Adder
|
|
{
|
|
typedef void result_type;
|
|
|
|
Adder( T& rAdderTarget,
|
|
T nIncrement ) :
|
|
mpTarget( &rAdderTarget ),
|
|
mnIncrement( nIncrement )
|
|
{
|
|
}
|
|
|
|
void operator()() { *mpTarget += mnIncrement; }
|
|
void operator()( const ::canvas::Sprite::Reference& ) { *mpTarget += mnIncrement; }
|
|
void operator()( T nIncrement ) { *mpTarget += nIncrement; }
|
|
|
|
T* mpTarget;
|
|
T mnIncrement;
|
|
};
|
|
|
|
template< typename T> Adder<T> makeAdder( T& rAdderTarget,
|
|
T nIncrement )
|
|
{
|
|
return Adder<T>(rAdderTarget, nIncrement);
|
|
}
|
|
}
|
|
|
|
void SpriteCanvasHelper::renderSpriteCount( OutputDevice& rOutDev )
|
|
{
|
|
if( mpRedrawManager )
|
|
{
|
|
sal_Int32 nCount(0);
|
|
|
|
mpRedrawManager->forEachSprite( makeAdder(nCount,sal_Int32(1)) );
|
|
::rtl::OUString text(
|
|
::rtl::OUString::valueOf(
|
|
// disambiguate overload...
|
|
static_cast<sal_Int64>(nCount) ) );
|
|
|
|
// pad with leading space
|
|
while( text.getLength() < 3 )
|
|
text = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM (" ")) + text;
|
|
|
|
text = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("Sprites: ")) + text;
|
|
|
|
renderInfoText( rOutDev,
|
|
text,
|
|
Point(0, 30) );
|
|
}
|
|
}
|
|
|
|
void SpriteCanvasHelper::renderMemUsage( OutputDevice& rOutDev )
|
|
{
|
|
BackBufferSharedPtr pBackBuffer( mpOwningSpriteCanvas->getBackBuffer() );
|
|
|
|
if( mpRedrawManager &&
|
|
pBackBuffer )
|
|
{
|
|
double nPixel(0.0);
|
|
|
|
// accumulate pixel count for each sprite into fCount
|
|
mpRedrawManager->forEachSprite( ::boost::bind(
|
|
makeAdder(nPixel,1.0),
|
|
::boost::bind(
|
|
&calcNumPixel,
|
|
_1 ) ) );
|
|
|
|
static const int NUM_VIRDEV(2);
|
|
static const int BYTES_PER_PIXEL(3);
|
|
|
|
const Size& rVDevSize( maVDev->GetOutputSizePixel() );
|
|
const Size& rBackBufferSize( pBackBuffer->getOutDev().GetOutputSizePixel() );
|
|
|
|
const double nMemUsage( nPixel * NUM_VIRDEV * BYTES_PER_PIXEL +
|
|
rVDevSize.Width()*rVDevSize.Height() * BYTES_PER_PIXEL +
|
|
rBackBufferSize.Width()*rBackBufferSize.Height() * BYTES_PER_PIXEL );
|
|
|
|
::rtl::OUString text( ::rtl::math::doubleToUString( nMemUsage / 1048576.0,
|
|
rtl_math_StringFormat_F,
|
|
2,'.',NULL,' ') );
|
|
|
|
// pad with leading space
|
|
while( text.getLength() < 4 )
|
|
text = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM (" ")) + text;
|
|
|
|
text = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("Mem: ")) +
|
|
text +
|
|
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("MB"));
|
|
|
|
renderInfoText( rOutDev,
|
|
text,
|
|
Point(0, 60) );
|
|
}
|
|
}
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|