Merge lp:~didrocks/unity/launcher-fixes into lp:unity

[Didier Roche-Tolomelli]

This branch:
* Fix some false-positive when the check call isn't refresh on ws change (LP:
#730679)
* enable adding a new desktop file with the dbus call (LP: #670403)
* add another drag icon action: pressing for 500ms on a launcher icon would
decouple it from the Launcher. Clean some other code as well (LP: #727922)
* do some cleanup on the launcher code as well

[Mirco Müller (macslow)]

This branch disables the Press&Hold activation for the Quicklist.

review: Needs Fixing

[Didier Roche-Tolomelli (didrocks)]

As discussed on IRC, the Press&Hold should only happen with the touch framework, not the mouse one and it's not implemented yet.

[Mirco Müller (macslow)]

Ok, approved then. I only wish we would have not wasted time on this before.

review: Approve

=== modified file 'com.canonical.Unity.gschema.xml'
--- com.canonical.Unity.gschema.xml	2011-03-07 15:25:13 +0000
+++ com.canonical.Unity.gschema.xml	2011-03-16 10:54:46 +0000
@@ -14,7 +14,7 @@
   </schema>
 	<schema path="/desktop/unity/launcher/" id="com.canonical.Unity.Launcher" gettext-domain="unity">
     <key type="as" name="favorites">
-      <default>[ 'ubiquity-gtkui.desktop', 'nautilus-home.desktop', 'firefox.desktop', 'ubuntuone-control-panel-gtk.desktop', 'tomboy.desktop' ]</default>
+      <default>[ 'ubiquity-gtkui.desktop', 'nautilus-home.desktop', 'firefox.desktop', 'libreoffice-writer.desktop', 'libreoffice-calc.desktop', 'libreoffice-impress.desktop', 'ubuntu-software-center.desktop', 'ubuntuone-control-panel-gtk.desktop' ]</default>
       <summary>List of desktop file ids for favorites on the launcher.</summary>
       <description>These applications are shown in the Launcher by default.</description>
     </key>
 
=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-03-11 16:59:00 +0000
+++ src/Launcher.cpp	2011-03-16 10:54:46 +0000
@@ -51,6 +51,10 @@
 
 #define BACKLIGHT_STRENGTH  0.9f
 
+#define S_DBUS_NAME  "com.canonical.Unity.Launcher"
+#define S_DBUS_PATH  "/com/canonical/Unity/Launcher"
+#define S_DBUS_IFACE "com.canonical.Unity.Launcher"
+
 NUX_IMPLEMENT_OBJECT_TYPE (Launcher);
 
 int
@@ -72,6 +76,30 @@
   timeref->tv_nsec -= remove * 1000000;
 }
 
+const gchar Launcher::introspection_xml[] =
+  "<node>"
+  "  <interface name='com.canonical.Unity.Launcher'>"
+  ""
+  "    <method name='AddLauncherItemFromPosition'>"
+  "      <arg type='s' name='icon' direction='in'/>"
+  "      <arg type='s' name='title' direction='in'/>"
+  "      <arg type='i' name='icon_x' direction='in'/>"
+  "      <arg type='i' name='icon_y' direction='in'/>"
+  "      <arg type='i' name='icon_size' direction='in'/>"
+  "      <arg type='s' name='desktop_file' direction='in'/>"
+  "      <arg type='s' name='aptdaemon_task' direction='in'/>"
+  "    </method>"
+  ""
+  "  </interface>"
+  "</node>";
+  
+GDBusInterfaceVTable Launcher::interface_vtable =
+{
+  Launcher::handle_dbus_method_call,
+  NULL,
+  NULL
+};
+
 
 /*
 	        Use this shader to pass vertices in screen coordinates in the C++ code and compute use
@@ -303,9 +331,8 @@
     _autohide_handle        = 0;
     _autoscroll_handle      = 0;
     _redraw_handle          = 0;
+    _start_dragicon_handle  = 0;
     _focus_keynav_handle    = 0;
-    _single_finger_hold_handle = 0;
-    _single_finger_hold_timer  = NULL;
     _floating               = false;
     _hovered                = false;
     _hidden                 = false;
@@ -355,6 +382,15 @@
     ubus_server_register_interest (ubus, UBUS_LAUNCHER_ACTION_DONE,
                                    (UBusCallback)&Launcher::OnActionDone,
                                    this);
+    
+    _dbus_owner = g_bus_own_name (G_BUS_TYPE_SESSION,
+                                  S_DBUS_NAME,
+                                  (GBusNameOwnerFlags) (G_BUS_NAME_OWNER_FLAGS_REPLACE | G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT),
+                                  OnBusAcquired,
+                                  OnNameAcquired,
+                                  OnNameLost,
+                                  this,
+                                  NULL);
 
     SetDndEnabled (false, true);
 }
@@ -366,6 +402,7 @@
     if (_superkey_labels[i])
       _superkey_labels[i]->UnReference ();
   }
+  g_bus_unown_name (_dbus_owner);
 }
 
 /* Introspection */
@@ -608,11 +645,6 @@
     return pow (1.0f - CLAMP ((float) (TimeDelta (&current, &_times[TIME_DRAG_END])) / (float) ANIM_DURATION_LONG, 0.0f, 1.0f), 2);
 }
 
