shell-app: Finish startup sequence for process that exit too early

If a process associated to an application declaring StartupNotify=true
in its desktop file exits before having ever mapped a top level window,
the "remove" X message expected as per the Startup Notification Spec [1]
won't ever be issued, and the shell will keep waiting for a while until
the sequence is finished on time out.

This provides a confusing and bad experience since things like a confusing
icon + a spinner, or the mouse pointer switching to a spinning cursor, will
be showing up in the meantime, so we need to detect those situations and
make sure the sequence gets completed, and the app moved to STOPPED.

[1] https://www.freedesktop.org/wiki/Specifications/startup-notification-spec

Closes: #267

js/misc/keyboardManager.js

@@ -89,6 +89,8 @@ var KeyboardManager = new Lang.Class({
     },
 
     setUserLayouts(ids) {
+        let currentId = this._current ? this._current.id : null;
+        let currentGroupIndex = this._current ? this._current.groupIndex : null;
         this._current = null;
         this._layoutInfos = {};
 
@@ -115,6 +117,9 @@ var KeyboardManager = new Lang.Class({
             info.group = group;
             info.groupIndex = groupIndex;
 
+            if (currentId == id && currentGroupIndex == groupIndex)
+                this._current = info;
+
             i += 1;
         }
     },

js/perf/hwtest.js

@@ -136,8 +136,7 @@ function run() {
     global.frame_finish_timestamp = true;
 
     for (let k = 0; k < 5; k++)
-        yield Scripting.createTestWindow(640, 480,
+        yield Scripting.createTestWindow({ maximized: true });
-                                         { maximized: true });
     yield Scripting.waitTestWindows();
 
     yield Scripting.sleep(1000);
@@ -158,8 +157,7 @@ function run() {
     yield Scripting.destroyTestWindows();
     Main.overview.hide();
 
-    yield Scripting.createTestWindow(640, 480,
+    yield Scripting.createTestWindow({ maximized: true,
-                                     { maximized: true,
                                        redraws: true});
     yield Scripting.waitTestWindows();
 

js/ui/components/networkAgent.js

@@ -660,7 +660,7 @@ var NetworkAgent = new Lang.Class({
         switch (connectionType) {
         case '802-11-wireless':
             let wirelessSetting = connection.get_setting_wireless();
-            let ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid());
+            let ssid = NM.utils_ssid_to_utf8(wirelessSetting.get_ssid().get_data());
             title = _("Authentication required by wireless network");
             body = _("Passwords or encryption keys are required to access the wireless network “%s”.").format(ssid);
             break;

js/ui/osdWindow.js

@@ -204,7 +204,7 @@ var OsdWindow = new Lang.Class({
 
         let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
         this._icon.icon_size = popupSize / (2 * scaleFactor);
-        this._box.translation_y = monitor.height / 4;
+        this._box.translation_y = Math.round(monitor.height / 4);
         this._boxConstraint.minSize = popupSize;
     }
 });

js/ui/remoteSearch.js

@@ -295,7 +295,7 @@ var RemoteSearchProvider = new Lang.Class({
                                name: metas[i]['name'],
                                description: metas[i]['description'],
                                createIcon: size => {
-                                   this.createIcon(size, metas[i]);
+                                   return this.createIcon(size, metas[i]);
                                },
                                clipboardText: metas[i]['clipboardText'] });
         }

js/ui/scripting.js

@@ -133,7 +133,7 @@ function _callRemote(obj, method, ...args) {
  * because of the normal X asynchronous mapping process, to actually wait
  * until the window has been mapped and exposed, use waitTestWindows().
  */
-function createTestWindow(width, height, params) {
+function createTestWindow(params) {
     params = Params.parse(params, { width: 640,
                                     height: 480,
                                     alpha: false,

js/ui/workspaceThumbnail.js

@@ -884,6 +884,9 @@ var ThumbnailsBox = new Lang.Class({
     },
 
     _destroyThumbnails() {
+        if (this._thumbnails.length == 0)
+            return;
+
         if (this._switchWorkspaceNotifyId > 0) {
             global.window_manager.disconnect(this._switchWorkspaceNotifyId);
             this._switchWorkspaceNotifyId = 0;

po/pt_BR.po

@@ -15,22 +15,22 @@
 # Georges Basile Stavracas Neto <georges.stavracas@gmail.com>, 2014.
 # Felipe Braga <fbobraga@gmail.com>, 2015.
 # Artur de Aquino Morais <artur.morais93@outlook.com>, 2016.
-# Rafael Fontenelle <rafaelff@gnome.org>, 2013-2017.
+# Rafael Fontenelle <rafaelff@gnome.org>, 2013-2018.
 # Enrico Nicoletto <liverig@gmail.com>, 2013-2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell/issues\n"
-"POT-Creation-Date: 2018-03-16 21:34+0000\n"
+"POT-Creation-Date: 2018-04-13 18:31+0000\n"
-"PO-Revision-Date: 2018-02-09 21:52-0200\n"
+"PO-Revision-Date: 2018-05-02 15:45-0200\n"
-"Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
+"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Virtaal 1.0.0-beta1\n"
 "X-Project-Style: gnome\n"
 
 #: data/50-gnome-shell-system.xml:6
@@ -356,7 +356,7 @@ msgid "There was an error loading the preferences dialog for %s:"
 msgstr "Ocorreu um erro ao carregar o dialogo de preferências para %s:"
 
 #: js/gdm/authPrompt.js:147 js/ui/audioDeviceSelection.js:71
-#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:148
+#: js/ui/components/networkAgent.js:117 js/ui/components/polkitAgent.js:153
 #: js/ui/endSessionDialog.js:482 js/ui/extensionDownloader.js:197
 #: js/ui/shellMountOperation.js:343 js/ui/status/network.js:919
 msgid "Cancel"
@@ -642,7 +642,7 @@ msgstr "Negar acesso"
 
 #: js/ui/accessDialog.js:64 js/ui/status/location.js:396
 msgid "Grant Access"
-msgstr "Garantir acesso"
+msgstr "Conceder acesso"
 
 #: js/ui/appDisplay.js:793
 msgid "Frequently used applications will appear here"
@@ -676,12 +676,12 @@ msgstr "Adicionar aos favoritos"
 msgid "Show Details"
 msgstr "Mostrar detalhes"
 
-#: js/ui/appFavorites.js:138
+#: js/ui/appFavorites.js:140
 #, javascript-format
 msgid "%s has been added to your favorites."
 msgstr "%s foi adicionado aos seus favoritos."
 
-#: js/ui/appFavorites.js:172
+#: js/ui/appFavorites.js:174
 #, javascript-format
 msgid "%s has been removed from your favorites."
 msgstr "%s foi removido dos seus favoritos."
@@ -876,7 +876,7 @@ msgstr "Unidade externa desconectada"
 msgid "Open with %s"
 msgstr "Abrir com %s"
 
-#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:284
+#: js/ui/components/keyring.js:107 js/ui/components/polkitAgent.js:295
 msgid "Password:"
 msgstr "Senha:"
 
@@ -964,15 +964,15 @@ msgstr "Uma senha é necessária para se conectar a “%s”."
 msgid "Network Manager"
 msgstr "Gerenciador de rede"
 
-#: js/ui/components/polkitAgent.js:43
+#: js/ui/components/polkitAgent.js:48
 msgid "Authentication Required"
 msgstr "Autenticação necessária"
 
-#: js/ui/components/polkitAgent.js:71
+#: js/ui/components/polkitAgent.js:76
 msgid "Administrator"
 msgstr "Administrador"
 
-#: js/ui/components/polkitAgent.js:151
+#: js/ui/components/polkitAgent.js:156
 msgid "Authenticate"
 msgstr "Autenticação"
 
@@ -980,7 +980,7 @@ msgstr "Autenticação"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance.
-#: js/ui/components/polkitAgent.js:270 js/ui/shellMountOperation.js:327
+#: js/ui/components/polkitAgent.js:281 js/ui/shellMountOperation.js:327
 msgid "Sorry, that didn’t work. Please try again."
 msgstr "Desculpe, isto não funcionou. Por favor, tente novamente."
 
@@ -1028,7 +1028,7 @@ msgstr "Adicionar relógios mundiais…"
 msgid "World Clocks"
 msgstr "Relógios mundiais"
 
-#: js/ui/dateMenu.js:225
+#: js/ui/dateMenu.js:227
 msgid "Weather"
 msgstr "Meteorologia"
 
@@ -1036,7 +1036,7 @@ msgstr "Meteorologia"
 #. libgweather for the possible condition strings. If at all
 #. possible, the sentence should match the grammatical case etc. of
 #. the inserted conditions.
-#: js/ui/dateMenu.js:289
+#: js/ui/dateMenu.js:291
 #, javascript-format
 msgid "%s all day."
 msgstr "%s por todo o dia."
@@ -1045,7 +1045,7 @@ msgstr "%s por todo o dia."
 #. libgweather for the possible condition strings. If at all
 #. possible, the sentence should match the grammatical case etc. of
 #. the inserted conditions.
-#: js/ui/dateMenu.js:295
+#: js/ui/dateMenu.js:297
 #, javascript-format
 msgid "%s, then %s later."
 msgstr "%s, depois %s mais tarde."
@@ -1054,30 +1054,30 @@ msgstr "%s, depois %s mais tarde."
 #. libgweather for the possible condition strings. If at all
 #. possible, the sentence should match the grammatical case etc. of
 #. the inserted conditions.
-#: js/ui/dateMenu.js:301
+#: js/ui/dateMenu.js:303
 #, javascript-format
 msgid "%s, then %s, followed by %s later."
 msgstr "%s, depois %s, seguido de %s mais tarde."
 
-#: js/ui/dateMenu.js:312
+#: js/ui/dateMenu.js:314
 msgid "Select a location…"
 msgstr "Selecione uma localização…"
 
-#: js/ui/dateMenu.js:315
+#: js/ui/dateMenu.js:317
 msgid "Loading…"
 msgstr "Carregando…"
 
 #. Translators: %s is a temperature with unit, e.g. "23℃"
-#: js/ui/dateMenu.js:321
+#: js/ui/dateMenu.js:323
 #, javascript-format
 msgid "Feels like %s."
 msgstr "Sensação térmica de %s."
 
-#: js/ui/dateMenu.js:324
+#: js/ui/dateMenu.js:326
 msgid "Go online for weather information"
 msgstr "Conecte-se à internet para obter as informações meteorológicas"
 
-#: js/ui/dateMenu.js:326
+#: js/ui/dateMenu.js:328
 msgid "Weather information is currently unavailable"
 msgstr "No momento as informações meteorológicas não estão disponíveis"
 

src/calendar-server/gnome-shell-calendar-server.c

@@ -590,6 +590,11 @@ app_load_events (App *app)
   g_list_free (app->live_views);
   app->live_views = NULL;
 
+  if (!app->since || !app->until)
+    {
+      print_debug ("Skipping load of events, no time interval set yet");
+      return;
+    }
   /* timezone could have changed */
   app_update_timezone (app);
 

src/gnome-shell-perf-tool.in

@@ -347,10 +347,10 @@ if options.perf == None:
         options.perf = 'core'
 
 if options.extra_filter is None:
-    if options.hwtest:
+    options.extra_filter = []
-        options.extra_filter = ['Gedit']
+
-    else:
+if options.perf == 'hwtest':
-        options.extra_filter = []
+    options.extra_filter.append('Gedit')
 
 if args:
     parser.print_usage()

src/shell-app.c

@@ -1190,12 +1190,37 @@ app_child_setup (gpointer user_data)
 }
 #endif
 
+static void
+_shell_app_watch_callback (GPid      pid,
+                           gint      status,
+                           ShellApp *app)
+{
+  if (app->state == SHELL_APP_STATE_STARTING)
+    {
+      ShellWindowTracker *tracker = shell_window_tracker_get_default ();
+      GSList *startup_sequences = shell_window_tracker_get_startup_sequences (tracker);
+      GSList *iter = NULL;
+
+      for (iter = startup_sequences; iter; iter = g_slist_next (iter))
+        {
+          ShellStartupSequence *sequence = (ShellStartupSequence*) iter->data;
+          ShellApp *startup_app = shell_startup_sequence_get_app (sequence);
+          if (startup_app == app)
+            shell_startup_sequence_complete (sequence);
+        }
+
+      shell_app_state_transition (app, SHELL_APP_STATE_STOPPED);
+    }
+
+  g_spawn_close_pid (pid);
+}
+
 static void
 wait_pid (GDesktopAppInfo *appinfo,
           GPid             pid,
-          gpointer         user_data)
+          ShellApp        *app)
 {
-  g_child_watch_add (pid, (GChildWatchFunc) g_spawn_close_pid, NULL);
+  g_child_watch_add (pid, (GChildWatchFunc) _shell_app_watch_callback, app);
 }
 
 /**
@@ -1242,7 +1267,8 @@ shell_app_launch (ShellApp     *app,
 #else
                                                    NULL, NULL,
 #endif
-                                                   wait_pid, NULL,
+                                                   (GDesktopAppLaunchCallback) wait_pid,
+                                                   app,
                                                    error);
   g_object_unref (context);
 

src/shell-window-tracker.c

@@ -906,6 +906,11 @@ shell_startup_sequence_create_icon (ShellStartupSequence *sequence, guint size)
   return texture;
 }
 
+void
+shell_startup_sequence_complete (ShellStartupSequence *sequence)
+{
+  sn_startup_sequence_complete ((SnStartupSequence*)sequence);
+}
 
 /**
  * shell_window_tracker_get_default:

src/shell-window-tracker.h

@@ -36,6 +36,7 @@ const char *shell_startup_sequence_get_name (ShellStartupSequence *sequence);
 gboolean shell_startup_sequence_get_completed (ShellStartupSequence *sequence);
 int shell_startup_sequence_get_workspace (ShellStartupSequence *sequence);
 ClutterActor *shell_startup_sequence_create_icon (ShellStartupSequence *sequence, guint size);
+void shell_startup_sequence_complete (ShellStartupSequence *sequence);
 
 G_END_DECLS
 

src/st/meson.build

@@ -142,7 +142,7 @@ libst_gir = gnome.generate_gir(libst,
   sources: st_gir_sources,
   nsversion: '1.0',
   namespace: 'St',
-  includes: ['Clutter-' + mutter_api_version, 'Gtk-3.0'],
+  includes: ['Clutter-' + mutter_api_version, 'Cally-' + mutter_api_version, 'Gtk-3.0'],
   dependencies: [mutter_dep],
   include_directories: include_directories('..'),
   extra_args: ['-DST_COMPILATION', '--quiet'],