New upstream version 3.24.34

This commit is contained in:
Simon McVittie
2022-06-01 16:13:05 +01:00
473 changed files with 306973 additions and 738624 deletions

View File

@ -485,12 +485,12 @@ the <code class="literal">plus</code> symbol is shifted, so when comparing a key
8</pre></td>
<td class="listing_code"><pre class="programlisting"><span class="c1">// We want to ignore irrelevant modifiers like ScrollLock</span>
<span class="cp">#define ALL_ACCELS_MASK (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK)</span>
<span class="n">gdk_keymap_translate_keyboard_state</span> <span class="p">(</span><span class="n">keymap</span><span class="p">,</span> <span class="n">event</span><span class="o">-&gt;</span><span class="n">hardware_keycode</span><span class="p">,</span>
<span class="n">event</span><span class="o">-&gt;</span><span class="n">state</span><span class="p">,</span> <span class="n">event</span><span class="o">-&gt;</span><span class="n">group</span><span class="p">,</span>
<span class="o">&amp;</span><span class="n">keyval</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">,</span> <span class="nb">NULL</span><span class="p">,</span> <span class="o">&amp;</span><span class="n">consumed</span><span class="p">);</span>
<span class="k">if</span> <span class="p">(</span><span class="n">keyval</span> <span class="o">==</span> <span class="n">GDK_PLUS</span> <span class="o">&amp;&amp;</span>
<span class="p">(</span><span class="n">event</span><span class="o">-&gt;</span><span class="n">state</span> <span class="o">&amp;</span> <span class="o">~</span><span class="n">consumed</span> <span class="o">&amp;</span> <span class="n">ALL_ACCELS_MASK</span><span class="p">)</span> <span class="o">==</span> <span class="n">GDK_CONTROL_MASK</span><span class="p">)</span>
<span class="c1">// Control was pressed</span></pre></td>
<span class="n">gdk_keymap_translate_keyboard_state</span><span class="w"> </span><span class="p">(</span><span class="n">keymap</span><span class="p">,</span><span class="w"> </span><span class="n">event</span><span class="o">-&gt;</span><span class="n">hardware_keycode</span><span class="p">,</span><span class="w"></span>
<span class="w"> </span><span class="n">event</span><span class="o">-&gt;</span><span class="n">state</span><span class="p">,</span><span class="w"> </span><span class="n">event</span><span class="o">-&gt;</span><span class="n">group</span><span class="p">,</span><span class="w"></span>
<span class="w"> </span><span class="o">&amp;</span><span class="n">keyval</span><span class="p">,</span><span class="w"> </span><span class="nb">NULL</span><span class="p">,</span><span class="w"> </span><span class="nb">NULL</span><span class="p">,</span><span class="w"> </span><span class="o">&amp;</span><span class="n">consumed</span><span class="p">);</span><span class="w"></span>
<span class="k">if</span><span class="w"> </span><span class="p">(</span><span class="n">keyval</span><span class="w"> </span><span class="o">==</span><span class="w"> </span><span class="n">GDK_PLUS</span><span class="w"> </span><span class="o">&amp;&amp;</span><span class="w"></span>
<span class="w"> </span><span class="p">(</span><span class="n">event</span><span class="o">-&gt;</span><span class="n">state</span><span class="w"> </span><span class="o">&amp;</span><span class="w"> </span><span class="o">~</span><span class="n">consumed</span><span class="w"> </span><span class="o">&amp;</span><span class="w"> </span><span class="n">ALL_ACCELS_MASK</span><span class="p">)</span><span class="w"> </span><span class="o">==</span><span class="w"> </span><span class="n">GDK_CONTROL_MASK</span><span class="p">)</span><span class="w"></span>
<span class="w"> </span><span class="c1">// Control was pressed</span></pre></td>
</tr>
</tbody>
</table>
@ -511,9 +511,9 @@ modifiers, by doing:</p>
3
4</pre></td>
<td class="listing_code"><pre class="programlisting"><span class="c1">// XXX Dont do this XXX</span>
<span class="k">if</span> <span class="p">(</span><span class="n">keyval</span> <span class="o">==</span> <span class="n">accel_keyval</span> <span class="o">&amp;&amp;</span>
<span class="p">(</span><span class="n">event</span><span class="o">-&gt;</span><span class="n">state</span> <span class="o">&amp;</span> <span class="o">~</span><span class="n">consumed</span> <span class="o">&amp;</span> <span class="n">ALL_ACCELS_MASK</span><span class="p">)</span> <span class="o">==</span> <span class="p">(</span><span class="n">accel_mods</span> <span class="o">&amp;</span> <span class="o">~</span><span class="n">consumed</span><span class="p">))</span>
<span class="c1">// Accelerator was pressed</span></pre></td>
<span class="k">if</span><span class="w"> </span><span class="p">(</span><span class="n">keyval</span><span class="w"> </span><span class="o">==</span><span class="w"> </span><span class="n">accel_keyval</span><span class="w"> </span><span class="o">&amp;&amp;</span><span class="w"></span>
<span class="w"> </span><span class="p">(</span><span class="n">event</span><span class="o">-&gt;</span><span class="n">state</span><span class="w"> </span><span class="o">&amp;</span><span class="w"> </span><span class="o">~</span><span class="n">consumed</span><span class="w"> </span><span class="o">&amp;</span><span class="w"> </span><span class="n">ALL_ACCELS_MASK</span><span class="p">)</span><span class="w"> </span><span class="o">==</span><span class="w"> </span><span class="p">(</span><span class="n">accel_mods</span><span class="w"> </span><span class="o">&amp;</span><span class="w"> </span><span class="o">~</span><span class="n">consumed</span><span class="p">))</span><span class="w"></span>
<span class="w"> </span><span class="c1">// Accelerator was pressed</span></pre></td>
</tr>
</tbody>
</table>