-float Launcher::DnDStartProgress (struct timespec const &current)
-{
-  return CLAMP ((float) (TimeDelta (&current, &_times[TIME_DRAG_START])) / (float) ANIM_DURATION, 0.0f, 1.0f);
-}
-
 float Launcher::AutohideProgress (struct timespec const &current)
 {
     
@@ -624,7 +656,7 @@
           return 0.0f;
           
         // "dead" zone
-        if ((_trigger_mouse_position.x < 2) && (_trigger_mouse_position.y < 2))
+        if ((_trigger_mouse_position.x < 3) && (_trigger_mouse_position.y < 3))
             return GetAutohidePositionMin ();
         
        /* 
@@ -749,10 +781,6 @@
     // hover out animation
     if (TimeDelta (&current, &_times[TIME_LEAVE]) < ANIM_DURATION)
         return true;
-  
-    // drag start animation
-    if (TimeDelta (&current, &_times[TIME_DRAG_START]) < ANIM_DURATION)
-        return true;
     
     // drag end animation
     if (TimeDelta (&current, &_times[TIME_DRAG_END]) < ANIM_DURATION_LONG)
@@ -1442,7 +1470,7 @@
 {
     if (hidden == _hidden)
         return;
-    
+        
     // auto lock/unlock the launcher depending on the state switch
     if (hidden)
     {
@@ -1487,21 +1515,6 @@
   return _mouse_position.y;
 }
 
-gboolean
-Launcher::SingleFingerHoldTimeout (gpointer data)
-{
-  Launcher*     self          = NULL;
-  LauncherIcon* launcher_icon = NULL;
-
-  self = (Launcher*) data;
-  launcher_icon = self->MouseIconIntersection (self->GetMouseX (),
-                                               self->GetMouseY ());
-  if (launcher_icon)
-    launcher_icon->OpenQuicklist ();
-
-  return false;
-}
-
 gboolean Launcher::DrawLauncherTimeout (gpointer data)
 {
     Launcher *self = (Launcher*) data;
@@ -1542,7 +1555,7 @@
   if (!window || !(window->type () & intersect_types) || !window->isMapped () || !window->isViewable ())
     return false;
 
-  if (CompRegion (window->serverInputRect ()).intersects (CompRect (geo.x, geo.y, geo.width, geo.height)))
+  if (CompRegion (window->inputRect ()).intersects (CompRect (geo.x, geo.y, geo.width, geo.height)))
     return true;
 
   return false;
@@ -2337,42 +2350,31 @@
     guint64 shortcut = arg.icon->GetShortcut ();
 
     /* deal with dynamic labels for places, which can be set via the locale */
-    if (shortcut != 0 && !g_ascii_isdigit ((gchar) shortcut))
-    {
-      RenderIcon (GfxContext,
-                  arg,
-                  arg.icon->GetSuperkeyLabel ()->GetDeviceTexture (),
-                  nux::Color (0xFFFFFFFF),
-                  arg.alpha,
-                  arg.icon->_xform_coords["Tile"]);
-    }
-    else
-    {
-      /* deal with the hardcoded labels used for the first 10 icons on the launcher */
-      gchar key   = (gchar) shortcut;
-      int   index = -1;
-
-      switch (key)
+    if (shortcut != 0)
+    {
+      if (!g_ascii_isdigit ((gchar) shortcut))
       {
-        case '1': index = 0; break;
-        case '2': index = 1; break;
-        case '3': index = 2; break;
-        case '4': index = 3; break;
-        case '5': index = 4; break;
-        case '6': index = 5; break;
-        case '7': index = 6; break;
-        case '8': index = 7; break;
-        case '9': index = 8; break;
-        case '0': index = 9; break;
+        RenderIcon (GfxContext,
+                    arg,
+                    arg.icon->GetSuperkeyLabel ()->GetDeviceTexture (),
+                    nux::Color (0xFFFFFFFF),
+                    arg.alpha,
+                    arg.icon->_xform_coords["Tile"]);
       }
-
-      if (index != -1)
+      else
+      {
+        /* deal with the hardcoded labels used for the first 10 icons on the launcher */
+        gchar *shortcut_str = g_strdup_printf ("%c", (gchar)shortcut);
+        int index = (atoi (shortcut_str) + 9) % 10; // Not -1 as -1 % 10 = -1…
+        g_free (shortcut_str);
+        
         RenderIcon (GfxContext,
                     arg,
                     _superkey_labels[index]->GetDeviceTexture (),
                     nux::Color (0xFFFFFFFF),
                     arg.alpha,
                     arg.icon->_xform_coords["Tile"]);
+      }
     }
   }
 }
