Fix issue - keybinding with Super, Hyper and Meta Modifiers does not work.

Fix issue - keybinding with Super, Hyper and Meta Modifiers does not work.


BUG=None
TEST=Manually

[fujiwara, 2012-06-07 09:56:54]

https://codereview.appspot.com/6302047/diff/1/ui/gtk3/panel.vala
File ui/gtk3/panel.vala (right):

https://codereview.appspot.com/6302047/diff/1/ui/gtk3/panel.vala#newcode97
ui/gtk3/panel.vala:97: Gdk.Keymap.get_default().map_virtual_modifiers(ref
m_switch_modifiers);
In vala 0.16, ref causes an build error:

panel.vala:160.64-160.83: error: Argument 1: Cannot pass ref argument to
non-reference parameter
                Gdk.Keymap.get_default().map_virtual_modifiers(ref
switch_modifiers);
                                                              
^^^^^^^^^^^^^^^^^^^^

% grep map_virtual_modifiers /usr/share/vala-0.16/vapi/gdk-3.0.vapi
		public bool map_virtual_modifiers (out Gdk.ModifierType state);

s/ref/out/

But map_virtual_modifiers does not work in my test:

    Gtk.accelerator_parse("<Super>space",
            out switch_keysym, out switch_modifiers);
    print ("test %x %x\n", switch_keysym, switch_modifiers);
    Gdk.Keymap.get_default().map_virtual_modifiers(out switch_modifiers);
    print ("test2 %x %x\n", switch_keysym, switch_modifiers);

% ./a.out
test 20 4000000
test2 20 0

[fujiwara, 2012-06-07 12:01:14]

https://codereview.appspot.com/6302047/diff/5/ui/gtk3/keybindingmanager.vala
File ui/gtk3/keybindingmanager.vala (right):

https://codereview.appspot.com/6302047/diff/5/ui/gtk3/keybindingmanager.vala#...
ui/gtk3/keybindingmanager.vala:41: // Gdk.ModifierType.MOD5_MASK |  //
What is the last //?

[Peng, 2012-06-07 12:04:44]

On 2012/06/07 09:56:54, fujiwara wrote:
> https://codereview.appspot.com/6302047/diff/1/ui/gtk3/panel.vala
> File ui/gtk3/panel.vala (right):
> 
> https://codereview.appspot.com/6302047/diff/1/ui/gtk3/panel.vala#newcode97
> ui/gtk3/panel.vala:97: Gdk.Keymap.get_default().map_virtual_modifiers(ref
> m_switch_modifiers);
> In vala 0.16, ref causes an build error:
> 
> panel.vala:160.64-160.83: error: Argument 1: Cannot pass ref argument to
> non-reference parameter
>                 Gdk.Keymap.get_default().map_virtual_modifiers(ref
> switch_modifiers);
>                                                               
> ^^^^^^^^^^^^^^^^^^^^
> 
> % grep map_virtual_modifiers /usr/share/vala-0.16/vapi/gdk-3.0.vapi
> 		public bool map_virtual_modifiers (out Gdk.ModifierType state);
> 
> s/ref/out/
> 
> But map_virtual_modifiers does not work in my test:
> 
>     Gtk.accelerator_parse("<Super>space",
>             out switch_keysym, out switch_modifiers);
>     print ("test %x %x\n", switch_keysym, switch_modifiers);
>     Gdk.Keymap.get_default().map_virtual_modifiers(out switch_modifiers);
>     print ("test2 %x %x\n", switch_keysym, switch_modifiers);
> 
> % ./a.out
> test 20 4000000
> test2 20 0
Maybe it is because of ref/out change. I think the Gdk vapi has a bug. I use ref
in Gdk vapi file. Please try it.

[fujiwara, 2012-06-08 02:29:23]

