Mercurial > octave-nkf

comparison libgui/qterminal/libqterminal/unix/KeyboardTranslator.cpp @ 19627:446c46af4b42 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip trailing whitespace from most source files * Makefile.am, NEWS, build-aux/common.mk, configure.ac, doc/Makefile.am, doc/doxyhtml/Makefile.am, doc/interpreter/Makefile.am, doc/interpreter/arith.txi, doc/interpreter/audio.txi, doc/interpreter/basics.txi, doc/interpreter/bugs.txi, doc/interpreter/container.txi, doc/interpreter/cp-idx.txi, doc/interpreter/data.txi, doc/interpreter/debug.txi, doc/interpreter/diagperm.txi, doc/interpreter/diffeq.txi, doc/interpreter/doccheck/README, doc/interpreter/doccheck/spellcheck, doc/interpreter/emacs.txi, doc/interpreter/errors.txi, doc/interpreter/eval.txi, doc/interpreter/expr.txi, doc/interpreter/external.txi, doc/interpreter/fn-idx.txi, doc/interpreter/func.txi, doc/interpreter/geometry.txi, doc/interpreter/geometryimages.m, doc/interpreter/gpl.txi, doc/interpreter/grammar.txi, doc/interpreter/gui.txi, doc/interpreter/image.txi, doc/interpreter/install.txi, doc/interpreter/interp.txi, doc/interpreter/interpimages.m, doc/interpreter/intro.txi, doc/interpreter/io.txi, doc/interpreter/java.txi, doc/interpreter/linalg.txi, doc/interpreter/macros.texi, doc/interpreter/matrix.txi, doc/interpreter/munge-texi.pl, doc/interpreter/nonlin.txi, doc/interpreter/numbers.txi, doc/interpreter/obsolete.txi, doc/interpreter/octave-config.1, doc/interpreter/octave.texi, doc/interpreter/oop.txi, doc/interpreter/op-idx.txi, doc/interpreter/optim.txi, doc/interpreter/package.txi, doc/interpreter/plot.txi, doc/interpreter/poly.txi, doc/interpreter/preface.txi, doc/interpreter/quad.txi, doc/interpreter/set.txi, doc/interpreter/signal.txi, doc/interpreter/sparse.txi, doc/interpreter/sparseimages.m, doc/interpreter/splineimages.m, doc/interpreter/stats.txi, doc/interpreter/stmt.txi, doc/interpreter/strings.txi, doc/interpreter/system.txi, doc/interpreter/testfun.txi, doc/interpreter/tips.txi, doc/interpreter/var.txi, doc/interpreter/vectorize.txi, doc/liboctave/Makefile.am, doc/liboctave/array.texi, doc/liboctave/bugs.texi, doc/liboctave/cp-idx.texi, doc/liboctave/dae.texi, doc/liboctave/diffeq.texi, doc/liboctave/error.texi, doc/liboctave/factor.texi, doc/liboctave/fn-idx.texi, doc/liboctave/gpl.texi, doc/liboctave/install.texi, doc/liboctave/intro.texi, doc/liboctave/liboctave.texi, doc/liboctave/matvec.texi, doc/liboctave/nleqn.texi, doc/liboctave/nlfunc.texi, doc/liboctave/ode.texi, doc/liboctave/optim.texi, doc/liboctave/preface.texi, doc/liboctave/quad.texi, doc/liboctave/range.texi, doc/refcard/Makefile.am, doc/refcard/refcard.tex, etc/HACKING, etc/NEWS.1, etc/NEWS.2, etc/NEWS.3, etc/OLD-ChangeLogs/ChangeLog, etc/OLD-ChangeLogs/doc-ChangeLog, etc/OLD-ChangeLogs/scripts-ChangeLog, etc/OLD-ChangeLogs/src-ChangeLog, etc/OLD-ChangeLogs/test-ChangeLog, etc/PROJECTS, etc/README.Cygwin, etc/README.MacOS, etc/README.MinGW, etc/README.gnuplot, etc/gdbinit, etc/icons/Makefile.am, examples/@polynomial/end.m, examples/@polynomial/subsasgn.m, examples/Makefile.am, examples/standalonebuiltin.cc, libgui/Makefile.am, libgui/qterminal/libqterminal/README, libgui/qterminal/libqterminal/unix/BlockArray.cpp, libgui/qterminal/libqterminal/unix/BlockArray.h, libgui/qterminal/libqterminal/unix/Character.h, libgui/qterminal/libqterminal/unix/CharacterColor.h, libgui/qterminal/libqterminal/unix/Emulation.cpp, libgui/qterminal/libqterminal/unix/Emulation.h, libgui/qterminal/libqterminal/unix/Filter.cpp, libgui/qterminal/libqterminal/unix/Filter.h, libgui/qterminal/libqterminal/unix/History.cpp, libgui/qterminal/libqterminal/unix/History.h, libgui/qterminal/libqterminal/unix/KeyboardTranslator.cpp, libgui/qterminal/libqterminal/unix/KeyboardTranslator.h, libgui/qterminal/libqterminal/unix/LineFont.h, libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.cpp, libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.h, libgui/qterminal/libqterminal/unix/Screen.cpp, libgui/qterminal/libqterminal/unix/Screen.h, libgui/qterminal/libqterminal/unix/ScreenWindow.cpp, libgui/qterminal/libqterminal/unix/ScreenWindow.h, libgui/qterminal/libqterminal/unix/TerminalCharacterDecoder.cpp, libgui/qterminal/libqterminal/unix/TerminalCharacterDecoder.h, libgui/qterminal/libqterminal/unix/Vt102Emulation.h, libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp, libgui/qterminal/qterminal/main.cpp, libgui/src/m-editor/file-editor-tab.cc, libgui/src/octave-gui.cc, libgui/src/octave-qt-link.cc, libinterp/corefcn/data.cc, libinterp/corefcn/defun-int.h, libinterp/corefcn/det.cc, libinterp/corefcn/gl2ps-renderer.cc, libinterp/corefcn/graphics.cc, libinterp/corefcn/graphics.in.h, libinterp/corefcn/ls-mat5.cc, libinterp/corefcn/lu.cc, libinterp/corefcn/oct-tex-parser.yy, libinterp/corefcn/oct-tex-symbols.in, libinterp/corefcn/quadcc.cc, libinterp/corefcn/zfstream.cc, libinterp/dldfcn/__eigs__.cc, libinterp/dldfcn/__voronoi__.cc, libinterp/gendoc.pl, libinterp/genprops.awk, libinterp/mk-errno-list, libinterp/mk-pkg-add, libinterp/mkbuiltins, libinterp/mkdefs, libinterp/mkdocs, libinterp/mkops, libinterp/octave-value/ov-java.cc, libinterp/parse-tree/lex.ll, libinterp/parse-tree/oct-parse.in.yy, libinterp/parse-tree/octave.gperf, liboctave/Makefile.am, liboctave/array/Array.cc, liboctave/array/module.mk, liboctave/cruft/daspk/datv.f, liboctave/cruft/daspk/dcnst0.f, liboctave/cruft/daspk/dcnstr.f, liboctave/cruft/daspk/ddasic.f, liboctave/cruft/daspk/ddasid.f, liboctave/cruft/daspk/ddasik.f, liboctave/cruft/daspk/ddaspk.f, liboctave/cruft/daspk/ddstp.f, liboctave/cruft/daspk/ddwnrm.f, liboctave/cruft/daspk/dfnrmd.f, liboctave/cruft/daspk/dfnrmk.f, liboctave/cruft/daspk/dhels.f, liboctave/cruft/daspk/dheqr.f, liboctave/cruft/daspk/dinvwt.f, liboctave/cruft/daspk/dlinsd.f, liboctave/cruft/daspk/dlinsk.f, liboctave/cruft/daspk/dmatd.f, liboctave/cruft/daspk/dnedd.f, liboctave/cruft/daspk/dnedk.f, liboctave/cruft/daspk/dnsd.f, liboctave/cruft/daspk/dnsid.f, liboctave/cruft/daspk/dnsik.f, liboctave/cruft/daspk/dnsk.f, liboctave/cruft/daspk/dorth.f, liboctave/cruft/daspk/dslvd.f, liboctave/cruft/daspk/dslvk.f, liboctave/cruft/daspk/dspigm.f, liboctave/cruft/daspk/dyypnw.f, liboctave/cruft/dasrt/ddasrt.f, liboctave/cruft/dasrt/drchek.f, liboctave/cruft/dassl/ddaslv.f, liboctave/cruft/dassl/ddassl.f, liboctave/cruft/misc/blaswrap.c, liboctave/cruft/misc/module.mk, liboctave/cruft/odepack/cfode.f, liboctave/cruft/odepack/dlsode.f, liboctave/cruft/odepack/ewset.f, liboctave/cruft/odepack/intdy.f, liboctave/cruft/odepack/prepj.f, liboctave/cruft/odepack/sintdy.f, liboctave/cruft/odepack/slsode.f, liboctave/cruft/odepack/solsy.f, liboctave/cruft/odepack/ssolsy.f, liboctave/cruft/odepack/stode.f, liboctave/cruft/odepack/vnorm.f, liboctave/cruft/ranlib/Basegen.doc, liboctave/cruft/ranlib/README, liboctave/cruft/ranlib/genbet.f, liboctave/cruft/ranlib/genexp.f, liboctave/cruft/ranlib/gennch.f, liboctave/cruft/ranlib/gennf.f, liboctave/cruft/ranlib/gennor.f, liboctave/cruft/ranlib/getsd.f, liboctave/cruft/ranlib/initgn.f, liboctave/cruft/ranlib/phrtsd.f, liboctave/cruft/ranlib/randlib.fdoc, liboctave/cruft/ranlib/setsd.f, liboctave/cruft/ranlib/tstgmn.for, liboctave/cruft/ranlib/tstmid.for, liboctave/cruft/slatec-fn/atanh.f, liboctave/cruft/slatec-fn/datanh.f, liboctave/cruft/slatec-fn/xgmainc.f, liboctave/cruft/slatec-fn/xsgmainc.f, liboctave/numeric/module.mk, liboctave/operators/mk-ops.awk, liboctave/operators/mx-ops, liboctave/operators/sparse-mk-ops.awk, liboctave/operators/sparse-mx-ops, liboctave/operators/vx-ops, liboctave/util/module.mk, run-octave.in, scripts/@ftp/ftp.m, scripts/audio/wavread.m, scripts/deprecated/java_convert_matrix.m, scripts/deprecated/java_debug.m, scripts/deprecated/java_invoke.m, scripts/deprecated/java_new.m, scripts/deprecated/java_unsigned_conversion.m, scripts/deprecated/javafields.m, scripts/deprecated/javamethods.m, scripts/deprecated/shell_cmd.m, scripts/general/accumarray.m, scripts/general/display.m, scripts/general/fieldnames.m, scripts/general/interp1.m, scripts/general/interp2.m, scripts/general/interp3.m, scripts/general/isa.m, scripts/general/methods.m, scripts/general/sortrows.m, scripts/geometry/convhull.m, scripts/geometry/delaunay.m, scripts/geometry/delaunay3.m, scripts/geometry/delaunayn.m, scripts/geometry/griddata.m, scripts/geometry/griddatan.m, scripts/geometry/voronoi.m, scripts/geometry/voronoin.m, scripts/gui/guihandles.m, scripts/gui/inputdlg.m, scripts/gui/listdlg.m, scripts/gui/msgbox.m, scripts/gui/questdlg.m, scripts/gui/uigetfile.m, scripts/gui/waitbar.m, scripts/gui/warndlg.m, scripts/help/doc.m, scripts/help/help.m, scripts/help/type.m, scripts/image/bone.m, scripts/image/cmpermute.m, scripts/image/cmunique.m, scripts/image/colorcube.m, scripts/image/colormap.m, scripts/image/contrast.m, scripts/image/gray2ind.m, scripts/image/image.m, scripts/image/imshow.m, scripts/image/ind2gray.m, scripts/image/jet.m, scripts/image/rgb2ntsc.m, scripts/image/spinmap.m, scripts/io/importdata.m, scripts/io/strread.m, scripts/io/textread.m, scripts/io/textscan.m, scripts/java/java_get.m, scripts/java/java_set.m, scripts/java/javaaddpath.m, scripts/java/javaclasspath.m, scripts/java/javamem.m, scripts/linear-algebra/linsolve.m, scripts/linear-algebra/qzhess.m, scripts/miscellaneous/debug.m, scripts/miscellaneous/desktop.m, scripts/miscellaneous/dir.m, scripts/miscellaneous/dos.m, scripts/miscellaneous/edit.m, scripts/miscellaneous/fact.m, scripts/miscellaneous/getappdata.m, scripts/miscellaneous/inputname.m, scripts/miscellaneous/license.m, scripts/miscellaneous/ls_command.m, scripts/miscellaneous/run.m, scripts/miscellaneous/setfield.m, scripts/miscellaneous/unix.m, scripts/miscellaneous/ver.m, scripts/mk-pkg-add, scripts/mkdoc.pl, scripts/optimization/fminsearch.m, scripts/optimization/optimset.m, scripts/optimization/sqp.m, scripts/pkg/pkg.m, scripts/pkg/private/create_pkgadddel.m, scripts/pkg/private/fix_depends.m, scripts/pkg/private/install.m, scripts/plot/appearance/axis.m, scripts/plot/appearance/box.m, scripts/plot/appearance/clabel.m, scripts/plot/appearance/daspect.m, scripts/plot/appearance/datetick.m, scripts/plot/appearance/grid.m, scripts/plot/appearance/legend.m, scripts/plot/appearance/orient.m, scripts/plot/appearance/shading.m, scripts/plot/appearance/text.m, scripts/plot/appearance/title.m, scripts/plot/appearance/xlabel.m, scripts/plot/appearance/ylabel.m, scripts/plot/appearance/zlabel.m, scripts/plot/draw/area.m, scripts/plot/draw/bar.m, scripts/plot/draw/barh.m, scripts/plot/draw/colorbar.m, scripts/plot/draw/contour.m, scripts/plot/draw/contour3.m, scripts/plot/draw/contourf.m, scripts/plot/draw/ellipsoid.m, scripts/plot/draw/errorbar.m, scripts/plot/draw/ezcontour.m, scripts/plot/draw/ezcontourf.m, scripts/plot/draw/ezmesh.m, scripts/plot/draw/ezpolar.m, scripts/plot/draw/fill.m, scripts/plot/draw/fplot.m, scripts/plot/draw/hist.m, scripts/plot/draw/meshc.m, scripts/plot/draw/meshz.m, scripts/plot/draw/pareto.m, scripts/plot/draw/patch.m, scripts/plot/draw/peaks.m, scripts/plot/draw/pie.m, scripts/plot/draw/pie3.m, scripts/plot/draw/plot.m, scripts/plot/draw/plotyy.m, scripts/plot/draw/private/__bar__.m, scripts/plot/draw/private/__contour__.m, scripts/plot/draw/private/__errplot__.m, scripts/plot/draw/private/__ezplot__.m, scripts/plot/draw/private/__patch__.m, scripts/plot/draw/private/__stem__.m, scripts/plot/draw/rectangle.m, scripts/plot/draw/ribbon.m, scripts/plot/draw/rose.m, scripts/plot/draw/scatter.m, scripts/plot/draw/scatter3.m, scripts/plot/draw/semilogx.m, scripts/plot/draw/shrinkfaces.m, scripts/plot/draw/sombrero.m, scripts/plot/draw/sphere.m, scripts/plot/draw/stairs.m, scripts/plot/draw/stem.m, scripts/plot/draw/stemleaf.m, scripts/plot/draw/surf.m, scripts/plot/draw/surface.m, scripts/plot/draw/surfc.m, scripts/plot/draw/surfl.m, scripts/plot/draw/surfnorm.m, scripts/plot/draw/tetramesh.m, scripts/plot/draw/trimesh.m, scripts/plot/draw/triplot.m, scripts/plot/draw/trisurf.m, scripts/plot/util/__gnuplot_drawnow__.m, scripts/plot/util/__plt_get_axis_arg__.m, scripts/plot/util/axes.m, scripts/plot/util/clf.m, scripts/plot/util/copyobj.m, scripts/plot/util/figure.m, scripts/plot/util/gcbo.m, scripts/plot/util/graphics_toolkit.m, scripts/plot/util/hggroup.m, scripts/plot/util/meshgrid.m, scripts/plot/util/newplot.m, scripts/plot/util/print.m, scripts/plot/util/private/__add_default_menu__.m, scripts/plot/util/private/__fltk_print__.m, scripts/plot/util/private/__gnuplot_print__.m, scripts/plot/util/private/__print_parse_opts__.m, scripts/plot/util/refreshdata.m, scripts/plot/util/subplot.m, scripts/polynomial/conv.m, scripts/polynomial/poly.m, scripts/polynomial/polyeig.m, scripts/polynomial/polyfit.m, scripts/polynomial/polyval.m, scripts/polynomial/private/__splinefit__.m, scripts/polynomial/spline.m, scripts/prefs/prefdir.m, scripts/prefs/preferences.m, scripts/prefs/private/prefsfile.m, scripts/prefs/rmpref.m, scripts/signal/freqz.m, scripts/signal/module.mk, scripts/sparse/eigs.m, scripts/sparse/pcg.m, scripts/sparse/private/__sprand_impl__.m, scripts/sparse/sprand.m, scripts/sparse/sprandn.m, scripts/sparse/spy.m, scripts/sparse/svds.m, scripts/specfun/expint.m, scripts/specfun/factor.m, scripts/special-matrix/gallery.m, scripts/special-matrix/hankel.m, scripts/special-matrix/toeplitz.m, scripts/startup/inputrc, scripts/statistics/base/kurtosis.m, scripts/statistics/base/moment.m, scripts/statistics/base/qqplot.m, scripts/statistics/base/var.m, scripts/statistics/distributions/betarnd.m, scripts/statistics/distributions/binoinv.m, scripts/statistics/distributions/binopdf.m, scripts/statistics/distributions/binornd.m, scripts/statistics/distributions/cauchy_rnd.m, scripts/statistics/distributions/chi2rnd.m, scripts/statistics/distributions/discrete_pdf.m, scripts/statistics/distributions/discrete_rnd.m, scripts/statistics/distributions/empirical_rnd.m, scripts/statistics/distributions/exprnd.m, scripts/statistics/distributions/frnd.m, scripts/statistics/distributions/gamrnd.m, scripts/statistics/distributions/geornd.m, scripts/statistics/distributions/hygernd.m, scripts/statistics/distributions/kolmogorov_smirnov_cdf.m, scripts/statistics/distributions/laplace_cdf.m, scripts/statistics/distributions/laplace_pdf.m, scripts/statistics/distributions/logistic_cdf.m, scripts/statistics/distributions/logistic_pdf.m, scripts/statistics/distributions/lognrnd.m, scripts/statistics/distributions/nbincdf.m, scripts/statistics/distributions/nbininv.m, scripts/statistics/distributions/nbinpdf.m, scripts/statistics/distributions/nbinrnd.m, scripts/statistics/distributions/normrnd.m, scripts/statistics/distributions/poissinv.m, scripts/statistics/distributions/poissrnd.m, scripts/statistics/distributions/tinv.m, scripts/statistics/distributions/trnd.m, scripts/statistics/distributions/unidcdf.m, scripts/statistics/distributions/unidpdf.m, scripts/statistics/distributions/unidrnd.m, scripts/statistics/distributions/unifrnd.m, scripts/statistics/distributions/wblrnd.m, scripts/statistics/models/module.mk, scripts/statistics/tests/kruskal_wallis_test.m, scripts/strings/base2dec.m, scripts/strings/deblank.m, scripts/strings/dec2base.m, scripts/strings/dec2bin.m, scripts/strings/dec2hex.m, scripts/strings/mat2str.m, scripts/strings/ostrsplit.m, scripts/strings/regexptranslate.m, scripts/strings/str2num.m, scripts/strings/strcat.m, scripts/strings/strjoin.m, scripts/strings/strsplit.m, scripts/strings/strtok.m, scripts/strings/strtrim.m, scripts/strings/strtrunc.m, scripts/strings/substr.m, scripts/testfun/__run_test_suite__.m, scripts/testfun/speed.m, scripts/testfun/test.m, scripts/time/asctime.m, scripts/time/datenum.m, scripts/time/datevec.m, scripts/time/weekday.m, src/Makefile.am, test/Makefile.am, test/build-bc-overload-tests.sh, test/build-sparse-tests.sh, test/jit.tst, test/line-continue.tst: Strip trailing whitespace.
author John W. Eaton <jwe@octave.org>
date Tue, 20 Jan 2015 08:26:57 -0500
parents 3e53eca42f00
children
comparison
equal deleted inserted replaced
19488:8dbd55742112 19627:446c46af4b42
38 // FIXME: We should not have a special case for Mac here. Instead, we 38 // FIXME: We should not have a special case for Mac here. Instead, we
39 // should be loading .keytab files at run time, and ideally, allowing 39 // should be loading .keytab files at run time, and ideally, allowing
40 // individual keys to be redefined from some preferences menu. 40 // individual keys to be redefined from some preferences menu.
41 41
42 //and this is default now translator - default.keytab from original Konsole 42 //and this is default now translator - default.keytab from original Konsole
43 const char* KeyboardTranslatorManager::defaultTranslatorText = 43 const char* KeyboardTranslatorManager::defaultTranslatorText =
44 #if defined (Q_OS_MAC) 44 #if defined (Q_OS_MAC)
45 #include "ExtendedDefaultTranslatorMac.h" 45 #include "ExtendedDefaultTranslatorMac.h"
46 #else 46 #else
47 #include "ExtendedDefaultTranslator.h" 47 #include "ExtendedDefaultTranslator.h"
48 #endif 48 #endif
115 // +".keytab"; 115 // +".keytab";
116 116
117 qDebug() << "Saving translator to" << path; 117 qDebug() << "Saving translator to" << path;
118 118
119 QFile destination(path); 119 QFile destination(path);
120 120
121 if (!destination.open(QIODevice::WriteOnly | QIODevice::Text)) 121 if (!destination.open(QIODevice::WriteOnly | QIODevice::Text))
122 { 122 {
123 qWarning() << "Unable to save keyboard translation:" 123 qWarning() << "Unable to save keyboard translation:"
124 << destination.errorString(); 124 << destination.errorString();
125 125
126 return false; 126 return false;
127 } 127 }
128 128
142 142
143 KeyboardTranslator* KeyboardTranslatorManager::loadTranslator(const QString& name) 143 KeyboardTranslator* KeyboardTranslatorManager::loadTranslator(const QString& name)
144 { 144 {
145 const QString& path = findTranslatorPath(name); 145 const QString& path = findTranslatorPath(name);
146 146
147 QFile source(path); 147 QFile source(path);
148 148
149 if (name.isEmpty() || !source.open(QIODevice::ReadOnly | QIODevice::Text)) 149 if (name.isEmpty() || !source.open(QIODevice::ReadOnly | QIODevice::Text))
150 return 0; 150 return 0;
151 151
152 return loadTranslator(&source,name); 152 return loadTranslator(&source,name);
153 } 153 }
166 KeyboardTranslator* KeyboardTranslatorManager::loadTranslator(QIODevice* source,const QString& name) 166 KeyboardTranslator* KeyboardTranslatorManager::loadTranslator(QIODevice* source,const QString& name)
167 { 167 {
168 KeyboardTranslator* translator = new KeyboardTranslator(name); 168 KeyboardTranslator* translator = new KeyboardTranslator(name);
169 KeyboardTranslatorReader reader(source); 169 KeyboardTranslatorReader reader(source);
170 translator->setDescription( reader.description() ); 170 translator->setDescription( reader.description() );
171 171
172 while ( reader.hasNextEntry() ) { 172 while ( reader.hasNextEntry() ) {
173 translator->addEntry(reader.nextEntry()); 173 translator->addEntry(reader.nextEntry());
174 } 174 }
175 175
176 source->close(); 176 source->close();
221 // - key KeySequence : CommandName 221 // - key KeySequence : CommandName
222 // 222 //
223 // KeySequence begins with the name of the key ( taken from the Qt::Key enum ) 223 // KeySequence begins with the name of the key ( taken from the Qt::Key enum )
224 // and is followed by the keyboard modifiers and state flags ( with + or - in front 224 // and is followed by the keyboard modifiers and state flags ( with + or - in front
225 // of each modifier or flag to indicate whether it is required ). All keyboard modifiers 225 // of each modifier or flag to indicate whether it is required ). All keyboard modifiers
226 // and flags are optional, if a particular modifier or state is not specified it is 226 // and flags are optional, if a particular modifier or state is not specified it is
227 // assumed not to be a part of the sequence. The key sequence may contain whitespace 227 // assumed not to be a part of the sequence. The key sequence may contain whitespace
228 // 228 //
229 // eg: "key Up+Shift : scrollLineUp" 229 // eg: "key Up+Shift : scrollLineUp"
230 // "key Next-Shift : "\E[6~" 230 // "key Next-Shift : "\E[6~"
231 // 231 //
248 } 248 }
249 } 249 }
250 250
251 readNext(); 251 readNext();
252 } 252 }
253 void KeyboardTranslatorReader::readNext() 253 void KeyboardTranslatorReader::readNext()
254 { 254 {
255 // find next entry 255 // find next entry
256 while ( !_source->atEnd() ) 256 while ( !_source->atEnd() )
257 { 257 {
258 const QList<Token>& tokens = tokenize( QString(_source->readLine()) ); 258 const QList<Token>& tokens = tokenize( QString(_source->readLine()) );
268 decodeSequence(tokens[1].text.toLower(), 268 decodeSequence(tokens[1].text.toLower(),
269 keyCode, 269 keyCode,
270 modifiers, 270 modifiers,
271 modifierMask, 271 modifierMask,
272 flags, 272 flags,
273 flagMask); 273 flagMask);
274 274
275 KeyboardTranslator::Command command = KeyboardTranslator::NoCommand; 275 KeyboardTranslator::Command command = KeyboardTranslator::NoCommand;
276 QByteArray text; 276 QByteArray text;
277 277
278 // get text or command 278 // get text or command
300 300
301 _hasNext = true; 301 _hasNext = true;
302 302
303 return; 303 return;
304 } 304 }
305 } 305 }
306 306
307 _hasNext = false; 307 _hasNext = false;
308 } 308 }
309 309
310 bool KeyboardTranslatorReader::parseAsCommand(const QString& text,KeyboardTranslator::Command& command) 310 bool KeyboardTranslatorReader::parseAsCommand(const QString& text,KeyboardTranslator::Command& command)
311 { 311 {
312 if ( text.compare("erase",Qt::CaseInsensitive) == 0 ) 312 if ( text.compare("erase",Qt::CaseInsensitive) == 0 )
313 command = KeyboardTranslator::EraseCommand; 313 command = KeyboardTranslator::EraseCommand;
314 else if ( text.compare("scrollpageup",Qt::CaseInsensitive) == 0 ) 314 else if ( text.compare("scrollpageup",Qt::CaseInsensitive) == 0 )
315 command = KeyboardTranslator::ScrollPageUpCommand; 315 command = KeyboardTranslator::ScrollPageUpCommand;
332 Qt::KeyboardModifiers& modifiers, 332 Qt::KeyboardModifiers& modifiers,
333 Qt::KeyboardModifiers& modifierMask, 333 Qt::KeyboardModifiers& modifierMask,
334 KeyboardTranslator::States& flags, 334 KeyboardTranslator::States& flags,
335 KeyboardTranslator::States& flagMask) 335 KeyboardTranslator::States& flagMask)
336 { 336 {
337 bool isWanted = true; 337 bool isWanted = true;
338 bool endOfItem = false; 338 bool endOfItem = false;
339 QString buffer; 339 QString buffer;
340 340
341 Qt::KeyboardModifiers tempModifiers = modifiers; 341 Qt::KeyboardModifiers tempModifiers = modifiers;
342 Qt::KeyboardModifiers tempModifierMask = modifierMask; 342 Qt::KeyboardModifiers tempModifierMask = modifierMask;
381 qDebug() << "Unable to parse key binding item:" << buffer; 381 qDebug() << "Unable to parse key binding item:" << buffer;
382 382
383 buffer.clear(); 383 buffer.clear();
384 } 384 }
385 385
386 // check if this is a wanted / not-wanted flag and update the 386 // check if this is a wanted / not-wanted flag and update the
387 // state ready for the next item 387 // state ready for the next item
388 if ( ch == '+' ) 388 if ( ch == '+' )
389 isWanted = true; 389 isWanted = true;
390 else if ( ch == '-' ) 390 else if ( ch == '-' )
391 isWanted = false; 391 isWanted = false;
392 } 392 }
393 393
394 modifiers = tempModifiers; 394 modifiers = tempModifiers;
395 modifierMask = tempModifierMask; 395 modifierMask = tempModifierMask;
396 flags = tempFlags; 396 flags = tempFlags;
397 flagMask = tempFlagMask; 397 flagMask = tempFlagMask;
462 } 462 }
463 bool KeyboardTranslatorReader::hasNextEntry() 463 bool KeyboardTranslatorReader::hasNextEntry()
464 { 464 {
465 return _hasNext; 465 return _hasNext;
466 } 466 }
467 KeyboardTranslator::Entry KeyboardTranslatorReader::createEntry( const QString& condition , 467 KeyboardTranslator::Entry KeyboardTranslatorReader::createEntry( const QString& condition ,
468 const QString& result ) 468 const QString& result )
469 { 469 {
470 QString entryString("keyboard \"temporary\"\nkey "); 470 QString entryString("keyboard \"temporary\"\nkey ");
471 entryString.append(condition); 471 entryString.append(condition);
472 entryString.append(" : "); 472 entryString.append(" : ");
492 entry = reader.nextEntry(); 492 entry = reader.nextEntry();
493 493
494 return entry; 494 return entry;
495 } 495 }
496 496
497 KeyboardTranslator::Entry KeyboardTranslatorReader::nextEntry() 497 KeyboardTranslator::Entry KeyboardTranslatorReader::nextEntry()
498 { 498 {
499 Q_ASSERT( _hasNext ); 499 Q_ASSERT( _hasNext );
500 500
501 501
502 KeyboardTranslator::Entry entry = _nextEntry; 502 KeyboardTranslator::Entry entry = _nextEntry;
544 544
545 if ( key.capturedTexts()[3].isEmpty() ) 545 if ( key.capturedTexts()[3].isEmpty() )
546 { 546 {
547 // capturedTexts()[2] is a command 547 // capturedTexts()[2] is a command
548 Token commandToken = { Token::Command , key.capturedTexts()[2] }; 548 Token commandToken = { Token::Command , key.capturedTexts()[2] };
549 list << commandToken; 549 list << commandToken;
550 } 550 }
551 else 551 else
552 { 552 {
553 // capturedTexts()[3] is the output string 553 // capturedTexts()[3] is the output string
554 Token outputToken = { Token::OutputText , key.capturedTexts()[3] }; 554 Token outputToken = { Token::OutputText , key.capturedTexts()[3] };
555 list << outputToken; 555 list << outputToken;
556 } 556 }
557 } 557 }
558 else 558 else
559 { 559 {
560 qWarning() << "Line in keyboard translator file could not be understood:" << text; 560 qWarning() << "Line in keyboard translator file could not be understood:" << text;
561 } 561 }
562 562
563 return list; 563 return list;
564 } 564 }
565 565
566 QList<QString> KeyboardTranslatorManager::allTranslators() 566 QList<QString> KeyboardTranslatorManager::allTranslators()
567 { 567 {
568 if ( !_haveLoadedAll ) 568 if ( !_haveLoadedAll )
569 { 569 {
570 findTranslators(); 570 findTranslators();
571 } 571 }
592 _stateMask == rhs._stateMask && 592 _stateMask == rhs._stateMask &&
593 _command == rhs._command && 593 _command == rhs._command &&
594 _text == rhs._text; 594 _text == rhs._text;
595 } 595 }
596 596
597 bool KeyboardTranslator::Entry::matches(int keyCode , 597 bool KeyboardTranslator::Entry::matches(int keyCode ,
598 Qt::KeyboardModifiers modifiers, 598 Qt::KeyboardModifiers modifiers,
599 States state) const 599 States state) const
600 { 600 {
601 if ( _keyCode != keyCode ) 601 if ( _keyCode != keyCode )
602 return false; 602 return false;
603 603
604 if ( (modifiers & _modifierMask) != (_modifiers & _modifierMask) ) 604 if ( (modifiers & _modifierMask) != (_modifiers & _modifierMask) )
605 return false; 605 return false;
606 606
607 // if modifiers is non-zero, the 'any modifier' state is implicit 607 // if modifiers is non-zero, the 'any modifier' state is implicit
608 if ( modifiers != 0 ) 608 if ( modifiers != 0 )
609 state |= AnyModifierState; 609 state |= AnyModifierState;
610 610
611 if ( (state & _stateMask) != (_state & _stateMask) ) 611 if ( (state & _stateMask) != (_state & _stateMask) )
612 return false; 612 return false;
613 613
614 // special handling for the 'Any Modifier' state, which checks for the presence of 614 // special handling for the 'Any Modifier' state, which checks for the presence of
615 // any or no modifiers. In this context, the 'keypad' modifier does not count. 615 // any or no modifiers. In this context, the 'keypad' modifier does not count.
616 bool anyModifiersSet = modifiers != 0 && modifiers != Qt::KeypadModifier; 616 bool anyModifiersSet = modifiers != 0 && modifiers != Qt::KeypadModifier;
617 if ( _stateMask & KeyboardTranslator::AnyModifierState ) 617 if ( _stateMask & KeyboardTranslator::AnyModifierState )
618 { 618 {
619 // test fails if any modifier is required but none are set 619 // test fails if any modifier is required but none are set
651 replacement = 'x'; 651 replacement = 'x';
652 } 652 }
653 653
654 if ( replacement == 'x' ) 654 if ( replacement == 'x' )
655 { 655 {
656 result.replace(i,1,"\\x"+QByteArray(1,ch).toInt(0, 16)); 656 result.replace(i,1,"\\x"+QByteArray(1,ch).toInt(0, 16));
657 } else if ( replacement != 0 ) 657 } else if ( replacement != 0 )
658 { 658 {
659 result.remove(i,1); 659 result.remove(i,1);
660 result.insert(i,'\\'); 660 result.insert(i,'\\');
661 result.insert(i+1,replacement); 661 result.insert(i+1,replacement);
712 712
713 if ( escapedChar ) 713 if ( escapedChar )
714 result.replace(i,charsToRemove,replacement); 714 result.replace(i,charsToRemove,replacement);
715 } 715 }
716 } 716 }
717 717
718 return result; 718 return result;
719 } 719 }
720 720
721 void KeyboardTranslator::Entry::insertModifier( QString& item , int modifier ) const 721 void KeyboardTranslator::Entry::insertModifier( QString& item , int modifier ) const
722 { 722 {
785 785
786 // add modifiers 786 // add modifiers
787 insertModifier( result , Qt::ShiftModifier ); 787 insertModifier( result , Qt::ShiftModifier );
788 insertModifier( result , Qt::ControlModifier ); 788 insertModifier( result , Qt::ControlModifier );
789 insertModifier( result , Qt::AltModifier ); 789 insertModifier( result , Qt::AltModifier );
790 insertModifier( result , Qt::MetaModifier ); 790 insertModifier( result , Qt::MetaModifier );
791 791
792 // add states 792 // add states
793 insertState( result , KeyboardTranslator::AlternateScreenState ); 793 insertState( result , KeyboardTranslator::AlternateScreenState );
794 insertState( result , KeyboardTranslator::NewLineState ); 794 insertState( result , KeyboardTranslator::NewLineState );
795 insertState( result , KeyboardTranslator::AnsiState ); 795 insertState( result , KeyboardTranslator::AnsiState );
802 KeyboardTranslator::KeyboardTranslator(const QString& name) 802 KeyboardTranslator::KeyboardTranslator(const QString& name)
803 : _name(name) 803 : _name(name)
804 { 804 {
805 } 805 }
806 806
807 void KeyboardTranslator::setDescription(const QString& description) 807 void KeyboardTranslator::setDescription(const QString& description)
808 { 808 {
809 _description = description; 809 _description = description;
810 } 810 }
811 QString KeyboardTranslator::description() const 811 QString KeyboardTranslator::description() const
812 { 812 {
844 KeyboardTranslator::Entry KeyboardTranslator::findEntry(int keyCode, Qt::KeyboardModifiers modifiers, States state) const 844 KeyboardTranslator::Entry KeyboardTranslator::findEntry(int keyCode, Qt::KeyboardModifiers modifiers, States state) const
845 { 845 {
846 if ( _entries.contains(keyCode) ) 846 if ( _entries.contains(keyCode) )
847 { 847 {
848 QList<Entry> entriesForKey = _entries.values(keyCode); 848 QList<Entry> entriesForKey = _entries.values(keyCode);
849 849
850 QListIterator<Entry> iter(entriesForKey); 850 QListIterator<Entry> iter(entriesForKey);
851 851
852 while (iter.hasNext()) 852 while (iter.hasNext())
853 { 853 {
854 const Entry& next = iter.next(); 854 const Entry& next = iter.next();
860 } 860 }
861 else 861 else
862 { 862 {
863 return Entry(); 863 return Entry();
864 } 864 }
865 865
866 } 866 }
867 void KeyboardTranslatorManager::addTranslator(KeyboardTranslator* translator) 867 void KeyboardTranslatorManager::addTranslator(KeyboardTranslator* translator)
868 { 868 {
869 _translators.insert(translator->name(),translator); 869 _translators.insert(translator->name(),translator);
870 870
879 // locate and delete 879 // locate and delete
880 QString path = findTranslatorPath(name); 880 QString path = findTranslatorPath(name);
881 if ( QFile::remove(path) ) 881 if ( QFile::remove(path) )
882 { 882 {
883 _translators.remove(name); 883 _translators.remove(name);
884 return true; 884 return true;
885 } 885 }
886 else 886 else
887 { 887 {
888 qWarning() << "Failed to remove translator - " << path; 888 qWarning() << "Failed to remove translator - " << path;
889 return false; 889 return false;