@@ -2499,6 +2501,31 @@
   EnsureAnimation ();
 }
 
+
+gboolean Launcher::StartIconDragTimeout (gpointer data)
+{
+    Launcher *self = (Launcher*) data;
+    
+    // if we are still waiting…
+    if (self->GetActionState () == ACTION_NONE)
+      self->StartIconDragRequest (self->GetMouseX (), self->GetMouseY ());
+    return false;    
+}
+
+void Launcher::StartIconDragRequest (int x, int y)
+{
+  LauncherIcon *drag_icon = MouseIconIntersection ((int) (GetGeometry ().x / 2.0f), y);
+  
+  // FIXME: nux doesn't give nux::GetEventButton (button_flags) there, relying
+  // on an internal Launcher property then
+  if (drag_icon && (_last_button_press == 1) && _model->IconHasSister (drag_icon))
+  {
+    StartIconDrag (drag_icon);
+    SetActionState (ACTION_DRAG_ICON);
+    UpdateDragWindowPosition (x, y);
+  } 
+}
+
 void Launcher::StartIconDrag (LauncherIcon *icon)
 {
   if (!icon)
@@ -2612,8 +2639,6 @@
 
   if (GetActionState () == ACTION_NONE)
   {
-    SetTimeStruct (&_times[TIME_DRAG_START]);
-    
     if (nux::Abs (_dnd_delta_y) >= nux::Abs (_dnd_delta_x))
     {
       _launcher_drag_delta += _dnd_delta_y;
@@ -2621,17 +2646,7 @@
     }
     else
     {
-      LauncherIcon *drag_icon = MouseIconIntersection ((int) (GetGeometry ().x / 2.0f), y);
-      
-      // FIXME: nux doesn't give nux::GetEventButton (button_flags) there, relying
-      // on an internal Launcher property then
-      if (drag_icon && (_last_button_press == 1) && _model->IconHasSister (drag_icon))
-      {
-        StartIconDrag (drag_icon);
-        SetActionState (ACTION_DRAG_ICON);
-        UpdateDragWindowPosition (x, y);
-      }
-
+      StartIconDragRequest (x, y);
     }
   }
   else if (GetActionState () == ACTION_DRAG_LAUNCHER)
@@ -2883,21 +2898,14 @@
   LauncherIcon* launcher_icon = 0;
   launcher_icon = MouseIconIntersection (_mouse_position.x, _mouse_position.y);
 
-  // this takes care of the one-finger-hold "event" on a launcher-icon
-  if (_single_finger_hold_handle == 0)
-  {
-    _single_finger_hold_handle = g_timeout_add (SINGLE_FINGER_HOLD_DURATION,
-                                                &Launcher::SingleFingerHoldTimeout,
-                                                this);
-    if (_single_finger_hold_timer)
-      g_timer_destroy (_single_finger_hold_timer);
-
-    _single_finger_hold_timer = g_timer_new ();
-  }
-
   if (launcher_icon)
   {
     _icon_mouse_down = launcher_icon;
+    // if MouseUp after the time ended -> it's an icon drag, otherwise, it's starting an app
+    if (_start_dragicon_handle > 0)
+      g_source_remove (_start_dragicon_handle);
+    _start_dragicon_handle = g_timeout_add (START_DRAGICON_DURATION, &Launcher::StartIconDragTimeout, this);
+    
     launcher_icon->MouseDown.emit (nux::GetEventButton (button_flags));
   }
 }
