Merge pull request #19606 from dterrahe/rotor_fallback

Rotor fallback and <focused> works in QAP

Author: TurboGit

src/bauhaus/bauhaus.c

@@ -3928,7 +3928,7 @@ static float _action_process_combo(gpointer target,
        ? DT_VALUE_PATTERN_ACTIVE : 0);
 }
 
-static gboolean _find_nth_bauhaus(GtkWidget **w,
+static gboolean _find_nth_bauhaus(gpointer *w,
                                   int *num,
                                   const dt_bauhaus_type_t type)
 {
@@ -3961,40 +3961,37 @@ static gboolean _find_nth_bauhaus(GtkWidget **w,
   return *num < 0;
 }
 
-static float _action_process_focus_slider(gpointer target,
+static float _action_process_focus_slider(gpointer widget,
                                           dt_action_element_t element,
                                           const dt_action_effect_t effect,
                                           const float move_size)
 {
-  GtkWidget *widget = ((dt_iop_module_t *)target)->widget;
   if(_find_nth_bauhaus(&widget, &element, DT_BAUHAUS_SLIDER))
     return _action_process_slider(widget, DT_ACTION_ELEMENT_VALUE, effect, move_size);
 
   if(DT_PERFORM_ACTION(move_size))
-    dt_action_widget_toast(target, NULL, _("not that many sliders"));
+    dt_action_widget_toast(&darktable.control->actions_focus, NULL, _("not that many sliders"));
   return DT_ACTION_NOT_VALID;
 }
 
-static float _action_process_focus_combo(gpointer target,
+static float _action_process_focus_combo(gpointer widget,
                                          dt_action_element_t element,
                                          const dt_action_effect_t effect,
                                          const float move_size)
 {
-  GtkWidget *widget = ((dt_iop_module_t *)target)->widget;
   if(_find_nth_bauhaus(&widget, &element, DT_BAUHAUS_COMBOBOX))
     return _action_process_combo(widget, DT_ACTION_ELEMENT_SELECTION, effect, move_size);
 
   if(DT_PERFORM_ACTION(move_size))
-    dt_action_widget_toast(target, NULL, _("not that many dropdowns"));
+    dt_action_widget_toast(&darktable.control->actions_focus, NULL, _("not that many dropdowns"));
   return DT_ACTION_NOT_VALID;
 }
 
-static float _action_process_focus_button(gpointer target,
+static float _action_process_focus_button(gpointer widget,
                                           dt_action_element_t element,
                                           const dt_action_effect_t effect,
                                           const float move_size)
 {
-  GtkWidget *widget = ((dt_iop_module_t *)target)->widget;
   if(_find_nth_bauhaus(&widget, &element, DT_BAUHAUS_BUTTON))
   {
     if(DT_PERFORM_ACTION(move_size))
@@ -4004,7 +4001,7 @@ static float _action_process_focus_button(gpointer target,
   }
 
   if(DT_PERFORM_ACTION(move_size))
-    dt_action_widget_toast(target, NULL, _("not that many buttons"));
+    dt_action_widget_toast(&darktable.control->actions_focus, NULL, _("not that many buttons"));
   return DT_ACTION_NOT_VALID;
 }
 

src/gui/accelerators.c

@@ -3591,6 +3591,33 @@ gboolean dt_action_widget_invisible(GtkWidget *w)
 #define ADD_EXPLANATION(cause, effect, extra, ...) if(*fb_log) \
       dt_util_str_cat(&*fb_log, "\n%s \u2192 %s" extra, cause, effect, ##__VA_ARGS__)
 
+static gboolean _unmatched_move(dt_shortcut_t *c,
+                                dt_shortcut_t *s,
+                                const dt_action_element_def_t **elements,
+                                char **fb_log)
+{
+  if(c->move == s->move) return FALSE;
+  if(!darktable.control->enable_fallbacks ||
+     !c->move_device || c->move > s->move) return TRUE; // don't try to match mouse moves
+  *elements = _action_find_elements(c->action);
+  if(!*elements) return TRUE;
+  int skipped = s->move - c->move;
+  if((*elements)[c->element].effects == (*elements)[c->element+1].effects)
+    s->element = c->element + skipped;
+  else
+  {
+    s->action = c->action;
+    dt_action_type_t tp = s->action->type;
+    while(skipped && (s->action = s->action->next))
+      if(s->action->type == tp) --skipped;
+    if(skipped) return TRUE;
+  }
+  ADD_EXPLANATION(_("move not assigned"), _("fallback to earlier move"), " %d -> %d", s->move, c->move);
+
+  s->move = c->move;
+  return FALSE;
+}
+
 static gboolean _shortcut_closest_match(GSequenceIter **current,
                                         dt_shortcut_t *s,
                                         gboolean *fully_matched,
@@ -3608,7 +3635,8 @@ static gboolean _shortcut_closest_match(GSequenceIter **current,
        c->key != s->key ||
        c->press < (s->press & ~DT_SHORTCUT_LONG) ||
        ((c->move_device || c->move) &&
-        (c->move_device != s->move_device || c->move != s->move)) ||
+        (c->move_device != s->move_device ||
+         _unmatched_move(c, s, elements, fb_log))) ||
        (s->action &&
         s->action->type == DT_ACTION_TYPE_FALLBACK &&
         s->action->target != c->action->target))
@@ -3622,7 +3650,6 @@ static gboolean _shortcut_closest_match(GSequenceIter **current,
           (c->button != s->button || c->click != s->click)) ||
          (c->mods       && c->mods != s->mods) ||
          (c->direction  & ~s->direction      ) ||
-         (c->element    && s->element        ) ||
          (c->effect > 0 && s->effect > 0     ) ||
          (c->instance   && s->instance       ) ||
          (c->element && s->effect > 0 && *elements &&
@@ -3645,10 +3672,10 @@ static gboolean _shortcut_closest_match(GSequenceIter **current,
   }
   if(!s->action || c->effect != DT_ACTION_EFFECT_DEFAULT_KEY)
     s->effect = c->effect;
-  if(c->element) s->element = c->element;
+  if(!s->element) s->element = c->element;
   if(c->instance) s->instance = c->instance;
 
-  s->action = c->action;
+  if(!s->action) s->action = c->action;
   if(!*elements) *elements = _action_find_elements(s->action);
 
   if(ELEMENT_IS(value, s, *elements) && c->effect == DT_ACTION_EFFECT_SET)
@@ -3780,19 +3807,20 @@ static float _process_action(dt_action_t *action,
   {
     // find module instance
     dt_iop_module_so_t *module = (dt_iop_module_so_t *)owner;
+    dt_iop_module_t *mod = NULL;
 
     if(owner == &darktable.control->actions_focus)
     {
-      action_target = dt_dev_gui_module();
+      action_target = dt_dev_modulegroups_test_activated(darktable.develop)
+                    ? (mod = dt_dev_gui_module()) ? (gpointer)mod->widget : NULL
+                    : dt_ui_get_container(darktable.gui->ui, DT_UI_CONTAINER_PANEL_RIGHT_CENTER);
       if(!action_target)
         return return_value;
     }
     else if(instance)
     {
       int current_instance = abs(instance);
 
-      dt_iop_module_t *mod = NULL;
-
       for(GList *iop_mods = instance >= 0
                           ? darktable.develop->iop
                           : g_list_last(darktable.develop->iop);

src/gui/gtk.c

@@ -3676,7 +3676,7 @@ static float _action_process_tabs(const gpointer target,
 static void _find_notebook(GtkWidget *widget,
                            GtkWidget **p)
 {
-  if(*p) return;
+  if(*p || !gtk_widget_get_visible(widget)) return;
   if(GTK_IS_NOTEBOOK(widget))
     *p = widget;
   else if(GTK_IS_CONTAINER(widget))
@@ -3688,14 +3688,14 @@ static float _action_process_focus_tabs(const gpointer target,
                                         const dt_action_effect_t effect,
                                         const float move_size)
 {
-  GtkWidget *widget = ((dt_iop_module_t *)target)->widget, *notebook = NULL;
-  _find_notebook(widget, &notebook);
+  GtkWidget *notebook = NULL;
+  _find_notebook(target, &notebook);
 
   if(notebook)
     return _action_process_tabs(notebook, element, effect, move_size);
 
   if(DT_PERFORM_ACTION(move_size))
-    dt_action_widget_toast(target, NULL, _("does not contain pages"));
+    dt_action_widget_toast(&darktable.control->actions_focus, NULL, _("does not contain pages"));
   return NAN;
 }
 

src/iop/atrous.c

@@ -1639,6 +1639,8 @@ static float _action_process_equalizer(gpointer target,
                                        const dt_action_effect_t effect,
                                        float move_size)
 {
+  if(element > BANDS) return DT_ACTION_NOT_VALID;
+
   dt_iop_module_t *self = g_object_get_data(G_OBJECT(target), "iop-instance");
   dt_iop_atrous_gui_data_t *g = self->gui_data;
   dt_iop_atrous_params_t *p = self->params;

src/iop/colorequal.c

@@ -2941,6 +2941,8 @@ static float _action_process_colorequal(const gpointer target,
                                         const dt_action_effect_t effect,
                                         const float move_size)
 {
+  if(element >= NODES) return DT_ACTION_NOT_VALID;
+
   const dt_iop_module_t *self = g_object_get_data(G_OBJECT(target), "iop-instance");
   const dt_iop_colorequal_gui_data_t *g = self->gui_data;
 

src/iop/colorzones.c

@@ -2497,14 +2497,16 @@ static float _action_process_zones(gpointer target,
                                    dt_action_effect_t effect,
                                    float move_size)
 {
+  if(element >= DT_IOP_COLORZONES_BANDS) return DT_ACTION_NOT_VALID;
+
   dt_iop_module_t *self = g_object_get_data(G_OBJECT(target), "iop-instance");
   dt_iop_colorzones_gui_data_t *g = self->gui_data;
   dt_iop_colorzones_params_t *p = self->params;
 
   const int ch = g->channel;
   const int nodes = p->curve_num_nodes[ch];
   dt_iop_colorzones_node_t *curve = p->curve[ch];
-  const float x = (float)element / 8.0;
+  const float x = (float)element / DT_IOP_COLORZONES_BANDS;
 
   gboolean close_enough = FALSE;
   int node = 0;

src/iop/rgblevels.c

@@ -969,6 +969,8 @@ static float _action_process(gpointer target,
                              const dt_action_effect_t effect,
                              float move_size)
 {
+  if(element >= DT_IOP_RGBLEVELS_MAX_CHANNELS) return DT_ACTION_NOT_VALID;
+
   dt_iop_module_t *self = g_object_get_data(G_OBJECT(target), "iop-instance");
   dt_iop_rgblevels_gui_data_t *g = self->gui_data;
   dt_iop_rgblevels_params_t *p = self->params;

src/libs/filters/colors.c

@@ -220,7 +220,7 @@ static gboolean _colors_enter_notify(GtkWidget *widget, GdkEventCrossing *event,
 
 static float _action_process_colors(gpointer target, dt_action_element_t element, dt_action_effect_t effect, float move_size)
 {
-  if(!target) return DT_ACTION_NOT_VALID;
+  if(!target || element >= DT_COLORLABELS_LAST + 2) return DT_ACTION_NOT_VALID;
 
   _widgets_colors_t *colors = g_object_get_data(G_OBJECT(target), "colors_self");
   GtkWidget *w = element ? colors->colors[element - 1] : colors->operator;