ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/CV/Changes
Revision: 1.264
Committed: Fri May 12 02:11:11 2023 UTC (12 months, 2 weeks ago) by root
Branch: MAIN
Changes since 1.263: +2 -0 lines
Log Message:
*** empty log message ***

File Contents

# User Rev Content
1 root 1.244 TODO/FIXME: pixmap-bg-trick sometimes doesn't work (race?)
2     TODO/FIXME: remove event does not recalculate schanuzer content size
3     TODO: with manual placement, initial contents aren't displayed
4     TODO: update a file that has been removed etc.
5     TODO: note to self, the reason mplayer hangs during long copies is that execve hangs, because it closes an fd to the target file.
6    
7     TODO: "mädhcne" utf-8 bug move to ERROR is a directory
8     TODO: up == select dir
9     TODO: CV_THUMBNAIL_SCALE
10     TODO: Pango-WARNING **: Invalid UTF-8 string passed to pango_layout_set_text() at /opt/bin/cv line 224.
11     TODO: dir_is_movie in load_image bluray: ffmpeg etc.
12 root 1.260 TODO: cv 5/ 6/ (hla) bad icon label in schnauzere
13 root 1.244
14 root 1.261 - leave file autoloading up to the user config, do not override it anymore.
15 root 1.262 - switch to AnyEvent::MPV for video/audio displaying.
16 root 1.263 - do not use ffprobe to probe video formats, use mpv.
17 root 1.264 - for filenames ending in .iso, read more data when doing filetype
18     detection, to detect udf discs.
19 root 1.261
20 root 1.260 2.0 Fri 26 Aug 2022 23:56:45 CEST
21 root 1.257 - support jpeg-xl files.
22 root 1.253 - mpv: do no autoload files, as this is very slow on large directories.
23 root 1.246 - work around bugs with newer gtk2 and/or xft
24     versions that cause the schnauzer window to shrink randomly.
25 root 1.245 - implement (mostly hiden) --sort argument that forces filename sort
26     even when cv normally wouldn't.
27 root 1.250 - implement animated gif detection using netscape app block,
28 root 1.251 whose presence will be assume to indicate an animated gif. this is not
29     foolproof, bit greatly reduces the number of mpv invocations for gifs.
30 root 1.250 - fix video/gif rotation, used mplayer metpod, switched to mpv's
31 root 1.244 --video-rotate.
32 root 1.250 - take Display matrix/rotation side data type into account
33     when calculating video size from ffprobe.
34 root 1.247 - mpv renamed the input file option once more, to input-ipc-client.
35     tedious. would be nice if they instead worked on being able to pass
36     filenames over the APIS, or some other real problem. oh yeah,
37     --list-options format was also changed. sigh.
38 root 1.244 - up version sort width to 8 digits, from 6.
39 root 1.248 - t/T now rotate video during playback.
40 root 1.252 - when thumbnailing, do not open archives, follow playlists, open
41     subtitles and so on.
42 root 1.253 - update mpv switches to mdoern format.
43 root 1.254 - set whole toplevel window to insensitive insteads of just the schnauzer,
44     to avoid gtk default signal handling to mess up navigation.
45 root 1.255 - preliminary and limited support to play bluray/dvd "directories".
46     - use mpv commands (as opposed to mplayer) for subtitle/audio track cycling.
47 root 1.256 - fix keysym for '#', which at some point seems to have been replaced
48     by 'numbersign' in gtk.
49 root 1.258 - implement hack to detect some iso files as bluray movies and play them.
50 root 1.259 - do not pass filenames directly to ffprobe, instead prefix them with
51     file:, to ensure they are not misinterpreted as urls.
52 root 1.260 - implement '#' (switch audio tracks) and "j" (switch subtitle tracks)
53     keybindings.
54 root 1.244
55 root 1.243 1.9 Sun May 9 13:04:09 CEST 2021
56 root 1.231 - INCOMPATIBLE CHANGE: .cvrc is now sourced much earlier, before loading
57 root 1.230 modules. cvrc_boot and cvrc_start functions are called later.
58 root 1.235 - INCOMPATIBLE CHANGE: mplayer support has been completely removed.
59 root 1.237 - INCOMPATIBLE CHANGE: viewer now defaults to "maxpect" (shift-M) mode.
60 root 1.242 - "invisible" cursor does not act weirdly when it is in position zero
61     (ctrl-u, space did not advance if cursor was on first item in schnauzer).
62 root 1.239 - support heif/avif now via pixbufloader (which seesm to not have
63     working autodetection, so we do our own).
64 root 1.237 - cv now uses mpv to generate video thumbnails - maybe slower, maybe overall
65     worse, but at least there is no dependency on mplayer anymore.
66 root 1.236 - cv now expects mpv to be in the CV_MPV, not CV_MPALYER, env variable.
67 root 1.232 - the Schnauzer now autoscales everything according to the first monitor's
68 root 1.233 DPI when the dpi is >= 110. This can be disabled by adding this to your .cvrc:
69 root 1.232 $Gtk2::CV::Schnauzer::DISPLAYSCALE = 1;
70 root 1.234 - redid "splash" image to be 16:9 (and also super-ugly, but nobody cares).
71 root 1.237 - support mpv's --input-ipc-file option, in addition to --input-file
72     (untested).
73 root 1.226 - rather brutally remove LC_ALL and override LC_NUMERIC, as perl and gtk2
74 root 1.230 sometimes fail to format numbers correctly and fall back to the
75 root 1.226 locale-specific format (which perl should never do).
76 root 1.225 - added a "Subdir view", showing only subdirectories in the cluster view and
77     immediately entering them.
78 root 1.231 - add .cvrc changable variable $Gtk2::CV::Schnauzer::DISPLAYSCALE,
79     defaults to 1 - for use with hidpi displays.
80     - add .cvrc changable variable $Gtk2::CV::Schnauzer::ICONSCALE,
81     defaults to 1 - modifies actual icon file size.
82     - add .cvrc changable variable $Gtk2::CV::Schnauzer::FONTSCALE,
83     defaults to icon scale - modified icon font height.
84 root 1.238 - while CV is effectively single-threaded, it might need thread support
85     to be initialized in Gtk2/xcb.
86 root 1.240 - remove hyper scaling mode.
87 root 1.241 - "," is now the opposite (modulo rounding) from ".".
88     - do not duplicate filetype detection in schnauzer and CV.xs, always use
89     the xs code.
90 root 1.225
91 root 1.224 1.8 Mon Apr 29 15:10:44 CEST 2019
92     - work around newer versions of mpv no longer having a pause command.
93 root 1.220 - always use mpv to display gif images, because it's hard to detect whether a gif
94     is animated or not.
95 root 1.218 - use a better(?), more "sharp" method to detect keyboard accelerators and to decide
96     which keys to pass to the schnauzer from the image window.
97 root 1.217 - new selection method. Alt-A / select files i same directory, can be repeated.
98 root 1.219 - rename select by prefix to select by adjacent name.
99     - increase search range for adjacent name to 10000.
100 root 1.217 - change meta-mask to mod1-mask, as gtk+ has silently changed the meaning of meta
101     over the years (so much for api stability...).
102 root 1.216 - newer perl versions somehow manage to leak the prefetch file handle somehow,
103     try tro work aorund.
104 root 1.217 - implement (undocumented) filename_display_name hook in Gt2k::CV::Schnauer.
105     - use symbolic names for entry indices in Schnauzer, for sanity, as the design
106     is now stable enough.
107 root 1.220 - use loop-file=inf for mpv instead of -loop 0, which only works for mplayer.
108 root 1.221 - add metadata clustering plugin.
109 root 1.222 - use ffprobe also if libmagic cannot detect anything, to decide whether the
110     file is (maybe) an image or (maybe) a video.
111 root 1.223 - namecluster now respects default modifier mask.
112 root 1.216
113 root 1.215 1.71 Tue Jul 31 00:57:03 CEST 2018
114 root 1.213 - fix 'o' key osd level switching in mpv (similar to old mplayer mode).
115 root 1.214 - do not error out on incomplete JPEG files, generate fake EOI marker instead
116     to enable the decoder to output a partial file.
117 root 1.213
118 root 1.212 1.7 Wed Dec 27 18:47:50 CET 2017
119 root 1.207 - DEFAULT CHANGED: cv will now default to mpv instead of mplayer.
120     use CV_MPLAYER=mplayer to get the previous behaviour.
121 root 1.203 - new env variable, CV_MPLAYER, defaulting to mpv.
122     - make "mplayer" configurable via CV_MPLAYER, support mpv.
123     - support mpv ipc protocol for remote control.
124 root 1.210 - implement audio visualisation when playing audio streams,
125     remove support for CV_AUDIO_PLAYER.
126 root 1.205 - port to newer versions of gtk2, which require including gdkx.h.
127 root 1.206 - preliminary & optional webp load and thumbnail support.
128 root 1.209 - use mmap to "load" files and decode from memory buffers.
129     - use internal fileype function to detect filetype when generating
130     hthumbnails, instead of relaying on file extension (for speed).
131 root 1.208 - add internal magic_buffer/magic_buffer_mime functions.
132 root 1.211 - add more fallback extensions for audio when mimetype detection fails.
133 root 1.203
134     1.61 Sat Jun 24 01:55:48 CEST 2017
135 root 1.191 - work around parser bug in 5.18.1 (-a).
136 root 1.202 - very simple "better than nothing" jpeg cmyk/ycck format decoding.
137 root 1.190 - use ffprobe instead of mplayer to probe video size/type.
138 root 1.187 - switch to using AnyEvent::Fork as provider for the processpool, which ought
139     to save gobs of memory.
140 root 1.190 - much improved async communications with worker processes.
141 root 1.189 - batch expose events together, in an attempt to reduce the amount of
142     expose races in gtk+ (does not fix scrolling races).
143 root 1.187 - create #cpu + 1 worker jobs now, not 1.5 * #cpu + 1 as before.
144 root 1.185 - better shell-quoting: use ""-style for utf-8 filenames and paste as unicode,
145     use bash's $'' syntax for other filenames.
146 root 1.180 - no longer pass a-z from viewer to schnauzer.
147 root 1.175 - properly serialise jobs by priority, instead of executing
148     jobs in parallel on the same path *sometimes*.
149 root 1.171 - escape select-by-prefix menu item labels.
150 root 1.170 - work around more perl unicode bugs.
151 root 1.172 - slightly improved filetype detection.
152 root 1.173 - add "cp" job for external plugins.
153 root 1.174 - work around even more perl unicode bugs that the perl5-porters
154     don't want to fix because of backwards compatibility.
155 root 1.176 - do not stupidly load big video files into memory just
156     to make a thumbnail.
157 root 1.177 - don't modify global $_ in aio callbacks.
158 root 1.181 - make drag-rectangle more visible.
159 root 1.182 - do not enter the last directory on the commandline, if more
160     than one argument is specified.
161 root 1.180 - started using AnyEvent.
162 root 1.183 - space by default activates first file, or first directory, if no files
163     (as opposed to first file or last directory in previous versions).
164 root 1.184 - fix race condition where the schnauzer might stay non-sensitive
165     on fast directory changes.
166 root 1.186 - allow reversal of rotation via .cvrc $REVERSE_ROTATION = 1.
167 root 1.187 - delay initialisation of Gtk2::CV::Schnauzer until first use.
168 root 1.188 - fix a runtime error when starting namecluster with newer gtk's.
169 root 1.191 - do not rely on /dev/shm being world-writable, use
170     /run/shm, /dev/shm and /tmp, in this order.
171     - expect mplayer to sometimes generate more than 2 frames when 1 is
172     requested.
173     - tune video thumbnail generation a bit.
174     - more fixups for "file -i" failing.
175 root 1.192 - properly follows symlinks instead of bailing out.
176 root 1.193 - support perl multicore specification (http://perlmulticore.schmorp.de/)
177     for jpeg loading and image transformations, although nothing takes
178     advantage of this *yet*.
179 root 1.197 - ctrl-up/down in schnauzer tries to move name cluster cursor.
180 root 1.198 - ctrl-shift-T in image window now sets default rotation for
181     subsequent image loads.
182 root 1.200 - ctrl-shift-G in schnauzer now removes thumbnails.
183 root 1.199 - implement j (cycle subtitle) and # (cycle audio track)
184     in mplayer mode.
185 root 1.201 - respect load time (ctrl-shift-T) rotation setting for videos
186     (no clue how to do that at runtime).
187 root 1.202 - print jpeg error messages to stderr.
188 root 1.170
189 root 1.169 1.56 Thu Oct 28 14:13:36 CEST 2010
190 root 1.166 - try an ugly workaround against Gtk's CONTINUED brokenness
191     with regards to non-ascii filenames :(.
192 root 1.161 - REALLY hide paths that are in the process of being removed
193     from the Schnauzer.
194     - when selecting entries, stat them all and fine their total
195     size(s) + filesystem overhead after a delay.
196     - take advantage of the Guard module.
197 root 1.162 - work around mplayer grabbing the focus.
198 root 1.163 - improve mplayer window size bug workaround. *sigh*.
199 root 1.164 - try not to keep a handle to a guard file to avoid
200     running into rename races with nfs.
201 root 1.165 - work around perl bug #77798 in some parts.
202 root 1.167 - slight namecluster speed improvement.
203 root 1.168 - work around newer libmagic versions adding mime attributes.
204 root 1.161
205 root 1.160 1.55 Tue Jan 26 03:18:45 CET 2010
206 root 1.161 - schnauzer did usually not give the correct number for
207 root 1.160 "# entries selected".
208 root 1.159 - added new "renamer" plugin that is useful for mass renames
209     of very similar filenames.
210 root 1.158 - apply a heavy dose of common::sense.
211 root 1.155 - enable assert's (which perl disables...).
212 root 1.156 - take advantage of IO::AIO::aio_readdirx.
213 root 1.158 - speed up file move duplicate detection.
214 root 1.155
215 root 1.154 1.54 Mon Apr 27 04:23:33 CEST 2009
216 root 1.151 - implement automatic reloading on SIGUSR1, as per suggestions
217     by Trevor Cordes.
218 root 1.152 - remove -\d\d\d file ending first on move collision.
219 root 1.150 - ctrl-shift-d now deletes despite CV_TRASHCAN.
220 root 1.146 - very hacky video thumbnailing via mplayer.
221 root 1.143 - ctrl-d errornously worked like ctrl-shift-d (cost 50gb of data).
222 root 1.140 - work around glib/gtk's filename corruption bugs when saving thumbnails
223 root 1.141 by writing the file ourselves.
224     - work around some other glib/gtk string corruption bugs.
225 root 1.136 - really only warn about pipe close failures :/.
226 root 1.137 - add hide attribute to jobs that will remove the file and do not
227 root 1.138 show those files in the schnauzer (but in-progress jobs
228     will still be shown, unfortunately).
229 root 1.139 - work around some more unicode issues in perl.
230 root 1.142 - correctly parse .rm as file extension in the schnauzer.
231 root 1.147 - always pre-fork the maximum number of worker slaves,
232     as forking later can consume way too much memory.
233 root 1.148 - update glade to work around annoying warnings in newer gtk.
234     - work around changes in newer glade. *sigh*.
235 root 1.149 - document that we need libgtk2.0-dev, too.
236 root 1.153 - avoid endless loops in mv.
237 root 1.136
238 root 1.135 1.53 Tue Jul 8 14:03:12 CEST 2008
239 root 1.134 - only warn about pipe close failures in printdialog, do not die.
240 root 1.131 - do not try to handle filenames in unicode, instead, only
241     convert at display time.
242 root 1.130 - kill any media players on destroy and not in the finaliser,
243     as gtk+'s lazy finalisation and mplayers stubbornness to
244     continue running without control socket and output window
245     can be annoying.
246 root 1.132 - add recursive delete (lamely implemented using rm -rf).
247 root 1.133 - update progressbar after a timeout in addition to after
248     enough work has done to ensure it is being displayed
249     quickly for long jobs.
250 root 1.130
251 root 1.129 1.51 Sun Jan 27 17:48:14 CET 2008
252 root 1.127 - run more stats in parallel in schnauzer scanning.
253 root 1.128 - do not deselect cursor on scroll if a range is selected.
254 root 1.127
255 root 1.125 1.5 Sun Nov 25 15:15:27 CET 2007
256 root 1.122 - rudimentary support for audio.
257 root 1.123 - fix Gtk2::Ex::PodViewer rename (patch by Randy J. Ray).
258 root 1.122
259 root 1.121 1.4 Sat Mar 17 14:11:48 CET 2007
260 root 1.116 - upgraded to IO::AIO 2.1 features.
261 root 1.113 - errors in IO::AIO callback execution will be logged and will
262     not freeze AIO operations anymore.
263 root 1.120 - jpeg2000 support by running jasper externally (imageviewer only).
264 root 1.114 - directory scanning now asynchronous.
265 root 1.115 - increased progress update frequency and reduced delay.
266 root 1.117 - add/enable icons for mp2/mp3/ogm.
267     - better ogm support.
268     - use mplayer for just about anything as opposed to just for video/*.
269 root 1.118 - fix auto rotation in older perls.
270 root 1.112
271 root 1.110 1.3 Wed Sep 27 23:59:27 CEST 2006
272 root 1.111 - simplify redraw, avoid unnecessary schnauzer redraws.
273 root 1.107 - add rotate entries to the schnauzer menu, adapted
274     from a patch by Corris Randall.
275 root 1.108 - use new experimental (but much faster) clustering feature vector
276     based on moments and not on a histogram.
277 root 1.109 - reimplement file movement to use IO::AIO natively, thus much faster
278     and lower on resources.
279 root 1.107
280 root 1.106 1.2 Fri Mar 31 12:55:15 CEST 2006
281 root 1.94 - fix unnecessarily redraws on partial exposes (scrolling etc).
282 root 1.95 - fixed CV_TRASHCAN support.
283 root 1.96 - "a" calls exiftran to rotate the image on-disk.
284     - don't run jobs on the same file in parallel.
285 root 1.98 - filenames were sometiems encoded twice when loading xvpics.
286 root 1.99 - do not sort filenames given on the commandline.
287 root 1.100 - set dithering to 'max', as contrary to documentation 'normal'
288     doesn't dither on (my) 8-bit-displays.
289 root 1.101 - enable dithering for xvpics.
290 root 1.102 - use libmagic for filetype detection.
291 root 1.103 - set window roles.
292 root 1.104 - changed xor color from 0x8080 PC to 0x8000, as the former yields
293     useless results on gtk 2.8.
294 root 1.105 - fix p7 thumbnail reading.
295 root 1.94
296 root 1.93 1.1 Fri Oct 28 15:47:53 CEST 2005
297 root 1.91 - jobs for files currently shown in a schnauzer get prioritised.
298 root 1.72 - directories visited in a session are shown darker.
299 root 1.93 - unvisited directory with .xvpics in them are shown differently.
300     - add Remove Thumbnails menu entry.
301     - allow restricting image size to something less than the screen
302     (ctrl-shift-m).
303     - fix a bug where background processes stopped processing jobs.
304     - primary selection support for schnauzer selections.
305     - documented and implemented scorlling behaviour while drag-selecting.
306     - implemented Select=>By Prefix.
307     - background loading of .xvpics (and checking for symlinks-to-dirs).
308     - use overlays to differentiate between directories that
309     are empty, have .xvpics or are symlinks-to-directories.
310     - better/slower expose handling (we need double-refreshes due to
311     probable bugs in gtk+ or X11).
312     - implement a dirstack (statestack) and make use of it.
313     - don't forget cursor position on ctrl-g and similar commands.
314     - implemented keep_only_thumbnailed and remove_thumbnailed.
315     - implemented multiple-image-window support in cv.
316     - do some extra random resizes on the mplayer window to get it
317     to notice the damned window size.
318     - reap fork'ed job processes to avoid ressource leaks.
319     - fixed GNU R clustering.
320 root 1.44
321 root 1.70 1.0 Wed Sep 7 18:41:38 CEST 2005
322 root 1.65 - fix alpha handling: we now compose with a checkerboard,
323 root 1.93 but exposing hidden pixel data is also supported in the code.
324     - use jpg instead of P7 format for thumbnails and remove p7
325     write support: better quality, smaller filesize.
326     - evaluate _NET_FRAME_EXTENTS to get actual maximum screen size.
327     - better mplayer integration (resize handling, aspect handling).
328     - fix some bugs when a Schnauzer window was resized and got
329     the wrong offset.
330     - don't crash when trying to crop to a size of less than a pixel.
331     - schnauzer now has two modes: directors view or single-file view.
332     this changes it's behaviour on rescan and other occasions.
333     - reduce the amount of random dithering.
334     - load jpeg files ~20% faster, create jpeg thumbnails an order
335     of magnitude faster.
336     - improved bin/cv documentation.
337     - improve scanning performance further by usign the directory
338     link count and by stat'ing possible directories early.
339     - do file data prefetch after space or backspace and 0.3s.
340     - better and faster casefolding.
341     - use pango's ellipsise functionality and cut at the end.
342     - moved the R clustering algo to a separate plugin (and fix it).
343     - moved the filename clustering algo to a separate plugin.
344     - try very hard to get the window size correct befre first map.
345     - only load the default title image when necessary (saves mem & cpu).
346     - change drag xor colour to #808080, uglier, but visible on all
347     images.
348     - added icon for .tif files.
349     - updated icons for some file-extensions.
350     - created a job system and create thumbnails in parallel and
351     in the background.
352     - more careful handling of filename encodings.
353     - use gdk_pixbuf_rotate_simple instead of our own functions.
354 root 1.68 - played with resizing logic once more.
355 root 1.16
356 root 1.43 0.5 Mon Jul 11 05:48:13 CEST 2005
357 root 1.93 - image window resizing now works again.
358     - much improved resize/move handling (still not up to xv's level).
359     - every schnauzer now has an associated label/info field.
360     - better ^D performance.
361     - can now play videos if mplayer is in the path (and probably is
362     identical to my versions and your config file is empty etc. etc.
363     the usual caveats about embedding mplayer...)
364     (http://itdp.fh-biergarten.de/mplayer-dev-eng/2004-12/txt00028.txt fixes
365     the resize problems).
366     - remove gtk20-compatibility cruft.
367     - added progress window for lengthy operations.
368     - removed <parent> entry, use popup=>Up.
369     - change of contact address.
370     - updated icons for some file-extensions.
371     - make cv's info label wrap as not to change horizontal window width
372     (doesn't work, but that's general gtk2 brokenness).
373     - use set_absolute_size for the schnauzer font. doesn't result in an
374     absolute size, but at least results in the same height everywhere.
375     - implemented a primitive plugin system (see Gtk2::CV::Plugin and
376     eg/plugin-skeleton).
377     - removed bin/cvc's clusteriser.
378     - added a new clusteriser algorithm, use Popup=>"Filename clustering..."
379     - set _X_CWD to current dir in bin/cv (a rather special feature...).
380     - further directory scanning speed improvements.
381     - IO::AIO use for some speedups and more concurrency.
382 root 1.19
383 root 1.18 0.3 Sun Aug 1 21:59:49 CEST 2004
384 root 1.16 - cv * now correctly loads && selects the first image again.
385 root 1.93 - changed selection behaviour to select ranges not rectangles
386     (could be configurable at runtime).
387     - many small bugfixes.
388     - better display behaviour when viewing many images quickly.
389     - changed sort order to sth... strange (case insensitive,
390     numbers < 5 digits sorted in numerical order).
391 root 1.16
392 root 1.15 0.2 Thu Nov 20 07:49:55 CET 2003
393 root 1.14 - add DSC comments (except for %%page).
394 root 1.93 - implemented binary encoding for postscript printing.
395     - ctrl-s == rescan.
396     - less-latency resizes.
397     - after implementing filename_to_unicode maybe it is time to use it...
398 root 1.12
399     0.15 Wed Nov 12 21:33:32 CET 2003
400 root 1.7 - add nifty print dialog, using glade and GladeXML. GladeXML needs
401 root 1.93 some convinience functions, but is ok to use.
402     - improved schnauzer scrolling and geometry hints.
403     - bugfixes, as usual.
404     - implemented ctrl-u.
405     - implemented maxpect-always mode.
406 root 1.7
407     0.14 Mon Nov 10 20:11:15 CET 2003
408 root 1.3 - use subpixbufs for cropping.
409     - don't force redraws anymore, hopefully the result is the same.
410 root 1.93 - primitive printing with automaxpect (always to /tmp/x, watch out!).
411     - off-by-one error in flip code fixed.
412     - replaced nearest interpolation to tiles for thumbnail generation.
413     - much improved thumbnail dithering.
414     - applied drag_rect patch by muppet, together with some infrastructure
415     improvements.
416     - faster and less accurate text "autoscaling".
417 root 1.1
418     0.13 Sat Nov 8 14:13:24 CET 2003
419 root 1.2 - Applied patch by muppet to backport it to gtk2.0,
420 root 1.93 plus portabiity fixes.