@@ -2905,59 +2913,20 @@
 void Launcher::MouseUpLogic (int x, int y, unsigned long button_flags, unsigned long key_flags)
 {
   LauncherIcon* launcher_icon = 0;
+  
   launcher_icon = MouseIconIntersection (_mouse_position.x, _mouse_position.y);
-
-  // this takes care of the one-finger-hold "event" on a launcher-icon
-  if (_single_finger_hold_timer)
-  {
-    // user "released" before single-finger-hold threshold
-    if (g_timer_elapsed (_single_finger_hold_timer, NULL) < (float) SINGLE_FINGER_HOLD_DURATION / 1000.0)
-    {
-
-      // remove callback
-      if (_single_finger_hold_handle > 0)
-      {
-        g_source_remove (_single_finger_hold_handle);
-        _single_finger_hold_handle = 0;
-      }
-    }
-    // user "released" after single-finger-hold threshold...
-    else
-    {
-      // remove timer
-      g_timer_destroy (_single_finger_hold_timer);
-      _single_finger_hold_timer = NULL;
-
-      // remove callback
-      if (_single_finger_hold_handle > 0)
-      {
-        g_source_remove (_single_finger_hold_handle);
-        _single_finger_hold_handle = 0;
-      }
-
-      // ... don't start app, just return
-      _icon_mouse_down = 0;
-      return;
-    }
-
-    // remove timer
-    g_timer_destroy (_single_finger_hold_timer);
-    _single_finger_hold_timer = NULL;
-
-    // remove callback
-    if (_single_finger_hold_handle > 0)
-    {
-      g_source_remove (_single_finger_hold_handle);
-      _single_finger_hold_handle = 0;
-    }
-  }
+  
+  if (_start_dragicon_handle > 0)
+      g_source_remove (_start_dragicon_handle);
+  _start_dragicon_handle = 0;
 
   if (_icon_mouse_down && (_icon_mouse_down == launcher_icon))
   {
     _icon_mouse_down->MouseUp.emit (nux::GetEventButton (button_flags));
 
-    if (GetActionState () == ACTION_NONE)
+    if (GetActionState () == ACTION_NONE) {
       _icon_mouse_down->MouseClick.emit (nux::GetEventButton (button_flags));
+    }
   }
 
   if (launcher_icon && (_icon_mouse_down != launcher_icon))
@@ -3658,7 +3627,7 @@
     
     if (path)
     {
-      launcher_dropped.emit (path, _dnd_hovered_icon);
+      launcher_addrequest.emit (path, _dnd_hovered_icon);
       g_free (path);
     }
   }
@@ -3696,3 +3665,83 @@
   else
     return NULL;
 }
