21c3d17ae1
fix merge/rebase mistake
2016-02-22 15:31:26 -05:00
d2a6fec03a
additional GTKOSX => __APPLE__ changes missed in previous commit
2016-02-22 15:31:25 -05:00
fbc985f913
set PrimaryModifier on OS X to match the actual bits used by GTK for Command
2016-02-22 15:31:24 -05:00
bc487bb4b0
replicate the remove-all-trailing whitespace commit(s) in master
2016-02-22 15:31:24 -05:00
589f2a1ab8
change suffix of keybinding files to ".keys" to avoid conflict with earlier versions.
...
Move some code around that should never have been inside libs/ardour to begin with.
2016-02-22 15:31:24 -05:00
949163f806
more changes to Bindings, Keyboard APIs
2016-02-22 15:31:24 -05:00
67e19c177f
radically change Keyboard/Binding API design to disconnect Gtk::Action lookup from binding definition
...
We need this because we need binding information/objects before all
Actions have been defined.
2016-02-22 15:31:24 -05:00
f028a6bffb
fix memory lifetime management issue
2016-02-22 15:31:24 -05:00
36023db8aa
change/extend/rework Bindings API to allow replacement and provide stub/hook/call to save bindings
2016-02-22 15:31:23 -05:00
04a9ce757c
initial compilable version of saving key bindings with "new" scheme
2016-02-22 15:31:23 -05:00
0f17508e6c
changes to Bindings and Keyboard API to support (mostly) GTK-free keyboard bindings
2016-02-22 15:31:23 -05:00
86d27a736c
better system for managing kbd focus after cmd-w closing a dialog.
...
Key, Button and Focus In events in the editor+mixer windows cause the respective window to be noted
as the window to which focus should return after a dialog is closed with cmd/ctrl-w
2016-02-22 14:03:55 -05:00
3a08ac5e1f
os x: an initial attempt at fixing loss of keyboard focus after cmd-w to close dialog
2016-02-22 11:49:17 -05:00
344cf05540
OS X: fix the handling of SUPER,HYPER,META (see code comment for more)
2016-02-21 10:48:35 -05:00
c92e822332
remove HYPER,SUPER,META modifier masks from Keyboard::RelevantModifierMask so that modifier_state_equals() works on OS X
...
GTK on OS X adds META when Command is pressed even though it also uses MOD2 to indicate COMMAND. So Cmd-w was actually META-MOD2-w and modifier_state_equals(MOD2)
would fail. This should have nothing but good side effects
2016-02-18 09:44:50 -05:00
dd7649a409
add a static utility function (should really be in utils.cc and public) to show modifier state in english; use said function
2016-02-18 09:43:03 -05:00
52e75f5a45
remove cruft
2015-10-20 15:49:59 +02:00
f1a6d7816d
remove unused "copy modifier hint"
2015-10-20 11:12:36 +02:00
nick_m
9511c9c86f
Add tooltips to user config preferences. clean up combo ordering.
2015-10-20 00:53:30 +11:00
2397429e99
use quotes for in-tree pbd/glib wrapper include
2015-10-05 22:15:18 +02:00
dc36b063bf
remove unused fstream includes
2015-10-05 22:15:18 +02:00
22b07e0233
NOOP, remove trailing tabs/whitespace.
2015-10-05 16:17:49 +02:00
4dc63966f0
globally remove all trailing whitespace from ardour code base.
...
Paul Davis was responsible for introducing almost all of this.
2015-10-04 14:51:05 -04:00
7ac691ec82
use pbd's gstdio compatibility wrapper
2015-09-17 14:37:57 +02:00
nick_m
e8a0b1c514
Swap default snap modifiers (non-OSX) to avoid potential upgrade pain.
...
- Disable snap now defaults to alt
- Snap absolute now defaults to alt-windows
2015-05-24 05:50:31 +10:00
nick_m
5d176eefa6
Make the prefs less squashed looking, add another entry for OSX modifiers.
...
- Defaults are probably still wrong, but at least they are actual
keys.
2015-05-21 23:47:32 +10:00
nick_m
186736043c
Move ui-centric modifiers into ArdourKeyboard, set some bad defaults.
...
- Also makes "Mod4" Appear as "Windows" and adds new combination
"Alt-Windows" to the dropdown.
- Attempt to set a pair of default snap modifiers (without
knowing what it actually is for OSX)
- Copy modifier now saves
- Snap modifier modifier problem still remains.
2015-05-21 05:32:23 +10:00
nick_m
ae0759ae88
Allow all drag -related modifiers to be set, re-instate "jump after trim"
...
- Copy modifier still doesn't save
- Testers please edit the Extra section of ~/.ardourN/config to allow
defaults to "take"
- Note that the current defaults overlap.
- warning - absolute snap modifier has no default and will be always
"on" unless you set it!
2015-05-21 01:30:57 +10:00
nick_m
66221d1dea
Add more modifier preferences.
...
Note that no defaults are set - go to prefs->user interaction to
ensure that nothing is set to "no modifer"
also - the copy modifier doesn't actually save its state yet.
2015-05-20 04:00:04 +10:00
nick_m
0d8a331bca
Remove some debugging.
2015-05-19 03:29:22 +10:00
nick_m
aac167a19f
"Lock" mode is now "Constrained", make snap absolute modifier configurable.
...
- user can abs/rel modifier key in prefs->user interaction
suggested for linux - absolute->alt ignore snap->alt-shift
- Constrained mode works the same as button 2 drag (initial move
sets constraint axis).
2015-05-18 06:25:36 +10:00
nick_m
35f69656e8
Window focus handling fixes.
...
Many windows were not getting key events.
Use magic focus infrastructure (built for widgets) to deliver key events
via window focus in/out.
2015-04-02 02:41:49 +11:00
8859ebe56e
add Gtkmm2ext::Keyboard::reset_bindings()
2014-07-10 11:04:04 -04:00
710ee36eaa
a few DEBUG_TRACE improvements
2013-09-16 22:02:36 -04:00
8e376f7a2a
Fix special handling of 'zoom vertical' scroll wheel modifier key.
...
gtkmm2ext/keyboard.cc has a special case to emit a signal on the key-up of
the modifier key used to adjust track heights in conjunction with the
scroll wheel, so that the same track continues to be resized even when
it's shrunk to no longer be under the mouse cursor. However, this code
assumed that the modifier key for this was <Shift>.
Fix it to use the event->state bit corresponding to
ScrollZoomVerticalModifier instead, and rename the relevant functions to
clarify that it's the 'zoom vertical' modifier key they're dealing with.
Partially fixes #5610 .
2013-07-23 16:42:34 +01:00
21914c884e
Make scroll-wheel modifier keys consistent in main editor window.
...
Add constants for the keyboard modifiers that should be used for vertical
zoom, horizontal zoom, and horizontal scrolling in the main editor window,
and use these where appropriate rather than using Keyboard::PrimaryModifier
and friends directly.
2013-06-21 20:13:44 +01:00
241a9edd3e
replace final(?) incidences of program name (ardour, Ardour) with PROGRAM_NAME (thanks to edgar for tracking them all down)
...
git-svn-id: svn://localhost/ardour2/branches/3.0@14050 d708f5d6-7413-0410-9779-e7cbd77b26cf
2013-02-05 18:18:35 +00:00
Carl Hetherington
95377c141c
Hacky fix for track height step losing 'grip' on the
...
track being resized (#4503 ).
git-svn-id: svn://localhost/ardour2/branches/3.0@12747 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-06-17 16:57:21 +00:00
Carl Hetherington
6a4628e50a
Use the same logic to decide on step size when scroll-wheeling faders in the mixer and knobs in the monitor section (part of #4726 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12510 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-31 18:04:47 +00:00
5c298dfef3
fix comment regarding keyboard modifiers on OS X
...
git-svn-id: svn://localhost/ardour2/branches/3.0@12501 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-05-31 14:01:46 +00:00
bef3ea1adc
MCP: F1-7 jump to a given view; F8 closes any currently open dialog; in zoom mode, up/down alter vertical track height of all tracks; option-up/down alters selected track heights
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11858 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-04-09 18:53:51 +00:00
f1638d365e
use MOD2 for command key on OS X, just like in 2.X
...
git-svn-id: svn://localhost/ardour2/branches/3.0@11716 d708f5d6-7413-0410-9779-e7cbd77b26cf
2012-03-16 21:53:06 +00:00
Carl Hetherington
23964284a4
Hopefully fix some i18n bugs ( #3565 ).
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10833 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-28 19:46:30 +00:00
9674867b9d
switch use of Option/Alt and Control on OS X for bindings. Option/Alt is intended by Apple to be used primarily (if not entirely) for entering alternate characters. Shift would be more conventional as 2ndary modified on OS X but that might have a few more implications than we want to deal with right now
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10481 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-07 19:19:31 +00:00
0938a42440
fixes for 98% of all the warnings/errors reported by OS X gcc on tiger
...
git-svn-id: svn://localhost/ardour2/branches/3.0@10179 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-09-30 17:55:14 +00:00
3f68aa2638
Make button 1 the default for inserting notes via modifier shortcut with select tool
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9667 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-06-02 03:17:35 +00:00
Carl Hetherington
7cf24873f8
Use PBD debugging code for keyboard debugging.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@9019 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-03-01 23:26:27 +00:00
Carl Hetherington
2304a51b85
Use an action's tooltip in the key editor if its label is empty; add some tooltips so that Solo / Monitor actions are not blank in the key editor.
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8909 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-02-20 17:29:52 +00:00
4624153d26
add static methods to Keyboard for keyboard modifier names
...
git-svn-id: svn://localhost/ardour2/branches/3.0@8364 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-12-29 16:27:43 +00:00
7c39d2171f
slightly more info when debugging the kbd snooper
...
git-svn-id: svn://localhost/ardour2/branches/3.0@7548 d708f5d6-7413-0410-9779-e7cbd77b26cf
2010-08-05 19:39:11 +00:00