On 2012/06/07 12:04:44, Peng wrote:
> On 2012/06/07 09:56:54, fujiwara wrote:
> > https://codereview.appspot.com/6302047/diff/1/ui/gtk3/panel.vala
> > File ui/gtk3/panel.vala (right):
> > 
> > https://codereview.appspot.com/6302047/diff/1/ui/gtk3/panel.vala#newcode97
> > ui/gtk3/panel.vala:97: Gdk.Keymap.get_default().map_virtual_modifiers(ref
> > m_switch_modifiers);
> > In vala 0.16, ref causes an build error:
> > 
> > panel.vala:160.64-160.83: error: Argument 1: Cannot pass ref argument to
> > non-reference parameter
> >                 Gdk.Keymap.get_default().map_virtual_modifiers(ref
> > switch_modifiers);
> >                                                               
> > ^^^^^^^^^^^^^^^^^^^^
> > 
> > % grep map_virtual_modifiers /usr/share/vala-0.16/vapi/gdk-3.0.vapi
> > 		public bool map_virtual_modifiers (out Gdk.ModifierType state);
> > 
> > s/ref/out/
> > 
> > But map_virtual_modifiers does not work in my test:
> > 
> >     Gtk.accelerator_parse("<Super>space",
> >             out switch_keysym, out switch_modifiers);
> >     print ("test %x %x\n", switch_keysym, switch_modifiers);
> >     Gdk.Keymap.get_default().map_virtual_modifiers(out switch_modifiers);
> >     print ("test2 %x %x\n", switch_keysym, switch_modifiers);
> > 
> > % ./a.out
> > test 20 4000000
> > test2 20 0
> Maybe it is because of ref/out change. I think the Gdk vapi has a bug. I use
ref
> in Gdk vapi file. Please try it.

OK, I confirmed the patch can work with modifying the gdk.vapi:
# diff /usr/share/vala-0.16/vapi/gdk-3.0.vapi.orig \
       /usr/share/vala-0.16/vapi/gdk-3.0.vapi
4776c4776
< 		public bool map_virtual_modifiers (out Gdk.ModifierType state);
---
> 		public bool map_virtual_modifiers (ref Gdk.ModifierType state);


Probably I think it's good to use '#if VALA_0_18' while I'm not sure if it will
be fixed in vala 0.18.

[fujiwara, 2012-06-08 02:36:24]

On 2012/06/08 02:29:23, fujiwara wrote:
> On 2012/06/07 12:04:44, Peng wrote:
> > On 2012/06/07 09:56:54, fujiwara wrote:
> > > https://codereview.appspot.com/6302047/diff/1/ui/gtk3/panel.vala
> > > File ui/gtk3/panel.vala (right):
> > > 
> > > https://codereview.appspot.com/6302047/diff/1/ui/gtk3/panel.vala#newcode97
> > > ui/gtk3/panel.vala:97: Gdk.Keymap.get_default().map_virtual_modifiers(ref
> > > m_switch_modifiers);
> > > In vala 0.16, ref causes an build error:
> > > 
> > > panel.vala:160.64-160.83: error: Argument 1: Cannot pass ref argument to
> > > non-reference parameter
> > >                 Gdk.Keymap.get_default().map_virtual_modifiers(ref
> > > switch_modifiers);
> > >                                                               
> > > ^^^^^^^^^^^^^^^^^^^^
> > > 
> > > % grep map_virtual_modifiers /usr/share/vala-0.16/vapi/gdk-3.0.vapi
> > > 		public bool map_virtual_modifiers (out Gdk.ModifierType state);
> > > 
> > > s/ref/out/
> > > 
> > > But map_virtual_modifiers does not work in my test:
> > > 
> > >     Gtk.accelerator_parse("<Super>space",
> > >             out switch_keysym, out switch_modifiers);
> > >     print ("test %x %x\n", switch_keysym, switch_modifiers);
> > >     Gdk.Keymap.get_default().map_virtual_modifiers(out switch_modifiers);
> > >     print ("test2 %x %x\n", switch_keysym, switch_modifiers);
> > > 
> > > % ./a.out
> > > test 20 4000000
> > > test2 20 0
> > Maybe it is because of ref/out change. I think the Gdk vapi has a bug. I use
> ref
> > in Gdk vapi file. Please try it.
> 
> OK, I confirmed the patch can work with modifying the gdk.vapi:
> # diff /usr/share/vala-0.16/vapi/gdk-3.0.vapi.orig \
>        /usr/share/vala-0.16/vapi/gdk-3.0.vapi
> 4776c4776
> < 		public bool map_virtual_modifiers (out Gdk.ModifierType state);
> ---
> > 		public bool map_virtual_modifiers (ref Gdk.ModifierType state);
> 
> 
> Probably I think it's good to use '#if VALA_0_18' while I'm not sure if it
will
> be fixed in vala 0.18.

lgtm.