+
+/* dbus handlers */
+
+void
+Launcher::handle_dbus_method_call (GDBusConnection       *connection,
+                                   const gchar           *sender,
+                                   const gchar           *object_path,
+                                   const gchar           *interface_name,
+                                   const gchar           *method_name,
+                                   GVariant              *parameters,
+                                   GDBusMethodInvocation *invocation,
+                                   gpointer               user_data)
+{
+
+  if (g_strcmp0 (method_name, "AddLauncherItemFromPosition") == 0)
+  {
+    gchar  *icon;
+    gchar  *title;
+    gint32  icon_x;
+    gint32  icon_y;
+    gint32  icon_size;
+    gchar  *desktop_file;   
+    gchar  *aptdaemon_task;
+    
+    g_variant_get (parameters, "(ssiiiss)", &icon, &title, &icon_x, &icon_y, &icon_size, &desktop_file, &aptdaemon_task, NULL);
+    
+    Launcher *self = (Launcher*)user_data;
+    self->launcher_addrequest.emit (desktop_file, NULL);
+    
+    g_dbus_method_invocation_return_value (invocation, NULL);
+    g_free (icon);
+    g_free (title);
+    g_free (desktop_file);
+    g_free (aptdaemon_task);
+  }
+  
+}
+
+void
+Launcher::OnBusAcquired (GDBusConnection *connection,
+                         const gchar     *name,
+                         gpointer         user_data)
+{
+  GDBusNodeInfo *introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
+  guint registration_id;
+  
+  if (!introspection_data) {
+    g_warning ("No introspection data loaded. Won't get dynamic launcher addition.");
+    return;
+  }
+  
+  
+  
+  registration_id = g_dbus_connection_register_object (connection,
+                                                       S_DBUS_PATH,
+                                                       introspection_data->interfaces[0],
+                                                       &interface_vtable,
+                                                       user_data,
+                                                       NULL,
+                                                       NULL);
+  if (!registration_id)
+    g_warning ("Object registration failed. Won't get dynamic launcher addition.");
+  
+}
+
+void
+Launcher::OnNameAcquired (GDBusConnection *connection,
+                          const gchar     *name,
+                          gpointer         user_data)
+{
+  g_debug ("Acquired the name %s on the session bus\n", name);
+}
+
+void
+Launcher::OnNameLost (GDBusConnection *connection,
+                       const gchar     *name,
+                       gpointer         user_data)
+{
+  g_debug ("Lost the name %s on the session bus\n", name);
+}
 
=== modified file 'src/Launcher.h'
--- src/Launcher.h	2011-03-07 17:02:59 +0000
+++ src/Launcher.h	2011-03-16 10:54:46 +0000
@@ -39,7 +39,7 @@
 #define ANIM_DURATION_LONG  350
 
 #define SUPER_TAP_DURATION  250
-#define SINGLE_FINGER_HOLD_DURATION 1000
+#define START_DRAGICON_DURATION 500
 
 #define MAX_SUPERKEY_LABELS 10
 
@@ -154,8 +154,10 @@
 
   int GetMouseX ();
   int GetMouseY ();
+  
+  void CheckWindowOverLauncher ();
 
-  sigc::signal<void, char *, LauncherIcon *> launcher_dropped;
+  sigc::signal<void, char *, LauncherIcon *> launcher_addrequest;
   sigc::signal<void> selection_change;
 protected:
   // Introspectable methods
@@ -179,7 +181,6 @@
   {
     TIME_ENTER,
     TIME_LEAVE,
-    TIME_DRAG_START,
     TIME_DRAG_END,
     TIME_DRAG_THRESHOLD,
     TIME_AUTOHIDE,
@@ -223,7 +224,7 @@
   static gboolean DrawLauncherTimeout (gpointer data);
   static gboolean StrutHack (gpointer data);
   static gboolean MoveFocusToKeyNavModeTimeout (gpointer data);
-  static gboolean SingleFingerHoldTimeout (gpointer data);
+  static gboolean StartIconDragTimeout (gpointer data);
 
   void SetMousePosition (int x, int y);
   
@@ -252,7 +253,6 @@
   static gboolean OnScrollTimeout (gpointer data);
   static gboolean OnUpdateDragManagerTimeout (gpointer data);
 
-  void CheckWindowOverLauncher ();
   bool CheckIntersectWindow (CompWindow *window);
 
   float DnDStartProgress             (struct timespec const &current);
@@ -343,6 +343,7 @@
   void MouseDownLogic (int x, int y, unsigned long button_flags, unsigned long key_flags);
   void MouseUpLogic (int x, int y, unsigned long button_flags, unsigned long key_flags);
   
+  void StartIconDragRequest (int x, int y);
   void StartIconDrag (LauncherIcon *icon);
   void EndIconDrag ();
   void UpdateDragWindowPosition (int x, int y);
@@ -461,8 +462,7 @@
   guint _autoscroll_handle;
   guint _focus_keynav_handle;
   guint _redraw_handle;
-  guint _single_finger_hold_handle;
-  GTimer* _single_finger_hold_timer;
+  guint _start_dragicon_handle;
 
   nux::Point2   _mouse_position;
   nux::Point2   _trigger_mouse_position;
@@ -483,6 +483,23 @@
   LauncherIcon     *_dnd_hovered_icon;
   
   Atom              _selection_atom;
+
+  /* gdbus */
+  guint                       _dbus_owner;
+  static const gchar          introspection_xml[];
+  static GDBusInterfaceVTable interface_vtable;
+  
+  static void OnBusAcquired  (GDBusConnection *connection, const gchar *name, gpointer user_data);
+  static void OnNameAcquired (GDBusConnection *connection, const gchar *name, gpointer user_data);
+  static void OnNameLost    (GDBusConnection *connection, const gchar *name, gpointer user_data);
+  static void handle_dbus_method_call (GDBusConnection       *connection,
+                                       const gchar           *sender,
+                                       const gchar           *object_path,
+                                       const gchar           *interface_name,
+                                       const gchar           *method_name,
+                                       GVariant              *parameters,
+                                       GDBusMethodInvocation *invocation,
+                                       gpointer               user_data);
   
   struct timespec  _times[TIME_LAST];
 };
 
