Compare commits
	
		
			1 Commits
		
	
	
		
			citadel-42
			...
			wip/carlos
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					44029116fc | 
@@ -2179,6 +2179,7 @@ meta_input_settings_get_pad_button_action (MetaInputSettings   *input_settings,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
static gboolean
 | 
					static gboolean
 | 
				
			||||||
cycle_logical_monitors (MetaInputSettings   *settings,
 | 
					cycle_logical_monitors (MetaInputSettings   *settings,
 | 
				
			||||||
 | 
					                        gboolean             skip_all_monitors,
 | 
				
			||||||
                        MetaLogicalMonitor  *current_logical_monitor,
 | 
					                        MetaLogicalMonitor  *current_logical_monitor,
 | 
				
			||||||
                        MetaLogicalMonitor **next_logical_monitor)
 | 
					                        MetaLogicalMonitor **next_logical_monitor)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
@@ -2188,7 +2189,8 @@ cycle_logical_monitors (MetaInputSettings   *settings,
 | 
				
			|||||||
  GList *logical_monitors;
 | 
					  GList *logical_monitors;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  /* We cycle between:
 | 
					  /* We cycle between:
 | 
				
			||||||
   * - the span of all monitors (current_output = NULL)
 | 
					   * - the span of all monitors (current_output = NULL), only for
 | 
				
			||||||
 | 
					   *   non-integrated devices.
 | 
				
			||||||
   * - each monitor individually.
 | 
					   * - each monitor individually.
 | 
				
			||||||
   */
 | 
					   */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -2206,6 +2208,8 @@ cycle_logical_monitors (MetaInputSettings   *settings,
 | 
				
			|||||||
      l = g_list_find (logical_monitors, current_logical_monitor);
 | 
					      l = g_list_find (logical_monitors, current_logical_monitor);
 | 
				
			||||||
      if (l->next)
 | 
					      if (l->next)
 | 
				
			||||||
        *next_logical_monitor = l->next->data;
 | 
					        *next_logical_monitor = l->next->data;
 | 
				
			||||||
 | 
					      else if (skip_all_monitors)
 | 
				
			||||||
 | 
					        *next_logical_monitor = logical_monitors->data;
 | 
				
			||||||
      else
 | 
					      else
 | 
				
			||||||
        *next_logical_monitor = NULL;
 | 
					        *next_logical_monitor = NULL;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
@@ -2221,6 +2225,7 @@ meta_input_settings_cycle_tablet_output (MetaInputSettings  *input_settings,
 | 
				
			|||||||
  DeviceMappingInfo *info;
 | 
					  DeviceMappingInfo *info;
 | 
				
			||||||
  MetaLogicalMonitor *logical_monitor = NULL;
 | 
					  MetaLogicalMonitor *logical_monitor = NULL;
 | 
				
			||||||
  const gchar *edid[4] = { 0 }, *pretty_name = NULL;
 | 
					  const gchar *edid[4] = { 0 }, *pretty_name = NULL;
 | 
				
			||||||
 | 
					  gboolean is_integrated_device = FALSE;
 | 
				
			||||||
#ifdef HAVE_LIBWACOM
 | 
					#ifdef HAVE_LIBWACOM
 | 
				
			||||||
  WacomDevice *wacom_device;
 | 
					  WacomDevice *wacom_device;
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
@@ -2239,11 +2244,9 @@ meta_input_settings_cycle_tablet_output (MetaInputSettings  *input_settings,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  if (wacom_device)
 | 
					  if (wacom_device)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
      /* Output rotation only makes sense on external tablets */
 | 
					 | 
				
			||||||
      if (libwacom_get_integration_flags (wacom_device) != WACOM_DEVICE_INTEGRATED_NONE)
 | 
					 | 
				
			||||||
        return;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
      pretty_name = libwacom_get_name (wacom_device);
 | 
					      pretty_name = libwacom_get_name (wacom_device);
 | 
				
			||||||
 | 
					      is_integrated_device =
 | 
				
			||||||
 | 
					        libwacom_get_integration_flags (wacom_device) != WACOM_DEVICE_INTEGRATED_NONE;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -2251,6 +2254,7 @@ meta_input_settings_cycle_tablet_output (MetaInputSettings  *input_settings,
 | 
				
			|||||||
                                    NULL, &logical_monitor);
 | 
					                                    NULL, &logical_monitor);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  if (!cycle_logical_monitors (input_settings,
 | 
					  if (!cycle_logical_monitors (input_settings,
 | 
				
			||||||
 | 
					                               is_integrated_device,
 | 
				
			||||||
                               logical_monitor,
 | 
					                               logical_monitor,
 | 
				
			||||||
                               &logical_monitor))
 | 
					                               &logical_monitor))
 | 
				
			||||||
    return;
 | 
					    return;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user