summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2019-02-18 11:55:41 +0100
committerSimon Rettberg2019-02-18 11:55:41 +0100
commitae69a754244c4e475c8d2591772ca8e005071d83 (patch)
tree58b3fa7abc2dcfe3c23e1c0ce108950c720826ab
parentUpdate gitignore (diff)
downloadxscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.gz
xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.xz
xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.zip
Update to 5.42
-rw-r--r--OSX/LaunchScreen.xib12
-rw-r--r--OSX/Makefile81
-rw-r--r--OSX/Media-iOS.xcassets/LaunchImage.launchimage/Contents.json38
-rw-r--r--OSX/README5
-rw-r--r--OSX/SaverListController.m4
-rw-r--r--OSX/SaverRunner.h2
-rw-r--r--OSX/SaverRunner.m11
-rw-r--r--OSX/SaverRunner.plist10
l---------OSX/Sparkle.framework/Modules1
l---------OSX/Sparkle.framework/PrivateHeaders1
-rw-r--r--OSX/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h43
-rw-r--r--OSX/Sparkle.framework/Versions/A/Headers/SPUDownloader.h25
-rw-r--r--OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h38
-rw-r--r--OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderDeprecated.h13
-rw-r--r--OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h34
-rw-r--r--OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderSession.h20
-rw-r--r--OSX/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h35
-rw-r--r--[-rwxr-xr-x]OSX/Sparkle.framework/Versions/A/Headers/SUAppcast.h37
-rw-r--r--[-rwxr-xr-x]OSX/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h72
-rw-r--r--OSX/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h22
-rw-r--r--OSX/Sparkle.framework/Versions/A/Headers/SUErrors.h56
-rw-r--r--OSX/Sparkle.framework/Versions/A/Headers/SUExport.h18
-rw-r--r--OSX/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h52
-rw-r--r--[-rwxr-xr-x]OSX/Sparkle.framework/Versions/A/Headers/SUUpdater.h272
-rw-r--r--OSX/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h301
-rw-r--r--[-rwxr-xr-x]OSX/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h22
-rw-r--r--[-rwxr-xr-x]OSX/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h22
-rw-r--r--[-rwxr-xr-x]OSX/Sparkle.framework/Versions/A/Headers/Sparkle.h20
-rw-r--r--OSX/Sparkle.framework/Versions/A/Modules/module.modulemap6
-rw-r--r--OSX/Sparkle.framework/Versions/A/PrivateHeaders/SUUnarchiver.h21
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist54
-rwxr-xr-xOSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdatebin0 -> 193884 bytes
-rwxr-xr-xOSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileopbin0 -> 89836 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/PkgInfo1
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/AppIcon.icnsbin0 -> 37132 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nibbin0 -> 11698 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.stringsbin0 -> 8070 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ca.lproj/Sparkle.stringsbin0 -> 6310 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.stringsbin0 -> 7434 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.stringsbin0 -> 7990 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.stringsbin0 -> 8874 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.stringsbin0 -> 7332 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/en.lproj/Sparkle.stringsbin0 -> 9096 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.stringsbin0 -> 9640 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.stringsbin0 -> 5814 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.stringsbin0 -> 8964 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.stringsbin0 -> 4936 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hr.lproj/Sparkle.stringsbin0 -> 9352 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hu.lproj/Sparkle.stringsbin0 -> 9600 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/is.lproj/Sparkle.stringsbin0 -> 5478 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.stringsbin0 -> 7920 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.stringsbin0 -> 7718 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.stringsbin0 -> 5868 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.stringsbin0 -> 8998 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.stringsbin0 -> 8466 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.stringsbin0 -> 8140 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.stringsbin0 -> 9280 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.stringsbin0 -> 7434 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.stringsbin0 -> 9412 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.stringsbin0 -> 7446 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.stringsbin0 -> 7168 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.stringsbin0 -> 7562 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.stringsbin0 -> 7406 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.stringsbin0 -> 8118 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.stringsbin0 -> 9246 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.stringsbin0 -> 7466 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.stringsbin0 -> 5484 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.stringsbin0 -> 5410 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/DarkAqua.css9
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/Info.plist22
-rw-r--r--[-rwxr-xr-x]OSX/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist160
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/SUStatus.nibbin6565 -> 11698 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.nibbin7118 -> 12411 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.nibbin10445 -> 21763 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.nibbin12737 -> 18515 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.stringsbin8896 -> 8070 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ca.lproj/Sparkle.stringsbin0 -> 6310 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.nibbin7039 -> 12399 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.nibbin10241 -> 21789 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.nibbin12782 -> 18613 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/Sparkle.stringsbin8642 -> 7434 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.nibbin7018 -> 12308 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.nibbin10347 -> 21668 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.nibbin12635 -> 18402 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.stringsbin8818 -> 7990 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nibbin7109 -> 12327 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nibbin10386 -> 21705 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nibbin12699 -> 18555 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.stringsbin9246 -> 8874 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUAutomaticUpdateAlert.nibbin0 -> 12451 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdateAlert.nibbin0 -> 21804 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdatePermissionPrompt.nibbin0 -> 18645 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/el.lproj/Sparkle.stringsbin0 -> 7332 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nibbin7015 -> 12305 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nibbin10258 -> 21657 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nibbin12566 -> 18344 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.stringsbin9042 -> 9096 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nibbin7052 -> 12361 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nibbin10492 -> 21839 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nibbin12872 -> 18737 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.stringsbin8956 -> 9640 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUAutomaticUpdateAlert.nibbin0 -> 12451 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdateAlert.nibbin0 -> 21812 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdatePermissionPrompt.nibbin0 -> 18453 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/Sparkle.stringsbin0 -> 5814 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nibbin7076 -> 12364 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nibbin10436 -> 21761 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nibbin12914 -> 18723 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.stringsbin9204 -> 8964 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/he.lproj/Sparkle.stringsbin0 -> 4936 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUAutomaticUpdateAlert.nibbin0 -> 12406 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdateAlert.nibbin0 -> 21814 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdatePermissionPrompt.nibbin0 -> 18454 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/Sparkle.stringsbin0 -> 9352 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUAutomaticUpdateAlert.nibbin0 -> 12453 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdateAlert.nibbin0 -> 21867 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdatePermissionPrompt.nibbin0 -> 18453 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/Sparkle.stringsbin0 -> 9600 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.nibbin7013 -> 12375 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.nibbin10221 -> 21774 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.nibbin12780 -> 18643 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/is.lproj/Sparkle.stringsbin6772 -> 5478 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nibbin7002 -> 12311 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nibbin10353 -> 21699 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nibbin12716 -> 18580 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.stringsbin9136 -> 7920 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.nibbin7103 -> 12315 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.nibbin10436 -> 21679 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.nibbin12524 -> 18273 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.stringsbin7518 -> 7718 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.nibbin6919 -> 12283 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.nibbin10079 -> 21633 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.nibbin12417 -> 18280 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/Sparkle.stringsbin0 -> 5868 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUAutomaticUpdateAlert.nibbin0 -> 12327 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdateAlert.nibbin0 -> 21628 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdatePermissionPrompt.nibbin0 -> 18536 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/Sparkle.stringsbin0 -> 8998 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nibbin7007 -> 12323 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nibbin10333 -> 21672 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nibbin12515 -> 18360 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.stringsbin9374 -> 8466 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.nibbin7039 -> 12402 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.nibbin10223 -> 21778 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.nibbin12564 -> 18427 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/Sparkle.stringsbin9532 -> 8140 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.nibbin7080 -> 12379 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.nibbin10328 -> 21819 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nibbin12785 -> 18655 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.stringsbin8330 -> 9280 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.nibbin7094 -> 12385 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdateAlert.nibbin10513 -> 21839 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nibbin12886 -> 18695 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.stringsbin8652 -> 7434 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.nibbin7117 -> 12413 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.nibbin10466 -> 21823 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.nibbin12592 -> 18413 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.stringsbin9386 -> 9412 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nibbin7143 -> 12453 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nibbin10524 -> 21873 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nibbin12864 -> 18729 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.stringsbin8662 -> 7446 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.nibbin7068 -> 12431 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.nibbin10270 -> 21825 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.nibbin12778 -> 18641 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/Sparkle.stringsbin0 -> 7168 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.nibbin7103 -> 12341 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.nibbin10232 -> 21737 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.nibbin12751 -> 18560 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.stringsbin8778 -> 7562 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nibbin7022 -> 12390 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nibbin10385 -> 21799 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nibbin12727 -> 18556 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.stringsbin8600 -> 7406 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.nibbin7087 -> 12377 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.nibbin10342 -> 21742 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.nibbin12658 -> 18475 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.stringsbin8946 -> 8118 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.nibbin7179 -> 12415 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.nibbin10477 -> 21747 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.nibbin12731 -> 18600 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.stringsbin9284 -> 9246 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUAutomaticUpdateAlert.nibbin7233 -> 12471 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.nibbin10624 -> 21893 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.nibbin12774 -> 18638 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.stringsbin8644 -> 7466 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.nibbin6938 -> 12249 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.nibbin10244 -> 21577 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nibbin12334 -> 18199 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.stringsbin6908 -> 5484 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.nibbin6891 -> 12255 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.nibbin10040 -> 21594 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nibbin12315 -> 18209 bytes
-rw-r--r--OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.stringsbin6642 -> 5410 bytes
-rwxr-xr-xOSX/Sparkle.framework/Versions/A/Sparklebin403600 -> 625620 bytes
-rw-r--r--OSX/Updater.h13
-rw-r--r--OSX/Updater.m3
-rw-r--r--OSX/Updater.plist10
-rw-r--r--OSX/XScreenSaver.plist4
-rw-r--r--OSX/XScreenSaverConfigSheet.h4
-rw-r--r--OSX/XScreenSaverView.m4
-rw-r--r--OSX/bindist.rtf4
-rw-r--r--OSX/bindist2.webloc2
-rwxr-xr-xOSX/fuzztest.sh2
-rw-r--r--OSX/iSaverRunner.plist10
-rw-r--r--OSX/ios-function-table.m4
-rwxr-xr-xOSX/seticon.pl7
-rwxr-xr-xOSX/sparkle-bin/BinaryDeltabin0 -> 173948 bytes
-rw-r--r--OSX/sparkle-bin/BinaryDelta.dSYM/Contents/Info.plist20
-rw-r--r--OSX/sparkle-bin/BinaryDelta.dSYM/Contents/Resources/DWARF/BinaryDeltabin0 -> 2245543 bytes
-rwxr-xr-xOSX/sparkle-bin/generate_appcastbin0 -> 9904192 bytes
-rw-r--r--OSX/sparkle-bin/generate_appcast.dSYM/Contents/Info.plist20
-rw-r--r--OSX/sparkle-bin/generate_appcast.dSYM/Contents/Resources/DWARF/generate_appcastbin0 -> 5953211 bytes
-rwxr-xr-xOSX/sparkle-bin/generate_keysbin0 -> 9556400 bytes
-rw-r--r--OSX/sparkle-bin/generate_keys.dSYM/Contents/Info.plist20
-rw-r--r--OSX/sparkle-bin/generate_keys.dSYM/Contents/Resources/DWARF/generate_keysbin0 -> 5388236 bytes
-rwxr-xr-xOSX/sparkle-bin/old_dsa_scripts/generate_dsa_keys_macos_10.12_only24
-rwxr-xr-xOSX/sparkle-bin/old_dsa_scripts/sign_update18
-rwxr-xr-xOSX/sparkle-bin/sign_updatebin0 -> 9785400 bytes
-rw-r--r--OSX/sparkle-bin/sign_update.dSYM/Contents/Info.plist20
-rw-r--r--OSX/sparkle-bin/sign_update.dSYM/Contents/Resources/DWARF/sign_updatebin0 -> 3891842 bytes
-rwxr-xr-xOSX/updates.pl62
-rw-r--r--OSX/updates.xml53
-rw-r--r--OSX/xscreensaver.xcodeproj/project.pbxproj195
-rw-r--r--README51
-rw-r--r--README.hacking6
-rw-r--r--aclocal.m45
-rw-r--r--android/Makefile1
-rw-r--r--android/build.gradle4
-rw-r--r--android/xscreensaver/.idea/caches/build_file_checksums.serbin521 -> 521 bytes
-rw-r--r--android/xscreensaver/.idea/misc.xml2
-rw-r--r--android/xscreensaver/.idea/workspace.xml236
-rw-r--r--android/xscreensaver/build.gradle8
-rw-r--r--android/xscreensaver/jni/Android.mk1
-rw-r--r--android/xscreensaver/jni/Application.mk4
-rw-r--r--android/xscreensaver/xscreensaver.iml16
-rw-r--r--config.h.in4
-rwxr-xr-xconfigure61
-rw-r--r--configure.in48
-rw-r--r--driver/Makefile.in11
-rw-r--r--driver/XScreenSaver.ad.in5
-rw-r--r--driver/XScreenSaver_ad.h1
-rw-r--r--driver/demo-Gtk.c5
-rw-r--r--driver/passwd.c46
-rw-r--r--driver/test-yarandom.c66
-rw-r--r--driver/xscreensaver.c12
-rw-r--r--hacks/Makefile.in227
-rw-r--r--hacks/abstractile.c9
-rw-r--r--hacks/analogtv-cli.c967
-rw-r--r--hacks/analogtv.c26
-rw-r--r--hacks/analogtv.h18
-rw-r--r--hacks/anemone.c3
-rw-r--r--hacks/anemotaxis.c3
-rw-r--r--hacks/apple2-main.c13
-rw-r--r--hacks/attraction.c5
-rw-r--r--hacks/barcode.c12
-rw-r--r--hacks/binaryring.c10
-rw-r--r--hacks/blaster.c2
-rw-r--r--hacks/blitspin.c21
-rw-r--r--hacks/boxfit.c6
-rw-r--r--hacks/bsod.c600
-rw-r--r--hacks/bubbles.c36
-rw-r--r--hacks/bumps.c6
-rw-r--r--hacks/ccurve.c5
-rw-r--r--hacks/celtic.c11
-rwxr-xr-xhacks/check-configs.pl26
-rw-r--r--hacks/cloudlife.c11
-rw-r--r--hacks/compass.c12
-rw-r--r--hacks/compile_axp.com1
-rw-r--r--hacks/compile_decc.com1
-rw-r--r--hacks/config/README4
-rw-r--r--hacks/config/bsod.xml2
-rw-r--r--hacks/config/handsy.xml58
-rw-r--r--hacks/config/ripples.xml3
-rw-r--r--hacks/config/unknownpleasures.xml19
-rw-r--r--hacks/coral.c4
-rw-r--r--hacks/critical.c9
-rw-r--r--hacks/cwaves.c5
-rw-r--r--hacks/cynosure.c5
-rw-r--r--hacks/decayscreen.c2
-rw-r--r--hacks/deco.c2
-rw-r--r--hacks/deluxe.c14
-rw-r--r--hacks/distort.c37
-rw-r--r--hacks/epicycle.c4
-rw-r--r--hacks/eruption.c17
-rw-r--r--hacks/filmleader.c31
-rw-r--r--hacks/fireworkx.c12
-rw-r--r--hacks/flag.c46
-rw-r--r--hacks/flame.c2
-rw-r--r--hacks/fluidballs.c11
-rw-r--r--hacks/fontglide.c31
-rw-r--r--hacks/fuzzyflakes.c5
-rw-r--r--hacks/glx/Makefile.in125
-rw-r--r--hacks/glx/antinspect.c12
-rw-r--r--hacks/glx/antmaze.c16
-rw-r--r--hacks/glx/antspotlight.c15
-rw-r--r--hacks/glx/atlantis.c19
-rw-r--r--hacks/glx/atunnel.c10
-rw-r--r--hacks/glx/b_draw.c4
-rw-r--r--hacks/glx/b_lockglue.c7
-rw-r--r--hacks/glx/b_sphere.c4
-rw-r--r--hacks/glx/blinkbox.c17
-rw-r--r--hacks/glx/blocktube.c19
-rw-r--r--hacks/glx/boing.c13
-rw-r--r--hacks/glx/bouncingcow.c22
-rw-r--r--hacks/glx/boxed.c30
-rw-r--r--hacks/glx/bubble3d.c22
-rw-r--r--hacks/glx/cage.c11
-rw-r--r--hacks/glx/carousel.c27
-rw-r--r--hacks/glx/circuit.c10
-rw-r--r--hacks/glx/cityflow.c21
-rw-r--r--hacks/glx/companion.c20
-rw-r--r--hacks/glx/crackberg.c43
-rw-r--r--hacks/glx/crumbler.c12
-rw-r--r--hacks/glx/cube21.c12
-rw-r--r--hacks/glx/cubenetic.c24
-rw-r--r--hacks/glx/cubestack.c15
-rw-r--r--hacks/glx/cubestorm.c22
-rw-r--r--hacks/glx/cubetwist.c6
-rw-r--r--hacks/glx/cubicgrid.c14
-rw-r--r--hacks/glx/dangerball.c18
-rw-r--r--hacks/glx/discoball.c8
-rw-r--r--hacks/glx/dnalogo.c35
-rwxr-xr-xhacks/glx/dxf2gl.pl51
-rw-r--r--hacks/glx/dymaxionmap.c28
-rw-r--r--hacks/glx/endgame.c19
-rw-r--r--hacks/glx/energystream.c19
-rw-r--r--hacks/glx/engine.c17
-rw-r--r--hacks/glx/esper.c29
-rw-r--r--hacks/glx/extrusion.c14
-rw-r--r--hacks/glx/flipflop.c6
-rw-r--r--hacks/glx/flipscreen3d.c13
-rw-r--r--hacks/glx/fliptext.c22
-rw-r--r--hacks/glx/flurry-texture.c5
-rw-r--r--hacks/glx/flurry.c18
-rw-r--r--hacks/glx/flurry.h3
-rw-r--r--hacks/glx/flyingtoasters.c24
-rw-r--r--hacks/glx/fps-gl.c15
-rw-r--r--hacks/glx/gears.c21
-rw-r--r--hacks/glx/geodesic.c15
-rw-r--r--hacks/glx/geodesicgears.c14
-rw-r--r--hacks/glx/gflux.c12
-rw-r--r--hacks/glx/glblur.c26
-rw-r--r--hacks/glx/glcells.c34
-rw-r--r--hacks/glx/gleidescope.c19
-rw-r--r--hacks/glx/glforestfire.c15
-rw-r--r--hacks/glx/glhanoi.c47
-rw-r--r--hacks/glx/glknots.c16
-rw-r--r--hacks/glx/glmatrix.c14
-rw-r--r--hacks/glx/glplanet.c23
-rw-r--r--hacks/glx/glschool.c21
-rw-r--r--hacks/glx/glslideshow.c26
-rw-r--r--hacks/glx/glsnake.c17
-rw-r--r--hacks/glx/gltext.c12
-rw-r--r--hacks/glx/gltrackball.c7
-rw-r--r--hacks/glx/gltrackball.h1
-rw-r--r--hacks/glx/handsy.c1175
-rw-r--r--hacks/glx/handsy.dxf67706
-rw-r--r--hacks/glx/handsy.man76
-rw-r--r--hacks/glx/handsy_anim.h805
-rw-r--r--hacks/glx/handsy_model.c6684
-rw-r--r--hacks/glx/hexstrut.c9
-rw-r--r--hacks/glx/hilbert.c27
-rw-r--r--hacks/glx/hydrostat.c22
-rw-r--r--hacks/glx/hypertorus.c14
-rw-r--r--hacks/glx/hypnowheel.c19
-rw-r--r--hacks/glx/jigglypuff.c148
-rw-r--r--hacks/glx/jigsaw.c19
-rw-r--r--hacks/glx/juggler3d.c14
-rw-r--r--hacks/glx/kaleidocycle.c16
-rw-r--r--hacks/glx/klein.c15
-rw-r--r--hacks/glx/lament.c20
-rw-r--r--hacks/glx/lavalite.c18
-rw-r--r--hacks/glx/lockward.c12
-rwxr-xr-xhacks/glx/maze3d.c12
-rw-r--r--[-rwxr-xr-x]hacks/glx/maze3d.man0
-rw-r--r--hacks/glx/menger.c18
-rw-r--r--hacks/glx/mirrorblob.c12
-rw-r--r--hacks/glx/moebius.c14
-rw-r--r--hacks/glx/moebiusgears.c15
-rw-r--r--hacks/glx/molecule.c56
-rw-r--r--hacks/glx/morph3d.c9
-rw-r--r--hacks/glx/noof.c14
-rw-r--r--hacks/glx/peepers.c22
-rw-r--r--hacks/glx/photopile.c22
-rw-r--r--hacks/glx/pinion.c22
-rw-r--r--hacks/glx/pipes.c77
-rw-r--r--hacks/glx/polyhedra-gl.c24
-rw-r--r--hacks/glx/polyhedra.c1
-rw-r--r--hacks/glx/polytopes.c14
-rw-r--r--hacks/glx/projectiveplane.c15
-rw-r--r--hacks/glx/providence.c17
-rw-r--r--hacks/glx/pulsar.c5
-rw-r--r--hacks/glx/quasicrystal.c21
-rw-r--r--hacks/glx/queens.c17
-rw-r--r--hacks/glx/quickhull.h11
-rw-r--r--hacks/glx/raverhoop.c28
-rw-r--r--hacks/glx/razzledazzle.c6
-rw-r--r--hacks/glx/romanboy.c21
-rw-r--r--hacks/glx/rubik.c21
-rw-r--r--hacks/glx/rubikblocks.c16
-rw-r--r--hacks/glx/sballs.c34
-rw-r--r--hacks/glx/sierpinski3d.c21
-rw-r--r--hacks/glx/skytentacles.c28
-rw-r--r--hacks/glx/sonar-icmp.c8
-rw-r--r--hacks/glx/sonar.c35
-rw-r--r--hacks/glx/spheremonics.c18
-rw-r--r--hacks/glx/splitflap.c28
-rw-r--r--hacks/glx/splodesic.c9
-rw-r--r--hacks/glx/sproingies.c2
-rw-r--r--hacks/glx/sproingiewrap.c11
-rw-r--r--hacks/glx/stairs.c11
-rw-r--r--hacks/glx/starwars.c18
-rw-r--r--hacks/glx/stonerview.c5
-rw-r--r--hacks/glx/superquadrics.c9
-rw-r--r--hacks/glx/surfaces.c15
-rw-r--r--hacks/glx/tangram.c14
-rw-r--r--hacks/glx/texfont.c3
-rw-r--r--hacks/glx/timetunnel.c28
-rw-r--r--hacks/glx/topblock.c23
-rw-r--r--hacks/glx/tronbit.c20
-rw-r--r--hacks/glx/unicrud.c16
-rw-r--r--hacks/glx/unknownpleasures.c698
-rw-r--r--hacks/glx/unknownpleasures.man32
-rw-r--r--hacks/glx/vigilance.c30
-rw-r--r--hacks/glx/voronoi.c20
-rw-r--r--hacks/glx/winduprobot.c30
-rw-r--r--hacks/glx/xlock-gl-utils.c1
-rw-r--r--hacks/halftone.c11
-rw-r--r--hacks/halo.c11
-rw-r--r--hacks/helix.c1
-rw-r--r--hacks/hexadrop.c4
-rw-r--r--hacks/hyperball.c5
-rw-r--r--hacks/hypercube.c6
-rw-r--r--hacks/ifs.c1
-rw-r--r--hacks/images/dvd.pngbin0 -> 2727 bytes
-rw-r--r--hacks/images/sun.pngbin0 -> 415 bytes
-rw-r--r--hacks/imsmap.c7
-rw-r--r--hacks/interaggregate.c7
-rw-r--r--hacks/interference.c7
-rw-r--r--hacks/intermomentary.c16
-rw-r--r--hacks/juggle.c1
-rw-r--r--hacks/kaleidescope.c25
-rw-r--r--hacks/kumppa.c2
-rw-r--r--hacks/lmorph.c13
-rw-r--r--hacks/m6502.c2
-rw-r--r--hacks/maze.c10
-rw-r--r--hacks/memscroller.c47
-rw-r--r--hacks/metaballs.c25
-rw-r--r--hacks/moire.c7
-rw-r--r--hacks/moire2.c6
-rw-r--r--hacks/munch.c6
-rw-r--r--hacks/nerverot.c4
-rw-r--r--hacks/noseguy.c39
-rw-r--r--hacks/pacman.c5
-rw-r--r--hacks/pedal.c3
-rw-r--r--hacks/penetrate.c5
-rw-r--r--hacks/petri.c12
-rw-r--r--hacks/phosphor.c26
-rw-r--r--hacks/piecewise.c39
-rw-r--r--hacks/pong.c2
-rw-r--r--hacks/popsquares.c3
-rw-r--r--hacks/pyro.c4
-rw-r--r--hacks/qix.c37
-rw-r--r--hacks/rd-bomb.c11
-rw-r--r--hacks/recanim.c64
-rw-r--r--hacks/ripples.c13
-rw-r--r--hacks/rocks.c11
-rw-r--r--hacks/rorschach.c1
-rw-r--r--hacks/rotzoomer.c18
-rw-r--r--hacks/screenhack.c34
-rw-r--r--hacks/screenhack.h5
-rw-r--r--hacks/screenhackI.h1
-rw-r--r--hacks/shadebobs.c4
-rw-r--r--hacks/slidescreen.c2
-rw-r--r--hacks/speedmine.c11
-rw-r--r--hacks/squiral.c6
-rw-r--r--hacks/starfish.c4
-rw-r--r--hacks/strange.c2
-rw-r--r--hacks/substrate.c6
-rw-r--r--hacks/t3d.c10
-rw-r--r--hacks/tessellimage.c2
-rw-r--r--hacks/truchet.c4
-rw-r--r--hacks/twang.c8
-rw-r--r--hacks/vermiculate.c28
-rw-r--r--hacks/vfeedback.c1
-rw-r--r--hacks/wander.c1
-rw-r--r--hacks/whirlwindwarp.c2
-rw-r--r--hacks/whirlygig.c7
-rw-r--r--hacks/wormhole.c29
-rw-r--r--hacks/xanalogtv.c50
-rw-r--r--hacks/xflame.c15
-rw-r--r--hacks/ximage-loader.c11
-rw-r--r--hacks/xjack.c3
-rw-r--r--hacks/xlockmore.c3
-rw-r--r--hacks/xlockmore.h6
-rw-r--r--hacks/xlockmoreI.h1
-rw-r--r--hacks/xlyap.c9
-rw-r--r--hacks/xmatrix.c19
-rw-r--r--hacks/xrayswarm.c5
-rw-r--r--hacks/xspirograph.c1
-rw-r--r--jwxyz/jwxyz.h1
-rw-r--r--po/POTFILES.in3
-rw-r--r--utils/Makefile.in2
-rw-r--r--utils/colors.c15
-rw-r--r--utils/erase.c2
-rw-r--r--utils/font-retry.c43
-rw-r--r--utils/textclient-mobile.c14
-rw-r--r--utils/version.h2
-rw-r--r--utils/yarandom.h34
-rw-r--r--xscreensaver.spec2
511 files changed, 83882 insertions, 1761 deletions
diff --git a/OSX/LaunchScreen.xib b/OSX/LaunchScreen.xib
index 731d86e..15cdbc5 100644
--- a/OSX/LaunchScreen.xib
+++ b/OSX/LaunchScreen.xib
@@ -1,8 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10116" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
+ <device id="retina4_7" orientation="portrait">
+ <adaptation id="fullscreen"/>
+ </device>
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -10,7 +14,7 @@
<view contentMode="scaleToFill" id="iN0-l3-epB">
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+ <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="simulatedStatusBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="404" y="445"/>
diff --git a/OSX/Makefile b/OSX/Makefile
index 373df6b..456c1bd 100644
--- a/OSX/Makefile
+++ b/OSX/Makefile
@@ -43,7 +43,14 @@ release:: distdepend
release:: check_versions
Sparkle.framework:
- unzip ../archive/Sparkle.framework-2013-12-04.zip
+ rm -rf bin sparkle-bin
+ tar -vxjf ../archive/Sparkle-1.21.2.tar.bz2 \
+ --exclude CHANGELOG \
+ --exclude LICENSE \
+ --exclude SampleAppcast.xml \
+ --exclude Sparkle.framework.dSYM \
+ --exclude Sparkle\ Test\ App\*
+ mv bin sparkle-bin
# Download and resize images from jwz.org.
# This saves us having to include 4MB of images in the tar file
@@ -54,7 +61,7 @@ Sparkle.framework:
BASE = xscreensaver/screenshots/
URL = https://www.jwz.org/$(BASE)
-WGET = wget -q -U xscreensaver-build-osx
+WGET = wget -q -U xscreensaver-build-osx --content-on-error=0
CVT = -thumbnail '200x150^' -gravity center -extent 200x150 \
\( +clone -alpha extract \
-draw 'fill black polygon 0,0 0,6 6,0 fill white circle 6,6 6,0' \
@@ -280,11 +287,12 @@ build/Release/installer.pkg: installer.rtf installer.xml installer.sh installer.
# -format UDBZ saves 4% (~1.2 MB) over UDZO.
-dmg:: distdepend
-dmg:: check_versions check_coretext
+dmg:: distdepend check_versions check_coretext
#dmg:: check_gc
dmg:: build/Release/installer.pkg
-dmg::
+dmg:: _dmg notarize
+
+_dmg::
@ \
set -e ; \
SRC=../utils/version.h ; \
@@ -369,7 +377,68 @@ dmg::
"$$TMPDMG" -o "$$DMG" ; \
xattr -w com.apple.quarantine "0000;00000000;;" "$$DMG" ; \
rm -f "$$TMPDMG" ; \
- ls -ldhgF "$$DMG"
+ ls -ldhgF "$$DMG" ; \
+ $(MAKE) notarize ; \
+
+
+# To set up notarization:
+# - Log in on https://appleid.apple.com/
+# - Generate App-Specific Password, "altool-notarizer"
+# - Keychain Access / New
+# - Name: "altool-notarizer", Account: "jwz@jwz.org",
+# Pass: the one you just generated.
+#
+# "make notarize", which will upload the DMG (slow).
+# A response will be emailed back in about an hour.
+# When that arrives, "make staple".
+#
+# https://developer.apple.com/documentation/security/notarizing_your_app_before_distribution/customizing_the_notarization_workflow?language=objc
+#
+# Note that if Sparkle.framework/.../Autoupdate.app is not independently
+# signed, it won't pass. I had to add a build phase for that.
+#
+NOTARGS=-u "jwz@jwz.org" -p "@keychain:altool-notarizer"
+
+notarize::
+ @ \
+ set -e ; \
+ SRC=../utils/version.h ; \
+ V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' $$SRC` ; \
+ BASE="xscreensaver-$$V" ; \
+ OUTDIR="../archive" ; \
+ DMG="$$OUTDIR/$$BASE.dmg" ; \
+ set -x ; \
+ xcrun altool --notarize-app --primary-bundle-id "org.jwz.xscreensaver" \
+ --file "$$DMG" $(NOTARGS) ; \
+ echo "" ; \
+ sleep 3 ; \
+ $(MAKE) notarize_wait staple updates.xml
+
+notarize_wait::
+ @while ( xcrun altool --notarization-history 0 $(NOTARGS) | \
+ grep -q 'in progress' ); do \
+ echo `date +%I:%M:` "waiting for notarization..." ; \
+ sleep 15 ; \
+ done ; \
+ echo '' ; \
+ xcrun altool --notarization-history 0 $(NOTARGS) ; \
+
+staple::
+ @ \
+ set -e ; \
+ SRC=../utils/version.h ; \
+ V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' $$SRC` ; \
+ BASE="xscreensaver-$$V" ; \
+ OUTDIR="../archive" ; \
+ DMG="$$OUTDIR/$$BASE.dmg" ; \
+ set -x ; \
+ xcrun stapler staple "$$DMG" ; \
+ xcrun stapler validate "$$DMG"
+
+notarization_history::
+ xcrun altool --notarization-history 0 $(NOTARGS)
+ @echo 'now do: xcrun altool $(NOTARGS) --notarization-info <UUID>' ; \
+ echo 'and wget the LogFileURL'
# When debugging, sometimes I have to reset the preferences for all
diff --git a/OSX/Media-iOS.xcassets/LaunchImage.launchimage/Contents.json b/OSX/Media-iOS.xcassets/LaunchImage.launchimage/Contents.json
index 5dd89e0..bc0812f 100644
--- a/OSX/Media-iOS.xcassets/LaunchImage.launchimage/Contents.json
+++ b/OSX/Media-iOS.xcassets/LaunchImage.launchimage/Contents.json
@@ -1,6 +1,24 @@
{
"images" : [
{
+ "extent" : "full-screen",
+ "idiom" : "iphone",
+ "subtype" : "736h",
+ "filename" : "1242x2208.png",
+ "minimum-system-version" : "8.0",
+ "orientation" : "portrait",
+ "scale" : "3x"
+ },
+ {
+ "extent" : "full-screen",
+ "idiom" : "iphone",
+ "subtype" : "667h",
+ "filename" : "750x1334.png",
+ "minimum-system-version" : "8.0",
+ "orientation" : "portrait",
+ "scale" : "2x"
+ },
+ {
"orientation" : "portrait",
"idiom" : "iphone",
"filename" : "640x960.png",
@@ -24,25 +42,7 @@
"extent" : "full-screen",
"subtype" : "retina4",
"scale" : "2x"
- },
- {
- "extent" : "full-screen",
- "idiom" : "iphone",
- "subtype" : "667h",
- "filename" : "750x1334.png",
- "minimum-system-version" : "8.0",
- "orientation" : "portrait",
- "scale" : "2x"
- },
- {
- "extent" : "full-screen",
- "idiom" : "iphone",
- "subtype" : "736h",
- "filename" : "1242x2208.png",
- "minimum-system-version" : "8.0",
- "orientation" : "portrait",
- "scale" : "3x"
- },
+ }
],
"info" : {
"version" : 1,
diff --git a/OSX/README b/OSX/README
index 0799995..e57d5a7 100644
--- a/OSX/README
+++ b/OSX/README
@@ -20,7 +20,8 @@ ridiculously long list of steps!
5: Delete the "DangerBall copy-Info.plist" from the Build Settings too.
6: Manage Schemes, rename "DangerBall Copy".
7: Move to the right place in the list.
- 8: Scheme / Run / Info: Executable: SaverTester.app.
+ 8. Scheme / Profile / Info: Executable: SaverTester.app.
+ Scheme / Run / Info: Executable: SaverTester.app.
9: Scheme / Run / Arguments: set SELECTED_SAVER environment variable.
10: File / Add Files / the new .c and .xml.
11: Re-order them in the file list. This will bring up an Options dialog.
@@ -38,5 +39,5 @@ ridiculously long list of steps!
18: git add xscreensaver.xcodeproj/xcuserdata/*/xcschemes/*.xcscheme
19: Don't forget to create a man page from the XML with xml2man.pl,
and update Makefile.in.
- 20: Make a video: -record-animation 3600 -delay 1 -geom 1920x1080+128+64
+ 20: Make a video: -record-animation 3600 -geom 1920x1080+128+64
./upload-video.pl NAME
diff --git a/OSX/SaverListController.m b/OSX/SaverListController.m
index 9377275..e68387c 100644
--- a/OSX/SaverListController.m
+++ b/OSX/SaverListController.m
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2012-2014 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2012-2018 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@ -225,6 +225,8 @@
for (int i = 0; i < n; i++) {
if ([list_by_letter[i] count] > 0) {
active_section_count++;
+ [list_by_letter[i] sortUsingSelector:
+ @selector(localizedCaseInsensitiveCompare:)];
[letter_sections addObject: list_by_letter[i]];
if (i <= 'Z'-'A')
[section_titles addObject: [NSString stringWithFormat: @"%c", i+'A']];
diff --git a/OSX/SaverRunner.h b/OSX/SaverRunner.h
index 073a87e..399eec0 100644
--- a/OSX/SaverRunner.h
+++ b/OSX/SaverRunner.h
@@ -31,7 +31,7 @@
# import <ScreenSaver/ScreenSaver.h>
#endif
-#import <XScreenSaverView.h>
+#import "XScreenSaverView.h"
#ifdef USE_IPHONE
diff --git a/OSX/SaverRunner.m b/OSX/SaverRunner.m
index f358fb7..8ab45c1 100644
--- a/OSX/SaverRunner.m
+++ b/OSX/SaverRunner.m
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2006-2017 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2006-2018 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@ -1035,10 +1035,11 @@ relabel_menus (NSObject *v, NSString *old_str, NSString *new_str)
if (name) [result addObject: name];
}
- if (! [result count])
- result = 0;
-
- return result;
+ if (result && [result count])
+ return [result sortedArrayUsingSelector:
+ @selector(localizedCaseInsensitiveCompare:)];
+ else
+ return 0;
}
diff --git a/OSX/SaverRunner.plist b/OSX/SaverRunner.plist
index 3ad0ce7..1a5f022 100644
--- a/OSX/SaverRunner.plist
+++ b/OSX/SaverRunner.plist
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>5.40</string>
+ <string>5.42</string>
<key>CFBundleIconFile</key>
<string>SaverRunner</string>
<key>CFBundleIdentifier</key>
@@ -15,21 +15,21 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>5.40</string>
+ <string>5.42</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>5.40</string>
+ <string>5.42</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>5.40</string>
+ <string>5.42</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSHumanReadableCopyright</key>
- <string>5.40</string>
+ <string>5.42</string>
<key>NSMainNibFile</key>
<string>SaverRunner</string>
<key>NSPrincipalClass</key>
diff --git a/OSX/Sparkle.framework/Modules b/OSX/Sparkle.framework/Modules
new file mode 120000
index 0000000..5736f31
--- /dev/null
+++ b/OSX/Sparkle.framework/Modules
@@ -0,0 +1 @@
+Versions/Current/Modules \ No newline at end of file
diff --git a/OSX/Sparkle.framework/PrivateHeaders b/OSX/Sparkle.framework/PrivateHeaders
new file mode 120000
index 0000000..d8e5645
--- /dev/null
+++ b/OSX/Sparkle.framework/PrivateHeaders
@@ -0,0 +1 @@
+Versions/Current/PrivateHeaders \ No newline at end of file
diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h
new file mode 100644
index 0000000..41cd574
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h
@@ -0,0 +1,43 @@
+//
+// SPUDownloadData.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 8/10/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+#import "SUExport.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*!
+ * A class for containing downloaded data along with some information about it.
+ */
+SU_EXPORT @interface SPUDownloadData : NSObject <NSSecureCoding>
+
+- (instancetype)initWithData:(NSData *)data textEncodingName:(NSString * _Nullable)textEncodingName MIMEType:(NSString * _Nullable)MIMEType;
+
+/*!
+ * The raw data that was downloaded.
+ */
+@property (nonatomic, readonly) NSData *data;
+
+/*!
+ * The IANA charset encoding name if available. Eg: "utf-8"
+ */
+@property (nonatomic, readonly, nullable, copy) NSString *textEncodingName;
+
+/*!
+ * The MIME type if available. Eg: "text/plain"
+ */
+@property (nonatomic, readonly, nullable, copy) NSString *MIMEType;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloader.h b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloader.h
new file mode 100644
index 0000000..5eee9bd
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloader.h
@@ -0,0 +1,25 @@
+//
+// SPUDownloader.h
+// Downloader
+//
+// Created by Mayur Pawashe on 4/1/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SPUDownloaderProtocol.h"
+
+@protocol SPUDownloaderDelegate;
+
+// This object implements the protocol which we have defined. It provides the actual behavior for the service. It is 'exported' by the service to make it available to the process hosting the service over an NSXPCConnection.
+@interface SPUDownloader : NSObject <SPUDownloaderProtocol>
+
+// Due to XPC remote object reasons, this delegate is strongly referenced
+// Invoke cleanup when done with this instance
+- (instancetype)initWithDelegate:(id <SPUDownloaderDelegate>)delegate;
+
+@end
diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h
new file mode 100644
index 0000000..76e7e75
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h
@@ -0,0 +1,38 @@
+//
+// SPUDownloaderDelegate.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 4/1/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class SPUDownloadData;
+
+@protocol SPUDownloaderDelegate <NSObject>
+
+// This is only invoked for persistent downloads
+- (void)downloaderDidSetDestinationName:(NSString *)destinationName temporaryDirectory:(NSString *)temporaryDirectory;
+
+// Under rare cases, this may be called more than once, in which case the current progress should be reset back to 0
+// This is only invoked for persistent downloads
+- (void)downloaderDidReceiveExpectedContentLength:(int64_t)expectedContentLength;
+
+// This is only invoked for persistent downloads
+- (void)downloaderDidReceiveDataOfLength:(uint64_t)length;
+
+// downloadData is nil if this is a persisent download, otherwise it's non-nil if it's a temporary download
+- (void)downloaderDidFinishWithTemporaryDownloadData:(SPUDownloadData * _Nullable)downloadData;
+
+- (void)downloaderDidFailWithError:(NSError *)error;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderDeprecated.h b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderDeprecated.h
new file mode 100644
index 0000000..36302df
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderDeprecated.h
@@ -0,0 +1,13 @@
+//
+// SPUDownloaderDeprecated.h
+// Sparkle
+//
+// Created by Deadpikle on 12/20/17.
+// Copyright © 2017 Sparkle Project. All rights reserved.
+//
+
+#import "SPUDownloader.h"
+
+@interface SPUDownloaderDeprecated : SPUDownloader <SPUDownloaderProtocol>
+
+@end
diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h
new file mode 100644
index 0000000..ebe477f
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h
@@ -0,0 +1,34 @@
+//
+// SPUDownloaderProtocol.h
+// PersistentDownloader
+//
+// Created by Mayur Pawashe on 4/1/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class SPUURLRequest;
+
+// The protocol that this service will vend as its API. This header file will also need to be visible to the process hosting the service.
+@protocol SPUDownloaderProtocol
+
+- (void)startPersistentDownloadWithRequest:(SPUURLRequest *)request bundleIdentifier:(NSString *)bundleIdentifier desiredFilename:(NSString *)desiredFilename;
+
+- (void)startTemporaryDownloadWithRequest:(SPUURLRequest *)request;
+
+- (void)downloadDidFinish;
+
+- (void)cleanup;
+
+- (void)cancel;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderSession.h b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderSession.h
new file mode 100644
index 0000000..4bde75a
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Headers/SPUDownloaderSession.h
@@ -0,0 +1,20 @@
+//
+// SPUDownloaderSession.h
+// Sparkle
+//
+// Created by Deadpikle on 12/20/17.
+// Copyright © 2017 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SPUDownloader.h"
+#import "SPUDownloaderProtocol.h"
+
+NS_CLASS_AVAILABLE(NSURLSESSION_AVAILABLE, 7_0)
+@interface SPUDownloaderSession : SPUDownloader <SPUDownloaderProtocol>
+
+@end
diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h b/OSX/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h
new file mode 100644
index 0000000..6949614
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h
@@ -0,0 +1,35 @@
+//
+// SPUURLRequest.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 5/19/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+// A class that wraps NSURLRequest and implements NSSecureCoding
+// This class exists because NSURLRequest did not support NSSecureCoding in macOS 10.8
+// I have not verified if NSURLRequest in 10.9 implements NSSecureCoding or not
+@interface SPUURLRequest : NSObject <NSSecureCoding>
+
+// Creates a new URL request
+// Only these properties are currently tracked:
+// * URL
+// * Cache policy
+// * Timeout interval
+// * HTTP header fields
+// * networkServiceType
++ (instancetype)URLRequestWithRequest:(NSURLRequest *)request;
+
+@property (nonatomic, readonly) NSURLRequest *request;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SUAppcast.h b/OSX/Sparkle.framework/Versions/A/Headers/SUAppcast.h
index 5a60d2f..34276b7 100755..100644
--- a/OSX/Sparkle.framework/Versions/A/Headers/SUAppcast.h
+++ b/OSX/Sparkle.framework/Versions/A/Headers/SUAppcast.h
@@ -9,28 +9,27 @@
#ifndef SUAPPCAST_H
#define SUAPPCAST_H
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SUExport.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
@class SUAppcastItem;
-@interface SUAppcast : NSObject
-{
-@private
- NSArray *items;
- NSString *userAgentString;
- id delegate;
- NSString *downloadFilename;
- NSURLDownload *download;
-}
-
-- (void)fetchAppcastFromURL:(NSURL *)url;
-- (void)setDelegate:delegate;
-- (void)setUserAgentString:(NSString *)userAgentString;
-
-- (NSArray *)items;
+SU_EXPORT @interface SUAppcast : NSObject
-@end
+@property (copy, nullable) NSString *userAgentString;
+@property (copy, nullable) NSDictionary<NSString *, NSString *> *httpHeaders;
+
+- (void)fetchAppcastFromURL:(NSURL *)url inBackground:(BOOL)bg completionBlock:(void (^)(NSError *_Nullable))err;
+- (SUAppcast *)copyWithoutDeltaUpdates;
-@interface NSObject (SUAppcastDelegate)
-- (void)appcastDidFinishLoading:(SUAppcast *)appcast;
-- (void)appcast:(SUAppcast *)appcast failedToLoadWithError:(NSError *)error;
+@property (readonly, copy, nullable) NSArray *items;
@end
+NS_ASSUME_NONNULL_END
+
#endif
diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h b/OSX/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h
index d6f9c64..c0380dd 100755..100644
--- a/OSX/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h
+++ b/OSX/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h
@@ -9,51 +9,43 @@
#ifndef SUAPPCASTITEM_H
#define SUAPPCASTITEM_H
-@interface SUAppcastItem : NSObject
-{
-@private
- NSString *title;
- NSDate *date;
- NSString *itemDescription;
-
- NSURL *releaseNotesURL;
-
- NSString *DSASignature;
- NSString *minimumSystemVersion;
- NSString *maximumSystemVersion;
-
- NSURL *fileURL;
- NSString *versionString;
- NSString *displayVersionString;
-
- NSDictionary *deltaUpdates;
-
- NSDictionary *propertiesDictionary;
-
- NSURL *infoURL; // UK 2007-08-31
-}
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SUExport.h"
+@class SUSignatures;
+
+SU_EXPORT @interface SUAppcastItem : NSObject
+@property (copy, readonly) NSString *title;
+@property (copy, readonly) NSString *dateString;
+@property (copy, readonly) NSString *itemDescription;
+@property (strong, readonly) NSURL *releaseNotesURL;
+@property (strong, readonly) SUSignatures *signatures;
+@property (copy, readonly) NSString *minimumSystemVersion;
+@property (copy, readonly) NSString *maximumSystemVersion;
+@property (strong, readonly) NSURL *fileURL;
+@property (nonatomic, readonly) uint64_t contentLength;
+@property (copy, readonly) NSString *versionString;
+@property (copy, readonly) NSString *osString;
+@property (copy, readonly) NSString *displayVersionString;
+@property (copy, readonly) NSDictionary *deltaUpdates;
+@property (strong, readonly) NSURL *infoURL;
// Initializes with data from a dictionary provided by the RSS class.
-- initWithDictionary:(NSDictionary *)dict;
-- initWithDictionary:(NSDictionary *)dict failureReason:(NSString**)error;
-
-- (NSString *)title;
-- (NSString *)versionString;
-- (NSString *)displayVersionString;
-- (NSDate *)date;
-- (NSString *)itemDescription;
-- (NSURL *)releaseNotesURL;
-- (NSURL *)fileURL;
-- (NSString *)DSASignature;
-- (NSString *)minimumSystemVersion;
-- (NSString *)maximumSystemVersion;
-- (NSDictionary *)deltaUpdates;
-- (BOOL)isDeltaUpdate;
+- (instancetype)initWithDictionary:(NSDictionary *)dict;
+- (instancetype)initWithDictionary:(NSDictionary *)dict failureReason:(NSString **)error;
+
+@property (getter=isDeltaUpdate, readonly) BOOL deltaUpdate;
+@property (getter=isCriticalUpdate, readonly) BOOL criticalUpdate;
+@property (getter=isMacOsUpdate, readonly) BOOL macOsUpdate;
+@property (getter=isInformationOnlyUpdate, readonly) BOOL informationOnlyUpdate;
// Returns the dictionary provided in initWithDictionary; this might be useful later for extensions.
-- (NSDictionary *)propertiesDictionary;
+@property (readonly, copy) NSDictionary *propertiesDictionary;
-- (NSURL *)infoURL; // UK 2007-08-31
+- (NSURL *)infoURL;
@end
diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h b/OSX/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h
new file mode 100644
index 0000000..f034cd2
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h
@@ -0,0 +1,22 @@
+//
+// SUCodeSigningVerifier.h
+// Sparkle
+//
+// Created by Andy Matuschak on 7/5/12.
+//
+//
+
+#ifndef SUCODESIGNINGVERIFIER_H
+#define SUCODESIGNINGVERIFIER_H
+
+#import <Foundation/Foundation.h>
+#import "SUExport.h"
+
+SU_EXPORT @interface SUCodeSigningVerifier : NSObject
++ (BOOL)codeSignatureAtBundleURL:(NSURL *)oldBundlePath matchesSignatureAtBundleURL:(NSURL *)newBundlePath error:(NSError **)error;
++ (BOOL)codeSignatureIsValidAtBundleURL:(NSURL *)bundlePath error:(NSError **)error;
++ (BOOL)bundleAtURLIsCodeSigned:(NSURL *)bundlePath;
++ (NSDictionary *)codeSignatureInfoAtBundleURL:(NSURL *)bundlePath;
+@end
+
+#endif
diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SUErrors.h b/OSX/Sparkle.framework/Versions/A/Headers/SUErrors.h
new file mode 100644
index 0000000..7d2e73a
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Headers/SUErrors.h
@@ -0,0 +1,56 @@
+//
+// SUErrors.h
+// Sparkle
+//
+// Created by C.W. Betts on 10/13/14.
+// Copyright (c) 2014 Sparkle Project. All rights reserved.
+//
+
+#ifndef SUERRORS_H
+#define SUERRORS_H
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SUExport.h"
+
+/**
+ * Error domain used by Sparkle
+ */
+SU_EXPORT extern NSString *const SUSparkleErrorDomain;
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wc++98-compat"
+typedef NS_ENUM(OSStatus, SUError) {
+ // Appcast phase errors.
+ SUAppcastParseError = 1000,
+ SUNoUpdateError = 1001,
+ SUAppcastError = 1002,
+ SURunningFromDiskImageError = 1003,
+
+ // Download phase errors.
+ SUTemporaryDirectoryError = 2000,
+ SUDownloadError = 2001,
+
+ // Extraction phase errors.
+ SUUnarchivingError = 3000,
+ SUSignatureError = 3001,
+
+ // Installation phase errors.
+ SUFileCopyFailure = 4000,
+ SUAuthenticationFailure = 4001,
+ SUMissingUpdateError = 4002,
+ SUMissingInstallerToolError = 4003,
+ SURelaunchError = 4004,
+ SUInstallationError = 4005,
+ SUDowngradeError = 4006,
+ SUInstallationCancelledError = 4007,
+
+ // System phase errors
+ SUSystemPowerOffError = 5000
+};
+#pragma clang diagnostic pop
+
+#endif
diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SUExport.h b/OSX/Sparkle.framework/Versions/A/Headers/SUExport.h
new file mode 100644
index 0000000..3e3f8a1
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Headers/SUExport.h
@@ -0,0 +1,18 @@
+//
+// SUExport.h
+// Sparkle
+//
+// Created by Jake Petroules on 2014-08-23.
+// Copyright (c) 2014 Sparkle Project. All rights reserved.
+//
+
+#ifndef SUEXPORT_H
+#define SUEXPORT_H
+
+#ifdef BUILDING_SPARKLE
+#define SU_EXPORT __attribute__((visibility("default")))
+#else
+#define SU_EXPORT
+#endif
+
+#endif
diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h b/OSX/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h
new file mode 100644
index 0000000..ed11921
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h
@@ -0,0 +1,52 @@
+//
+// SUStandardVersionComparator.h
+// Sparkle
+//
+// Created by Andy Matuschak on 12/21/07.
+// Copyright 2007 Andy Matuschak. All rights reserved.
+//
+
+#ifndef SUSTANDARDVERSIONCOMPARATOR_H
+#define SUSTANDARDVERSIONCOMPARATOR_H
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SUExport.h"
+#import "SUVersionComparisonProtocol.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/*!
+ Sparkle's default version comparator.
+
+ This comparator is adapted from MacPAD, by Kevin Ballard.
+ It's "dumb" in that it does essentially string comparison,
+ in components split by character type.
+*/
+SU_EXPORT @interface SUStandardVersionComparator : NSObject <SUVersionComparison>
+
+/*!
+ Initializes a new instance of the standard version comparator.
+ */
+- (instancetype)init;
+
+/*!
+ Returns a singleton instance of the comparator.
+
+ It is usually preferred to alloc/init new a comparator instead.
+*/
++ (SUStandardVersionComparator *)defaultComparator;
+
+/*!
+ Compares version strings through textual analysis.
+
+ See the implementation for more details.
+*/
+- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB;
+@end
+
+NS_ASSUME_NONNULL_END
+#endif
diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SUUpdater.h b/OSX/Sparkle.framework/Versions/A/Headers/SUUpdater.h
index cd79566..bc1d491 100755..100644
--- a/OSX/Sparkle.framework/Versions/A/Headers/SUUpdater.h
+++ b/OSX/Sparkle.framework/Versions/A/Headers/SUUpdater.h
@@ -9,153 +9,223 @@
#ifndef SUUPDATER_H
#define SUUPDATER_H
+#if __has_feature(modules)
+@import Cocoa;
+#else
+#import <Cocoa/Cocoa.h>
+#endif
+#import "SUExport.h"
#import "SUVersionComparisonProtocol.h"
#import "SUVersionDisplayProtocol.h"
-@class SUUpdateDriver, SUAppcastItem, SUHost, SUAppcast;
+@class SUAppcastItem, SUAppcast;
+
+@protocol SUUpdaterDelegate;
+
+/*!
+ The main API in Sparkle for controlling the update mechanism.
-@interface SUUpdater : NSObject
-{
-@private
- NSTimer *checkTimer;
- SUUpdateDriver *driver;
+ This class is used to configure the update paramters as well as manually
+ and automatically schedule and control checks for updates.
+ */
+SU_EXPORT @interface SUUpdater : NSObject
- NSString *customUserAgentString;
- SUHost *host;
- IBOutlet id delegate;
-}
+@property (unsafe_unretained) IBOutlet id<SUUpdaterDelegate> delegate;
+/*!
+ The shared updater for the main bundle.
+
+ This is equivalent to passing [NSBundle mainBundle] to SUUpdater::updaterForBundle:
+ */
+ (SUUpdater *)sharedUpdater;
-+ (SUUpdater *)updaterForBundle:(NSBundle *)bundle;
-- (id)initForBundle:(NSBundle *)bundle;
-- (NSBundle *)hostBundle;
+/*!
+ The shared updater for a specified bundle.
+
+ If an updater has already been initialized for the provided bundle, that shared instance will be returned.
+ */
++ (SUUpdater *)updaterForBundle:(NSBundle *)bundle;
-- (void)setDelegate:(id)delegate;
-- (id)delegate;
+/*!
+ Designated initializer for SUUpdater.
+
+ If an updater has already been initialized for the provided bundle, that shared instance will be returned.
+ */
+- (instancetype)initForBundle:(NSBundle *)bundle;
-- (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyChecks;
-- (BOOL)automaticallyChecksForUpdates;
+/*!
+ Explicitly checks for updates and displays a progress dialog while doing so.
-- (void)setUpdateCheckInterval:(NSTimeInterval)interval;
-- (NSTimeInterval)updateCheckInterval;
+ This method is meant for a main menu item.
+ Connect any menu item to this action in Interface Builder,
+ and Sparkle will check for updates and report back its findings verbosely
+ when it is invoked.
-- (void)setFeedURL:(NSURL *)feedURL;
-- (NSURL *)feedURL; // *** MUST BE CALLED ON MAIN THREAD ***
+ This will find updates that the user has opted into skipping.
+ */
+- (IBAction)checkForUpdates:(id)sender;
-- (void)setUserAgentString:(NSString *)userAgent;
-- (NSString *)userAgentString;
+/*!
+ The menu item validation used for the -checkForUpdates: action
+ */
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem;
-- (void)setSendsSystemProfile:(BOOL)sendsSystemProfile;
-- (BOOL)sendsSystemProfile;
+/*!
+ Checks for updates, but does not display any UI unless an update is found.
-- (void)setAutomaticallyDownloadsUpdates:(BOOL)automaticallyDownloadsUpdates;
-- (BOOL)automaticallyDownloadsUpdates;
+ This is meant for programmatically initating a check for updates. That is,
+ it will display no UI unless it actually finds an update, in which case it
+ proceeds as usual.
-// This IBAction is meant for a main menu item. Hook up any menu item to this action,
-// and Sparkle will check for updates and report back its findings verbosely.
-- (IBAction)checkForUpdates:(id)sender;
+ If automatic downloading of updates it turned on and allowed, however,
+ this will invoke that behavior, and if an update is found, it will be downloaded
+ in the background silently and will be prepped for installation.
-// This kicks off an update meant to be programmatically initiated. That is, it will display no UI unless it actually finds an update,
-// in which case it proceeds as usual. If the fully automated updating is turned on, however, this will invoke that behavior, and if an
-// update is found, it will be downloaded and prepped for installation.
+ This will not find updates that the user has opted into skipping.
+ */
- (void)checkForUpdatesInBackground;
-// Date of last update check. Returns nil if no check has been performed.
-- (NSDate*)lastUpdateCheckDate;
+/*!
+ A property indicating whether or not to check for updates automatically.
-// This begins a "probing" check for updates which will not actually offer to update to that version. The delegate methods, though,
-// (up to updater:didFindValidUpdate: and updaterDidNotFindUpdate:), are called, so you can use that information in your UI.
-- (void)checkForUpdateInformation;
+ Setting this property will persist in the host bundle's user defaults.
+ The update schedule cycle will be reset in a short delay after the property's new value is set.
+ This is to allow reverting this property without kicking off a schedule change immediately
+ */
+@property BOOL automaticallyChecksForUpdates;
-// Call this to appropriately schedule or cancel the update checking timer according to the preferences for time interval and automatic checks. This call does not change the date of the next check, but only the internal NSTimer.
-- (void)resetUpdateCycle;
+/*!
+ A property indicating whether or not updates can be automatically downloaded in the background.
-- (BOOL)updateInProgress;
+ Note that automatic downloading of updates can be disallowed by the developer
+ or by the user's system if silent updates cannot be done (eg: if they require authentication).
+ In this case, -automaticallyDownloadsUpdates will return NO regardless of how this property is set.
-@end
+ Setting this property will persist in the host bundle's user defaults.
+ */
+@property BOOL automaticallyDownloadsUpdates;
+/*!
+ A property indicating the current automatic update check interval.
-// -----------------------------------------------------------------------------
-// SUUpdater Delegate:
-// -----------------------------------------------------------------------------
+ Setting this property will persist in the host bundle's user defaults.
+ The update schedule cycle will be reset in a short delay after the property's new value is set.
+ This is to allow reverting this property without kicking off a schedule change immediately
+ */
+@property NSTimeInterval updateCheckInterval;
-@interface NSObject (SUUpdaterDelegateInformalProtocol)
+/*!
+ Begins a "probing" check for updates which will not actually offer to
+ update to that version.
-// Use this to keep Sparkle from popping up e.g. while your setup assistant is showing:
-- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)bundle;
+ However, the delegate methods
+ SUUpdaterDelegate::updater:didFindValidUpdate: and
+ SUUpdaterDelegate::updaterDidNotFindUpdate: will be called,
+ so you can use that information in your UI.
-// This method allows you to add extra parameters to the appcast URL, potentially based on whether or not Sparkle will also be sending along the system profile. This method should return an array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user.
-- (NSArray *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile;
+ Updates that have been skipped by the user will not be found.
+ */
+- (void)checkForUpdateInformation;
-// Override this to dynamically specify the entire URL.
-- (NSString*)feedURLStringForUpdater:(SUUpdater*)updater;
+/*!
+ The URL of the appcast used to download update information.
-// Use this to override the default behavior for Sparkle prompting the user about automatic update checks.
-- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)bundle;
+ Setting this property will persist in the host bundle's user defaults.
+ If you don't want persistence, you may want to consider instead implementing
+ SUUpdaterDelegate::feedURLStringForUpdater: or SUUpdaterDelegate::feedParametersForUpdater:sendingSystemProfile:
-// Implement this if you want to do some special handling with the appcast once it finishes loading.
-- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast;
+ This property must be called on the main thread.
+ */
+@property (copy) NSURL *feedURL;
-// If you're using special logic or extensions in your appcast, implement this to use your own logic for finding
-// a valid update, if any, in the given appcast.
-- (SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)bundle;
+/*!
+ The host bundle that is being updated.
+ */
+@property (readonly, strong) NSBundle *hostBundle;
-// Sent when a valid update is found by the update driver.
-- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)update;
+/*!
+ The bundle this class (SUUpdater) is loaded into.
+ */
+@property (strong, readonly) NSBundle *sparkleBundle;
-// Sent when a valid update is not found.
-- (void)updaterDidNotFindUpdate:(SUUpdater *)update;
+/*!
+ The user agent used when checking for updates.
-// Sent immediately before installing the specified update.
-- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update;
+ The default implementation can be overrided.
+ */
+@property (nonatomic, copy) NSString *userAgentString;
-// Return YES to delay the relaunch until you do some processing; invoke the given NSInvocation to continue.
-// This is not called if the user didn't relaunch on the previous update, in that case it will immediately
-// restart.
-- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)update untilInvoking:(NSInvocation *)invocation;
+/*!
+ The HTTP headers used when checking for updates.
-// Some apps *can not* be relaunched in certain circumstances. They can use this method
-// to prevent a relaunch "hard":
-- (BOOL)updaterShouldRelaunchApplication:(SUUpdater *)updater;
+ The keys of this dictionary are HTTP header fields (NSString) and values are corresponding values (NSString)
+ */
+@property (copy) NSDictionary<NSString *, NSString *> *httpHeaders;
-// Called immediately before relaunching.
-- (void)updaterWillRelaunchApplication:(SUUpdater *)updater;
+/*!
+ A property indicating whether or not the user's system profile information is sent when checking for updates.
-// This method allows you to provide a custom version comparator.
-// If you don't implement this method or return nil, the standard version comparator will be used.
-- (id <SUVersionComparison>)versionComparatorForUpdater:(SUUpdater *)updater;
+ Setting this property will persist in the host bundle's user defaults.
+ */
+@property BOOL sendsSystemProfile;
-// This method allows you to provide a custom version comparator.
-// If you don't implement this method or return nil, the standard version displayer will be used.
-- (id <SUVersionDisplay>)versionDisplayerForUpdater:(SUUpdater *)updater;
+/*!
+ A property indicating the decryption password used for extracting updates shipped as Apple Disk Images (dmg)
+ */
+@property (nonatomic, copy) NSString *decryptionPassword;
-// Returns the path which is used to relaunch the client after the update is installed. By default, the path of the host bundle.
-- (NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater;
+/*!
+ This function ignores normal update schedule, ignores user preferences,
+ and interrupts users with an unwanted immediate app update.
-// Called before and after, respectively, an updater shows a modal alert window, to give the host
-// the opportunity to hide attached windows etc. that may get in the way:
--(void) updaterWillShowModalAlert:(SUUpdater *)updater;
--(void) updaterDidShowModalAlert:(SUUpdater *)updater;
+ WARNING: this function should not be used in regular apps. This function
+ is a user-unfriendly hack only for very special cases, like unstable
+ rapidly-changing beta builds that would not run correctly if they were
+ even one day out of date.
-@end
+ Instead of this function you should set `SUAutomaticallyUpdate` to `YES`,
+ which will gracefully install updates when the app quits.
+ For UI-less/daemon apps that aren't usually quit, instead of this function,
+ you can use the delegate method
+ SUUpdaterDelegate::updater:willInstallUpdateOnQuit:immediateInstallationInvocation:
+ to immediately start installation when an update was found.
-// -----------------------------------------------------------------------------
-// Constants:
-// -----------------------------------------------------------------------------
+ A progress dialog is shown but the user will never be prompted to read the
+ release notes.
-// Define some minimum intervals to avoid DOS-like checking attacks. These are in seconds.
-#if defined(DEBUG) && DEBUG && 0
-#define SU_MIN_CHECK_INTERVAL 60
-#else
-#define SU_MIN_CHECK_INTERVAL 60*60
-#endif
+ This function will cause update to be downloaded twice if automatic updates are
+ enabled.
-#if defined(DEBUG) && DEBUG && 0
-#define SU_DEFAULT_CHECK_INTERVAL 60
-#else
-#define SU_DEFAULT_CHECK_INTERVAL 60*60*24
-#endif
+ You may want to respond to the userDidCancelDownload delegate method in case
+ the user clicks the "Cancel" button while the update is downloading.
+ */
+- (void)installUpdatesIfAvailable;
+
+/*!
+ Returns the date of last update check.
+
+ \returns \c nil if no check has been performed.
+ */
+@property (readonly, copy) NSDate *lastUpdateCheckDate;
+
+/*!
+ Appropriately schedules or cancels the update checking timer according to
+ the preferences for time interval and automatic checks.
+
+ This call does not change the date of the next check,
+ but only the internal NSTimer.
+ */
+- (void)resetUpdateCycle;
+
+/*!
+ A property indicating whether or not an update is in progress.
+
+ Note this property is not indicative of whether or not user initiated updates can be performed.
+ Use SUUpdater::validateMenuItem: for that instead.
+ */
+@property (readonly) BOOL updateInProgress;
+
+@end
#endif
diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h b/OSX/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h
new file mode 100644
index 0000000..86d1eb9
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h
@@ -0,0 +1,301 @@
+//
+// SUUpdaterDelegate.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 12/25/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+
+#import "SUExport.h"
+
+@protocol SUVersionComparison, SUVersionDisplay;
+@class SUUpdater, SUAppcast, SUAppcastItem;
+
+NS_ASSUME_NONNULL_BEGIN
+
+// -----------------------------------------------------------------------------
+// SUUpdater Notifications for events that might be interesting to more than just the delegate
+// The updater will be the notification object
+// -----------------------------------------------------------------------------
+SU_EXPORT extern NSString *const SUUpdaterDidFinishLoadingAppCastNotification;
+SU_EXPORT extern NSString *const SUUpdaterDidFindValidUpdateNotification;
+SU_EXPORT extern NSString *const SUUpdaterDidNotFindUpdateNotification;
+SU_EXPORT extern NSString *const SUUpdaterWillRestartNotification;
+#define SUUpdaterWillRelaunchApplicationNotification SUUpdaterWillRestartNotification;
+#define SUUpdaterWillInstallUpdateNotification SUUpdaterWillRestartNotification;
+
+// Key for the SUAppcastItem object in the SUUpdaterDidFindValidUpdateNotification userInfo
+SU_EXPORT extern NSString *const SUUpdaterAppcastItemNotificationKey;
+// Key for the SUAppcast object in the SUUpdaterDidFinishLoadingAppCastNotification userInfo
+SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey;
+
+// -----------------------------------------------------------------------------
+// SUUpdater Delegate:
+// -----------------------------------------------------------------------------
+
+/*!
+ Provides methods to control the behavior of an SUUpdater object.
+ */
+@protocol SUUpdaterDelegate <NSObject>
+@optional
+
+/*!
+ Returns whether to allow Sparkle to pop up.
+
+ For example, this may be used to prevent Sparkle from interrupting a setup assistant.
+
+ \param updater The SUUpdater instance.
+ */
+- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)updater;
+
+/*!
+ Returns additional parameters to append to the appcast URL's query string.
+
+ This is potentially based on whether or not Sparkle will also be sending along the system profile.
+
+ \param updater The SUUpdater instance.
+ \param sendingProfile Whether the system profile will also be sent.
+
+ \return An array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user.
+ */
+- (NSArray<NSDictionary<NSString *, NSString *> *> *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile;
+
+/*!
+ Returns a custom appcast URL.
+
+ Override this to dynamically specify the entire URL.
+
+ An alternative may be to use SUUpdaterDelegate::feedParametersForUpdater:sendingSystemProfile:
+ and let the server handle what kind of feed to provide.
+
+ \param updater The SUUpdater instance.
+ */
+- (nullable NSString *)feedURLStringForUpdater:(SUUpdater *)updater;
+
+/*!
+ Returns whether Sparkle should prompt the user about automatic update checks.
+
+ Use this to override the default behavior.
+
+ \param updater The SUUpdater instance.
+ */
+- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)updater;
+
+/*!
+ Called after Sparkle has downloaded the appcast from the remote server.
+
+ Implement this if you want to do some special handling with the appcast once it finishes loading.
+
+ \param updater The SUUpdater instance.
+ \param appcast The appcast that was downloaded from the remote server.
+ */
+- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast;
+
+/*!
+ Returns the item in the appcast corresponding to the update that should be installed.
+
+ If you're using special logic or extensions in your appcast,
+ implement this to use your own logic for finding a valid update, if any,
+ in the given appcast.
+
+ \param appcast The appcast that was downloaded from the remote server.
+ \param updater The SUUpdater instance.
+ */
+- (nullable SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)updater;
+
+/*!
+ Called when a valid update is found by the update driver.
+
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ */
+- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called when a valid update is not found.
+
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterDidNotFindUpdate:(SUUpdater *)updater;
+
+/*!
+ Called immediately before downloading the specified update.
+
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be downloaded.
+ \param request The mutable URL request that will be used to download the update.
+ */
+- (void)updater:(SUUpdater *)updater willDownloadUpdate:(SUAppcastItem *)item withRequest:(NSMutableURLRequest *)request;
+
+/*!
+ Called immediately after succesfull download of the specified update.
+
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that has been downloaded.
+ */
+- (void)updater:(SUUpdater *)updater didDownloadUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called after the specified update failed to download.
+
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that failed to download.
+ \param error The error generated by the failed download.
+ */
+- (void)updater:(SUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error;
+
+/*!
+ Called when the user clicks the cancel button while and update is being downloaded.
+
+ \param updater The SUUpdater instance.
+ */
+- (void)userDidCancelDownload:(SUUpdater *)updater;
+
+/*!
+ Called immediately before extracting the specified downloaded update.
+
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be extracted.
+ */
+- (void)updater:(SUUpdater *)updater willExtractUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called immediately after extracting the specified downloaded update.
+
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that has been extracted.
+ */
+- (void)updater:(SUUpdater *)updater didExtractUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called immediately before installing the specified update.
+
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ */
+- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)item;
+
+/*!
+ Returns whether the relaunch should be delayed in order to perform other tasks.
+
+ This is not called if the user didn't relaunch on the previous update,
+ in that case it will immediately restart.
+
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ \param invocation The invocation that must be completed with `[invocation invoke]` before continuing with the relaunch.
+
+ \return \c YES to delay the relaunch until \p invocation is invoked.
+ */
+- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)item untilInvoking:(NSInvocation *)invocation;
+
+/*!
+ Returns whether the application should be relaunched at all.
+
+ Some apps \b cannot be relaunched under certain circumstances.
+ This method can be used to explicitly prevent a relaunch.
+
+ \param updater The SUUpdater instance.
+ */
+- (BOOL)updaterShouldRelaunchApplication:(SUUpdater *)updater;
+
+/*!
+ Called immediately before relaunching.
+
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterWillRelaunchApplication:(SUUpdater *)updater;
+
+/*!
+ Called immediately after relaunching. SUUpdater delegate must be set before applicationDidFinishLaunching: to catch this event.
+
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterDidRelaunchApplication:(SUUpdater *)updater;
+
+/*!
+ Returns an object that compares version numbers to determine their arithmetic relation to each other.
+
+ This method allows you to provide a custom version comparator.
+ If you don't implement this method or return \c nil,
+ the standard version comparator will be used.
+
+ \sa SUStandardVersionComparator
+
+ \param updater The SUUpdater instance.
+ */
+- (nullable id<SUVersionComparison>)versionComparatorForUpdater:(SUUpdater *)updater;
+
+/*!
+ Returns an object that formats version numbers for display to the user.
+
+ If you don't implement this method or return \c nil,
+ the standard version formatter will be used.
+
+ \sa SUUpdateAlert
+
+ \param updater The SUUpdater instance.
+ */
+- (nullable id<SUVersionDisplay>)versionDisplayerForUpdater:(SUUpdater *)updater;
+
+/*!
+ Returns the path which is used to relaunch the client after the update is installed.
+
+ The default is the path of the host bundle.
+
+ \param updater The SUUpdater instance.
+ */
+- (nullable NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater;
+
+/*!
+ Called before an updater shows a modal alert window,
+ to give the host the opportunity to hide attached windows that may get in the way.
+
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterWillShowModalAlert:(SUUpdater *)updater;
+
+/*!
+ Called after an updater shows a modal alert window,
+ to give the host the opportunity to hide attached windows that may get in the way.
+
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterDidShowModalAlert:(SUUpdater *)updater;
+
+/*!
+ Called when an update is scheduled to be silently installed on quit.
+ This is after an update has been automatically downloaded in the background.
+ (i.e. SUUpdater::automaticallyDownloadsUpdates is YES)
+
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ \param invocation Can be used to trigger an immediate silent install and relaunch.
+ */
+- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationInvocation:(NSInvocation *)invocation;
+
+/*!
+ Calls after an update that was scheduled to be silently installed on quit has been canceled.
+
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that was proposed to be installed.
+ */
+- (void)updater:(SUUpdater *)updater didCancelInstallUpdateOnQuit:(SUAppcastItem *)item;
+
+/*!
+ Called after an update is aborted due to an error.
+
+ \param updater The SUUpdater instance.
+ \param error The error that caused the abort
+ */
+- (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h b/OSX/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h
index 6c65ea4..c654fc4 100755..100644
--- a/OSX/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h
+++ b/OSX/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h
@@ -9,21 +9,29 @@
#ifndef SUVERSIONCOMPARISONPROTOCOL_H
#define SUVERSIONCOMPARISONPROTOCOL_H
-#import <Cocoa/Cocoa.h>
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SUExport.h"
+
+NS_ASSUME_NONNULL_BEGIN
/*!
- @protocol
- @abstract Implement this protocol to provide version comparison facilities for Sparkle.
+ Provides version comparison facilities for Sparkle.
*/
@protocol SUVersionComparison
/*!
- @method
- @abstract An abstract method to compare two version strings.
- @discussion Should return NSOrderedAscending if b > a, NSOrderedDescending if b < a, and NSOrderedSame if they are equivalent.
+ An abstract method to compare two version strings.
+
+ Should return NSOrderedAscending if b > a, NSOrderedDescending if b < a,
+ and NSOrderedSame if they are equivalent.
*/
-- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB; // *** MAY BE CALLED ON NON-MAIN THREAD!
+- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB; // *** MAY BE CALLED ON NON-MAIN THREAD!
@end
+NS_ASSUME_NONNULL_END
#endif
diff --git a/OSX/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h b/OSX/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h
index 368b9c9..980efb3 100755..100644
--- a/OSX/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h
+++ b/OSX/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h
@@ -6,22 +6,24 @@
// Copyright 2009 Elgato Systems GmbH. All rights reserved.
//
-#import <Cocoa/Cocoa.h>
-
+#if __has_feature(modules)
+@import Foundation;
+#else
+#import <Foundation/Foundation.h>
+#endif
+#import "SUExport.h"
/*!
- @protocol
- @abstract Implement this protocol to apply special formatting to the two
- version numbers.
+ Applies special display formatting to version numbers.
*/
@protocol SUVersionDisplay
/*!
- @method
- @abstract An abstract method to format two version strings.
- @discussion You get both so you can display important distinguishing
- information, but leave out unnecessary/confusing parts.
+ Formats two version strings.
+
+ Both versions are provided so that important distinguishing information
+ can be displayed while also leaving out unnecessary/confusing parts.
*/
--(void) formatVersion: (NSString**)inOutVersionA andVersion: (NSString**)inOutVersionB;
+- (void)formatVersion:(NSString *_Nonnull*_Nonnull)inOutVersionA andVersion:(NSString *_Nonnull*_Nonnull)inOutVersionB;
@end
diff --git a/OSX/Sparkle.framework/Versions/A/Headers/Sparkle.h b/OSX/Sparkle.framework/Versions/A/Headers/Sparkle.h
index 08dd577..5ae2e6a 100755..100644
--- a/OSX/Sparkle.framework/Versions/A/Headers/Sparkle.h
+++ b/OSX/Sparkle.framework/Versions/A/Headers/Sparkle.h
@@ -12,10 +12,22 @@
// This list should include the shared headers. It doesn't matter if some of them aren't shared (unless
// there are name-space collisions) so we can list all of them to start with:
-#import <Sparkle/SUUpdater.h>
+#import "SUAppcast.h"
+#import "SUAppcastItem.h"
+#import "SUStandardVersionComparator.h"
+#import "SUUpdater.h"
+#import "SUUpdaterDelegate.h"
+#import "SUVersionComparisonProtocol.h"
+#import "SUVersionDisplayProtocol.h"
+#import "SUErrors.h"
-#import <Sparkle/SUAppcast.h>
-#import <Sparkle/SUAppcastItem.h>
-#import <Sparkle/SUVersionComparisonProtocol.h>
+#import "SPUDownloader.h"
+#import "SPUDownloaderDelegate.h"
+#import "SPUDownloaderDeprecated.h"
+#import "SPUDownloadData.h"
+#import "SPUDownloaderProtocol.h"
+#import "SPUDownloaderSession.h"
+#import "SPUURLRequest.h"
+#import "SUCodeSigningVerifier.h"
#endif
diff --git a/OSX/Sparkle.framework/Versions/A/Modules/module.modulemap b/OSX/Sparkle.framework/Versions/A/Modules/module.modulemap
new file mode 100644
index 0000000..af3fe6d
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Modules/module.modulemap
@@ -0,0 +1,6 @@
+framework module Sparkle {
+ umbrella header "Sparkle.h"
+
+ export *
+ module * { export * }
+}
diff --git a/OSX/Sparkle.framework/Versions/A/PrivateHeaders/SUUnarchiver.h b/OSX/Sparkle.framework/Versions/A/PrivateHeaders/SUUnarchiver.h
new file mode 100644
index 0000000..a52bf5a
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/PrivateHeaders/SUUnarchiver.h
@@ -0,0 +1,21 @@
+//
+// SUUnarchiver.h
+// Sparkle
+//
+// Created by Andy Matuschak on 3/16/06.
+// Copyright 2006 Andy Matuschak. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol SUUnarchiverProtocol;
+
+@interface SUUnarchiver : NSObject
+
++ (nullable id <SUUnarchiverProtocol>)unarchiverForPath:(NSString *)path updatingHostBundlePath:(nullable NSString *)hostPath decryptionPassword:(nullable NSString *)decryptionPassword;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist
new file mode 100644
index 0000000..2bda3e9
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>BuildMachineOSBuild</key>
+ <string>18C54</string>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>Autoupdate</string>
+ <key>CFBundleIconFile</key>
+ <string>AppIcon.icns</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.sparkle-project.Sparkle.Autoupdate</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.21.2 12-ga5b23cdbe</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleSupportedPlatforms</key>
+ <array>
+ <string>MacOSX</string>
+ </array>
+ <key>CFBundleVersion</key>
+ <string>1.21.2</string>
+ <key>DTCompiler</key>
+ <string>com.apple.compilers.llvm.clang.1_0</string>
+ <key>DTPlatformBuild</key>
+ <string>10B61</string>
+ <key>DTPlatformVersion</key>
+ <string>GM</string>
+ <key>DTSDKBuild</key>
+ <string>18B71</string>
+ <key>DTSDKName</key>
+ <string>macosx10.14</string>
+ <key>DTXcode</key>
+ <string>1010</string>
+ <key>DTXcodeBuild</key>
+ <string>10B61</string>
+ <key>LSBackgroundOnly</key>
+ <string>1</string>
+ <key>LSMinimumSystemVersion</key>
+ <string>10.7</string>
+ <key>LSUIElement</key>
+ <string>1</string>
+ <key>NSMainNibFile</key>
+ <string>MainMenu</string>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+</dict>
+</plist>
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate
new file mode 100755
index 0000000..ee27325
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop
new file mode 100755
index 0000000..561ff48
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/PkgInfo b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/PkgInfo
new file mode 100644
index 0000000..bd04210
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/PkgInfo
@@ -0,0 +1 @@
+APPL???? \ No newline at end of file
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/AppIcon.icns b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/AppIcon.icns
new file mode 100644
index 0000000..7f2a571
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/AppIcon.icns
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib
new file mode 100644
index 0000000..da18126
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.strings
new file mode 100644
index 0000000..4cd92c0
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ca.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ca.lproj/Sparkle.strings
new file mode 100644
index 0000000..cc238f6
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ca.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.strings
new file mode 100644
index 0000000..c93688a
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.strings
new file mode 100644
index 0000000..10e3c5a
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings
new file mode 100644
index 0000000..698dc67
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.strings
new file mode 100644
index 0000000..deed9ef
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/en.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/en.lproj/Sparkle.strings
new file mode 100644
index 0000000..8c38dc6
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/en.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.strings
new file mode 100644
index 0000000..4f2015f
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.strings
new file mode 100644
index 0000000..dab921c
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.strings
new file mode 100644
index 0000000..c7a5571
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.strings
new file mode 100644
index 0000000..fec4d0d
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hr.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hr.lproj/Sparkle.strings
new file mode 100644
index 0000000..2a727d3
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hr.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hu.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hu.lproj/Sparkle.strings
new file mode 100644
index 0000000..9cd6bff
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hu.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/is.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/is.lproj/Sparkle.strings
new file mode 100644
index 0000000..74ae728
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/is.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.strings
new file mode 100644
index 0000000..68b6d36
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.strings
new file mode 100644
index 0000000..f5e9c6d
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.strings
new file mode 100644
index 0000000..92c18ee
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.strings
new file mode 100644
index 0000000..ec2561b
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.strings
new file mode 100644
index 0000000..58be0e8
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.strings
new file mode 100644
index 0000000..2b9c461
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.strings
new file mode 100644
index 0000000..e55c6fd
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.strings
new file mode 100644
index 0000000..00df86f
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.strings
new file mode 100644
index 0000000..318baa9
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.strings
new file mode 100644
index 0000000..c33086d
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.strings
new file mode 100644
index 0000000..a7d2ebc
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.strings
new file mode 100644
index 0000000..1be2a80
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.strings
new file mode 100644
index 0000000..738c900
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.strings
new file mode 100644
index 0000000..eca2570
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.strings
new file mode 100644
index 0000000..4def140
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.strings
new file mode 100644
index 0000000..f7eb257
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.strings
new file mode 100644
index 0000000..214331c
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.strings
new file mode 100644
index 0000000..533e208
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/DarkAqua.css b/OSX/Sparkle.framework/Versions/A/Resources/DarkAqua.css
new file mode 100644
index 0000000..a41e0f2
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/DarkAqua.css
@@ -0,0 +1,9 @@
+html {
+ color: #FFFFFFD8;
+}
+:link {
+ color: #419CFF;
+}
+:link:active {
+ color: #FF1919;
+}
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/Info.plist b/OSX/Sparkle.framework/Versions/A/Resources/Info.plist
index 1e79abe..0d62b6c 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/Info.plist
+++ b/OSX/Sparkle.framework/Versions/A/Resources/Info.plist
@@ -3,13 +3,13 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
- <string>13A603</string>
+ <string>18C54</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>Sparkle</string>
<key>CFBundleIdentifier</key>
- <string>org.andymatuschak.Sparkle</string>
+ <string>org.sparkle-project.Sparkle</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
@@ -17,24 +17,28 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
- <string>1.5 Beta (git)</string>
+ <string>1.21.2 12-ga5b23cdbe</string>
<key>CFBundleSignature</key>
<string>????</string>
+ <key>CFBundleSupportedPlatforms</key>
+ <array>
+ <string>MacOSX</string>
+ </array>
<key>CFBundleVersion</key>
- <string>1.5</string>
+ <string>1.21.2</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
- <string>5A3005</string>
+ <string>10B61</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
- <string>13A595</string>
+ <string>18B71</string>
<key>DTSDKName</key>
- <string>macosx10.9</string>
+ <string>macosx10.14</string>
<key>DTXcode</key>
- <string>0502</string>
+ <string>1010</string>
<key>DTXcodeBuild</key>
- <string>5A3005</string>
+ <string>10B61</string>
</dict>
</plist>
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist b/OSX/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist
index 63644f0..1f75b24 100755..100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist
+++ b/OSX/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist
@@ -9,27 +9,91 @@
<key>iMac4,1</key>
<string>iMac (Core Duo)</string>
<key>iMac4,2</key>
- <string>iMac for Education (17-inch, Core Duo)</string>
+ <string>iMac for Education (17 inch, Core Duo)</string>
<key>iMac5,1</key>
<string>iMac (Core 2 Duo, 17 or 20 inch, SuperDrive)</string>
<key>iMac5,2</key>
<string>iMac (Core 2 Duo, 17 inch, Combo Drive)</string>
<key>iMac6,1</key>
<string>iMac (Core 2 Duo, 24 inch, SuperDrive)</string>
+ <key>iMac7,1</key>
+ <string>iMac Intel Core 2 Duo (aluminum enclosure)</string>
<key>iMac8,1</key>
- <string>iMac (April 2008)</string>
+ <string>iMac (Core 2 Duo, 20 or 24 inch, Early 2008 )</string>
+ <key>iMac9,1</key>
+ <string>iMac (Core 2 Duo, 20 or 24 inch, Early or Mid 2009 )</string>
+ <key>iMac10,1</key>
+ <string>iMac (Core 2 Duo, 21.5 or 27 inch, Late 2009 )</string>
+ <key>iMac11,1</key>
+ <string>iMac (Core i5 or i7, 27 inch Late 2009)</string>
+ <key>iMac11,2</key>
+ <string>21.5&quot; iMac (mid 2010)</string>
+ <key>iMac11,3</key>
+ <string>iMac (Core i5 or i7, 27 inch Mid 2010)</string>
+ <key>iMac12,1</key>
+ <string>iMac (Core i3 or i5 or i7, 21.5 inch Mid 2010 or Late 2011)</string>
+ <key>iMac12,2</key>
+ <string>iMac (Core i5 or i7, 27 inch Mid 2011)</string>
+ <key>iMac13,1</key>
+ <string>iMac (Core i3 or i5 or i7, 21.5 inch Late 2012 or Early 2013)</string>
+ <key>iMac13,2</key>
+ <string>iMac (Core i5 or i7, 27 inch Late 2012)</string>
+ <key>iMac14,1</key>
+ <string>iMac (Core i5, 21.5 inch Late 2013)</string>
+ <key>iMac14,2</key>
+ <string>iMac (Core i5 or i7, 27 inch Late 2013)</string>
+ <key>iMac14,3</key>
+ <string>iMac (Core i5 or i7, 21.5 inch Late 2013)</string>
+ <key>iMac14,4</key>
+ <string>iMac (Core i5, 21.5 inch Mid 2014)</string>
+ <key>iMac15,1</key>
+ <string>iMac (Retina 5K Core i5 or i7, 27 inch Late 2014 or Mid 2015)</string>
+ <key>iMac16,1</key>
+ <string>iMac (Core i5, 21,5 inch Late 2015)</string>
+ <key>iMac16,2</key>
+ <string>iMac (Retina 4K Core i5 or i7, 21.5 inch Late 2015)</string>
+ <key>iMac17,1</key>
+ <string>iMac (Retina 5K Core i5 or i7, 27 inch Late 2015)</string>
<key>MacBook1,1</key>
<string>MacBook (Core Duo)</string>
<key>MacBook2,1</key>
<string>MacBook (Core 2 Duo)</string>
<key>MacBook4,1</key>
<string>MacBook (Core 2 Duo Feb 2008)</string>
+ <key>MacBook5,1</key>
+ <string>MacBook (Core 2 Duo, Late 2008, Unibody)</string>
+ <key>MacBook5,2</key>
+ <string>MacBook (Core 2 Duo, Early 2009, White)</string>
+ <key>MacBook6,1</key>
+ <string>MacBook (Core 2 Duo, Late 2009, Unibody)</string>
+ <key>MacBook7,1</key>
+ <string>MacBook (Core 2 Duo, Mid 2010, White)</string>
+ <key>MacBook8,1</key>
+ <string>MacBook (Core M, 12 inch, Early 2015)</string>
<key>MacBookAir1,1</key>
- <string>MacBook Air (January 2008)</string>
+ <string>MacBook Air (Core 2 Duo, 13 inch, Early 2008)</string>
<key>MacBookAir2,1</key>
- <string>MacBook Air (June 2009)</string>
+ <string>MacBook Air (Core 2 Duo, 13 inch, Mid 2009)</string>
<key>MacBookAir3,1</key>
- <string>MacBook Air (October 2010)</string>
+ <string>MacBook Air (Core 2 Duo, 11 inch, Late 2010)</string>
+ <key>MacBookAir3,2</key>
+ <string>MacBook Air (Core 2 Duo, 13 inch, Late 2010)</string>
+ <key>MacBookAir4,1</key>
+ <string>MacBook Air (Core i5 or i7, 11 inch, Mid 2011)</string>
+ <key>MacBookAir4,2</key>
+ <string>MacBook Air (Core i5 or i7, 13 inch, Mid 2011)</string>
+ <key>MacBookAir5,1</key>
+ <string>MacBook Air (Core i5 or i7, 11 inch, Mid 2012)</string>
+ <key>MacBookAir5,2</key>
+ <string>MacBook Air (Core i5 or i7, 13 inch, Mid 2012)</string>
+ <key>MacBookAir6,1</key>
+ <string>MacBook Air (Core i5 or i7, 11 inch, Mid 2013 or Early 2014)</string>
+ <key>MacBookAir6,2</key>
+ <string>MacBook Air (Core i5 or i7, 13 inch, Mid 2013 or Early 2014)</string>
+ <key>MacBookAir7,1</key>
+ <string>MacBook Air (Core i5 or i7, 11 inch, Early 2015)</string>
+ <key>MacBookAir7,2</key>
+ <string>MacBook Air (Core i5 or i7, 13 inch, Early 2015)</string>
<key>MacBookPro1,1</key>
<string>MacBook Pro Core Duo (15-inch)</string>
<key>MacBookPro1,2</key>
@@ -44,8 +108,70 @@
<string>MacBook Pro Core 2 Duo (17-inch HD, Core 2 Duo)</string>
<key>MacBookPro4,1</key>
<string>MacBook Pro (Core 2 Duo Feb 2008)</string>
+ <key>MacBookPro5,1</key>
+ <string>MacBook Pro Intel Core 2 Duo (aluminum unibody)</string>
+ <key>MacBookPro5,2</key>
+ <string>MacBook Pro Intel Core 2 Duo (aluminum unibody)</string>
+ <key>MacBookPro5,3</key>
+ <string>MacBook Pro Intel Core 2 Duo (aluminum unibody)</string>
+ <key>MacBookPro5,4</key>
+ <string>MacBook Pro Intel Core 2 Duo (aluminum unibody)</string>
+ <key>MacBookPro5,5</key>
+ <string>MacBook Pro Intel Core 2 Duo (aluminum unibody)</string>
+ <key>MacBookPro6,1</key>
+ <string>MacBook Pro Intel Core i5, Intel Core i7 (mid 2010)</string>
+ <key>MacBookPro6,2</key>
+ <string>MacBook Pro Intel Core i5, Intel Core i7 (mid 2010)</string>
+ <key>MacBookPro7,1</key>
+ <string>MacBook Pro Intel Core 2 Duo (mid 2010)</string>
+ <key>MacBookPro8,1</key>
+ <string>MacBook Pro Intel Core i5, Intel Core i7, 13&quot; (early 2011)</string>
+ <key>MacBookPro8,2</key>
+ <string>MacBook Pro Intel Core i7, 15&quot; (early 2011)</string>
+ <key>MacBookPro8,3</key>
+ <string>MacBook Pro Intel Core i7, 17&quot; (early 2011)</string>
+ <key>MacBookPro9,1</key>
+ <string>MacBook Pro (15-inch, Mid 2012)</string>
+ <key>MacBookPro9,2</key>
+ <string>MacBook Pro (13-inch, Mid 2012)</string>
+ <key>MacBookPro10,1</key>
+ <string>MacBook Pro (Retina, Mid 2012)</string>
+ <key>MacBookPro10,2</key>
+ <string>MacBook Pro (Retina, 13-inch, Late 2012)</string>
+ <key>MacBookPro11,1</key>
+ <string>MacBook Pro (Retina, 13-inch, Late 2013)</string>
+ <key>MacBookPro11,2</key>
+ <string>MacBook Pro (Retina, 15-inch, Late 2013)</string>
+ <key>MacBookPro11,3</key>
+ <string>MacBook Pro (Retina, 15-inch, Late 2013)</string>
+ <key>MacbookPro11,4</key>
+ <string>MacBook Pro (Retina, 15-inch, Mid 2015)</string>
+ <key>MacbookPro11,5</key>
+ <string>MacBook Pro (Retina, 15-inch, Mid 2015)</string>
+ <key>MacbookPro12,1 </key>
+ <string>MacBook Pro (Retina, 13-inch, Early 2015)</string>
<key>Macmini1,1</key>
<string>Mac Mini (Core Solo/Duo)</string>
+ <key>Macmini2,1</key>
+ <string>Mac mini Intel Core</string>
+ <key>Macmini3,1</key>
+ <string>Mac mini Intel Core</string>
+ <key>Macmini4,1</key>
+ <string>Mac mini Intel Core (Mid 2010)</string>
+ <key>Macmini5,1</key>
+ <string>Mac mini (Core i5, Mid 2011)</string>
+ <key>Macmini5,2</key>
+ <string>Mac mini (Core i5 or Core i7, Mid 2011)</string>
+ <key>Macmini5,3</key>
+ <string>Mac mini (Core i7, Server, Mid 2011)</string>
+ <key>Macmini6,1</key>
+ <string>Mac mini (Core i5, Late 2012)</string>
+ <key>Macmini6,2</key>
+ <string>Mac mini (Core i7, Normal or Server, Late 2012)</string>
+ <key>Macmini7,1</key>
+ <string>Mac mini (Core i5 or Core i7, Late 2014)</string>
+ <key>MacPro1,1,Quad</key>
+ <string>Mac Pro</string>
<key>MacPro1,1</key>
<string>Mac Pro (four-core)</string>
<key>MacPro2,1</key>
@@ -55,7 +181,9 @@
<key>MacPro4,1</key>
<string>Mac Pro (March 2009)</string>
<key>MacPro5,1</key>
- <string>Mac Pro (August 2010)</string>
+ <string>Mac Pro (2010 or 2012)</string>
+ <key>MacPro6,1</key>
+ <string>Mac Pro (Late 2013)</string>
<key>PowerBook1,1</key>
<string>PowerBook G3</string>
<key>PowerBook2,1</key>
@@ -118,14 +246,6 @@
<string>Power Macintosh G3 (Blue &amp; White)</string>
<key>PowerMac1,2</key>
<string>Power Macintosh G4 (PCI Graphics)</string>
- <key>PowerMac10,1</key>
- <string>Mac Mini G4</string>
- <key>PowerMac10,2</key>
- <string>Mac Mini (Late 2005)</string>
- <key>PowerMac11,2</key>
- <string>Power Macintosh G5 (Late 2005)</string>
- <key>PowerMac12,1</key>
- <string>iMac G5 (iSight)</string>
<key>PowerMac2,1</key>
<string>iMac G3 (Slot-loading CD-ROM)</string>
<key>PowerMac2,2</key>
@@ -152,6 +272,8 @@
<string>iMac G4 (17-inch Flat Panel)</string>
<key>PowerMac5,1</key>
<string>Power Macintosh G4 Cube</string>
+ <key>PowerMac5,2</key>
+ <string>Power Mac G4 Cube</string>
<key>PowerMac6,1</key>
<string>iMac G4 (USB 2.0)</string>
<key>PowerMac6,3</key>
@@ -168,6 +290,14 @@
<string>iMac G5 (Ambient Light Sensor)</string>
<key>PowerMac9,1</key>
<string>Power Macintosh G5 (Late 2005)</string>
+ <key>PowerMac10,1</key>
+ <string>Mac Mini G4</string>
+ <key>PowerMac10,2</key>
+ <string>Mac Mini (Late 2005)</string>
+ <key>PowerMac11,2</key>
+ <string>Power Macintosh G5 (Late 2005)</string>
+ <key>PowerMac12,1</key>
+ <string>iMac G5 (iSight)</string>
<key>RackMac1,1</key>
<string>Xserve G4</string>
<key>RackMac1,2</key>
@@ -178,5 +308,7 @@
<string>Xserve (Intel Xeon)</string>
<key>Xserve2,1</key>
<string>Xserve (January 2008 quad-core)</string>
+ <key>Xserve3,1</key>
+ <string>Xserve (early 2009)</string>
</dict>
</plist>
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/SUStatus.nib b/OSX/Sparkle.framework/Versions/A/Resources/SUStatus.nib
index 356987e..da18126 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/SUStatus.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/SUStatus.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.nib
index 2d1b77b..29127f1 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.nib
index b8925e7..c619e69 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.nib
index 006d6aa..5773517 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.strings
index 858a71f..4cd92c0 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ca.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/ca.lproj/Sparkle.strings
new file mode 100644
index 0000000..cc238f6
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ca.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.nib
index 335264f..b3d57f6 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.nib
index fe70bf2..30a49ec 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.nib
index 9dcd944..f4c8532 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/Sparkle.strings
index 9bbb996..c93688a 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/cs.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.nib
index 211e718..ef46cca 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.nib
index 42395b2..778a468 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.nib
index 58af832..e435904 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.strings
index bcf691d..10e3c5a 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib
index 19970aa..7540fa1 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib
index 69fccfc..fed8b25 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib
index c59bf3c..6ecec45 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings
index 664946d..698dc67 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUAutomaticUpdateAlert.nib
new file mode 100644
index 0000000..6e803a7
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdateAlert.nib
new file mode 100644
index 0000000..8ca181c
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdatePermissionPrompt.nib
new file mode 100644
index 0000000..353156a
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/Sparkle.strings
new file mode 100644
index 0000000..deed9ef
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/el.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib
index 512c1c5..15f157f 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib
index e856f9d..29d60da 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib
index 4f0c0a3..72f172e 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings
index f9c15d8..8c38dc6 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib
index 8d657a7..9b3f723 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib
index d28a4f8..265bacc 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib
index f927ba6..009394d 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings
index 8e4ab94..4f2015f 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUAutomaticUpdateAlert.nib
new file mode 100644
index 0000000..a882db0
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdateAlert.nib
new file mode 100644
index 0000000..c7a3311
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdatePermissionPrompt.nib
new file mode 100644
index 0000000..60cd954
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/Sparkle.strings
new file mode 100644
index 0000000..dab921c
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/fi.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib
index 59b199b..5112924 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib
index a084b19..e24e3fd 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib
index 808db82..88598eb 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings
index 236f807..c7a5571 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/he.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/he.lproj/Sparkle.strings
new file mode 100644
index 0000000..fec4d0d
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/he.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUAutomaticUpdateAlert.nib
new file mode 100644
index 0000000..75761ac
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdateAlert.nib
new file mode 100644
index 0000000..867b7c0
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdatePermissionPrompt.nib
new file mode 100644
index 0000000..f1090d7
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/Sparkle.strings
new file mode 100644
index 0000000..2a727d3
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/hr.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUAutomaticUpdateAlert.nib
new file mode 100644
index 0000000..4d7e8a9
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdateAlert.nib
new file mode 100644
index 0000000..40571fd
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdatePermissionPrompt.nib
new file mode 100644
index 0000000..ff2e24f
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/Sparkle.strings
new file mode 100644
index 0000000..9cd6bff
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/hu.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.nib
index 89825fb..e27ca6d 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.nib
index 2172c0d..3e2d8ef 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.nib
index 9a4cca0..0dceed4 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/Sparkle.strings
index 665e273..74ae728 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/is.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib
index c3d7a42..c0522dc 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib
index 7cc884b..5013418 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib
index 285596b..cc82821 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings
index 4ccd7af..68b6d36 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.nib
index 61d2a29..27f5abf 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.nib
index ee41cad..86798fe 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.nib
index ebd5759..57fcc83 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.strings
index b21ea04..f5e9c6d 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.nib
index e7a8d46..977dc0a 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.nib
index 89f887e..d52bd5d 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.nib
index 5da11e0..7880aef 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/Sparkle.strings
new file mode 100644
index 0000000..92c18ee
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ko.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUAutomaticUpdateAlert.nib
new file mode 100644
index 0000000..fd5b851
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdateAlert.nib
new file mode 100644
index 0000000..6b05c1f
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdatePermissionPrompt.nib
new file mode 100644
index 0000000..b1474d1
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/Sparkle.strings
new file mode 100644
index 0000000..ec2561b
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/nb.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib
index 35a8de2..19e19ff 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib
index eec88ff..13a6ea6 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib
index ab2c86f..690b23a 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings
index 023c473..58be0e8 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.nib
index 0646f3f..3de644f 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.nib
index 1b4d495..b05aea7 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.nib
index 8ea95e8..fc42fa2 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/Sparkle.strings
index 9a0bc8b..2b9c461 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/pl.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.nib
index e8a824a..c43d996 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.nib
index 03500fa..bf5e54d 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nib
index dc92de6..0773eee 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings
index 7a11a9e..e55c6fd 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.nib
index c3603d5..f787d8c 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdateAlert.nib
index 2d371c4..a0ea252 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nib
index 7b6d719..8df1dbb 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.strings
index 497cd83..00df86f 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.nib
index d669654..b4068e8 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.nib
index 6a75e5e..998781b 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.nib
index 2e5802c..011aaf5 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.strings
index e90bdf5..318baa9 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib
index 8022f52..09fb088 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib
index 9466dc3..423b2ce 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib
index 3b26a5b..19e13ec 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings
index 7afef95..c33086d 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.nib
index 3afea8d..cf9cb70 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.nib
index 15e760d..0413025 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.nib
index e7d67a2..ea04cc1 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/Sparkle.strings
new file mode 100644
index 0000000..a7d2ebc
--- /dev/null
+++ b/OSX/Sparkle.framework/Versions/A/Resources/sk.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.nib
index 60cfe74..ac4ded9 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.nib
index c3bd698..fc1c757 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.nib
index 1ff5bc3..913fb3b 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.strings
index 7ec0bc2..1be2a80 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib
index 8df1ba0..5c5774c 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib
index 9ab3288..bff9b7f 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib
index 0337c2a..00410e3 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings
index 16c3fb8..738c900 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.nib
index e1377a4..9126de5 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.nib
index 239b8f7..867b481 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.nib
index 143ff91..25e48c8 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.strings
index 0468c97..eca2570 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.nib
index 263e74a..6526d27 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.nib
index ca40c57..4e7b748 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.nib
index 22a8f46..21bed5f 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.strings
index cabc211..4def140 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUAutomaticUpdateAlert.nib
index 83dbcbf..5d2dda5 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.nib
index 939e0cb..94c9dc7 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.nib
index 8e2bf73..ac62cbf 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.strings
index 6f0e4db..f7eb257 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.nib
index 65cc3d2..789fbdb 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.nib
index a453dfc..9ea3f4d 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nib
index 9f85d65..aec87f2 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.strings
index b741758..214331c 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.nib
index c4b9e9b..c5f6ea8 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.nib b/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.nib
index 6e98d7e..1b4b140 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nib b/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nib
index 935b007..1a642e8 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nib
+++ b/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nib
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.strings b/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.strings
index c1f7e85..533e208 100644
--- a/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.strings
+++ b/OSX/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.strings
Binary files differ
diff --git a/OSX/Sparkle.framework/Versions/A/Sparkle b/OSX/Sparkle.framework/Versions/A/Sparkle
index 64eefd0..dcba851 100755
--- a/OSX/Sparkle.framework/Versions/A/Sparkle
+++ b/OSX/Sparkle.framework/Versions/A/Sparkle
Binary files differ
diff --git a/OSX/Updater.h b/OSX/Updater.h
index 53abbe4..3b56830 100644
--- a/OSX/Updater.h
+++ b/OSX/Updater.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2013 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2013-2018 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@ -9,14 +9,17 @@
* implied warranty.
*/
-#ifndef USE_IPHONE
-#import <Cocoa/Cocoa.h>
-@interface XScreenSaverUpdater : NSObject <NSApplicationDelegate>
+#ifdef IN_UPDATER
+# import <Cocoa/Cocoa.h>
+# import <Sparkle/SUUpdaterDelegate.h>
+
+@interface XScreenSaverUpdater : NSObject <NSApplicationDelegate,
+ SUUpdaterDelegate>
{
NSTimer *timer;
}
@end
-#endif // !USE_IPHONE
+#endif // IN_UPDATER
#define UPDATER_DOMAIN "org.jwz.xscreensaver.updater"
diff --git a/OSX/Updater.m b/OSX/Updater.m
index 1bf29fa..6e0d3c9 100644
--- a/OSX/Updater.m
+++ b/OSX/Updater.m
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2013 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2013-2018 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@ -17,6 +17,7 @@
* version 4-Dec-2013 or later.
*/
+#define IN_UPDATER
#import "Updater.h"
#import "Sparkle/SUUpdater.h"
diff --git a/OSX/Updater.plist b/OSX/Updater.plist
index fd3b176..05befe8 100644
--- a/OSX/Updater.plist
+++ b/OSX/Updater.plist
@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>5.40</string>
+ <string>5.42</string>
<key>CFBundleIconFile</key>
<string>SaverRunner</string>
<key>CFBundleIdentifier</key>
@@ -17,23 +17,23 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>5.40</string>
+ <string>5.42</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>5.40</string>
+ <string>5.42</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>5.40</string>
+ <string>5.42</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>LSUIElement</key>
<true/>
<key>NSHumanReadableCopyright</key>
- <string>5.40</string>
+ <string>5.42</string>
<key>NSMainNibFile</key>
<string>Updater</string>
<key>NSPrincipalClass</key>
diff --git a/OSX/XScreenSaver.plist b/OSX/XScreenSaver.plist
index 3417295..4d106ad 100644
--- a/OSX/XScreenSaver.plist
+++ b/OSX/XScreenSaver.plist
@@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
- <string>5.40</string>
+ <string>5.42</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>5.40</string>
+ <string>5.42</string>
<key>LSMinimumSystemVersion</key>
<string>10.8</string>
<key>NSMainNibFile</key>
diff --git a/OSX/XScreenSaverConfigSheet.h b/OSX/XScreenSaverConfigSheet.h
index b2fd489..8e40dde 100644
--- a/OSX/XScreenSaverConfigSheet.h
+++ b/OSX/XScreenSaverConfigSheet.h
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2006-2013 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2006-2018 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@ -48,7 +48,7 @@
# endif
>
# else
- NSWindow <NSXMLParserDelegate>
+ NSPanel <NSXMLParserDelegate>
# endif
{
NSString *saver_name;
diff --git a/OSX/XScreenSaverView.m b/OSX/XScreenSaverView.m
index cb7d45b..371cf17 100644
--- a/OSX/XScreenSaverView.m
+++ b/OSX/XScreenSaverView.m
@@ -2059,10 +2059,10 @@ gl_check_ver (const struct gl_version *caps,
if (!initted_p || ![self isAnimating]) // no event handling unless running.
return NO;
- [self lockFocus];
+// [self lockFocus]; // As of 10.14 this causes flicker on mouse motion
[self prepareContext];
BOOL result = xsft->event_cb (xdpy, xwindow, xdata, e);
- [self unlockFocus];
+// [self unlockFocus];cp -Rf ${CONFIGURATION_BUILD_DIR}/BuildOutputPrefPane.prefPane ~/Library/PreferencePanes
return result;
}
diff --git a/OSX/bindist.rtf b/OSX/bindist.rtf
index 9d82431..251bb11 100644
--- a/OSX/bindist.rtf
+++ b/OSX/bindist.rtf
@@ -16,8 +16,8 @@
\b0 by Jamie Zawinski\
and many others\
\
-version 5.40\
-12-Aug-2018\
+version 5.42\
+28-Dec-2018\
\
{\field{\*\fldinst{HYPERLINK "https://www.jwz.org/xscreensaver/"}}{\fldrslt \cf2 \ul \ulc2 https://www.jwz.org/xscreensaver/}}\
\pard\pardeftab720
diff --git a/OSX/bindist2.webloc b/OSX/bindist2.webloc
index 0ebfa91..4b87f8c 100644
--- a/OSX/bindist2.webloc
+++ b/OSX/bindist2.webloc
@@ -3,6 +3,6 @@
<plist version="1.0">
<dict>
<key>URL</key>
- <string>https://www.jwz.org/xscreensaver/download.html</string>
+ <string>https://play.google.com/store/apps/details?id=org.jwz.android.xscreensaver</string>
</dict>
</plist>
diff --git a/OSX/fuzztest.sh b/OSX/fuzztest.sh
index 20d596a..870d12c 100755
--- a/OSX/fuzztest.sh
+++ b/OSX/fuzztest.sh
@@ -33,6 +33,8 @@ function menu() {
end tell
end tell
end tell"
+
+ open -a XEmacs # switch focus back to somewhere sane
}
menu 'Shake Gesture'
diff --git a/OSX/iSaverRunner.plist b/OSX/iSaverRunner.plist
index 4604e9d..92ca6f0 100644
--- a/OSX/iSaverRunner.plist
+++ b/OSX/iSaverRunner.plist
@@ -9,7 +9,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>5.40</string>
+ <string>5.42</string>
<key>CFBundleIcons</key>
<dict/>
<key>CFBundleIcons~ipad</key>
@@ -19,21 +19,21 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
- <string>5.40</string>
+ <string>5.42</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>5.40</string>
+ <string>5.42</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>5.40</string>
+ <string>5.42</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSHumanReadableCopyright</key>
- <string>5.40</string>
+ <string>5.42</string>
<key>NSMainNibFile</key>
<string>iSaverRunner</string>
<key>UIAppFonts</key>
diff --git a/OSX/ios-function-table.m b/OSX/ios-function-table.m
index fcb2808..c2e5b88 100644
--- a/OSX/ios-function-table.m
+++ b/OSX/ios-function-table.m
@@ -1,5 +1,5 @@
/* Generated file, do not edit.
- Created: Sat Aug 4 21:35:23 2018 by build-fntable.pl 1.6.
+ Created: Tue Oct 23 19:02:07 2018 by build-fntable.pl 1.6.
*/
#import <Foundation/Foundation.h>
@@ -107,6 +107,7 @@ extern struct xscreensaver_function_table
greynetic_xscreensaver_function_table,
halftone_xscreensaver_function_table,
halo_xscreensaver_function_table,
+ handsy_xscreensaver_function_table,
helix_xscreensaver_function_table,
hexadrop_xscreensaver_function_table,
hexstrut_xscreensaver_function_table,
@@ -346,6 +347,7 @@ NSDictionary *make_function_table_dict(void)
[NSValue valueWithPointer:&greynetic_xscreensaver_function_table], @"greynetic",
[NSValue valueWithPointer:&halftone_xscreensaver_function_table], @"halftone",
[NSValue valueWithPointer:&halo_xscreensaver_function_table], @"halo",
+ [NSValue valueWithPointer:&handsy_xscreensaver_function_table], @"handsy",
[NSValue valueWithPointer:&helix_xscreensaver_function_table], @"helix",
[NSValue valueWithPointer:&hexadrop_xscreensaver_function_table], @"hexadrop",
[NSValue valueWithPointer:&hexstrut_xscreensaver_function_table], @"hexstrut",
diff --git a/OSX/seticon.pl b/OSX/seticon.pl
index fb5dc71..a4f8c2c 100755
--- a/OSX/seticon.pl
+++ b/OSX/seticon.pl
@@ -18,7 +18,7 @@ use strict;
use File::Temp;
my $progname = $0; $progname =~ s@.*/@@g;
-my ($version) = ('$Revision: 1.6 $' =~ m/\s(\d[.\d]+)\s/s);
+my ($version) = ('$Revision: 1.7 $' =~ m/\s(\d[.\d]+)\s/s);
my $verbose = 0;
@@ -52,6 +52,11 @@ sub set_icon ($$) {
close $rez_fh;
my @cmd = ('Rez',
+
+ '-isysroot',
+ '/Applications/Xcode.app/Contents/Developer/Platforms' .
+ '/MacOSX.platform/Developer/SDKs/MacOSX.sdk',
+
'CoreServices.r',
$rez_filename,
'-o', $target_res);
diff --git a/OSX/sparkle-bin/BinaryDelta b/OSX/sparkle-bin/BinaryDelta
new file mode 100755
index 0000000..de7acd7
--- /dev/null
+++ b/OSX/sparkle-bin/BinaryDelta
Binary files differ
diff --git a/OSX/sparkle-bin/BinaryDelta.dSYM/Contents/Info.plist b/OSX/sparkle-bin/BinaryDelta.dSYM/Contents/Info.plist
new file mode 100644
index 0000000..325809b
--- /dev/null
+++ b/OSX/sparkle-bin/BinaryDelta.dSYM/Contents/Info.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.apple.xcode.dsym.BinaryDelta</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundlePackageType</key>
+ <string>dSYM</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleVersion</key>
+ <string>1</string>
+ </dict>
+</plist>
diff --git a/OSX/sparkle-bin/BinaryDelta.dSYM/Contents/Resources/DWARF/BinaryDelta b/OSX/sparkle-bin/BinaryDelta.dSYM/Contents/Resources/DWARF/BinaryDelta
new file mode 100644
index 0000000..302129c
--- /dev/null
+++ b/OSX/sparkle-bin/BinaryDelta.dSYM/Contents/Resources/DWARF/BinaryDelta
Binary files differ
diff --git a/OSX/sparkle-bin/generate_appcast b/OSX/sparkle-bin/generate_appcast
new file mode 100755
index 0000000..cffaded
--- /dev/null
+++ b/OSX/sparkle-bin/generate_appcast
Binary files differ
diff --git a/OSX/sparkle-bin/generate_appcast.dSYM/Contents/Info.plist b/OSX/sparkle-bin/generate_appcast.dSYM/Contents/Info.plist
new file mode 100644
index 0000000..85e4783
--- /dev/null
+++ b/OSX/sparkle-bin/generate_appcast.dSYM/Contents/Info.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.apple.xcode.dsym.generate_appcast</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundlePackageType</key>
+ <string>dSYM</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleVersion</key>
+ <string>1</string>
+ </dict>
+</plist>
diff --git a/OSX/sparkle-bin/generate_appcast.dSYM/Contents/Resources/DWARF/generate_appcast b/OSX/sparkle-bin/generate_appcast.dSYM/Contents/Resources/DWARF/generate_appcast
new file mode 100644
index 0000000..da66605
--- /dev/null
+++ b/OSX/sparkle-bin/generate_appcast.dSYM/Contents/Resources/DWARF/generate_appcast
Binary files differ
diff --git a/OSX/sparkle-bin/generate_keys b/OSX/sparkle-bin/generate_keys
new file mode 100755
index 0000000..9b4bf11
--- /dev/null
+++ b/OSX/sparkle-bin/generate_keys
Binary files differ
diff --git a/OSX/sparkle-bin/generate_keys.dSYM/Contents/Info.plist b/OSX/sparkle-bin/generate_keys.dSYM/Contents/Info.plist
new file mode 100644
index 0000000..3caf890
--- /dev/null
+++ b/OSX/sparkle-bin/generate_keys.dSYM/Contents/Info.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.apple.xcode.dsym.generate_keys</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundlePackageType</key>
+ <string>dSYM</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleVersion</key>
+ <string>1</string>
+ </dict>
+</plist>
diff --git a/OSX/sparkle-bin/generate_keys.dSYM/Contents/Resources/DWARF/generate_keys b/OSX/sparkle-bin/generate_keys.dSYM/Contents/Resources/DWARF/generate_keys
new file mode 100644
index 0000000..ff7be52
--- /dev/null
+++ b/OSX/sparkle-bin/generate_keys.dSYM/Contents/Resources/DWARF/generate_keys
Binary files differ
diff --git a/OSX/sparkle-bin/old_dsa_scripts/generate_dsa_keys_macos_10.12_only b/OSX/sparkle-bin/old_dsa_scripts/generate_dsa_keys_macos_10.12_only
new file mode 100755
index 0000000..56f195f
--- /dev/null
+++ b/OSX/sparkle-bin/old_dsa_scripts/generate_dsa_keys_macos_10.12_only
@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e
+for file in "dsaparam.pem" "dsa_priv.pem" "dsa_pub.pem"; do
+ if [ -e "$file" ]; then
+ echo "There's already a $file here! Move it aside or be more careful!"
+ exit 1
+ fi
+done
+
+openssl="/usr/bin/openssl"
+$openssl gendsa <($openssl dsaparam 2047) -out dsa_priv.pem
+chmod 0400 dsa_priv.pem
+$openssl dsa -in dsa_priv.pem -pubout -out dsa_pub.pem
+
+echo "
+Generated two files:
+dsa_priv.pem: your private key. Keep it secret and don't share it!
+dsa_pub.pem: public counterpart to include in the app bundle.
+
+BACK UP YOUR PRIVATE KEY AND KEEP IT SAFE!
+If you lose it, your users will be unable to upgrade!
+"
+
+open -R dsa_priv.pem
diff --git a/OSX/sparkle-bin/old_dsa_scripts/sign_update b/OSX/sparkle-bin/old_dsa_scripts/sign_update
new file mode 100755
index 0000000..fddaae8
--- /dev/null
+++ b/OSX/sparkle-bin/old_dsa_scripts/sign_update
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+set -o pipefail
+if [ "$#" -ne 2 ]; then
+ echo "Usage: $0 update_archive_file dsa_priv.pem"
+ echo "This is an old DSA signing script for deprecated DSA keys."
+ echo "Do not use this for new applications."
+ exit 1
+fi
+openssl=/usr/bin/openssl
+version=`$openssl version`
+if [[ $version =~ "OpenSSL 0.9" ]]; then
+ # pre-10.13 system: Fall back to OpenSSL DSS1 digest because it does not like the -sha1 option
+ $openssl dgst -sha1 -binary < "$1" | $openssl dgst -dss1 -sign "$2" | $openssl enc -base64
+else
+ # 10.13 and later: Use LibreSSL SHA1 digest
+ $openssl dgst -sha1 -binary < "$1" | $openssl dgst -sha1 -sign "$2" | $openssl enc -base64
+fi
diff --git a/OSX/sparkle-bin/sign_update b/OSX/sparkle-bin/sign_update
new file mode 100755
index 0000000..b97e4bd
--- /dev/null
+++ b/OSX/sparkle-bin/sign_update
Binary files differ
diff --git a/OSX/sparkle-bin/sign_update.dSYM/Contents/Info.plist b/OSX/sparkle-bin/sign_update.dSYM/Contents/Info.plist
new file mode 100644
index 0000000..0739389
--- /dev/null
+++ b/OSX/sparkle-bin/sign_update.dSYM/Contents/Info.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.apple.xcode.dsym.sign_update</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundlePackageType</key>
+ <string>dSYM</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleVersion</key>
+ <string>1</string>
+ </dict>
+</plist>
diff --git a/OSX/sparkle-bin/sign_update.dSYM/Contents/Resources/DWARF/sign_update b/OSX/sparkle-bin/sign_update.dSYM/Contents/Resources/DWARF/sign_update
new file mode 100644
index 0000000..67f19b4
--- /dev/null
+++ b/OSX/sparkle-bin/sign_update.dSYM/Contents/Resources/DWARF/sign_update
Binary files differ
diff --git a/OSX/updates.pl b/OSX/updates.pl
index 5938a4a..9249154 100755
--- a/OSX/updates.pl
+++ b/OSX/updates.pl
@@ -1,5 +1,5 @@
#!/usr/bin/perl -w
-# Copyright © 2013 Jamie Zawinski <jwz@jwz.org>
+# Copyright © 2013-2018 Jamie Zawinski <jwz@jwz.org>
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
@@ -21,14 +21,15 @@ use open ":encoding(utf8)";
use POSIX;
my $progname = $0; $progname =~ s@.*/@@g;
-my ($version) = ('$Revision: 1.2 $' =~ m/\s(\d[.\d]+)\s/s);
+my ($version) = ('$Revision: 1.5 $' =~ m/\s(\d[.\d]+)\s/s);
my $verbose = 0;
my $debug_p = 0;
my $base_url = "https://www.jwz.org/";
-my $priv_key_file = "$ENV{HOME}/.ssh/sparkle_dsa_priv.pem";
-my $sign_update = "./sign_update.rb";
+my $dsa_priv_key_file = "$ENV{HOME}/.ssh/sparkle_dsa_priv.pem";
+my $dsa_sign_update = "sparkle-bin/old_dsa_scripts/sign_update";
+my $edddsa_sign_update = "sparkle-bin/sign_update";
sub generate_xml($$$$) {
@@ -37,21 +38,26 @@ sub generate_xml($$$$) {
my $outfile = "updates.xml";
my $obody = '';
- my %sigs;
+ my %sig1s;
+ my %sig2s;
my %dates;
if (open (my $in, '<', $outfile)) {
print STDERR "$progname: reading $outfile\n" if $verbose;
local $/ = undef; # read entire file
$obody = <$in>;
close $in;
- foreach my $item (split (/<item/i, $obody)) {
+ my @i = split (/<item/i, $obody);
+ shift @i;
+ foreach my $item (@i) {
my ($v) = ($item =~ m/version="(.*?)"/si);
- my ($sig) = ($item =~ m/dsaSignature="(.*?)"/si);
+ my ($sig1) = ($item =~ m/dsaSignature="(.*?)"/si);
+ my ($sig2) = ($item =~ m/edSignature="(.*?)"/si);
my ($date) = ($item =~ m/<pubDate>(.*?)</si);
next unless $v;
- $sigs{$v} = $sig if $sig;
+ $sig1s{$v} = $sig1 if $sig1;
+ $sig2s{$v} = $sig2 if $sig2;
$dates{$v} = $date if $date;
- print STDERR "$progname: $v: " . ($date || '?') . "\n"
+ print STDERR "$progname: existing: $v: " . ($date || '?') . "\n"
if ($verbose > 1);
}
}
@@ -82,7 +88,8 @@ sub generate_xml($$$$) {
my $v2 = $v1; $v2 =~ s/\.//gs;
my $zip = undef;
DONE:
- foreach my $ext ('zip', 'dmg', 'tar.gz', 'tar.Z') {
+ #foreach my $ext ('zip', 'dmg', 'tar.gz', 'tar.Z') {
+ foreach my $ext ('dmg') {
foreach my $v ($v1, $v2) {
foreach my $name ($app_name, "x" . lc($app_name)) {
my $f = "$name-$v.$ext";
@@ -97,36 +104,51 @@ sub generate_xml($$$$) {
my $publishedp = ($zip && -f "$www_dir/$zip");
$publishedp = 1 if ($count == 0);
- my $url = ("${base_url}$app_name/" . ($publishedp ? $zip : ""));
+ my $url = ("${base_url}$app_name/" . ($publishedp && $zip ? $zip : ""));
$url =~ s@DaliClock/@xdaliclock/@gs if $url; # Kludge
my @st = stat("$archive_dir/$zip") if $zip;
my $size = $st[7];
my $date = $st[9];
- $date = ($zip ?
+ $date = ($date ?
strftime ("%a, %d %b %Y %T %z", localtime($date))
: "");
my $odate = $dates{$v1};
- my $sig = $sigs{$v1};
+ my $sig1 = $sig1s{$v1};
+ my $sig2 = $sig2s{$v1};
# Re-generate the sig if the file date changed.
- $sig = undef if ($odate && $odate ne $date);
+ $sig1 = undef if ($odate && $odate ne $date);
+ $sig2 = undef if ($odate && $odate ne $date);
- print STDERR "$progname: $v1: $date " . ($sig ? "Y" : "N") . "\n"
+ print STDERR "$progname: $v1: $date " .
+ ($sig1 ? "Y" : "N") . ($sig2 ? "Y" : "N") . "\n"
if ($verbose > 1);
- if (!$sig && $zip) {
+ if (!$sig1 && $zip) { # Old-style sigs
local %ENV = %ENV;
$ENV{PATH} = "/usr/bin:$ENV{PATH}";
- $sig = `$sign_update "$archive_dir/$zip" "$priv_key_file"`;
- $sig =~ s/\s+//gs;
+ $sig1 = `$dsa_sign_update "$archive_dir/$zip" "$dsa_priv_key_file"`;
+ $sig1 =~ s/\s+//gs;
}
+ if (!$sig2 && $zip) { # New-style sigs
+ local %ENV = %ENV;
+ $ENV{PATH} = "/usr/bin:$ENV{PATH}";
+ my $xml = `$edddsa_sign_update "$archive_dir/$zip"`;
+ ($sig2) = ($xml =~ m/sparkle:edSignature=\"([^\"<>\s]+)\"/si);
+ error ("unparsable: $edddsa_sign_update: $xml") unless $sig2;
+ }
+
+ $sig1 = 'ERROR' unless defined($sig1);
+ $sig2 = 'ERROR' unless defined($sig2);
+ $size = -1 unless defined($size);
my $enc = ($publishedp
? ("<enclosure url=\"$url\"\n" .
" sparkle:version=\"$v1\"\n" .
- " sparkle:dsaSignature=\"$sig\"\n" .
+ " sparkle:dsaSignature=\"$sig1\"\n" .
+ " sparkle:edSignature=\"$sig2\"\n" .
" length=\"$size\"\n" .
" type=\"application/octet-stream\" />\n")
: "<sparkle:version>$v1</sparkle:version>\n");
@@ -196,6 +218,8 @@ sub usage() {
}
sub main() {
+ binmode (STDOUT, ':utf8');
+ binmode (STDERR, ':utf8');
my ($app_name, $changelog, $archive_dir, $www_dir);
while ($#ARGV >= 0) {
$_ = shift @ARGV;
diff --git a/OSX/updates.xml b/OSX/updates.xml
index a4733a6..e782f72 100644
--- a/OSX/updates.xml
+++ b/OSX/updates.xml
@@ -8,36 +8,39 @@
<description>Updates to xscreensaver.</description>
<language>en</language>
<item>
- <title>Version 5.39</title>
- <link>https://www.jwz.org/xscreensaver/xscreensaver-5.39.dmg</link>
- <description><![CDATA[&bull; New hacks, 'razzledazzle', 'peepers', 'crumbler' and `maze3d'. <BR>&bull; More heuristics for using RSS feeds as image sources. <BR>&bull; Android: Image loading works. <BR>&bull; Built-in image assets are now PNG instead of XPM or XBM. <BR>&bull; X11: Better font-loading fallback heuristics on systems with a terrible selection of installed fonts. <BR>&bull; macOS: Retina display-related bug fixes.]]></description>
- <pubDate>Thu, 12 Apr 2018 13:00:37 -0700</pubDate>
- <enclosure url="https://www.jwz.org/xscreensaver/xscreensaver-5.39.dmg"
- sparkle:version="5.39"
- sparkle:dsaSignature="MC0CFCNqDWYNT+EDQXEpi0SAxySC77A+AhUArqhfa7sp5J8cXq42u5uFmBOQiFA="
- length="32888133"
+ <title>Version 5.42</title>
+ <link>https://www.jwz.org/xscreensaver/xscreensaver-5.42.dmg</link>
+ <description><![CDATA[&bull; macOS: Fixed Sparkle auto-updater.]]></description>
+ <pubDate>Fri, 28 Dec 2018 16:20:28 -0800</pubDate>
+ <enclosure url="https://www.jwz.org/xscreensaver/xscreensaver-5.42.dmg"
+ sparkle:version="5.42"
+ sparkle:dsaSignature="MC0CFQC1IPDQbZA8nlNOy66NB/EpedRH6QIUSezxMtsmla56Axi6QpMzIKYaFAI="
+ sparkle:edSignature="TlJojJAVzOQvQ5rUkHPvTpKtePMGKErePVI8nRvTnZjgaLR5YvxAiZAykdYeA1fip81jwzMXnOA14DxfumscAQ=="
+ length="36576409"
type="application/octet-stream" />
</item>
<item>
- <title>Version 5.38</title>
- <link>https://www.jwz.org/xscreensaver/xscreensaver-5.38.dmg</link>
- <description><![CDATA[&bull; New hack, 'esper'. <BR>&bull; macOS: Support for Retina displays. <BR>&bull; X11: `webcollage' now works with ImageMagick instead of with pbmtools if `webcollage-helper' is not installed. <BR>&bull; 'bsod' now accepts Dunning-Krugerrands. <BR>&bull; Android: These hacks work now: 'anemone', 'anemotaxis', 'atlantis', 'bouboule', 'celtic', 'compass', 'crackberg', 'epicycle', 'fuzzyflakes', 'goop', 'kumppa' 'munch', 'pacman', 'polyominoes', 'slip'. <BR>&bull; Android: Thick lines work better for: 'anemone', 'anemotaxis', 'celtic', 'compass', 'deluxe', 'epicycle', 'fuzzyflakes', 'pacman' <BR>&bull; Android: Assorted performance improvements, especially for 'kumppa' and 'slip'. <BR>&bull; Android TV: Daydreams work. <BR>&bull; iOS: Tweaks for iPhone X. <BR>&bull; Lots of xlockmore-derived hacks now have animated erase routines. <BR>&bull; 'crystal' works properly on non-X11 systems. <BR>&bull; 'm6502' now includes 'texture.asm'. <BR>&bull; X11: Try harder to find sensible fonts for the password dialog.]]></description>
- <pubDate>Wed, 20 Dec 2017 11:16:13 -0800</pubDate>
- <enclosure url="https://www.jwz.org/xscreensaver/xscreensaver-5.38.dmg"
- sparkle:version="5.38"
- sparkle:dsaSignature="MCwCFB2O5ykEfT4xCkb/CraguQZPTFJHAhQZde4jxrb5+zc2Haazg10uYLqNRw=="
- length="54125574"
+ <title>Version 5.41</title>
+ <link>https://www.jwz.org/xscreensaver/xscreensaver-5.41.dmg</link>
+ <description><![CDATA[&bull; X11: Those new font-loading fallback heuristics work again. Oops. <BR>&bull; iOS, Android: Plugged many memory leaks at exit. <BR>&bull; New hack, `handsy'. <BR>&bull; Fixed `noof' from displaying minimalistically. <BR>&bull; Rewrote `unknownpleasures' to be faster, and a true waterfall graph. <BR>&bull; BSOD Solaris improved. DVD added. <BR>&bull; Linux: If the xscreensaver daemon is setuid, then we can implore the kernel's out-of-memory killer to pretty please not unlock the screen. <BR>&bull; macOS: Upgraded Sparkle (the "Check for Updates" library). <BR>&bull; macOS: Screen saver settings work again on 10.14.]]></description>
+ <pubDate>Wed, 26 Dec 2018 23:00:51 -0800</pubDate>
+ <enclosure url="https://www.jwz.org/xscreensaver/xscreensaver-5.41.dmg"
+ sparkle:version="5.41"
+ sparkle:dsaSignature="MC0CFEH7e4ONZ1wfijWGBMEHwLESwKS3AhUAuhLIv/AsPsE60Jcmgm0eJDU0BRA="
+ sparkle:edSignature="2hXB1NVm+HZsj3aMCgOmdwX1zHT+dJ95v5aI2Cyn6vEReOUs+NSxqpoWEWQgH/AIMYhr9I3b4c5e/MceOdK7Bg=="
+ length="35542175"
type="application/octet-stream" />
</item>
<item>
- <title>Version 5.37</title>
- <link>https://www.jwz.org/xscreensaver/xscreensaver-5.37.dmg</link>
- <description><![CDATA[&bull; New hack, `vigilance'. <BR>&bull; Added Mac Software Update and VMware to `bsod'. <BR>&bull; macOS: Grabbing the desktop works again. <BR>&bull; macOS: Pinch to zoom. <BR>&bull; Android: Both Daydreams and Live Wallpapers are implemented. <BR>&bull; Updated `webcollage' for recent changes. <BR>&bull; Various bug fixes.]]></description>
- <pubDate>Wed, 05 Jul 2017 10:55:51 -0700</pubDate>
- <enclosure url="https://www.jwz.org/xscreensaver/xscreensaver-5.37.dmg"
- sparkle:version="5.37"
- sparkle:dsaSignature="MCwCFFsEWCDZbAY8Owz7k4lcs+uGM+LUAhQlLSsjg0Eqkd2TX2UfxiFdPrciTA=="
- length="52481386"
+ <title>Version 5.40</title>
+ <link>https://www.jwz.org/xscreensaver/xscreensaver-5.40.dmg</link>
+ <description><![CDATA[&bull; New hacks, `filmleader', `vfeedback'. <BR>&bull; New hack, `glitchpeg' (X11 and macOS only). <BR>&bull; GLPlanet blends between day and night maps at the dusk terminator. <BR>&bull; DymaxionMap can display arbitrary map images, and animate sunlight across the flattened globe. <BR>&bull; Tessellimage can draw either Delaunay or Voronoi tilings. <BR>&bull; XAnalogTV includes test cards. <BR>&bull; Android: These hacks work now: `blitspin', `bumps', `cityflow', `endgame', `esper', `flipscreen3d', `gleidescope', `glslideshow', `jigglypuff', `queens', `tessellimage', `xanalogtv', `xmatrix', `zoom'.]]></description>
+ <pubDate>Sun, 12 Aug 2018 16:39:18 -0700</pubDate>
+ <enclosure url="https://www.jwz.org/xscreensaver/xscreensaver-5.40.dmg"
+ sparkle:version="5.40"
+ sparkle:dsaSignature="MCwCFBVb+Vyo39OOfiuqm9K3zmrahnGIAhRK6pirSDvI1gT0ddtv+okGTW4NLg=="
+ sparkle:edSignature="R3FTLn+BURQDTK8BORtPeUrLrb2BLyhP2TeEU11Y9oXl2epIJ2owMS2BvsQke+gV/nEyzq34sUnBHnCsKvfgDg=="
+ length="34297646"
type="application/octet-stream" />
</item>
<item>
@@ -48,6 +51,7 @@
<enclosure url="https://www.jwz.org/xscreensaver/xscreensaver-5.34.dmg"
sparkle:version="5.34"
sparkle:dsaSignature="MCwCFAoZpMknlOVF0zFXlzFruzFvRXufAhQVKY0qlzelKcArrlC6k7EbHLTcyg=="
+ sparkle:edSignature="yUaWHZ0W91rhh0jsFUgtdcH17SPq66A4SdLMRqf/AU7cnVwNNBvlEJOKAJGJIMTVPpBMtYgk93YJL3/5R4+1BA=="
length="58850776"
type="application/octet-stream" />
</item>
@@ -59,6 +63,7 @@
<enclosure url="https://www.jwz.org/xscreensaver/xscreensaver-5.14.dmg"
sparkle:version="5.14"
sparkle:dsaSignature="MCwCFHrKuttf1gN27mVG3YL8+ueMJmNaAhR6aSkKQefuNFNp6MinLq2o1nocaA=="
+ sparkle:edSignature="yAg5vrtkqVdOXnloYeZ/XlwNK6VA3yWdKIOvMbpFEEGUfmsRm5/besIJBMjQkZg5BxXG8DTVh9NMHWrzZ9KvCg=="
length="54485615"
type="application/octet-stream" />
</item>
diff --git a/OSX/xscreensaver.xcodeproj/project.pbxproj b/OSX/xscreensaver.xcodeproj/project.pbxproj
index f5e98b8..adb9fd1 100644
--- a/OSX/xscreensaver.xcodeproj/project.pbxproj
+++ b/OSX/xscreensaver.xcodeproj/project.pbxproj
@@ -239,6 +239,7 @@
AF777A1D09B660B300EA3033 /* PBXTargetDependency */,
AF777A1B09B660B300EA3033 /* PBXTargetDependency */,
AF777A1909B660B300EA3033 /* PBXTargetDependency */,
+ AF62D6392180087500C57C42 /* PBXTargetDependency */,
AF1B0FC51D7AB5740011DBE4 /* PBXTargetDependency */,
AF4F10F0143450C300E34F3F /* PBXTargetDependency */,
AFC0E8C91CDC6125008CAFAC /* PBXTargetDependency */,
@@ -400,7 +401,7 @@
AF1ADA141850132600932759 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
AF1ADA161850157400932759 /* Updater.xib in Resources */ = {isa = PBXBuildFile; fileRef = AF1ADA151850157400932759 /* Updater.xib */; };
AF1ADA181850180E00932759 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF1ADA171850180E00932759 /* Sparkle.framework */; };
- AF1ADA1A1850186B00932759 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AF1ADA171850180E00932759 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+ AF1ADA1A1850186B00932759 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = AF1ADA171850180E00932759 /* Sparkle.framework */; };
AF1ADA1B18501B3D00932759 /* SaverRunner.icns in Resources */ = {isa = PBXBuildFile; fileRef = AF2D522513E954A0002AA818 /* SaverRunner.icns */; };
AF1ADA1F18504A4F00932759 /* ScreenSaver.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF976ED30989BF59001F8B92 /* ScreenSaver.framework */; };
AF1B0FAE1D7AB4740011DBE4 /* XScreenSaverSubclass.m in Sources */ = {isa = PBXBuildFile; fileRef = AF9CC7A0099580E70075E99B /* XScreenSaverSubclass.m */; };
@@ -1849,6 +1850,20 @@
AF6048FB157C07C600CA21E4 /* jwzgles.c in Sources */ = {isa = PBXBuildFile; fileRef = AF6048F8157C07C600CA21E4 /* jwzgles.c */; };
AF6048FC157C07C600CA21E4 /* jwzgles.h in Headers */ = {isa = PBXBuildFile; fileRef = AF6048F9157C07C600CA21E4 /* jwzgles.h */; };
AF6048FD157C07C600CA21E4 /* jwzglesI.h in Headers */ = {isa = PBXBuildFile; fileRef = AF6048FA157C07C600CA21E4 /* jwzglesI.h */; };
+ AF62D61F2180070600C57C42 /* XScreenSaverSubclass.m in Sources */ = {isa = PBXBuildFile; fileRef = AF9CC7A0099580E70075E99B /* XScreenSaverSubclass.m */; };
+ AF62D6212180070600C57C42 /* libjwxyz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AF4808C1098C3B6C00FB32B8 /* libjwxyz.a */; };
+ AF62D6222180070600C57C42 /* ScreenSaver.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF976ED30989BF59001F8B92 /* ScreenSaver.framework */; };
+ AF62D6232180070600C57C42 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF2C31E515C0F7FE007A6896 /* QuartzCore.framework */; };
+ AF62D6242180070600C57C42 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
+ AF62D6252180070600C57C42 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF48112B0990A2C700FB32B8 /* Carbon.framework */; };
+ AF62D6262180070600C57C42 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEE0BC611A6B0D6200C098BF /* OpenGL.framework */; };
+ AF62D6272180070600C57C42 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AF78369617DB9F25003B9FC0 /* libz.dylib */; };
+ AF62D6312180082100C57C42 /* handsy_model.c in Sources */ = {isa = PBXBuildFile; fileRef = AF62D62F2180082100C57C42 /* handsy_model.c */; };
+ AF62D6322180082100C57C42 /* handsy_model.c in Sources */ = {isa = PBXBuildFile; fileRef = AF62D62F2180082100C57C42 /* handsy_model.c */; settings = {COMPILER_FLAGS = "-DUSE_GL"; }; };
+ AF62D6332180082100C57C42 /* handsy.c in Sources */ = {isa = PBXBuildFile; fileRef = AF62D6302180082100C57C42 /* handsy.c */; };
+ AF62D6342180082100C57C42 /* handsy.c in Sources */ = {isa = PBXBuildFile; fileRef = AF62D6302180082100C57C42 /* handsy.c */; settings = {COMPILER_FLAGS = "-DUSE_GL"; }; };
+ AF62D6362180083E00C57C42 /* handsy.xml in Resources */ = {isa = PBXBuildFile; fileRef = AF62D6352180083D00C57C42 /* handsy.xml */; };
+ AF62D6372180083E00C57C42 /* handsy.xml in Resources */ = {isa = PBXBuildFile; fileRef = AF62D6352180083D00C57C42 /* handsy.xml */; };
AF633C081EE0BA6F00AB33BD /* XScreenSaverSubclass.m in Sources */ = {isa = PBXBuildFile; fileRef = AF9CC7A0099580E70075E99B /* XScreenSaverSubclass.m */; };
AF633C0A1EE0BA6F00AB33BD /* libjwxyz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AF4808C1098C3B6C00FB32B8 /* libjwxyz.a */; };
AF633C0B1EE0BA6F00AB33BD /* ScreenSaver.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF976ED30989BF59001F8B92 /* ScreenSaver.framework */; };
@@ -1986,6 +2001,7 @@
AF68A49B19196E3E00D41CD1 /* delaunay.c in Sources */ = {isa = PBXBuildFile; fileRef = AF68A49619196E3E00D41CD1 /* delaunay.c */; };
AF68A49C19196E3E00D41CD1 /* delaunay.c in Sources */ = {isa = PBXBuildFile; fileRef = AF68A49619196E3E00D41CD1 /* delaunay.c */; };
AF69640B0E4FE3470085DBCE /* teapot.c in Sources */ = {isa = PBXBuildFile; fileRef = AFC211930E4E30C800D87B6E /* teapot.c */; };
+ AF6C07C121D6ECCE00083862 /* Sparkle.framework in Resources */ = {isa = PBXBuildFile; fileRef = AF1ADA171850180E00932759 /* Sparkle.framework */; };
AF73FF211A08AB9400E485E9 /* iSaverRunner57t.png in Resources */ = {isa = PBXBuildFile; fileRef = AF73FF201A08AB9400E485E9 /* iSaverRunner57t.png */; };
AF73FF291A09877F00E485E9 /* XScreenSaverSubclass.m in Sources */ = {isa = PBXBuildFile; fileRef = AF9CC7A0099580E70075E99B /* XScreenSaverSubclass.m */; };
AF73FF2B1A09877F00E485E9 /* libjwxyz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AF4808C1098C3B6C00FB32B8 /* libjwxyz.a */; };
@@ -4606,6 +4622,20 @@
remoteGlobalIDString = AF5ECEA92116B1A400069433;
remoteInfo = VFeedback;
};
+ AF62D61A2180070600C57C42 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = AF4808C0098C3B6C00FB32B8;
+ remoteInfo = jwxyz;
+ };
+ AF62D6382180087500C57C42 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = AF62D6182180070600C57C42;
+ remoteInfo = Handsy;
+ };
AF633C031EE0BA6F00AB33BD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
@@ -7781,6 +7811,10 @@
AF6048F8157C07C600CA21E4 /* jwzgles.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jwzgles.c; path = ../jwxyz/jwzgles.c; sourceTree = "<group>"; };
AF6048F9157C07C600CA21E4 /* jwzgles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jwzgles.h; path = ../jwxyz/jwzgles.h; sourceTree = "<group>"; };
AF6048FA157C07C600CA21E4 /* jwzglesI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = jwzglesI.h; path = ../jwxyz/jwzglesI.h; sourceTree = "<group>"; };
+ AF62D62D2180070600C57C42 /* Handsy.saver */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Handsy.saver; sourceTree = BUILT_PRODUCTS_DIR; };
+ AF62D62F2180082100C57C42 /* handsy_model.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = handsy_model.c; path = hacks/glx/handsy_model.c; sourceTree = "<group>"; };
+ AF62D6302180082100C57C42 /* handsy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = handsy.c; path = hacks/glx/handsy.c; sourceTree = "<group>"; };
+ AF62D6352180083D00C57C42 /* handsy.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = handsy.xml; sourceTree = "<group>"; };
AF633C161EE0BA6F00AB33BD /* Vigilance.saver */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Vigilance.saver; sourceTree = BUILT_PRODUCTS_DIR; };
AF633C181EE0BC4900AB33BD /* vigilance.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = vigilance.xml; sourceTree = "<group>"; };
AF633C191EE0BC4A00AB33BD /* vigilance.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vigilance.c; path = hacks/glx/vigilance.c; sourceTree = "<group>"; };
@@ -9638,6 +9672,20 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ AF62D6202180070600C57C42 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ AF62D6212180070600C57C42 /* libjwxyz.a in Frameworks */,
+ AF62D6222180070600C57C42 /* ScreenSaver.framework in Frameworks */,
+ AF62D6232180070600C57C42 /* QuartzCore.framework in Frameworks */,
+ AF62D6242180070600C57C42 /* Cocoa.framework in Frameworks */,
+ AF62D6252180070600C57C42 /* Carbon.framework in Frameworks */,
+ AF62D6262180070600C57C42 /* OpenGL.framework in Frameworks */,
+ AF62D6272180070600C57C42 /* libz.dylib in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
AF633C091EE0BA6F00AB33BD /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
@@ -12529,6 +12577,7 @@
AFA6AB0520999950006D2685 /* GlitchPEG.saver */,
AFD77E7020C23F8600A3638D /* FilmLeader.saver */,
AF5ECEC02116B1A400069433 /* VFeedback.saver */,
+ AF62D62D2180070600C57C42 /* Handsy.saver */,
);
name = Products;
path = ..;
@@ -12911,6 +12960,8 @@
AF7777E709B64CF700EA3033 /* glslideshow.c */,
AFA55C8C099349EE00F3E977 /* glsnake.c */,
AFD56E080996A07A00BA26F7 /* gltext.c */,
+ AF62D62F2180082100C57C42 /* handsy_model.c */,
+ AF62D6302180082100C57C42 /* handsy.c */,
AF1B0FBE1D7AB5210011DBE4 /* hexstrut.c */,
AF78D18A142DD96E002AAF77 /* hilbert.c */,
AFC0E8C21CDC60A9008CAFAC /* hydrostat.c */,
@@ -13139,6 +13190,7 @@
AFC258C10988A468000655EE /* greynetic.xml */,
AFC258C20988A468000655EE /* halftone.xml */,
AFC258C30988A468000655EE /* halo.xml */,
+ AF62D6352180083D00C57C42 /* handsy.xml */,
AFC258C40988A468000655EE /* helix.xml */,
AFB591BC178B81E600EA4005 /* hexadrop.xml */,
AF1B0FBF1D7AB5210011DBE4 /* hexstrut.xml */,
@@ -13567,6 +13619,7 @@
AF1AD9DF18500F9F00932759 /* Frameworks */,
AF1AD9E018500F9F00932759 /* Resources */,
AF1ADA191850185F00932759 /* CopyFiles */,
+ AF168EA821D240EB00ED6E08 /* Codesign Sparkle */,
AF1ADA1E18501DC200932759 /* Run Update Info Plist */,
);
buildRules = (
@@ -15017,6 +15070,26 @@
productReference = AF5ECEC02116B1A400069433 /* VFeedback.saver */;
productType = "com.apple.product-type.bundle";
};
+ AF62D6182180070600C57C42 /* Handsy */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = AF62D62A2180070600C57C42 /* Build configuration list for PBXNativeTarget "Handsy" */;
+ buildPhases = (
+ AF62D61B2180070600C57C42 /* Resources */,
+ AF62D61D2180070600C57C42 /* Sources */,
+ AF62D6202180070600C57C42 /* Frameworks */,
+ AF62D6282180070600C57C42 /* Rez */,
+ AF62D6292180070600C57C42 /* Run Update Info Plist */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ AF62D6192180070600C57C42 /* PBXTargetDependency */,
+ );
+ name = Handsy;
+ productName = DangerBall;
+ productReference = AF62D62D2180070600C57C42 /* Handsy.saver */;
+ productType = "com.apple.product-type.bundle";
+ };
AF633C011EE0BA6F00AB33BD /* Vigilance */ = {
isa = PBXNativeTarget;
buildConfigurationList = AF633C131EE0BA6F00AB33BD /* Build configuration list for PBXNativeTarget "Vigilance" */;
@@ -18731,7 +18804,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0940;
+ LastUpgradeCheck = 1010;
TargetAttributes = {
AF08398F09930B6B00277BE9 = {
DevelopmentTeam = 4627ATJELP;
@@ -18985,6 +19058,9 @@
AF5ECEA92116B1A400069433 = {
DevelopmentTeam = 4627ATJELP;
};
+ AF62D6182180070600C57C42 = {
+ DevelopmentTeam = 4627ATJELP;
+ };
AF633C011EE0BA6F00AB33BD = {
DevelopmentTeam = 4627ATJELP;
};
@@ -19756,6 +19832,7 @@
AF7777D009B64C6B00EA3033 /* GLSlideshow */,
AFA55C77099349A600F3E977 /* GLSnake */,
AFD56DF10996A03800BA26F7 /* GLText */,
+ AF62D6182180070600C57C42 /* Handsy */,
AF1B0FA71D7AB4740011DBE4 /* Hexstrut */,
AF78D175142DD8F3002AAF77 /* Hilbert */,
AFC0E8AB1CDC601A008CAFAC /* Hydrostat */,
@@ -19896,6 +19973,7 @@
AF1ADA1B18501B3D00932759 /* SaverRunner.icns in Resources */,
AF3633FC18530DD90086A439 /* sparkle_dsa_pub.pem in Resources */,
AF1ADA161850157400932759 /* Updater.xib in Resources */,
+ AF6C07C121D6ECCE00083862 /* Sparkle.framework in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -20477,6 +20555,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ AF62D61B2180070600C57C42 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ AF62D6362180083E00C57C42 /* handsy.xml in Resources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
AF633C041EE0BA6F00AB33BD /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
@@ -20900,6 +20986,7 @@
AF918B0F158FC53D002B5D1E /* grav.xml in Resources */,
AF918B11158FC53D002B5D1E /* halftone.xml in Resources */,
AF918B12158FC53D002B5D1E /* halo.xml in Resources */,
+ AF62D6372180083E00C57C42 /* handsy.xml in Resources */,
AF918B13158FC53D002B5D1E /* helix.xml in Resources */,
AFB591BF178B81E600EA4005 /* hexadrop.xml in Resources */,
AF1B0FC01D7AB5330011DBE4 /* hexstrut.xml in Resources */,
@@ -22771,6 +22858,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ AF62D6282180070600C57C42 /* Rez */ = {
+ isa = PBXRezBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
AF633C111EE0BA6F00AB33BD /* Rez */ = {
isa = PBXRezBuildPhase;
buildActionMask = 2147483647;
@@ -24036,6 +24130,25 @@
shellScript = "$SOURCE_ROOT/update-info-plist.pl -q $BUILT_PRODUCTS_DIR/$PRODUCT_NAME$WRAPPER_SUFFIX";
showEnvVarsInLog = 0;
};
+ AF168EA821D240EB00ED6E08 /* Codesign Sparkle */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputFileListPaths = (
+ );
+ inputPaths = (
+ );
+ name = "Codesign Sparkle";
+ outputFileListPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "codesign -v --force --deep -o runtime --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sparkle.framework/Versions/A/Resources/Autoupdate.app\ncodesign -v --force -o runtime --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sparkle.framework/Versions/A\n";
+ showEnvVarsInLog = 0;
+ };
AF1A176F0D6D6EE3008AF328 /* Run Update Info Plist */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -24366,6 +24479,21 @@
shellScript = "$SOURCE_ROOT/update-info-plist.pl -q $BUILT_PRODUCTS_DIR/$PRODUCT_NAME$WRAPPER_SUFFIX";
showEnvVarsInLog = 0;
};
+ AF62D6292180070600C57C42 /* Run Update Info Plist */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ name = "Run Update Info Plist";
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "$SOURCE_ROOT/update-info-plist.pl -q $BUILT_PRODUCTS_DIR/$PRODUCT_NAME$WRAPPER_SUFFIX";
+ showEnvVarsInLog = 0;
+ };
AF633C121EE0BA6F00AB33BD /* Run Update Info Plist */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -28816,6 +28944,16 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
+ AF62D61D2180070600C57C42 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ AF62D6312180082100C57C42 /* handsy_model.c in Sources */,
+ AF62D61F2180070600C57C42 /* XScreenSaverSubclass.m in Sources */,
+ AF62D6332180082100C57C42 /* handsy.c in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
AF633C061EE0BA6F00AB33BD /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -29364,6 +29502,8 @@
AF918A67158FC3E5002B5D1E /* glslideshow.c in Sources */,
AF918A68158FC3E5002B5D1E /* glsnake.c in Sources */,
AF918A69158FC3E5002B5D1E /* gltext.c in Sources */,
+ AF62D6322180082100C57C42 /* handsy_model.c in Sources */,
+ AF62D6342180082100C57C42 /* handsy.c in Sources */,
AF1B0FC31D7AB5500011DBE4 /* hexstrut.c in Sources */,
AF918A6A158FC3E5002B5D1E /* hilbert.c in Sources */,
AFC0E8C41CDC60B0008CAFAC /* hydrostat.c in Sources */,
@@ -31488,6 +31628,16 @@
target = AF5ECEA92116B1A400069433 /* VFeedback */;
targetProxy = AF5ECEC82116B31F00069433 /* PBXContainerItemProxy */;
};
+ AF62D6192180070600C57C42 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = AF4808C0098C3B6C00FB32B8 /* jwxyz */;
+ targetProxy = AF62D61A2180070600C57C42 /* PBXContainerItemProxy */;
+ };
+ AF62D6392180087500C57C42 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = AF62D6182180070600C57C42 /* Handsy */;
+ targetProxy = AF62D6382180087500C57C42 /* PBXContainerItemProxy */;
+ };
AF633C021EE0BA6F00AB33BD /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = AF4808C0098C3B6C00FB32B8 /* jwxyz */;
@@ -33672,6 +33822,7 @@
"$(SRCROOT)",
);
INFOPLIST_FILE = "$(SRCROOT)/Updater.plist";
+ LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
"OTHER_CFLAGS[sdk=macosx*]" = "${OBJC_NO_GC_CFLAGS}";
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER)";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -33688,6 +33839,7 @@
"$(SRCROOT)",
);
INFOPLIST_FILE = "$(SRCROOT)/Updater.plist";
+ LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
"OTHER_CFLAGS[sdk=macosx*]" = "${OBJC_NO_GC_CFLAGS}";
PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER)";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -34815,6 +34967,28 @@
};
name = Release;
};
+ AF62D62B2180070600C57C42 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = (
+ "USE_GL=1",
+ "$(GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS)",
+ );
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Debug;
+ };
+ AF62D62C2180070600C57C42 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = (
+ "USE_GL=1",
+ "$(GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS)",
+ );
+ PRODUCT_NAME = "$(TARGET_NAME)";
+ };
+ name = Release;
+ };
AF633C141EE0BA6F00AB33BD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -38035,6 +38209,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = AF94E7411A16E93600289B93 /* xscreensaver.xcconfig */;
buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD)";
BUNDLE_IDENTIFIER = "org.jwz.${PROJECT_NAME:rfc1034identifier}.${PRODUCT_NAME:rfc1034identifier}";
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
@@ -38057,8 +38232,10 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphonesimulator*]" = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
+ CODE_SIGN_INJECT_BASE_ENTITLEMENTS = YES;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = 4627ATJELP;
+ ENABLE_HARDENED_RUNTIME = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_NO_COMMON_BLOCKS = YES;
@@ -38120,6 +38297,7 @@
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "";
"OTHER_CFLAGS[sdk=macosx*]" = "$(OBJC_GC_CFLAGS)";
+ OTHER_CODE_SIGN_FLAGS = "--timestamp";
"OTHER_LDFLAGS[sdk=macosx*]" = "-headerpad_max_install_names";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
@@ -38137,6 +38315,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = AF94E7411A16E93600289B93 /* xscreensaver.xcconfig */;
buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD)";
BUNDLE_IDENTIFIER = "org.jwz.${PROJECT_NAME:rfc1034identifier}.${PRODUCT_NAME:rfc1034identifier}";
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
@@ -38159,8 +38338,10 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Jamie Zawinski (4627ATJELP)";
"CODE_SIGN_IDENTITY[sdk=iphonesimulator*]" = "iPhone Distribution: Jamie Zawinski (4627ATJELP)";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application: Jamie Zawinski (4627ATJELP)";
+ CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = 4627ATJELP;
+ ENABLE_HARDENED_RUNTIME = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_NO_COMMON_BLOCKS = YES;
@@ -38221,6 +38402,7 @@
"LLVM_LTO[sdk=macosx*]" = NO;
OTHER_CFLAGS = "";
"OTHER_CFLAGS[sdk=macosx*]" = "$(OBJC_GC_CFLAGS)";
+ OTHER_CODE_SIGN_FLAGS = "--timestamp";
"OTHER_LDFLAGS[sdk=macosx*]" = "-headerpad_max_install_names";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
@@ -39006,6 +39188,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
+ AF62D62A2180070600C57C42 /* Build configuration list for PBXNativeTarget "Handsy" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ AF62D62B2180070600C57C42 /* Debug */,
+ AF62D62C2180070600C57C42 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
AF633C131EE0BA6F00AB33BD /* Build configuration list for PBXNativeTarget "Vigilance" */ = {
isa = XCConfigurationList;
buildConfigurations = (
diff --git a/README b/README
index af3f949..9a2a384 100644
--- a/README
+++ b/README
@@ -46,19 +46,32 @@ XScreenSaver has an extensive manual -- please read it!
===============================================================================
-5.40 * New hacks, 'filmleader', 'vfeedback'.
- * New hack, 'glitchpeg' (X11 and macOS only).
+5.42 * macOS: Fixed Sparkle auto-updater.
+
+5.41 * X11: Those new font-loading fallback heuristics work again. Oops.
+ * iOS, Android: Plugged many memory leaks at exit.
+ * New hack, `handsy'.
+ * Fixed `noof' from displaying minimalistically.
+ * Rewrote `unknownpleasures' to be faster, and a true waterfall graph.
+ * BSOD Solaris improved. DVD added.
+ * Linux: If the xscreensaver daemon is setuid, then we can implore the
+ kernel's out-of-memory killer to pretty please not unlock the screen.
+ * macOS: Upgraded Sparkle (the "Check for Updates" library).
+ * macOS: Screen saver settings work again on 10.14.
+
+5.40 * New hacks, `filmleader', `vfeedback'.
+ * New hack, `glitchpeg' (X11 and macOS only).
* GLPlanet blends between day and night maps at the dusk terminator.
* DymaxionMap can display arbitrary map images, and animate sunlight
across the flattened globe.
* Tessellimage can draw either Delaunay or Voronoi tilings.
* XAnalogTV includes test cards.
- * Android: These hacks work now: 'blitspin', 'bumps', 'cityflow',
- 'endgame', 'esper', 'flipscreen3d', 'gleidescope', 'glslideshow',
- 'jigglypuff', 'queens', 'tessellimage', 'xanalogtv', 'xmatrix',
- 'zoom'.
+ * Android: These hacks work now: `blitspin', `bumps', `cityflow',
+ `endgame', `esper', `flipscreen3d', `gleidescope', `glslideshow',
+ `jigglypuff', `queens', `tessellimage', `xanalogtv', `xmatrix',
+ `zoom'.
-5.39 * New hacks, 'razzledazzle', 'peepers', 'crumbler' and `maze3d'.
+5.39 * New hacks, `razzledazzle', `peepers', `crumbler' and `maze3d'.
* More heuristics for using RSS feeds as image sources.
* Android: Image loading works.
* Built-in image assets are now PNG instead of XPM or XBM.
@@ -66,24 +79,24 @@ XScreenSaver has an extensive manual -- please read it!
terrible selection of installed fonts.
* macOS: Retina display-related bug fixes.
-5.38 * New hack, 'esper'.
+5.38 * New hack, `esper'.
* macOS: Support for Retina displays.
* X11: `webcollage' now works with ImageMagick instead of with
pbmtools if `webcollage-helper' is not installed.
- * 'bsod' now accepts Dunning-Krugerrands.
- * Android: These hacks work now: 'anemone', 'anemotaxis', 'atlantis',
- 'bouboule', 'celtic', 'compass', 'crackberg', 'epicycle',
- 'fuzzyflakes', 'goop', 'kumppa' 'munch', 'pacman', 'polyominoes',
- 'slip'.
- * Android: Thick lines work better for: 'anemone', 'anemotaxis',
- 'celtic', 'compass', 'deluxe', 'epicycle', 'fuzzyflakes', 'pacman'
- * Android: Assorted performance improvements, especially for 'kumppa'
- and 'slip'.
+ * `bsod' now accepts Dunning-Krugerrands.
+ * Android: These hacks work now: `anemone', `anemotaxis', `atlantis',
+ `bouboule', `celtic', `compass', `crackberg', `epicycle',
+ `fuzzyflakes', `goop', `kumppa' `munch', `pacman', `polyominoes',
+ `slip'.
+ * Android: Thick lines work better for: `anemone', `anemotaxis',
+ `celtic', `compass', `deluxe', `epicycle', `fuzzyflakes', `pacman'.
+ * Android: Assorted performance improvements, especially for `kumppa'
+ and `slip'.
* Android TV: Daydreams work.
* iOS: Tweaks for iPhone X.
* Lots of xlockmore-derived hacks now have animated erase routines.
- * 'crystal' works properly on non-X11 systems.
- * 'm6502' now includes 'texture.asm'.
+ * `crystal' works properly on non-X11 systems.
+ * `m6502' now includes `texture.asm'.
* X11: Try harder to find sensible fonts for the password dialog.
5.37 * New hack, `vigilance'.
diff --git a/README.hacking b/README.hacking
index 6fc2fe5..451aec1 100644
--- a/README.hacking
+++ b/README.hacking
@@ -178,6 +178,12 @@ Programming Tips
- On modern machines, OpenGL will always run faster than Xlib. It's
also more portable. Consider writing in OpenGL whenever possible.
+ - Free any memory you allocate. While screen savers under X11 have
+ their memory freed automatically when their process is killed by
+ the XScreenSaver daemon, under iOS and Android screen savers exist
+ in long-lived processes where no such cleanup takes place.
+ Consider Valgrind or gcc -fsanitize=leak to find memory leaks.
+
==========================================================================
macOS, iOS and Android
diff --git a/aclocal.m4 b/aclocal.m4
index 37e5872..d25f855 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -39,7 +39,10 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun
#
# Modified to require ngettext
# Matthias Clasen <mclasen@redhat.com> 08/06/2004
-#
+
+# Increment this whenever this file is changed.
+#serial 1
+
# We need this here as well, since someone might use autoconf-2.5x
# to configure GLib then an older version to configure a package
# using AM_GLIB_GNU_GETTEXT
diff --git a/android/Makefile b/android/Makefile
index f0d5da0..ed65edf 100644
--- a/android/Makefile
+++ b/android/Makefile
@@ -128,6 +128,7 @@ export ANDROID_HACKS= \
grav \
greynetic \
halo \
+ handsy \
helix \
hexadrop \
hexstrut \
diff --git a/android/build.gradle b/android/build.gradle
index 648cc32..978b94c 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,8 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
- jcenter()
google()
+ jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.2'
@@ -12,9 +12,9 @@ buildscript {
allprojects {
repositories {
+ google()
maven { url 'https://maven.google.com' }
jcenter()
- google()
}
}
diff --git a/android/xscreensaver/.idea/caches/build_file_checksums.ser b/android/xscreensaver/.idea/caches/build_file_checksums.ser
index bc8f00c..c2ab27f 100644
--- a/android/xscreensaver/.idea/caches/build_file_checksums.ser
+++ b/android/xscreensaver/.idea/caches/build_file_checksums.ser
Binary files differ
diff --git a/android/xscreensaver/.idea/misc.xml b/android/xscreensaver/.idea/misc.xml
index c0f68ed..99202cc 100644
--- a/android/xscreensaver/.idea/misc.xml
+++ b/android/xscreensaver/.idea/misc.xml
@@ -25,7 +25,7 @@
</value>
</option>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/android/xscreensaver/.idea/workspace.xml b/android/xscreensaver/.idea/workspace.xml
index 1dedd64..9f2ef73 100644
--- a/android/xscreensaver/.idea/workspace.xml
+++ b/android/xscreensaver/.idea/workspace.xml
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
+ <component name="CMakeSettings">
+ <configurations>
+ <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
+ </configurations>
+ </component>
<component name="ChangeListManager">
<list default="true" id="41008724-035d-4e24-92b6-6dfb9231c83c" name="Default" comment="" />
<ignored path="xscreensaver.iws" />
@@ -35,8 +40,7 @@
<entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
- <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
- <folding />
+ <caret line="6" selection-start-line="6" selection-end-line="6" />
</state>
</provider>
</entry>
@@ -1659,7 +1663,7 @@
<option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-api/3.1.2/427e25639a55911cadcf70657c9b2ded2ad6af2b/gradle-api-3.1.2.jar" />
<option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.databinding/compilerCommon/3.1.2/be65c11ded4242932046f23ecfa5c7ccb0e98f46/compilerCommon-3.1.2.jar" />
<option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jre8/1.2.0/505f55b9619bbc5f5e26c77427dd24a6a441eef1/kotlin-stdlib-jre8-1.2.0.jar" />
- <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/transform-api/2.0.0-deprecated-use-gradle-api/85bee1acea9e27152b920746c68133b30b11431/transform-api-2.0.0-deprecated-use-gradle-api.jar" />
+ <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/transform-api/2.0.0-deprecated-use-gradle-api/47f6c56527c42425742fa9b56ffd3fd80763fe03/transform-api-2.0.0-deprecated-use-gradle-api.jar" />
<option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm/5.1/5ef31c4fe953b1fd00b8a88fa1d6820e8785bb45/asm-5.1.jar" />
<option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-analysis/5.1/6d1bf8989fc7901f868bee3863c44f21aa63d110/asm-analysis-5.1.jar" />
<option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-commons/5.1/25d8a575034dd9cfcb375a39b5334f0ba9c8474e/asm-commons-5.1.jar" />
@@ -1742,7 +1746,7 @@
<option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-api/3.1.2/427e25639a55911cadcf70657c9b2ded2ad6af2b/gradle-api-3.1.2.jar" />
<option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.databinding/compilerCommon/3.1.2/be65c11ded4242932046f23ecfa5c7ccb0e98f46/compilerCommon-3.1.2.jar" />
<option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jre8/1.2.0/505f55b9619bbc5f5e26c77427dd24a6a441eef1/kotlin-stdlib-jre8-1.2.0.jar" />
- <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/transform-api/2.0.0-deprecated-use-gradle-api/85bee1acea9e27152b920746c68133b30b11431/transform-api-2.0.0-deprecated-use-gradle-api.jar" />
+ <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/transform-api/2.0.0-deprecated-use-gradle-api/47f6c56527c42425742fa9b56ffd3fd80763fe03/transform-api-2.0.0-deprecated-use-gradle-api.jar" />
<option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm/5.1/5ef31c4fe953b1fd00b8a88fa1d6820e8785bb45/asm-5.1.jar" />
<option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-analysis/5.1/6d1bf8989fc7901f868bee3863c44f21aa63d110/asm-analysis-5.1.jar" />
<option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-commons/5.1/25d8a575034dd9cfcb375a39b5334f0ba9c8474e/asm-commons-5.1.jar" />
@@ -1826,44 +1830,18 @@
</entry>
</map>
</option>
- <option name="externalProjectsViewState">
- <projects_view />
- </option>
</component>
<component name="ProjectFrameBounds">
- <option name="x" value="90" />
- <option name="y" value="24" />
+ <option name="x" value="105" />
+ <option name="y" value="23" />
<option name="width" value="1339" />
<option name="height" value="859" />
</component>
<component name="ProjectView">
<navigator currentView="Scope" currentSubView="Project Files" proportions="" version="1">
- <flattenPackages />
- <showMembers />
- <showModules />
- <showLibraryContents />
- <hideEmptyPackages />
- <abbreviatePackageNames />
- <autoscrollToSource />
- <autoscrollFromSource />
- <sortByType />
- <manualOrder />
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="AndroidView">
- <subPane>
- <expand>
- <path>
- <item name="xscreensaver" type="1abcf292:AndroidViewProjectNode" />
- <item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
- </path>
- </expand>
- <select />
- </subPane>
- </pane>
- <pane id="PackagesPane" />
- <pane id="Scratches" />
<pane id="ProjectPane" />
<pane id="Scope">
<subPane subId="Project Files">
@@ -1887,6 +1865,18 @@
<select />
</subPane>
</pane>
+ <pane id="AndroidView">
+ <subPane>
+ <expand>
+ <path>
+ <item name="xscreensaver" type="1abcf292:AndroidViewProjectNode" />
+ <item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
+ </path>
+ </expand>
+ <select />
+ </subPane>
+ </pane>
+ <pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -1901,8 +1891,9 @@
<property name="SearchEverywhereHistoryKey" value="sdk manager&#9;ACTION&#9;WelcomeScreen.RunAndroidSdkManager" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="show.do.not.ask.upgrade.gradle.plugin" value="2.1.0" />
- <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1533959035566" />
+ <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1545885427557" />
<property name="device.picker.selection" value="Nexus_5_8.1" />
+ <property name="sync.plugin.last.upgrade.timestamp" value="1538463643381" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
@@ -1918,8 +1909,6 @@
</component>
<component name="RunManager">
<configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" />
@@ -1929,22 +1918,22 @@
<option name="VM_PARAMETERS" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="file://$MODULE_DIR$" />
- <option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
- <envs />
<patterns />
<method>
+ <option name="Make" enabled="false" />
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
</method>
</configuration>
<configuration default="true" type="AndroidRunConfigurationType" factoryName="Android App">
- <module name="" />
<option name="DEPLOY" value="true" />
+ <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
<option name="ARTIFACT_NAME" value="" />
<option name="PM_INSTALL_OPTIONS" value="" />
+ <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
<option name="ACTIVITY_EXTRA_FLAGS" value="" />
<option name="MODE" value="default_activity" />
<option name="CLEAR_LOGCAT" value="false" />
@@ -1981,19 +1970,22 @@
</Native>
<Profilers>
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
+ <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
+ <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sampled (Java)" />
</Profilers>
<option name="DEEP_LINK" value="" />
<option name="ACTIVITY_CLASS" value="" />
<method>
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
- <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" />
</method>
</configuration>
<configuration name="xscreensaver" type="AndroidRunConfigurationType" factoryName="Android App">
<module name="xscreensaver" />
<option name="DEPLOY" value="true" />
+ <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
<option name="ARTIFACT_NAME" value="" />
<option name="PM_INSTALL_OPTIONS" value="" />
+ <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
<option name="ACTIVITY_EXTRA_FLAGS" value="" />
<option name="MODE" value="default_activity" />
<option name="CLEAR_LOGCAT" value="false" />
@@ -2030,37 +2022,16 @@
</Native>
<Profilers>
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
+ <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
+ <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sampled (Java)" />
</Profilers>
<option name="DEEP_LINK" value="" />
<option name="ACTIVITY_CLASS" value="" />
- <method>
- <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" />
- </method>
</configuration>
<configuration default="true" type="Application" factoryName="Application">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <module name="" />
- <envs />
- </configuration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
</configuration>
<configuration default="true" type="TestNG" factoryName="TestNG">
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
- <module name="" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="SUITE_NAME" />
@@ -2073,15 +2044,12 @@
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
<option name="OUTPUT_DIRECTORY" />
- <option name="ANNOTATION_TYPE" />
- <option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="singleModule" />
</option>
<option name="USE_DEFAULT_REPORTERS" value="false" />
<option name="PROPERTIES_FILE" />
- <envs />
<properties />
<listeners />
</configuration>
@@ -2098,9 +2066,6 @@
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
</configuration>
</component>
- <component name="ShelveChangesManager" show_recycled="false">
- <option name="remove_strategy" value="false" />
- </component>
<component name="SvnConfiguration">
<configuration />
</component>
@@ -2115,43 +2080,44 @@
<servers />
</component>
<component name="ToolWindowManager">
- <frame x="90" y="24" width="1339" height="859" extended-state="0" />
+ <frame x="105" y="23" width="1339" height="859" extended-state="0" />
<layout>
- <window_info id="Android Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
- <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32928476" sideWeight="0.5312259" order="7" side_tool="true" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Logcat" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2544333" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Build" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32928476" sideWeight="0.47185814" order="8" side_tool="false" content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32928476" sideWeight="0.49421743" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Device File Explorer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
- <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
- <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
- <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32839838" sideWeight="0.49730146" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+ <window_info anchor="bottom" id="Android Profiler" order="7" show_stripe_button="false" />
+ <window_info anchor="bottom" id="TODO" order="6" />
+ <window_info anchor="right" id="Palette&#9;" order="3" />
+ <window_info id="Image Layers" order="3" />
+ <window_info id="Build Variants" order="3" side_tool="true" />
+ <window_info anchor="right" id="Capture Analysis" order="3" />
+ <window_info active="true" anchor="bottom" id="Event Log" order="7" sideWeight="0.5188897" side_tool="true" visible="true" weight="0.32882273" />
+ <window_info anchor="bottom" id="Run" order="2" />
+ <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
+ <window_info anchor="bottom" id="Terminal" order="7" />
+ <window_info anchor="bottom" id="Logcat" order="7" />
+ <window_info id="Captures" order="2" weight="0.25" />
+ <window_info id="Capture Tool" order="3" />
+ <window_info id="Designer" order="3" />
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2544333" />
+ <window_info anchor="right" id="Assistant" visible="true" weight="0.3299923" />
+ <window_info anchor="bottom" id="Build" order="8" sideWeight="0.47185814" weight="0.32928476" />
+ <window_info anchor="bottom" id="Find" order="1" sideWeight="0.48111024" visible="true" weight="0.32882273" />
+ <window_info anchor="right" id="Gradle" order="3" />
+ <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+ <window_info anchor="right" id="Device File Explorer" order="3" side_tool="true" />
+ <window_info anchor="right" id="Theme Preview" order="3" />
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+ <window_info id="Favorites" order="3" side_tool="true" />
+ <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+ <window_info anchor="bottom" id="Messages" order="7" sideWeight="0.49730146" visible="true" weight="0.32839838" />
+ <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+ <window_info anchor="right" id="Android Model" order="3" side_tool="true" />
+ <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+ <window_info id="Nl-Palette" order="3" />
+ <window_info anchor="right" id="Properties" order="3" />
+ <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+ <window_info anchor="bottom" id="Message" order="0" />
+ <window_info anchor="bottom" id="Gradle Console" order="7" side_tool="true" />
+ <window_info anchor="bottom" id="Android Monitor" order="7" />
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
</layout>
</component>
<component name="Vcs.Log.UiProperties">
@@ -2170,56 +2136,68 @@
<path value="$PROJECT_DIR$/../.." />
</ignored-roots>
</component>
- <component name="XDebuggerManager">
- <breakpoint-manager />
- <watches-manager />
- </component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
+ <state relative-caret-position="90">
+ <caret line="6" selection-start-line="6" selection-end-line="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
- </state>
+ <state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
- </state>
+ <state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
- </state>
+ <state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
- </state>
+ <state />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../gradle/wrapper/gradle-wrapper.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
- <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
- <folding />
+ <caret line="6" selection-start-line="6" selection-end-line="6" />
</state>
</provider>
</entry>
diff --git a/android/xscreensaver/build.gradle b/android/xscreensaver/build.gradle
index f0ff9a3..038e613 100644
--- a/android/xscreensaver/build.gradle
+++ b/android/xscreensaver/build.gradle
@@ -1,8 +1,8 @@
apply plugin: 'android'
dependencies {
- compile fileTree(include: '*.jar', dir: 'libs')
- compile "com.android.support:support-v4:27.1.1"
+ implementation fileTree(include: '*.jar', dir: 'libs')
+ implementation "com.android.support:support-v4:27.1.1"
}
android {
@@ -96,6 +96,10 @@ android {
defaultConfig {
+ // Previous applicationId was "org.jwz.xscreensaver" but I had
+ // to change it because I managed to lose the signing key...
+ // Note that the Java class tree is still "org.jwz.xscreensaver".
+ applicationId "org.jwz.android.xscreensaver"
minSdkVersion 15
targetSdkVersion 27
}
diff --git a/android/xscreensaver/jni/Android.mk b/android/xscreensaver/jni/Android.mk
index 1e20a83..3396bd9 100644
--- a/android/xscreensaver/jni/Android.mk
+++ b/android/xscreensaver/jni/Android.mk
@@ -73,6 +73,7 @@ LOCAL_SRC_FILES += \
hacks/glx/gllist.c \
hacks/glx/glschool_alg.c \
hacks/glx/glschool_gl.c \
+ hacks/glx/handsy_model.c \
hacks/glx/involute.c \
hacks/glx/lament_model.c \
hacks/glx/pipeobjs.c \
diff --git a/android/xscreensaver/jni/Application.mk b/android/xscreensaver/jni/Application.mk
index d3f5436..311946d 100644
--- a/android/xscreensaver/jni/Application.mk
+++ b/android/xscreensaver/jni/Application.mk
@@ -1,7 +1,7 @@
# Get this value from android/Makefile
APP_ABI := $(shell echo $$APP_ABI)
-APP_STL := stlport_static
-APP_PLATFORM := android-14
+APP_STL := c++_static
+APP_PLATFORM := android-16
# ^^ APP_PLATFORM is minimum API version supported
# https://android.googlesource.com/platform/ndk/+/master/docs/user/common_problems.md#target-api-set-higher-than-device-api
diff --git a/android/xscreensaver/xscreensaver.iml b/android/xscreensaver/xscreensaver.iml
index dd9566c..18e9fb0 100644
--- a/android/xscreensaver/xscreensaver.iml
+++ b/android/xscreensaver/xscreensaver.iml
@@ -79,7 +79,23 @@
<sourceFolder url="file://$MODULE_DIR$/tests/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/tests/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/tests/shaders" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+ <excludeFolder url="file://$MODULE_DIR$/build/reports" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
diff --git a/config.h.in b/config.h.in
index 6294bee..8c031ec 100644
--- a/config.h.in
+++ b/config.h.in
@@ -211,6 +211,10 @@
examined to determine when keyboard activity has occurred. */
#undef HAVE_PROC_INTERRUPTS
+/* Define this if you have a Linux-like /proc/.../oom_score_adj file which can
+ be adjusted by root to exempt us from the out-of-memory . */
+#undef HAVE_PROC_OOM
+
/* Define this if your system supports POSIX threads. */
#undef HAVE_PTHREAD
diff --git a/configure b/configure
index 2ac1b1b..f61dfbe 100755
--- a/configure
+++ b/configure
@@ -835,6 +835,7 @@ with_xf86vmode_ext
with_xf86gamma_ext
with_randr_ext
with_proc_interrupts
+with_proc_oom
enable_locking
enable_root_passwd
with_pam
@@ -1522,6 +1523,7 @@ Installation options:
--with-randr-ext Include support for the X Resize+Rotate extension.
--with-proc-interrupts Include support for consulting the /proc/interrupts
file to notice keyboard activity.
+ --with-proc-oom Include support for disabling the OOM-killer.
--with-pam Include support for PAM (Pluggable Auth Modules.)
--with-pam-service-name NAME arg is the name of the PAM service that
xscreensaver will authenticate as.
@@ -2626,6 +2628,8 @@ echo "command line was: $0 $@"
+
+
# After checking to see that --srcdir is correct (which AC_INIT does)
# check for some random other files that come later in the tar file,
# to make sure everything is here.
@@ -10321,6 +10325,61 @@ fi
###############################################################################
#
+# Check for /proc/*/oom_score_adj.
+#
+###############################################################################
+
+have_proc_oom=no
+with_proc_oom_req=unspecified
+
+# Check whether --with-proc-oom was given.
+if test "${with_proc_oom+set}" = set; then :
+ withval=$with_proc_oom; with_proc_oom="$withval"; with_proc_oom_req="$withval"
+else
+ with_proc_oom=yes
+fi
+
+
+if test "$with_proc_oom_req" = yes; then
+
+ # Note that we may be building in an environment (e.g. Debian buildd chroot)
+ # without a proper /proc filesystem.
+ #
+ have_proc_oom=yes
+ $as_echo "#define HAVE_PROC_OOM 1" >>confdefs.h
+
+
+elif test "$with_proc_oom_req" = unspecified; then
+
+ have_proc_oom=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether /proc/$$/oom_score_adj exists" >&5
+$as_echo_n "checking whether /proc/$$/oom_score_adj exists... " >&6; }
+if ${ac_cv_have_proc_oom+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_have_proc_oom=no
+ if test -f /proc/$$/oom_score_adj; then
+ ac_cv_have_proc_oom=yes
+ fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_proc_oom" >&5
+$as_echo "$ac_cv_have_proc_oom" >&6; }
+ have_proc_oom=$ac_cv_have_proc_oom
+
+ if test "$have_proc_oom" = yes; then
+ $as_echo "#define HAVE_PROC_OOM 1" >>confdefs.h
+
+ fi
+
+elif test "$with_proc_oom" != no; then
+ echo "error: must be yes or no: --with-proc-oom=$with_proc_oom"
+ exit 1
+fi
+
+
+###############################################################################
+#
# The --enable-locking option
#
###############################################################################
@@ -13351,7 +13410,7 @@ if ${ac_cv_mesagl_version_string+:} false; then :
$as_echo_n "(cached) " >&6
else
cat > conftest.$ac_ext <<EOF
-#line 13358 "configure"
+#line 13417 "configure"
#include "confdefs.h"
#include <GL/gl.h>
#ifndef MESA_MAJOR_VERSION
diff --git a/configure.in b/configure.in
index d439bb5..f8ed25e 100644
--- a/configure.in
+++ b/configure.in
@@ -124,6 +124,11 @@ AH_TEMPLATE([HAVE_PROC_INTERRUPTS],
can be examined to determine when keyboard activity has
occurred.])
+AH_TEMPLATE([HAVE_PROC_OOM],
+ [Define this if you have a Linux-like /proc/.../oom_score_adj file
+ which can be adjusted by root to exempt us from the out-of-memory
+ .])
+
AH_TEMPLATE([HAVE_MOTIF],[Define this if you have Motif.])
AH_TEMPLATE([HAVE_XMCOMBOBOX],
@@ -1952,6 +1957,49 @@ fi
###############################################################################
#
+# Check for /proc/*/oom_score_adj.
+#
+###############################################################################
+
+have_proc_oom=no
+with_proc_oom_req=unspecified
+AC_ARG_WITH(proc-oom,
+[ --with-proc-oom Include support for disabling the OOM-killer.],
+ [with_proc_oom="$withval"; with_proc_oom_req="$withval"],
+ [with_proc_oom=yes])
+
+if test "$with_proc_oom_req" = yes; then
+
+ # Note that we may be building in an environment (e.g. Debian buildd chroot)
+ # without a proper /proc filesystem.
+ #
+ have_proc_oom=yes
+ AC_DEFINE(HAVE_PROC_OOM)
+
+elif test "$with_proc_oom_req" = unspecified; then
+
+ have_proc_oom=no
+ AC_CACHE_CHECK([whether /proc/$$/oom_score_adj exists],
+ ac_cv_have_proc_oom,
+ [ac_cv_have_proc_oom=no
+ if test -f /proc/$$/oom_score_adj; then
+ ac_cv_have_proc_oom=yes
+ fi
+ ])
+ have_proc_oom=$ac_cv_have_proc_oom
+
+ if test "$have_proc_oom" = yes; then
+ AC_DEFINE(HAVE_PROC_OOM)
+ fi
+
+elif test "$with_proc_oom" != no; then
+ echo "error: must be yes or no: --with-proc-oom=$with_proc_oom"
+ exit 1
+fi
+
+
+###############################################################################
+#
# The --enable-locking option
#
###############################################################################
diff --git a/driver/Makefile.in b/driver/Makefile.in
index 55effec..b13853e 100644
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -115,10 +115,12 @@ NOLOCK_OBJS_1 = lock.o
TEST_SRCS = test-passwd.c test-uid.c test-xdpms.c test-grab.c \
test-apm.c test-fade.c test-xinerama.c test-vp.c \
- test-randr.c xdpyinfo.c test-mlstring.c test-screens.c
+ test-randr.c xdpyinfo.c test-mlstring.c test-screens.c \
+ test-yarandom.c
TEST_EXES = test-passwd test-uid test-xdpms test-grab \
test-apm test-fade test-xinerama test-vp \
- test-randr xdpyinfo test-mlstring test-screens
+ test-randr xdpyinfo test-mlstring test-screens \
+ test-yarandom
MOTIF_LIBS = @MOTIF_LIBS@ @PNG_LIBS@ $(XMU_LIBS)
GTK_LIBS = @GTK_LIBS@ $(XMU_LIBS)
@@ -865,6 +867,9 @@ test-screens.o: screens.c
test-screens: test-screens.o
$(CC) $(LDFLAGS) -o $@ $(TEST_SCREENS_OBJS) $(SAVER_LIBS)
+test-yarandom: test-yarandom.o
+ $(CC) -DTEST $(LDFLAGS) -o $@ test-yarandom.o $(UTILS_BIN)/yarandom.o
+
xdpyinfo.o: xdpyinfo.c
$(CC) -c $(INCLUDES) -DHAVE_GLX $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) \
@@ -980,6 +985,8 @@ test-uid.o: ../config.h
test-vp.o: ../config.h
test-xdpms.o: ../config.h
test-xinerama.o: ../config.h
+test-yarandom.o: ../config.h
+test-yarandom.o: $(UTILS_SRC)/yarandom.h
timers.o: ../config.h
timers.o: $(srcdir)/prefs.h
timers.o: $(srcdir)/types.h
diff --git a/driver/XScreenSaver.ad.in b/driver/XScreenSaver.ad.in
index f4e29d4..eec998f 100644
--- a/driver/XScreenSaver.ad.in
+++ b/driver/XScreenSaver.ad.in
@@ -4,8 +4,8 @@
! a screen saver and locker for the X window system
! by Jamie Zawinski
!
-! version 5.40
-! 12-Aug-2018
+! version 5.42
+! 28-Dec-2018
!
! See "man xscreensaver" for more info. The latest version is always
! available at https://www.jwz.org/xscreensaver/
@@ -386,6 +386,7 @@ GetViewPortIsFullOfLies: False
@GL_KLUDGE@ GL: crumbler -root \n\
filmleader -root \n\
glitchpeg -root \n\
+@GL_KLUDGE@ GL: handsy -root \n\
@GL_KLUDGE@ GL: maze3d -root \n\
@GL_KLUDGE@ GL: peepers -root \n\
@GL_KLUDGE@ GL: razzledazzle -root \n\
diff --git a/driver/XScreenSaver_ad.h b/driver/XScreenSaver_ad.h
index cd4976e..2d7b168 100644
--- a/driver/XScreenSaver_ad.h
+++ b/driver/XScreenSaver_ad.h
@@ -281,6 +281,7 @@
GL: crumbler -root \\n\
filmleader -root \\n\
glitchpeg -root \\n\
+ GL: handsy -root \\n\
GL: maze3d -root \\n\
GL: peepers -root \\n\
GL: razzledazzle -root \\n\
diff --git a/driver/demo-Gtk.c b/driver/demo-Gtk.c
index 0dfc387..ef00d82 100644
--- a/driver/demo-Gtk.c
+++ b/driver/demo-Gtk.c
@@ -3970,6 +3970,11 @@ launch_preview_subproc (state *s)
}
else
{
+ /* We do this instead of relying on $XSCREENSAVER_WINDOW specifically
+ so that third-party savers that don't implement -window-id will fail:
+ otherwise we might have full-screen windows popping up when we were
+ just trying to get a preview thumbnail.
+ */
strcpy (new_cmd, cmd);
sprintf (new_cmd + strlen (new_cmd), " -window-id 0x%X",
(unsigned int) id);
diff --git a/driver/passwd.c b/driver/passwd.c
index ac5a3f0..f443726 100644
--- a/driver/passwd.c
+++ b/driver/passwd.c
@@ -1,5 +1,5 @@
/* passwd.c --- verifying typed passwords with the OS.
- * xscreensaver, Copyright (c) 1993-2014 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1993-2018 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@ -24,6 +24,7 @@
#endif
#include <time.h>
#include <sys/time.h>
+#include <sys/stat.h>
#ifndef VMS
# include <pwd.h> /* for getpwuid() */
@@ -111,6 +112,44 @@ struct auth_methods methods[] = {
};
+# ifdef HAVE_PROC_OOM
+/* On some recent Linux systems you can tell the kernel's OOM-killer to
+ consider the possibility of maybe sometimes not killing you in low-memory
+ situations. Because that would unlock the screen. And that would be bad.
+
+ Linux >= 2.6.11: echo -17 > /proc/$$/oom_adj <-- ignoring this.
+ Linux >= 2.6.37: echo -1000 > /proc/$$/oom_score_adj <-- trying this.
+ */
+static void
+oom_assassin_immunity (Bool verbose_p)
+{
+ char fn[1024];
+ struct stat st;
+ FILE *out;
+ sprintf (fn, "/proc/%d/oom_score_adj", getpid());
+ if (stat(fn, &st) != 0)
+ {
+ if (verbose_p)
+ fprintf (stderr, "%s: OOM: %s does not exist\n", blurb(), fn);
+ return;
+ }
+ out = fopen (fn, "w");
+ if (!out)
+ {
+ if (verbose_p)
+ {
+ char b[2048];
+ sprintf (b, "%s: OOM: unable to write %s\n", blurb(), fn);
+ perror(b);
+ }
+ return;
+ }
+ fputs ("-1000\n", out);
+ fclose (out);
+}
+# endif /* HAVE_PROC_OOM */
+
+
Bool
lock_priv_init (int argc, char **argv, Bool verbose_p)
{
@@ -130,6 +169,11 @@ lock_priv_init (int argc, char **argv, Bool verbose_p)
fprintf (stderr, "%s: initialization of %s passwords failed.\n",
blurb(), methods[i].name);
}
+
+# ifdef HAVE_PROC_OOM
+ oom_assassin_immunity (verbose_p);
+# endif
+
return any_ok;
}
diff --git a/driver/test-yarandom.c b/driver/test-yarandom.c
new file mode 100644
index 0000000..6701ff8
--- /dev/null
+++ b/driver/test-yarandom.c
@@ -0,0 +1,66 @@
+/* test-yarandom.c --- generate a file of random bytes for analysis.
+ * xscreensaver, Copyright (c) 2018 Jamie Zawinski <jwz@jwz.org>
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation. No representations are made about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#include <ctype.h>
+#include <stdio.h>
+#include "yarandom.h"
+
+char *progname = 0;
+
+int
+main (int argc, char **argv)
+{
+ unsigned long i, n;
+ char *f;
+ FILE *fd;
+
+ progname = argv[0];
+ if (argc != 3)
+ {
+ fprintf(stderr, "usage: %s bytes outfile\n", argv[0]);
+ exit(1);
+ }
+
+ n = atol (argv[1]);
+ f = argv[2];
+
+# undef ya_rand_init
+ ya_rand_init(0);
+
+ fd = fopen (f, "w");
+ if (!fd) { perror (f); exit (1); }
+
+ n /= sizeof(uint32_t);
+ for (i = 0; i < n; i++)
+ {
+ union { uint32_t i; char s[sizeof(uint32_t)]; } rr;
+ rr.i = random();
+ if (! fwrite (rr.s, sizeof(rr.s), 1, fd))
+ {
+ perror ("write");
+ exit (1);
+ }
+ }
+ fclose (fd);
+ fprintf (stderr, "%s: %s: wrote %ld bytes\n",
+ progname, f, i * sizeof(uint32_t));
+ exit(0);
+}
diff --git a/driver/xscreensaver.c b/driver/xscreensaver.c
index f5f65dc..abcb07f 100644
--- a/driver/xscreensaver.c
+++ b/driver/xscreensaver.c
@@ -1328,6 +1328,10 @@ main_loop (saver_info *si)
{
Time lock_timeout = p->lock_timeout;
+ /* If we're fading, don't lock until the fade finishes. */
+ if (si->fading_possible_p && p->fade_p)
+ lock_timeout += p->fade_seconds / 1000;
+
if (si->emergency_lock_p && p->lock_p && lock_timeout)
{
int secs = p->lock_timeout / 1000;
@@ -2071,15 +2075,15 @@ handle_clientmessage (saver_info *si, XEvent *event, Bool until_idle_p)
sprintf (buf, "LOCK ClientMessage received; %s", response);
clientmessage_response (si, window, False, buf, response);
+ /* Have to set the time or xscreensaver-command doesn't report
+ the LOCK state change. Must come before set_locked_p(). */
+ si->blank_time = time ((time_t *) 0);
+
/* Note that this leaves things in a slightly inconsistent state:
we are blanked but not locked. And blanking might actually
fail if we can't get the grab. */
set_locked_p (si, True);
- /* Have to set the time or xscreensaver-command doesn't
- report the LOCK state change. */
- si->blank_time = time ((time_t *) 0);
-
si->selection_mode = 0;
si->demoing_p = False;
diff --git a/hacks/Makefile.in b/hacks/Makefile.in
index 4556872..63e69be 100644
--- a/hacks/Makefile.in
+++ b/hacks/Makefile.in
@@ -115,15 +115,15 @@ SRCS = attraction.c blitspin.c bouboule.c braid.c bubbles.c \
euler2d.c juggle.c polyominoes.c thornbird.c fluidballs.c \
anemone.c halftone.c metaballs.c eruption.c popsquares.c \
barcode.c piecewise.c cloudlife.c fontglide.c apple2.c \
- apple2-main.c analogtv.c xanalogtv.c pong.c filmleader.c \
- wormhole.c pacman.c pacman_ai.c pacman_level.c \
+ apple2-main.c analogtv.c analogtv-cli.c xanalogtv.c pong.c \
+ filmleader.c wormhole.c pacman.c pacman_ai.c pacman_level.c \
fuzzyflakes.c anemotaxis.c memscroller.c substrate.c \
intermomentary.c fireworkx.c fiberlamp.c \
boxfit.c interaggregate.c celtic.c cwaves.c m6502.c \
asm6502.c abstractile.c lcdscrub.c hexadrop.c \
tessellimage.c delaunay.c recanim.c binaryring.c \
- glitchpeg.c vfeedback.c \
- webcollage-cocoa.m webcollage-helper-cocoa.m testx11.c
+ glitchpeg.c vfeedback.c webcollage-cocoa.m \
+ webcollage-helper-cocoa.m testx11.c
SCRIPTS = vidwhacker webcollage ljlatest
# Programs that are mentioned in XScreenSaver.ad, and that have XML files,
@@ -156,14 +156,15 @@ OBJS = attraction.o blitspin.o bouboule.o braid.o bubbles.o \
euler2d.o juggle.o polyominoes.o thornbird.o fluidballs.o \
anemone.o halftone.o metaballs.o eruption.o popsquares.o \
barcode.o piecewise.o cloudlife.o fontglide.o apple2.o \
- apple2-main.o analogtv.o xanalogtv.o pong.o filmleader.o \
- wormhole.o pacman.o pacman_ai.o pacman_level.o \
- fuzzyflakes.o anemotaxis.o memscroller.o substrate.o \
- intermomentary.o fireworkx.o fiberlamp.o boxfit.o \
- interaggregate.o celtic.o cwaves.o webcollage-cocoa.o \
- webcollage-helper-cocoa.o m6502.o asm6502.o abstractile.o \
- lcdscrub.o hexadrop.o tessellimage.o delaunay.o recanim.o \
- binaryring.o glitchpeg.o vfeedback.o testx11.o
+ apple2-main.o analogtv.o analogtv2.o analogtv-cli.o \
+ xanalogtv.o pong.o filmleader.o wormhole.o pacman.o \
+ pacman_ai.o pacman_level.o fuzzyflakes.o anemotaxis.o \
+ memscroller.o substrate.o intermomentary.o fireworkx.o \
+ fiberlamp.o boxfit.o interaggregate.o celtic.o cwaves.o \
+ webcollage-cocoa.o webcollage-helper-cocoa.o m6502.o \
+ asm6502.o abstractile.o lcdscrub.o hexadrop.o \
+ tessellimage.o delaunay.o recanim.o binaryring.o \
+ glitchpeg.o vfeedback.o testx11.o
EXES = attraction blitspin bouboule braid decayscreen deco \
drift flame galaxy grav greynetic halo \
@@ -414,7 +415,9 @@ distdepend:: m6502.h
-e 's@\.\./utils@$$(UTILS_SRC)@g' \
-e 's@ \([^$$]\)@ $$(srcdir)/\1@g' \
-e 's@ $$(srcdir)/\(.*config.h\)@ \1@g' \
- -e 's@ $$(srcdir)/\(m6502.h\)@ \1@g' ; \
+ -e 's@ $$(srcdir)/\(m6502.h\)@ \1@g' \
+ -e 's@ $$(srcdir)/\(images/gen/\)@ \1@g' \
+ -e 's@ $$(HACK_SRC)/\(images/gen/\)@ \1@g' ; \
echo '' \
) > /tmp/distdepend.$$$$ && \
mv /tmp/distdepend.$$$$ Makefile.in
@@ -533,8 +536,9 @@ $(UTIL_OBJS):
$(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
# How we build object files in this directory.
+HACK_CFLAGS_BASE=$(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS)
.c.o:
- $(CC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) $<
+ $(CC) -c $(HACK_CFLAGS_BASE) $<
# Make sure these are regenerated when the version number ticks.
@@ -564,11 +568,13 @@ xscreensaver-sgigl: xscreensaver-sgigl.c
$(XMU_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) -lm
test-utf8wc: $(UTILS_SRC)/utf8wc.c
- $(CC) $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) $(LDFLAGS)\
+ $(CC) $(HACK_CFLAGS_BASE) $(LDFLAGS)\
-o $@ -DSELFTEST $<
# Make sure the images have been packaged. This is the first one hit:
-$(HACK_BIN)/images/gen/nose-f1_png.h:
+images/gen/som_png.h:
+ cd $(srcdir)/images && $(MAKE)
+images/gen/6x10font_png.h:
cd $(srcdir)/images && $(MAKE)
# The rules for those hacks which follow the `screenhack.c' API.
@@ -691,6 +697,21 @@ apple2: apple2.o apple2-main.o $(HACK_OBJS) $(ATV) $(GRAB) $(TEXT) $(PN
xanalogtv: xanalogtv.o $(HACK_OBJS) $(ATV) $(GRAB) $(PNG)
$(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(ATV) $(GRAB) $(PNG) $(PNG_LIBS) $(HACK_LIBS) $(THRL)
+ATVCLI_CFLAGS=-DANALOGTV_SCALE=1 -DNO_CONSTRAIN_RATIO $(HACK_CFLAGS_BASE)
+analogtv2.o: Makefile
+analogtv2.o: images/gen/6x10font_png.h
+analogtv2.o: $(srcdir)/analogtv.h
+analogtv2.o: $(srcdir)/analogtv.c
+ $(CC) -o $@ -c $(ATVCLI_CFLAGS) $<
+analogtv-cli.o: $(srcdir)/analogtv-cli.c
+ $(CC) -o $@ -c $(ATVCLI_CFLAGS) $<
+
+ATVCLI=analogtv2.o $(UTILS_BIN)/yarandom.o $(THRO) $(PNG)
+analogtv-cli: analogtv-cli.o $(ATVCLI)
+ $(CC_HACK) -o $@ $@.o $(ATVCLI) $(THRL) $(PNG_LIBS) -lpng
+clean::
+ -rm -f analogtv-cli
+
distort: distort.o $(HACK_OBJS) $(GRAB) $(SHM)
$(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(GRAB) $(SHM) $(HACK_LIBS) $(THRL)
@@ -1035,9 +1056,19 @@ abstractile.o: $(UTILS_SRC)/resources.h
abstractile.o: $(UTILS_SRC)/usleep.h
abstractile.o: $(UTILS_SRC)/visual.h
abstractile.o: $(UTILS_SRC)/yarandom.h
+analogtv-cli.o: $(srcdir)/analogtv.h
+analogtv-cli.o: ../config.h
+analogtv-cli.o: $(UTILS_SRC)/aligned_malloc.h
+analogtv-cli.o: $(UTILS_SRC)/font-retry.h
+analogtv-cli.o: $(UTILS_SRC)/resources.h
+analogtv-cli.o: $(UTILS_SRC)/thread_util.h
+analogtv-cli.o: $(UTILS_SRC)/visual.h
+analogtv-cli.o: $(UTILS_SRC)/xshm.h
+analogtv-cli.o: $(UTILS_SRC)/yarandom.h
+analogtv-cli.o: $(srcdir)/ximage-loader.h
analogtv.o: $(srcdir)/analogtv.h
analogtv.o: ../config.h
-analogtv.o: $(srcdir)/images/gen/6x10font_png.h
+analogtv.o: images/gen/6x10font_png.h
analogtv.o: $(UTILS_SRC)/aligned_malloc.h
analogtv.o: $(UTILS_SRC)/font-retry.h
analogtv.o: $(UTILS_SRC)/grabscreen.h
@@ -1131,7 +1162,7 @@ apple2.o: $(srcdir)/analogtv.h
apple2.o: $(srcdir)/apple2.h
apple2.o: ../config.h
apple2.o: $(srcdir)/fps.h
-apple2.o: $(srcdir)/images/gen/apple2font_png.h
+apple2.o: images/gen/apple2font_png.h
apple2.o: $(srcdir)/recanim.h
apple2.o: $(srcdir)/screenhackI.h
apple2.o: $(UTILS_SRC)/aligned_malloc.h
@@ -1204,7 +1235,7 @@ blaster.o: $(UTILS_SRC)/visual.h
blaster.o: $(UTILS_SRC)/yarandom.h
blitspin.o: ../config.h
blitspin.o: $(srcdir)/fps.h
-blitspin.o: $(srcdir)/images/gen/som_png.h
+blitspin.o: images/gen/som_png.h
blitspin.o: $(srcdir)/recanim.h
blitspin.o: $(srcdir)/screenhackI.h
blitspin.o: $(srcdir)/screenhack.h
@@ -1266,17 +1297,19 @@ bsod.o: $(srcdir)/analogtv.h
bsod.o: $(srcdir)/apple2.h
bsod.o: ../config.h
bsod.o: $(srcdir)/fps.h
-bsod.o: $(srcdir)/images/gen/amiga_png.h
-bsod.o: $(srcdir)/images/gen/android_png.h
-bsod.o: $(srcdir)/images/gen/apple_png.h
-bsod.o: $(srcdir)/images/gen/atari_png.h
-bsod.o: $(srcdir)/images/gen/atm_png.h
-bsod.o: $(srcdir)/images/gen/hmac_png.h
-bsod.o: $(srcdir)/images/gen/macbomb_png.h
-bsod.o: $(srcdir)/images/gen/mac_png.h
-bsod.o: $(srcdir)/images/gen/osx_10_2_png.h
-bsod.o: $(srcdir)/images/gen/osx_10_3_png.h
-bsod.o: $(srcdir)/images/gen/ransomware_png.h
+bsod.o: images/gen/amiga_png.h
+bsod.o: images/gen/android_png.h
+bsod.o: images/gen/apple_png.h
+bsod.o: images/gen/atari_png.h
+bsod.o: images/gen/atm_png.h
+bsod.o: images/gen/dvd_png.h
+bsod.o: images/gen/hmac_png.h
+bsod.o: images/gen/macbomb_png.h
+bsod.o: images/gen/mac_png.h
+bsod.o: images/gen/osx_10_2_png.h
+bsod.o: images/gen/osx_10_3_png.h
+bsod.o: images/gen/ransomware_png.h
+bsod.o: images/gen/sun_png.h
bsod.o: $(srcdir)/recanim.h
bsod.o: $(srcdir)/screenhackI.h
bsod.o: $(srcdir)/screenhack.h
@@ -1294,50 +1327,50 @@ bsod.o: $(UTILS_SRC)/yarandom.h
bsod.o: $(srcdir)/ximage-loader.h
bubbles-default.o: $(srcdir)/bubbles.h
bubbles-default.o: ../config.h
-bubbles-default.o: $(srcdir)/images/gen/blood10_png.h
-bubbles-default.o: $(srcdir)/images/gen/blood11_png.h
-bubbles-default.o: $(srcdir)/images/gen/blood1_png.h
-bubbles-default.o: $(srcdir)/images/gen/blood2_png.h
-bubbles-default.o: $(srcdir)/images/gen/blood3_png.h
-bubbles-default.o: $(srcdir)/images/gen/blood4_png.h
-bubbles-default.o: $(srcdir)/images/gen/blood5_png.h
-bubbles-default.o: $(srcdir)/images/gen/blood6_png.h
-bubbles-default.o: $(srcdir)/images/gen/blood7_png.h
-bubbles-default.o: $(srcdir)/images/gen/blood8_png.h
-bubbles-default.o: $(srcdir)/images/gen/blood9_png.h
-bubbles-default.o: $(srcdir)/images/gen/blue10_png.h
-bubbles-default.o: $(srcdir)/images/gen/blue11_png.h
-bubbles-default.o: $(srcdir)/images/gen/blue1_png.h
-bubbles-default.o: $(srcdir)/images/gen/blue2_png.h
-bubbles-default.o: $(srcdir)/images/gen/blue3_png.h
-bubbles-default.o: $(srcdir)/images/gen/blue4_png.h
-bubbles-default.o: $(srcdir)/images/gen/blue5_png.h
-bubbles-default.o: $(srcdir)/images/gen/blue6_png.h
-bubbles-default.o: $(srcdir)/images/gen/blue7_png.h
-bubbles-default.o: $(srcdir)/images/gen/blue8_png.h
-bubbles-default.o: $(srcdir)/images/gen/blue9_png.h
-bubbles-default.o: $(srcdir)/images/gen/glass10_png.h
-bubbles-default.o: $(srcdir)/images/gen/glass11_png.h
-bubbles-default.o: $(srcdir)/images/gen/glass1_png.h
-bubbles-default.o: $(srcdir)/images/gen/glass2_png.h
-bubbles-default.o: $(srcdir)/images/gen/glass3_png.h
-bubbles-default.o: $(srcdir)/images/gen/glass4_png.h
-bubbles-default.o: $(srcdir)/images/gen/glass5_png.h
-bubbles-default.o: $(srcdir)/images/gen/glass6_png.h
-bubbles-default.o: $(srcdir)/images/gen/glass7_png.h
-bubbles-default.o: $(srcdir)/images/gen/glass8_png.h
-bubbles-default.o: $(srcdir)/images/gen/glass9_png.h
-bubbles-default.o: $(srcdir)/images/gen/jade10_png.h
-bubbles-default.o: $(srcdir)/images/gen/jade11_png.h
-bubbles-default.o: $(srcdir)/images/gen/jade1_png.h
-bubbles-default.o: $(srcdir)/images/gen/jade2_png.h
-bubbles-default.o: $(srcdir)/images/gen/jade3_png.h
-bubbles-default.o: $(srcdir)/images/gen/jade4_png.h
-bubbles-default.o: $(srcdir)/images/gen/jade5_png.h
-bubbles-default.o: $(srcdir)/images/gen/jade6_png.h
-bubbles-default.o: $(srcdir)/images/gen/jade7_png.h
-bubbles-default.o: $(srcdir)/images/gen/jade8_png.h
-bubbles-default.o: $(srcdir)/images/gen/jade9_png.h
+bubbles-default.o: images/gen/blood10_png.h
+bubbles-default.o: images/gen/blood11_png.h
+bubbles-default.o: images/gen/blood1_png.h
+bubbles-default.o: images/gen/blood2_png.h
+bubbles-default.o: images/gen/blood3_png.h
+bubbles-default.o: images/gen/blood4_png.h
+bubbles-default.o: images/gen/blood5_png.h
+bubbles-default.o: images/gen/blood6_png.h
+bubbles-default.o: images/gen/blood7_png.h
+bubbles-default.o: images/gen/blood8_png.h
+bubbles-default.o: images/gen/blood9_png.h
+bubbles-default.o: images/gen/blue10_png.h
+bubbles-default.o: images/gen/blue11_png.h
+bubbles-default.o: images/gen/blue1_png.h
+bubbles-default.o: images/gen/blue2_png.h
+bubbles-default.o: images/gen/blue3_png.h
+bubbles-default.o: images/gen/blue4_png.h
+bubbles-default.o: images/gen/blue5_png.h
+bubbles-default.o: images/gen/blue6_png.h
+bubbles-default.o: images/gen/blue7_png.h
+bubbles-default.o: images/gen/blue8_png.h
+bubbles-default.o: images/gen/blue9_png.h
+bubbles-default.o: images/gen/glass10_png.h
+bubbles-default.o: images/gen/glass11_png.h
+bubbles-default.o: images/gen/glass1_png.h
+bubbles-default.o: images/gen/glass2_png.h
+bubbles-default.o: images/gen/glass3_png.h
+bubbles-default.o: images/gen/glass4_png.h
+bubbles-default.o: images/gen/glass5_png.h
+bubbles-default.o: images/gen/glass6_png.h
+bubbles-default.o: images/gen/glass7_png.h
+bubbles-default.o: images/gen/glass8_png.h
+bubbles-default.o: images/gen/glass9_png.h
+bubbles-default.o: images/gen/jade10_png.h
+bubbles-default.o: images/gen/jade11_png.h
+bubbles-default.o: images/gen/jade1_png.h
+bubbles-default.o: images/gen/jade2_png.h
+bubbles-default.o: images/gen/jade3_png.h
+bubbles-default.o: images/gen/jade4_png.h
+bubbles-default.o: images/gen/jade5_png.h
+bubbles-default.o: images/gen/jade6_png.h
+bubbles-default.o: images/gen/jade7_png.h
+bubbles-default.o: images/gen/jade8_png.h
+bubbles-default.o: images/gen/jade9_png.h
bubbles-default.o: $(UTILS_SRC)/yarandom.h
bubbles.o: $(srcdir)/bubbles.h
bubbles.o: ../config.h
@@ -1701,7 +1734,7 @@ fireworkx.o: $(UTILS_SRC)/visual.h
fireworkx.o: $(UTILS_SRC)/yarandom.h
flag.o: ../config.h
flag.o: $(srcdir)/fps.h
-flag.o: $(srcdir)/images/gen/bob_png.h
+flag.o: images/gen/bob_png.h
flag.o: $(srcdir)/recanim.h
flag.o: $(srcdir)/screenhackI.h
flag.o: $(UTILS_SRC)/colors.h
@@ -2232,8 +2265,8 @@ m6502.o: $(UTILS_SRC)/xshm.h
m6502.o: $(UTILS_SRC)/yarandom.h
maze.o: ../config.h
maze.o: $(srcdir)/fps.h
-maze.o: $(srcdir)/images/gen/logo-180_png.h
-maze.o: $(srcdir)/images/gen/logo-50_png.h
+maze.o: images/gen/logo-180_png.h
+maze.o: images/gen/logo-50_png.h
maze.o: $(srcdir)/recanim.h
maze.o: $(srcdir)/screenhackI.h
maze.o: $(srcdir)/screenhack.h
@@ -2345,14 +2378,14 @@ nerverot.o: $(UTILS_SRC)/visual.h
nerverot.o: $(UTILS_SRC)/yarandom.h
noseguy.o: ../config.h
noseguy.o: $(srcdir)/fps.h
-noseguy.o: $(srcdir)/images/gen/nose-f1_png.h
-noseguy.o: $(srcdir)/images/gen/nose-f2_png.h
-noseguy.o: $(srcdir)/images/gen/nose-f3_png.h
-noseguy.o: $(srcdir)/images/gen/nose-f4_png.h
-noseguy.o: $(srcdir)/images/gen/nose-l1_png.h
-noseguy.o: $(srcdir)/images/gen/nose-l2_png.h
-noseguy.o: $(srcdir)/images/gen/nose-r1_png.h
-noseguy.o: $(srcdir)/images/gen/nose-r2_png.h
+noseguy.o: images/gen/nose-f1_png.h
+noseguy.o: images/gen/nose-f2_png.h
+noseguy.o: images/gen/nose-f3_png.h
+noseguy.o: images/gen/nose-f4_png.h
+noseguy.o: images/gen/nose-l1_png.h
+noseguy.o: images/gen/nose-l2_png.h
+noseguy.o: images/gen/nose-r1_png.h
+noseguy.o: images/gen/nose-r2_png.h
noseguy.o: $(srcdir)/recanim.h
noseguy.o: $(srcdir)/screenhackI.h
noseguy.o: $(srcdir)/screenhack.h
@@ -2404,7 +2437,7 @@ pacman_level.o: $(srcdir)/ximage-loader.h
pacman_level.o: $(srcdir)/xlockmoreI.h
pacman.o: ../config.h
pacman.o: $(srcdir)/fps.h
-pacman.o: $(srcdir)/images/gen/pacman_png.h
+pacman.o: images/gen/pacman_png.h
pacman.o: $(srcdir)/pacman_ai.h
pacman.o: $(srcdir)/pacman.h
pacman.o: $(srcdir)/pacman_level.h
@@ -2480,7 +2513,7 @@ petri.o: $(UTILS_SRC)/visual.h
petri.o: $(UTILS_SRC)/yarandom.h
phosphor.o: ../config.h
phosphor.o: $(srcdir)/fps.h
-phosphor.o: $(srcdir)/images/gen/6x10font_png.h
+phosphor.o: images/gen/6x10font_png.h
phosphor.o: $(srcdir)/recanim.h
phosphor.o: $(srcdir)/screenhackI.h
phosphor.o: $(srcdir)/screenhack.h
@@ -2912,7 +2945,7 @@ tessellimage.o: $(UTILS_SRC)/yarandom.h
testx11.o: ../config.h
testx11.o: $(srcdir)/fps.h
testx11.o: $(srcdir)/glx/rotator.h
-testx11.o: $(srcdir)/images/gen/logo-180_png.h
+testx11.o: images/gen/logo-180_png.h
testx11.o: $(srcdir)/recanim.h
testx11.o: $(srcdir)/screenhackI.h
testx11.o: $(srcdir)/screenhack.h
@@ -3116,10 +3149,10 @@ worm.o: $(srcdir)/xlockmore.h
xanalogtv.o: $(srcdir)/analogtv.h
xanalogtv.o: ../config.h
xanalogtv.o: $(srcdir)/fps.h
-xanalogtv.o: $(srcdir)/images/gen/logo-180_png.h
-xanalogtv.o: $(srcdir)/images/gen/testcard_bbcf_png.h
-xanalogtv.o: $(srcdir)/images/gen/testcard_pm5544_png.h
-xanalogtv.o: $(srcdir)/images/gen/testcard_rca_png.h
+xanalogtv.o: images/gen/logo-180_png.h
+xanalogtv.o: images/gen/testcard_bbcf_png.h
+xanalogtv.o: images/gen/testcard_pm5544_png.h
+xanalogtv.o: images/gen/testcard_rca_png.h
xanalogtv.o: $(srcdir)/recanim.h
xanalogtv.o: $(srcdir)/screenhackI.h
xanalogtv.o: $(srcdir)/screenhack.h
@@ -3137,7 +3170,7 @@ xanalogtv.o: $(UTILS_SRC)/yarandom.h
xanalogtv.o: $(srcdir)/ximage-loader.h
xflame.o: ../config.h
xflame.o: $(srcdir)/fps.h
-xflame.o: $(srcdir)/images/gen/bob_png.h
+xflame.o: images/gen/bob_png.h
xflame.o: $(srcdir)/recanim.h
xflame.o: $(srcdir)/screenhackI.h
xflame.o: $(srcdir)/screenhack.h
@@ -3196,10 +3229,10 @@ xlyap.o: $(UTILS_SRC)/visual.h
xlyap.o: $(UTILS_SRC)/yarandom.h
xmatrix.o: ../config.h
xmatrix.o: $(srcdir)/fps.h
-xmatrix.o: $(srcdir)/images/gen/matrix1b_png.h
-xmatrix.o: $(srcdir)/images/gen/matrix1_png.h
-xmatrix.o: $(srcdir)/images/gen/matrix2b_png.h
-xmatrix.o: $(srcdir)/images/gen/matrix2_png.h
+xmatrix.o: images/gen/matrix1b_png.h
+xmatrix.o: images/gen/matrix1_png.h
+xmatrix.o: images/gen/matrix2b_png.h
+xmatrix.o: images/gen/matrix2_png.h
xmatrix.o: $(srcdir)/recanim.h
xmatrix.o: $(srcdir)/screenhackI.h
xmatrix.o: $(srcdir)/screenhack.h
diff --git a/hacks/abstractile.c b/hacks/abstractile.c
index b4394f1..1b055c2 100644
--- a/hacks/abstractile.c
+++ b/hacks/abstractile.c
@@ -1485,6 +1485,7 @@ abstractile_init(Display *display, Window window)
fprintf(stderr, "%s: unknown tile option %s\n", progname, tile);
st->tile = TILE_RANDOM;
}
+ if (tile) free (tile);
st->speed = get_integer_resource(display, "speed", "Integer");
if (st->speed < 0) st->speed = 0;
@@ -1579,6 +1580,14 @@ static void
abstractile_free (Display *dpy, Window window, void *closure)
{
struct state *st = (struct state *) closure;
+ if (st->dline) free(st->dline);
+ if (st->eline) free(st->eline);
+ if (st->grid) free(st->grid);
+ if (st->zlist) free(st->zlist);
+ if (st->fdol) free(st->fdol);
+ if (st->odi) free(st->odi);
+ XFreeGC (dpy, st->fgc);
+ XFreeGC (dpy, st->bgc);
free (st);
}
diff --git a/hacks/analogtv-cli.c b/hacks/analogtv-cli.c
new file mode 100644
index 0000000..d70db1b
--- /dev/null
+++ b/hacks/analogtv-cli.c
@@ -0,0 +1,967 @@
+/* xanalogtv-cli, Copyright (c) 2018 Jamie Zawinski <jwz@jwz.org>
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation. No representations are made about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * Performs the "Analog TV" transform on an image file, converting it to
+ * an MP4. The MP4 file will have the same dimensions as the input image.
+ * Requires 'ffmpeg' on $PATH.
+ *
+ * --duration Length in seconds of MP4.
+ * --powerup Do the power-on animation at the beginning.
+ * --logo FILE Small image overlayed onto the colorbars image.
+ * --audio FILE Add a soundtrack. Must be as long or longer.
+ *
+ * Created: 10-Dec-2018 by jwz.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <signal.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xos.h>
+
+#include "resources.h"
+#include "visual.h"
+#include "yarandom.h"
+#include "font-retry.h"
+#include "ximage-loader.h"
+#include "thread_util.h"
+#include "xshm.h"
+#include "analogtv.h"
+
+#ifdef HAVE_LIBPNG
+# include <png.h>
+#endif
+
+const char *progname;
+const char *progclass;
+int mono_p = 0;
+static Bool verbose_p = 0;
+
+#define RANDSIGN() ((random() & 1) ? 1 : -1)
+
+enum {
+ N_CHANNELS=12,
+ MAX_MULTICHAN=2,
+ MAX_STATIONS=11
+};
+
+typedef struct chansetting_s {
+ analogtv_reception recs[MAX_MULTICHAN];
+ double noise_level;
+} chansetting;
+
+struct state {
+ XImage *output_frame;
+ int frames_written;
+ char *framefile_fmt;
+
+ Display *dpy;
+ Window window;
+ analogtv *tv;
+ analogtv_font ugly_font;
+
+ int n_stations;
+ analogtv_input *stations[MAX_STATIONS];
+ Bool image_loading_p;
+ XImage *logo, *logo_mask;
+
+ int curinputi;
+ chansetting chansettings[N_CHANNELS];
+ chansetting *cs;
+};
+
+static struct state global_state;
+
+
+/* Since this program does not connect to an X server, or in fact link
+ with Xlib, we need stubs for the few X11 routines that analogtv.c calls.
+ Most are unused. It seems like I am forever implementing subsets of X11.
+ */
+
+Status
+XAllocColor (Display *dpy, Colormap cmap, XColor *c)
+{
+ abort();
+}
+
+int
+XClearArea (Display *dpy, Window win, int x, int y,
+ unsigned int w, unsigned int h, Bool exp)
+{
+ return 0;
+}
+
+int
+XClearWindow (Display *dpy, Window window)
+{
+ return 0;
+}
+
+GC
+XCreateGC(Display *dpy, Drawable d, unsigned long mask, XGCValues *gcv)
+{
+ return 0;
+}
+
+XImage *
+XCreateImage (Display *dpy, Visual *v, unsigned int depth,
+ int format, int offset, char *data,
+ unsigned int width, unsigned int height,
+ int bitmap_pad, int bytes_per_line)
+{
+ XImage *ximage = (XImage *) calloc (1, sizeof(*ximage));
+ unsigned long r, g, b;
+
+ if (depth == 0) depth = 32;
+
+ ximage->width = width;
+ ximage->height = height;
+ ximage->format = format;
+ ximage->data = data;
+ ximage->bitmap_unit = 8;
+ ximage->byte_order = LSBFirst;
+ ximage->bitmap_bit_order = ximage->byte_order;
+ ximage->bitmap_pad = bitmap_pad;
+ ximage->depth = depth;
+ visual_rgb_masks (0, v, &r, &g, &b);
+ ximage->red_mask = (depth == 1 ? 0 : r);
+ ximage->green_mask = (depth == 1 ? 0 : g);
+ ximage->blue_mask = (depth == 1 ? 0 : b);
+ ximage->bits_per_pixel = (depth == 1 ? 1 : visual_pixmap_depth (0, v));
+ ximage->bytes_per_line = bytes_per_line;
+
+ XInitImage (ximage);
+ if (! ximage->f.put_pixel) abort();
+ return ximage;
+}
+
+Pixmap
+XCreatePixmap (Display *dpy, Drawable d, unsigned int width,
+ unsigned int height, unsigned int depth)
+{
+ abort();
+}
+
+Pixmap
+XCreatePixmapFromBitmapData (Display *dpy, Drawable d, char *data,
+ unsigned int w, unsigned int h,
+ unsigned long fg, unsigned long bg,
+ unsigned int depth)
+{
+ abort();
+}
+
+int
+XDrawString (Display *dpy, Drawable d, GC gc, int x, int y, const char *s,
+ int len)
+{
+ abort();
+}
+
+int
+XFillRectangle (Display *dpy, Drawable d, GC gc, int x, int y,
+ unsigned int width, unsigned int height)
+{
+ abort();
+}
+
+int
+XFreeColors (Display *dpy, Colormap cmap, unsigned long *px, int n,
+ unsigned long planes)
+{
+ abort();
+}
+
+int
+XFreeGC (Display *dpy, GC gc)
+{
+ abort();
+}
+
+int
+XFreePixmap (Display *dpy, Pixmap p)
+{
+ abort();
+}
+
+XImage *
+XGetImage (Display *dpy, Drawable d, int x, int y,
+ unsigned int w, unsigned int h,
+ unsigned long pm, int fmt)
+{
+ abort();
+}
+
+Status
+XGetWindowAttributes (Display *dpy, Window w, XWindowAttributes *xgwa)
+{
+ struct state *st = &global_state;
+ memset (xgwa, 0, sizeof(*xgwa));
+ xgwa->width = st->output_frame->width;
+ xgwa->height = st->output_frame->height;
+ return True;
+}
+
+int
+XPutImage (Display *dpy, Drawable d, GC gc, XImage *image,
+ int src_x, int src_y, int dest_x, int dest_y,
+ unsigned int w, unsigned int h)
+{
+ struct state *st = &global_state;
+ XImage *out = st->output_frame;
+ int x, y;
+ for (y = 0; y < h; y++) {
+ int iy = src_y + y;
+ int oy = dest_y + y;
+ if (iy >= 0 &&
+ oy >= 0 &&
+ iy < image->height &&
+ oy < out->height)
+ for (x = 0; x < w; x++) {
+ int ix = src_x + x;
+ int ox = dest_x + x;
+ if (ix >= 0 &&
+ ox >= 0 &&
+ ix < image->width &&
+ ox < out->width) {
+ XPutPixel (out, ox, oy, XGetPixel (image, ix, iy));
+ }
+ }
+ }
+ return 0;
+}
+
+int
+XQueryColor (Display *dpy, Colormap cmap, XColor *color)
+{
+ uint16_t r = (color->pixel & 0x00FF0000L) >> 16;
+ uint16_t g = (color->pixel & 0x0000FF00L) >> 8;
+ uint16_t b = (color->pixel & 0x000000FFL);
+ color->red = r | (r<<8);
+ color->green = g | (g<<8);
+ color->blue = b | (b<<8);
+ color->flags = DoRed|DoGreen|DoBlue;
+ return 0;
+}
+
+int
+XQueryColors (Display *dpy, Colormap cmap, XColor *c, int n)
+{
+ int i;
+ for (i = 0; i < n; i++)
+ XQueryColor (dpy, cmap, &c[i]);
+ return 0;
+}
+
+int
+XSetForeground (Display *dpy, GC gc, unsigned long fg)
+{
+ abort();
+}
+
+int
+XSetWindowBackground (Display *dpy, Window win, unsigned long bg)
+{
+ return 0;
+}
+
+XImage *
+create_xshm_image (Display *dpy, Visual *visual,
+ unsigned int depth,
+ int format, XShmSegmentInfo *shm_info,
+ unsigned int width, unsigned int height)
+{
+# undef BitmapPad
+# define BitmapPad(dpy) 8
+ XImage *image = XCreateImage (dpy, visual, depth, format, 0, NULL,
+ width, height, BitmapPad(dpy), 0);
+ int error = thread_malloc ((void **)&image->data, dpy,
+ image->height * image->bytes_per_line);
+ if (error) {
+ XDestroyImage (image);
+ image = NULL;
+ } else {
+ memset (image->data, 0, image->height * image->bytes_per_line);
+ }
+
+ return image;
+}
+
+void
+destroy_xshm_image (Display *dpy, XImage *image, XShmSegmentInfo *shm_info)
+{
+ thread_free (image->data);
+ image->data = NULL;
+ XDestroyImage (image);
+}
+
+Bool
+get_boolean_resource (Display *dpy, char *name, char *class)
+{
+ if (!strcmp(name, "useThreads")) return True;
+ abort();
+}
+
+double
+get_float_resource (Display *dpy, char *name, char *class)
+{
+ if (!strcmp(name, "TVTint")) return 5;
+ if (!strcmp(name, "TVColor")) return 70;
+ if (!strcmp(name, "TVBrightness")) return -15;
+ if (!strcmp(name, "TVContrast")) return 150;
+ abort();
+}
+
+int
+get_integer_resource (Display *dpy, char *name, char *class)
+{
+ if (!strcmp(name, "use_cmap")) return 0;
+ abort();
+}
+
+unsigned int
+get_pixel_resource (Display *dpy, Colormap cmap, char *name, char *class)
+{
+ if (!strcmp(name, "background")) return 0;
+ abort();
+}
+
+XFontStruct *
+load_font_retry (Display *dpy, const char *xlfd)
+{
+ abort();
+}
+
+Bool
+put_xshm_image (Display *dpy, Drawable d, GC gc, XImage *image,
+ int src_x, int src_y, int dest_x, int dest_y,
+ unsigned int width, unsigned int height,
+ XShmSegmentInfo *shm_info)
+{
+ return XPutImage (dpy, d, gc, image, src_x, src_y, dest_x, dest_y,
+ width, height);
+}
+
+int
+visual_class (Screen *s, Visual *v)
+{
+ return TrueColor;
+}
+
+int
+visual_pixmap_depth (Screen *s, Visual *v)
+{
+ return 32;
+}
+
+void
+visual_rgb_masks (Screen *screen, Visual *visual,
+ unsigned long *red_mask,
+ unsigned long *green_mask,
+ unsigned long *blue_mask)
+{
+ *red_mask = 0x00FF0000L;
+ *green_mask = 0x0000FF00L;
+ *blue_mask = 0x000000FFL;
+}
+
+
+static void
+update_smpte_colorbars(analogtv_input *input)
+{
+ struct state *st = (struct state *) input->client_data;
+ int col;
+ int black_ntsc[4];
+
+ /*
+ SMPTE is the society of motion picture and television engineers, and
+ these are the standard color bars in the US. Following the partial spec
+ at http://broadcastengineering.com/ar/broadcasting_inside_color_bars/
+ These are luma, chroma, and phase numbers for each of the 7 bars.
+ */
+ double top_cb_table[7][3]={
+ {75, 0, 0.0}, /* gray */
+ {69, 31, 167.0}, /* yellow */
+ {56, 44, 283.5}, /* cyan */
+ {48, 41, 240.5}, /* green */
+ {36, 41, 60.5}, /* magenta */
+ {28, 44, 103.5}, /* red */
+ {15, 31, 347.0} /* blue */
+ };
+ double mid_cb_table[7][3]={
+ {15, 31, 347.0}, /* blue */
+ {7, 0, 0}, /* black */
+ {36, 41, 60.5}, /* magenta */
+ {7, 0, 0}, /* black */
+ {56, 44, 283.5}, /* cyan */
+ {7, 0, 0}, /* black */
+ {75, 0, 0.0} /* gray */
+ };
+
+ analogtv_lcp_to_ntsc(0.0, 0.0, 0.0, black_ntsc);
+
+ analogtv_setup_sync(input, 1, 0);
+
+ for (col=0; col<7; col++) {
+ analogtv_draw_solid_rel_lcp(input, col*(1.0/7.0), (col+1)*(1.0/7.0), 0.00, 0.68,
+ top_cb_table[col][0],
+ top_cb_table[col][1], top_cb_table[col][2]);
+
+ analogtv_draw_solid_rel_lcp(input, col*(1.0/7.0), (col+1)*(1.0/7.0), 0.68, 0.75,
+ mid_cb_table[col][0],
+ mid_cb_table[col][1], mid_cb_table[col][2]);
+ }
+
+ analogtv_draw_solid_rel_lcp(input, 0.0, 1.0/6.0,
+ 0.75, 1.00, 7, 40, 303); /* -I */
+ analogtv_draw_solid_rel_lcp(input, 1.0/6.0, 2.0/6.0,
+ 0.75, 1.00, 100, 0, 0); /* white */
+ analogtv_draw_solid_rel_lcp(input, 2.0/6.0, 3.0/6.0,
+ 0.75, 1.00, 7, 40, 33); /* +Q */
+ analogtv_draw_solid_rel_lcp(input, 3.0/6.0, 4.0/6.0,
+ 0.75, 1.00, 7, 0, 0); /* black */
+ analogtv_draw_solid_rel_lcp(input, 12.0/18.0, 13.0/18.0,
+ 0.75, 1.00, 3, 0, 0); /* black -4 */
+ analogtv_draw_solid_rel_lcp(input, 13.0/18.0, 14.0/18.0,
+ 0.75, 1.00, 7, 0, 0); /* black */
+ analogtv_draw_solid_rel_lcp(input, 14.0/18.0, 15.0/18.0,
+ 0.75, 1.00, 11, 0, 0); /* black +4 */
+ analogtv_draw_solid_rel_lcp(input, 5.0/6.0, 6.0/6.0,
+ 0.75, 1.00, 7, 0, 0); /* black */
+ if (st->logo)
+ {
+ double aspect = (double)
+ st->output_frame->width / st->output_frame->height;
+ int w2 = st->tv->xgwa.width * 0.35;
+ int h2 = st->tv->xgwa.height * 0.35 * aspect;
+ analogtv_load_ximage (st->tv, input, st->logo, st->logo_mask,
+ (st->tv->xgwa.width - w2) / 2,
+ st->tv->xgwa.height * 0.20,
+ w2, h2);
+ }
+
+ input->next_update_time += 1.0;
+}
+
+
+
+static void
+analogtv_save_frame (struct state *st, const char *outfile,
+ unsigned long frame)
+{
+ char *pngfile = malloc (strlen (st->framefile_fmt) + 40);
+ FILE *f;
+
+ sprintf (pngfile, st->framefile_fmt, (int) frame);
+ f = fopen (pngfile, "wb");
+ if (! f) {
+ fprintf (stderr, "%s: unable to write %s\n", progname, pngfile);
+ exit (1);
+ }
+
+# ifdef HAVE_LIBPNG
+ {
+ png_structp png_ptr;
+ png_infop info_ptr;
+ png_bytep row;
+ XImage *img = st->output_frame;
+ int x, y;
+
+ png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0);
+ if (!png_ptr) abort();
+ info_ptr = png_create_info_struct (png_ptr);
+ if (!info_ptr) abort();
+ if (setjmp (png_jmpbuf (png_ptr))) abort();
+
+ png_init_io (png_ptr, f);
+
+ png_set_IHDR (png_ptr, info_ptr, img->width, img->height, 8,
+ PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
+ PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+ png_write_info (png_ptr, info_ptr);
+
+ row = (png_bytep) malloc (3 * img->width * sizeof(png_byte));
+ if (!row) abort();
+ for (y = 0 ; y < img->height ; y++) {
+ for (x = 0 ; x < img->width ; x++) {
+ unsigned long p = XGetPixel (img, x, y);
+ row[x*3+0] = (p & 0x000000FFL);
+ row[x*3+1] = (p & 0x0000FF00L) >> 8;
+ row[x*3+2] = (p & 0x00FF0000L) >> 16;
+ }
+ png_write_row (png_ptr, row);
+ }
+
+ png_write_end (png_ptr, 0);
+
+ png_free_data (png_ptr, info_ptr, PNG_FREE_ALL, -1);
+ png_destroy_write_struct (&png_ptr, 0);
+ free (row);
+ }
+#else /* ! HAVE_LIBPNG */
+# error libpng required
+# endif /* ! HAVE_LIBPNG */
+
+ fclose (f);
+ if (verbose_p > 1)
+ fprintf (stderr, "%s: wrote %s\n", progname, pngfile);
+ free (pngfile);
+}
+
+
+static void
+delete_tmp_files(void)
+{
+ struct state *st = &global_state;
+ char outfile[2048];
+ int i;
+ for (i = 0; i <= st->frames_written; i++)
+ {
+ sprintf (outfile, st->framefile_fmt, i);
+ if (verbose_p > 1)
+ fprintf (stderr, "%s: rm %s\n", progname, outfile);
+ unlink (outfile);
+ }
+}
+
+
+static RETSIGTYPE
+analogtv_signal (int sig)
+{
+ signal (sig, SIG_DFL);
+ delete_tmp_files();
+ kill (getpid (), sig);
+}
+
+
+static void
+analogtv_write_mp4 (struct state *st, const char *outfile,
+ const char *audiofile,
+ unsigned long frames)
+{
+ char cmd[1024];
+ struct stat ss;
+
+ sprintf (cmd,
+ "ffmpeg"
+ " -hide_banner"
+ " -v 16"
+ " -framerate 30" /* rate of input: must be before -i */
+ " -i '%s'"
+ " -r 30", /* rate of output: must be after -i */
+ st->framefile_fmt);
+ if (audiofile)
+ sprintf (cmd + strlen(cmd),
+ " -i '%s'"
+ " -map 0:v:0"
+ " -map 1:a:0"
+ " -acodec aac"
+ " -shortest",
+ audiofile);
+ sprintf (cmd + strlen(cmd),
+ " -c:v libx264"
+ " -profile:v high"
+ " -crf 24" /* 18 is very high; 24 is good enough */
+ " -pix_fmt yuv420p"
+ " '%s'"
+ " </dev/null"
+ /*" 2>&-"*/,
+ outfile);
+
+ if (verbose_p > 1)
+ fprintf (stderr, "%s: exec: %s\n", progname, cmd);
+ unlink (outfile);
+ system (cmd);
+
+ delete_tmp_files();
+
+ if (stat (outfile, &ss))
+ {
+ fprintf (stderr, "%s: %s was not created\n", progname, outfile);
+ exit (1);
+ }
+
+ if (verbose_p)
+ fprintf (stderr, "%s: wrote %s (%dx%d, %lu sec, %.0f MB)\n",
+ progname, outfile,
+ st->output_frame->width, st->output_frame->height,
+ frames/30,
+ (float) ss.st_size / (1024*1024));
+}
+
+
+static void
+flip_ximage (XImage *ximage)
+{
+ char *data2, *in, *out;
+ int y;
+
+ if (!ximage) return;
+ data2 = malloc (ximage->bytes_per_line * ximage->height);
+ if (!data2) abort();
+ in = ximage->data;
+ out = data2 + ximage->bytes_per_line * (ximage->height - 1);
+ for (y = 0; y < ximage->height; y++)
+ {
+ memcpy (out, in, ximage->bytes_per_line);
+ in += ximage->bytes_per_line;
+ out -= ximage->bytes_per_line;
+ }
+ free (ximage->data);
+ ximage->data = data2;
+}
+
+
+static void
+analogtv_convert (const char *infile, const char *outfile,
+ const char *audiofile, const char *logofile,
+ int duration, Bool powerp)
+{
+ struct state *st = &global_state;
+ XImage *ximage = file_to_ximage (0, 0, infile);
+ Display *dpy = 0;
+ Window window = 0;
+ int i;
+ unsigned long curticks = 0;
+ time_t lastlog = time((time_t *)0);
+ int frames_left;
+ int fps = 30;
+
+ if (verbose_p)
+ fprintf (stderr, "%s: progname: loaded %s %dx%d\n",
+ progname, infile, ximage->width, ximage->height);
+
+ flip_ximage (ximage);
+
+ memset (st, 0, sizeof(*st));
+ st->dpy = dpy;
+ st->window = window;
+
+ st->output_frame = XCreateImage (dpy, 0, ximage->depth, ximage->format, 0,
+ NULL,
+ ximage->width & ~1, /* can't be odd */
+ ximage->height & ~1,
+ ximage->bitmap_pad, 0);
+ st->output_frame->data = (char *)
+ calloc (st->output_frame->height, st->output_frame->bytes_per_line);
+
+ {
+ char *s1, *s2;
+ st->framefile_fmt = malloc (strlen(outfile) + 100);
+ strcpy (st->framefile_fmt, outfile);
+ s1 = strrchr (st->framefile_fmt, '/');
+ s2 = strrchr (st->framefile_fmt, '.');
+ if (s2 && s2 > s1) *s2 = 0;
+ sprintf (st->framefile_fmt + strlen(st->framefile_fmt),
+ ".%08x.%%06d.png", (random() % 0xFFFFFFFF));
+ }
+
+ if (logofile) {
+ int x, y;
+ st->logo = file_to_ximage (0, 0, logofile);
+ if (verbose_p)
+ fprintf (stderr, "%s: progname: loaded %s %dx%d\n",
+ progname, logofile, st->logo->width, st->logo->height);
+ flip_ximage (st->logo);
+ /* Pull the alpha out of the logo and make a separate mask ximage. */
+ st->logo_mask = XCreateImage (dpy, 0, st->logo->depth, st->logo->format, 0,
+ NULL, st->logo->width, st->logo->height,
+ st->logo->bitmap_pad, 0);
+ st->logo_mask->data = (char *)
+ calloc (st->logo_mask->height, st->logo_mask->bytes_per_line);
+
+ for (y = 0; y < st->logo->height; y++)
+ for (x = 0; x < st->logo->width; x++) {
+ unsigned long p = XGetPixel (st->logo, x, y);
+ uint8_t a = (p & 0xFF000000L) >> 24;
+ XPutPixel (st->logo, x, y, (p & 0x00FFFFFFL));
+ XPutPixel (st->logo_mask, x, y, (a ? 0x00FFFFFFL : 0));
+ }
+ }
+
+
+ if (audiofile) {
+ struct stat ss;
+ if (stat (audiofile, &ss))
+ {
+ fprintf (stderr, "%s: %s does not exist\n", progname, audiofile);
+ exit (1);
+ }
+ }
+
+ /* Catch signals to delete tmp files before we start writing them. */
+
+ signal (SIGHUP, analogtv_signal);
+ signal (SIGINT, analogtv_signal);
+ signal (SIGQUIT, analogtv_signal);
+ signal (SIGILL, analogtv_signal);
+ signal (SIGTRAP, analogtv_signal);
+# ifdef SIGIOT
+ signal (SIGIOT, analogtv_signal);
+# endif
+ signal (SIGABRT, analogtv_signal);
+# ifdef SIGEMT
+ signal (SIGEMT, analogtv_signal);
+# endif
+ signal (SIGFPE, analogtv_signal);
+ signal (SIGBUS, analogtv_signal);
+ signal (SIGSEGV, analogtv_signal);
+# ifdef SIGSYS
+ signal (SIGSYS, analogtv_signal);
+# endif
+ signal (SIGTERM, analogtv_signal);
+# ifdef SIGXCPU
+ signal (SIGXCPU, analogtv_signal);
+# endif
+# ifdef SIGXFSZ
+ signal (SIGXFSZ, analogtv_signal);
+# endif
+# ifdef SIGDANGER
+ signal (SIGDANGER, analogtv_signal);
+# endif
+
+ st->tv=analogtv_allocate(dpy, window);
+
+ while (st->n_stations < MAX_STATIONS) {
+ analogtv_input *input=analogtv_input_allocate();
+ st->stations[st->n_stations++]=input;
+ input->client_data = st;
+ }
+
+ analogtv_set_defaults(st->tv, "");
+ st->tv->need_clear=1;
+
+ if (random()%4==0) {
+ st->tv->tint_control += pow(frand(2.0)-1.0, 7) * 180.0;
+ }
+ if (1) {
+ st->tv->color_control += frand(0.3) * RANDSIGN();
+ }
+ if (random()%4==0) {
+ st->tv->brightness_control += frand(0.15);
+ }
+ if (random()%4==0) {
+ st->tv->contrast_control += frand(0.2) * RANDSIGN();
+ }
+
+ for (i=0; i<N_CHANNELS; i++) {
+ memset(&st->chansettings[i], 0, sizeof(chansetting));
+
+ st->chansettings[i].noise_level = 0.06;
+ {
+ int last_station=42;
+ int stati;
+ for (stati=0; stati<MAX_MULTICHAN; stati++) {
+ analogtv_reception *rec=&st->chansettings[i].recs[stati];
+ int station;
+ while (1) {
+ station=random()%st->n_stations;
+ if (station!=last_station) break;
+ if ((random()%10)==0) break;
+ }
+ last_station=station;
+ rec->input = st->stations[station];
+ rec->level = pow(frand(1.0), 3.0) * 2.0 + 0.05;
+ rec->ofs=random()%ANALOGTV_SIGNAL_LEN;
+ if (random()%3) {
+ rec->multipath = frand(1.0);
+ } else {
+ rec->multipath=0.0;
+ }
+ if (stati) {
+ /* We only set a frequency error for ghosting stations,
+ because it doesn't matter otherwise */
+ rec->freqerr = (frand(2.0)-1.0) * 3.0;
+ }
+
+ if (rec->level > 0.3) break;
+ if (random()%4) break;
+ }
+ }
+ }
+
+ st->curinputi=0;
+ st->cs = &st->chansettings[st->curinputi];
+ frames_left = fps * (2 + frand(1.5));
+
+ st->tv->powerup=0.0;
+
+ /* load_station_images() */
+
+ for (i = 0; i < MAX_STATIONS; i++) {
+ analogtv_input *input = st->stations[i];
+
+ if (i == 1) { /* station 0 is the unadulterated image.
+ station 1 is colorbars. */
+ input->updater = update_smpte_colorbars;
+ } else {
+ int w = ximage->width * 0.815; /* underscan */
+ int h = ximage->height * 0.970;
+ int x = (ximage->width - w) / 2;
+ int y = (ximage->height - h) / 2;
+ analogtv_input *input = st->stations[i];
+ analogtv_setup_sync(input, 1, (random()%20)==0);
+ analogtv_load_ximage (st->tv, input, ximage, 0, x, y, w, h);
+ }
+ }
+
+
+ /* xanalogtv_draw() */
+
+ while (1) {
+ const analogtv_reception *recs[MAX_MULTICHAN];
+ unsigned rec_count = 0;
+ double curtime=curticks*0.001;
+
+ frames_left--;
+ if (frames_left <= 0) {
+ frames_left = fps * (0.5 + frand(2.5));
+
+ if (st->curinputi != 0 && !(random() % 3)) {
+ st->curinputi = 0; /* unadulterated image */
+ } else {
+ st->curinputi = 1 + (random() % (N_CHANNELS - 1));
+ }
+
+ st->cs = &st->chansettings[st->curinputi];
+ /* Set channel change noise flag */
+ st->tv->channel_change_cycles=200000;
+ }
+
+ for (i=0; i<MAX_MULTICHAN; i++) {
+ analogtv_reception *rec = &st->cs->recs[i];
+ analogtv_input *inp=rec->input;
+ if (!inp) continue;
+
+ if (inp->updater) {
+ inp->next_update_time = curtime;
+ (inp->updater)(inp);
+ }
+ rec->ofs += rec->freqerr;
+ }
+
+ st->tv->powerup=(powerp ? curtime : 9999);
+
+ if (st->curinputi == 0) {
+ XPutImage (dpy, 0, 0, ximage, 0, 0, 0, 0,
+ ximage->width, ximage->height);
+ } else {
+ for (i=0; i<MAX_MULTICHAN; i++) {
+ analogtv_reception *rec = &st->cs->recs[i];
+ if (rec->input) {
+ analogtv_reception_update(rec);
+ recs[rec_count] = rec;
+ ++rec_count;
+ }
+ }
+ analogtv_draw (st->tv, st->cs->noise_level, recs, rec_count);
+ }
+
+ analogtv_save_frame (st, outfile, st->frames_written);
+
+ if (curtime >= duration) break;
+
+ curticks += 1000/fps;
+ st->frames_written++;
+
+ if (verbose_p) {
+ unsigned long now = time((time_t *)0);
+ if (now > lastlog + 5) {
+ fprintf (stderr, "%s: %2d%%...\n", progname,
+ (int) (curtime * 100 / duration));
+ lastlog = now;
+ }
+ }
+ }
+
+ analogtv_write_mp4 (st, outfile, audiofile, st->frames_written);
+}
+
+
+static void
+usage(const char *err)
+{
+ if (err) fprintf (stderr, "%s: %s unknown\n", progname, err);
+ fprintf (stderr, "usage: %s [--verbose] [--duration secs]"
+ " [--audio mp3-file] [--no-powerup] infile.png outfile.mp4\n",
+ progname);
+ exit (1);
+}
+
+int
+main (int argc, char **argv)
+{
+ int i;
+ const char *infile = 0;
+ const char *outfile = 0;
+ int duration = 30;
+ Bool powerp = False;
+ char *audio = 0;
+ char *logo = 0;
+
+ char *s = strrchr (argv[0], '/');
+ progname = s ? s+1 : argv[0];
+ progclass = progname;
+
+ for (i = 1; i < argc; i++)
+ {
+ if (argv[i][0] == '-' && argv[i][1] == '-')
+ argv[i]++;
+ if (!strcmp(argv[i], "-v") ||
+ !strcmp(argv[i], "-verbose"))
+ verbose_p++;
+ else if (!strcmp(argv[i], "-vv")) verbose_p += 2;
+ else if (!strcmp(argv[i], "-vvv")) verbose_p += 3;
+ else if (!strcmp(argv[i], "-vvvv")) verbose_p += 4;
+ else if (!strcmp(argv[i], "-vvvvv")) verbose_p += 5;
+ else if (!strcmp(argv[i], "-duration") && argv[i+1])
+ {
+ char dummy;
+ i++;
+ if (1 != sscanf (argv[i], " %d %c", &duration, &dummy))
+ usage(argv[i]);
+ }
+ else if (!strcmp(argv[i], "-audio") && argv[i+1])
+ audio = argv[++i];
+ else if (!strcmp(argv[i], "-logo") && argv[i+1])
+ logo = argv[++i];
+ else if (!strcmp(argv[i], "-powerup") ||
+ !strcmp(argv[i], "-power"))
+ powerp = True;
+ else if (!strcmp(argv[i], "-no-powerup") ||
+ !strcmp(argv[i], "-no-power"))
+ powerp = False;
+ else if (argv[i][0] == '-')
+ usage(argv[i]);
+ else if (!infile)
+ infile = argv[i];
+ else if (!outfile)
+ outfile = argv[i];
+ else
+ usage(argv[i]);
+ }
+ if (!infile) usage("input file");
+ if (!outfile) usage("output file");
+
+# undef ya_rand_init
+ ya_rand_init (0);
+ analogtv_convert (infile, outfile, audio, logo, duration, powerp);
+ exit (0);
+}
diff --git a/hacks/analogtv.c b/hacks/analogtv.c
index fd7f504..8ef3c7d 100644
--- a/hacks/analogtv.c
+++ b/hacks/analogtv.c
@@ -329,7 +329,7 @@ analogtv_configure(analogtv *it)
wlim = it->xgwa.width;
ratio = wlim / (float) hlim;
-#ifdef HAVE_MOBILE
+#if defined(HAVE_MOBILE) || defined(NO_CONSTRAIN_RATIO)
/* Fill the whole iPhone screen, even though that distorts the image. */
min_ratio = 0;
max_ratio = 10;
@@ -1002,7 +1002,7 @@ analogtv_setup_sync(analogtv_input *input, int do_cb, int do_ssavi)
if (do_cb) {
/* 9 cycles of colorburst */
- for (i=ANALOGTV_CB_START; i<ANALOGTV_CB_START+36; i+=4) {
+ for (i=ANALOGTV_CB_START; i<ANALOGTV_CB_START+36*ANALOGTV_SCALE; i+=4*ANALOGTV_SCALE) {
sig[i+1] += ANALOGTV_CB_LEVEL;
sig[i+3] -= ANALOGTV_CB_LEVEL;
}
@@ -1022,11 +1022,11 @@ analogtv_sync(analogtv *it)
float cbfc=1.0f/128.0f;
/* sp = it->rx_signal + lineno*ANALOGTV_H + cur_hsync;*/
- for (i=-32; i<32; i++) {
+ for (i=-32*ANALOGTV_SCALE; i<32*ANALOGTV_SCALE; i++) {
lineno = (cur_vsync + i + ANALOGTV_V) % ANALOGTV_V;
sp = it->rx_signal + lineno*ANALOGTV_H;
filt=0.0f;
- for (j=0; j<ANALOGTV_H; j+=ANALOGTV_H/16) {
+ for (j=0; j<ANALOGTV_H; j+=ANALOGTV_H/(16*ANALOGTV_SCALE)) {
filt += sp[j];
}
filt *= it->agclevel;
@@ -1039,11 +1039,11 @@ analogtv_sync(analogtv *it)
for (lineno=0; lineno<ANALOGTV_V; lineno++) {
- if (lineno>5 && lineno<ANALOGTV_V-3) { /* ignore vsync interval */
+ if (lineno>5*ANALOGTV_SCALE && lineno<ANALOGTV_V-3*ANALOGTV_SCALE) { /* ignore vsync interval */
unsigned lineno2 = (lineno + cur_vsync + ANALOGTV_V)%ANALOGTV_V;
if (!lineno2) lineno2 = ANALOGTV_V;
sp = it->rx_signal + lineno2*ANALOGTV_H + cur_hsync;
- for (i=-8; i<8; i++) {
+ for (i=-8*ANALOGTV_SCALE; i<8*ANALOGTV_SCALE; i++) {
osc = (float)(ANALOGTV_H+i)/(float)ANALOGTV_H;
filt=(sp[i-3]+sp[i-2]+sp[i-1]+sp[i]) * it->agclevel;
@@ -1061,9 +1061,9 @@ analogtv_sync(analogtv *it)
cycles.
*/
- if (lineno>15) {
+ if (lineno>15*ANALOGTV_SCALE) {
sp = it->rx_signal + lineno*ANALOGTV_H + (cur_hsync&~3);
- for (i=ANALOGTV_CB_START+8; i<ANALOGTV_CB_START+36-8; i++) {
+ for (i=ANALOGTV_CB_START+8*ANALOGTV_SCALE; i<ANALOGTV_CB_START+(36-8)*ANALOGTV_SCALE; i++) {
it->cb_phase[i&3] = it->cb_phase[i&3]*(1.0f-cbfc) +
sp[i]*it->agclevel*cbfc;
}
@@ -2009,7 +2009,7 @@ analogtv_load_ximage(analogtv *it, analogtv_input *input,
unsigned long black = 0; /* not BlackPixelOfScreen (it->xgwa.screen); */
int x_length=ANALOGTV_PIC_LEN;
- int y_overscan=5; /* overscan this much top and bottom */
+ int y_overscan=5*ANALOGTV_SCALE; /* overscan this much top and bottom */
int y_scanlength=ANALOGTV_VISLINES+2*y_overscan;
if (target_w > 0) x_length = x_length * target_w / it->xgwa.width;
@@ -2297,8 +2297,8 @@ analogtv_make_font(Display *dpy, Window window, analogtv_font *f,
f->text_im->bytes_per_line);
}
- f->x_mult=4;
- f->y_mult=2;
+ f->x_mult=4 * ANALOGTV_SCALE;
+ f->y_mult=2 * ANALOGTV_SCALE;
}
int
@@ -2415,7 +2415,7 @@ analogtv_draw_string(analogtv_input *input, analogtv_font *f,
{
while (*s) {
analogtv_draw_char(input, f, *s, x, y, ntsc);
- x += f->char_w * 4;
+ x += f->char_w * f->x_mult;
s++;
}
}
@@ -2424,7 +2424,7 @@ void
analogtv_draw_string_centered(analogtv_input *input, analogtv_font *f,
char *s, int x, int y, int ntsc[4])
{
- int width=strlen(s) * f->char_w * 4;
+ int width=strlen(s) * f->char_w * f->x_mult;
x -= width/2;
analogtv_draw_string(input, f, s, x, y, ntsc);
diff --git a/hacks/analogtv.h b/hacks/analogtv.h
index e3170f1..4b11b58 100644
--- a/hacks/analogtv.h
+++ b/hacks/analogtv.h
@@ -19,21 +19,29 @@
# define HAVE_MOBILE
#endif
+/* To simulate an NTSC CRT monitor with way more scanlines, and thus
+ apply an ahistorical tv-like effect to a larger image, increase
+ this resolution multiplier.
+ */
+#ifndef ANALOGTV_SCALE
+# define ANALOGTV_SCALE 1
+#endif
+
/*
You'll need these to generate standard NTSC TV signals
*/
enum {
/* We don't handle interlace here */
- ANALOGTV_V=262,
- ANALOGTV_TOP=30,
- ANALOGTV_VISLINES=200,
+ ANALOGTV_V=262*ANALOGTV_SCALE,
+ ANALOGTV_TOP=30*ANALOGTV_SCALE,
+ ANALOGTV_VISLINES=200*ANALOGTV_SCALE,
ANALOGTV_BOT=ANALOGTV_TOP + ANALOGTV_VISLINES,
/* This really defines our sampling rate, 4x the colorburst
frequency. Handily equal to the Apple II's dot clock.
You could also make a case for using 3x the colorburst freq,
but 4x isn't hard to deal with. */
- ANALOGTV_H=912,
+ ANALOGTV_H=912*ANALOGTV_SCALE,
/* Each line is 63500 nS long. The sync pulse is 4700 nS long, etc.
Define sync, back porch, colorburst, picture, and front porch
@@ -54,7 +62,7 @@ enum {
ANALOGTV_VIS_END=ANALOGTV_PIC_START + (ANALOGTV_PIC_LEN*7/8),
ANALOGTV_VIS_LEN=ANALOGTV_VIS_END-ANALOGTV_VIS_START,
- ANALOGTV_HASHNOISE_LEN=6,
+ ANALOGTV_HASHNOISE_LEN=6*ANALOGTV_SCALE,
ANALOGTV_GHOSTFIR_LEN=4,
diff --git a/hacks/anemone.c b/hacks/anemone.c
index deedb27..f0ea5e8 100644
--- a/hacks/anemone.c
+++ b/hacks/anemone.c
@@ -409,6 +409,9 @@ anemone_free (Display *dpy, Window window, void *closure)
struct state *st = (struct state *) closure;
if (st->vPendage) free (st->vPendage);
if (st->appD) free (st->appD);
+ XFreeGC (dpy, st->gcDraw);
+ XFreeGC (dpy, st->gcClear);
+ free (st->colors);
free (st);
}
diff --git a/hacks/anemotaxis.c b/hacks/anemotaxis.c
index 9f240e8..04c12e3 100644
--- a/hacks/anemotaxis.c
+++ b/hacks/anemotaxis.c
@@ -722,6 +722,9 @@ anemotaxis_free (Display *dpy, Window window, void *closure)
if (st->searcher[i]) destroy_searcher (st->searcher[i]);
free (st->searcher);
}
+ XFreeGC (dpy, st->gcDraw);
+ XFreeGC (dpy, st->gcClear);
+ free (st->colors);
free (st);
}
diff --git a/hacks/apple2-main.c b/hacks/apple2-main.c
index 3063b58..c30be1f 100644
--- a/hacks/apple2-main.c
+++ b/hacks/apple2-main.c
@@ -813,7 +813,7 @@ struct terminal_controller_data {
/* The structure of closure linkage throughout this code is so amazingly
baroque that I can't get to the 'struct state' from where I need it. */
-static const char *global_program;
+static char *global_program;
static Bool global_fast_p;
@@ -1825,8 +1825,10 @@ apple2_init (Display *dpy, Window window)
}
if (s) free (s);
- global_program = get_string_resource (dpy, "program", "Program");
- global_fast_p = get_boolean_resource (dpy, "fast", "Boolean");
+ if (!global_program) {
+ global_program = get_string_resource (dpy, "program", "Program");
+ global_fast_p = get_boolean_resource (dpy, "fast", "Boolean");
+ }
/* Kludge for MacOS standalone mode: see OSX/SaverRunner.m. */
@@ -1836,7 +1838,8 @@ apple2_init (Display *dpy, Window window)
{
st->controller = terminal_controller;
st->random_p = False;
- global_program = getenv ("SHELL");
+ if (global_program) free (global_program);
+ global_program = strdup (getenv ("SHELL"));
global_fast_p = True;
}
}
@@ -1906,6 +1909,8 @@ apple2_free (Display *dpy, Window window, void *closure)
if (apple2_one_frame (st->sim))
abort(); /* should have freed! */
}
+ if (global_program) free (global_program);
+ global_program = 0;
free (st);
}
diff --git a/hacks/attraction.c b/hacks/attraction.c
index 4fe22c2..25bc3b0 100644
--- a/hacks/attraction.c
+++ b/hacks/attraction.c
@@ -227,6 +227,7 @@ attraction_init (Display *dpy, Window window)
progname, mode_str);
exit (1);
}
+ if (mode_str) free (mode_str);
graph_mode_str = get_string_resource (dpy, "graphmode", "Mode");
if (! graph_mode_str) st->graph_mode = graph_none;
@@ -241,6 +242,7 @@ attraction_init (Display *dpy, Window window)
progname, graph_mode_str);
exit (1);
}
+ if (graph_mode_str) free (graph_mode_str);
/* only allocate memory if it is needed */
if(st->graph_mode != graph_none)
@@ -1044,6 +1046,9 @@ attraction_free (Display *dpy, Window window, void *closure)
if (st->colors) free (st->colors);
if (st->spl) free_spline (st->spl);
+ XFreeGC (dpy, st->draw_gc);
+ XFreeGC (dpy, st->erase_gc);
+
free (st);
}
diff --git a/hacks/barcode.c b/hacks/barcode.c
index 31574bd..2ce609e 100644
--- a/hacks/barcode.c
+++ b/hacks/barcode.c
@@ -391,14 +391,12 @@ static void bitmapClear (Bitmap *b)
memset (b->buf, 0, b->widthBytes * b->height);
}
-#if 0
/* free a bitmap */
static void bitmapFree (Bitmap *b)
{
free (b->buf);
free (b);
}
-#endif
/* get the byte value at the given byte-offset coordinates in the given
@@ -1913,6 +1911,16 @@ barcode_reshape (Display *dpy, Window window, void *closure,
static void
barcode_free (Display *dpy, Window window, void *closure)
{
+ struct state *st = (struct state *) closure;
+ int i;
+ XFreeGC (dpy, st->theGC);
+ st->theImage->data = 0;
+ XDestroyImage (st->theImage);
+ bitmapFree (st->theBitmap);
+ for (i = 0; i < st->barcode_max; i++)
+ bitmapFree (st->barcodes[i].bitmap);
+ free (st->barcodes);
+ free (st);
}
diff --git a/hacks/binaryring.c b/hacks/binaryring.c
index 3cbaec2..755a1b4 100644
--- a/hacks/binaryring.c
+++ b/hacks/binaryring.c
@@ -554,10 +554,12 @@ static void binaryring_free ( Display* display, Window win, void *closure ) {
XWindowAttributes tmp;
XGetWindowAttributes(display, win, &tmp);
- free( st->buffer );
- free( st->particles );
-
- free ( st );
+ if (st->gc) XFreeGC (display, st->gc);
+ if (st->pix) XFreePixmap (display, st->pix);
+ if (st->buf) XDestroyImage (st->buf);
+ free (st->buffer);
+ free (st->particles);
+ free (st);
}
diff --git a/hacks/blaster.c b/hacks/blaster.c
index a60351a..5ab3741 100644
--- a/hacks/blaster.c
+++ b/hacks/blaster.c
@@ -1083,6 +1083,8 @@ blaster_free (Display *dpy, Window window, void *closure)
if (st->l_color1) XFreeGC (dpy, st->l_color1);
if (st->s_color) XFreeGC (dpy, st->s_color);
if (st->black) XFreeGC (dpy, st->black);
+ if (st->EXPLODE_COLOR_1) XFreeGC (dpy, st->EXPLODE_COLOR_1);
+ if (st->EXPLODE_COLOR_2) XFreeGC (dpy, st->EXPLODE_COLOR_2);
if (st->stars) free (st->stars);
if (st->mother) {
free (st->mother->lasers);
diff --git a/hacks/blitspin.c b/hacks/blitspin.c
index d27271d..00d9109 100644
--- a/hacks/blitspin.c
+++ b/hacks/blitspin.c
@@ -256,11 +256,13 @@ blitspin_init (Display *d_arg, Window w_arg)
bitmap_name = get_string_resource (st->dpy, "bitmap", "Bitmap");
if (! bitmap_name || !*bitmap_name)
- bitmap_name = "(default)";
+ bitmap_name = strdup ("(default)");
if (!strcasecmp (bitmap_name, "(default)") ||
- !strcasecmp (bitmap_name, "default"))
- bitmap_name = "(screen)";
+ !strcasecmp (bitmap_name, "default")) {
+ free (bitmap_name);
+ bitmap_name = strdup ("(screen)");
+ }
if (!strcasecmp (bitmap_name, "(builtin)") ||
!strcasecmp (bitmap_name, "builtin"))
@@ -309,6 +311,7 @@ blitspin_init (Display *d_arg, Window w_arg)
blitspin_init_2 (st);
}
+ if (bitmap_name) free (bitmap_name);
return st;
}
@@ -421,6 +424,18 @@ blitspin_event (Display *dpy, Window window, void *closure, XEvent *event)
static void
blitspin_free (Display *dpy, Window window, void *closure)
{
+ struct state *st = (struct state *) closure;
+# ifdef USE_XCOPYAREA
+ if (st->gc_set) XFreeGC (dpy, st->gc_set);
+ if (st->gc_clear) XFreeGC (dpy, st->gc_clear);
+ if (st->gc_copy) XFreeGC (dpy, st->gc_copy);
+ if (st->gc_and) XFreeGC (dpy, st->gc_and);
+ if (st->gc_or) XFreeGC (dpy, st->gc_or);
+ if (st->gc_xor) XFreeGC (dpy, st->gc_xor);
+# endif
+ if (st->gc) XFreeGC (dpy, st->gc);
+ XFreePixmap (dpy, st->bitmap);
+ free (st);
}
diff --git a/hacks/boxfit.c b/hacks/boxfit.c
index 1b1d0d7..09d2ef7 100644
--- a/hacks/boxfit.c
+++ b/hacks/boxfit.c
@@ -88,6 +88,7 @@ reset_boxes (state *st)
progname, s);
exit (1);
}
+ free (s);
}
if (st->mode == -1)
@@ -514,6 +515,11 @@ boxfit_event (Display *dpy, Window window, void *closure, XEvent *event)
static void
boxfit_free (Display *dpy, Window window, void *closure)
{
+ state *st = (state *) closure;
+ if (st->boxes) free (st->boxes);
+ if (st->colors) free (st->colors);
+ XFreeGC (dpy, st->gc);
+ free (st);
}
diff --git a/hacks/bsod.c b/hacks/bsod.c
index ff6c359..f3af911 100644
--- a/hacks/bsod.c
+++ b/hacks/bsod.c
@@ -61,6 +61,8 @@
#include "images/gen/macbomb_png.h"
#include "images/gen/apple_png.h"
#include "images/gen/atm_png.h"
+#include "images/gen/sun_png.h"
+#include "images/gen/dvd_png.h"
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@ -481,8 +483,14 @@ draw_char (struct bsod_state *bst, char c)
{
int dir, ascent, descent;
XCharStruct ov;
+ Bool cursorp = (c == '\033'); /* apparently \e is non-standard now! */
+
+ if (cursorp) c = ' ';
XTextExtents (bst->font, &c, 1, &dir, &ascent, &descent, &ov);
+ if (bst->x < bst->left_margin)
+ bst->x = bst->left_margin;
+
if ((bst->wrap_p || bst->word_wrap_p) &&
bst->x + ov.width > bst->xgwa.width - bst->right_margin - bst->xoff)
{
@@ -518,8 +526,30 @@ draw_char (struct bsod_state *bst, char c)
}
}
+ /* We render the character ESC as an inverted space (block cursor). */
+
+ if (cursorp)
+ {
+ unsigned long swap = bst->fg;
+ bst->fg = bst->bg;
+ bst->bg = swap;
+ XSetForeground (bst->dpy, bst->gc, bst->fg);
+ XSetBackground (bst->dpy, bst->gc, bst->bg);
+ }
+
XDrawImageString (bst->dpy, bst->window, bst->gc,
bst->x, bst->y, &c, 1);
+
+ if (cursorp)
+ {
+ unsigned long swap = bst->fg;
+ bst->fg = bst->bg;
+ bst->bg = swap;
+ XSetForeground (bst->dpy, bst->gc, bst->fg);
+ XSetBackground (bst->dpy, bst->gc, bst->bg);
+ c = ' ';
+ }
+
bst->x += ov.width;
if (bst->word_wrap_p)
@@ -670,6 +700,11 @@ bsod_pop (struct bsod_state *bst)
int h = (long) bst->queue[bst->pos].arg4;
int tox = (long) bst->queue[bst->pos].arg5;
int toy = (long) bst->queue[bst->pos].arg6;
+
+ /* If ~0, place pixmap at current text pos */
+ if (tox == ~0) tox = bst->x;
+ if (toy == ~0) toy = bst->y - bst->font->ascent;
+
if (type == PIXMAP && bst->mask)
{
XSetClipMask (bst->dpy, bst->gc, bst->mask);
@@ -838,7 +873,7 @@ make_bsod_state (Display *dpy, Window window,
char buf1[1024], buf2[1024];
char buf5[1024], buf6[1024];
char buf7[1024], buf8[1024];
- const char *font1, *font3, *font4;
+ char *font1, *font3, *font4;
bst = (struct bsod_state *) calloc (1, sizeof (*bst));
bst->queue_size = 10;
@@ -939,6 +974,11 @@ make_bsod_state (Display *dpy, Window window,
bst->y = bst->font->ascent + bst->left_margin + bst->yoff;
XSetWindowBackground (dpy, window, gcv.background);
+
+ if (font1) free (font1);
+ if (font3) free (font3);
+ if (font4) free (font4);
+
return bst;
}
@@ -956,6 +996,8 @@ free_bsod_state (struct bsod_state *bst)
XFreePixmap(bst->dpy, bst->mask);
XFreeFont (bst->dpy, bst->font);
+ if (bst->fontB && bst->fontB != bst->font) XFreeFont (bst->dpy, bst->fontB);
+ if (bst->fontC && bst->fontC != bst->font) XFreeFont (bst->dpy, bst->fontC);
XFreeGC (bst->dpy, bst->gc);
for (i = 0; i < bst->queue_size; i++)
@@ -3217,6 +3259,36 @@ sparc_solaris (Display *dpy, Window window)
{
struct bsod_state *bst = make_bsod_state (dpy, window, "solaris", "Solaris");
int i;
+ int pix_w = 0, pix_h = 0;
+ int char_width;
+ Pixmap mask = 0;
+ Pixmap pixmap = image_data_to_pixmap (dpy, window,
+ sun_png, sizeof(sun_png),
+ &pix_w, &pix_h, &mask);
+# if 0
+ if (pixmap &&
+ pix_w < bst->xgwa.width / 2 &&
+ pix_h < bst->xgwa.height / 2)
+ {
+ int i, n = 1;
+ if (bst->xgwa.width > 2560) n++; /* Retina displays */
+ for (i = 0; i < n; i++)
+ {
+ pixmap = double_pixmap (dpy, bst->xgwa.visual,
+ bst->xgwa.depth, pixmap, pix_w, pix_h);
+ mask = double_pixmap (dpy, bst->xgwa.visual, 1, mask, pix_w, pix_h);
+ pix_w *= 2;
+ pix_h *= 2;
+ }
+ }
+# endif
+
+ char_width = (bst->font->per_char
+ ? bst->font->per_char['n'-bst->font->min_char_or_byte2].width
+ : bst->font->min_bounds.width);
+
+ bst->pixmap = pixmap;
+ bst->mask = mask;
bst->scroll_p = True;
bst->wrap_p = True;
@@ -3224,8 +3296,14 @@ sparc_solaris (Display *dpy, Window window)
bst->top_margin = bst->bottom_margin = bst->xgwa.height * 0.07;
bst->y = bst->top_margin + bst->yoff + bst->font->ascent;
+# if 0
+ /* This looks correct if we have a desktop image behind it, but doesn't
+ make sense if it's a photo. So let's skip it. */
BSOD_IMG (bst);
BSOD_PAUSE (bst, 3000000);
+# endif
+
+ BSOD_LINE_DELAY (bst, 20000);
BSOD_INVERT(bst);
BSOD_RECT (bst, True,
@@ -3260,30 +3338,359 @@ sparc_solaris (Display *dpy, Window window)
" 100131480 10012a6e0 0\n"
"End traceback...\n"
"panic[cpu0]/thread=30000953a20: trap\n"
- "syncing file systems...");
+ "syncing file systems...\033");
BSOD_PAUSE (bst, 3000000);
- BSOD_TEXT (bst, LEFT, " 1 done\n");
- BSOD_TEXT (bst, LEFT, "dumping to /dev/dsk/c0t0d0s3, offset 26935296\n");
+ BSOD_TEXT (bst, LEFT, "\b 1 done\n");
+ BSOD_TEXT (bst, LEFT, "dumping to /dev/dsk/c0t0d0s3, offset 26935296\n\033");
BSOD_PAUSE (bst, 2000000);
-
+ BSOD_TEXT (bst, LEFT, "\b");
for (i = 1; i <= 100; ++i)
{
char buf[100];
- sprintf (buf, "\b\b\b\b\b\b\b\b\b\b\b%3d%% done", i);
+ sprintf (buf, "\r %3d%% done\033", i);
BSOD_TEXT (bst, LEFT, buf);
BSOD_PAUSE (bst, 100000);
}
BSOD_TEXT (bst, LEFT,
- ": 2803 pages dumped, compression ratio 2.88, dump succeeded\n");
+ "\b: 2803 pages dumped, compression ratio 2.88, dump succeeded\n\033");
BSOD_PAUSE (bst, 2000000);
BSOD_TEXT (bst, LEFT,
- "rebooting...\n"
- "Resetting ...");
+ "\brebooting...\n"
+ "Resetting ...\n\033");
+
+ BSOD_PAUSE (bst, 3000000);
+
+ BSOD_INVERT(bst);
+ BSOD_RECT (bst, True,
+ bst->left_margin, bst->top_margin,
+ bst->xgwa.width - bst->left_margin - bst->right_margin,
+ bst->xgwa.height - bst->top_margin - bst->bottom_margin);
+ BSOD_INVERT(bst);
+ BSOD_MOVETO (bst, bst->left_margin, bst->top_margin + bst->font->ascent);
+ BSOD_PAUSE (bst, 1000000);
+
+ BSOD_TEXT (bst, LEFT,
+ "Starting real time clock...\n"
+ "Probing /sbus@1,f8000000 at 0,0 dma esp sd st le\n"
+ "Probing /sbus@1,f8000000 at 1,0 Invalid FCode start byte at ffe70000\n"
+ "Probing /sbus@1,f8000000 at 2,0 Invalid FCode start byte at ffe70000\n"
+ "Probing /sbus@1,f8000000 at 3,0 bwtwo\n"
+ "\n");
+
+ BSOD_PIXMAP (bst, 0, 0, pix_w, pix_h, ~0, ~0);
+ BSOD_MARGINS (bst,
+ bst->left_margin + char_width * 12,
+ bst->top_margin);
+ BSOD_TEXT (bst, LEFT,
+ "SPARCstation IPC, Keyboard Present\n"
+ "ROM Rev. 2.9, 16 MB memory installed, Serial #12648190.\n"
+ "Ethernet address 8:0:20:37:1:87, Host ID: 52c0fefe.\n");
+ BSOD_MARGINS (bst, bst->left_margin, bst->top_margin);
+
+ BSOD_TEXT (bst, LEFT, "\n\n\033");
+ BSOD_PAUSE (bst, 3000000);
+ BSOD_TEXT (bst, LEFT, "\r");
+
+ BSOD_TEXT (bst, LEFT, "Testing 16 megs of memory. Still to go \033 16");
+
+ for (i = 16; i > 0; i--)
+ {
+ char buf[100];
+ sprintf (buf, "\b\b%2d", i);
+ BSOD_TEXT (bst, LEFT, buf);
+ BSOD_PAUSE (bst, 100000);
+ }
+ BSOD_TEXT (bst, LEFT, "\b\b\b\b 0\n"
+ "Initializing 16 megs of memory at addr 0\033 16");
+ for (i = 16; i >= 0; i--)
+ {
+ char buf[100];
+ sprintf (buf, "\b\b%2d", i);
+ BSOD_TEXT (bst, LEFT, buf);
+ BSOD_PAUSE (bst, 30000);
+ }
+ BSOD_TEXT (bst, LEFT, "\r"
+ " \r"
+ "Boot device: /sbus/le@0,c00000 File and args:\n\033");
+
+ {
+ int n = (random() % 10);
+ for (i = 0; i < n; i++)
+ {
+ BSOD_PAUSE (bst, 3000000);
+ BSOD_TEXT (bst, LEFT, "\rTimeout waiting for ARP/RARP packet\n\033");
+ }
+ }
+ BSOD_TEXT (bst, LEFT, "\r");
+
+ BSOD_TEXT (bst, LEFT,
+ "Internal loopback test -- Wrong packet length;"
+ " expected 36, observed 1600\n"
+ "Can't open boot device\n"
+ "\n"
+ "Type b (boot), c (continue), or n (new command mode)\n"
+ ">");
+ BSOD_CURSOR (bst, CURSOR_BLOCK, 500000, 10);
+ BSOD_TEXT (bst, LEFT, "n\n");
+ BSOD_PAUSE (bst, 500000);
+ BSOD_TEXT (bst, LEFT, "Type help for more information\n"
+ "ok ");
+
+ BSOD_CURSOR (bst, CURSOR_BLOCK, 500000, 4);
+ BSOD_CHAR_DELAY (bst, 80000);
+ BSOD_TEXT (bst, LEFT, /* "test net" */
+ "t\033\be\033\bs\033\bt\033\b \033\bn\033\be\033\bt\033\b");
+ BSOD_CURSOR (bst, CURSOR_BLOCK, 500000, 2);
+ BSOD_TEXT (bst, LEFT, "\n\033");
+ BSOD_CHAR_DELAY (bst, 0);
+
+ BSOD_PAUSE (bst, 1000000);
+ BSOD_TEXT (bst, LEFT, "\r Lance register test -- succeeded.\n\033");
+ BSOD_PAUSE (bst, 1000000);
+ BSOD_TEXT (bst, LEFT, "\r Internal loopback test -- succeeded.\n\033");
+ BSOD_PAUSE (bst, 1000000);
+ BSOD_TEXT (bst, LEFT, "\r External loopback test -- succeeded.\n"
+ "ok ");
+ BSOD_CURSOR (bst, CURSOR_BLOCK, 500000, 8);
+
+ BSOD_TEXT (bst, LEFT, "\rok ");
+ BSOD_CURSOR (bst, CURSOR_BLOCK, 500000, 4);
+ BSOD_CHAR_DELAY (bst, 80000);
+ BSOD_TEXT (bst, LEFT, /* "boot cdrom" */
+ "b\033\bo\033\bo\033\bt\033\b \033\bc\033\bd\033\br\033\bo\033\bm\033\b");
+ BSOD_TEXT (bst, LEFT, " \n");
+ BSOD_CHAR_DELAY (bst, 0);
+ BSOD_TEXT (bst, LEFT,
+ "\rBoot device: /sbus/esp@0,800000/sd@6,0:c File and args:\n\033");
+ BSOD_PAUSE (bst, 1000000);
+ BSOD_TEXT (bst, LEFT,
+ "\rroot on fstype 4.3\n"
+ "Boot: vmunix\n\033");
+
+ BSOD_TEXT (bst, LEFT, "\rSize: 696320+");
+ BSOD_CHAR_DELAY (bst, 5000);
+ BSOD_INVERT(bst);
+ BSOD_TEXT (bst, LEFT, /* spinner */
+ "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/"
+ "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/"
+ "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/"
+ "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/"
+ "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/"
+ "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/"
+ "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/"
+ "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/"
+ "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/"
+ "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/"
+ "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/"
+ "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/"
+ "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/"
+ "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/"
+ "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/"
+ "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/" "\b-\b\\\b|\b/");
+ BSOD_INVERT(bst);
+ BSOD_TEXT (bst, LEFT, "\b+");
+ BSOD_CHAR_DELAY (bst, 0);
+ BSOD_TEXT (bst, LEFT,
+ "2218504+28056 bytes\n\033");
+ BSOD_PAUSE (bst, 1000000);
+
+ i = random() % 3;
+
+ if (i == 0)
+ {
+ BSOD_TEXT (bst, LEFT,
+ "\rSunOS Release 4.1.1 (MUNIX) #1: Thu Oct 11 11:22:48 PDT 1990\n"
+ "Copyright (c) 1983-1990, Sun Microsystems, Inc.\n"
+ "mem = 16384K (0x1000000)\n"
+ "avail mem = 12865536\n"
+ "Ethernet address = 8:0:20:37:1:87\n"
+ "No FPU in configuration\n"
+ "cpu = SUNW,Sun 4/40\n"
+ "zs0 at obio 0xf1000000 pri 12\n"
+ "zs1 at obio 0xf0000000 pri 12\n"
+ "sbus0 at SBus slot 0 0x0\n"
+ "dma0 at SBus slot 0 0x400000\n"
+ "esp0 at SBus slot 0 0x800000 pri 3\n"
+ "\033");
+ }
+ else if (i == 1)
+ {
+ BSOD_TEXT (bst, LEFT,
+ "\rSunOS Release 5.6 Version Generic [UNIX(R) System V Release 4.0]\n"
+ "Copyright (c) 1983-1997, Sun Microsystems, Inc.\n"
+ "No FPU in configuration\n"
+ "WARNING: kbd: Unknown keyboard type, Type 3 assumed.\n"
+ "WARNING: kbd: Unknown keyboard type, Type 3 assumed.\n"
+ "Configuring devices...\n"
+ "\033");
+ BSOD_PAUSE (bst, 1000000);
+ BSOD_TEXT (bst, LEFT,
+ "\rWARNING: /sbus@1,f8000000/esp@0,800000/sd@6,0 (sd6):\n"
+ " incomplete read- retrying\n"
+ "\n"
+ "loadkeys: ioctl(KIOCLAYOUT): Invalid argument\n"
+ "\033");
+ }
+ else
+ {
+ BSOD_TEXT (bst, LEFT,
+ "\rSunOS Release 5.3 Version Generic [UNIX(R) System V Release 4.0]\n"
+ "Copyright (c) 1983-1993, Sun Microsystems, Inc.\n"
+ "No FPU in configuration\n"
+ "WARNING: /sbus@1,f8000000/esp@0,800000/sd@3,0 (sd3):\n"
+ " corrupt label - wrong magic number\n"
+ "\n"
+ "\\ unexpected data phase\n\033");
+ for (i = 0; i < 3; i++)
+ {
+ BSOD_PAUSE (bst, 3000000);
+ if (i > 0)
+ BSOD_TEXT (bst, LEFT,
+ "\r polled command timeout\n");
+ BSOD_TEXT (bst, LEFT,
+ "\resp: State=DATA Last State=UNKNOWN\n"
+ "esp: Latched stat=0x11<XZERO,IO> intr=0x10<BUS,FCMO>"
+ " fifo 0x0\n"
+ "esp: lst msg out: IDENTIFY; lst msg in: COMMAND COMPLETE\n"
+ "esp: DMA csr=0x10<INTEN>\n"
+ "esp: addr=fff0100f dmacnt=8000 last=fff01008 last_cnt=7\n"
+ "esp: Cmd dump for Target 6 Lun 0:\n"
+ "esp: cdblen=6, cdb=[ 0x0 0x0 0x0 0x0 0x1 0x0 ]\n"
+ "esp: pkt_state 0x3<SEL,ARB> pkt_flags 0x10000"
+ " pkt_statistics 0x0\n"
+ "esp: cmd_flags=0x10022 cmd_timeout=120\n"
+ "\033");
+ }
+ BSOD_PAUSE (bst, 3000000);
+ BSOD_TEXT (bst, LEFT,
+ "\rWARNING: /sbus@1,f8000000/esp@0,800000/sd@6,0 (sd6):\n"
+ " incomplete read- retrying\n"
+ "\n"
+ "loadkeys: ioctl(KIOCLAYOUT): Invalid argument\n"
+ "\033");
+ }
+
+ BSOD_PAUSE (bst, 1000000);
+ BSOD_TEXT (bst, LEFT,
+ "\rsd1 at esp0 target 1 lun 0\n"
+ "sd1: corrupt label - wrong magic number\n"
+ "sd1: Vendor ' SEAGAT', product ' ', 786432 512 byte blocks\n"
+ "sr0: Unrecongized vendor 'Sony ',"
+ " product 'CDU-76S 'sr0 at esp0 target 6 lun 0\n"
+ "le0 at SBus slot 0 0xc00000 pri 5\n"
+ "fd0 at obio 0xf7200000 pri 11\n\033");
+ BSOD_PAUSE (bst, 1000000);
+ BSOD_TEXT (bst, LEFT,
+ "\rrd0: using preloaded munixfs\n"
+ "WARNING: TOD clock not initialized -- CHECK AND RESET THE DATE!\n"
+ "root on rd0a fstype 4.2\n"
+ "swap on ns0b fstype spec size 12480K\n"
+ "dump on ns0b fstype spec size 12468K\n"
+ "\033");
+ BSOD_PAUSE (bst, 4000000);
+
+ i = random() % 3;
+
+ if (i == 0)
+ {
+ BSOD_TEXT (bst, LEFT,
+ "\rStarting OpenWindows...\n"
+ "\n"
+ "\n"
+ "waiting for X server to begin accepting connections \033");
+ BSOD_PAUSE (bst, 2500000);
+ BSOD_TEXT (bst, LEFT, "\b.\033");
+ BSOD_PAUSE (bst, 2500000);
+ BSOD_TEXT (bst, LEFT, "\b \n.\033");
+ for (i = 0; i < 10; i++)
+ {
+ BSOD_PAUSE (bst, 2500000);
+ BSOD_TEXT (bst, LEFT, "\b.\033");
+ BSOD_PAUSE (bst, 2500000);
+ BSOD_TEXT (bst, LEFT, "\b \n.\033");
+ }
+ }
+ else if (i == 1)
+ {
+ BSOD_TEXT (bst, LEFT,
+ "\rCan't invoke /sbin/init, error 13\n"
+ "Can't invoke /etc/init, error 13\n"
+ "Can't invoke /bin/init, error 13\n"
+ "Can't invoke /usr/etc/init, error 13\n"
+ "Can't invoke /usr/bin/init, error 13\n"
+ "panic: icode\n"
+ "syncing file systems...\033");
+ BSOD_PAUSE (bst, 2000000);
+ BSOD_TEXT (bst, LEFT, "\b done\n");
+ BSOD_TEXT (bst, LEFT,
+ "00000 low-memory static kernel pages\n"
+ "00888 additional static and sysmap kernel pages\n"
+ "00000 dynamic kernel data pages\n"
+ "00008 additional user structure pages\n"
+ "00000 segmap kernel pages\n"
+ "00000 segvn kernel pages\n"
+ "00000 current user process pages\n"
+ "00000 user stack pages\n"
+ "00896 total pages (896 chunks)\n"
+ "\n"
+ "dumping to vp ff007dd4, offset 17768\n"
+ "0 total pages, dump failed: error 19\n"
+ "rebooting...\n");
+ }
+ else
+ {
+ BSOD_TEXT (bst, LEFT,
+ "\r \n"
+ "What would you like to do?\n"
+ " 1 - install SunOS mini-root\n"
+ " 2 - exit to single user shell\n"
+ "Enter a 1 or 2: ");
+ BSOD_CURSOR (bst, CURSOR_BLOCK, 500000, 4);
+ BSOD_TEXT (bst, LEFT,
+ "2\n"
+ "you may restart this script by typing <cntl-D>\n# ");
+ BSOD_CURSOR (bst, CURSOR_BLOCK, 500000, 4);
+ BSOD_CHAR_DELAY (bst, 80000);
+ BSOD_TEXT (bst, LEFT, "l\033\bs\033\b");
+ BSOD_TEXT (bst, LEFT, " \n");
+ BSOD_CHAR_DELAY (bst, 0);
+ BSOD_TEXT (bst, LEFT,
+ ".MUNIXFS bin extract stand\n"
+ ".profile dev lib tmp\n"
+ "README etc sbin usr\n"
+ "# ");
+ BSOD_CURSOR (bst, CURSOR_BLOCK, 500000, 4);
+ BSOD_CHAR_DELAY (bst, 80000);
+ BSOD_TEXT (bst, LEFT, /* ". extract" */
+ ".\033\b \033\be\033\bx\033\bt\033\br\033\ba\033\bc\033\bt\033\b");
+ BSOD_TEXT (bst, LEFT, " \n");
+ BSOD_CHAR_DELAY (bst, 0);
+ BSOD_TEXT (bst, LEFT,
+ "using cdrom partition number 2\n"
+ "esp0: data transfer overrun\n"
+ " State=DATA Last State=DATA_DNE\n"
+ " Latched stat=0x11<XZERO,IO> intr=0x10<BUS> fifo 0x0\n"
+ " lst msg out: EXTENDED; lst msg in: COMMAND COMPLETE\n"
+ " DMA csr=0x10<INTEN>\n"
+ " addr=fff026d0 last=fff024d0 last_count=200\n"
+ " Cmd dump for Target 6 Lun 0:\n"
+ " cdb=[ 0x8 0x0 0x0 0x0 0x1 0x0 ]\n"
+ " pkt_state 0xf<XFER,CMD,SEL,ARB> pkt_flags 0x0"
+ " pkt_statistics 0x0\n"
+ " Mapped Dma Space:\n"
+ " Base = 0x24d0 Count = 0x200\n"
+ " Transfer History:\n"
+ " Base = 0x24d0 Count = 0x200\n");
+ }
+
+ BSOD_CURSOR (bst, CURSOR_BLOCK, 500000, 8);
+
+ XClearWindow(dpy, window);
return bst;
}
@@ -5023,6 +5430,122 @@ apple2ransomware (Display *dpy, Window window)
+static void
+a2controller_encom (apple2_sim_t *sim, int *stepno,
+ double *next_actiontime)
+{
+ apple2_state_t *st=sim->st;
+
+ struct mydata {
+ const char *str;
+ Bool bold_p;
+ } *mine;
+
+ if (!sim->controller_data)
+ sim->controller_data = calloc(sizeof(struct mydata),1);
+ mine=(struct mydata *) sim->controller_data;
+
+ switch(*stepno) {
+ case 0:
+
+ st->gr_mode |= A2_GR_FULL;
+ a2_cls(st);
+ a2_goto(st,0,35);
+ a2_prints(st, "ENCOM");
+ a2_goto(st,23,0);
+ *stepno = 10;
+ *next_actiontime += 6;
+ break;
+
+ case 10:
+ a2_cls(st);
+ a2_goto(st,0,0);
+ *stepno = 11;
+ *next_actiontime += 1;
+ break;
+
+ case 11:
+ a2_goto(st, 1, 0);
+ *stepno = 12;
+ mine->str = ("\n"
+ "\r\n"
+ "\r\n"
+ "\r\n"
+ "\r\n"
+ "\r\n"
+ "\r\n"
+ "\r\n"
+ "\r\n"
+ "SEPT 22, 18:32:21 PM\n"
+ "\n"
+ " YOUR ACCESS SUSPENDED\n"
+ " PLEASE REPORT TO DILLINGER\n"
+ " IMMEDIATELY\n"
+ " AUTHORIZATION: MASTER CONTROL\n"
+ " PROGRAM\n"
+ "\n"
+ "\r\r\r\r\r"
+ " END OF LINE\n"
+ "\n"
+ "\n"
+ "\n"
+ "\n");
+ break;
+
+ case 12:
+ {
+ char c = *mine->str;
+ mine->str++;
+
+ if (c == 0)
+ {
+ *next_actiontime += 30;
+ *stepno = 0;
+ }
+ else
+ {
+ if (c == '\r')
+ *next_actiontime += 0.2;
+ if (mine->bold_p)
+ c |= 0xC0;
+ a2_printc_noscroll(st, c);
+ }
+ }
+ break;
+
+ case A2CONTROLLER_FREE:
+ return;
+ }
+}
+
+
+static int
+a2_encom_draw (struct bsod_state *bst)
+{
+ apple2_sim_t *sim = (apple2_sim_t *) bst->closure;
+ if (! sim) {
+ sim = apple2_start (bst->dpy, bst->window, 9999999,
+ a2controller_encom);
+ bst->closure = sim;
+ }
+
+ if (! apple2_one_frame (sim)) {
+ bst->closure = 0;
+ }
+
+ return 10000;
+}
+
+static struct bsod_state *
+encom (Display *dpy, Window window)
+{
+ struct bsod_state *bst = make_bsod_state (dpy, window, "encom", "Encom");
+ bst->draw_cb = a2_encom_draw;
+ bst->free_cb = a2_free;
+ return bst;
+}
+
+
/* A crash spotted on a cash machine circa 2006, by jwz. I didn't note
what model it was; probably a Tranax Mini-Bank 1000 or similar vintage.
*/
@@ -5080,6 +5603,56 @@ atm (Display *dpy, Window window)
}
+static struct bsod_state *
+dvd (Display *dpy, Window window)
+{
+ struct bsod_state *bst = make_bsod_state (dpy, window, "dvd", "DVD");
+ int pix_w, pix_h;
+ float scale = 0.15;
+ Pixmap mask = 0;
+ Pixmap pixmap = image_data_to_pixmap (dpy, window,
+ dvd_png, sizeof(dvd_png),
+ &pix_w, &pix_h, &mask);
+ int i = 0;
+ int x, y, dx, dy;
+ int steps = 10000;
+
+ XClearWindow (dpy, window);
+
+ while (pix_w <= bst->xgwa.width * scale &&
+ pix_h <= bst->xgwa.height * scale)
+ {
+ pixmap = double_pixmap (dpy, bst->xgwa.visual, bst->xgwa.depth,
+ pixmap, pix_w, pix_h);
+ mask = double_pixmap (dpy, bst->xgwa.visual, 1, mask, pix_w, pix_h);
+ pix_w *= 2;
+ pix_h *= 2;
+ i++;
+ }
+
+ bst->pixmap = pixmap;
+ bst->mask = mask;
+ x = random() % (bst->xgwa.width - pix_w);
+ y = random() % (bst->xgwa.height - pix_h);
+ dx = random() & 1 ? 1 : -1;
+ dy = random() & 1 ? 1 : -1;
+
+ BSOD_INVERT(bst);
+ for (i = 0; i < steps; i++)
+ {
+ BSOD_RECT (bst, True, x, y, pix_w, pix_h);
+ if (x + dx < 0 || x + dx + pix_w > bst->xgwa.width) dx = -dx;
+ if (y + dy < 0 || y + dy + pix_h > bst->xgwa.height) dy = -dy;
+ x += dx;
+ y += dy;
+ BSOD_PIXMAP (bst, 0, 0, pix_w, pix_h, x, y);
+ BSOD_PAUSE (bst, 1000000 / 30.0);
+ }
+
+ return bst;
+}
+
+
/* An Android phone boot loader, by jwz.
*/
static struct bsod_state *
@@ -5355,6 +5928,8 @@ static const struct {
{ "GLaDOS", glados },
{ "Android", android },
{ "VMware", vmware },
+ { "Encom", encom },
+ { "DVD", dvd },
};
@@ -5385,6 +5960,7 @@ hack_title (struct driver_state *dst)
XStoreName (dst->bst->dpy, dst->bst->window, nname);
free (nname);
}
+ if (oname) free (oname);
# endif /* !HAVE_JWXYZ */
}
@@ -5673,6 +6249,8 @@ static const char *bsod_defaults [] = {
"*doGLaDOS: True",
"*doAndroid: True",
"*doVMware: True",
+ "*doEncom: True",
+ "*doDVD: True",
".foreground: White",
".background: Black",
@@ -6000,6 +6578,10 @@ static const XrmOptionDescRec bsod_options [] = {
{ "-no-android", ".doAndroid", XrmoptionNoArg, "False" },
{ "-vmware", ".doVMware", XrmoptionNoArg, "True" },
{ "-no-vmware", ".doVMware", XrmoptionNoArg, "False" },
+ { "-encom", ".doEncom", XrmoptionNoArg, "True" },
+ { "-no-encom", ".doEncom", XrmoptionNoArg, "False" },
+ { "-dvd", ".doDVD", XrmoptionNoArg, "True" },
+ { "-no-dvd", ".doDVD", XrmoptionNoArg, "False" },
ANALOGTV_OPTIONS
{ 0, 0, 0, 0 }
};
diff --git a/hacks/bubbles.c b/hacks/bubbles.c
index 9cb2678..eefe048 100644
--- a/hacks/bubbles.c
+++ b/hacks/bubbles.c
@@ -129,7 +129,7 @@ struct state {
#ifdef FANCY_BUBBLES
int num_bubble_pixmaps;
- Bubble_Step **step_pixmaps;
+ Bubble_Step **step_pixmaps, **def_list;
#endif
Bool simple;
@@ -1214,6 +1214,8 @@ default_to_pixmaps (struct state *st)
init_default_bubbles();
+ st->def_list = (Bubble_Step **)xmalloc((num_default_bubbles + 1) *
+ sizeof(Bubble_Step *));
for (i = 0; i < num_default_bubbles; i++) {
newpix = (Bubble_Step *)xmalloc(sizeof(Bubble_Step));
make_pixmap_from_default(st,
@@ -1221,6 +1223,7 @@ default_to_pixmaps (struct state *st)
default_bubbles[i].size,
newpix);
/* Now add to list */
+ st->def_list[i] = newpix;
if (pixmap_list == (Bubble_Step *)NULL) {
pixmap_list = newpix;
} else {
@@ -1278,6 +1281,8 @@ get_resources(struct state *st)
else
fprintf (stderr, "%s: bogus mode: \"%s\"\n", progname, s);
+ if (s) free (s);
+
st->trails = get_boolean_resource(st->dpy, "trails", "Boolean");
st->drop_dir = (st->drop ? 1 : -1);
if (st->drop || rise)
@@ -1428,9 +1433,38 @@ bubbles_event (Display *dpy, Window window, void *closure, XEvent *event)
}
static void
+free_bubble (Display *dpy, Bubble_Step *b)
+{
+ if (b->ball) XFreePixmap (dpy, b->ball);
+ if (b->shape_mask) XFreePixmap (dpy, b->shape_mask);
+ if (b->draw_gc) XFreeGC (dpy, b->draw_gc);
+ if (b->erase_gc) XFreeGC (dpy, b->erase_gc);
+ free (b);
+}
+
+static void
bubbles_free (Display *dpy, Window window, void *closure)
{
struct state *st = (struct state *) closure;
+ int i;
+
+ /* #### The lifetime of objects in this program is fucking incomprehensible.
+ I give up. */
+
+ /* for (i = 0; i < num_default_bubbles; i++)
+ free_bubble (dpy, st->def_list[i]); */
+ for (i = 0; i < st->num_bubble_pixmaps; i++)
+ free_bubble (dpy, st->step_pixmaps[i]);
+ for (i = 0; i < st->mesh_cells; i++)
+ free (st->adjacent_list[i]);
+ /* for (i = 0; i < st->mesh_cells; i++)
+ free_bubble (dpy, st->mesh[i]); */
+ if (st->draw_gc) XFreeGC (dpy, st->draw_gc);
+ if (st->erase_gc) XFreeGC (dpy, st->erase_gc);
+ free (st->adjacent_list);
+ free (st->def_list);
+ free (st->step_pixmaps);
+ free (st->mesh);
free (st);
}
diff --git a/hacks/bumps.c b/hacks/bumps.c
index fa728e6..d24ce00 100644
--- a/hacks/bumps.c
+++ b/hacks/bumps.c
@@ -376,6 +376,8 @@ static void SetPalette(Display *dpy, SBumps *pBumps, XWindowAttributes *pXWinAtt
#endif /* VERBOSE */
XSetWindowBackground( pBumps->dpy, pBumps->Win, pBumps->aColors[ 0 ] );
+
+ if (sColor) free (sColor);
}
@@ -418,6 +420,7 @@ static void InitBumpMap_2(Display *dpy, SBumps *pBumps)
XClearWindow (pBumps->dpy, pBumps->Win);
XSync (pBumps->dpy, 0);
+ if (pBumps->aBumpMap) free (pBumps->aBumpMap);
pBumps->aBumpMap = malloc( pBumps->iWinWidth * pBumps->iWinHeight * sizeof(uint16_t) );
nSoften = get_integer_resource(dpy, "soften", "Integer" );
@@ -606,9 +609,12 @@ static void DestroySpotLight( SSpotLight *pSpotLight ) { free( pSpotLight->aLigh
static void DestroyBumps( SBumps *pBumps )
{
DestroySpotLight( &pBumps->SpotLight );
+ free (pBumps->xColors);
free( pBumps->aColors );
free( pBumps->aBumpMap );
destroy_xshm_image( pBumps->dpy, pBumps->pXImage, &pBumps->XShmInfo );
+ XFreeGC (pBumps->dpy, pBumps->GraphicsContext);
+ free(pBumps);
}
diff --git a/hacks/ccurve.c b/hacks/ccurve.c
index 23b53e8..a4423b2 100644
--- a/hacks/ccurve.c
+++ b/hacks/ccurve.c
@@ -733,6 +733,7 @@ ccurve_draw (Display *dpy, Window window, void *closure)
{
st->draw_segment_count
= lengths [random () % (sizeof (lengths) / sizeof (int))];
+ if (st->draw_segments) free (st->draw_segments);
st->draw_segments
= (Segment*)(malloc ((st->draw_segment_count) * sizeof (Segment)));
select_pattern (st->draw_segment_count, st->draw_segments);
@@ -839,6 +840,10 @@ ccurve_event (Display *dpy, Window window, void *closure, XEvent *event)
static void
ccurve_free (Display *dpy, Window window, void *closure)
{
+ struct state *st = (struct state *) closure;
+ XFreeGC (dpy, st->context);
+ if (st->draw_segments) free (st->draw_segments);
+ free (st);
}
diff --git a/hacks/celtic.c b/hacks/celtic.c
index 890b398..232adb6 100644
--- a/hacks/celtic.c
+++ b/hacks/celtic.c
@@ -911,6 +911,7 @@ celtic_init (Display *d_arg, Window w_arg)
XGetWindowAttributes (st->dpy, st->window, &st->xgwa);
+ if (st->colors) free (st->colors);
assert(st->colors = (XColor *) calloc (st->ncolors,sizeof(XColor)));
if (get_boolean_resource(st->dpy, "mono", "Boolean"))
@@ -983,7 +984,8 @@ celtic_draw (Display *dpy, Window window, void *closure)
pattern_del(st->pattern);
}
st->pattern = NULL;
- graph_del(st->graph);
+ if (st->graph) graph_del(st->graph);
+ st->graph = NULL;
/* recolor each time */
st->ncolors = get_integer_resource (st->dpy, "ncolors", "Integer");
@@ -1124,6 +1126,13 @@ static void
celtic_free (Display *dpy, Window window, void *closure)
{
struct state *st = (struct state *) closure;
+ XFreeGC (dpy, st->gc);
+ XFreeGC (dpy, st->shadow_gc);
+ XFreeGC (dpy, st->gc_graph);
+ if (st->pattern) pattern_del (st->pattern);
+ st->pattern = 0;
+ if (st->graph) graph_del (st->graph);
+ if (st->eraser) eraser_free (st->eraser);
free (st);
}
diff --git a/hacks/check-configs.pl b/hacks/check-configs.pl
index 7a7d0bb..7cc60b4 100755
--- a/hacks/check-configs.pl
+++ b/hacks/check-configs.pl
@@ -1,5 +1,5 @@
#!/usr/bin/perl -w
-# Copyright © 2008-2017 Jamie Zawinski <jwz@jwz.org>
+# Copyright © 2008-2018 Jamie Zawinski <jwz@jwz.org>
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
@@ -21,7 +21,7 @@ use diagnostics;
use strict;
my $progname = $0; $progname =~ s@.*/@@g;
-my ($version) = ('$Revision: 1.26 $' =~ m/\s(\d[.\d]+)\s/s);
+my ($version) = ('$Revision: 1.28 $' =~ m/\s(\d[.\d]+)\s/s);
my $verbose = 0;
my $debug_p = 0;
@@ -997,17 +997,17 @@ sub build_android(@) {
$write_files{"$xml_dir/${saver_underscore}_wallpaper.xml"} = $wallpaper;
$daydream_java .=
- (" public static class $saver_class extends org.jwz.xscreensaver.Daydream {\n" .
+ (" public static class $saver_class extends $package.Daydream {\n" .
" }\n" .
"\n");
$wallpaper_java .=
- (" public static class $saver_class extends org.jwz.xscreensaver.Wallpaper {\n" .
+ (" public static class $saver_class extends $package.Wallpaper {\n" .
" }\n" .
"\n");
$settings_java .=
- (" public static class $saver_class extends org.jwz.xscreensaver.Settings\n" .
+ (" public static class $saver_class extends $package.Settings\n" .
" implements SharedPreferences.OnSharedPreferenceChangeListener {\n" .
" }\n" .
"\n");
@@ -1035,7 +1035,7 @@ sub build_android(@) {
$manifest .= "<activity android:name=\"$package.Settings\" />\n";
$manifest .= ("<activity android:name=\"" .
- "org.jwz.xscreensaver.Activity\"\n" .
+ "$package.Activity\"\n" .
" android:theme=\"\@android:style/Theme.Holo\"\n" .
" android:label=\"\@string/app_name\">\n" .
" <intent-filter>\n" .
@@ -1056,7 +1056,7 @@ sub build_android(@) {
$manifest .= ("<activity android:name=\"" .
- "org.jwz.xscreensaver.TVActivity\"\n" .
+ "$package.TVActivity\"\n" .
" android:theme=\"\@android:style/Theme.Holo\"\n" .
" android:label=\"\@string/app_name\">\n" .
" <intent-filter>\n" .
@@ -1091,7 +1091,7 @@ sub build_android(@) {
" android:versionCode=\"$versb\"\n" .
" android:versionName=\"$vers\">\n" .
- " <uses-sdk android:minSdkVersion=\"14\"" .
+ " <uses-sdk android:minSdkVersion=\"16\"" .
" android:targetSdkVersion=\"19\" />\n" .
" <uses-feature android:glEsVersion=\"0x00010001\"\n" .
@@ -1117,23 +1117,23 @@ sub build_android(@) {
" </application>\n" .
"</manifest>\n");
- $daydream_java = ("package org.jwz.xscreensaver.gen;\n" .
+ $daydream_java = ("package $package.gen;\n" .
"\n" .
- "import org.jwz.xscreensaver.jwxyz;\n" .
+ "import $package.jwxyz;\n" .
"\n" .
"public class Daydream {\n" .
$daydream_java .
"}\n");
- $wallpaper_java = ("package org.jwz.xscreensaver.gen;\n" .
+ $wallpaper_java = ("package $package.gen;\n" .
"\n" .
- "import org.jwz.xscreensaver.jwxyz;\n" .
+ "import $package.jwxyz;\n" .
"\n" .
"public class Wallpaper {\n" .
$wallpaper_java .
"}\n");
- $settings_java = ("package org.jwz.xscreensaver.gen;\n" .
+ $settings_java = ("package $package.gen;\n" .
"\n" .
"import android.content.SharedPreferences;\n" .
"\n" .
diff --git a/hacks/cloudlife.c b/hacks/cloudlife.c
index 4b65f9e..123dd13 100644
--- a/hacks/cloudlife.c
+++ b/hacks/cloudlife.c
@@ -382,6 +382,11 @@ cloudlife_event (Display *dpy, Window window, void *closure, XEvent *event)
{
XClearWindow (dpy, window);
st->cycles = 0;
+ if (st->field) {
+ free (st->field->cells);
+ free (st->field->new_cells);
+ free (st->field);
+ }
st->field = init_field(st);
return True;
}
@@ -392,6 +397,12 @@ static void
cloudlife_free (Display *dpy, Window window, void *closure)
{
struct state *st = (struct state *) closure;
+ free (st->field->cells);
+ free (st->field->new_cells);
+ free (st->field);
+ free (st->colors);
+ XFreeGC (dpy, st->fgc);
+ XFreeGC (dpy, st->bgc);
free (st);
}
diff --git a/hacks/compass.c b/hacks/compass.c
index 1dc1d3e..1678ca9 100644
--- a/hacks/compass.c
+++ b/hacks/compass.c
@@ -957,6 +957,18 @@ compass_event (Display *dpy, Window window, void *closure, XEvent *event)
static void
compass_free (Display *dpy, Window window, void *closure)
{
+ struct state *st = (struct state *) closure;
+ int i;
+ XFreeGC (dpy, st->ptr_gc);
+ XFreeGC (dpy, st->erase_gc);
+ for (i = 0; i < 4; i++)
+ if (st->discs[i]) {
+ XFreeGC (dpy, st->discs[i]->gc);
+ free (st->discs[i]);
+ }
+ if (st->ba) XFreePixmap (dpy, st->ba);
+ if (st->bb) XFreePixmap (dpy, st->bb);
+ free (st);
}
diff --git a/hacks/compile_axp.com b/hacks/compile_axp.com
index c50e0f9..9fab007 100644
--- a/hacks/compile_axp.com
+++ b/hacks/compile_axp.com
@@ -1,5 +1,6 @@
$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H,STANDALONE)/INCL=([],[-],[-.UTILS]) ABSTRACTILE.C
$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H,STANDALONE)/INCL=([],[-],[-.UTILS]) ANALOGTV.C
+$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H,STANDALONE)/INCL=([],[-],[-.UTILS]) ANALOGTV-CLI.C
$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H,STANDALONE)/INCL=([],[-],[-.UTILS]) ANEMONE.C
$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H,STANDALONE)/INCL=([],[-],[-.UTILS]) ANEMOTAXIS.C
$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H,STANDALONE)/INCL=([],[-],[-.UTILS]) ANT.C
diff --git a/hacks/compile_decc.com b/hacks/compile_decc.com
index c50e0f9..9fab007 100644
--- a/hacks/compile_decc.com
+++ b/hacks/compile_decc.com
@@ -1,5 +1,6 @@
$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H,STANDALONE)/INCL=([],[-],[-.UTILS]) ABSTRACTILE.C
$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H,STANDALONE)/INCL=([],[-],[-.UTILS]) ANALOGTV.C
+$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H,STANDALONE)/INCL=([],[-],[-.UTILS]) ANALOGTV-CLI.C
$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H,STANDALONE)/INCL=([],[-],[-.UTILS]) ANEMONE.C
$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H,STANDALONE)/INCL=([],[-],[-.UTILS]) ANEMOTAXIS.C
$ CC/DECC/PREFIX=ALL/DEFINE=(VMS,HAVE_CONFIG_H,STANDALONE)/INCL=([],[-],[-.UTILS]) ANT.C
diff --git a/hacks/config/README b/hacks/config/README
index 9771a89..5981463 100644
--- a/hacks/config/README
+++ b/hacks/config/README
@@ -4,8 +4,8 @@
a screen saver and locker for the X window system
by Jamie Zawinski
- version 5.40
- 12-Aug-2018
+ version 5.42
+ 28-Dec-2018
https://www.jwz.org/xscreensaver/
diff --git a/hacks/config/bsod.xml b/hacks/config/bsod.xml
index ef18e21..0d18218 100644
--- a/hacks/config/bsod.xml
+++ b/hacks/config/bsod.xml
@@ -40,12 +40,14 @@
<boolean id="atari" _label="Atari" arg-set="-atari"/>
<boolean id="macx" _label="MacOS X" arg-unset="-no-macx"/>
<boolean id="os390" _label="OS/390" arg-unset="-no-os390"/>
+ <boolean id="encom" _label="Encom" arg-unset="-no-encom"/>
</vgroup>
<vgroup>
<boolean id="vms" _label="VMS" arg-unset="-no-vms"/>
<boolean id="hvx" _label="HVX/GCOS6" arg-unset="-no-hvx"/>
<boolean id="blitdamage" _label="NCD X Terminal " arg-unset="-no-blitdamage"/>
<boolean id="atm" _label="ATM" arg-unset="-no-atm"/>
+ <boolean id="dvd" _label="DVD" arg-unset="-no-dvd"/>
</vgroup>
<vgroup>
<boolean id="bsd" _label="BSD" arg-set="-bsd"/>
diff --git a/hacks/config/handsy.xml b/hacks/config/handsy.xml
new file mode 100644
index 0000000..2ff9608
--- /dev/null
+++ b/hacks/config/handsy.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<screensaver name="handsy" _label="Handsy" gl="yes">
+
+ <command arg="-root"/>
+
+ <video href="https://www.youtube.com/watch?v=awI8EawYTdE"/>
+
+ <hgroup>
+ <vgroup>
+ <number id="delay" type="slider" arg="-delay %"
+ _label="Frame rate" _low-label="Low" _high-label="High"
+ low="0" high="100000" default="30000"
+ convert="invert"/>
+
+ <number id="speed" type="slider" arg="-speed %"
+ _label="Speed" _low-label="Slow" _high-label="Fast"
+ low="0.05" high="2.0" default="1.0"/>
+
+ <number id="count" type="slider" arg="-count %"
+ _label="Number of hands" _low-label="Two" _high-label="Many"
+ low="2" high="32" default="2"/>
+ </vgroup>
+
+ <vgroup>
+
+ <boolean id="wander" _label="Wander" arg-unset="-no-wander"/>
+ <select id="rotation">
+ <option id="no" _label="Don't rotate" arg-set="-spin 0"/>
+ <option id="x" _label="Rotate around X axis" arg-set="-spin X"/>
+ <option id="y" _label="Rotate around Y axis" arg-set="-spin Y"/>
+ <option id="z" _label="Rotate around Z axis" arg-set="-spin Z"/>
+ <option id="xy" _label="Rotate around X and Y axes"/>
+ <option id="xz" _label="Rotate around X and Z axes" arg-set="-spin XZ"/>
+ <option id="yz" _label="Rotate around Y and Z axes" arg-set="-spin YZ"/>
+ <option id="xyz" _label="Rotate around all three axes" arg-set="-spin XYZ"/>
+ </select>
+
+ <select id="facing">
+ <option id="front" _label="Always face front"/>
+ <option id="nofront" _label="Spin all the way around" arg-set="-no-front"/>
+ </select>
+
+ <hgroup>
+ <boolean id="wire" _label="Wireframe" arg-set="-wireframe"/>
+ <boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
+ </hgroup>
+
+ <xscreensaver-updater />
+ </vgroup>
+ </hgroup>
+
+ <_description>
+A set of robotic hands communicate non-verbally.
+
+Written by Jamie Zawinski; 2018.
+ </_description>
+</screensaver>
diff --git a/hacks/config/ripples.xml b/hacks/config/ripples.xml
index 191e041..8a2e1be 100644
--- a/hacks/config/ripples.xml
+++ b/hacks/config/ripples.xml
@@ -24,8 +24,7 @@
<number id="fluidity" type="slider" arg="-fluidity %"
_label="Fluidity" _low-label="Small drops" _high-label="Big drops"
- low="0" high="16" default="6"
- convert="invert"/>
+ low="0" high="16" default="6"/>
</vgroup>
<vgroup>
diff --git a/hacks/config/unknownpleasures.xml b/hacks/config/unknownpleasures.xml
index 7ef79ac..0730599 100644
--- a/hacks/config/unknownpleasures.xml
+++ b/hacks/config/unknownpleasures.xml
@@ -4,7 +4,7 @@
<command arg="-root"/>
- <video href="https://www.youtube.com/watch?v=vuWhUxBq99E"/>
+ <video href="https://www.youtube.com/watch?v=DEWPiUbwnt0"/>
<hgroup>
<vgroup>
@@ -16,22 +16,31 @@
<number id="count" type="slider" arg="-count %"
_label="Scanlines" _low-label="Few" _high-label="Many"
low="3" high="200" default="80"/>
- </vgroup>
- <vgroup>
<number id="speed" type="slider" arg="-speed %"
_label="Speed" _low-label="Slow" _high-label="Fast"
- low="0.1" high="3.0" default="1.0"/>
+ low="0.1" high="20.0" default="1.0"/>
+ </vgroup>
+ <vgroup>
<number id="resolution" type="slider" arg="-resolution %"
_label="Resolution" _low-label="Low" _high-label="High"
low="5" high="300" default="100"/>
+
+ <number id="amplitude" type="slider" arg="-amplitude %"
+ _label="Amplitude" _low-label="Low" _high-label="High"
+ low="0.01" high="0.25" default="0.13"/>
+
+ <number id="noise" type="slider" arg="-noise %"
+ _label="Noise" _low-label="Low" _high-label="High"
+ low="0.0" high="3.0" default="1.0"/>
</vgroup>
</hgroup>
<hgroup>
<boolean id="ortho" _label="Orthographic Projection" arg-unset="-no-ortho"/>
- <boolean id="wire" _label="Wireframe" arg-set="-wireframe"/>
+ <boolean id="buzz" _label="Buzz" arg-set="-buzz"/>
+ <boolean id="wire" _label="Wireframe" arg-set="-wireframe"/>
<boolean id="showfps" _label="Show frame rate" arg-set="-fps"/>
</hgroup>
diff --git a/hacks/coral.c b/hacks/coral.c
index 9cfcf50..f82f9ed 100644
--- a/hacks/coral.c
+++ b/hacks/coral.c
@@ -71,8 +71,10 @@ init_coral(struct state *st)
st->ncolors = 0;
}
gcv.foreground = st->default_fg_pixel = get_pixel_resource(st->dpy, cmap, "foreground", "Foreground");
+ if (st->draw_gc) XFreeGC (st->dpy, st->draw_gc);
st->draw_gc = XCreateGC(st->dpy, st->window, GCForeground, &gcv);
gcv.foreground = get_pixel_resource (st->dpy, cmap, "background", "Background");
+ if (st->erase_gc) XFreeGC (st->dpy, st->erase_gc);
st->erase_gc = XCreateGC (st->dpy, st->window, GCForeground, &gcv);
st->ncolors = NCOLORSMAX;
make_uniform_colormap(xgwa.screen, xgwa.visual, cmap,
@@ -283,6 +285,8 @@ coral_free (Display *dpy, Window window, void *closure)
{
struct state *st = (struct state *) closure;
free (st->pointbuf);
+ XFreeGC (dpy, st->draw_gc);
+ XFreeGC (dpy, st->erase_gc);
if (st->walkers) free (st->walkers);
if (st->board) free (st->board);
free (st);
diff --git a/hacks/critical.c b/hacks/critical.c
index 81fd0c1..d716fc6 100644
--- a/hacks/critical.c
+++ b/hacks/critical.c
@@ -198,7 +198,7 @@ static void
setup_colormap (struct state *st, XColor **colors, int *n_colors)
{
Bool writable;
- char const * color_scheme;
+ char * color_scheme;
/* Make a colormap */
*n_colors = get_integer_resource (st->dpy, "ncolors", "Integer");
@@ -237,6 +237,7 @@ setup_colormap (struct state *st, XColor **colors, int *n_colors)
*colors, n_colors, True,
&writable, True);
}
+ if (color_scheme) free (color_scheme);
}
@@ -421,6 +422,12 @@ static void
critical_free (Display *dpy, Window window, void *closure)
{
struct state *st = (struct state *) closure;
+ XFreeGC (dpy, st->fgc);
+ XFreeGC (dpy, st->bgc);
+ free (st->model->cells);
+ free (st->model);
+ free (st->history);
+ free (st->d_colors);
free (st);
}
diff --git a/hacks/cwaves.c b/hacks/cwaves.c
index 20dd80a..b032626 100644
--- a/hacks/cwaves.c
+++ b/hacks/cwaves.c
@@ -182,6 +182,11 @@ cwaves_event (Display *dpy, Window window, void *closure, XEvent *event)
static void
cwaves_free (Display *dpy, Window window, void *closure)
{
+ state *st = (state *) closure;
+ XFreeGC (dpy, st->gc);
+ free (st->colors);
+ free (st->waves);
+ free (st);
}
diff --git a/hacks/cynosure.c b/hacks/cynosure.c
index 8b8b85b..3eaa397 100644
--- a/hacks/cynosure.c
+++ b/hacks/cynosure.c
@@ -409,6 +409,11 @@ static void
cynosure_free (Display *dpy, Window window, void *closure)
{
struct state *st = (struct state *) closure;
+ XFreeGC (dpy, st->fg_gc);
+ XFreeGC (dpy, st->bg_gc);
+ XFreeGC (dpy, st->shadow_gc);
+ if (st->colors) free (st->colors);
+ if (st->colors2) free (st->colors2);
free (st);
}
diff --git a/hacks/decayscreen.c b/hacks/decayscreen.c
index 8b45af9..6b2a4cb 100644
--- a/hacks/decayscreen.c
+++ b/hacks/decayscreen.c
@@ -122,6 +122,7 @@ decayscreen_init (Display *dpy, Window window)
st->random_p = 1;
st->mode = random() % (FUZZ+1);
}
+ if (s) free (s);
st->delay = get_integer_resource (st->dpy, "delay", "Integer");
if (st->delay < 0) st->delay = 0;
@@ -361,6 +362,7 @@ static void
decayscreen_free (Display *dpy, Window window, void *closure)
{
struct state *st = (struct state *) closure;
+ XFreeGC (dpy, st->gc);
free (st);
}
diff --git a/hacks/deco.c b/hacks/deco.c
index 876badc..cebed2c 100644
--- a/hacks/deco.c
+++ b/hacks/deco.c
@@ -297,6 +297,8 @@ static void
deco_free (Display *dpy, Window window, void *closure)
{
struct state *st = (struct state *) closure;
+ XFreeGC (dpy, st->fgc);
+ XFreeGC (dpy, st->bgc);
free (st);
}
diff --git a/hacks/deluxe.c b/hacks/deluxe.c
index 694a982..5fd7eb7 100644
--- a/hacks/deluxe.c
+++ b/hacks/deluxe.c
@@ -423,6 +423,20 @@ deluxe_event (Display *dpy, Window window, void *closure, XEvent *event)
static void
deluxe_free (Display *dpy, Window window, void *closure)
{
+ struct state *st = (struct state *) closure;
+ int i;
+ XFreeGC (dpy, st->erase_gc);
+ if (st->ba) XFreePixmap (dpy, st->ba);
+ if (st->bb) XFreePixmap (dpy, st->bb);
+ if (st->plane_masks) free (st->plane_masks);
+ for (i = 0; i < st->count; i++)
+ if (st->throbbers[i]) {
+ XFreeGC (dpy, st->throbbers[i]->gc);
+ free (st->throbbers[i]);
+ }
+ free (st->throbbers);
+ free (st->colors);
+ free (st);
}
diff --git a/hacks/distort.c b/hacks/distort.c
index ba81279..a3586cf 100644
--- a/hacks/distort.c
+++ b/hacks/distort.c
@@ -74,6 +74,7 @@ struct state {
int ***from;
int ****from_array;
int *fast_from;
+ int from_size;
int bpp_size;
@@ -140,6 +141,7 @@ distort_reset (struct state *st)
;
else if (s && *s)
fprintf(stderr,"%s: bogus effect: %s\n", progname, s);
+ if (s) free (s);
if (st->effect == NULL && st->radius == 0 && st->speed == 0 && st->number == 0
&& !st->blackhole && !st->vortex && !st->magnify && !st->reflect) {
@@ -307,9 +309,11 @@ distort_finish_loading (struct state *st)
XClearWindow (st->dpy, st->window);
XCopyArea (st->dpy, st->pm, st->window, st->gc,
0, 0, st->xgwa.width, st->xgwa.height, 0, 0);
+ if (st->orig_map) XDestroyImage (st->orig_map);
st->orig_map = XGetImage(st->dpy, st->pm, 0, 0,
st->xgwa.width, st->xgwa.height,
~0L, ZPixmap);
+ if (st->buffer_map_cache) free (st->buffer_map_cache);
st->buffer_map_cache = malloc(sizeof(unsigned long)*(2*st->radius+st->speed+2)*(2*st->radius+st->speed+2));
if (st->buffer_map_cache == NULL) {
@@ -317,6 +321,8 @@ distort_finish_loading (struct state *st)
exit(EXIT_FAILURE);
}
+ if (st->buffer_map)
+ destroy_xshm_image (st->dpy, st->buffer_map, &st->shm_info);
st->buffer_map = create_xshm_image(st->dpy, st->xgwa.visual, st->orig_map->depth,
ZPixmap, &st->shm_info,
2*st->radius + st->speed + 2,
@@ -377,6 +383,7 @@ static void convert(struct state *st)
{
int *p;
int i, j;
+ if (st->fast_from) free (st->fast_from);
st->fast_from = calloc(1, sizeof(int)*((st->buffer_map->bytes_per_line/st->bpp_size)*(2*st->radius+st->speed+2) + 2*st->radius+st->speed+2));
if (st->fast_from == NULL) {
perror("distort");
@@ -478,6 +485,17 @@ static void allocate_lense(struct state *st)
* then pointers could be used instead of arrays in some places (and
* maybe give a speedup - maybe also consume less memory)
*/
+ if (st->from) {
+ for (i = 0; i < st->from_size; i++)
+ if (st->from[i]) {
+ for (j = 0; j < st->from_size; j++) {
+ if (st->from[i][j]) free (st->from[i][j]);
+ }
+ free (st->from[i]);
+ }
+ free (st->from);
+ }
+ st->from_size = s;
st->from = (int ***)malloc(s*sizeof(int **));
if (st->from == NULL) {
perror("distort");
@@ -508,6 +526,7 @@ static void init_round_lense(struct state *st)
int k;
if (st->effect == &swamp_thing) {
+ if (st->from_array) free (st->from_array);
st->from_array = (int ****)malloc((st->radius+1)*sizeof(int ***));
for (k=0; k <= st->radius; k++) {
allocate_lense(st);
@@ -796,13 +815,27 @@ static void
distort_free (Display *dpy, Window window, void *closure)
{
struct state *st = (struct state *) closure;
+ int i, j;
XFreeGC (st->dpy, st->gc);
if (st->pm) XFreePixmap (dpy, st->pm);
if (st->orig_map) XDestroyImage (st->orig_map);
- if (st->buffer_map) destroy_xshm_image (st->dpy, st->buffer_map, &st->shm_info);
- if (st->from) free (st->from);
+ if (st->buffer_map)
+ destroy_xshm_image (st->dpy, st->buffer_map, &st->shm_info);
if (st->fast_from) free (st->fast_from);
if (st->from_array) free (st->from_array);
+ if (st->buffer_map_cache) free (st->buffer_map_cache);
+
+ if (st->from) {
+ for (i = 0; i < st->from_size; i++)
+ if (st->from[i]) {
+ for (j = 0; j < st->from_size; j++) {
+ if (st->from[i][j]) free (st->from[i][j]);
+ }
+ free (st->from[i]);
+ }
+ free (st->from);
+ }
+
free (st);
}
diff --git a/hacks/epicycle.c b/hacks/epicycle.c
index 89fab0b..a8a257c 100644
--- a/hacks/epicycle.c
+++ b/hacks/epicycle.c
@@ -788,6 +788,10 @@ static void
epicycle_free (Display *dpy, Window window, void *closure)
{
struct state *st = (struct state *) closure;
+ if (st->eraser) eraser_free (st->eraser);
+ if (st->pb0) delete_body (st->pb0);
+ XFreeGC (dpy, st->color0);
+ free (st->colors);
free (st);
}
diff --git a/hacks/eruption.c b/hacks/eruption.c
index 629cb8e..3f68cf7 100644
--- a/hacks/eruption.c
+++ b/hacks/eruption.c
@@ -482,15 +482,16 @@ eruption_event (Display *dpy, Window window, void *closure, XEvent *event)
static void
eruption_free (Display *dpy, Window window, void *closure)
{
-#if 0
struct state *st = (struct state *) closure;
- XDestroyImage( st->pImage );
- free( st->aiColorVals );
- for (i = 0; i < st->iWinHeight; ++i)
- free( st->fire[i] );
- free( st->fire );
- free( st->particles );
-#endif
+ int i;
+ XDestroyImage (st->pImage);
+ free (st->aiColorVals);
+ for (i = 0; i < st->iWinHeight; ++i)
+ free (st->fire[i]);
+ free (st->fire);
+ free (st->particles);
+ XFreeGC (dpy, st->gc);
+ free (st);
}
diff --git a/hacks/filmleader.c b/hacks/filmleader.c
index ef021e1..25b64c4 100644
--- a/hacks/filmleader.c
+++ b/hacks/filmleader.c
@@ -53,6 +53,7 @@ filmleader_init (Display *dpy, Window window)
{
struct state *st = (struct state *) calloc (1, sizeof(*st));
XGCValues gcv;
+ char *s;
st->dpy = dpy;
st->window = window;
@@ -105,15 +106,15 @@ filmleader_init (Display *dpy, Window window)
st->xftdraw = XftDrawCreate (dpy, st->pix, st->xgwa.visual,
st->xgwa.colormap);
- st->font = load_xft_font_retry (dpy, screen_number (st->xgwa.screen),
- get_string_resource (dpy, "numberFont",
- "Font"));
- st->font2 = load_xft_font_retry (dpy, screen_number (st->xgwa.screen),
- get_string_resource (dpy, "numberFont2",
- "Font"));
- st->font3 = load_xft_font_retry (dpy, screen_number (st->xgwa.screen),
- get_string_resource (dpy, "numberFont3",
- "Font"));
+ s = get_string_resource (dpy, "numberFont", "Font");
+ st->font = load_xft_font_retry (dpy, screen_number (st->xgwa.screen), s);
+ if (s) free (s);
+ s = get_string_resource (dpy, "numberFont2", "Font");
+ st->font2 = load_xft_font_retry (dpy, screen_number (st->xgwa.screen), s);
+ if (s) free (s);
+ s = get_string_resource (dpy, "numberFont3", "Font");
+ st->font3 = load_xft_font_retry (dpy, screen_number (st->xgwa.screen), s);
+ if (s) free (s);
st->bg = get_pixel_resource (dpy, st->xgwa.colormap,
"textBackground", "Background");
@@ -124,12 +125,15 @@ filmleader_init (Display *dpy, Window window)
st->trace_color = get_pixel_resource (dpy, st->xgwa.colormap,
"traceColor", "Foreground");
- XftColorAllocName (dpy, st->xgwa.visual, st->xgwa.colormap,
- get_string_resource (dpy, "textColor", "Foreground"),
+ s = get_string_resource (dpy, "textColor", "Foreground");
+ XftColorAllocName (dpy, st->xgwa.visual, st->xgwa.colormap, s,
&st->xft_text_color_1);
- XftColorAllocName (dpy, st->xgwa.visual, st->xgwa.colormap,
- get_string_resource (dpy, "textBackground", "Background"),
+ if (s) free (s);
+
+ s = get_string_resource (dpy, "textBackground", "Background");
+ XftColorAllocName (dpy, st->xgwa.visual, st->xgwa.colormap, s,
&st->xft_text_color_2);
+ if (s) free (s);
return st;
}
@@ -512,6 +516,7 @@ filmleader_free (Display *dpy, Window window, void *closure)
{
struct state *st = (struct state *) closure;
analogtv_release (st->tv);
+ free (st->inp);
XftDrawDestroy (st->xftdraw);
XftColorFree(dpy, st->xgwa.visual, st->xgwa.colormap, &st->xft_text_color_1);
XftColorFree(dpy, st->xgwa.visual, st->xgwa.colormap, &st->xft_text_color_2);
diff --git a/hacks/fireworkx.c b/hacks/fireworkx.c
index faf3745..57ba128 100644
--- a/hacks/fireworkx.c
+++ b/hacks/fireworkx.c
@@ -571,11 +571,13 @@ static void resize(struct state *st)
XSync(st->dpy, 0);
if (st->xim)
{
- if (st->xim->data == (char *)st->palaka2) st->xim->data = NULL;
+ /* if (st->xim->data == (char *)st->palaka2) */
+ st->xim->data = NULL;
XDestroyImage(st->xim);
XSync(st->dpy, 0);
free(st->mem2);
free(st->mem1);
+ st->xim = 0;
}
st->xim = XCreateImage(st->dpy, xwa.visual, xwa.depth, ZPixmap, 0, 0,
st->width, st->height, 8, 0);
@@ -841,6 +843,14 @@ fireworkx_free (Display *dpy, Window window, void *closure)
free(st->mem1);
free(st->fireshell_array->fpix);
free(st->fireshell_array);
+ if (st->xim) {
+ st->xim->data = NULL;
+ XDestroyImage (st->xim);
+ }
+ if (st->light_map) free(st->light_map);
+ if (st->colors) free (st->colors);
+ XFreeGC (dpy, st->gc);
+ free(st);
}
static const char *fireworkx_defaults [] =
diff --git a/hacks/flag.c b/hacks/flag.c
index f12c0bc..ca58ed8 100644
--- a/hacks/flag.c
+++ b/hacks/flag.c
@@ -196,8 +196,9 @@ make_flag_bits(ModeInfo *mi)
char *bitmap_name = get_string_resource (dpy, "bitmap", "Bitmap");
char *text = get_string_resource (dpy, "text", "Text");
-#ifdef HAVE_JWXYZ
- bitmap_name = 0; /* #### always use default */
+#ifdef HAVE_JWXYZ /* always use default */
+ if (bitmap_name) free (bitmap_name);
+ bitmap_name = 0;
#endif
/* If neither a bitmap nor text are specified, randomly select either
@@ -228,6 +229,7 @@ make_flag_bits(ModeInfo *mi)
&width, &height, 0);
if (bitmap)
{
+ if (fp->image) XDestroyImage (fp->image);
fp->image = XGetImage(dpy, bitmap, 0, 0, width, height, ~0L,
ZPixmap);
XFreePixmap(dpy, bitmap);
@@ -256,6 +258,7 @@ make_flag_bits(ModeInfo *mi)
struct utsname uts;
if (uname (&uts) < 0)
{
+ if (text) free (text);
text = strdup("uname() failed");
}
else
@@ -263,6 +266,7 @@ make_flag_bits(ModeInfo *mi)
char *s;
if ((s = strchr(uts.nodename, '.')))
*s = 0;
+ if (text) free (text);
text = (char *) malloc(strlen(uts.nodename) +
strlen(uts.sysname) +
strlen(uts.version) +
@@ -280,11 +284,14 @@ make_flag_bits(ModeInfo *mi)
char *s, buf[255];
while (fgets (buf, sizeof(buf)-1, f)) {
-# define GRAB(S,V) \
- if (strstr(buf, S)) { \
- fgets (buf, sizeof(buf)-1, f); \
- if ((s = strchr (buf, '>'))) V = strdup(s+1); \
- if ((s = strchr (V, '<'))) *s = 0; \
+# define GRAB(S,V) \
+ if (strstr(buf, S)) { \
+ fgets (buf, sizeof(buf)-1, f); \
+ if ((s = strchr (buf, '>'))) { \
+ if (V) free (V); \
+ V = strdup(s+1); \
+ } \
+ if ((s = strchr (V, '<'))) *s = 0; \
}
GRAB ("ProductName", pn)
GRAB ("ProductBuildVersion", pbv)
@@ -298,6 +305,9 @@ make_flag_bits(ModeInfo *mi)
else
sprintf(text, "%s\n%s %s",
uts.nodename, uts.sysname, uts.release);
+ if (pbv) free (pbv);
+ if (pn) free (pn);
+ if (puvv) free (puvv);
}
# else
sprintf(text, "%s\n%s %s",
@@ -305,6 +315,7 @@ make_flag_bits(ModeInfo *mi)
# endif /* special system types */
}
#else /* !HAVE_UNAME */
+ if (text) free (text);
# ifdef VMS
text = strdup(getenv("SYS$NODE"));
# else
@@ -320,8 +331,9 @@ make_flag_bits(ModeInfo *mi)
text2 = strdup(text);
- if (!fn) fn = def_fn;
+ if (!fn) fn = strdup (def_fn);
font = load_font_retry (dpy, fn);
+ free (fn);
memset(&overall, 0, sizeof(overall));
token = text;
@@ -371,10 +383,10 @@ make_flag_bits(ModeInfo *mi)
lines++;
}
free(text2);
- XUnloadFont(dpy, font->fid);
- XFree((XPointer) font);
+ XFreeFont(dpy, font);
XFreeGC(dpy, gc);
+ if (fp->image) XDestroyImage (fp->image);
fp->image = XGetImage(dpy, bitmap, 0, 0, width, height, 1L, XYPixmap);
XFreePixmap(dpy, bitmap);
}
@@ -420,6 +432,7 @@ make_flag_bits(ModeInfo *mi)
int w = flag_width;
int h = flag_height;
int i = 0;
+ if (fp->image) XDestroyImage (fp->image);
fp->image =
XCreateImage(MI_DISPLAY(mi), MI_VISUAL(mi),
1, XYBitmap, 0, /* dpth, fmt, offset */
@@ -543,15 +556,10 @@ draw_flag(ModeInfo * mi)
ENTRYPOINT void
free_flag(ModeInfo * mi)
{
- int screen = MI_SCREEN(mi);
-
- if (flags == NULL)
- return;
-
- if (flags[screen].cache && flags[screen].dbufp)
- XFreePixmap(MI_DISPLAY(mi), flags[screen].cache);
- if (flags[screen].image)
- XDestroyImage(flags[screen].image);
+ flagstruct *fp = &flags[MI_SCREEN(mi)];
+ if (fp->cache && fp->dbufp)
+ XFreePixmap(MI_DISPLAY(mi), fp->cache);
+ if (fp->image) XDestroyImage(fp->image);
}
#ifndef STANDALONE
diff --git a/hacks/flame.c b/hacks/flame.c
index 7b59056..f7e9833 100644
--- a/hacks/flame.c
+++ b/hacks/flame.c
@@ -459,6 +459,8 @@ static void
flame_free (Display *dpy, Window window, void *closure)
{
struct state *st = (struct state *) closure;
+ XFreeGC (dpy, st->gc);
+ free (st->colors);
free (st);
}
diff --git a/hacks/fluidballs.c b/hacks/fluidballs.c
index 9273082..533ee2d 100644
--- a/hacks/fluidballs.c
+++ b/hacks/fluidballs.c
@@ -800,6 +800,17 @@ static void
fluidballs_free (Display *dpy, Window window, void *closure)
{
b_state *state = (b_state *) closure;
+ XFreeGC (dpy, state->draw_gc);
+ XFreeGC (dpy, state->draw_gc2);
+ XFreeGC (dpy, state->erase_gc);
+ free (state->m);
+ free (state->r);
+ free (state->vx);
+ free (state->vy);
+ free (state->px);
+ free (state->py);
+ free (state->opx);
+ free (state->opy);
free (state);
}
diff --git a/hacks/fontglide.c b/hacks/fontglide.c
index 263393a..df8f498 100644
--- a/hacks/fontglide.c
+++ b/hacks/fontglide.c
@@ -172,9 +172,11 @@ append_font_name(Display *dpy, char *dest, const XFontStruct *font)
int i;
for (i = 0; i != font->n_properties; ++i) {
if (font->properties[i].name == XA_FONT) {
- const char *suffix = XGetAtomName (dpy, font->properties[i].card32);
+ char *suffix = XGetAtomName (dpy, font->properties[i].card32);
+ int L = strlen(suffix);
strcpy(dest, suffix);
- return dest + strlen(suffix);
+ free (suffix);
+ return dest + L;
}
}
@@ -768,6 +770,7 @@ free_word (state *s, word *w)
if (w->text) free (w->text);
if (w->pixmap) XFreePixmap (s->dpy, w->pixmap);
if (w->mask) XFreePixmap (s->dpy, w->mask);
+ free (w);
}
@@ -860,6 +863,7 @@ split_words (state *s, sentence *se)
char *t2 = chars[k];
word *w2 = new_word (s, se, t2, True);
words2[j++] = w2;
+ free (t2);
w2->x = x;
w2->y = y;
@@ -1219,7 +1223,7 @@ populate_sentence (state *s, sentence *se)
y + se->xftfont->ascent + se->xftfont->descent > s->xgwa.height)
{
unread_word (s, w);
- free (w);
+ w = 0;
/* done = True; */
break;
}
@@ -2203,8 +2207,10 @@ fontglide_init (Display *dpy, Window window)
XGetWindowAttributes (s->dpy, s->window, &s->xgwa);
s->font_override = get_string_resource (dpy, "font", "Font");
- if (s->font_override && (!*s->font_override || *s->font_override == '('))
+ if (s->font_override && (!*s->font_override || *s->font_override == '(')) {
+ free (s->font_override);
s->font_override = 0;
+ }
s->charset = get_string_resource (dpy, "fontCharset", "FontCharset");
s->border_width = get_integer_resource (dpy, "fontBorderWidth", "Integer");
@@ -2247,7 +2253,7 @@ fontglide_init (Display *dpy, Window window)
if (s->trails_p) s->dbuf = False; /* don't need it in this case */
{
- const char *ss = get_string_resource (dpy, "mode", "Mode");
+ char *ss = get_string_resource (dpy, "mode", "Mode");
if (!ss || !*ss || !strcasecmp (ss, "random"))
s->mode = ((random() % 2) ? SCROLL : PAGE);
else if (!strcasecmp (ss, "scroll"))
@@ -2262,6 +2268,7 @@ fontglide_init (Display *dpy, Window window)
"%s: `mode' must be `scroll', `page', or `random', not `%s'\n",
progname, ss);
}
+ if (ss) free (ss);
}
if (s->dbuf)
@@ -2410,8 +2417,20 @@ static void
fontglide_free (Display *dpy, Window window, void *closure)
{
state *s = (state *) closure;
+ int i;
+
textclient_close (s->tc);
+// if (s->b && s->b != s->window) XFreePixmap (dpy, s->b);
+// if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba);
+ XFreeGC (dpy, s->bg_gc);
+ if (s->charset) free (s->charset);
+ if (s->font_override) free (s->font_override);
+ for (i = 0;i < s->nsentences; i++)
+ if (s->sentences[i])
+ free_sentence (s, s->sentences[i]);
+ free (s->sentences);
+
#ifdef DEBUG
if (s->metrics_xftfont)
XftFontClose (s->dpy, s->metrics_xftfont);
@@ -2424,8 +2443,6 @@ fontglide_free (Display *dpy, Window window, void *closure)
if (s->label_gc) XFreeGC (dpy, s->label_gc);
#endif
- /* #### there's more to free here */
-
free (s);
}
diff --git a/hacks/fuzzyflakes.c b/hacks/fuzzyflakes.c
index 18470bc..7429fa8 100644
--- a/hacks/fuzzyflakes.c
+++ b/hacks/fuzzyflakes.c
@@ -445,6 +445,10 @@ FuzzyFlakesFreeFlake(Flake *flake)
if (flake->DB.bb) XFreePixmap(flake->dpy, flake->DB.bb);
if (flake->DB.ba) XFreePixmap(flake->dpy, flake->DB.ba);
+ XFreeGC (flake->dpy, flake->GCVar);
+ if (flake->Colors.Back) free (flake->Colors.Back);
+ if (flake->Colors.Fore) free (flake->Colors.Fore);
+ if (flake->Colors.Bord) free (flake->Colors.Bord);
}
static void
@@ -607,6 +611,7 @@ fuzzyflakes_free (Display *dpy, Window window, void *closure)
{
Flake *flake = (Flake *) closure;
FuzzyFlakesFreeFlake(flake);
+ free(flake->Flakes);
free(flake);
}
diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
index e3fa617..91e4d51 100644
--- a/hacks/glx/Makefile.in
+++ b/hacks/glx/Makefile.in
@@ -132,7 +132,7 @@ SRCS = xscreensaver-gl-helper.c normals.c erase-gl.c fps-gl.c \
raverhoop.c hydrostat.c discoball.c cubetwist.c cubestack.c \
splodesic.c hexstrut.c vigilance.c seccam.c esper.c \
razzledazzle.c ships.c peepers.c crumbler.c quickhull.c \
- maze3d.c
+ maze3d.c handsy.c handsy_model.c
OBJS = xscreensaver-gl-helper.o normals.o erase-gl.o fps-gl.o \
atlantis.o b_draw.o b_lockglue.o b_sphere.o bubble3d.o \
@@ -179,7 +179,7 @@ OBJS = xscreensaver-gl-helper.o normals.o erase-gl.o fps-gl.o \
raverhoop.o hydrostat.o discoball.o cubetwist.o cubestack.o \
splodesic.o hexstrut.o vigilance.o seccam.o esper.o \
razzledazzle.o ships.o peepers.o crumbler.o quickhull.o \
- maze3d.o
+ maze3d.o handsy.o handsy_model.o
GL_EXES = cage gears moebius pipes sproingies stairs superquadrics \
morph3d rubik atlantis lament bubble3d glplanet pulsar \
@@ -200,7 +200,7 @@ GL_EXES = cage gears moebius pipes sproingies stairs superquadrics \
splitflap dymaxionmap unicrud energystream raverhoop \
hydrostat discoball cubetwist cubestack splodesic \
hexstrut vigilance esper razzledazzle peepers crumbler \
- maze3d
+ maze3d handsy
GLE_EXES = extrusion
SUID_EXES = sonar
GL_UTIL_EXES = xscreensaver-gl-helper
@@ -237,7 +237,7 @@ HDRS = atlantis.h bubble3d.h buildlwo.h e_textures.h \
sproingies.h extrusion.h glschool.h glschool_gl.h \
glschool_alg.h topblock.h involute.h teapot.h sonar.h \
dropshadow.h starwars.h teapot2.h dnapizza.h curlicue.h \
- quickhull.h dymaxionmap-coords.h
+ quickhull.h dymaxionmap-coords.h handsy_anim.h
GL_MEN = atlantis.man boxed.man bubble3d.man cage.man circuit.man \
cubenetic.man dangerball.man engine.man extrusion.man \
flipscreen3d.man gears.man gflux.man \
@@ -266,7 +266,7 @@ GL_MEN = atlantis.man boxed.man bubble3d.man cage.man circuit.man \
unicrud.man energystream.man raverhoop.man hydrostat.man \
discoball.man cubetwist.man cubestack.man splodesic.man \
hexstrut.man vigilance.man esper.man razzledazzle.man \
- peepers.man crumbler.man maze3d.man
+ peepers.man crumbler.man maze3d.man handsy.man
MEN = @GL_MEN@
RETIRED_MEN = glforestfire.man
EXTRAS = README Makefile.in dxf2gl.pl vrml2gl.pl wfront2gl.pl \
@@ -452,7 +452,9 @@ distdepend:: molecules.h
-e 's@ \([^$$]\)@ $$(srcdir)/\1@g' \
-e 's@ $$(srcdir)/\(.*config.h\)@ \1@g' \
-e 's@ $$(HACK_SRC)/\(.*config.h\)@ ../\1@g' \
- -e 's@ $$(srcdir)/\(.*molecules.h\)@ \1@g' ; \
+ -e 's@ $$(srcdir)/\(.*molecules.h\)@ \1@g' \
+ -e 's@ $$(srcdir)/\(images/gen/\)@ ../\1@g' \
+ -e 's@ $$(HACK_SRC)/\(images/gen/\)@ ../\1@g' ; \
echo '' \
) > /tmp/distdepend.$$$$ && \
mv /tmp/distdepend.$$$$ Makefile.in
@@ -997,6 +999,14 @@ crumbler: crumbler.o quickhull.o $(HACK_TRACK_OBJS)
maze3d: maze3d.o $(PNG) $(HACK_TRACK_OBJS)
$(CC_HACK) -o $@ $@.o $(PNG) $(PNG_LIBS) $(HACK_TRACK_OBJS) $(HACK_LIBS)
+HANDSY_OBJS=gllist.o handsy_model.o normals.o $(HACK_TRACK_OBJS)
+handsy: handsy.o $(HANDSY_OBJS)
+ $(CC_HACK) -o $@ $@.o $(HANDSY_OBJS) $(HACK_LIBS)
+
+handsy_dxf::
+ ./dxf2gl.pl --smooth 28 --layers handsy.dxf handsy_model.c
+
+
##############################################################################
#
# DO NOT DELETE: updated by make distdepend
@@ -1062,7 +1072,7 @@ antspotlight.o: $(HACK_SRC)/xlockmore.h
atlantis.o: $(srcdir)/atlantis.h
atlantis.o: ../../config.h
atlantis.o: $(HACK_SRC)/fps.h
-atlantis.o: $(HACK_SRC)/images/gen/sea-texture_png.h
+atlantis.o: ../images/gen/sea-texture_png.h
atlantis.o: $(HACK_SRC)/recanim.h
atlantis.o: $(HACK_SRC)/screenhackI.h
atlantis.o: $(UTILS_SRC)/colors.h
@@ -1079,12 +1089,12 @@ atlantis.o: $(HACK_SRC)/xlockmoreI.h
atlantis.o: $(HACK_SRC)/xlockmore.h
atunnel.o: ../../config.h
atunnel.o: $(HACK_SRC)/fps.h
-atunnel.o: $(HACK_SRC)/images/gen/tunnel0_png.h
-atunnel.o: $(HACK_SRC)/images/gen/tunnel1_png.h
-atunnel.o: $(HACK_SRC)/images/gen/tunnel2_png.h
-atunnel.o: $(HACK_SRC)/images/gen/tunnel3_png.h
-atunnel.o: $(HACK_SRC)/images/gen/tunnel4_png.h
-atunnel.o: $(HACK_SRC)/images/gen/tunnel5_png.h
+atunnel.o: ../images/gen/tunnel0_png.h
+atunnel.o: ../images/gen/tunnel1_png.h
+atunnel.o: ../images/gen/tunnel2_png.h
+atunnel.o: ../images/gen/tunnel3_png.h
+atunnel.o: ../images/gen/tunnel4_png.h
+atunnel.o: ../images/gen/tunnel5_png.h
atunnel.o: $(HACK_SRC)/recanim.h
atunnel.o: $(HACK_SRC)/screenhackI.h
atunnel.o: $(srcdir)/tunnel_draw.h
@@ -1149,7 +1159,7 @@ b_lockglue.o: $(HACK_SRC)/xlockmoreI.h
b_lockglue.o: $(HACK_SRC)/xlockmore.h
blocktube.o: ../../config.h
blocktube.o: $(HACK_SRC)/fps.h
-blocktube.o: $(HACK_SRC)/images/gen/blocktube_png.h
+blocktube.o: ../images/gen/blocktube_png.h
blocktube.o: $(HACK_SRC)/recanim.h
blocktube.o: $(HACK_SRC)/screenhackI.h
blocktube.o: $(UTILS_SRC)/colors.h
@@ -1249,7 +1259,7 @@ buildlwo.o: $(srcdir)/buildlwo.h
buildlwo.o: ../../config.h
cage.o: ../../config.h
cage.o: $(HACK_SRC)/fps.h
-cage.o: $(HACK_SRC)/images/gen/wood_png.h
+cage.o: ../images/gen/wood_png.h
cage.o: $(HACK_SRC)/recanim.h
cage.o: $(HACK_SRC)/screenhackI.h
cage.o: $(UTILS_SRC)/colors.h
@@ -1582,10 +1592,10 @@ dymaxionmap.o: ../../config.h
dymaxionmap.o: $(srcdir)/dymaxionmap-coords.h
dymaxionmap.o: $(HACK_SRC)/fps.h
dymaxionmap.o: $(srcdir)/gltrackball.h
-dymaxionmap.o: $(HACK_SRC)/images/gen/earth_flat_png.h
-dymaxionmap.o: $(HACK_SRC)/images/gen/earth_night_png.h
-dymaxionmap.o: $(HACK_SRC)/images/gen/earth_png.h
-dymaxionmap.o: $(HACK_SRC)/images/gen/ground_png.h
+dymaxionmap.o: ../images/gen/earth_flat_png.h
+dymaxionmap.o: ../images/gen/earth_night_png.h
+dymaxionmap.o: ../images/gen/earth_png.h
+dymaxionmap.o: ../images/gen/ground_png.h
dymaxionmap.o: $(srcdir)/normals.h
dymaxionmap.o: $(HACK_SRC)/recanim.h
dymaxionmap.o: $(srcdir)/rotator.h
@@ -1804,8 +1814,8 @@ flyingtoasters.o: ../../config.h
flyingtoasters.o: $(HACK_SRC)/fps.h
flyingtoasters.o: $(srcdir)/gllist.h
flyingtoasters.o: $(srcdir)/gltrackball.h
-flyingtoasters.o: $(HACK_SRC)/images/gen/chromesphere_png.h
-flyingtoasters.o: $(HACK_SRC)/images/gen/toast_png.h
+flyingtoasters.o: ../images/gen/chromesphere_png.h
+flyingtoasters.o: ../images/gen/toast_png.h
flyingtoasters.o: $(HACK_SRC)/recanim.h
flyingtoasters.o: $(HACK_SRC)/screenhackI.h
flyingtoasters.o: $(UTILS_SRC)/colors.h
@@ -1965,8 +1975,8 @@ gleidescope.o: $(HACK_SRC)/xlockmore.h
glforestfire.o: ../../config.h
glforestfire.o: $(HACK_SRC)/fps.h
glforestfire.o: $(srcdir)/gltrackball.h
-glforestfire.o: $(HACK_SRC)/images/gen/ground_png.h
-glforestfire.o: $(HACK_SRC)/images/gen/tree_png.h
+glforestfire.o: ../images/gen/ground_png.h
+glforestfire.o: ../images/gen/tree_png.h
glforestfire.o: $(HACK_SRC)/recanim.h
glforestfire.o: $(HACK_SRC)/screenhackI.h
glforestfire.o: $(UTILS_SRC)/colors.h
@@ -2019,7 +2029,7 @@ gllist.o: ../../config.h
gllist.o: $(srcdir)/gllist.h
glmatrix.o: ../../config.h
glmatrix.o: $(HACK_SRC)/fps.h
-glmatrix.o: $(HACK_SRC)/images/gen/matrix3_png.h
+glmatrix.o: ../images/gen/matrix3_png.h
glmatrix.o: $(HACK_SRC)/recanim.h
glmatrix.o: $(HACK_SRC)/screenhackI.h
glmatrix.o: $(UTILS_SRC)/colors.h
@@ -2037,8 +2047,8 @@ glmatrix.o: $(HACK_SRC)/xlockmore.h
glplanet.o: ../../config.h
glplanet.o: $(HACK_SRC)/fps.h
glplanet.o: $(srcdir)/gltrackball.h
-glplanet.o: $(HACK_SRC)/images/gen/earth_night_png.h
-glplanet.o: $(HACK_SRC)/images/gen/earth_png.h
+glplanet.o: ../images/gen/earth_night_png.h
+glplanet.o: ../images/gen/earth_png.h
glplanet.o: $(HACK_SRC)/recanim.h
glplanet.o: $(srcdir)/rotator.h
glplanet.o: $(HACK_SRC)/screenhackI.h
@@ -2151,6 +2161,29 @@ grab-ximage.o: $(UTILS_SRC)/grabscreen.h
grab-ximage.o: $(UTILS_SRC)/pow2.h
grab-ximage.o: $(UTILS_SRC)/visual.h
grab-ximage.o: $(UTILS_SRC)/xshm.h
+handsy_model.o: ../../config.h
+handsy_model.o: $(srcdir)/gllist.h
+handsy.o: ../../config.h
+handsy.o: $(HACK_SRC)/fps.h
+handsy.o: $(srcdir)/gllist.h
+handsy.o: $(srcdir)/gltrackball.h
+handsy.o: $(srcdir)/handsy_anim.h
+handsy.o: $(HACK_SRC)/recanim.h
+handsy.o: $(srcdir)/rotator.h
+handsy.o: $(HACK_SRC)/screenhackI.h
+handsy.o: $(srcdir)/sphere.h
+handsy.o: $(srcdir)/tube.h
+handsy.o: $(UTILS_SRC)/colors.h
+handsy.o: $(UTILS_SRC)/erase.h
+handsy.o: $(UTILS_SRC)/font-retry.h
+handsy.o: $(UTILS_SRC)/grabscreen.h
+handsy.o: $(UTILS_SRC)/hsv.h
+handsy.o: $(UTILS_SRC)/resources.h
+handsy.o: $(UTILS_SRC)/usleep.h
+handsy.o: $(UTILS_SRC)/visual.h
+handsy.o: $(UTILS_SRC)/yarandom.h
+handsy.o: $(HACK_SRC)/xlockmoreI.h
+handsy.o: $(HACK_SRC)/xlockmore.h
hexstrut.o: ../../config.h
hexstrut.o: $(HACK_SRC)/fps.h
hexstrut.o: $(srcdir)/gltrackball.h
@@ -2255,7 +2288,7 @@ involute.o: $(UTILS_SRC)/yarandom.h
jigglypuff.o: ../../config.h
jigglypuff.o: $(HACK_SRC)/fps.h
jigglypuff.o: $(srcdir)/gltrackball.h
-jigglypuff.o: $(HACK_SRC)/images/gen/jigglymap_png.h
+jigglypuff.o: ../images/gen/jigglymap_png.h
jigglypuff.o: $(HACK_SRC)/recanim.h
jigglypuff.o: $(HACK_SRC)/screenhackI.h
jigglypuff.o: $(UTILS_SRC)/colors.h
@@ -2352,7 +2385,7 @@ lament.o: ../../config.h
lament.o: $(HACK_SRC)/fps.h
lament.o: $(srcdir)/gllist.h
lament.o: $(srcdir)/gltrackball.h
-lament.o: $(HACK_SRC)/images/gen/lament512_png.h
+lament.o: ../images/gen/lament512_png.h
lament.o: $(srcdir)/normals.h
lament.o: $(HACK_SRC)/recanim.h
lament.o: $(srcdir)/rotator.h
@@ -2408,12 +2441,12 @@ marching.o: $(srcdir)/marching.h
marching.o: $(srcdir)/normals.h
maze3d.o: ../../config.h
maze3d.o: $(HACK_SRC)/fps.h
-maze3d.o: $(HACK_SRC)/images/gen/bob_png.h
-maze3d.o: $(HACK_SRC)/images/gen/brick1_png.h
-maze3d.o: $(HACK_SRC)/images/gen/brick2_png.h
-maze3d.o: $(HACK_SRC)/images/gen/logo-32_png.h
-maze3d.o: $(HACK_SRC)/images/gen/start_png.h
-maze3d.o: $(HACK_SRC)/images/gen/wood2_png.h
+maze3d.o: ../images/gen/bob_png.h
+maze3d.o: ../images/gen/brick1_png.h
+maze3d.o: ../images/gen/brick2_png.h
+maze3d.o: ../images/gen/logo-32_png.h
+maze3d.o: ../images/gen/start_png.h
+maze3d.o: ../images/gen/wood2_png.h
maze3d.o: $(HACK_SRC)/recanim.h
maze3d.o: $(HACK_SRC)/screenhackI.h
maze3d.o: $(UTILS_SRC)/colors.h
@@ -2557,8 +2590,8 @@ normals.o: $(srcdir)/normals.h
peepers.o: ../../config.h
peepers.o: $(HACK_SRC)/fps.h
peepers.o: $(srcdir)/gltrackball.h
-peepers.o: $(HACK_SRC)/images/gen/iris_png.h
-peepers.o: $(HACK_SRC)/images/gen/sclera_png.h
+peepers.o: ../images/gen/iris_png.h
+peepers.o: ../images/gen/sclera_png.h
peepers.o: $(srcdir)/normals.h
peepers.o: $(HACK_SRC)/recanim.h
peepers.o: $(srcdir)/rotator.h
@@ -2875,8 +2908,8 @@ s1_b.o: $(srcdir)/gllist.h
sballs.o: ../../config.h
sballs.o: $(HACK_SRC)/fps.h
sballs.o: $(srcdir)/gltrackball.h
-sballs.o: $(HACK_SRC)/images/gen/sball-bg_png.h
-sballs.o: $(HACK_SRC)/images/gen/sball_png.h
+sballs.o: ../images/gen/sball-bg_png.h
+sballs.o: ../images/gen/sball_png.h
sballs.o: $(HACK_SRC)/recanim.h
sballs.o: $(HACK_SRC)/screenhackI.h
sballs.o: $(UTILS_SRC)/colors.h
@@ -2928,7 +2961,7 @@ sierpinski3d.o: $(HACK_SRC)/xlockmore.h
skytentacles.o: ../../config.h
skytentacles.o: $(HACK_SRC)/fps.h
skytentacles.o: $(srcdir)/gltrackball.h
-skytentacles.o: $(HACK_SRC)/images/gen/scales_png.h
+skytentacles.o: ../images/gen/scales_png.h
skytentacles.o: $(srcdir)/normals.h
skytentacles.o: $(HACK_SRC)/recanim.h
skytentacles.o: $(srcdir)/rotator.h
@@ -3094,7 +3127,7 @@ sproingiewrap.o: $(HACK_SRC)/xlockmore.h
stairs.o: ../../config.h
stairs.o: $(HACK_SRC)/fps.h
stairs.o: $(srcdir)/gltrackball.h
-stairs.o: $(HACK_SRC)/images/gen/wood_png.h
+stairs.o: ../images/gen/wood_png.h
stairs.o: $(HACK_SRC)/recanim.h
stairs.o: $(HACK_SRC)/screenhackI.h
stairs.o: $(srcdir)/sphere.h
@@ -3242,11 +3275,11 @@ texfont.o: $(UTILS_SRC)/xshm.h
timetunnel.o: ../../config.h
timetunnel.o: $(HACK_SRC)/fps.h
timetunnel.o: $(srcdir)/gltrackball.h
-timetunnel.o: $(HACK_SRC)/images/gen/logo-180_png.h
-timetunnel.o: $(HACK_SRC)/images/gen/timetunnel0_png.h
-timetunnel.o: $(HACK_SRC)/images/gen/timetunnel1_png.h
-timetunnel.o: $(HACK_SRC)/images/gen/timetunnel2_png.h
-timetunnel.o: $(HACK_SRC)/images/gen/tunnelstar_png.h
+timetunnel.o: ../images/gen/logo-180_png.h
+timetunnel.o: ../images/gen/timetunnel0_png.h
+timetunnel.o: ../images/gen/timetunnel1_png.h
+timetunnel.o: ../images/gen/timetunnel2_png.h
+timetunnel.o: ../images/gen/tunnelstar_png.h
timetunnel.o: $(HACK_SRC)/recanim.h
timetunnel.o: $(srcdir)/rotator.h
timetunnel.o: $(HACK_SRC)/screenhackI.h
@@ -3433,7 +3466,7 @@ winduprobot.o: ../../config.h
winduprobot.o: $(HACK_SRC)/fps.h
winduprobot.o: $(srcdir)/gllist.h
winduprobot.o: $(srcdir)/gltrackball.h
-winduprobot.o: $(HACK_SRC)/images/gen/chromesphere_png.h
+winduprobot.o: ../images/gen/chromesphere_png.h
winduprobot.o: $(srcdir)/involute.h
winduprobot.o: $(HACK_SRC)/recanim.h
winduprobot.o: $(HACK_SRC)/screenhackI.h
diff --git a/hacks/glx/antinspect.c b/hacks/glx/antinspect.c
index ad3bef5..8f2152b 100644
--- a/hacks/glx/antinspect.c
+++ b/hacks/glx/antinspect.c
@@ -19,7 +19,6 @@
#define DEFAULTS "*delay: 20000 \n" \
"*showFPS: False \n"
-# define free_antinspect 0
# define release_antinspect 0
#include "xlockmore.h"
#else
@@ -645,7 +644,7 @@ ENTRYPOINT void draw_antinspect(ModeInfo * mi)
if(!mp->glx_context)
return;
- glXMakeCurrent(display, window, *(mp->glx_context));
+ glXMakeCurrent(display, window, *mp->glx_context);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -695,10 +694,17 @@ ENTRYPOINT void change_antinspect(ModeInfo * mi)
if (!mp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(mp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *mp->glx_context);
pinit();
}
#endif /* !STANDALONE */
+ENTRYPOINT void free_antinspect(ModeInfo * mi)
+{
+ antinspectstruct *mp = &antinspect[MI_SCREEN(mi)];
+ if (!mp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *mp->glx_context);
+ gltrackball_free (mp->trackball);
+}
XSCREENSAVER_MODULE ("AntInspect", antinspect)
diff --git a/hacks/glx/antmaze.c b/hacks/glx/antmaze.c
index 79b7e0b..6853b35 100644
--- a/hacks/glx/antmaze.c
+++ b/hacks/glx/antmaze.c
@@ -25,7 +25,6 @@ static const char sccsid[] = "@(#)antmaze.c 5.01 2001/03/01 xlockmore";
"*showFPS: False \n" \
"*fpsSolid: True \n"
-# define free_antmaze 0
# define release_antmaze 0
# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
@@ -1442,7 +1441,7 @@ ENTRYPOINT void draw_antmaze(ModeInfo * mi)
return;
mi->polygon_count = 0;
- glXMakeCurrent(display, window, *(mp->glx_context));
+ glXMakeCurrent(display, window, *mp->glx_context);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -1603,11 +1602,22 @@ ENTRYPOINT void change_antmaze(ModeInfo * mi)
if (!mp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(mp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *mp->glx_context);
pinit();
}
#endif /* !STANDALONE */
+ENTRYPOINT void free_antmaze(ModeInfo * mi)
+{
+ antmazestruct *mp = &antmaze[MI_SCREEN(mi)];
+ if (!mp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *mp->glx_context);
+ gltrackball_free (mp->trackball);
+ free_rotator (mp->rot);
+ if (mp->checktexture) glDeleteTextures (1, &mp->checktexture);
+ if (mp->brushedtexture) glDeleteTextures (1, &mp->brushedtexture);
+}
+
XSCREENSAVER_MODULE ("AntMaze", antmaze)
#endif
diff --git a/hacks/glx/antspotlight.c b/hacks/glx/antspotlight.c
index 55bb80c..f5e1e69 100644
--- a/hacks/glx/antspotlight.c
+++ b/hacks/glx/antspotlight.c
@@ -19,7 +19,6 @@
"*showFPS: False \n" \
"*useSHM: True \n"
-# define free_antspotlight 0
# define release_antspotlight 0
#include "xlockmore.h"
#else
@@ -750,7 +749,7 @@ ENTRYPOINT void draw_antspotlight(ModeInfo * mi)
/* Just keep running before the texture has come in. */
/* if (mp->waiting_for_image_p) return; */
- glXMakeCurrent(display, window, *(mp->glx_context));
+ glXMakeCurrent(display, window, *mp->glx_context);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -791,9 +790,19 @@ ENTRYPOINT void change_antspotlight(ModeInfo * mi)
if (!mp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(mp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *mp->glx_context);
pinit();
}
#endif /* !STANDALONE */
+ENTRYPOINT void free_antspotlight(ModeInfo * mi)
+{
+ antspotlightstruct *mp = &antspotlight[MI_SCREEN(mi)];
+ if (!mp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *mp->glx_context);
+ gltrackball_free (mp->trackball);
+ free_rotator (mp->rot);
+ if (mp->screentexture) glDeleteTextures (1, &mp->screentexture);
+}
+
XSCREENSAVER_MODULE ("AntSpotlight", antspotlight)
diff --git a/hacks/glx/atlantis.c b/hacks/glx/atlantis.c
index 04bde12..05ea903 100644
--- a/hacks/glx/atlantis.c
+++ b/hacks/glx/atlantis.c
@@ -308,6 +308,9 @@ Init(ModeInfo *mi)
glLoadIdentity();
glScalef(scale, scale, 1);
glMatrixMode(GL_MODELVIEW);
+
+ if (ap->texture) XDestroyImage (ap->texture);
+ ap->texture = 0;
}
InitFishs(ap);
@@ -466,7 +469,7 @@ init_atlantis(ModeInfo * mi)
if ((ap->sharks = (fishRec *) calloc(ap->num_sharks,
sizeof (fishRec))) == NULL) {
/* free everything up to now */
- (void) free((void *) atlantis);
+ free(atlantis);
atlantis = NULL;
return;
}
@@ -520,7 +523,7 @@ draw_atlantis(ModeInfo * mi)
if (!ap->glx_context)
return;
- glXMakeCurrent(display, window, *(ap->glx_context));
+ glXMakeCurrent(display, window, *ap->glx_context);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -545,12 +548,10 @@ draw_atlantis(ModeInfo * mi)
ENTRYPOINT void
free_atlantis(ModeInfo * mi)
{
-#if 0
- atlantisstruct *ap = &atlantis[screen];
-
- if (ap->sharks)
- (void) free((void *) ap->sharks);
-#endif
+ atlantisstruct *ap = &atlantis[MI_SCREEN(mi)];
+ if (!ap->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *ap->glx_context);
+ if (ap->sharks) free(ap->sharks);
}
#ifndef STANDALONE
@@ -567,7 +568,7 @@ change_atlantis(ModeInfo * mi)
if (!ap->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(ap->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *ap->glx_context);
Init(mi);
}
#endif /* !STANDALONE */
diff --git a/hacks/glx/atunnel.c b/hacks/glx/atunnel.c
index f21d04f..1b8fb07 100644
--- a/hacks/glx/atunnel.c
+++ b/hacks/glx/atunnel.c
@@ -267,7 +267,7 @@ ENTRYPOINT void draw_atunnel(ModeInfo * mi)
if (!sa->glx_context)
return;
- glXMakeCurrent(display, window, *(sa->glx_context));
+ glXMakeCurrent(display, window, *sa->glx_context);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -303,13 +303,13 @@ ENTRYPOINT void init_atunnel(ModeInfo * mi)
}
-/* all sorts of nice cleanup code should go here! */
ENTRYPOINT void free_atunnel(ModeInfo * mi)
{
-#if 0
atunnelstruct *sa = &Atunnel[MI_SCREEN(mi)];
- FreeTunnel(sa->ts);
-#endif
+ if (!sa->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *sa->glx_context);
+ atunnel_FreeTunnel(sa->ts);
+ glDeleteTextures (MAX_TEXTURE, sa->texture);
}
XSCREENSAVER_MODULE ("Atunnel", atunnel)
diff --git a/hacks/glx/b_draw.c b/hacks/glx/b_draw.c
index 977efbe..1b789b6 100644
--- a/hacks/glx/b_draw.c
+++ b/hacks/glx/b_draw.c
@@ -127,8 +127,8 @@ glb_draw_end(void *cc)
glb_sphere_end (c->d);
- (void) free((void *) c->bubble_list);
- (void) free((void *) c);
+ free(c->bubble_list);
+ free(c);
}
static int
diff --git a/hacks/glx/b_lockglue.c b/hacks/glx/b_lockglue.c
index 1bb1e67..d134a66 100644
--- a/hacks/glx/b_lockglue.c
+++ b/hacks/glx/b_lockglue.c
@@ -195,7 +195,7 @@ draw_bubble3d(ModeInfo * mi)
if (!c->glx_context)
return;
- glXMakeCurrent(display, window, *(c->glx_context));
+ glXMakeCurrent(display, window, *c->glx_context);
glb_config.polygon_count = 0;
glPushMatrix();
@@ -231,8 +231,9 @@ ENTRYPOINT void
free_bubble3d(ModeInfo * mi)
{
struct context *c = &contexts[MI_SCREEN(mi)];
- if (c->draw_context)
- glb_draw_end(c->draw_context);
+ if (!c->glx_context) return;
+ glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *c->glx_context);
+ if (c->draw_context) glb_draw_end(c->draw_context);
}
XSCREENSAVER_MODULE ("Bubble3D", bubble3d)
diff --git a/hacks/glx/b_sphere.c b/hacks/glx/b_sphere.c
index 78be392..38e3d79 100644
--- a/hacks/glx/b_sphere.c
+++ b/hacks/glx/b_sphere.c
@@ -213,7 +213,7 @@ glb_sphere_get_triangles(glb_data *d, int *nr_triangles_ptr)
void
glb_sphere_end(glb_data *d)
{
- (void) free((void *) d->vertices);
- (void) free((void *) d->triangles);
+ free(d->vertices);
+ free(d->triangles);
free (d);
}
diff --git a/hacks/glx/blinkbox.c b/hacks/glx/blinkbox.c
index f777371..45071a9 100644
--- a/hacks/glx/blinkbox.c
+++ b/hacks/glx/blinkbox.c
@@ -16,7 +16,6 @@
"*wireframe: False \n" \
"*suppressRotationAnimation: True\n" \
-# define free_ball 0
# define release_ball 0
# define ball_handle_event xlockmore_no_events
#undef countof
@@ -383,11 +382,11 @@ init_ball (ModeInfo *mi)
#define SPHERE_SLICES 12 /* how densely to render spheres */
#define SPHERE_STACKS 16
- bp->sp = malloc(sizeof(*bp->sp));
+/* bp->sp = malloc(sizeof(*bp->sp));
if(bp->sp == NULL){
fprintf(stderr,"Could not allocate memory\n");
exit(1);
- }
+ }*/
if( (bp->bscale.wh < 1) ||
(bp->bscale.wh > 8) ) {
fprintf(stderr,"Boxsize out of range. Using default\n");
@@ -449,7 +448,7 @@ draw_ball (ModeInfo *mi)
if (! bp->glx_context)
return;
mi->polygon_count = 0;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -603,6 +602,16 @@ draw_ball (ModeInfo *mi)
}
+ENTRYPOINT void
+free_ball (ModeInfo *mi)
+{
+ blinkboxstruct *bp = &blinkbox[MI_SCREEN(mi)];
+ if (!bp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
+ if (glIsList(bp->ballList)) glDeleteLists(bp->ballList, 1);
+ if (glIsList(bp->boxList)) glDeleteLists(bp->boxList, 1);
+}
+
XSCREENSAVER_MODULE_2 ("BlinkBox", blinkbox, ball)
#endif /* USE_GL */
diff --git a/hacks/glx/blocktube.c b/hacks/glx/blocktube.c
index d4a402e..811b185 100644
--- a/hacks/glx/blocktube.c
+++ b/hacks/glx/blocktube.c
@@ -291,14 +291,13 @@ ENTRYPOINT void free_blocktube (ModeInfo *mi)
{
blocktube_configuration *lp = &lps[MI_SCREEN(mi)];
# if defined ( I_HAVE_XPM )
- if (lp->glx_context) {
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(lp->glx_context));
-
- if (lp->envTexture)
- glDeleteTextures(1, &lp->envTexture);
- if (lp->texti)
- XDestroyImage(lp->texti);
- }
+ if (!lp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *lp->glx_context);
+ if (lp->envTexture) glDeleteTextures(1, &lp->envTexture);
+ if (lp->texti) XDestroyImage(lp->texti);
+ if (glIsList(lp->block_dlist)) glDeleteLists(lp->block_dlist, 1);
+ if (lp->envTexture) glDeleteTextures (1, &lp->envTexture);
+
# endif
}
@@ -308,7 +307,7 @@ ENTRYPOINT void reshape_blocktube (ModeInfo *mi, int width, int height)
GLfloat h = (GLfloat) height / (GLfloat) width;
int y = 0;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(lp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *lp->glx_context);
if (width > height * 5) { /* tiny window: show middle */
height = width;
@@ -421,7 +420,7 @@ draw_blocktube (ModeInfo *mi)
mi->polygon_count = 0;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(lp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *lp->glx_context);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
diff --git a/hacks/glx/boing.c b/hacks/glx/boing.c
index 55a05f3..adaf96b 100644
--- a/hacks/glx/boing.c
+++ b/hacks/glx/boing.c
@@ -25,7 +25,6 @@
"*showFPS: False \n" \
"*wireframe: False \n" \
-# define free_boing 0
# define release_boing 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@ -595,7 +594,7 @@ draw_boing (ModeInfo *mi)
if (!bp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
mi->polygon_count = 0;
@@ -653,6 +652,16 @@ draw_boing (ModeInfo *mi)
glXSwapBuffers(dpy, window);
}
+
+ENTRYPOINT void
+free_boing (ModeInfo *mi)
+{
+ boing_configuration *bp = &bps[MI_SCREEN(mi)];
+ if (!bp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
+ if (bp->trackball) gltrackball_free (bp->trackball);
+}
+
XSCREENSAVER_MODULE ("Boing", boing)
#endif /* USE_GL */
diff --git a/hacks/glx/bouncingcow.c b/hacks/glx/bouncingcow.c
index 6f9b45d..bcbea24 100644
--- a/hacks/glx/bouncingcow.c
+++ b/hacks/glx/bouncingcow.c
@@ -16,7 +16,6 @@
"*showFPS: False \n" \
"*wireframe: False \n" \
-# define free_cow 0
# define release_cow 0
#define DEF_SPEED "1.0"
#define DEF_TEXTURE "(none)"
@@ -463,7 +462,7 @@ draw_cow (ModeInfo *mi)
if (!bp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -514,6 +513,25 @@ draw_cow (ModeInfo *mi)
glXSwapBuffers(dpy, window);
}
+
+ENTRYPOINT void
+free_cow (ModeInfo *mi)
+{
+ cow_configuration *bp = &bps[MI_SCREEN(mi)];
+ int i;
+ if (!bp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
+ if (bp->floaters) {
+ for (i = 0; i < bp->nfloaters; i++)
+ free_rotator (bp->floaters[i].rot);
+ free (bp->floaters);
+ }
+ for (i = 0; i < countof(all_objs); i++)
+ if (glIsList(bp->dlists[i])) glDeleteLists(bp->dlists[i], 1);
+ if (bp->trackball) gltrackball_free (bp->trackball);
+ if (bp->dlists) free (bp->dlists);
+}
+
XSCREENSAVER_MODULE_2 ("BouncingCow", bouncingcow, cow)
#endif /* USE_GL */
diff --git a/hacks/glx/boxed.c b/hacks/glx/boxed.c
index 136d468..6ce82bb 100644
--- a/hacks/glx/boxed.c
+++ b/hacks/glx/boxed.c
@@ -1330,7 +1330,7 @@ draw_boxed(ModeInfo * mi)
glDrawBuffer(GL_BACK);
- glXMakeCurrent(display, window, *(gp->glx_context));
+ glXMakeCurrent(display, window, *gp->glx_context);
draw(mi);
if (mi->fps_p) do_fps (mi);
@@ -1343,23 +1343,17 @@ free_boxed(ModeInfo * mi)
{
boxedstruct *gp = &boxed[MI_SCREEN(mi)];
int i;
-
- if (gp->glx_context) {
- /* Display lists MUST be freed while their glXContext is current. */
- glXMakeCurrent(MI_DISPLAY(mi), gp->window, *(gp->glx_context));
-
- if (glIsList(gp->listobjects))
- glDeleteLists(gp->listobjects, 3);
-
- for (i=0;i<gp->bman.num_balls;i++) {
- if (gp->bman.balls[i].bounced) freetris(&gp->tman[i]);
- }
- free (gp->bman.balls);
- free (gp->tman);
- free (gp->tex1);
-
-
- }
+ if (!gp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), gp->window, *gp->glx_context);
+ if (glIsList(gp->listobjects)) glDeleteLists(gp->listobjects, 3);
+ for (i=0;i<gp->bman.num_balls;i++)
+ if (gp->bman.balls[i].bounced) freetris(&gp->tman[i]);
+ glDeleteLists (gp->gllists[0], 1);
+ glDeleteLists (gp->gllists[1], 1);
+ glDeleteLists (gp->gllists[2], 1);
+ free (gp->bman.balls);
+ free (gp->tman);
+ free (gp->tex1);
}
diff --git a/hacks/glx/bubble3d.c b/hacks/glx/bubble3d.c
index 9cd2afc..7b0b686 100644
--- a/hacks/glx/bubble3d.c
+++ b/hacks/glx/bubble3d.c
@@ -114,20 +114,20 @@ glb_bubble_new(glb_data *d, GLfloat x, GLfloat y, GLfloat z, GLfloat scale,
b->contributions = (GLfloat *) malloc(sizeof (GLfloat) * nr_vertices *
glb_config.nr_nudge_axes);
if (b->contributions == 0) {
- (void) free((void *) b);
+ free(b);
return 0;
}
b->nudge_angle = (GLfloat *) malloc(sizeof (GLfloat) * glb_config.nr_nudge_axes);
if (b->nudge_angle == 0) {
- (void) free((void *) b->contributions);
- (void) free((void *) b);
+ free(b->contributions);
+ free(b);
return 0;
}
b->nudge_angle_incr = (GLfloat *) malloc(sizeof (GLfloat) * glb_config.nr_nudge_axes);
if (b->nudge_angle_incr == 0) {
- (void) free((void *) b->nudge_angle);
- (void) free((void *) b->contributions);
- (void) free((void *) b);
+ free(b->nudge_angle);
+ free(b->contributions);
+ free(b);
return 0;
}
/* Initialize primitive elements. */
@@ -176,18 +176,18 @@ glb_bubble_delete(void *bb)
if (b != NULL) {
if (b->nudge_angle_incr) {
- (void) free((void *) b->nudge_angle_incr);
+ free(b->nudge_angle_incr);
b->nudge_angle_incr = NULL;
}
if (b->nudge_angle) {
- (void) free((void *) b->nudge_angle);
+ free(b->nudge_angle);
b->nudge_angle = NULL;
}
if (b->contributions) {
- (void) free((void *) b->contributions);
+ free(b->contributions);
b->contributions = NULL;
}
- (void) free((void *) b);
+ free(b);
b = NULL;
}
}
@@ -267,7 +267,7 @@ glb_bubble_draw(glb_data *d, void *bb)
}
glEnd();
glPopMatrix();
- (void) free((void *) new_vertices);
+ free(new_vertices);
glb_config.polygon_count += nr_triangles;
}
diff --git a/hacks/glx/cage.c b/hacks/glx/cage.c
index 66f48aa..32384a7 100644
--- a/hacks/glx/cage.c
+++ b/hacks/glx/cage.c
@@ -82,7 +82,6 @@ static const char sccsid[] = "@(#)cage.c 5.01 2001/03/01 xlockmore";
"*wireframe: False \n" \
"*suppressRotationAnimation: True\n" \
-# define free_cage 0
# define release_cage 0
# define cage_handle_event xlockmore_no_events
# include "xlockmore.h" /* from the xscreensaver distribution */
@@ -418,7 +417,7 @@ draw_cage (ModeInfo * mi)
return;
mi->polygon_count = 0;
- glXMakeCurrent(display, window, *(cp->glx_context));
+ glXMakeCurrent(display, window, *cp->glx_context);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -470,11 +469,17 @@ change_cage (ModeInfo * mi)
if (!cp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(cp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *cp->glx_context);
pinit(mi);
}
#endif /* !STANDALONE */
+ENTRYPOINT void
+free_cage (ModeInfo * mi)
+{
+ /* nothing to do */
+}
+
XSCREENSAVER_MODULE ("Cage", cage)
#endif
diff --git a/hacks/glx/carousel.c b/hacks/glx/carousel.c
index 863b1a5..c1132b1 100644
--- a/hacks/glx/carousel.c
+++ b/hacks/glx/carousel.c
@@ -34,7 +34,6 @@
"*grabDesktopImages: False \n" \
"*chooseRandomImages: True \n"
-# define free_carousel 0
# define release_carousel 0
# include "xlockmore.h"
@@ -497,6 +496,7 @@ hack_resources (Display *dpy)
value.addr = buf2;
value.size = strlen(buf2);
XrmPutResource (&db, buf1, "String", &value);
+ free (val);
# endif /* !HAVE_JWXYZ */
}
@@ -847,7 +847,7 @@ draw_carousel (ModeInfo *mi)
if (!ss->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(ss->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *ss->glx_context);
if (ss->awaiting_first_images_p)
if (!load_initial_images (mi))
@@ -936,6 +936,29 @@ draw_carousel (ModeInfo *mi)
glXSwapBuffers (MI_DISPLAY (mi), MI_WINDOW(mi));
}
+
+ENTRYPOINT void
+free_carousel (ModeInfo *mi)
+{
+ carousel_state *ss = &sss[MI_SCREEN(mi)];
+ int i;
+ if (!ss->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *ss->glx_context);
+ if (ss->rot) free_rotator (ss->rot);
+ if (ss->trackball) gltrackball_free (ss->trackball);
+ if (ss->texfont) free_texture_font (ss->texfont);
+ if (ss->titlefont) free_texture_font (ss->titlefont);
+ for (i = 0; i < ss->nframes; i++) {
+ if (ss->frames[i]->current.title) free (ss->frames[i]->current.title);
+ if (ss->frames[i]->loading.title) free (ss->frames[i]->loading.title);
+ if (ss->frames[i]->rot) free_rotator (ss->frames[i]->rot);
+ if (ss->frames[i]->current.texid)
+ glDeleteTextures (1, &ss->frames[i]->current.texid);
+ if (ss->frames[i]->loading.texid)
+ glDeleteTextures (1, &ss->frames[i]->loading.texid);
+ }
+}
+
XSCREENSAVER_MODULE ("Carousel", carousel)
#endif /* USE_GL */
diff --git a/hacks/glx/circuit.c b/hacks/glx/circuit.c
index 744e4b6..b8b845e 100644
--- a/hacks/glx/circuit.c
+++ b/hacks/glx/circuit.c
@@ -2072,7 +2072,7 @@ ENTRYPOINT void draw_circuit(ModeInfo *mi)
if (!ci->glx_context)
return;
- glXMakeCurrent(disp, w, *(ci->glx_context));
+ glXMakeCurrent(disp, w, *ci->glx_context);
display(mi);
@@ -2084,8 +2084,12 @@ ENTRYPOINT void draw_circuit(ModeInfo *mi)
ENTRYPOINT void free_circuit(ModeInfo *mi)
{
Circuit *ci = &circuit[MI_SCREEN(mi)];
- if (ci->font)
- free_texture_font (ci->font);
+ int i;
+ if (!ci->glx_context) return;
+ glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *ci->glx_context);
+ if (ci->font) free_texture_font (ci->font);
+ for (i = 0 ; i < 12 ; i++)
+ if (glIsList(ci->band_list[i])) glDeleteLists(ci->band_list[i], 1);
FreeAllGL(mi);
}
diff --git a/hacks/glx/cityflow.c b/hacks/glx/cityflow.c
index 2b3bd4f..a6660af 100644
--- a/hacks/glx/cityflow.c
+++ b/hacks/glx/cityflow.c
@@ -14,7 +14,6 @@
"*showFPS: False \n" \
"*wireframe: False \n" \
-# define free_cube 0
# define release_cube 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@ -381,7 +380,7 @@ draw_cube (ModeInfo *mi)
return;
mi->polygon_count = 0;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(cc->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *cc->glx_context);
interference (mi);
animate_cubes (mi);
@@ -540,6 +539,24 @@ draw_cube (ModeInfo *mi)
}
+ENTRYPOINT void
+free_cube (ModeInfo *mi)
+{
+ cube_configuration *cc = &ccs[MI_SCREEN(mi)];
+ if (!cc->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *cc->glx_context);
+
+ if (cc->waves) {
+ free (cc->waves->srcs);
+ free (cc->waves->heights);
+ free (cc->waves);
+ }
+ if (cc->trackball) gltrackball_free (cc->trackball);
+ if (cc->cubes) free (cc->cubes);
+ if (cc->colors) free (cc->colors);
+}
+
+
XSCREENSAVER_MODULE_2 ("Cityflow", cityflow, cube)
#endif /* USE_GL */
diff --git a/hacks/glx/companion.c b/hacks/glx/companion.c
index 3c004a5..1f518b1 100644
--- a/hacks/glx/companion.c
+++ b/hacks/glx/companion.c
@@ -26,7 +26,6 @@
/* #define DEBUG */
-# define free_cube 0
# define release_cube 0
#define DEF_SPEED "1.0"
#define DEF_SPIN "False"
@@ -548,7 +547,7 @@ draw_cube (ModeInfo *mi)
if (!bp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -587,6 +586,23 @@ draw_cube (ModeInfo *mi)
glXSwapBuffers(dpy, window);
}
+
+ENTRYPOINT void
+free_cube (ModeInfo *mi)
+{
+ cube_configuration *bp = &bps[MI_SCREEN(mi)];
+ int i;
+ if (!bp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
+ for (i = 0; i < bp->nfloaters; i++)
+ if (bp->floaters[i].rot) free_rotator (bp->floaters[i].rot);
+ for (i = 0; i < countof(all_objs)+1; i++)
+ if (glIsList(bp->dlists[i])) glDeleteLists(bp->dlists[i], 1);
+ if (bp->floaters) free (bp->floaters);
+ if (bp->trackball) gltrackball_free (bp->trackball);
+ if (bp->dlists) free (bp->dlists);
+}
+
XSCREENSAVER_MODULE_2 ("CompanionCube", companioncube, cube)
#endif /* USE_GL */
diff --git a/hacks/glx/crackberg.c b/hacks/glx/crackberg.c
index 74c6915..22d3adc 100644
--- a/hacks/glx/crackberg.c
+++ b/hacks/glx/crackberg.c
@@ -95,7 +95,7 @@ struct _Trile {
const Morph *morph;
struct _Trile *left, *right, *parent; /* for bst, NOT spatial */
- struct _Trile *next_free; /* for memory allocation */
+ struct _Trile *next_free, *next0; /* for memory allocation */
};
enum { MOTION_AUTO = 0, MOTION_MANUAL = 1, MOTION_LROT= 2, MOTION_RROT = 4,
@@ -124,6 +124,7 @@ struct _cberg_state {
double *heights, *norms;
Trile *free_head; /* for trile_[alloc|free] */
+ Trile *all_triles;
double draw_elapsed;
@@ -539,13 +540,15 @@ static Trile *trile_alloc(cberg_state *cberg)
cberg->free_head = cberg->free_head->next_free;
} else {
++cberg->count;
- if (!(new = malloc(sizeof(Trile)))
- || !(new->l = (double *) malloc(sizeof(double) * cberg->epoints * 3))) {
+ if (!(new = calloc(1, sizeof(Trile)))
+ || !(new->l = (double *) calloc(sizeof(double), cberg->epoints * 3))) {
perror(progname);
exit(1);
}
new->r = new->l + cberg->epoints;
new->v = new->r + cberg->epoints;
+ new->next0 = cberg->all_triles;
+ cberg->all_triles = new;
#ifdef DEBUG
printf("needed to alloc; [%d]\n", cberg->count);
#endif
@@ -584,13 +587,15 @@ static void trile_draw(Trile *tr, void *ignore)
static void grow_init(Trile *tr)
{
- tr->morph_data = (void *) malloc(sizeof(double));
+ if (!tr->morph_data)
+ tr->morph_data = (void *) malloc(sizeof(double));
*((double *)tr->morph_data) = 0.02; /* not 0; avoid normals crapping */
}
static void grow_free(Trile *tr)
{
- free(tr->morph_data);
+ if (tr->morph_data) free(tr->morph_data);
+ tr->morph_data = 0;
}
static void grow_draw(Trile *tr)
@@ -619,13 +624,15 @@ static void grow_dying_iter(Trile *tr, cberg_state *cberg)
static void fall_init(Trile *tr)
{
- tr->morph_data = (void *) malloc(sizeof(double));
+ if (!tr->morph_data)
+ tr->morph_data = (void *) malloc(sizeof(double));
*((double *)tr->morph_data) = 0.0;
}
static void fall_free(Trile *tr)
{
- free(tr->morph_data);
+ if (tr->morph_data) free(tr->morph_data);
+ tr->morph_data = 0;
}
static void fall_draw(Trile *tr)
@@ -654,13 +661,15 @@ static void fall_dying_iter(Trile *tr, cberg_state *cberg)
static void yeast_init(Trile *tr)
{
- tr->morph_data = (void *) malloc(sizeof(double));
+ if (!tr->morph_data)
+ tr->morph_data = (void *) malloc(sizeof(double));
*((double *)tr->morph_data) = 0.02;
}
static void yeast_free(Trile *tr)
{
- free(tr->morph_data);
+ if (tr->morph_data) free(tr->morph_data);
+ tr->morph_data = 0;
}
static void yeast_draw(Trile *tr)
@@ -1362,7 +1371,7 @@ ENTRYPOINT void draw_crackberg (ModeInfo *mi)
if (!cberg->glx_context) /*XXX does this get externally tweaked? it kinda*/
return; /*XXX can't.. check it in crackberg_init*/
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(cberg->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *cberg->glx_context);
gettimeofday(&cur_frame_t, NULL);
cur_frame = cur_frame_t.tv_sec + cur_frame_t.tv_usec / 1.0E6;
@@ -1458,9 +1467,17 @@ ENTRYPOINT void draw_crackberg (ModeInfo *mi)
ENTRYPOINT void free_crackberg (ModeInfo *mi)
{
cberg_state *cberg = &cbergs[MI_SCREEN(mi)];
- if (cberg->norms)
- free(cberg->norms);
- free(cberg->heights);
+ if (!cberg->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *cberg->glx_context);
+ while (cberg->all_triles) {
+ Trile *n = cberg->all_triles;
+ cberg->all_triles = n->next0;
+ free (n->l);
+ if (n->morph_data) free (n->morph_data);
+ free (n);
+ }
+ if (cberg->norms) free(cberg->norms);
+ if (cberg->heights) free(cberg->heights);
}
XSCREENSAVER_MODULE ("Crackberg", crackberg)
diff --git a/hacks/glx/crumbler.c b/hacks/glx/crumbler.c
index 8e783db..b7b8acc 100644
--- a/hacks/glx/crumbler.c
+++ b/hacks/glx/crumbler.c
@@ -747,7 +747,7 @@ draw_crumbler (ModeInfo *mi)
if (!bp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
tick_crumbler (mi);
@@ -861,12 +861,14 @@ free_crumbler (ModeInfo *mi)
{
crumbler_configuration *bp = &bps[MI_SCREEN(mi)];
int i;
- free (bp->trackball);
- free (bp->rot);
- free (bp->colors);
+ if (!bp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
+ if (bp->trackball) gltrackball_free (bp->trackball);
+ if (bp->rot) free_rotator (bp->rot);
+ if (bp->colors) free (bp->colors);
for (i = 0; i < bp->nchunks; i++)
free_chunk (bp->chunks[i]);
- free (bp->chunks);
+ if (bp->chunks) free (bp->chunks);
}
diff --git a/hacks/glx/cube21.c b/hacks/glx/cube21.c
index 451a523..de72206 100644
--- a/hacks/glx/cube21.c
+++ b/hacks/glx/cube21.c
@@ -45,7 +45,6 @@
"*showFPS: False \n" \
"*wireframe: False \n"
-# define free_cube21 0
# define release_cube21 0
#include "xlockmore.h"
@@ -915,7 +914,7 @@ ENTRYPOINT void draw_cube21(ModeInfo * mi)
MI_IS_DRAWN(mi) = True;
if (!cp->glx_context) return;
mi->polygon_count = 0;
- glXMakeCurrent(display, window, *(cp->glx_context));
+ glXMakeCurrent(display, window, *cp->glx_context);
if (!draw_main(mi, cp)) {
MI_ABORT(mi);
return;
@@ -930,11 +929,18 @@ ENTRYPOINT void change_cube21(ModeInfo * mi)
{
cube21_conf *cp = &cube21[MI_SCREEN(mi)];
if (!cp->glx_context) return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(cp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *cp->glx_context);
init_gl(mi);
}
#endif /* !STANDALONE */
+ENTRYPOINT void free_cube21(ModeInfo * mi)
+{
+ cube21_conf *cp = &cube21[MI_SCREEN(mi)];
+ if (!cp->glx_context) return;
+ glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *cp->glx_context);
+ gltrackball_free (cp->trackball);
+}
XSCREENSAVER_MODULE ("Cube21", cube21)
diff --git a/hacks/glx/cubenetic.c b/hacks/glx/cubenetic.c
index cc9b0d6..0ddbb29 100644
--- a/hacks/glx/cubenetic.c
+++ b/hacks/glx/cubenetic.c
@@ -15,7 +15,6 @@
"*wireframe: False \n" \
"*suppressRotationAnimation: True\n" \
-# define free_cube 0
# define release_cube 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@ -530,7 +529,7 @@ draw_cube (ModeInfo *mi)
return;
mi->polygon_count = 0;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(cc->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *cc->glx_context);
glShadeModel(GL_FLAT);
@@ -593,6 +592,27 @@ draw_cube (ModeInfo *mi)
glXSwapBuffers(dpy, window);
}
+
+ENTRYPOINT void
+free_cube (ModeInfo *mi)
+{
+ cube_configuration *cc = &ccs[MI_SCREEN(mi)];
+ if (!cc->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *cc->glx_context);
+ if (cc->waves) {
+ free (cc->waves->srcs);
+ free (cc->waves->heights);
+ free (cc->waves);
+ }
+ if (glIsList(cc->cube_list)) glDeleteLists(cc->cube_list, 1);
+ if (cc->rot) free_rotator (cc->rot);
+ if (cc->trackball) gltrackball_free (cc->trackball);
+ if (cc->texture_colors) free (cc->texture_colors);
+ if (cc->cube_colors) free (cc->cube_colors);
+ if (cc->texture) free (cc->texture);
+ if (cc->texture_id) glDeleteTextures (1, &cc->texture_id);
+}
+
XSCREENSAVER_MODULE_2 ("Cubenetic", cubenetic, cube)
#endif /* USE_GL */
diff --git a/hacks/glx/cubestack.c b/hacks/glx/cubestack.c
index 70883f6..928ad1c 100644
--- a/hacks/glx/cubestack.c
+++ b/hacks/glx/cubestack.c
@@ -14,7 +14,6 @@
"*wireframe: False \n" \
"*suppressRotationAnimation: True\n" \
-# define free_cube 0
# define release_cube 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@ -406,7 +405,7 @@ draw_cube (ModeInfo *mi)
if (!bp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glPushMatrix ();
@@ -457,6 +456,18 @@ draw_cube (ModeInfo *mi)
glXSwapBuffers(dpy, window);
}
+
+ENTRYPOINT void
+free_cube (ModeInfo *mi)
+{
+ cube_configuration *bp = &bps[MI_SCREEN(mi)];
+ if (!bp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
+ if (bp->trackball) gltrackball_free (bp->trackball);
+ if (bp->rot) free_rotator (bp->rot);
+ if (bp->colors) free (bp->colors);
+}
+
XSCREENSAVER_MODULE_2 ("CubeStack", cubestack, cube)
#endif /* USE_GL */
diff --git a/hacks/glx/cubestorm.c b/hacks/glx/cubestorm.c
index cf973c9..afa1797 100644
--- a/hacks/glx/cubestorm.c
+++ b/hacks/glx/cubestorm.c
@@ -17,7 +17,6 @@
"*suppressRotationAnimation: True\n" \
-# define free_cube 0
# define release_cube 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@ -391,7 +390,7 @@ draw_cube (ModeInfo *mi)
if (!bp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glShadeModel(GL_SMOOTH);
@@ -464,6 +463,25 @@ draw_cube (ModeInfo *mi)
glXSwapBuffers(dpy, window);
}
+
+ENTRYPOINT void
+free_cube (ModeInfo *mi)
+{
+ cube_configuration *bp = &bps[MI_SCREEN(mi)];
+ int i;
+ if (!bp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
+ if (bp->subcubes) {
+ for (i = 0; i < MI_COUNT(mi); i++)
+ free_rotator (bp->subcubes[i].rot);
+ free (bp->subcubes);
+ }
+ if (bp->hist) free (bp->hist);
+ if (bp->trackball) gltrackball_free (bp->trackball);
+ if (bp->colors) free (bp->colors);
+
+}
+
XSCREENSAVER_MODULE_2 ("CubeStorm", cubestorm, cube)
#endif /* USE_GL */
diff --git a/hacks/glx/cubetwist.c b/hacks/glx/cubetwist.c
index 61af287..776e396 100644
--- a/hacks/glx/cubetwist.c
+++ b/hacks/glx/cubetwist.c
@@ -517,7 +517,7 @@ draw_cube (ModeInfo *mi)
if (!bp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
glShadeModel(GL_SMOOTH);
glEnable(GL_DEPTH_TEST);
@@ -574,6 +574,8 @@ ENTRYPOINT void
free_cube (ModeInfo *mi)
{
cube_configuration *bp = &bps[MI_SCREEN(mi)];
+ if (!bp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
while (bp->cubes)
{
cube *c = bp->cubes->next;
@@ -587,6 +589,8 @@ free_cube (ModeInfo *mi)
free (bp->oscillators);
bp->oscillators = o;
}
+ if (bp->trackball) gltrackball_free (bp->trackball);
+ if (bp->rot) free_rotator (bp->rot);
}
diff --git a/hacks/glx/cubicgrid.c b/hacks/glx/cubicgrid.c
index 34b6c34..d7ef6f2 100644
--- a/hacks/glx/cubicgrid.c
+++ b/hacks/glx/cubicgrid.c
@@ -24,7 +24,6 @@
"*wireframe: False \n" \
"*suppressRotationAnimation: True\n" \
-# define free_cubicgrid 0
# define release_cubicgrid 0
#include "xlockmore.h"
@@ -242,7 +241,7 @@ ENTRYPOINT void draw_cubicgrid(ModeInfo * mi)
cp = &cubicgrid[MI_SCREEN(mi)];
MI_IS_DRAWN(mi) = True;
if (!cp->glx_context) return;
- glXMakeCurrent(display, window, *(cp->glx_context));
+ glXMakeCurrent(display, window, *cp->glx_context);
if (!draw_main(mi)) {
MI_ABORT(mi);
return;
@@ -258,11 +257,20 @@ ENTRYPOINT void change_cubicgrid(ModeInfo * mi)
{
cubicgrid_conf *cp = &cubicgrid[MI_SCREEN(mi)];
if (!cp->glx_context) return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(cp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *cp->glx_context);
init_gl(mi);
}
#endif /* !STANDALONE */
+ENTRYPOINT void free_cubicgrid(ModeInfo * mi)
+{
+ cubicgrid_conf *cp = &cubicgrid[MI_SCREEN(mi)];
+ if (!cp->glx_context) return;
+ glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *cp->glx_context);
+ gltrackball_free (cp->trackball);
+ free_rotator (cp->rot);
+ if (glIsList(cp->list)) glDeleteLists(cp->list, 1);
+}
XSCREENSAVER_MODULE ("CubicGrid", cubicgrid)
diff --git a/hacks/glx/dangerball.c b/hacks/glx/dangerball.c
index e40ccc5..7cb38e0 100644
--- a/hacks/glx/dangerball.c
+++ b/hacks/glx/dangerball.c
@@ -15,7 +15,6 @@
"*wireframe: False \n" \
"*suppressRotationAnimation: True\n" \
-# define free_ball 0
# define release_ball 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@ -294,7 +293,7 @@ draw_ball (ModeInfo *mi)
if (!bp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
glShadeModel(GL_SMOOTH);
@@ -359,6 +358,21 @@ draw_ball (ModeInfo *mi)
glXSwapBuffers(dpy, window);
}
+
+ENTRYPOINT void
+free_ball (ModeInfo *mi)
+{
+ ball_configuration *bp = &bps[MI_SCREEN(mi)];
+ if (!bp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
+ if (bp->colors) free (bp->colors);
+ if (bp->spikes) free (bp->spikes);
+ if (bp->rot) free_rotator (bp->rot);
+ if (bp->trackball) gltrackball_free (bp->trackball);
+ if (glIsList(bp->ball_list)) glDeleteLists(bp->ball_list, 1);
+ if (glIsList(bp->spike_list)) glDeleteLists(bp->spike_list, 1);
+}
+
XSCREENSAVER_MODULE_2 ("DangerBall", dangerball, ball)
#endif /* USE_GL */
diff --git a/hacks/glx/discoball.c b/hacks/glx/discoball.c
index 4085c56..427d7e9 100644
--- a/hacks/glx/discoball.c
+++ b/hacks/glx/discoball.c
@@ -637,7 +637,7 @@ draw_ball (ModeInfo *mi)
if (!bp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
glShadeModel(GL_SMOOTH);
@@ -693,13 +693,17 @@ ENTRYPOINT void
free_ball (ModeInfo *mi)
{
ball_configuration *bp = &bps[MI_SCREEN(mi)];
+ if (!bp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
while (bp->tiles)
{
tile *t = bp->tiles->next;
free (bp->tiles);
bp->tiles = t;
}
- free (bp->rays);
+ if (bp->rays) free (bp->rays);
+ if (bp->trackball) gltrackball_free (bp->trackball);
+ if (bp->rot) free_rotator (bp->rot);
}
XSCREENSAVER_MODULE_2 ("Discoball", discoball, ball)
diff --git a/hacks/glx/dnalogo.c b/hacks/glx/dnalogo.c
index 2b24f83..3afb73c 100644
--- a/hacks/glx/dnalogo.c
+++ b/hacks/glx/dnalogo.c
@@ -67,7 +67,6 @@
# define CWFONT "-*-helvetica-medium-r-normal-*-*-240-*-*-*-*-*-*"
# endif
-# define free_logo 0
# define release_logo 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@ -2944,6 +2943,7 @@ init_logo (ModeInfo *mi)
dc->color[2] = xcolor.blue / 65535.0;
dc->color[3] = 1.0;
+ free (color_name);
color_name = get_string_resource (mi->dpy, "cwForeground", "Foreground");
for (s2 = color_name + strlen(color_name) - 1; s2 > color_name; s2--)
if (*s2 == ' ' || *s2 == '\t')
@@ -2956,6 +2956,7 @@ init_logo (ModeInfo *mi)
fprintf (stderr, "%s: can't parse color %s\n", progname, color_name);
exit (1);
}
+ free (color_name);
# ifdef CW
dc->codeword_color[0] = xcolor.red / 65535.0;
@@ -2975,6 +2976,7 @@ init_logo (ModeInfo *mi)
fprintf (stderr, "%s: can't parse color %s\n", progname, color_name);
exit (1);
}
+ free (color_name);
dc->codeword_bg[0] = xcolor.red / 65535.0;
dc->codeword_bg[1] = xcolor.green / 65535.0;
@@ -3289,7 +3291,7 @@ draw_logo (ModeInfo *mi)
return;
mi->polygon_count = 0;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(dc->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *dc->glx_context);
if (!wire &&
dc->wire_overlay == 0 &&
@@ -3634,6 +3636,35 @@ draw_logo (ModeInfo *mi)
glXSwapBuffers(dpy, window);
}
+
+ENTRYPOINT void
+free_logo (ModeInfo *mi)
+{
+ logo_configuration *dc = &dcs[MI_SCREEN(mi)];
+ if (!dc->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *dc->glx_context);
+ if (dc->trackball) gltrackball_free (dc->trackball);
+# ifdef CW
+ if (dc->codeword_text) free (dc->codeword_text);
+ if (dc->codeword_text_out) free (dc->codeword_text_out);
+ if (dc->scene_rot) free_rotator (dc->scene_rot);
+ if (dc->font) free_texture_font (dc->font);
+# endif
+# ifdef DEBUG
+ if (dc->label_font) free_texture_font (dc->label_font);
+# endif
+ glDeleteLists(dc->helix_list, 1);
+ glDeleteLists(dc->helix_list_wire, 1);
+ glDeleteLists(dc->helix_list_facetted, 1);
+ glDeleteLists(dc->pizza_list, 1);
+ glDeleteLists(dc->pizza_list_wire, 1);
+ glDeleteLists(dc->pizza_list_facetted, 1);
+ glDeleteLists(dc->gasket_list, 1);
+ glDeleteLists(dc->gasket_list_wire, 1);
+ glDeleteLists(dc->frame_list, 1);
+ glDeleteLists(dc->frame_list_wire, 1);
+}
+
XSCREENSAVER_MODULE_2 ("DNALogo", dnalogo, logo)
#endif /* USE_GL */
diff --git a/hacks/glx/dxf2gl.pl b/hacks/glx/dxf2gl.pl
index 9ed470c..65b5a80 100755
--- a/hacks/glx/dxf2gl.pl
+++ b/hacks/glx/dxf2gl.pl
@@ -1,5 +1,5 @@
#!/usr/bin/perl -w
-# Copyright © 2003-2014 Jamie Zawinski <jwz@jwz.org>
+# Copyright © 2003-2018 Jamie Zawinski <jwz@jwz.org>
#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
@@ -17,8 +17,8 @@
# --normalize Compute the bounding box of the object, and scale all
# coordinates so that the object fits inside a unit cube.
#
-# --smooth When computing normals for the vertexes, average the
-# normals at any edge which is less than 90 degrees.
+# --smooth [DEG] When computing normals for the vertexes, average the
+# normals at any edge which is less than N degrees.
# If this option is not specified, planar normals will be
# used, resulting in a "faceted" object.
#
@@ -39,7 +39,7 @@ use Math::Trig qw(acos);
use Text::Wrap;
my $progname = $0; $progname =~ s@.*/@@g;
-my ($version) = ('$Revision: 1.11 $' =~ m/\s(\d[.\d]+)\s/s);
+my ($version) = ('$Revision: 1.13 $' =~ m/\s(\d[.\d]+)\s/s);
my $verbose = 0;
@@ -121,8 +121,8 @@ sub vector_angle($$$$$$) {
# returns a list of the normals for each vertex. These are the smoothed
# normals: the average of the normals of the participating faces.
#
-sub compute_vertex_normals(@) {
- my (@points) = @_;
+sub compute_vertex_normals($@) {
+ my ($smooth, @points) = @_;
my $npoints = ($#points+1) / 3;
my $nfaces = $npoints / 3;
@@ -185,7 +185,7 @@ sub compute_vertex_normals(@) {
# ignore any adjascent faces that are more than N degrees off.
my $angle = vector_angle ($norm[0], $norm[1], $norm[2],
$fnorm[0], $fnorm[1], $fnorm[2]);
- next if ($angle >= 30);
+ next if ($angle >= $smooth);
$nx += $fnorm[0];
$ny += $fnorm[1];
@@ -208,7 +208,7 @@ sub parse_dxf($$$$$) {
# Convert whitespace within a line to _, e.g., "ObjectDBX Classes".
# What the hell is up with this file format!
- 1 while ($dxf =~ s/([^ \t\n])[ \t]+([^ \t\n])/$1_$2/gs);
+ 1 while ($dxf =~ s/([^ \t\n])[ \t\#]+([^ \t\n])/$1_$2/gs);
$dxf =~ s/\r/\n/gs;
@@ -455,7 +455,7 @@ sub parse_dxf($$$$$) {
sub generate_c_1($$$$$@) {
- my ($name, $outfile, $smooth_p, $wireframe_p, $normalize_p, @points) = @_;
+ my ($name, $outfile, $smooth, $wireframe_p, $normalize_p, @points) = @_;
my $ccw_p = 1; # counter-clockwise winding rule for computing normals
@@ -463,8 +463,8 @@ sub generate_c_1($$$$$@) {
my $nfaces = ($wireframe_p ? $npoints/2 : $npoints/3);
my @normals;
- if ($smooth_p && !$wireframe_p) {
- @normals = compute_vertex_normals (@points);
+ if ($smooth && !$wireframe_p) {
+ @normals = compute_vertex_normals ($smooth, @points);
if ($#normals != $#points) {
error ("computed " . (($#normals+1)/3) . " normals for " .
@@ -514,7 +514,7 @@ sub generate_c_1($$$$$@) {
$nbx, $nby, $nbz,
$ncx, $ncy, $ncz);
- if ($smooth_p) {
+ if ($smooth) {
$nax = $normals[$i*9];
$nay = $normals[$i*9+1];
$naz = $normals[$i*9+2];
@@ -572,7 +572,7 @@ sub generate_c_1($$$$$@) {
sub generate_c($$$$$$) {
- my ($infile, $outfile, $smooth_p, $wireframe_p, $normalize_p, $layers) = @_;
+ my ($infile, $outfile, $smooth, $wireframe_p, $normalize_p, $layers) = @_;
my $code = '';
@@ -594,8 +594,8 @@ sub generate_c($$$$$$) {
strftime ("%d-%b-%Y", localtime ()) . ".\n" .
" " . ($wireframe_p
? "Wireframe."
- : ($smooth_p ?
- "Smoothed vertex normals." :
+ : ($smooth ?
+ "Smoothed vertex normals at $smooth\x{00B0}." :
"Faceted face normals.")) .
($normalize_p ? " Normalized to unit bounding box." : "") .
"\n" .
@@ -613,7 +613,7 @@ sub generate_c($$$$$$) {
my $name = $layer ? "${token}_${layer}" : $token;
my ($c, $np, $nf) =
generate_c_1 ($name, $outfile,
- $smooth_p, $wireframe_p, $normalize_p,
+ $smooth, $wireframe_p, $normalize_p,
@{$layers->{$layer}});
$code .= $c;
$npoints += $np;
@@ -648,7 +648,7 @@ sub cmp_files($$) {
sub dxf_to_gl($$$$$$) {
- my ($infile, $outfile, $smooth_p, $normalize_p, $wireframe_p, $layers_p) = @_;
+ my ($infile, $outfile, $smooth, $normalize_p, $wireframe_p, $layers_p) = @_;
open (my $in, "<$infile") || error ("$infile: $!");
my $filename = ($infile eq '-' ? "<stdin>" : $infile);
@@ -662,14 +662,14 @@ sub dxf_to_gl($$$$$$) {
my $data = parse_dxf ($filename, $dxf, $normalize_p, $wireframe_p, $layers_p);
$filename = ($outfile eq '-' ? "<stdout>" : $outfile);
- my $code = generate_c ($infile, $filename, $smooth_p, $wireframe_p,
+ my $code = generate_c ($infile, $filename, $smooth, $wireframe_p,
$normalize_p, $data);
if ($outfile eq '-') {
print STDOUT $code;
} else {
my $tmp = "$outfile.tmp";
- open (my $out, '>', $tmp) || error ("$tmp: $!");
+ open (my $out, '>:utf8', $tmp) || error ("$tmp: $!");
print $out $code || error ("$filename: $!");
close $out || error ("$filename: $!");
if (cmp_files ($filename, $tmp)) {
@@ -702,7 +702,7 @@ sub usage() {
sub main() {
my ($infile, $outfile);
my $normalize_p = 0;
- my $smooth_p = 0;
+ my $smooth = 0;
my $wireframe_p = 0;
my $layers_p = 0;
while ($_ = $ARGV[0]) {
@@ -710,7 +710,14 @@ sub main() {
if ($_ eq "--verbose") { $verbose++; }
elsif (m/^-v+$/) { $verbose += length($_)-1; }
elsif ($_ eq "--normalize") { $normalize_p = 1; }
- elsif ($_ eq "--smooth") { $smooth_p = 1; }
+ elsif ($_ eq "--smooth") {
+ if ($ARGV[0] && $ARGV[0] =~ m/^(\d[\d.]*)%?$/s) {
+ $smooth = 0 + $1;
+ shift @ARGV;
+ } else {
+ $smooth = 30;
+ }
+ }
elsif ($_ eq "--wireframe") { $wireframe_p = 1; }
elsif ($_ eq "--layers") { $layers_p = 1; }
elsif (m/^-./) { usage; }
@@ -722,7 +729,7 @@ sub main() {
$infile = "-" unless defined ($infile);
$outfile = "-" unless defined ($outfile);
- dxf_to_gl ($infile, $outfile, $smooth_p, $normalize_p, $wireframe_p, $layers_p);
+ dxf_to_gl ($infile, $outfile, $smooth, $normalize_p, $wireframe_p, $layers_p);
}
main;
diff --git a/hacks/glx/dymaxionmap.c b/hacks/glx/dymaxionmap.c
index 711db2e..41de703 100644
--- a/hacks/glx/dymaxionmap.c
+++ b/hacks/glx/dymaxionmap.c
@@ -277,6 +277,7 @@ create_daylight_mask (Display *dpy, Visual *v, int w, int h)
{
XImage *image = XCreateImage (dpy, v, 8, ZPixmap, 0, 0, w, h, 8, 0);
int x, y;
+# undef sun /* Doh */
XYZ sun;
double axial_tilt = frand(23.4) / (180/M_PI) * RANDSIGN();
double dusk = M_PI * 0.035;
@@ -1422,7 +1423,7 @@ draw_planet (ModeInfo * mi)
glDrawBuffer(GL_BACK);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
- glXMakeCurrent (dpy, window, *(gp->glx_context));
+ glXMakeCurrent (dpy, window, *gp->glx_context);
mi->polygon_count = 0;
@@ -1631,21 +1632,28 @@ free_planet (ModeInfo * mi)
planetstruct *gp = &planets[MI_SCREEN(mi)];
int i;
+ if (!gp->glx_context) return;
+ glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *gp->glx_context);
+
+ if (gp->font_data) free_texture_font (gp->font_data);
+ if (gp->trackball) gltrackball_free (gp->trackball);
+ if (gp->rot) free_rotator (gp->rot);
+ if (gp->rot2) free_rotator (gp->rot2);
+
if (gp->day) XDestroyImage (gp->day);
if (gp->night) XDestroyImage (gp->night);
if (gp->dusk) XDestroyImage (gp->dusk);
if (gp->cvt) XDestroyImage (gp->cvt);
- for (i = 0; i < gp->nimages; i++)
- if (gp->images[i]) XDestroyImage (gp->images[i]);
- free (gp->images);
-
- if (gp->glx_context) {
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(gp->glx_context));
-
- if (glIsList(gp->starlist))
- glDeleteLists(gp->starlist, 1);
+ if (gp->images) {
+ for (i = 0; i < gp->nimages; i++)
+ if (gp->images[i]) XDestroyImage (gp->images[i]);
+ free (gp->images);
}
+
+ if (glIsList(gp->starlist)) glDeleteLists(gp->starlist, 1);
+ if (gp->tex1) glDeleteTextures (1, &gp->tex1);
+ if (gp->tex2) glDeleteTextures (1, &gp->tex2);
}
diff --git a/hacks/glx/endgame.c b/hacks/glx/endgame.c
index ddba7f9..cc5f22c 100644
--- a/hacks/glx/endgame.c
+++ b/hacks/glx/endgame.c
@@ -20,7 +20,6 @@
"*showFPS: False \n" \
"*wireframe: False \n" \
-# define free_chess 0
# define release_chess 0
# include "xlockmore.h"
@@ -894,7 +893,7 @@ ENTRYPOINT void draw_chess(ModeInfo *mi)
if(!cs->glx_context)
return;
- glXMakeCurrent(disp, w, *(cs->glx_context));
+ glXMakeCurrent(disp, w, *cs->glx_context);
/** code for moving a piece */
if(cs->moving && ++cs->steps == 100) {
@@ -966,6 +965,22 @@ ENTRYPOINT void draw_chess(ModeInfo *mi)
glXSwapBuffers(disp, w);
}
+
+ENTRYPOINT void free_chess(ModeInfo *mi)
+{
+ Chesscreen *cs = &qs[MI_SCREEN(mi)];
+ int i;
+ if (!cs->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *cs->glx_context);
+ gltrackball_free (cs->trackball);
+ if (cs->piecetexture) glDeleteTextures (1, &cs->piecetexture);
+ if (cs->boardtexture) glDeleteTextures (1, &cs->boardtexture);
+
+ /* this is horrible! List numbers are hardcoded! */
+ for (i = 1; i <= 20; i++)
+ if (glIsList(i)) glDeleteLists(i, 1);
+}
+
XSCREENSAVER_MODULE_2 ("Endgame", endgame, chess)
#endif
diff --git a/hacks/glx/energystream.c b/hacks/glx/energystream.c
index 7221f0d..cc8b5b2 100644
--- a/hacks/glx/energystream.c
+++ b/hacks/glx/energystream.c
@@ -367,16 +367,19 @@ free_stream (ModeInfo * mi)
stream_configuration *es = &ess[MI_SCREEN(mi)];
int i;
- if (es->glx_context) {
- glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *(es->glx_context));
+ if (!es->glx_context) return;
+ glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *es->glx_context);
- for (i = 0; i < es->num_streams; i++) {
- free (es->streams[i].flares);
- glDeleteTextures (1, &es->streams[i].flare_tex);
- }
+ if (es->trackball) gltrackball_free (es->trackball);
+ if (es->rot) free_rotator (es->rot);
- free (es->streams);
+ for (i = 0; i < es->num_streams; i++) {
+ free (es->streams[i].flares);
+ glDeleteTextures (1, &es->streams[i].flare_tex);
}
+
+ if (es->streams) free (es->streams);
+
}
@@ -438,7 +441,7 @@ draw_stream (ModeInfo *mi)
cur_time = (float)(GETSECS(current_time) * 1000 + GETMSECS(current_time) - es->start_time) / 1000.0;
cur_time *= global_speed;
- glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *(es->glx_context));
+ glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *es->glx_context);
glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
diff --git a/hacks/glx/engine.c b/hacks/glx/engine.c
index 0f39b8d..ba30d81 100644
--- a/hacks/glx/engine.c
+++ b/hacks/glx/engine.c
@@ -27,7 +27,6 @@
"*suppressRotationAnimation: True\n" \
"*titleFont: -*-helvetica-medium-r-normal-*-*-180-*-*-*-*-*-*\n" \
-# define free_engine 0
# define release_engine 0
# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
@@ -985,7 +984,7 @@ ENTRYPOINT void draw_engine(ModeInfo *mi)
if (!e->glx_context)
return;
- glXMakeCurrent(disp, w, *(e->glx_context));
+ glXMakeCurrent(disp, w, *e->glx_context);
mi->polygon_count = display(mi);
@@ -1001,6 +1000,20 @@ ENTRYPOINT void draw_engine(ModeInfo *mi)
glXSwapBuffers(disp, w);
}
+
+ENTRYPOINT void free_engine(ModeInfo *mi)
+{
+ Engine *e = &engine[MI_SCREEN(mi)];
+ if (!e->glx_context) return;
+ glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *e->glx_context);
+ if (e->font_data) free_texture_font (e->font_data);
+ free (e->engine_name);
+ gltrackball_free (e->trackball);
+ free_rotator (e->rot);
+ if (glIsList(e->piston_list)) glDeleteLists(e->piston_list, 1);
+ if (glIsList(e->shaft_list)) glDeleteLists(e->shaft_list, 1);
+}
+
XSCREENSAVER_MODULE ("Engine", engine)
#endif
diff --git a/hacks/glx/esper.c b/hacks/glx/esper.c
index 7a0bb0b..e7d85a9 100644
--- a/hacks/glx/esper.c
+++ b/hacks/glx/esper.c
@@ -147,7 +147,6 @@
"*reticleColor: #FFFF77\n" \
"*textColor: #FFFFBB\n" \
-# define free_esper 0
# define refresh_esper 0
# define release_esper 0
# include "xlockmore.h"
@@ -2327,6 +2326,7 @@ parse_color (ModeInfo *mi, char *key, GLfloat color[4])
key, string);
exit (1);
}
+ free (string);
color[0] = xcolor.red / 65536.0;
color[1] = xcolor.green / 65536.0;
@@ -2390,7 +2390,7 @@ draw_esper (ModeInfo *mi)
if (!ss->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(ss->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *ss->glx_context);
mi->polygon_count = 0;
@@ -2407,6 +2407,31 @@ draw_esper (ModeInfo *mi)
glXSwapBuffers (MI_DISPLAY (mi), MI_WINDOW(mi));
}
+
+ENTRYPOINT void
+free_esper (ModeInfo *mi)
+{
+ esper_state *ss = &sss[MI_SCREEN(mi)];
+ int i;
+ if (!ss->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *ss->glx_context);
+
+ if (ss->font_data) free_texture_font (ss->font_data);
+ for (i = 0; i < ss->nimages; i++) {
+ if (ss->images[i]) {
+ if (ss->images[i]->title) free (ss->images[i]->title);
+ if (ss->images[i]->texid) glDeleteTextures (1, &ss->images[i]->texid);
+ free (ss->images[i]);
+ }
+ }
+ for (i = 0; i < countof(ss->sprites); i++) {
+ if (ss->sprites[i]) {
+ if (ss->sprites[i]->text) free (ss->sprites[i]->text);
+ if (ss->sprites[i]) free (ss->sprites[i]);
+ }
+ }
+}
+
XSCREENSAVER_MODULE ("Esper", esper)
#endif /* USE_GL */
diff --git a/hacks/glx/extrusion.c b/hacks/glx/extrusion.c
index 3dee71c..f8aaeb5 100644
--- a/hacks/glx/extrusion.c
+++ b/hacks/glx/extrusion.c
@@ -31,7 +31,6 @@
"*showFPS: False \n" \
"*wireframe: False \n"
-# define free_extrusion 0
# define release_extrusion 0
# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
@@ -314,7 +313,7 @@ draw_extrusion(ModeInfo * mi)
if (!gp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(gp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *gp->glx_context);
glPushMatrix();
@@ -551,6 +550,17 @@ init_extrusion (ModeInfo * mi)
}
+
+ENTRYPOINT void
+free_extrusion (ModeInfo * mi)
+{
+ extrusionstruct *gp = &Extrusion[MI_SCREEN(mi)];
+ if (!gp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *gp->glx_context);
+ if (gp->trackball) gltrackball_free (gp->trackball);
+ if (gp->rot) free_rotator (gp->rot);
+}
+
XSCREENSAVER_MODULE ("Extrusion", extrusion)
#endif /* USE_GL */
diff --git a/hacks/glx/flipflop.c b/hacks/glx/flipflop.c
index c26458c..fe1643b 100644
--- a/hacks/glx/flipflop.c
+++ b/hacks/glx/flipflop.c
@@ -456,7 +456,7 @@ draw_flipflop(ModeInfo *mi)
if(!c->glx_context || (textured && !c->got_texture))
return;
- glXMakeCurrent(disp, w, *(c->glx_context));
+ glXMakeCurrent(disp, w, *c->glx_context);
mi->polygon_count = display(mi);
@@ -474,10 +474,14 @@ ENTRYPOINT void
free_flipflop(ModeInfo *mi)
{
Flipflopcreen *c = &qs[MI_SCREEN(mi)];
+ if (!c->glx_context) return;
+ glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *c->glx_context);
+ if(c->trackball) gltrackball_free(c->trackball);
if (c->sheet) {
randsheet_free(c->sheet);
free (c->sheet);
}
+ if (c->texid) glDeleteTextures (1, &c->texid);
}
/*** ADDED RANDSHEET FUNCTIONS ***/
diff --git a/hacks/glx/flipscreen3d.c b/hacks/glx/flipscreen3d.c
index e4db5df..ce3dc76 100644
--- a/hacks/glx/flipscreen3d.c
+++ b/hacks/glx/flipscreen3d.c
@@ -21,7 +21,6 @@
"*useSHM: True \n" \
"*suppressRotationAnimation: True\n" \
-# define free_screenflip 0
# define release_screenflip 0
# include "xlockmore.h" /* from the xscreensaver distribution */
# include "gltrackball.h"
@@ -499,7 +498,7 @@ ENTRYPOINT void draw_screenflip(ModeInfo *mi)
if (c->waiting_for_image_p && c->first_image_p)
return;
- glXMakeCurrent(disp, w, *(c->glx_context));
+ glXMakeCurrent(disp, w, *c->glx_context);
glBindTexture(GL_TEXTURE_2D, c->texid);
@@ -513,6 +512,16 @@ ENTRYPOINT void draw_screenflip(ModeInfo *mi)
glXSwapBuffers(disp, w);
}
+
+ENTRYPOINT void free_screenflip(ModeInfo *mi)
+{
+ Screenflip *c = &screenflip[MI_SCREEN(mi)];
+ if (!c->glx_context) return;
+ glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *c->glx_context);
+ gltrackball_free (c->trackball);
+ if (c->texid) glDeleteTextures (1, &c->texid);
+}
+
XSCREENSAVER_MODULE_2 ("FlipScreen3D", flipscreen3d, screenflip)
#endif
diff --git a/hacks/glx/fliptext.c b/hacks/glx/fliptext.c
index c233e8b..951c188 100644
--- a/hacks/glx/fliptext.c
+++ b/hacks/glx/fliptext.c
@@ -798,6 +798,7 @@ ENTRYPOINT void
init_fliptext (ModeInfo *mi)
{
int wire = MI_IS_WIREFRAME(mi);
+ char *s;
fliptext_configuration *sc;
@@ -897,9 +898,9 @@ init_fliptext (ModeInfo *mi)
if (min_lines > max_lines - 3) min_lines = max_lines - 4;
if (min_lines < 1) min_lines = 1;
- parse_color (mi, "foreground",
- get_string_resource(mi->dpy, "foreground", "Foreground"),
- sc->color);
+ s = get_string_resource(mi->dpy, "foreground", "Foreground");
+ parse_color (mi, "foreground", s, sc->color);
+ if (s) free (s);
sc->top_margin = (sc->char_width * 100);
sc->bottom_margin = -sc->top_margin;
@@ -919,7 +920,7 @@ draw_fliptext (ModeInfo *mi)
if (!sc->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(sc->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *sc->glx_context);
#if 0
if (XtAppPending (app) & (XtIMTimer|XtIMAlternateInput))
@@ -989,11 +990,18 @@ ENTRYPOINT void
free_fliptext (ModeInfo *mi)
{
fliptext_configuration *sc = &scs[MI_SCREEN(mi)];
+ int i;
+ if (!sc->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *sc->glx_context);
if (sc->tc)
textclient_close (sc->tc);
- free(sc->lines);
-
- /* #### there's more to free here */
+ if (sc->texfont) free_texture_font (sc->texfont);
+ for (i = 0; i < sc->nlines; i++)
+ if (sc->lines[i]) {
+ if (sc->lines[i]->text) free (sc->lines[i]->text);
+ free (sc->lines[i]);
+ }
+ if(sc->lines) free(sc->lines);
}
XSCREENSAVER_MODULE ("FlipText", fliptext)
diff --git a/hacks/glx/flurry-texture.c b/hacks/glx/flurry-texture.c
index c787f59..f1b7e36 100644
--- a/hacks/glx/flurry-texture.c
+++ b/hacks/glx/flurry-texture.c
@@ -53,7 +53,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
static GLubyte smallTextureArray[32][32];
static GLubyte bigTextureArray[256][256][2];
-GLuint theTexture = 0;
/* simple smoothing routine */
static void SmoothTexture(void)
@@ -187,8 +186,9 @@ static void AverageLastAndFirstTextures(void)
}
}
-void MakeTexture()
+GLuint MakeTexture(void)
{
+ GLuint theTexture = 0;
int i,j;
for (i=0;i<8;i++)
{
@@ -221,4 +221,5 @@ void MakeTexture()
gluBuild2DMipmaps(GL_TEXTURE_2D, 2, 256, 256, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, bigTextureArray);
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+ return theTexture;
}
diff --git a/hacks/glx/flurry.c b/hacks/glx/flurry.c
index c9008a9..a236f52 100644
--- a/hacks/glx/flurry.c
+++ b/hacks/glx/flurry.c
@@ -90,6 +90,7 @@ ModStruct flurry_description = {
global_info_t *flurry_info = NULL;
+
static
double currentTime(void) {
struct timeval tv;
@@ -313,7 +314,7 @@ ENTRYPOINT void reshape_flurry(ModeInfo *mi, int width, int height)
{
global_info_t *global = flurry_info + MI_SCREEN(mi);
- glXMakeCurrent(MI_DISPLAY(mi), global->window, *(global->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), global->window, *global->glx_context);
glViewport(0.0, 0.0, width, height);
glMatrixMode(GL_PROJECTION);
@@ -506,11 +507,11 @@ draw_flurry(ModeInfo * mi)
return;
if (global->first) {
- MakeTexture();
+ global->texid = MakeTexture();
global->first = 0;
}
glDrawBuffer(GL_BACK);
- glXMakeCurrent(display, window, *(global->glx_context));
+ glXMakeCurrent(display, window, *global->glx_context);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -535,13 +536,12 @@ free_flurry(ModeInfo * mi)
global_info_t *global = &flurry_info[MI_SCREEN(mi)];
flurry_info_t *flurry;
- if (global->glx_context) {
- glXMakeCurrent(MI_DISPLAY(mi), global->window, *(global->glx_context));
- }
+ if (!global->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), global->window, *global->glx_context);
- for (flurry = global->flurry; flurry; flurry=flurry->next) {
- delete_flurry_info(flurry);
- }
+ for (flurry = global->flurry; flurry; flurry=flurry->next)
+ delete_flurry_info(flurry);
+ if (global->texid) glDeleteTextures (1, &global->texid);
}
XSCREENSAVER_MODULE ("Flurry", flurry)
diff --git a/hacks/glx/flurry.h b/hacks/glx/flurry.h
index 9bbe4b2..b4c7787 100644
--- a/hacks/glx/flurry.h
+++ b/hacks/glx/flurry.h
@@ -211,7 +211,7 @@ static vector float FastDistance2DV(vector float x, vector float y) {
extern GLuint theTexture;
-void MakeTexture(void);
+GLuint MakeTexture(void);
#define OPT_MODE_SCALAR_BASE 0x0
@@ -290,6 +290,7 @@ struct _global_info_t {
double oldFrameTime;
flurry_info_t *flurry;
+ GLuint texid;
};
#define kNumSpectrumEntries 512
diff --git a/hacks/glx/flyingtoasters.c b/hacks/glx/flyingtoasters.c
index 19a5897..a527e8b 100644
--- a/hacks/glx/flyingtoasters.c
+++ b/hacks/glx/flyingtoasters.c
@@ -32,7 +32,6 @@
/* #define DEBUG */
-# define free_toasters 0
# define release_toasters 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@ -796,7 +795,7 @@ draw_toasters (ModeInfo *mi)
if (!bp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -863,6 +862,27 @@ draw_toasters (ModeInfo *mi)
glXSwapBuffers(dpy, window);
}
+
+ENTRYPOINT void
+free_toasters (ModeInfo *mi)
+{
+ toaster_configuration *bp = &bps[MI_SCREEN(mi)];
+ int i;
+
+ if (!bp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
+
+ if (bp->dlists) free (bp->dlists);
+ if (bp->floaters) free (bp->floaters);
+ if (bp->user_trackball) gltrackball_free (bp->user_trackball);
+ for (i = 0; i < countof(all_objs); i++)
+ if (glIsList(bp->dlists[i])) glDeleteLists(bp->dlists[i], 1);
+ if (bp->toast_texture) glDeleteTextures (1, &bp->toast_texture);
+# ifndef HAVE_JWZGLES
+ if (bp->chrome_texture) glDeleteTextures (1, &bp->chrome_texture);
+# endif
+}
+
XSCREENSAVER_MODULE_2 ("FlyingToasters", flyingtoasters, toasters)
#endif /* USE_GL */
diff --git a/hacks/glx/fps-gl.c b/hacks/glx/fps-gl.c
index eb6b6de..b8cbb25 100644
--- a/hacks/glx/fps-gl.c
+++ b/hacks/glx/fps-gl.c
@@ -1,4 +1,4 @@
-/* fps, Copyright (c) 2001-2015 Jamie Zawinski <jwz@jwz.org>
+/* fps, Copyright (c) 2001-2018 Jamie Zawinski <jwz@jwz.org>
* Draw a frames-per-second display (Xlib and OpenGL).
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -96,3 +96,16 @@ xlockmore_gl_draw_fps (ModeInfo *mi)
st->string);
}
}
+
+void
+xlockmore_gl_free_fps (fps_state *st)
+{
+ gl_fps_data *data = (gl_fps_data *) st->gl_fps_data;
+ if (data)
+ {
+ if (data->texfont) free_texture_font (data->texfont);
+ free (data);
+ st->gl_fps_data = 0;
+ }
+ fps_free (st);
+}
diff --git a/hacks/glx/gears.c b/hacks/glx/gears.c
index 3976f2f..feaae8c 100644
--- a/hacks/glx/gears.c
+++ b/hacks/glx/gears.c
@@ -18,7 +18,6 @@
"*wireframe: False \n" \
"*suppressRotationAnimation: True\n" \
-# define free_gears 0
# define release_gears 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@ -827,7 +826,7 @@ draw_gears (ModeInfo *mi)
if (!bp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
glShadeModel(GL_SMOOTH);
@@ -933,6 +932,24 @@ gears_handle_event (ModeInfo *mi, XEvent *event)
return False;
}
+
+ENTRYPOINT void
+free_gears (ModeInfo *mi)
+{
+ gears_configuration *bp = &bps[MI_SCREEN(mi)];
+ int i;
+ if (!bp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
+ if (bp->rot) free_rotator (bp->rot);
+ if (bp->trackball) gltrackball_free (bp->trackball);
+ for (i = 0; i < bp->ngears; i++)
+ if (bp->gears[i])
+ free_gear (bp->gears[i]);
+ if (glIsList(bp->armature_dlist))
+ glDeleteLists (bp->armature_dlist, 1);
+
+}
+
XSCREENSAVER_MODULE ("Gears", gears)
#endif /* USE_GL */
diff --git a/hacks/glx/geodesic.c b/hacks/glx/geodesic.c
index 9ef2696..83fd4ac 100644
--- a/hacks/glx/geodesic.c
+++ b/hacks/glx/geodesic.c
@@ -14,7 +14,6 @@
"*showFPS: False \n" \
"*suppressRotationAnimation: True\n" \
-# define free_geodesic 0
# define release_geodesic 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@ -625,7 +624,7 @@ draw_geodesic (ModeInfo *mi)
if (!bp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
if (! wire)
glShadeModel(GL_SMOOTH);
@@ -811,6 +810,18 @@ draw_geodesic (ModeInfo *mi)
}
}
+
+ENTRYPOINT void
+free_geodesic (ModeInfo *mi)
+{
+ geodesic_configuration *bp = &bps[MI_SCREEN(mi)];
+ if (!bp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
+ if (bp->trackball) gltrackball_free (bp->trackball);
+ if (bp->rot) free_rotator (bp->rot);
+ if (bp->colors) free (bp->colors);
+}
+
XSCREENSAVER_MODULE ("Geodesic", geodesic)
#endif /* USE_GL */
diff --git a/hacks/glx/geodesicgears.c b/hacks/glx/geodesicgears.c
index ecc7f26..3911b38 100644
--- a/hacks/glx/geodesicgears.c
+++ b/hacks/glx/geodesicgears.c
@@ -1325,7 +1325,7 @@ reshape_geodesic (ModeInfo *mi, int width, int height)
h = height / (GLfloat) width;
}
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
glViewport (0, y, (GLint) width, (GLint) height);
@@ -1527,7 +1527,7 @@ draw_geodesic (ModeInfo *mi)
if (!bp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
if (bp->draw_time == 0)
@@ -1790,11 +1790,13 @@ free_geodesic (ModeInfo *mi)
geodesic_configuration *bp = &bps[MI_SCREEN(mi)];
if (!bp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
- free_texture_font (bp->font);
- free (bp->colors);
- free_sphere_gears (mi);
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
+ if (bp->font) free_texture_font (bp->font);
+ if (bp->colors) free (bp->colors);
+ if (mi) free_sphere_gears (mi);
if (bp->desc) free (bp->desc);
+ if (bp->trackball) gltrackball_free (bp->trackball);
+ if (bp->rot) free_rotator (bp->rot);
}
diff --git a/hacks/glx/gflux.c b/hacks/glx/gflux.c
index dbbb11c..63c9676 100644
--- a/hacks/glx/gflux.c
+++ b/hacks/glx/gflux.c
@@ -46,7 +46,6 @@
"*useSHM: True \n" \
"*suppressRotationAnimation: True\n" \
-# define free_gflux 0
# define release_gflux 0
# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
@@ -275,7 +274,7 @@ ENTRYPOINT void draw_gflux(ModeInfo * mi)
/* Just keep running before the texture has come in. */
/* if (gp->waiting_for_image_p) return; */
- glXMakeCurrent(display, window, *(gp->glx_context));
+ glXMakeCurrent(display, window, *gp->glx_context);
calcGrid(gp);
mi->polygon_count = gp->drawFunc(gp);
@@ -382,6 +381,7 @@ ENTRYPOINT void init_gflux(ModeInfo * mi)
progname, s);
exit (1);
}
+ if (s) free (s);
}
gp->modeinfo = mi;
@@ -394,6 +394,14 @@ ENTRYPOINT void init_gflux(ModeInfo * mi)
}
}
+ENTRYPOINT void free_gflux(ModeInfo * mi)
+{
+ gfluxstruct *gp = &gfluxes[MI_SCREEN(mi)];
+ if (!gp->glx_context) return;
+ glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *gp->glx_context);
+ gltrackball_free (gp->trackball);
+ if (gp->texName) glDeleteTextures (1, &gp->texName);
+}
static void createTexture(gfluxstruct *gp)
{
diff --git a/hacks/glx/glblur.c b/hacks/glx/glblur.c
index cee020c..d1514d1 100644
--- a/hacks/glx/glblur.c
+++ b/hacks/glx/glblur.c
@@ -27,7 +27,6 @@
"*fpsSolid: True \n" \
"*suppressRotationAnimation: True\n" \
-# define free_glblur 0
# define release_glblur 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@ -483,7 +482,7 @@ draw_glblur (ModeInfo *mi)
if (!bp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
/* Decide what we're drawing
*/
@@ -605,6 +604,29 @@ draw_glblur (ModeInfo *mi)
glXSwapBuffers(dpy, window);
}
+
+ENTRYPOINT void
+free_glblur (ModeInfo *mi)
+{
+ glblur_configuration *bp = &bps[MI_SCREEN(mi)];
+ if (!bp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
+ if (bp->tex_data) free (bp->tex_data);
+ if (bp->colors0) free (bp->colors0);
+ if (bp->colors1) free (bp->colors1);
+ if (bp->colors2) free (bp->colors2);
+ if (bp->colors3) free (bp->colors3);
+ if (bp->rot) free_rotator (bp->rot);
+ if (bp->trackball) gltrackball_free (bp->trackball);
+ if (glIsList(bp->obj_dlist0)) glDeleteLists(bp->obj_dlist0, 1);
+ if (glIsList(bp->obj_dlist1)) glDeleteLists(bp->obj_dlist1, 1);
+ if (glIsList(bp->obj_dlist2)) glDeleteLists(bp->obj_dlist2, 1);
+ if (glIsList(bp->obj_dlist3)) glDeleteLists(bp->obj_dlist3, 1);
+ if (glIsList(bp->scene_dlist1)) glDeleteLists(bp->scene_dlist1, 1);
+ if (glIsList(bp->scene_dlist2)) glDeleteLists(bp->scene_dlist2, 1);
+ if (bp->texture) glDeleteTextures (1, &bp->texture);
+}
+
XSCREENSAVER_MODULE ("GLBlur", glblur)
#endif /* USE_GL */
diff --git a/hacks/glx/glcells.c b/hacks/glx/glcells.c
index adf9866..b8ee5b8 100644
--- a/hacks/glx/glcells.c
+++ b/hacks/glx/glcells.c
@@ -905,6 +905,9 @@ static int create_list( State *st, double fac )
glNormalPointer( GL_FLOAT, 0, vertex_array->normal );
glDrawElements( GL_TRIANGLES, vertex_array->num_index,
GL_UNSIGNED_INT, vertex_array->index );
+ free (vertex_array->vertex);
+ free (vertex_array->normal);
+ free (vertex_array->index);
free( vertex_array );
#else
glBegin( GL_TRIANGLES );
@@ -1349,8 +1352,7 @@ draw_glcells( ModeInfo *mi )
if (!st->glx_context) return;
- glXMakeCurrent( MI_DISPLAY(mi), MI_WINDOW(mi),
- *(st->glx_context) );
+ glXMakeCurrent( MI_DISPLAY(mi), MI_WINDOW(mi), *st->glx_context);
mi->polygon_count = render( st );
@@ -1366,23 +1368,21 @@ free_glcells( ModeInfo *mi )
int i;
State *st = &sstate[MI_SCREEN(mi)];
- if (st->glx_context) {
- glXMakeCurrent( MI_DISPLAY(mi), MI_WINDOW(mi),
- *(st->glx_context) );
-
- /* nuke everything before exit */
- if (st->sphere) free_Object( st->sphere );
- if (st->food) free( st->food );
- for (i=0; i<NUM_CELL_SHAPES; ++i) {
- if (st->cell_list[i] != -1) {
- glDeleteLists( st->cell_list[i], 1 );
- }
+ if (!st->glx_context) return;
+ glXMakeCurrent( MI_DISPLAY(mi), MI_WINDOW(mi), *st->glx_context);
+
+ if (st->sphere) free_Object( st->sphere );
+ if (st->food) free( st->food );
+ for (i=0; i<NUM_CELL_SHAPES; ++i) {
+ if (st->cell_list[i] != -1) {
+ glDeleteLists( st->cell_list[i], 1 );
}
- if (st->cell) free( st->cell );
- free( st->disturbance );
- glDeleteTextures( 1, &st->texture_name );
- free( st->texture );
}
+ if (st->cell) free( st->cell );
+ free( st->disturbance );
+ glDeleteTextures( 1, &st->texture_name );
+ free( st->texture );
+ if (glIsList(st->nucleus_list)) glDeleteLists(st->nucleus_list, 1);
}
XSCREENSAVER_MODULE( "GLCells", glcells )
diff --git a/hacks/glx/gleidescope.c b/hacks/glx/gleidescope.c
index ec33388..60faf3e 100644
--- a/hacks/glx/gleidescope.c
+++ b/hacks/glx/gleidescope.c
@@ -1405,7 +1405,7 @@ ENTRYPOINT void reshape_gleidescope(ModeInfo *mi, int width, int height)
h = height / (GLfloat) width;
}
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(gp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *gp->glx_context);
glViewport(0, y, (GLint) width, (GLint) height);
glMatrixMode(GL_PROJECTION);
@@ -1574,7 +1574,7 @@ draw_gleidescope(ModeInfo * mi)
glDrawBuffer(GL_BACK);
- glXMakeCurrent(display, window, *(gp->glx_context));
+ glXMakeCurrent(display, window, *gp->glx_context);
draw(mi);
if (mi->fps_p) {
@@ -1608,15 +1608,12 @@ draw_gleidescope(ModeInfo * mi)
ENTRYPOINT void
free_gleidescope(ModeInfo * mi)
{
- gleidestruct *gp = &gleidescope[MI_SCREEN(mi)];
-
- /* acd - is this needed? */
- if (gp->glx_context) {
- /* Display lists MUST be freed while their glXContext is current. */
- glXMakeCurrent(MI_DISPLAY(mi), gp->window, *(gp->glx_context));
-
- /* acd - was code here for freeing things that are no longer in struct */
- }
+ gleidestruct *gp = &gleidescope[MI_SCREEN(mi)];
+ if (!gp->glx_context) return;
+ glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *gp->glx_context);
+ if (glIsList(gp->list)) glDeleteLists(gp->list, 1);
+ if (gp->textures[0].id) glDeleteTextures (1, &gp->textures[0].id);
+ if (gp->textures[1].id) glDeleteTextures (1, &gp->textures[1].id);
}
XSCREENSAVER_MODULE ("Gleidescope", gleidescope)
diff --git a/hacks/glx/glforestfire.c b/hacks/glx/glforestfire.c
index bcc9ed7..8aa1c97 100644
--- a/hacks/glx/glforestfire.c
+++ b/hacks/glx/glforestfire.c
@@ -885,6 +885,9 @@ free_fire(ModeInfo * mi)
{
firestruct *fs = &fire[MI_SCREEN(mi)];
+ if (!fs->glx_context) return;
+ glXMakeCurrent (MI_DISPLAY(mi), MI_WINDOW(mi), *fs->glx_context);
+
if (mode_font != None && fs->fontbase != None) {
glDeleteLists(fs->fontbase, mode_font->max_char_or_byte2 -
mode_font->min_char_or_byte2 + 1);
@@ -892,15 +895,15 @@ free_fire(ModeInfo * mi)
}
if (fs->p != NULL) {
- (void) free((void *) fs->p);
+ free(fs->p);
fs->p = (part *) NULL;
}
if (fs->r != NULL) {
- (void) free((void *) fs->r);
+ free(fs->r);
fs->r = (rain *) NULL;
}
if (fs->treepos != NULL) {
- (void) free((void *) fs->treepos);
+ free(fs->treepos);
fs->treepos = (treestruct *) NULL;
}
if (fs->ttexture != None) {
@@ -913,6 +916,8 @@ free_fire(ModeInfo * mi)
XDestroyImage(fs->gtexture);
fs->gtexture = None;
}
+
+ if (fs->trackball) gltrackball_free (fs->trackball);
}
/*
@@ -989,7 +994,7 @@ ENTRYPOINT void draw_fire(ModeInfo * mi)
if (!fs->glx_context)
return;
- glXMakeCurrent(display, window, *(fs->glx_context));
+ glXMakeCurrent(display, window, *fs->glx_context);
glShadeModel(GL_FLAT);
glEnable(GL_DEPTH_TEST);
@@ -1064,7 +1069,7 @@ ENTRYPOINT void change_fire(ModeInfo * mi)
if (!fs->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(fs->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *fs->glx_context);
/* if available, randomly change some values */
if (do_fog)
diff --git a/hacks/glx/glhanoi.c b/hacks/glx/glhanoi.c
index 865930f..eaf775f 100644
--- a/hacks/glx/glhanoi.c
+++ b/hacks/glx/glhanoi.c
@@ -1012,6 +1012,8 @@ static int drawTube(GLdouble bottomRadius, GLdouble topRadius,
glVertex3f(0.0, y, innerRadius);
glVertex3f(0.0, y, radius);
glEnd();
+ free (cosCache);
+ free (sinCache);
return polys;
}
@@ -1855,7 +1857,7 @@ ENTRYPOINT void reshape_glhanoi(ModeInfo * mi, int width, int height)
h = height / (GLfloat) width;
}
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(glhanoi->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *glhanoi->glx_context);
glViewport(0, y, (GLint) width, (GLint) height);
@@ -1962,7 +1964,7 @@ ENTRYPOINT void draw_glhanoi(ModeInfo * mi)
if(!glhanoi->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(glhanoi->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *glhanoi->glx_context);
glPolygonMode(GL_FRONT, glhanoi->wire ? GL_LINE : GL_FILL);
@@ -2060,25 +2062,32 @@ ENTRYPOINT Bool glhanoi_handle_event(ModeInfo * mi, XEvent * event)
ENTRYPOINT void free_glhanoi(ModeInfo * mi)
{
+ glhcfg *glh = &glhanoi_cfg[MI_SCREEN(mi)];
int i;
int j;
- glhcfg *glh = &glhanoi_cfg[MI_SCREEN(mi)];
- if (glh->glx_context) {
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(glh->glx_context));
- glDeleteLists(glh->floorList, 1);
- glDeleteLists(glh->baseList, 1);
- glDeleteLists(glh->poleList, 1);
- glDeleteLists(glh->textureNames[0], 2);
- for(j = 0; j < glh->numberOfDisks; ++j) {
- glDeleteLists(glh->disk[j].displayList, 1);
- }
- free(glh->disk);
- for(i = 0; i < glh->numberOfPoles; i++) {
- if(glh->pole[i].data != NULL) {
- free(glh->pole[i].data);
- }
- }
- }
+
+ if (!glh->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *glh->glx_context);
+
+ free_rotator (glh->the_rotator);
+ if (glh->pole) {
+ for (i = 0; i < glh->numberOfPoles; i++)
+ if (glh->pole[i].data) free (glh->pole[i].data);
+ free (glh->pole);
+ }
+ if (glh->diskPos) free (glh->diskPos);
+ if (glh->trailQ) free (glh->trailQ);
+ if (glh->solveStack) free (glh->solveStack);
+
+ glDeleteLists(glh->floorList, 1);
+ glDeleteLists(glh->baseList, 1);
+ glDeleteLists(glh->poleList, 1);
+ glDeleteLists(glh->textureNames[0], 2);
+ for(j = 0; j < glh->numberOfDisks; ++j) {
+ glDeleteLists(glh->disk[j].displayList, 1);
+ }
+ free(glh->disk);
+ glDeleteTextures (N_TEXTURES, glh->textureNames);
}
XSCREENSAVER_MODULE ("GLHanoi", glhanoi)
diff --git a/hacks/glx/glknots.c b/hacks/glx/glknots.c
index 730cadb..06be339 100644
--- a/hacks/glx/glknots.c
+++ b/hacks/glx/glknots.c
@@ -18,7 +18,6 @@
"*wireframe: False \n" \
"*suppressRotationAnimation: True\n" \
-# define free_knot 0
# define release_knot 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@ -348,7 +347,7 @@ draw_knot (ModeInfo *mi)
if (!bp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
if (bp->mode == 0)
{
@@ -440,6 +439,19 @@ draw_knot (ModeInfo *mi)
glXSwapBuffers(dpy, window);
}
+
+ENTRYPOINT void
+free_knot (ModeInfo *mi)
+{
+ knot_configuration *bp = &bps[MI_SCREEN(mi)];
+ if (!bp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
+ if (bp->trackball) gltrackball_free (bp->trackball);
+ if (bp->rot) free_rotator (bp->rot);
+ if (bp->colors) free (bp->colors);
+ if (glIsList(bp->knot_list)) glDeleteLists(bp->knot_list, 1);
+}
+
XSCREENSAVER_MODULE_2 ("GLKnots", glknots, knot)
#endif /* USE_GL */
diff --git a/hacks/glx/glmatrix.c b/hacks/glx/glmatrix.c
index 6a9b1fe..1e1c4f6 100644
--- a/hacks/glx/glmatrix.c
+++ b/hacks/glx/glmatrix.c
@@ -20,7 +20,6 @@
"*showFPS: False \n" \
"*wireframe: False \n" \
-# define free_matrix 0
# define release_matrix 0
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
@@ -986,7 +985,7 @@ draw_matrix (ModeInfo *mi)
if (!mp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(mp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *mp->glx_context);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
@@ -1063,6 +1062,17 @@ draw_matrix (ModeInfo *mi)
glXSwapBuffers(dpy, window);
}
+
+ENTRYPOINT void
+free_matrix (ModeInfo *mi)
+{
+ matrix_configuration *mp = &mps[MI_SCREEN(mi)];
+ if (!mp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *mp->glx_context);
+ if (mp->strips) free (mp->strips);
+ if (mp->texture) glDeleteTextures (1, &mp->texture);
+}
+
XSCREENSAVER_MODULE_2 ("GLMatrix", glmatrix, matrix)
#endif /* USE_GL */
diff --git a/hacks/glx/glplanet.c b/hacks/glx/glplanet.c
index f26a4ad..a2f6889 100644
--- a/hacks/glx/glplanet.c
+++ b/hacks/glx/glplanet.c
@@ -178,6 +178,7 @@ setup_xpm_texture (ModeInfo *mi, const unsigned char *data, unsigned long size)
GL_RGBA, GL_UNSIGNED_BYTE, image->data);
sprintf (buf, "builtin texture (%dx%d)", image->width, image->height);
check_gl_error(buf);
+ XDestroyImage (image);
}
@@ -399,7 +400,7 @@ reshape_planet (ModeInfo *mi, int width, int height)
planetstruct *gp = &planets[MI_SCREEN(mi)];
GLfloat h = (GLfloat) height / (GLfloat) width;
- glXMakeCurrent(MI_DISPLAY(mi), gp->window, *(gp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), gp->window, *gp->glx_context);
glViewport(0, 0, (GLint) width, (GLint) height);
glMatrixMode(GL_PROJECTION);
@@ -587,7 +588,7 @@ draw_planet (ModeInfo * mi)
glDrawBuffer(GL_BACK);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
- glXMakeCurrent (dpy, window, *(gp->glx_context));
+ glXMakeCurrent (dpy, window, *gp->glx_context);
mi->polygon_count = 0;
@@ -831,14 +832,18 @@ free_planet (ModeInfo * mi)
{
planetstruct *gp = &planets[MI_SCREEN(mi)];
- if (gp->glx_context) {
- glXMakeCurrent(MI_DISPLAY(mi), gp->window, *(gp->glx_context));
+ if (!gp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), gp->window, *gp->glx_context);
- if (glIsList(gp->platelist))
- glDeleteLists(gp->platelist, 1);
- if (glIsList(gp->starlist))
- glDeleteLists(gp->starlist, 1);
- }
+ if (glIsList(gp->platelist)) glDeleteLists(gp->platelist, 1);
+ if (glIsList(gp->shadowlist)) glDeleteLists(gp->shadowlist, 1);
+ if (glIsList(gp->latlonglist)) glDeleteLists(gp->latlonglist, 1);
+ if (glIsList(gp->starlist)) glDeleteLists(gp->starlist, 1);
+ glDeleteTextures(1, &gp->tex1);
+ glDeleteTextures(1, &gp->tex2);
+
+ if (gp->trackball) gltrackball_free (gp->trackball);
+ if (gp->rot) free_rotator (gp->rot);
}
diff --git a/hacks/glx/glschool.c b/hacks/glx/glschool.c
index 49cfc11..6ad80a9 100644
--- a/hacks/glx/glschool.c
+++ b/hacks/glx/glschool.c
@@ -16,7 +16,6 @@
"*showFPS: False \n" \
"*wireframe: False \n" \
-#define free_glschool (0)
#define release_glschool (0)
#define glschool_handle_event (xlockmore_no_events)
@@ -124,7 +123,7 @@ reshape_glschool(ModeInfo *mi, int width, int height)
double aspect = (double)width/(double)height;
glschool_configuration *sc = &scs[MI_SCREEN(mi)];
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(sc->context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *sc->context);
if (sc->school != (School *)0) {
glschool_setBBox(sc->school, -aspect*160, aspect*160, -130, 130, -450, -50.0);
glDeleteLists(sc->bboxList, 1);
@@ -187,7 +186,7 @@ draw_glschool(ModeInfo *mi)
return;
}
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(sc->context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *sc->context);
mi->polygon_count = 0;
@@ -213,4 +212,20 @@ draw_glschool(ModeInfo *mi)
glXSwapBuffers(dpy, window);
}
+
+ENTRYPOINT void
+free_glschool(ModeInfo *mi)
+{
+ glschool_configuration *sc = &scs[MI_SCREEN(mi)];
+
+ if (!sc->context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *sc->context);
+
+ if (sc->school) glschool_freeSchool (sc->school);
+ if (sc->colors) free (sc->colors);
+ if (glIsList(sc->bboxList)) glDeleteLists(sc->bboxList, 1);
+ if (glIsList(sc->goalList)) glDeleteLists(sc->goalList, 1);
+ if (glIsList(sc->fishList)) glDeleteLists(sc->fishList, 1);
+}
+
XSCREENSAVER_MODULE("GLSchool", glschool)
diff --git a/hacks/glx/glslideshow.c b/hacks/glx/glslideshow.c
index 64b1494..77c741c 100644
--- a/hacks/glx/glslideshow.c
+++ b/hacks/glx/glslideshow.c
@@ -78,7 +78,6 @@
"*grabDesktopImages: False \n" \
"*chooseRandomImages: True \n"
-# define free_slideshow 0
# define release_slideshow 0
# include "xlockmore.h"
@@ -1068,6 +1067,7 @@ hack_resources (void)
value.addr = buf2;
value.size = strlen(buf2);
XrmPutResource (&db, buf1, "String", &value);
+ free (val);
#endif
}
@@ -1137,7 +1137,7 @@ draw_slideshow (ModeInfo *mi)
if (!ss->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(ss->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *ss->glx_context);
if (ss->awaiting_first_image_p)
{
@@ -1217,6 +1217,28 @@ draw_slideshow (ModeInfo *mi)
check_fps (mi);
}
+
+ENTRYPOINT void
+free_slideshow (ModeInfo *mi)
+{
+ slideshow_state *ss = &sss[MI_SCREEN(mi)];
+ int i;
+ if (!ss->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *ss->glx_context);
+
+ if (ss->font_data) free_texture_font (ss->font_data);
+ for (i = 0; i < ss->nimages; i++) {
+ if (ss->images[i]) {
+ if (ss->images[i]->title) free (ss->images[i]->title);
+ if (ss->images[i]->texid) glDeleteTextures (1, &ss->images[i]->texid);
+ free (ss->images[i]);
+ }
+ }
+ for (i = 0; i < countof(ss->sprites); i++) {
+ if (ss->sprites[i]) free (ss->sprites[i]);
+ }
+}
+
XSCREENSAVER_MODULE_2 ("GLSlideshow", glslideshow, slideshow)
#endif /* USE_GL */
diff --git a/hacks/glx/glsnake.c b/hacks/glx/glsnake.c
index 5f20421..8efc681 100644
--- a/hacks/glx/glsnake.c
+++ b/hacks/glx/glsnake.c
@@ -144,7 +144,6 @@ static GLfloat angvel;
#define glsnake_init init_glsnake
#define glsnake_display draw_glsnake
#define glsnake_reshape reshape_glsnake
-#define free_glsnake 0
#define release_glsnake 0
#define glsnake_handle_event xlockmore_no_events
@@ -2176,7 +2175,7 @@ ENTRYPOINT void glsnake_display(
if (!bp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
#endif
gl_init(mi);
@@ -2334,6 +2333,20 @@ ENTRYPOINT void glsnake_display(
#endif
}
+
+#ifndef HAVE_GLUT
+ENTRYPOINT void free_glsnake(ModeInfo * mi)
+{
+ struct glsnake_cfg * bp = &glc[MI_SCREEN(mi)];
+ if (!bp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *bp->glx_context);
+ if (bp->font_data) free_texture_font (bp->font_data);
+ if (glIsList(bp->node_solid)) glDeleteLists(bp->node_solid, 1);
+ if (glIsList(bp->node_wire)) glDeleteLists(bp->node_wire, 1);
+}
+#endif
+
+
#ifdef HAVE_GLUT
/* anything that needs to be cleaned up goes here */
static void unmain()
diff --git a/hacks/glx/gltext.c b/hacks/glx/gltext.c
index 276c448..ab5a512 100644
--- a/hacks/glx/gltext.c
+++ b/hacks/glx/gltext.c
@@ -573,7 +573,7 @@ draw_text (ModeInfo *mi)
if (!tp->glx_context)
return;
- glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(tp->glx_context));
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *tp->glx_context);
if (tp->reload)
{
@@ -650,8 +650,18 @@ ENTRYPOINT void
free_text(ModeInfo * mi)
{
text_configuration *tp = &tps[MI_SCREEN(mi)];
+
+ if (!tp->glx_context) return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *tp->glx_context);
+
if (tp->tc)
textclient_close (tp->tc);
+ if (tp->text) free (tp->text);
+ if (tp->trackball) gltrackball_free (tp->trackball);
+ if (tp->rot) free_rotator (tp->rot);
+ if (tp->rot2) free_rotator (tp->rot2);
+ if (tp->colors) free (tp->colors);
+ if (glIsList(tp->text_list)) glDeleteLists(tp->text_list, 1);
}
diff --git a/hacks/glx/gltrackball.c b/hacks/glx/gltrackball.c
index 57b4b99..9e3314c 100644
--- a/hacks/glx/gltrackball.c
+++ b/hacks/glx/gltrackball.c
@@ -76,6 +76,13 @@ gltrackball_init (int ignore_device_rotation_p)
return ts;
}
+void
+gltrackball_free (trackball_state *ts)
+{
+ free (ts);
+}
+
+
/* Device rotation interacts very strangely with mouse positions.
I'm not entirely sure this is the right fix.
*/
diff --git a/hacks/glx/gltrackball.h b/hacks/glx/gltrackball.h
index ba9e574..2ccfb9a 100644
--- a/hacks/glx/gltrackball.h
+++ b/hacks/glx/gltrackball.h
@@ -19,6 +19,7 @@ typedef struct trackball_state trackball_state;
to make dragging the mouse on the window of a GL program do the right thing.
*/
extern trackball_state *gltrackball_init (int ignore_device_rotation_p);
+extern void gltrackball_free (trackball_state *);
/* Begin tracking the mouse: Call this when the mouse button goes down.
x and y are the mouse position relative to the window.
diff --git a/hacks/glx/handsy.c b/hacks/glx/handsy.c
new file mode 100644
index 0000000..077df76
--- /dev/null
+++ b/hacks/glx/handsy.c
@@ -0,0 +1,1175 @@
+/* handsy, Copyright (c) 2018 Jamie Zawinski <jwz@jwz.org>
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation. No representations are made about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ */
+
+#define DEFAULTS "*delay: 30000 \n" \
+ "*count: 2 \n" \
+ ".foreground: #8888CC" "\n" \
+ "*groundColor: #0000FF" "\n" \
+ "*showFPS: False \n" \
+ "*wireframe: False \n"
+
+# define release_hands 0
+#undef countof
+#define countof(x) (sizeof((x))/sizeof((*x)))
+
+#include "xlockmore.h"
+#include "sphere.h"
+#include "tube.h"
+#include "rotator.h"
+#include "gltrackball.h"
+#include "gllist.h"
+#include <ctype.h>
+
+#ifdef USE_GL /* whole file */
+
+
+#define DEF_SPEED "1.0"
+#define DEF_SPIN "XY"
+#define DEF_WANDER "True"
+#define DEF_FACE_FRONT "True"
+#define DEF_DEBUG "False"
+
+extern const struct gllist
+ *handsy_model_finger_distal, *handsy_model_finger_intermediate,
+ *handsy_model_finger_proximal, *handsy_model_finger_metacarpal,
+ *handsy_model_thumb_distal, *handsy_model_thumb_proximal,
+ *handsy_model_thumb_metacarpal, *handsy_model_palm;
+static struct gllist *ground = 0;
+
+static const struct gllist * const *all_objs[] = {
+ &handsy_model_finger_distal, &handsy_model_finger_intermediate,
+ &handsy_model_finger_proximal, &handsy_model_finger_metacarpal,
+ &handsy_model_thumb_distal, &handsy_model_thumb_proximal,
+ &handsy_model_thumb_metacarpal, &handsy_model_palm,
+ (const struct gllist * const *) &ground
+};
+
+#define FINGER_DISTAL 0
+#define FINGER_INTERMEDIATE 1
+#define FINGER_PROXIMAL 2
+#define FINGER_METACARPAL 3
+#define THUMB_DISTAL 4
+#define THUMB_PROXIMAL 5
+#define THUMB_METACARPAL 6
+#define PALM 7
+#define GROUND 8
+
+
+/* 'hand_geom' describes the position and extent of the various joints.
+ 'hand' describes the current flexion of the joints in that model.
+ 'hand_anim' is a list of positions and timings describing an animation.
+ 'hands_configuration' is the usual global state structure.
+ */
+
+typedef struct {
+ double min, max; /* +- pi */
+} joint;
+
+typedef struct {
+ joint bones[4];
+ joint base;
+} finger;
+
+typedef struct {
+ finger fingers[5];
+ joint palm;
+ joint wrist1;
+ joint wrist2;
+} hand_geom;
+
+static const hand_geom human_hand = {
+ {{{{ 0.0, 1.6 }, /* thumb distal */
+ { 0.0, 1.6 }, /* thumb proximal */
+ { 0.0, 1.6 }, /* thumb metacarpal */
+ { 0.0, 0.0 }}, /* none */
+ { -1.70, 0.00 }},
+ {{{ -0.2, 1.6 }, /* index distal */
+ { -0.2, 1.6 }, /* index intermediate */
+ { -0.2, 1.6 }, /* index proximal */
+ { 0.0, 0.0 }}, /* index metacarpal */
+ { -0.25, 0.25 }},
+ {{{ -0.2, 1.6 }, /* middle distal */
+ { -0.2, 1.6 }, /* middle intermediate */
+ { -0.2, 1.6 }, /* middle proximal */
+ { 0.0, 0.0 }}, /* middle metacarpal */
+ { -0.25, 0.25 }},
+ {{{ -0.2, 1.6 }, /* ring distal */
+ { -0.2, 1.6 }, /* ring intermediate */
+ { -0.2, 1.6 }, /* ring proximal */
+ { 0.0, 0.0 }}, /* ring metacarpal */
+ { -0.25, 0.25 }},
+ {{{ -0.2, 1.6 }, /* pinky distal */
+ { -0.2, 1.6 }, /* pinky intermediate */
+ { -0.2, 1.6 }, /* pinky proximal */
+ { 0.0, 0.0 }}, /* pinky metacarpal */
+ { -0.25, 0.25 }}},
+ { -0.7, 1.5 }, /* palm (wrist up/down) */
+ { -M_PI, M_PI }, /* wrist left/right */
+ { -M_PI, M_PI }, /* wrist rotate */
+};
+
+typedef struct {
+ double joint[countof(human_hand.fingers)] /* +- pi */
+ [countof(human_hand.fingers[0].bones)];
+ double base[countof(human_hand.fingers)];
+ double wrist[3]; /* up/down, left/right, rotate */
+ double pos[3]; /* XYZ */
+ Bool sinister;