|
From: Bastian M. <bma...@we...> - 2014-12-31 08:53:40
|
Am 31.12.2014 um 06:15 schrieb sfeam: > ====================== > "pause mouse" on MSWin > ====================== > > On Tuesday, 30 December 2014 08:42:16 PM Bastian Märkisch wrote: >>> >>> The patch for #1502 (and #1432?) touches more code than I am happy with >>> for a change at this late date. >> >> Understood, see above. Looking at the amazing new games demos, it would >> be a shame to add a "pause mouse on Windows broken" line to the release >> notes, wouldn't it? Note that the actual submit to 5.1 differs a bit >> from the last patch file (do not remember details). It (mostly) fixes >> #1502 and #1432. >> >> Bastian > > I have back-ported code fragments from 5.1 that seem to cover the same > ground as the patch attached to #1502. As you say, the code in 5.1 does > not really match what was in this patch. > > The code changes to files in .../src/ look correct to my eye and have > been compile tested under linux. This of course does not prove that > they work correctly under MSWin, though I'm pretty sure they correctly > reproduce what is currently in 5.1 > > The code changes to files in .../src/win have not been tested at all > by me. Please confirm that they at least compile under MSWin! > It would of course be even better if they do in fact fix the > "pause mouse" issues. > I have checked in another fragment for the wxt terminal which is referenced by the code in src/win/wpause.c. Now it compiles fine. Using wgnuplot, bug #1432 is resolved for wxt and windows (but not for qt and caca - as expected), bug #1502 is resolved for qt, windows and wxt. I will shortly upload a testing binary to http://www.gnuplot.info/development/binaries/ > This is already far more last-minute fiddling than I am comfortable > with, so I am not touching anything else in this area even if it is > related (e.g. caca.trm). > > $ diffstat core_portion_of_windows_bugfix_1432_1502.patch \ > win_portion_of_windows_bugfix_1432_1502.patch > src/win/wgnuplib.h | 1 > src/win/wgraph.c | 44 +++++++++++++++--- > src/win/winmain.c | 11 +++- > src/win/wpause.c | 103 +++++++++++++++++++++++++++++++++---------- > src/command.c | 107 +++++++++++++-------------------------------- > src/command.h | 5 -- > src/mouse.c | 23 +-------- > src/mousecmn.h | 6 +- > src/plot.c | 3 - > src/term.c | 15 ++++-- > 11 files changed, 181 insertions(+), 141 deletions(-) > (snip) > ========================== > Default terminal for MSWin > ========================== > > Bastian Märkisch wrote: >> As it is, "qt" will now be the default terminal on Windows. We should >> discuss if this should really stay that way. At least this change and >> the known issues should be mentioned in the release notes. Please also >> note that most Windows users will use the binaries provided. > > Karl Ratzsch <ra...@un...> wrote: >> I´ve been using the 5.0-rc/5.1 windows binaries with wxt (both from >> Tatsuro (64bit,wxt30) and sf.net/homebuilt (32bit, wxt28)) for half >> a year now at work, with no apparent problems. >> wxt probably is a safer bet, for now. > > I have no opinion here. > Do Tatsuro Matsuoka's binaries support both? Yes, Tatsuro's (and my) binaries do support both. Note that the qt terminal only works on Windows since mid June. I propose to change the order on Windows in term.c, see the attached patch. Bastian > > > Ethan > > |