=== modified file 'src/LauncherController.cpp'
--- src/LauncherController.cpp	2011-02-28 15:51:59 +0000
+++ src/LauncherController.cpp	2011-03-16 10:54:46 +0000
@@ -38,7 +38,7 @@
   _sort_priority = 0;
   
   _launcher->SetModel (_model);
-  _launcher->launcher_dropped.connect (sigc::mem_fun (this, &LauncherController::OnLauncherDropped));
+  _launcher->launcher_addrequest.connect (sigc::mem_fun (this, &LauncherController::OnLauncherAddRequest));
   _favorite_store = FavoriteStore::GetDefault ();
 
   _place_section = new PlaceLauncherSection (_launcher);
@@ -69,7 +69,7 @@
 }
 
 void
-LauncherController::OnLauncherDropped (char *path, LauncherIcon *before)
+LauncherController::OnLauncherAddRequest (char *path, LauncherIcon *before)
 {
   std::list<BamfLauncherIcon *> launchers;
   std::list<BamfLauncherIcon *>::iterator it;
@@ -85,7 +85,8 @@
   if (result)
   {
     RegisterIcon (result);
-    _model->ReorderBefore (result, before, false);
+    if (before)
+      _model->ReorderBefore (result, before, false);
   }
 }
 
 
=== modified file 'src/LauncherController.h'
--- src/LauncherController.h	2011-02-15 22:51:36 +0000
+++ src/LauncherController.h	2011-03-16 10:54:46 +0000
@@ -69,7 +69,7 @@
 
     void OnIconAdded (LauncherIcon *icon);
     
-    void OnLauncherDropped (char *path, LauncherIcon *before);
+    void OnLauncherAddRequest (char *path, LauncherIcon *before);
 
     void OnLauncerEntryRemoteAdded   (LauncherEntryRemote *entry);
     void OnLauncerEntryRemoteRemoved (LauncherEntryRemote *entry);
 
=== modified file 'src/unityshell.cpp'
--- src/unityshell.cpp	2011-03-10 15:39:00 +0000
+++ src/unityshell.cpp	2011-03-16 10:54:46 +0000
@@ -210,6 +210,23 @@
   }
 }
 
+void
+UnityScreen::handleCompizEvent (const char          *plugin,
+                                const char          *event,
+                                CompOption::Vector  &option)
+{
+  if (strcmp (event, "end_viewport_switch") == 0)
+  {
+    // compute again the list of all window on the new viewport
+    // to decide if we should or not hide the launcher
+    launcher->CheckWindowOverLauncher ();
+  }
+
+    
+  screen->handleCompizEvent (plugin, event, option);
+  
+}
+
 bool
 UnityScreen::showLauncherKeyInitiate (CompAction         *action,
                                       CompAction::State   state,
 
=== modified file 'src/unityshell.h'
--- src/unityshell.h	2011-03-09 19:12:37 +0000
+++ src/unityshell.h	2011-03-16 10:54:46 +0000
@@ -95,6 +95,9 @@
 
 	/* handle X11 events */
 	void handleEvent (XEvent *);
+    void handleCompizEvent (const char          *plugin,
+                            const char          *event,
+                            CompOption::Vector  &option);
 	
 	bool
 	showLauncherKeyInitiate (CompAction *action, CompAction::State state,