Bump version to 3.9.5

Update NEWS.

NEWS

@@ -1,3 +1,400 @@
+3.9.5
+=====
+* Fix width changes of the calendar popup [Florian; #704200]
+* Work towards aggregate status menu [Jasper; #702539, #704336, #704368,
+  #704670]
+* Update design of lock screen notifications [Allan; #702305]
+* Don't show empty backgroundMenu [Michael; #703868]
+* Add option to limit app switcher to current workspace [Adel; #703538]
+* Consolidate design of login screen and unlock dialog [Ray; #702308, #704795]
+* Respect hasWorkspace property of session mode [Jasper; #698593]
+* Fix fade of app menu icon in RTL locales [Jasper; #704583]
+* Destroy notifications when the close button is clicked [Adel; #687016]
+* Fix clicks on legacy tray icons in the message tray [Florian; #704095]
+* authPrompt: Fade out message if users start to type [Ray; #704817]
+* Export timestamps of global shortcuts on DBus [Bastien; #704859]
+* Fix duplicate search provider results [Jasper; #700283]
+* Misc bug fixes and cleanups [Lionel, Florian, Emilio, Ray, Jasper; #703859,
+  #703540, #704077, #703997, #704318, #704347, #704265, #704411, #704430,
+  #704347, #704453, #704471, #704542, #704707, #703905, #705037]
+
+Contributors:
+  Allan Day, Adel Gadllah, Lionel Landwerlin, Florian Müllner, Bastien Nocera,
+  Emilio Pozuelo Monfort, Jasper St. Pierre, Ray Strode, Colin Walters,
+  Michael Wood
+
+Translations:
+  eternalhui [zh_CN], Victor Ibragimov [tg], Dušan Kazik [sk],
+  Jiro Matsuzawa [ja], Kjartan Maraas [nb], Milo Casagrande [it],
+  Marek Černocký [cs], Daniel Mustieles [es], Benjamin Steinwender [de]
+
+3.9.4
+=====
+* Fix chat entries not being focused when expanded [Jasper; #698778]
+* Fix alignment of "Not Listed?" label [Mathieu; #702307]
+* Fix alignment of time stamps in chat notifications [Carlos; #687809]
+* Round the ends of slider trough [Jasper; #702825]
+* Add support for "box-shadow: none" [Cosimo; #702782]
+* Keep chrome below popup windows [Florian; #702338]
+* Move the session list to a popup menu [Ray; #702818]
+* Fix autorun notifications for "non-native" volumes [Matthias; #703418]
+* dnd: Speed up by not picking on each motion event [Jasper; #703443]
+* Fix management of asynchronous background loading [Lionel; #703001]
+* Rework focus handling [Jasper; #700735]
+* Optimize box-shadow rendering [Lionel; #689858]
+* Remove support for fixed positioning in BoxLayouts [Florian; #703808]
+* Misc bug fixes and cleanups [Adel, Jasper, Florian, Ray, Lionel, Emilio;
+  #702849, #610279, #703132, #703105, #703160, #703126, #703304, #703403,
+  #698593, #703442, #703565, #700901, #703874, #703807, #703893, #703909]
+
+Contributors:
+  Mathieu Bridon, Giovanni Campagna, Cosimo Cecchi, Matthias Clasen,
+  Fran Diéguez, Adel Gadllah, Lionel Landwerlin, Florian Müllner,
+  Emilio Pozuelo Monfort, Carlos Soriano, Jasper St. Pierre, Ray Strode
+
+Translations:
+  Baurzhan Muftakhidinov [kk], Marek Černocký [cs], Daniel Mustieles [es],
+  Fran Diéguez [gl], Kjartan Maraas [nb], Andika Triwidada [id],
+  Benjamin Steinwender [de], Nguyễn Thái Ngọc Duy [vi], Trần Ngọc Quân [vi]
+
+3.9.3
+=====
+* Don't push window thumbs when workspace switcher is hidden [Jasper; #701167]
+* Tweak timeout for activating windows during XDND [Adel; #700150]
+* Fix ellipsization in control buttons in app picker [Carlos; #696307]
+* Fix DND to empty dash [Florian; #684618]
+* Fix OSD window appearing below system modal dialogs [Rui; #701269]
+* Clear clipboard on screen lock to prevent information leak [Florian; #698922]
+* Allow session mode specific overrides schema [Florian; #701717]
+* window-switcher: Only show windows from current workspace by default
+  [Florian; #701214]
+* logout dialog: Show the correct text right away [Matthias; #702056]
+* bluetooth: Port to bluez 5 [Emilio; #700891]
+* dateMenu: Allow events to span multiple lines [Giovanni; #701231]
+* gdm: Clear message queue when no more messages are pending [Jonh; #702458]
+* Misc bug fixes and cleanups [Jasper, Florian, Adel, Giovanni; #693836,
+  #700972, #701386, #700877, #701755, #698918, #701224, #702125, #701954,
+  #701849, #702121]
+
+Contributors:
+  Giovanni Campagna, Matthias Clasen, Fran Diéguez, Adel Gadllah, Rui Matos,
+  Florian Müllner, Emilio Pozuelo Monfort, Carlos Soriano, Jasper St. Pierre,
+  Jonh Wendell
+
+Translations:
+  Marek Černocký [cs], Victor Ibragimov [tg], Fran Diéguez [gl],
+  Benjamin Steinwender [de], Cheng-Chia Tseng [zh_HK, zh_TW],
+  eternalhui [zh_CN], Ivaylo Valkov [bg], Kjartan Maraas [nb],
+  Daniel Mustieles [es]
+
+3.9.2
+=====
+* Use a symbolic icon for DESKTOP windows [Matthias; #697914]
+* Move paint state cache into StWidget [Jasper; #697274]
+* gdm: Fix regression where domain login hint not shown [Stef; #698200]
+* Make calendar keyboard navigable [Tanner; #667434]
+* Hide "Open Calendar" item when no calendar app is installed [Lionel; #697725]
+* Update how branding appears on login screen [Florian; #694912, #699877]
+* Allow OSD popups to grow if necessary [Marta; #696523]
+* Fix offset of shadow offscreen rendering [Lionel; #698301]
+* Fix insensitive button preventing empty keyring password [Stef; #696304]
+* Allow cancelling keyring dialog between prompts [Stef; #682830]
+* modalDialog: Show spinner while working [Stef; #684438]
+* overview: Only show close buttons for windows that may close [Jasper; #699269]
+* Add input purpose and hints to StEntry and StIMText [Daiki; #691392]
+* Set input-purpose property for password entries [Rui; #700043]
+* Provide a DBus API for screencasting [Florian; #696247]
+* overview: Disable hotcorner during DND [Jasper; #698484]
+* polkitAgent: Allow retrying after mistyped passwords [Stef; #684431]
+* Add a way to get backtraces from criticals and warnings [Giovanni; #700262]
+* Allow switch-to-workspace-n keybindings in overview [Florian; #649977]
+* Update man page [Matthias; #700339]
+* Add FocusSearch DBus method [Florian; #700536]
+* Hide frequent view when app monitoring is disabled [Florian; #699714]
+* Show switcher popup for switch-to-workspace-n keybindings [Elad; #659288]
+* gdm: Update the session chooser style [Allan; #695742]
+* Fix some app folders getting truncated at the top [Florian; #694371]
+* Don't block the message tray while a notification is showing [Jasper; #700639]
+* popupMenu: Allow for an optional border for slider handle [Florian; #697917]
+* Re-lock screen when restarted after a crash [Colin; #691987]
+* Synchronize input source switching with key events [Rui; #697007]
+* Switch input source on modifiers-only accelerator [Rui; #697008]
+* Allow input source switching in message tray [Rui; #697009]
+* Misc bug fixes and cleanups [Alban, Jasper, Giovanni, Florian, Rui, Tomeu,
+  Stef, Gustavo; #698863, #699799, #699800, #676285, #699975, #700097, #698812,
+  #698486, #700194, #695314, #700257, #699678, #700356, #700322, #700394,
+  #700409, #700595, #700625, #691746, #700620, #700807, #659288, #700784,
+  #700842, #700847, #700488, #700735, #696159, #700900, #700853, #700923,
+  #700944, #697661, #700854, #700190, #699189, #701097]
+
+Contributors:
+  Elad Alfassa, Alban Browaeys, Giovanni Campagna, Matthias Clasen, Allan Day,
+  Tanner Doshier, Lionel Landwerlin, Rui Matos, Simon McVittie,
+  Marta Milakovic, Florian Müllner, Gustavo Padovan, Jasper St. Pierre,
+  Daiki Ueno, Tomeu Vizoso, Stef Walter, Colin Walters
+
+Translations:
+  Matej Urbančič [sl], Kjartan Maraas [nb], Victor Ibragimov [tg],
+  Dušan Kazik [sk], Gil Forcada [ca], Daniel Mustieles [es]
+
+3.9.1
+=====
+* Add additional toggle-overview keybinding [Matthias; #698251]
+* Disable <super> shortcut when sticky keys are enabled [Matthias; #685974]
+* Disable tray context menu while a notification displays [Jasper; #695800]
+* Watch GApplication busy state [Cosimo; #697207]
+* Disable style transitions if animations are disabled [Jasper; #698391]
+* Filter out hidden applications from "Frequent" view [Giovanni; #696949]
+* Fix window previews swapping place randomly [Jasper; #694469, #698776]
+* Add support for serialized GIcons in remote search providers [Cosimo; #698761]
+* Fix hotcorner regression in RTL locales [Jasper; #698884]
+* Allow some keybindings to work while a top bar menu is open [Florian; #698938]
+* Make open-app-menu keybinding a toggle action [Florian; #686756]
+* Only recognize common URL schemes in notification messages [Monica; #661225]
+* Misc fixes and cleanups [Tim, Jasper, Florian, Giovanni, Owen; #698531,
+  #698622, #698427, #698483, #698513, #697203, #698959, #698918, #699029,
+  #699075, #696720, #649748]
+
+Contributors:
+  Giovanni Campagna, Cosimo Cecchi, Monica Chelliah, Matthias Clasen, Tim Lunn,
+  Florian Müllner, Jasper St. Pierre, Michael Wood, Owen W. Taylor
+
+Translations:
+  Fran Diéguez [gl], Muhammet Kara [tr], Daniel Mustieles [es],
+  Gil Forcada [ia], Anish A [ml], Dimitris Spingos [el], Marek Černocký [cs],
+  Žygimantas Beručka [lt]
+
+3.8.1
+=====
+* Clip window group during startup animation [Jasper; #696323]
+* Check for logind rather than systemd [Martin; #696252]
+* Don't special-case last remote search provider position [Giovanni; #694974]
+* Fix memory leaks [Ray, Jasper; ##697119, #697295, #697300, #697395]
+* AppSwitcherPopup: Activate only the selected window if any [Rui; #697480]
+* Enable screen recorder keybinding in all modes [Florian; #696200]
+* Remove box-shadow from screen shield for performance reasons [Adel; #697274]
+* Add support for -st-natural-width/height CSS properties [Giovanni; #664411]
+* Remove excessive padding from notification buttons [Allan; #664411]
+* Fix thumbnail dragging in overview [Jasper; #697504]
+* theme-node: Add get_url()/lookup_url() methods [Florian; #693688]
+* Misc bug fixes and cleanups [Jasper, Rui, Colin, David, Ray, Matthias:
+  #695859, #696259, #696585, #696436, #697432, #697435, #697560, #697722,
+  #697709]
+
+Contributors:
+  Giovanni Campagna, Matthias Clasen, Allan Day, Adel Gadllah, David Gumberg,
+  Rui Matos, Florian Müllner, Martin Pitt, Jasper St. Pierre, Ray Strode,
+  Colin Walters
+
+Translations:
+  Daniel Martinez [an], Bruce Cowan [en_GB], Khaled Hosny [ar],
+  Ihar Hrachyshka [be], Aron Xu [zh_CN], Wojciech Szczęsny [pl],
+  Inaki Larranaga Murgoitio [eu], Kjartan Maraas [nb],
+  Милош Поповић [sr, sr@latin], Trần Ngọc Quân [vi]
+
+3.8.0.1
+=======
+* Background bug fixes [Ray; #696712]
+
+3.8.0
+=====
+* Remove blur and desaturation from lock screen [Jasper; #696322]
+* Remove scroll view fade near edges [Adel; #696404]
+* dateMenu: Open calendar component when using Evolution [Florian; #696432]
+* Fix unlocking on fast user switch [Cosimo; #696287]
+* Tweak screen shield animation [Rui; #696380]
+* Fix major memory leak when changing backgrounds [Ray; #696157]
+* Miscellaneous bug fixes [Jasper, Adel, Florian; #696199, #696212, #696422,
+  #696447, #696235]
+
+Contributors:
+  Giovanni Campagna, Cosimo Cecchi, Adel Gadllah, Rui Matos, Florian Müllner,
+  Jasper St. Pierre, Ray Strode
+
+Translations:
+  Alexandre Franke [fr], Victor Ibragimov [tg], Arash Mousavi [fa],
+  Gabor Kelemen [hu], Sandeep Sheshrao Shedmake [mr], ManojKumar Giri [or],
+  Shantha kumar [ta], Rajesh Ranjan [hi], Stas Solovey [ru],
+  Shankar Prasad [kn], Dušan Kazik [sk], Ihar Hrachyshka [be],
+  Wouter Bolsterlee [nl], Kris Thomsen [da], Jiro Matsuzawa [ja],
+  Daniel Korostil [uk], Ani Peter [ml], Krishnababu Krothapalli [te],
+  Mantas Kriaučiūnas [lt], Praveen Illa [te]
+
+3.7.92
+======
+* Drop fallback lock implementation [Florian; #693403]
+* Don't let the user trigger message-tray when in fullscreen [Jasper; #694997]
+* Scroll search results when using keynav [Jasper; #689681]
+* Allow raising the shield by starting to type the password [Jasper; #686740]
+* Improve tracking of fullscreen windows [Owen; #649748]
+* Improve animation of new windows in overview [Giovanni; #695582]
+* workspace switcher: Animate new workspaces created by DND [Giovanni; #685285]
+* Give user time to read messages on login screen [Ray; #694688]
+* Misc bug fixes and cleanups [Jasper, Ray, Florian, Cosimo, Giovanni, Adel,
+  Stef, Takao, Rui, Neil; #695154, #694993, #695272, #691578, #694321, #695338,
+  #695409, #695458, #695526, #695601, #695471, #695324, #695650, #695656,
+  #695659, #695485, #695395, #694951, #695824, #695841, #695801, #694321,
+  #693708, #695800, #695607, #695882, #691578, #685851, #694371, #690857,
+  #694092, #695747, #696007, #693438, #696064, #696102
+
+Contributors:
+  Giovanni Campagna, Cosimo Cecchi, Allan Day, Takao Fujiwara, Adel Gadllah,
+  Tim Lunn, Rui Matos, Florian Müllner, Neil Roberts, Jasper St. Pierre,
+  Ray Strode, Stef Walter, Colin Walters, Owen W. Taylor
+
+Translations:
+  Nilamdyuti Goswami [as], Chao-Hsiung Liao [zh_HK, zh_TW],
+  Yuri Myasoedov [ru], Gheyret Kenji [ug], Baurzhan Muftakhidinov [kk],
+  Ville-Pekka Vainio [fi], Matej Urbančič [sl],
+  Мирослав Николић [sr, sr@latin], Rūdolfs Mazurs [lv], Christian Kirbach [de],
+  Andika Triwidada [id], Gil Forcada [ca], Mattias Põldaru [et],
+  Duarte Loreto [pt], Adam Matoušek [cs], Changwoo Ryu [ko],
+  Ihar Hrachyshka [be], Carles Ferrando [ca@valencia], Sweta Kothari [gu]
+
+3.7.91
+======
+* overview: Fade out controls during DND that are not targets [Cosimo; #686984]
+* overview: Keep open when a Control key is held [Florian; #686984]
+* Improve login screen => session transition [Ray; #694321]
+* Center application grid horizontally [Florian; #694261]
+* Fix hiding panel when fullscreen windows span multiple monitors [Adel; 646861]
+* Tweak thresholds of pressure barrier [Jasper; #694467]
+* Tweak window picker layout [Jasper; #694902]
+* Expose key grab DBus API to gnome-settings-daemon [Florian; #643111]
+* Don't always show message tray in overview, add message indicator
+  [Cosimo; #687787]
+* Tweak startup animation [Ray; #694326]
+* Add OSD popups and expose them to gnome-settings-daemon [Florian; #613543]
+* Move loupe icon to the start of the search entry [Jasper; #695069]
+* Don't show the input switcher with less than 2 items [Rui; 695000]
+* Fix auto-completion of system modals immediately upon display [Stef; #692937]
+* Ignore workspaces in alt-tab [Florian; #661156]
+* Disable copying text from password entries [Florian; #695104]
+* Use standard styling for ibus candidate popups [Allan; #694796]
+* Fix calendar changing height on month changes [Giovanni; #641383]
+* Port the hot corner to use pressure barriers [Jasper; #663661]
+* Misc bug fixes and cleanups: [Hashem, Giovanni, Alban, Jasper, Cosimo,
+  Florian, Adel, Daniel, Matthias, Ray, Rui, Guillaume, Stef; #685849, #690643,
+  #694292, #693814, #694234, #694365, #694287, #694336, #694256, #694261,
+  #663601, #694441, #694284, #694463, #694475, #687248, #694394, #694320,
+  #694701, #694784, #694858, #694906, #694327, #694876, #694905, #694969,
+  #694970, #694988, #695006, #695001, #694998, #695023, #695002, #695073,
+  #695126, #687748, #694837, #693907, #679851, #694988]
+
+Contributors:
+  Giovanni Campagna, Cosimo Cecchi, Matthias Clasen, Alban Crequy, Allan Day,
+  Guillaume Desmottes, Adel Gadllah, Rui Matos, Daniel Mustieles,
+  Hashem Nasarat, Jasper St. Pierre, Ray Strode, Stef Walter
+
+Translations:
+  Yuri Myasoedov [ru], Adam Matoušek [cs], Piotr Drąg [pl], Matej Urbančič [sl],
+  Sweta Kothari [gu], Kjartan Maraas [nb], Nguyễn Thái Ngọc Duy [vi],
+  Chao-Hsiung Liao [zh_HK, zh_TW], Dimitris Spingos [el],
+  Inaki Larranaga Murgoitio [eu], Luca Ferretti [it], A S Alam [pa],
+  Gheyret Kenji [ug], Stas Solovey [ru], Enrico Nicoletto [pt_BR],
+  Fran Diéguez [gl], Daniel Mustieles [es], Aurimas Černius [lt]
+
+3.7.90
+======
+* Let GNOME Shell work on EGL and GLES2 [Neil; #693225, #693438, #693339]
+* Implement middle-click paste [Jasper; #645019]
+* Fix top bar transition between session modes [Rui; #692966]
+* Trigger the message tray with downward pressure [Jasper; #677215]
+* Don't ask for a password on shutdown [Adel; #693385]
+* Add a context menu to the message tray [Adel; #691035, #693887]
+* Use unicode formatting in the date menu [Matthias; #689251]
+* Use proper ellipsis instead of three dots [Jeremy; #689542]
+* Tweak screen shield animation [Giovanni; #691964]
+* Always hide the OSK when showing the message tray [Florian; #662687]
+* Support sound in notifications [Giovanni; #642831]
+* Place application popup menus above chrome [Jasper; #633620]
+* Hide overview elements while searching [Cosimo; #682050]
+* Implement updated IBus candidate popup designs [Rui; #691902]
+* Add support for enable-animations preference [Cosimo; #655746]
+* Don't always show the message tray in the overview [Cosimo; #693987]
+* Improve arrangement of window previews [Adel; #690313]
+* Remove builtin settings provider [Giovanni; #690824]
+* Minimize fullscreen windows when they end up in the background [Adel; #693991]
+* Add context menu to the background actor [Jasper; #681540]
+* Handle backgrounds in the shell, improve startup animation [Ray; #682429]
+* Hide universal access menu when not needed [Giovanni; #681528]
+* Implement updated app picker designs [Florian; #694192]
+* Improve login manager -> session transition [Ray; #694062]
+* Don't use a grid layout in window picker [Adel; #694210]
+* Use scroll wheel for workspace switching rather than zoom [Florian; #686639]
+* Misc bug fixes and cleanups: [Jasper, Florian, Debarshi, Adel, Matthias,
+  Giovanni, Daiki, Rico, Bastien, Cosimo, Ray, Allan, Antonio; #693284,
+  #692680, #691746, #693303, #693162, #693161, #693522, #693385, #691715,
+  #688915, #689106, #682429, #693570, #693737, #693458, #692845, 693836,
+  #681540, #679925, #688227, #692773, #693909, #683288, #693854, #693746,
+  #693931, #693924, #693940, #693970, #693935, #693937, #693974, #693936,
+  #693975, #693822, #694030, #685849, #694052, #694035, #694038, #694079,
+  #694064, #681735, #694100, #694057, #694070, #693572, #693896, #686984,
+  #694123, #694125, #693756, #693757, #687556, #694215, 694062, #694227,
+  #694240, #694234, #694264, 694276, 694282, #694241, #689394, #694202,
+  #694265, #694289, #691806, #694290, #694296]
+
+Contributors:
+  Jeremy Bicha, Giovanni Campagna, Cosimo Cecchi, Matthias Clasen, Allan Day,
+  António Fernandes, Adel Gadllah, Rui Matos, Florian Müllner, Bastien Nocera,
+  Debarshi Ray, Neil Roberts, Jasper St. Pierre, Ray Strode, Rico Tzschichholz,
+  Daiki Ueno
+
+Translations:
+  Yasumichi Akahoshi [ja], Yoji TOYODA [ja], Dušan Kazik [sk],
+  Wouter Bolsterlee [nl], Matej Urbančič [sl], Gheyret Kenji [ug],
+  Ivaylo Valkov [bg], Daniel Korostil [uk], Gheyret Kenji [ug],
+  Daniel Mustieles [es], Anish A [ml], Gil Forcada [ca],
+  Carles Ferrando [ca@valencia], Мирослав Николић [sr, sr@latin],
+  Aurimas Černius [lt], Rafael Ferreira [pt_BR], Fran Diéguez [gl],
+  Piotr Drąg [pl], Luca Ferretti [it], A S Alam [pa]
+
+3.7.5
+=====
+* MessageTray: pass keyboard events to tray icons [Giovanni; #687425]
+* network: add support for virtual devices (vlan, bond, bridge) [Dan; #677144]
+* gdm: Allow right-clicking buttons for left-handed users [Jasper; #688748]
+* Make list search results span all available horizontal space [Tanner; #691967]
+* Make Show-Applications button depress when held down [Hashem; #692319]
+* Set a max width on search results [Cosimo; #692453]
+* Reserve scrollbar allocation for automatic policy [Cosimo; #686881]
+* Improve scaling algorithm for window thumbnails [Jasper; #686944]
+* Fix launching settings panels after g-c-c changes [Jasper; #692483]
+* Stop launching applications from empty searches [Hashem; #692391]
+* Implement per-source notification filtering [Giovanni; #685926]
+* ScreenShield: Omit ActiveChanged() signal at end of fade [Giovanni; #691964]
+* ScreenShield: Lower the shield on idle before locking [Giovanni; #692560]
+* Make previews of minimized windows translucent in overview [Florian; #692999]
+* windowManager: Respect icon geometry when minimizing [Florian; #692997]
+* ScreenShield: Only show lock icon when actually locked [Giovanni; #693007]
+* general: Use & instead of 'and' for Settings panels [Jeremy; #689590]
+* network: Add support for new ModemManager1 interface [Aleksander; #687359]
+* network: Handle LTE-only modems as GSM ones [Aleksander; #688144]
+* mobile-providers: Port to libnm-gtk [Aleksander; #688943]
+* general: Consistently use Title Case in top bar [Jeremy; #689589]
+* panel: Add :overview pseudo class while in overview [Florian; #693218]
+* sessionMode: Add support for mode-specific styling [Florian; #693219]
+* loginManager: Make suspend a NOP in the ConsoleKit patch [Florian; #693162]
+* screenShield: Inhibit suspend until the screen is locked [Florian; #686482]
+* Misc bug fixes and cleanups [Jasper, Giovanni, Rui, Cosimo, Florian, Stefano,
+  Adel, Yanko; #691745, #691731, #690171, #689091, #691976, #691963, #684279,
+  #692052, #692091, #642831, #692454, #692715, #692678, #692723, #692677,
+  #683986, #692693, #692749, #692948, #692995, #692996, #692994, #677215,
+  #692586, #693067, #693031, #693049, #643111, #693161, #693220]
+
+Contributors:
+  Jeremy Bicha, Giovanni Campagna, Cosimo Cecchi, Tanner Doshier,
+  Stefano Facchini, Adel Gadllah, Yanko Kaneti, Rui Matos, Aleksander Morgado,
+  Florian Müllner, Hashem Nasarat, Jasper St. Pierre, Dan Winship
+
+Translations:
+  Duarte Loreto [pt], Daniel Mustieles [es], Kjartan Maraas [nb],
+  Nilamdyuti Goswami [as], Мирослав Николић [sr,sr@latin],
+  Tobias Endrigkeit [de], Fabio Tomat [fur], Matej Urbančič [sl], A S Alam [pa],
+  Inaki Larranaga Murgoitio [eu], Piotr Drąg [pl], Wouter Bolsterlee [nl],
+  Gheyret Kenji [ug], Yaron Shahrabani [he], Chao-Hsiung Liao [zh_HK,zh_TW],
+  Milo Casagrande [it], Benjamin Steinwender [de]
+
 3.7.4.1
 =======
 * userMenu: Use show-full-name-in-top-bar setting [Bastien; #689561]

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ(2.63)
-AC_INIT([gnome-shell],[3.7.4.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
+AC_INIT([gnome-shell],[3.9.5],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/shell-global.c])
@@ -16,8 +16,6 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 # Checks for programs.
 AC_PROG_CC
-# Needed for per-target cflags, like in gnomeshell-taskpanel
-AM_PROG_CC_C_O
 
 # Initialize libtool
 LT_PREREQ([2.2.6])
@@ -55,29 +53,28 @@ if $PKG_CONFIG --exists gstreamer-1.0 '>=' $GSTREAMER_MIN_VERSION ; then
    AC_MSG_RESULT(yes)
    build_recorder=true
    recorder_modules="gstreamer-1.0 gstreamer-base-1.0 x11 gtk+-3.0"
-   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0 xfixes gl)
+   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0 xfixes)
 else
    AC_MSG_RESULT(no)
 fi
 
 AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)
 
-CLUTTER_MIN_VERSION=1.11.11
+CLUTTER_MIN_VERSION=1.13.4
 GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
 GJS_MIN_VERSION=1.35.4
-MUTTER_MIN_VERSION=3.7.4
-GTK_MIN_VERSION=3.3.9
-GIO_MIN_VERSION=2.35.0
+MUTTER_MIN_VERSION=3.9.5
+GTK_MIN_VERSION=3.7.9
+GIO_MIN_VERSION=2.37.0
 LIBECAL_MIN_VERSION=3.5.3
 LIBEDATASERVER_MIN_VERSION=3.5.3
 TELEPATHY_GLIB_MIN_VERSION=0.17.5
-TELEPATHY_LOGGER_MIN_VERSION=0.2.4
 POLKIT_MIN_VERSION=0.100
 STARTUP_NOTIFICATION_MIN_VERSION=0.11
-GCR_MIN_VERSION=3.3.90
-GNOME_DESKTOP_REQUIRED_VERSION=3.7.1
+GCR_MIN_VERSION=3.7.5
+GNOME_DESKTOP_REQUIRED_VERSION=3.7.90
 GNOME_MENUS_REQUIRED_VERSION=3.5.3
-NETWORKMANAGER_MIN_VERSION=0.9.6
+NETWORKMANAGER_MIN_VERSION=0.9.8
 PULSE_MIN_VERS=2.0
 
 # Collect more than 20 libraries for a prize!
@@ -90,46 +87,29 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
 			       libgnome-menu-3.0 >= $GNOME_MENUS_REQUIRED_VERSION
                                $recorder_modules
                                gdk-x11-3.0 libsoup-2.4
-                               gl
 			       clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
 			       clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
                                libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
                                gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
-			       libcanberra
+			       libcanberra libcanberra-gtk3
                                telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
-                               telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
                                polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
                                libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION
                                libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
-                               gnome-keyring-1 gcr-3 >= $GCR_MIN_VERSION)
-
-PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
-
-PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
-
-PKG_CHECK_MODULES(BROWSER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION json-glib-1.0 >= 0.13.2)
-
-GNOME_KEYBINDINGS_KEYSDIR=`$PKG_CONFIG --variable keysdir gnome-keybindings`
-AC_SUBST([GNOME_KEYBINDINGS_KEYSDIR])
-
-GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_MIN_VERSION])
-
-saved_CFLAGS=$CFLAGS
-saved_LIBS=$LIBS
-CFLAGS=$GNOME_SHELL_CFLAGS
-LIBS=$GNOME_SHELL_LIBS
-AC_CHECK_FUNCS(JS_NewGlobalObject XFixesCreatePointerBarrier)
-CFLAGS=$saved_CFLAGS
-LIBS=$saved_LIBS
+                               libsecret-unstable gcr-base-3 >= $GCR_MIN_VERSION)
 
 PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
 PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.8 x11)
+PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
+PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
+PKG_CHECK_MODULES(BROWSER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION json-glib-1.0 >= 0.13.2)
 PKG_CHECK_MODULES(TRAY, gtk+-3.0)
 PKG_CHECK_MODULES(GVC, libpulse >= $PULSE_MIN_VERS libpulse-mainloop-glib gobject-2.0)
 PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.7.4)
+PKG_CHECK_MODULES(CARIBOU, caribou-1.0 >= 0.4.8)
 
 AC_MSG_CHECKING([for bluetooth support])
-PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
+PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.9.0],
         [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
 	 BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
 	 AC_SUBST([BLUETOOTH_LIBS],["$BLUETOOTH_LIBS"])
@@ -146,32 +126,10 @@ PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedatas
 AC_SUBST(CALENDAR_SERVER_CFLAGS)
 AC_SUBST(CALENDAR_SERVER_LIBS)
 
-AC_ARG_WITH(systemd,
-            AS_HELP_STRING([--with-systemd],
-                           [Add systemd support]),
-            [with_systemd=$withval], [with_systemd=auto])
+GNOME_KEYBINDINGS_KEYSDIR=`$PKG_CONFIG --variable keysdir gnome-keybindings`
+AC_SUBST([GNOME_KEYBINDINGS_KEYSDIR])
 
-PKG_CHECK_MODULES(SYSTEMD,
-                  [libsystemd-login libsystemd-daemon],
-                  [have_systemd=yes], [have_systemd=no])
-
-if test "x$with_systemd" = "xauto" ; then
-        if test x$have_systemd = xno ; then
-                use_systemd=no
-        else
-                use_systemd=yes
-        fi
-else
-        use_systemd=$with_systemd
-fi
-
-if test "x$use_systemd" = "xyes"; then
-        if test "x$have_systemd" = "xno"; then
-                AC_MSG_ERROR([Systemd support explicitly required, but systemd not found])
-        fi
-
-        AC_DEFINE(WITH_SYSTEMD, 1, [systemd support])
-fi
+GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_MIN_VERSION])
 
 MUTTER_GIR_DIR=`$PKG_CONFIG --variable=girdir libmutter`
 MUTTER_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmutter`
@@ -198,16 +156,6 @@ fi
 
 # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
 AM_PATH_GLIB_2_0()
-G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-AC_SUBST(G_IR_SCANNER)
-G_IR_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-AC_SUBST(G_IR_COMPILER)
-G_IR_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-AC_SUBST(G_IR_GENERATE)
-GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-AC_SUBST(GIRDIR)
-TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-AC_SUBST(TYPELIBDIR)
 
 GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
 
@@ -223,32 +171,7 @@ if test "$enable_man" != no; then
 fi
 AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
 
-# Stay command-line compatible with the gnome-common configure option. Here
-# minimum/yes/maximum are the same, however.
-AC_ARG_ENABLE(compile_warnings,
-  AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],[Turn on compiler warnings]),,
-  enable_compile_warnings=error)
-
-changequote(,)dnl
-if test "$enable_compile_warnings" != no ; then
-  if test "x$GCC" = "xyes"; then
-    case " $CFLAGS " in
-    *[\ \	]-Wall[\ \	]*) ;;
-    *) CFLAGS="$CFLAGS -Wall" ;;
-    esac
-    case " $CFLAGS " in
-    *[\ \	]-Wmissing-prototypes[\ \	]*) ;;
-    *) CFLAGS="$CFLAGS -Wmissing-prototypes" ;;
-    esac
-    if test "$enable_compile_warnings" = error ; then
-      case " $CFLAGS " in
-      *[\ \	]-Werror[\ \	]*) ;;
-      *) CFLAGS="$CFLAGS -Werror -Wno-error=deprecated-declarations" ;;
-      esac
-    fi
-  fi
-fi
-changequote([,])dnl
+GNOME_COMPILE_WARNINGS([error])
 
 AC_ARG_ENABLE(jhbuild-wrapper-script,
   AS_HELP_STRING([--enable-jhbuild-wrapper-script],[Make "gnome-shell" script work for jhbuild]),,enable_jhbuild_wrapper_script=no)

data/50-gnome-shell-system.xml.in

@@ -11,6 +11,9 @@
 	<KeyListEntry name="focus-active-notification"
                       _description="Focus the active notification"/>
 
+	<KeyListEntry name="toggle-overview"
+                      _description="Show the overview"/>
+
 	<KeyListEntry name="toggle-application-view"
                       _description="Show all applications"/>
 

data/Makefile.am

@@ -1,3 +1,6 @@
+wandadir = $(pkgdatadir)
+dist_wanda_DATA = wanda.png
+
 desktopdir=$(datadir)/applications
 desktop_DATA = gnome-shell.desktop gnome-shell-extension-prefs.desktop
 
@@ -12,6 +15,7 @@ desktop_DATA = gnome-shell.desktop gnome-shell-extension-prefs.desktop
 
 introspectiondir = $(datadir)/dbus-1/interfaces
 introspection_DATA =				\
+	org.gnome.Shell.Screencast.xml		\
 	org.gnome.Shell.Screenshot.xml		\
 	org.gnome.ShellSearchProvider.xml	\
 	org.gnome.ShellSearchProvider2.xml

data/org.gnome.Shell.Screencast.xml

@@ -0,0 +1,96 @@
+<!DOCTYPE node PUBLIC
+'-//freedesktop//DTD D-BUS Object Introspection 1.0//EN'
+'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
+<node>
+
+  <!--
+      org.gnome.Shell.Screencast:
+      @short_description: Screencast interface
+
+      The interface used to record screen contents.
+  -->
+  <interface name="org.gnome.Shell.Screencast">
+
+    <!--
+        Screencast:
+        @file_template: the template for the filename to use
+        @options: a dictionary of optional parameters
+        @success: whether the screencast was started successfully
+        @filename_used: the file where the screencast is being saved
+
+        Records a screencast of the whole screen and saves it
+        (by default) as webm video under a filename derived from
+        @file_template. The template is either a relative or absolute
+        filename which may contain some escape sequences - %d and %t
+        will be replaced by the start date and time of the recording.
+        If a relative name is used, the screencast will be saved in the
+        $XDG_VIDEOS_DIR if it exists, or the home directory otherwise.
+        The actual filename of the saved video is returned in @filename_used.
+        The set of optional parameters in @options currently consists of:
+            'draw-cursor'(b): whether the cursor should be included in the
+                              recording (true)
+            'framerate'(i): the number of frames per second that should be
+                            recorded if possible (30)
+            'pipeline'(s): the GStreamer pipeline used to encode recordings
+                           in gst-launch format; if not specified, the
+                           recorder will produce vp8 (webm) video (unset)
+    -->
+    <method name="Screencast">
+      <arg type="s" direction="in" name="file_template"/>
+      <arg type="a{sv}" direction="in" name="options"/>
+      <arg type="b" direction="in" name="flash"/>
+      <arg type="b" direction="out" name="success"/>
+      <arg type="s" direction="out" name="filename_used"/>
+    </method>
+
+    <!--
+        ScreencastArea:
+        @x: the X coordinate of the area to capture
+        @y: the Y coordinate of the area to capture
+        @width: the width of the area to capture
+        @height: the height of the area to capture
+        @file_template: the template for the filename to use
+        @options: a dictionary of optional parameters
+        @success: whether the screencast was started successfully
+        @filename_used: the file where the screencast is being saved
+
+        Records a screencast of the passed in area and saves it
+        (by default) as webm video under a filename derived from
+        @file_template. The template is either a relative or absolute
+        filename which may contain some escape sequences - %d and %t
+        will be replaced by the start date and time of the recording.
+        If a relative name is used, the screencast will be saved in the
+        $XDG_VIDEOS_DIR if it exists, or the home directory otherwise.
+        The actual filename of the saved video is returned in @filename_used.
+        The set of optional parameters in @options currently consists of:
+            'draw-cursor'(b): whether the cursor should be included in the
+                              recording (true)
+            'framerate'(i): the number of frames per second that should be
+                            recorded if possible (30)
+            'pipeline'(s): the GStreamer pipeline used to encode recordings
+                           in gst-launch format; if not specified, the
+                           recorder will produce vp8 (webm) video (unset)
+    -->
+    <method name="ScreencastArea">
+      <arg type="i" direction="in" name="x"/>
+      <arg type="i" direction="in" name="y"/>
+      <arg type="i" direction="in" name="width"/>
+      <arg type="i" direction="in" name="height"/>
+      <arg type="s" direction="in" name="file_template"/>
+      <arg type="a{sv}" direction="in" name="options"/>
+      <arg type="b" direction="out" name="success"/>
+      <arg type="s" direction="out" name="filename_used"/>
+    </method>
+
+    <!--
+        StopScreencast:
+        @success: whether stopping the recording was successful
+
+        Stop the recording started by either Screencast or ScreencastArea.
+    -->
+    <method name="StopScreencast">
+      <arg type="b" direction="out" name="success"/>
+    </method>
+
+  </interface>
+</node>

data/org.gnome.ShellSearchProvider.xml

@@ -46,7 +46,7 @@
     <!--
         GetResultMetas:
         @identifiers: An array of result identifiers as returned by GetInitialResultSet() or GetSubsearchResultSet()
-        @metas: A dictionary describing the given search result, containing 'id' and 'name' (both strings). Optionally, either 'gicon' (a serialized GIcon) or 'icon-data' (raw image data as (iiibiiay) - width, height, rowstride, has-alpha, bits per sample, channels, data) can be specified if the result can be better served with a thumbnail of the content (such as with images).
+        @metas: A dictionary describing the given search result, containing a human-readable 'name' (string), along with the result identifier this meta is for, 'id' (string). Optionally, either 'gicon' (a serialized GIcon) or 'icon-data' (raw image data as (iiibiiay) - width, height, rowstride, has-alpha, bits per sample, channels, data) can be specified if the result can be better served with a thumbnail of the content (such as with images). A 'description' field (string) may also be specified if more context would help the user find the desired result.
 
         Return an array of meta data used to display each given result
     -->

data/org.gnome.ShellSearchProvider2.xml

@@ -46,7 +46,7 @@
     <!--
         GetResultMetas:
         @identifiers: An array of result identifiers as returned by GetInitialResultSet() or GetSubsearchResultSet()
-        @metas: A dictionary describing the given search result, containing 'id' and 'name' (both strings). Optionally, either 'gicon' (a serialized GIcon) or 'icon-data' (raw image data as (iiibiiay) - width, height, rowstride, has-alpha, bits per sample, channels, data) can be specified if the result can be better served with a thumbnail of the content (such as with images). A 'description' field (string) may also be specified if more context would help the user find the desired result.
+        @metas: A dictionary describing the given search result, containing a human-readable 'name' (string), along with the result identifier this meta is for, 'id' (string). Optionally, 'icon' (a serialized GIcon as obtained by g_icon_serialize) can be specified if the result can be better served with a thumbnail of the content (such as with images). 'gicon' (a serialized GIcon as obtained by g_icon_to_string) or 'icon-data' (raw image data as (iiibiiay) - width, height, rowstride, has-alpha, bits per sample, channels, data) are deprecated values that can also be used for that purpose. A 'description' field (string) may also be specified if more context would help the user find the desired result.
 
         Return an array of meta data used to display each given result
     -->

data/org.gnome.shell.gschema.xml.in.in

@@ -21,16 +21,6 @@
         EnableExtension and DisableExtension DBus methods on org.gnome.Shell.
       </_description>
     </key>
-    <key name="enable-app-monitoring" type="b">
-      <default>true</default>
-      <_summary>Whether to collect stats about applications usage</_summary>
-      <_description>
-        The shell normally monitors active applications in order to present
-        the most used ones (e.g. in launchers). While this data will be
-        kept private, you may want to disable this for privacy reasons.
-        Please note that doing so won't remove already saved data.
-      </_description>
-    </key>
     <key name="favorite-apps" type="as">
       <default>[ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop' ]</default>
       <_summary>List of desktop file IDs for favorite applications</_summary>
@@ -39,6 +29,14 @@
         will be displayed in the favorites area.
       </_description>
     </key>
+    <key name="app-folder-categories" type="as">
+      <default>[ 'Utilities', 'Sundry' ]</default>
+      <_summary>List of categories that should be displayed as folders</_summary>
+      <_description>
+        Each category name in this list will be represented as folder in the
+        application view, rather than being displayed inline in the main view.
+      </_description>
+    </key>
     <key name="command-history" type="as">
       <default>[]</default>
       <_summary>History for command (Alt-F2) dialog</_summary>
@@ -109,6 +107,13 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
         Overview.
       </_description>
     </key>
+    <key name="toggle-overview" type="as">
+      <default>["&lt;Super&gt;s"]</default>
+      <_summary>Keybinding to open the overview</_summary>
+      <_description>
+        Keybinding to open the Activities Overview.
+      </_description>
+    </key>
     <key name="toggle-message-tray" type="as">
       <default>["&lt;Super&gt;m"]</default>
       <_summary>Keybinding to toggle the visibility of the message tray</_summary>
@@ -181,6 +186,19 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
     </key>
   </schema>
 
+  <schema id="org.gnome.shell.app-switcher"
+          path="/org/gnome/shell/app-switcher/"
+          gettext-domain="@GETTEXT_PACKAGE@">
+    <key type="b" name="current-workspace-only">
+      <default>false</default>
+      <summary>Limit switcher to current workspace.</summary>
+      <description>
+	If true, only applications that have windows on the current workspace are shown in the switcher.
+	Otherwise, all applications are included.
+      </description>
+    </key>
+  </schema>
+
   <enum id="org.gnome.shell.window-switcher.AppIconMode">
     <value value="1" nick="thumbnail-only"/>
     <value value="2" nick="app-icon-only"/>
@@ -199,7 +217,7 @@ value here is from the GsmPresenceStatus enumeration.</_summary>
       </_description>
     </key>
     <key type="b" name="current-workspace-only">
-      <default>false</default>
+      <default>true</default>
       <summary>Limit switcher to current workspace.</summary>
       <description>
 	If true, only windows from the current workspace are shown in the switcher.

docs/reference/shell/shell-docs.sgml.in

@@ -46,11 +46,11 @@
     <xi:include href="doc-gen-org.gnome.Shell.SearchProvider.xml"/>
     <xi:include href="doc-gen-org.gnome.Shell.SearchProvider2.xml"/>
     <xi:include href="xml/shell-global.xml"/>
+    <xi:include href="xml/shell-keybinding-modes.xml"/>
     <xi:include href="xml/shell-wm.xml"/>
     <xi:include href="xml/shell-xfixes-cursor.xml"/>
     <xi:include href="xml/shell-util.xml"/>
     <xi:include href="xml/shell-mount-operation.xml"/>
-    <xi:include href="xml/shell-mobile-providers.xml"/>
     <xi:include href="xml/shell-network-agent.xml"/>
     <xi:include href="xml/shell-polkit-authentication-agent.xml"/>
     <xi:include href="xml/shell-tp-client.xml"/>

js/Makefile.am

@@ -17,6 +17,7 @@ misc/config.js: misc/config.js.in Makefile
 jsdir = $(pkgdatadir)/js
 
 nobase_dist_js_DATA = 	\
+	gdm/authPrompt.js	\
 	gdm/batch.js		\
 	gdm/fingerprint.js	\
 	gdm/loginDialog.js	\
@@ -28,6 +29,7 @@ nobase_dist_js_DATA = 	\
 	misc/extensionUtils.js	\
 	misc/fileUtils.js	\
 	misc/gnomeSession.js	\
+	misc/hash.js		\
 	misc/history.js		\
 	misc/jsParse.js		\
 	misc/loginManager.js	\
@@ -36,8 +38,11 @@ nobase_dist_js_DATA = 	\
 	misc/util.js		\
 	perf/core.js		\
 	ui/altTab.js		\
+	ui/animation.js		\
 	ui/appDisplay.js	\
 	ui/appFavorites.js	\
+	ui/backgroundMenu.js	\
+	ui/background.js	\
 	ui/boxpointer.js	\
 	ui/calendar.js		\
 	ui/checkBox.js		\
@@ -65,14 +70,19 @@ nobase_dist_js_DATA = 	\
 	ui/sessionMode.js	\
 	ui/shellEntry.js	\
 	ui/shellMountOperation.js \
+	ui/slider.js		\
 	ui/notificationDaemon.js \
+	ui/osdWindow.js		\
 	ui/overview.js		\
+	ui/overviewControls.js	\
 	ui/panel.js		\
 	ui/panelMenu.js		\
 	ui/pointerWatcher.js    \
 	ui/popupMenu.js		\
 	ui/remoteSearch.js	\
+	ui/remoteMenu.js	\
 	ui/runDialog.js		\
+	ui/screencast.js	\
 	ui/screenshot.js	\
         ui/screenShield.js	\
 	ui/scripting.js		\
@@ -86,10 +96,11 @@ nobase_dist_js_DATA = 	\
 	ui/status/power.js	\
 	ui/status/volume.js	\
 	ui/status/bluetooth.js	\
+	ui/status/system.js	\
 	ui/switcherPopup.js	\
 	ui/tweener.js		\
 	ui/unlockDialog.js	\
-	ui/userMenu.js		\
+	ui/userWidget.js	\
 	ui/viewSelector.js	\
 	ui/wanda.js		\
 	ui/windowAttentionHandler.js	\

js/extensionPrefs/main.js

@@ -45,6 +45,7 @@ const Application = new Lang.Class({
         this._extensionPrefsModules = {};
 
         this._extensionIters = {};
+        this._startupUuid = null;
     },
 
     _buildModel: function() {
@@ -203,6 +204,7 @@ const Application = new Lang.Class({
     _scanExtensions: function() {
         let finder = new ExtensionUtils.ExtensionFinder();
         finder.connect('extension-found', Lang.bind(this, this._extensionFound));
+        finder.connect('extensions-loaded', Lang.bind(this, this._extensionsLoaded));
         finder.scanExtensions();
     },
 
@@ -212,6 +214,11 @@ const Application = new Lang.Class({
         this._extensionIters[extension.uuid] = iter;
     },
 
+    _extensionsLoaded: function() {
+        if (this._startupUuid && this._extensionAvailable(this._startupUuid))
+            this._selectExtension(this._startupUuid);
+        this._startupUuid = null;
+    },
 
     _onActivate: function() {
         this._window.present();
@@ -232,10 +239,10 @@ const Application = new Lang.Class({
             // Strip off "extension:///" prefix which fakes a URI, if it exists
             uuid = stripPrefix(uuid, "extension:///");
 
-            if (!this._extensionAvailable(uuid))
-                return 1;
-
-            this._selectExtension(uuid);
+            if (this._extensionAvailable(uuid))
+                this._selectExtension(uuid);
+            else
+                this._startupUuid = uuid;
         }
         return 0;
     }

js/gdm/authPrompt.js

@@ -0,0 +1,458 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Clutter = imports.gi.Clutter;
+const Lang = imports.lang;
+const Signals = imports.signals;
+const St = imports.gi.St;
+
+const Animation = imports.ui.animation;
+const Batch = imports.gdm.batch;
+const GdmUtil = imports.gdm.util;
+const Params = imports.misc.params;
+const ShellEntry = imports.ui.shellEntry;
+const Tweener = imports.ui.tweener;
+const UserWidget = imports.ui.userWidget;
+
+const DEFAULT_BUTTON_WELL_ICON_SIZE = 24;
+const DEFAULT_BUTTON_WELL_ANIMATION_DELAY = 1.0;
+const DEFAULT_BUTTON_WELL_ANIMATION_TIME = 0.3;
+
+const MESSAGE_FADE_OUT_ANIMATION_TIME = 0.5;
+
+const AuthPromptMode = {
+    UNLOCK_ONLY: 0,
+    UNLOCK_OR_LOG_IN: 1
+};
+
+const AuthPrompt = new Lang.Class({
+    Name: 'AuthPrompt',
+
+    _init: function(gdmClient, mode) {
+        this.verifyingUser = false;
+
+        this._gdmClient = gdmClient;
+        this._mode = mode;
+
+        let reauthenticationOnly;
+        if (this._mode == AuthPromptMode.UNLOCK_ONLY)
+            reauthenticationOnly = true;
+        else if (this._mode == AuthPromptMode.UNLOCK_OR_LOG_IN)
+            reauthenticationOnly = false;
+
+        this._userVerifier = new GdmUtil.ShellUserVerifier(this._gdmClient, { reauthenticationOnly: reauthenticationOnly });
+
+        this._userVerifier.connect('ask-question', Lang.bind(this, this._onAskQuestion));
+        this._userVerifier.connect('show-message', Lang.bind(this, this._onShowMessage));
+        this._userVerifier.connect('verification-failed', Lang.bind(this, this._onVerificationFailed));
+        this._userVerifier.connect('verification-complete', Lang.bind(this, this._onVerificationComplete));
+        this._userVerifier.connect('reset', Lang.bind(this, this._onReset));
+        this._userVerifier.connect('show-login-hint', Lang.bind(this, this._onShowLoginHint));
+        this._userVerifier.connect('hide-login-hint', Lang.bind(this, this._onHideLoginHint));
+
+        this.connect('next', Lang.bind(this, function() {
+                         this.updateSensitivity(false);
+                         this.startSpinning();
+                         if (this._queryingService) {
+                             this._userVerifier.answerQuery(this._queryingService, this._entry.text);
+                         } else {
+                             this._preemptiveAnswer = this._entry.text;
+                         }
+                     }));
+
+        this.actor = new St.BoxLayout({ style_class: 'login-dialog-prompt-layout',
+                                        vertical: true });
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
+        this.actor.connect('key-press-event',
+                           Lang.bind(this, function(actor, event) {
+                               if (event.get_key_symbol() == Clutter.KEY_Escape) {
+                                   this.cancel();
+                               }
+                           }));
+
+        this._userWell = new St.Bin({ x_fill: true,
+                                      x_align: St.Align.START });
+        this.actor.add(this._userWell,
+                       { x_align: St.Align.START,
+                         x_fill: true,
+                         y_fill: true,
+                         expand: true });
+        this._label = new St.Label({ style_class: 'login-dialog-prompt-label' });
+
+        this.actor.add(this._label,
+                       { expand: true,
+                         x_fill: true,
+                         y_fill: true,
+                         x_align: St.Align.START });
+        this._entry = new St.Entry({ style_class: 'login-dialog-prompt-entry',
+                                     can_focus: true });
+        ShellEntry.addContextMenu(this._entry, { isPassword: true });
+
+        this.actor.add(this._entry,
+                       { expand: true,
+                         x_fill: true,
+                         y_fill: false,
+                         x_align: St.Align.START });
+
+        this._entry.grab_key_focus();
+
+        this._message = new St.Label({ opacity: 0 });
+        this._message.clutter_text.line_wrap = true;
+        this.actor.add(this._message, { x_fill: true });
+
+        this._loginHint = new St.Label({ style_class: 'login-dialog-prompt-login-hint-message' });
+        this.actor.add(this._loginHint);
+
+        this._buttonBox = new St.BoxLayout({ style_class: 'login-dialog-button-box',
+                                             vertical: false });
+        this.actor.add(this._buttonBox,
+                       { expand:  true,
+                         x_align: St.Align.MIDDLE,
+                         y_align: St.Align.END });
+
+        this._defaultButtonWell = new St.Widget();
+        this._defaultButtonWellActor = null;
+
+        this._initButtons();
+
+        let spinnerIcon = global.datadir + '/theme/process-working.svg';
+        this._spinner = new Animation.AnimatedIcon(spinnerIcon, DEFAULT_BUTTON_WELL_ICON_SIZE);
+        this._spinner.actor.opacity = 0;
+        this._spinner.actor.show();
+        this._defaultButtonWell.add_child(this._spinner.actor);
+    },
+
+    _onDestroy: function() {
+        this._userVerifier.clear();
+    },
+
+    _initButtons: function() {
+        this.cancelButton = new St.Button({ style_class: 'modal-dialog-button',
+                                            button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
+                                            reactive: true,
+                                            can_focus: true,
+                                            label: _("Cancel") });
+        this.cancelButton.connect('clicked',
+                                   Lang.bind(this, function() {
+                                       this.cancel();
+                                   }));
+        this._buttonBox.add(this.cancelButton,
+                            { expand: false,
+                              x_fill: false,
+                              y_fill: false,
+                              x_align: St.Align.START,
+                              y_align: St.Align.END });
+
+        this._buttonBox.add(this._defaultButtonWell,
+                            { expand: true,
+                              x_fill: false,
+                              y_fill: false,
+                              x_align: St.Align.END,
+                              y_align: St.Align.MIDDLE });
+        this.nextButton = new St.Button({ style_class: 'modal-dialog-button',
+                                          button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
+                                          reactive: true,
+                                          can_focus: true,
+                                          label: _("Next") });
+        this.nextButton.connect('clicked',
+                                 Lang.bind(this, function() {
+                                     this.emit('next');
+                                 }));
+        this.nextButton.add_style_pseudo_class('default');
+        this._buttonBox.add(this.nextButton,
+                            { expand: false,
+                              x_fill: false,
+                              y_fill: false,
+                              x_align: St.Align.END,
+                              y_align: St.Align.END });
+
+        this._updateNextButtonSensitivity(this._entry.text.length > 0);
+
+        this._entry.clutter_text.connect('text-changed',
+                                         Lang.bind(this, function() {
+                                             if (!this._userVerifier.hasPendingMessages)
+                                                 this._fadeOutMessage();
+
+                                             this._updateNextButtonSensitivity(this._entry.text.length > 0);
+                                         }));
+        this._entry.clutter_text.connect('activate', Lang.bind(this, function() {
+            this.emit('next');
+        }));
+    },
+
+    _onAskQuestion: function(verifier, serviceName, question, passwordChar) {
+        if (this._preemptiveAnswer) {
+            this._userVerifier.answerQuery(this._queryingService, this._preemptiveAnswer);
+            this._preemptiveAnswer = null;
+            return;
+        }
+
+        if (this._queryingService)
+            this.clear();
+
+        this._queryingService = serviceName;
+        this.setPasswordChar(passwordChar);
+        this.setQuestion(question);
+
+        if (this.verifyingUser)
+            this.cancelButton.show();
+        else
+            this.cancelButton.hide();
+
+        if (passwordChar) {
+            if (this._userVerifier.reauthenticating)
+                this.nextButton.label = _("Unlock");
+            else
+                this.nextButton.label = C_("button", "Sign In");
+        } else {
+            this.nextButton.label = _("Next");
+        }
+
+        this.updateSensitivity(true);
+        this.emit('prompted');
+    },
+
+    _onShowMessage: function(userVerifier, message, styleClass) {
+        this.setMessage(message, styleClass);
+    },
+
+    _onVerificationFailed: function() {
+        this.clear();
+
+        this.updateSensitivity(true);
+        this.setActorInDefaultButtonWell(null);
+        this.userVerified = false;
+    },
+
+    _onVerificationComplete: function() {
+        this.userVerified = true;
+    },
+
+    _onReset: function() {
+        if (!this.userVerified)
+            this.reset();
+    },
+
+    _onShowLoginHint: function(verifier, message) {
+        this.setHint(message);
+    },
+
+    _onHideLoginHint: function() {
+        this.setHint(null);
+    },
+
+    addActorToDefaultButtonWell: function(actor) {
+        this._defaultButtonWell.add_child(actor);
+
+        actor.add_constraint(new Clutter.AlignConstraint({ source: this._spinner.actor,
+                                                           align_axis: Clutter.AlignAxis.BOTH,
+                                                           factor: 0.5 }));
+    },
+
+    setActorInDefaultButtonWell: function(actor, animate) {
+        if (!this._defaultButtonWellActor &&
+            !actor)
+            return;
+
+        let oldActor = this._defaultButtonWellActor;
+
+        if (oldActor)
+            Tweener.removeTweens(oldActor);
+
+        let isSpinner;
+        if (actor == this._spinner.actor)
+            isSpinner = true;
+        else
+            isSpinner = false;
+
+        if (this._defaultButtonWellActor != actor && oldActor) {
+            if (!animate) {
+                oldActor.opacity = 0;
+            } else {
+                Tweener.addTween(oldActor,
+                                 { opacity: 0,
+                                   time: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
+                                   delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
+                                   transition: 'linear',
+                                   onCompleteScope: this,
+                                   onComplete: function() {
+                                      if (isSpinner) {
+                                          if (this._spinner)
+                                              this._spinner.stop();
+                                      }
+                                   }
+                                 });
+            }
+        }
+
+        if (actor) {
+            if (isSpinner)
+                this._spinner.play();
+
+            if (!animate)
+                actor.opacity = 255;
+            else
+                Tweener.addTween(actor,
+                                 { opacity: 255,
+                                   time: DEFAULT_BUTTON_WELL_ANIMATION_TIME,
+                                   delay: DEFAULT_BUTTON_WELL_ANIMATION_DELAY,
+                                   transition: 'linear' });
+        }
+
+        this._defaultButtonWellActor = actor;
+    },
+
+    startSpinning: function() {
+        this.setActorInDefaultButtonWell(this._spinner.actor, true);
+    },
+
+    stopSpinning: function() {
+        this.setActorInDefaultButtonWell(null, false);
+    },
+
+    clear: function() {
+        this._entry.text = '';
+        this.stopSpinning();
+    },
+
+    setPasswordChar: function(passwordChar) {
+        this._entry.clutter_text.set_password_char(passwordChar);
+        this._entry.menu.isPassword = passwordChar != '';
+    },
+
+    setQuestion: function(question) {
+        this._label.set_text(question);
+
+        this._label.show();
+        this._entry.show();
+
+        this._loginHint.opacity = 0;
+        this._loginHint.show();
+
+        this._entry.grab_key_focus();
+    },
+
+    getAnswer: function() {
+        let text = this._entry.get_text();
+
+        return text;
+    },
+
+    _fadeOutMessage: function() {
+        if (this._message.opacity == 0)
+            return;
+        Tweener.removeTweens(this._message);
+        Tweener.addTween(this._message,
+                         { opacity: 0,
+                           time: MESSAGE_FADE_OUT_ANIMATION_TIME,
+                           transition: 'easeOutQuad'
+                         });
+    },
+
+    setMessage: function(message, styleClass) {
+        if (message) {
+            Tweener.removeTweens(this._message);
+            this._message.text = message;
+            this._message.styleClass = styleClass;
+            this._message.opacity = 255;
+        } else {
+            this._message.opacity = 0;
+        }
+    },
+
+    _updateNextButtonSensitivity: function(sensitive) {
+        this.nextButton.reactive = sensitive;
+        this.nextButton.can_focus = sensitive;
+    },
+
+    updateSensitivity: function(sensitive) {
+        this._updateNextButtonSensitivity(sensitive);
+        this._entry.reactive = sensitive;
+        this._entry.clutter_text.editable = sensitive;
+    },
+
+    hide: function() {
+        this.setActorInDefaultButtonWell(null, true);
+        this.actor.hide();
+        this._loginHint.opacity = 0;
+
+        this.setUser(null);
+
+        this.updateSensitivity(true);
+        this._entry.set_text('');
+    },
+
+    setUser: function(user) {
+        if (user) {
+            let userWidget = new UserWidget.UserWidget(user);
+            this._userWell.set_child(userWidget.actor);
+        } else {
+            this._userWell.set_child(null);
+        }
+    },
+
+    setHint: function(message) {
+        if (message) {
+            this._loginHint.set_text(message)
+            this._loginHint.opacity = 255;
+        } else {
+            this._loginHint.opacity = 0;
+            this._loginHint.set_text('');
+        }
+    },
+
+    reset: function() {
+        this.verifyingUser = false;
+        this.userVerified = false;
+        this._queryingService = null;
+        this.clear();
+        this._message.opacity = 0;
+        this.setUser(null);
+        this.stopSpinning();
+        this.setHint(null);
+
+        this.emit('reset');
+    },
+
+    addCharacter: function(unichar) {
+        if (!this._entry.visible)
+            return;
+
+        this._entry.grab_key_focus();
+        this._entry.clutter_text.insert_unichar(unichar);
+    },
+
+    begin: function(params) {
+        params = Params.parse(params, { userName: null,
+                                        hold: null });
+
+        this.updateSensitivity(false);
+
+        let hold = params.hold;
+        if (!hold)
+            hold = new Batch.Hold();
+
+        this._userVerifier.begin(params.userName, hold);
+        this.verifyingUser = true;
+    },
+
+    finish: function(onComplete) {
+        if (!this._userVerifier.hasPendingMessages) {
+            onComplete();
+            return;
+        }
+
+        let signalId = this._userVerifier.connect('no-more-messages',
+                                                  Lang.bind(this, function() {
+                                                      this._userVerifier.disconnect(signalId);
+                                                      onComplete();
+                                                  }));
+    },
+
+    cancel: function() {
+        if (this.verifyingUser)
+            this._userVerifier.cancel();
+
+        this.reset();
+    }
+});
+Signals.addSignalMethods(AuthPrompt.prototype);

js/gdm/realmd.js

@@ -63,7 +63,7 @@ const Manager = new Lang.Class({
                                            Lang.bind(this, this._reloadRealms))
         this._realms = {};
 
-        this._aggregateProvider.connect('g-properties-changed',
+        this._signalId = this._aggregateProvider.connect('g-properties-changed',
                                         Lang.bind(this, function(proxy, properties) {
                                             if ('Realms' in properties.deep_unpack())
                                                 this._reloadRealms();
@@ -106,7 +106,7 @@ const Manager = new Lang.Class({
         realm.connect('g-properties-changed',
                       Lang.bind(this, function(proxy, properties) {
                                 if ('Configured' in properties.deep_unpack())
-                                    this._reloadRealm();
+                                    this._reloadRealm(realm);
                                 }));
     },
 
@@ -134,6 +134,18 @@ const Manager = new Lang.Class({
         this._updateLoginFormat();
 
         return this._loginFormat;
+    },
+
+    release: function() {
+        Service(Gio.DBus.system,
+                'org.freedesktop.realmd',
+                '/org/freedesktop/realmd',
+                function(service) {
+                    service.ReleaseRemote();
+                });
+        this._aggregateProvider.disconnect(this._signalId);
+        this._realms = { };
+        this._updateLoginFormat();
     }
 });
 Signals.addSignalMethods(Manager.prototype)

js/gdm/util.js

@@ -1,20 +1,24 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
+const St = imports.gi.St;
 
 const Batch = imports.gdm.batch;
 const Fprint = imports.gdm.fingerprint;
-const Realmd = imports.gdm.realmd;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
+const ShellEntry = imports.ui.shellEntry;
 const Tweener = imports.ui.tweener;
 
 const PASSWORD_SERVICE_NAME = 'gdm-password';
 const FINGERPRINT_SERVICE_NAME = 'gdm-fingerprint';
 const FADE_ANIMATION_TIME = 0.16;
+const CLONE_FADE_ANIMATION_TIME = 0.25;
 
 const LOGIN_SCREEN_SCHEMA = 'org.gnome.login-screen';
 const FINGERPRINT_AUTHENTICATION_KEY = 'enable-fingerprint-authentication';
@@ -25,6 +29,9 @@ const ALLOWED_FAILURES_KEY = 'allowed-failures';
 const LOGO_KEY = 'logo';
 const DISABLE_USER_LIST_KEY = 'disable-user-list';
 
+// Give user 16ms to read each character of a PAM message
+const USER_READ_TIME = 16
+
 function fadeInActor(actor) {
     if (actor.opacity == 255 && actor.visible)
         return null;
@@ -71,6 +78,34 @@ function fadeOutActor(actor) {
     return hold;
 }
 
+function cloneAndFadeOutActor(actor) {
+    // Immediately hide actor so its sibling can have its space
+    // and position, but leave a non-reactive clone on-screen,
+    // so from the user's point of view it smoothly fades away
+    // and reveals its sibling.
+    actor.hide();
+
+    let clone = new Clutter.Clone({ source: actor,
+                                    reactive: false });
+
+    Main.uiGroup.add_child(clone);
+
+    let [x, y] = actor.get_transformed_position();
+    clone.set_position(x, y);
+
+    let hold = new Batch.Hold();
+    Tweener.addTween(clone,
+                     { opacity: 0,
+                       time: CLONE_FADE_ANIMATION_TIME,
+                       transition: 'easeOutQuad',
+                       onComplete: function() {
+                           clone.destroy();
+                           hold.release();
+                       }
+                     });
+    return hold;
+}
+
 const ShellUserVerifier = new Lang.Class({
     Name: 'ShellUserVerifier',
 
@@ -83,7 +118,10 @@ const ShellUserVerifier = new Lang.Class({
         this._settings = new Gio.Settings({ schema: LOGIN_SCREEN_SCHEMA });
 
         this._fprintManager = new Fprint.FprintManager();
-        this._realmManager = new Realmd.Manager();
+        this._messageQueue = [];
+        this._messageQueueTimeoutId = 0;
+        this.hasPendingMessages = false;
+        this.reauthenticating = false;
 
         this._failCounter = 0;
     },
@@ -92,6 +130,7 @@ const ShellUserVerifier = new Lang.Class({
         this._cancellable = new Gio.Cancellable();
         this._hold = hold;
         this._userName = userName;
+        this.reauthenticating = false;
 
         this._checkForFingerprintReader();
 
@@ -123,13 +162,73 @@ const ShellUserVerifier = new Lang.Class({
             this._userVerifier.run_dispose();
             this._userVerifier = null;
         }
+
+        this._clearMessageQueue();
     },
 
     answerQuery: function(serviceName, answer) {
-        // Clear any previous message
-        this.emit('show-message', null, null);
+        if (!this.hasPendingMessages) {
+            this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
+        } else {
+            let signalId = this.connect('no-more-messages',
+                                        Lang.bind(this, function() {
+                                            this.disconnect(signalId);
+                                            this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
+                                        }));
+        }
+    },
 
-        this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null);
+    _getIntervalForMessage: function(message) {
+        // We probably could be smarter here
+        return message.length * USER_READ_TIME;
+    },
+
+    finishMessageQueue: function() {
+        if (!this.hasPendingMessages)
+            return;
+
+        this._messageQueue = [];
+
+        this.hasPendingMessages = false;
+        this.emit('no-more-messages');
+    },
+
+    _queueMessageTimeout: function() {
+        if (this._messageQueue.length == 0) {
+            this.finishMessageQueue();
+            return;
+        }
+
+        if (this._messageQueueTimeoutId != 0)
+            return;
+
+        let message = this._messageQueue.shift();
+        this.emit('show-message', message.text, message.iconName);
+
+        this._messageQueueTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
+                                                       message.interval,
+                                                       Lang.bind(this, function() {
+                                                           this._messageQueueTimeoutId = 0;
+                                                           this._queueMessageTimeout();
+                                                       }));
+    },
+
+    _queueMessage: function(message, iconName) {
+        let interval = this._getIntervalForMessage(message);
+
+        this.hasPendingMessages = true;
+        this._messageQueue.push({ text: message, interval: interval, iconName: iconName });
+        this._queueMessageTimeout();
+    },
+
+    _clearMessageQueue: function() {
+        this.finishMessageQueue();
+
+        if (this._messageQueueTimeoutId != 0) {
+            GLib.source_remove(this._messageQueueTimeoutId);
+            this._messageQueueTimeoutId = 0;
+        }
+        this.emit('show-message', null, null);
     },
 
     _checkForFingerprintReader: function() {
@@ -149,7 +248,7 @@ const ShellUserVerifier = new Lang.Class({
         logError(error, where);
         this._hold.release();
 
-        this.emit('show-message', _("Authentication error"), 'login-dialog-message-warning');
+        this._queueMessage(_("Authentication error"), 'login-dialog-message-warning');
         this._verificationFailed(false);
     },
 
@@ -170,6 +269,7 @@ const ShellUserVerifier = new Lang.Class({
             return;
         }
 
+        this.reauthenticating = true;
         this._connectSignals();
         this._beginVerification();
         this._hold.release();
@@ -268,7 +368,7 @@ const ShellUserVerifier = new Lang.Class({
             // to indicate the user can swipe their finger instead
             this.emit('show-login-hint', _("(or swipe finger)"));
         } else if (serviceName == PASSWORD_SERVICE_NAME) {
-            this.emit('show-message', info, 'login-dialog-message-info');
+            this._queueMessage(info, 'login-dialog-message-info');
         }
     },
 
@@ -277,22 +377,7 @@ const ShellUserVerifier = new Lang.Class({
         // users who haven't enrolled their fingerprint.
         if (serviceName != PASSWORD_SERVICE_NAME)
             return;
-        this.emit('show-message', problem, 'login-dialog-message-warning');
-    },
-
-    _showRealmLoginHint: function() {
-        if (this._realmManager.loginFormat) {
-            let hint = this._realmManager.loginFormat;
-
-            hint = hint.replace(/%U/g, 'user');
-            hint = hint.replace(/%D/g, 'DOMAIN');
-            hint = hint.replace(/%[^UD]/g, '');
-
-            // Translators: this message is shown below the username entry field
-            // to clue the user in on how to login to the local network realm
-            this.emit('show-login-hint',
-                      _("(e.g., user or %s)").format(hint));
-        }
+        this._queueMessage(problem, 'login-dialog-message-warning');
     },
 
     _onInfoQuery: function(client, serviceName, question) {
@@ -300,10 +385,6 @@ const ShellUserVerifier = new Lang.Class({
         if (serviceName != PASSWORD_SERVICE_NAME)
             return;
 
-        this._showRealmLoginHint();
-        this._realmLoginHintSignalId = this._realmManager.connect('login-format-changed',
-                                                                  Lang.bind(this, this._showRealmLoginHint));
-
         this.emit('ask-question', serviceName, question, '');
     },
 
@@ -316,8 +397,6 @@ const ShellUserVerifier = new Lang.Class({
     },
 
     _onReset: function() {
-        this.clear();
-
         // Clear previous attempts to authenticate
         this._failCounter = 0;
 
@@ -328,6 +407,15 @@ const ShellUserVerifier = new Lang.Class({
         this.emit('verification-complete');
     },
 
+    _cancelAndReset: function() {
+        this.cancel();
+        this._onReset();
+    },
+
+    _retry: function() {
+        this.begin(this._userName, new Batch.Hold());
+    },
+
     _verificationFailed: function(retry) {
         // For Not Listed / enterprise logins, immediately reset
         // the dialog
@@ -339,15 +427,25 @@ const ShellUserVerifier = new Lang.Class({
             this._failCounter < this._settings.get_int(ALLOWED_FAILURES_KEY);
 
         if (canRetry) {
-            this.clear();
-            this.begin(this._userName, new Batch.Hold());
+            if (!this.hasPendingMessages) {
+                this._retry();
+            } else {
+                let signalId = this.connect('no-more-messages',
+                                            Lang.bind(this, function() {
+                                                this.disconnect(signalId);
+                                                this._retry();
+                                            }));
+            }
         } else {
-            // Allow some time to see the message, then reset everything
-            Mainloop.timeout_add(3000, Lang.bind(this, function() {
-                this.cancel();
-
-                this._onReset();
-            }));
+            if (!this.hasPendingMessages) {
+                this._cancelAndReset();
+            } else {
+                let signalId = this.connect('no-more-messages',
+                                            Lang.bind(this, function() {
+                                                this.disconnect(signalId);
+                                                this._cancelAndReset();
+                                            }));
+            }
         }
 
         this.emit('verification-failed');
@@ -362,11 +460,6 @@ const ShellUserVerifier = new Lang.Class({
         }
 
         this.emit('hide-login-hint');
-
-        if (this._realmLoginHintSignalId) {
-            this._realmManager.disconnect(this._realmLoginHintSignalId);
-            this._realmLoginHintSignalId = 0;
-        }
     },
 });
 Signals.addSignalMethods(ShellUserVerifier.prototype);

js/misc/extensionUtils.js

@@ -174,10 +174,15 @@ const ExtensionFinder = new Lang.Class({
         this.emit('extension-found', extension);
     },
 
+    _extensionsLoaded: function() {
+        this.emit('extensions-loaded');
+    },
+
     scanExtensions: function() {
         let perUserDir = Gio.File.new_for_path(global.userdatadir);
         FileUtils.collectFromDatadirsAsync('extensions',
                                            { processFile: Lang.bind(this, this._loadExtension),
+                                             loadedCallback: Lang.bind(this, this._extensionsLoaded),
                                              includeUserDir: true,
                                              data: perUserDir });
     }

js/misc/gnomeSession.js

@@ -58,6 +58,7 @@ const SessionManagerIface = <interface name="org.gnome.SessionManager">
     <arg type="u" direction="in" />
     <arg type="b" direction="out" />
 </method>
+<property name="SessionIsActive" type="b" access="read"/>
 <signal name="InhibitorAdded">
     <arg type="o" direction="out"/>
 </signal>

js/misc/hash.js

@@ -0,0 +1,144 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Lang = imports.lang;
+const System = imports.system;
+
+const Params = imports.misc.params;
+
+// This is an implementation of EcmaScript SameValue algorithm,
+// which returns true if two values are not observably distinguishable.
+// It was taken from http://wiki.ecmascript.org/doku.php?id=harmony:egal
+//
+// In the future, we may want to use the 'is' operator instead.
+function _sameValue(x, y) {
+    if (x === y) {
+        // 0 === -0, but they are not identical
+        return x !== 0 || 1 / x === 1 / y;
+    }
+
+    // NaN !== NaN, but they are identical.
+    // NaNs are the only non-reflexive value, i.e., if x !== x,
+    // then x is a NaN.
+    // isNaN is broken: it converts its argument to number, so
+    // isNaN("foo") => true
+    return x !== x && y !== y;
+}
+
+const _hashers = {
+    object: function(o) { return o ? System.addressOf(o) : 'null'; },
+    function: function(f) { return System.addressOf(f); },
+    string: function(s) { return s; },
+    number: function(n) { return String(n); },
+    undefined: function() { return 'undefined'; },
+};
+
+/* Map is meant to be similar in usage to ES6 Map, which is
+   described at http://wiki.ecmascript.org/doku.php?id=harmony:simple_maps_and_sets,
+   without requiring more than ES5 + Gjs extensions.
+
+   Known differences from other implementations:
+   Polyfills around the web usually implement HashMaps for
+   primitive values and reversed WeakMaps for object keys,
+   but we want real maps with real O(1) semantics in all cases,
+   and the easiest way is to have different hashers for different
+   types.
+
+   Known differences from the ES6 specification:
+   - Map is a Lang.Class, not a ES6 class, so inheritance,
+     prototype, sealing, etc. work differently.
+   - items(), keys() and values() don't return iterators,
+     they return actual arrays, so they incur a full copy everytime
+     they're called, and they don't see changes if you mutate
+     the table while iterating
+     (admittedly, the ES6 spec is a bit unclear on this, and
+     the reference code would just blow up)
+*/
+const Map = new Lang.Class({
+    Name: 'Map',
+
+    _init: function(iterable) {
+        this._pool = { };
+        this._size = 0;
+
+        if (iterable) {
+            for (let i = 0; i < iterable.length; i++) {
+                let [key, value] = iterable[i];
+                this.set(key, value);
+            }
+        }
+    },
+
+    _hashKey: function(key) {
+        let type = typeof(key);
+        return type + ':' + _hashers[type](key);
+    },
+
+    _internalGet: function(key) {
+        let hash = this._hashKey(key);
+        let node = this._pool[hash];
+
+        if (node && _sameValue(node.key, key))
+            return [true, node.value];
+        else
+            return [false, null];
+    },
+
+    get: function(key) {
+        return this._internalGet(key)[1];
+    },
+
+    has: function(key) {
+        return this._internalGet(key)[0];
+    },
+
+    set: function(key, value) {
+        let hash = this._hashKey(key);
+        let node = this._pool[hash];
+
+        if (node) {
+            node.key = key;
+            node.value = value;
+        } else {
+            this._pool[hash] = { key: key, value: value };
+            this._size++;
+        }
+    },
+
+    delete: function(key) {
+        let hash = this._hashKey(key);
+        let node = this._pool[hash];
+
+        if (node && _sameValue(node.key, key)) {
+            delete this._pool[hash];
+            this._size--;
+            return [node.key, node.value];
+        } else {
+            return [null, null];
+        }
+    },
+
+    keys: function() {
+        let pool = this._pool;
+        return Object.getOwnPropertyNames(pool).map(function(hash) {
+            return pool[hash].key;
+        });
+    },
+
+    values: function() {
+        let pool = this._pool;
+        return Object.getOwnPropertyNames(pool).map(function(hash) {
+            return pool[hash].value;
+        });
+    },
+
+    items: function() {
+        let pool = this._pool;
+        return Object.getOwnPropertyNames(pool).map(function(hash) {
+            return [pool[hash].key, pool[hash].value];
+        });
+    },
+
+    size: function() {
+        return this._size;
+    },
+});

js/misc/loginManager.js

@@ -5,7 +5,7 @@ const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;
-const UPowerGlib = imports.gi.UPowerGlib;
+const Signals = imports.signals;
 
 const SystemdLoginManagerIface = <interface name='org.freedesktop.login1.Manager'>
 <method name='PowerOff'>
@@ -26,6 +26,23 @@ const SystemdLoginManagerIface = <interface name='org.freedesktop.login1.Manager
 <method name='CanSuspend'>
     <arg type='s' direction='out'/>
 </method>
+<method name='Inhibit'>
+    <arg type='s' direction='in'/>
+    <arg type='s' direction='in'/>
+    <arg type='s' direction='in'/>
+    <arg type='s' direction='in'/>
+    <arg type='h' direction='out'/>
+</method>
+<method name='GetSession'>
+    <arg type='s' direction='in'/>
+    <arg type='o' direction='out'/>
+</method>
+<method name='ListSessions'>
+    <arg name='sessions' type='a(susso)' direction='out'/>
+</method>
+<signal name='PrepareForSleep'>
+    <arg type='b' direction='out'/>
+</signal>
 </interface>;
 
 const SystemdLoginSessionIface = <interface name='org.freedesktop.login1.Session'>
@@ -51,12 +68,6 @@ const ConsoleKitManagerIface = <interface name='org.freedesktop.ConsoleKit.Manag
 </interface>;
 
 const ConsoleKitSessionIface = <interface name='org.freedesktop.ConsoleKit.Session'>
-<method name='IsActive'>
-    <arg type='b' direction='out' />
-</method>
-<signal name='ActiveChanged'>
-    <arg type='b' direction='out' />
-</signal>
 <signal name='Lock' />
 <signal name='Unlock' />
 </interface>;
@@ -65,7 +76,36 @@ const ConsoleKitSession = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface)
 const ConsoleKitManager = Gio.DBusProxy.makeProxyWrapper(ConsoleKitManagerIface);
 
 function haveSystemd() {
-    return GLib.access("/sys/fs/cgroup/systemd", 0) >= 0;
+    return GLib.access("/run/systemd/seats", 0) >= 0;
+}
+
+function versionCompare(required, reference) {
+    required = required.split('.');
+    reference = reference.split('.');
+
+    for (let i = 0; i < required.length; i++) {
+        if (required[i] != reference[i])
+            return required[i] < reference[i];
+    }
+
+    return true;
+}
+
+function canLock() {
+    try {
+        let params = GLib.Variant.new('(ss)', ['org.gnome.DisplayManager.Manager', 'Version']);
+        let result = Gio.DBus.system.call_sync('org.gnome.DisplayManager',
+                                               '/org/gnome/DisplayManager/Manager',
+                                               'org.freedesktop.DBus.Properties',
+                                               'Get', params, null,
+                                               Gio.DBusCallFlags.NONE,
+                                               -1, null);
+
+        let version = result.deep_unpack()[0].deep_unpack();
+        return versionCompare('3.5.91', version);
+    } catch(e) {
+        return false;
+    }
 }
 
 let _loginManager = null;
@@ -93,24 +133,30 @@ const LoginManagerSystemd = new Lang.Class({
         this._proxy = new SystemdLoginManager(Gio.DBus.system,
                                               'org.freedesktop.login1',
                                               '/org/freedesktop/login1');
+        this._proxy.connectSignal('PrepareForSleep',
+                                  Lang.bind(this, this._prepareForSleep));
     },
 
     // Having this function is a bit of a hack since the Systemd and ConsoleKit
     // session objects have different interfaces - but in both cases there are
     // Lock/Unlock signals, and that's all we count upon at the moment.
-    getCurrentSessionProxy: function() {
-        if (!this._currentSession) {
-            this._currentSession = new SystemdLoginSession(Gio.DBus.system,
-                                                           'org.freedesktop.login1',
-                                                           '/org/freedesktop/login1/session/' +
-                                                           GLib.getenv('XDG_SESSION_ID'));
+    getCurrentSessionProxy: function(callback) {
+        if (this._currentSession) {
+            callback (this._currentSession);
+            return;
         }
 
-        return this._currentSession;
-    },
-
-    get sessionActive() {
-        return Shell.session_is_active_for_systemd();
+        this._proxy.GetSessionRemote(GLib.getenv('XDG_SESSION_ID'), Lang.bind(this,
+            function(result, error) {
+                if (error) {
+                    logError(error, 'Could not get a proxy for the current session');
+                } else {
+                    this._currentSession = new SystemdLoginSession(Gio.DBus.system,
+                                                                   'org.freedesktop.login1',
+                                                                   result[0]);
+                    callback(this._currentSession);
+                }
+            }));
     },
 
     canPowerOff: function(asyncCallback) {
@@ -140,6 +186,15 @@ const LoginManagerSystemd = new Lang.Class({
         });
     },
 
+    listSessions: function(asyncCallback) {
+        this._proxy.ListSessionsRemote(function(result, error) {
+            if (error)
+                asyncCallback([]);
+            else
+                asyncCallback(result[0]);
+        });
+    },
+
     powerOff: function() {
         this._proxy.PowerOffRemote(true);
     },
@@ -150,8 +205,33 @@ const LoginManagerSystemd = new Lang.Class({
 
     suspend: function() {
         this._proxy.SuspendRemote(true);
+    },
+
+    inhibit: function(reason, callback) {
+        let inVariant = GLib.Variant.new('(ssss)',
+                                         ['sleep',
+                                          'GNOME Shell',
+                                          reason,
+                                          'delay']);
+        this._proxy.call_with_unix_fd_list('Inhibit', inVariant, 0, -1, null, null,
+            Lang.bind(this, function(proxy, result) {
+                let fd = -1;
+                try {
+                    let [outVariant, fdList] = proxy.call_with_unix_fd_list_finish(result);
+                    fd = fdList.steal_fds(outVariant.deep_unpack())[0];
+                    callback(new Gio.UnixInputStream({ fd: fd }));
+                } catch(e) {
+                    logError(e, "Error getting systemd inhibitor");
+                    callback(null);
+                }
+            }));
+    },
+
+    _prepareForSleep: function(proxy, sender, [aboutToSuspend]) {
+        this.emit('prepare-for-sleep', aboutToSuspend);
     }
 });
+Signals.addSignalMethods(LoginManagerSystemd.prototype);
 
 const LoginManagerConsoleKit = new Lang.Class({
     Name: 'LoginManagerConsoleKit',
@@ -160,34 +240,28 @@ const LoginManagerConsoleKit = new Lang.Class({
         this._proxy = new ConsoleKitManager(Gio.DBus.system,
                                             'org.freedesktop.ConsoleKit',
                                             '/org/freedesktop/ConsoleKit/Manager');
-        this._upClient = new UPowerGlib.Client();
     },
 
     // Having this function is a bit of a hack since the Systemd and ConsoleKit
     // session objects have different interfaces - but in both cases there are
     // Lock/Unlock signals, and that's all we count upon at the moment.
-    getCurrentSessionProxy: function() {
-        if (!this._currentSession) {
-            let [currentSessionId] = this._proxy.GetCurrentSessionSync();
-            this._currentSession = new ConsoleKitSession(Gio.DBus.system,
-                                                         'org.freedesktop.ConsoleKit',
-                                                         currentSessionId);
+    getCurrentSessionProxy: function(callback) {
+        if (this._currentSession) {
+            callback (this._currentSession);
+            return;
         }
 
-        return this._currentSession;
-    },
-
-    get sessionActive() {
-        if (this._sessionActive !== undefined)
-            return this._sessionActive;
-
-        let session = this.getCurrentSessionProxy();
-        session.connectSignal('ActiveChanged', Lang.bind(this, function(object, senderName, [isActive]) {
-            this._sessionActive = isActive;
-        }));
-        [this._sessionActive] = session.IsActiveSync();
-
-        return this._sessionActive;
+        this._proxy.GetCurrentSessionRemote(Lang.bind(this,
+            function(result, error) {
+                if (error) {
+                    logError(error, 'Could not get a proxy for the current session');
+                } else {
+                    this._currentSession = new ConsoleKitSession(Gio.DBus.system,
+                                                                 'org.freedesktop.ConsoleKit',
+                                                                 result[0]);
+                    callback(this._currentSession);
+                }
+            }));
     },
 
     canPowerOff: function(asyncCallback) {
@@ -209,10 +283,11 @@ const LoginManagerConsoleKit = new Lang.Class({
     },
 
     canSuspend: function(asyncCallback) {
-        Mainloop.idle_add(Lang.bind(this, function() {
-            asyncCallback(this._upClient.get_can_suspend());
-            return false;
-        }));
+        asyncCallback(false);
+    },
+
+    listSessions: function(asyncCallback) {
+        asyncCallback([]);
     },
 
     powerOff: function() {
@@ -224,6 +299,12 @@ const LoginManagerConsoleKit = new Lang.Class({
     },
 
     suspend: function() {
-        this._upClient.suspend_sync(null);
+        this.emit('prepare-for-sleep', true);
+        this.emit('prepare-for-sleep', false);
+    },
+
+    inhibit: function(reason, callback) {
+        callback(null);
     }
 });
+Signals.addSignalMethods(LoginManagerConsoleKit.prototype);

js/misc/modemManager.js

@@ -2,9 +2,93 @@
 
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
-const Shell = imports.gi.Shell;
+const NMGtk = imports.gi.NMGtk;
 const Signals = imports.signals;
 
+// _getMobileProvidersDatabase:
+//
+// Gets the database of mobile providers, with references between MCCMNC/SID and
+// operator name
+//
+let _mpd;
+function _getMobileProvidersDatabase() {
+    if (_mpd == null) {
+        try {
+            _mpd = new NMGtk.MobileProvidersDatabase();
+            _mpd.init(null);
+        } catch (e) {
+            log(e.message);
+            _mpd = null;
+        }
+    }
+
+    return _mpd;
+}
+
+// _findProviderForMccMnc:
+// @operator_name: operator name
+// @operator_code: operator code
+//
+// Given an operator name string (which may not be a real operator name) and an
+// operator code string, tries to find a proper operator name to display.
+//
+function _findProviderForMccMnc(operator_name, operator_code) {
+    if (operator_name) {
+        if (operator_name.length != 0 &&
+            (operator_name.length > 6 || operator_name.length < 5)) {
+            // this looks like a valid name, i.e. not an MCCMNC (that some
+            // devices return when not yet connected
+            return operator_name;
+        }
+
+        if (isNaN(parseInt(operator_name))) {
+            // name is definitely not a MCCMNC, so it may be a name
+            // after all; return that
+            return operator_name;
+        }
+    }
+
+    let needle;
+    if ((!operator_name || operator_name.length == 0) && operator_code)
+        needle = operator_code;
+    else if (operator_name && (operator_name.length == 6 || operator_name.length == 5))
+        needle = operator_name;
+    else // nothing to search
+        return null;
+
+    let mpd = _getMobileProvidersDatabase();
+    if (mpd) {
+        let provider = mpd.lookup_3gpp_mcc_mnc(needle);
+        if (provider)
+            return provider.get_name();
+    }
+    return null;
+}
+
+// _findProviderForSid:
+// @sid: System Identifier of the serving CDMA network
+//
+// Tries to find the operator name corresponding to the given SID
+//
+function _findProviderForSid(sid) {
+    if (sid == 0)
+        return null;
+
+    let mpd = _getMobileProvidersDatabase();
+    if (mpd) {
+        let provider = mpd.lookup_cdma_sid(sid);
+        if (provider)
+            return provider.get_name();
+    }
+    return null;
+}
+
+
+//------------------------------------------------------------------------------
+// Support for the old ModemManager interface (MM < 0.7)
+//------------------------------------------------------------------------------
+
+
 // The following are not the complete interfaces, just the methods we need
 // (or may need in the future)
 
@@ -42,76 +126,6 @@ const ModemCdmaInterface = <interface name="org.freedesktop.ModemManager.Modem.C
 
 const ModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(ModemCdmaInterface);
 
-let _providersTable;
-function _getProvidersTable() {
-    if (_providersTable)
-        return _providersTable;
-    return _providersTable = Shell.mobile_providers_parse(null,null);
-}
-
-function findProviderForMCCMNC(table, needle) {
-    let needlemcc = needle.substring(0, 3);
-    let needlemnc = needle.substring(3, needle.length);
-
-    let name2, name3;
-    for (let iter in table) {
-        let country = table[iter];
-        let providers = country.get_providers();
-
-        // Search through each country's providers
-        for (let i = 0; i < providers.length; i++) {
-            let provider = providers[i];
-
-            // Search through MCC/MNC list
-            let list = provider.get_gsm_mcc_mnc();
-            for (let j = 0; j < list.length; j++) {
-                let mccmnc = list[j];
-
-                // Match both 2-digit and 3-digit MNC; prefer a
-                // 3-digit match if found, otherwise a 2-digit one.
-                if (mccmnc.mcc != needlemcc)
-                    continue;  // MCC was wrong
-
-                if (!name3 && needle.length == 6 && needlemnc == mccmnc.mnc)
-                    name3 = provider.name;
-
-                if (!name2 && needlemnc.substring(0, 2) == mccmnc.mnc.substring(0, 2))
-                    name2 = provider.name;
-
-                if (name2 && name3)
-                    break;
-            }
-        }
-    }
-
-    return name3 || name2 || null;
-}
-
-function findProviderForSid(table, sid) {
-    if (sid == 0)
-        return null;
-
-    // Search through each country
-    for (let iter in table) {
-        let country = table[iter];
-        let providers = country.get_providers();
-
-        // Search through each country's providers
-        for (let i = 0; i < providers.length; i++) {
-            let provider = providers[i];
-            let cdma_sid = provider.get_cdma_sid();
-
-            // Search through CDMA SID list
-            for (let j = 0; j < cdma_sid.length; j++) {
-                if (cdma_sid[j] == sid)
-                    return provider.name;
-            }
-        }
-    }
-
-    return null;
-}
-
 const ModemGsm = new Lang.Class({
     Name: 'ModemGsm',
 
@@ -127,7 +141,7 @@ const ModemGsm = new Lang.Class({
             this.emit('notify::signal-quality');
         }));
         this._proxy.connectSignal('RegistrationInfo', Lang.bind(this, function(proxy, sender, [status, code, name]) {
-            this.operator_name = this._findOperatorName(name, code);
+            this.operator_name = _findProviderForMccMnc(name, code);
             this.emit('notify::operator-name');
         }));
         this._proxy.GetRegistrationInfoRemote(Lang.bind(this, function([result], err) {
@@ -137,7 +151,7 @@ const ModemGsm = new Lang.Class({
             }
 
             let [status, code, name] = result;
-            this.operator_name = this._findOperatorName(name, code);
+            this.operator_name = _findProviderForMccMnc(name, code);
             this.emit('notify::operator-name');
         }));
         this._proxy.GetSignalQualityRemote(Lang.bind(this, function(result, err) {
@@ -150,32 +164,6 @@ const ModemGsm = new Lang.Class({
             }
             this.emit('notify::signal-quality');
         }));
-    },
-
-    _findOperatorName: function(name, opCode) {
-        if (name) {
-            if (name && name.length != 0 && (name.length > 6 || name.length < 5)) {
-                // this looks like a valid name, i.e. not an MCCMNC (that some
-                // devices return when not yet connected
-                return name;
-            }
-            if (isNaN(parseInt(name))) {
-                // name is definitely not a MCCMNC, so it may be a name
-                // after all; return that
-                return name;
-            }
-        }
-
-        let needle;
-        if ((name == null || name.length == 0) && opCode)
-            needle = opCode;
-        else if (name.length == 6 || name.length == 5)
-            needle = name;
-        else // nothing to search
-            return null;
-
-        let table = _getProvidersTable();
-        return findProviderForMCCMNC(table, needle);
     }
 });
 Signals.addSignalMethods(ModemGsm.prototype);
@@ -215,15 +203,99 @@ const ModemCdma = new Lang.Class({
                 // it will return an error if the device is not connected
                 this.operator_name = null;
             } else {
-                let [bandClass, band, id] = result;
-                if (name.length > 0) {
-                    let table = _getProvidersTable();
-                    this.operator_name = findProviderForSid(table, id);
-                } else
-                    this.operator_name = null;
+                let [bandClass, band, sid] = result;
+
+                this.operator_name = _findProviderForSid(sid)
             }
             this.emit('notify::operator-name');
         }));
     }
 });
 Signals.addSignalMethods(ModemCdma.prototype);
+
+
+//------------------------------------------------------------------------------
+// Support for the new ModemManager1 interface (MM >= 0.7)
+//------------------------------------------------------------------------------
+
+const BroadbandModemInterface = <interface name="org.freedesktop.ModemManager1.Modem">
+<property name="SignalQuality" type="(ub)" access="read" />
+</interface>;
+const BroadbandModemProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemInterface);
+
+const BroadbandModem3gppInterface = <interface name="org.freedesktop.ModemManager1.Modem.Modem3gpp">
+<property name="OperatorCode" type="s" access="read" />
+<property name="OperatorName" type="s" access="read" />
+</interface>;
+const BroadbandModem3gppProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModem3gppInterface);
+
+const BroadbandModemCdmaInterface = <interface name="org.freedesktop.ModemManager1.Modem.ModemCdma">
+<property name="Sid" type="u" access="read" />
+</interface>;
+const BroadbandModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(BroadbandModemCdmaInterface);
+
+const BroadbandModem = new Lang.Class({
+    Name: 'BroadbandModem',
+
+    _init: function(path, capabilities) {
+        this._proxy = new BroadbandModemProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
+        this._proxy_3gpp = new BroadbandModem3gppProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
+        this._proxy_cdma = new BroadbandModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager1', path);
+        this._capabilities = capabilities;
+
+        this._proxy.connect('g-properties-changed', Lang.bind(this, function(proxy, properties) {
+            if ('SignalQuality' in properties.deep_unpack())
+                this._reloadSignalQuality();
+        }));
+        this._reloadSignalQuality();
+
+        this._proxy_3gpp.connect('g-properties-changed', Lang.bind(this, function(proxy, properties) {
+            let unpacked = properties.deep_unpack();
+            if ('OperatorName' in unpacked || 'OperatorCode' in unpacked)
+                this._reload3gppOperatorName();
+        }));
+        this._reload3gppOperatorName();
+
+        this._proxy_cdma.connect('g-properties-changed', Lang.bind(this, function(proxy, properties) {
+            let unpacked = properties.deep_unpack();
+            if ('Nid' in unpacked || 'Sid' in unpacked)
+                this._reloadCdmaOperatorName();
+        }));
+        this._reloadCdmaOperatorName();
+    },
+
+    _reloadSignalQuality: function() {
+        let [quality, recent] = this._proxy.SignalQuality;
+        this.signal_quality = quality;
+        this.emit('notify::signal-quality');
+    },
+
+    _reloadOperatorName: function() {
+        let new_name = "";
+        if (this.operator_name_3gpp && this.operator_name_3gpp.length > 0)
+            new_name += this.operator_name_3gpp;
+
+        if (this.operator_name_cdma && this.operator_name_cdma.length > 0) {
+            if (new_name != "")
+                new_name += ", ";
+            new_name += this.operator_name_cdma;
+        }
+
+        this.operator_name = new_name;
+        this.emit('notify::operator-name');
+    },
+
+    _reload3gppOperatorName: function() {
+        let name = this._proxy_3gpp.OperatorName;
+        let code = this._proxy_3gpp.OperatorCode;
+        this.operator_name_3gpp = _findProviderForMccMnc(name, code);
+        this._reloadOperatorName();
+    },
+
+    _reloadCdmaOperatorName: function() {
+        let sid = this._proxy_cdma.Sid;
+        this.operator_name_cdma = _findProviderForSid(sid);
+        this._reloadOperatorName();
+    }
+});
+Signals.addSignalMethods(BroadbandModem.prototype);

js/misc/util.js

@@ -1,8 +1,13 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
+const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
+const St = imports.gi.St;
 
 const Main = imports.ui.main;
+const Tweener = imports.ui.tweener;
+
+const SCROLL_TIME = 0.1;
 
 // http://daringfireball.net/2010/07/improved_regex_for_matching_urls
 const _balancedParens = '\\((?:[^\\s()<>]+|(?:\\(?:[^\\s()<>]+\\)))*\\)';
@@ -13,7 +18,7 @@ const _urlRegexp = new RegExp(
     '(^|' + _leadingJunk + ')' +
     '(' +
         '(?:' +
-            '[a-z][\\w-]+://' +                   // scheme://
+            '(?:http|https|ftp)://' +             // scheme://
             '|' +
             'www\\d{0,3}[.]' +                    // www.
             '|' +
@@ -208,3 +213,63 @@ function insertSorted(array, val, cmp) {
 
     return pos;
 }
+
+function makeCloseButton() {
+    let closeButton = new St.Button({ style_class: 'notification-close'});
+
+    // This is a bit tricky. St.Bin has its own x-align/y-align properties
+    // that compete with Clutter's properties. This should be fixed for
+    // Clutter 2.0. Since St.Bin doesn't define its own setters, the
+    // setters are a workaround to get Clutter's version.
+    closeButton.set_x_align(Clutter.ActorAlign.END);
+    closeButton.set_y_align(Clutter.ActorAlign.START);
+
+    // XXX Clutter 2.0 workaround: ClutterBinLayout needs expand
+    // to respect the alignments.
+    closeButton.set_x_expand(true);
+    closeButton.set_y_expand(true);
+
+    closeButton.connect('style-changed', function() {
+        let themeNode = closeButton.get_theme_node();
+        closeButton.translation_x = themeNode.get_length('-shell-close-overlap-x');
+        closeButton.translation_y = themeNode.get_length('-shell-close-overlap-y');
+    });
+
+    return closeButton;
+}
+
+function ensureActorVisibleInScrollView(scrollView, actor) {
+    let adjustment = scrollView.vscroll.adjustment;
+    let [value, lower, upper, stepIncrement, pageIncrement, pageSize] = adjustment.get_values();
+
+    let offset = 0;
+    let vfade = scrollView.get_effect("fade");
+    if (vfade)
+        offset = vfade.vfade_offset;
+
+    let box = actor.get_allocation_box();
+    let y1 = box.y1, y2 = box.y2;
+
+    let parent = actor.get_parent();
+    while (parent != scrollView) {
+        if (!parent)
+            throw new Error("actor not in scroll view");
+
+        let box = parent.get_allocation_box();
+        y1 += box.y1;
+        y2 += box.y1;
+        parent = parent.get_parent();
+    }
+
+    if (y1 < value + offset)
+        value = Math.max(0, y1 - offset);
+    else if (y2 > value + pageSize - offset)
+        value = Math.min(upper, y2 + offset - pageSize);
+    else
+        return;
+
+    Tweener.addTween(adjustment,
+                     { value: value,
+                       time: SCROLL_TIME,
+                       transition: 'easeOutQuad' });
+}

js/ui/altTab.js

@@ -98,43 +98,13 @@ const AppSwitcherPopup = new Lang.Class({
         }
     },
 
-    _getAppLists: function() {
-        let tracker = Shell.WindowTracker.get_default();
-        let appSys = Shell.AppSystem.get_default();
-        let allApps = appSys.get_running ();
-
-        let screen = global.screen;
-        let display = screen.get_display();
-        let windows = display.get_tab_list(Meta.TabList.NORMAL_ALL, screen,
-                                           screen.get_active_workspace());
-
-        // windows is only the windows on the current workspace. For
-        // each one, if it corresponds to an app we know, move that
-        // app from allApps to apps.
-        let apps = [];
-        for (let i = 0; i < windows.length && allApps.length != 0; i++) {
-            let app = tracker.get_window_app(windows[i]);
-            let index = allApps.indexOf(app);
-            if (index != -1) {
-                apps.push(app);
-                allApps.splice(index, 1);
-            }
-        }
-
-        // Now @apps is a list of apps on the current workspace, in
-        // standard Alt+Tab order (MRU except for minimized windows),
-        // and allApps is a list of apps that only appear on other
-        // workspaces, sorted by user_time, which is good enough.
-        return [apps, allApps];
-    },
-
     _createSwitcher: function() {
-        let [localApps, otherApps] = this._getAppLists();
+        let apps = Shell.AppSystem.get_default().get_running ();
 
-        if (localApps.length == 0 && otherApps.length == 0)
+        if (apps.length == 0)
             return false;
 
-        this._switcherList = new AppSwitcher(localApps, otherApps, this);
+        this._switcherList = new AppSwitcher(apps, this);
         this._items = this._switcherList.icons;
 
         return true;
@@ -262,15 +232,13 @@ const AppSwitcherPopup = new Lang.Class({
     },
 
     _finish : function(timestamp) {
-        this.parent();
-
         let appIcon = this._items[this._selectedIndex];
-        let window;
-        if (this._currentWindow >= 0)
-            window = appIcon.cachedWindows[this._currentWindow];
+        if (this._currentWindow < 0)
+            appIcon.app.activate_window(appIcon.cachedWindows[0], timestamp);
         else
-            window = null;
-        appIcon.app.activate_window(window, timestamp);
+            Main.activateWindow(appIcon.cachedWindows[this._currentWindow], timestamp);
+
+        this.parent();
     },
 
     _onDestroy : function() {
@@ -429,9 +397,9 @@ const WindowSwitcherPopup = new Lang.Class({
     },
 
     _finish: function() {
-        this.parent();
-
         Main.activateWindow(this._items[this._selectedIndex].window);
+
+        this.parent();
     }
 });
 
@@ -461,34 +429,31 @@ const AppSwitcher = new Lang.Class({
     Name: 'AppSwitcher',
     Extends: SwitcherPopup.SwitcherList,
 
-    _init : function(localApps, otherApps, altTabPopup) {
+    _init : function(apps, altTabPopup) {
         this.parent(true);
 
-        // Construct the AppIcons, add to the popup
-        let activeWorkspace = global.screen.get_active_workspace();
-        let workspaceIcons = [];
-        let otherIcons = [];
-        for (let i = 0; i < localApps.length; i++) {
-            let appIcon = new AppIcon(localApps[i]);
-            // Cache the window list now; we don't handle dynamic changes here,
-            // and we don't want to be continually retrieving it
-            appIcon.cachedWindows = appIcon.app.get_windows();
-            workspaceIcons.push(appIcon);
-        }
-        for (let i = 0; i < otherApps.length; i++) {
-            let appIcon = new AppIcon(otherApps[i]);
-            appIcon.cachedWindows = appIcon.app.get_windows();
-            otherIcons.push(appIcon);
-        }
-
         this.icons = [];
         this._arrows = [];
-        for (let i = 0; i < workspaceIcons.length; i++)
-            this._addIcon(workspaceIcons[i]);
-        if (workspaceIcons.length > 0 && otherIcons.length > 0)
-            this.addSeparator();
-        for (let i = 0; i < otherIcons.length; i++)
-            this._addIcon(otherIcons[i]);
+
+        let windowTracker = Shell.WindowTracker.get_default();
+        let settings = new Gio.Settings({ schema: 'org.gnome.shell.app-switcher' });
+        let workspace = settings.get_boolean('current-workspace-only') ? global.screen.get_active_workspace()
+                                                                       : null;
+        let allWindows = global.display.get_tab_list(Meta.TabList.NORMAL,
+                                                     global.screen, workspace);
+
+        // Construct the AppIcons, add to the popup
+        for (let i = 0; i < apps.length; i++) {
+            let appIcon = new AppIcon(apps[i]);
+            // Cache the window list now; we don't handle dynamic changes here,
+            // and we don't want to be continually retrieving it
+            appIcon.cachedWindows = allWindows.filter(function(w) {
+                return windowTracker.get_window_app (w) == appIcon.app;
+            });
+            if (workspace == null || appIcon.cachedWindows.length > 0) {
+                this._addIcon(appIcon);
+            }
+        }
 
         this._curApp = -1;
         this._iconSize = 0;
@@ -514,8 +479,6 @@ const AppSwitcher = new Lang.Class({
         let [iconMinHeight, iconNaturalHeight] = this.icons[j].label.get_preferred_height(-1);
         let iconSpacing = iconNaturalHeight + iconPadding + iconBorder;
         let totalSpacing = this._list.spacing * (this._items.length - 1);
-        if (this._separator)
-           totalSpacing += this._separator.width + this._list.spacing;
 
         // We just assume the whole screen here due to weirdness happing with the passed width
         let primary = Main.layoutManager.primaryMonitor;
@@ -638,24 +601,12 @@ const ThumbnailList = new Lang.Class({
     _init : function(windows) {
         this.parent(false);
 
-        let activeWorkspace = global.screen.get_active_workspace();
-
-        // We fake the value of 'separatorAdded' when the app has no window
-        // on the current workspace, to avoid displaying a useless separator in
-        // that case.
-        let separatorAdded = windows.length == 0 || windows[0].get_workspace() != activeWorkspace;
-
         this._labels = new Array();
         this._thumbnailBins = new Array();
         this._clones = new Array();
         this._windows = windows;
 
         for (let i = 0; i < windows.length; i++) {
-            if (!separatorAdded && windows[i].get_workspace() != activeWorkspace) {
-              this.addSeparator();
-              separatorAdded = true;
-            }
-
             let box = new St.BoxLayout({ style_class: 'thumbnail-box',
                                          vertical: true });
 

js/ui/animation.js

@@ -0,0 +1,84 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Lang = imports.lang;
+const Mainloop = imports.mainloop;
+const St = imports.gi.St;
+const Signals = imports.signals;
+const Atk = imports.gi.Atk;
+
+const ANIMATED_ICON_UPDATE_TIMEOUT = 100;
+
+const Animation = new Lang.Class({
+    Name: 'Animation',
+
+    _init: function(filename, width, height, speed) {
+        this.actor = new St.Bin();
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
+        this._speed = speed;
+
+        this._isLoaded = false;
+        this._isPlaying = false;
+        this._timeoutId = 0;
+        this._frame = 0;
+        this._animations = St.TextureCache.get_default().load_sliced_image (filename, width, height,
+                                                                            Lang.bind(this, this._animationsLoaded));
+        this.actor.set_child(this._animations);
+    },
+
+    play: function() {
+        if (this._isLoaded && this._timeoutId == 0) {
+            if (this._frame == 0)
+                this._showFrame(0);
+
+            this._timeoutId = Mainloop.timeout_add(this._speed, Lang.bind(this, this._update));
+        }
+
+        this._isPlaying = true;
+    },
+
+    stop: function() {
+        if (this._timeoutId > 0) {
+            Mainloop.source_remove(this._timeoutId);
+            this._timeoutId = 0;
+        }
+
+        this._isPlaying = false;
+    },
+
+    _showFrame: function(frame) {
+        let oldFrameActor = this._animations.get_child_at_index(this._frame);
+        if (oldFrameActor)
+            oldFrameActor.hide();
+
+        this._frame = (frame % this._animations.get_n_children());
+
+        let newFrameActor = this._animations.get_child_at_index(this._frame);
+        if (newFrameActor)
+            newFrameActor.show();
+    },
+
+    _update: function() {
+        this._showFrame(this._frame + 1);
+        return true;
+    },
+
+    _animationsLoaded: function() {
+        this._isLoaded = true;
+
+        if (this._isPlaying)
+            this.play();
+    },
+
+    _onDestroy: function() {
+        this.stop();
+    }
+});
+
+const AnimatedIcon = new Lang.Class({
+    Name: 'AnimatedIcon',
+    Extends: Animation,
+
+    _init: function(filename, size) {
+        this.parent(filename, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
+    }
+});

js/ui/background.js

@@ -0,0 +1,826 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Clutter = imports.gi.Clutter;
+const GDesktopEnums = imports.gi.GDesktopEnums;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const GnomeDesktop = imports.gi.GnomeDesktop;
+const Lang = imports.lang;
+const Meta = imports.gi.Meta;
+const Signals = imports.signals;
+
+const Main = imports.ui.main;
+const Params = imports.misc.params;
+const Tweener = imports.ui.tweener;
+
+const BACKGROUND_SCHEMA = 'org.gnome.desktop.background';
+const PRIMARY_COLOR_KEY = 'primary-color';
+const SECONDARY_COLOR_KEY = 'secondary-color';
+const COLOR_SHADING_TYPE_KEY = 'color-shading-type';
+const BACKGROUND_STYLE_KEY = 'picture-options';
+const PICTURE_OPACITY_KEY = 'picture-opacity';
+const PICTURE_URI_KEY = 'picture-uri';
+
+const FADE_ANIMATION_TIME = 1.0;
+
+// These parameters affect how often we redraw.
+// The first is how different (percent crossfaded) the slide show
+// has to look before redrawing and the second is the minimum
+// frequency (in seconds) we're willing to wake up
+const ANIMATION_OPACITY_STEP_INCREMENT = 4.0;
+const ANIMATION_MIN_WAKEUP_INTERVAL = 1.0;
+
+let _backgroundCache = null;
+
+const BackgroundCache = new Lang.Class({
+    Name: 'BackgroundCache',
+
+    _init: function() {
+       this._patterns = [];
+       this._images = [];
+       this._pendingFileLoads = [];
+       this._fileMonitors = {};
+    },
+
+    getPatternContent: function(params) {
+        params = Params.parse(params, { monitorIndex: 0,
+                                        color: null,
+                                        secondColor: null,
+                                        shadingType: null,
+                                        effects: Meta.BackgroundEffects.NONE });
+
+        let content = null;
+        let candidateContent = null;
+        for (let i = 0; i < this._patterns.length; i++) {
+            if (!this._patterns[i])
+                continue;
+
+            if (this._patterns[i].get_shading() != params.shadingType)
+                continue;
+
+            if (!params.color.equal(this._patterns[i].get_color()))
+                continue;
+
+            if (params.shadingType != GDesktopEnums.BackgroundShading.SOLID &&
+                !params.secondColor.equal(this._patterns[i].get_second_color()))
+                continue;
+
+            candidateContent = this._patterns[i];
+
+            if (params.effects != this._patterns[i].effects)
+                continue;
+
+            break;
+        }
+
+        if (candidateContent) {
+            content = candidateContent.copy(params.monitorIndex, params.effects);
+        } else {
+            content = new Meta.Background({ meta_screen: global.screen,
+                                            monitor: params.monitorIndex,
+                                            effects: params.effects });
+
+            if (params.shadingType == GDesktopEnums.BackgroundShading.SOLID) {
+                content.load_color(params.color);
+            } else {
+                content.load_gradient(params.shadingType, params.color, params.secondColor);
+            }
+        }
+
+        this._patterns.push(content);
+
+        return content;
+    },
+
+    _monitorFile: function(filename) {
+        if (this._fileMonitors[filename])
+            return;
+
+        let file = Gio.File.new_for_path(filename);
+        let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null);
+
+        let signalId = monitor.connect('changed',
+                                       Lang.bind(this, function() {
+                                           for (let i = 0; i < this._images.length; i++) {
+                                               if (this._images[i].get_filename() == filename)
+                                                   this._images.splice(i, 1);
+                                           }
+
+                                           monitor.disconnect(signalId);
+
+                                           this.emit('file-changed', filename);
+                                       }));
+
+        this._fileMonitors[filename] = monitor;
+    },
+
+    _removeContent: function(contentList, content) {
+        let index = contentList.indexOf(content);
+
+        if (index >= 0)
+            contentList.splice(index, 1);
+    },
+
+    removePatternContent: function(content) {
+        this._removeContent(this._patterns, content);
+    },
+
+    removeImageContent: function(content) {
+        let filename = content.get_filename();
+
+        if (filename && this._fileMonitors[filename])
+            delete this._fileMonitors[filename];
+
+        this._removeContent(this._images, content);
+    },
+
+    _loadImageContent: function(params) {
+        params = Params.parse(params, { monitorIndex: 0,
+                                        style: null,
+                                        filename: null,
+                                        effects: Meta.BackgroundEffects.NONE,
+                                        cancellable: null,
+                                        onFinished: null });
+
+        let fileLoad = { filename: params.filename,
+                         style: params.style,
+                         shouldCopy: false,
+                         monitorIndex: params.monitorIndex,
+                         effects: params.effects,
+                         onFinished: params.onFinished,
+                         cancellable: new Gio.Cancellable(), };
+        this._pendingFileLoads.push(fileLoad);
+
+        if (params.cancellable) {
+            params.cancellable.connect(Lang.bind(this, function(c) {
+               fileLoad.cancellable.cancel();
+            }));
+        }
+
+        let content = new Meta.Background({ meta_screen: global.screen,
+                                            monitor: params.monitorIndex,
+                                            effects: params.effects });
+
+        content.load_file_async(params.filename,
+                                params.style,
+                                fileLoad.cancellable,
+                                Lang.bind(this,
+                                          function(object, result) {
+                                              if (fileLoad.cancellable.is_cancelled()) {
+                                                  if (params.cancellable && params.cancellable.is_cancelled()) {
+                                                      if (params.onFinished)
+                                                          params.onFinished(null);
+                                                      this._removePendingFileLoad(fileLoad);
+                                                      return;
+                                                  }
+                                                  return;
+                                              }
+
+                                              try {
+                                                  content.load_file_finish(result);
+
+                                                  this._monitorFile(params.filename);
+                                                  this._images.push(content);
+                                              } catch(e) {
+                                                  content = null;
+                                              }
+
+                                              let needsCopy = false;
+                                              for (let i = 0; i < this._pendingFileLoads.length; i++) {
+                                                  let pendingLoad = this._pendingFileLoads[i];
+                                                  if (pendingLoad.filename != params.filename ||
+                                                      pendingLoad.style != params.style)
+                                                      continue;
+
+                                                  if (pendingLoad.cancellable.is_cancelled())
+                                                      continue;
+
+                                                  pendingLoad.cancellable.cancel();
+                                                  if (pendingLoad.onFinished) {
+                                                      if (content && needsCopy) {
+                                                          content = object.copy(pendingLoad.monitorIndex,
+                                                                                pendingLoad.effects);
+                                                      }
+
+                                                      needsCopy = true;
+                                                      pendingLoad.onFinished(content);
+                                                  }
+
+                                                  this._pendingFileLoads.splice(i, 1);
+                                              }
+                                          }));
+    },
+
+    _removePendingFileLoad: function(fileLoad) {
+        for (let i = 0; i < this._pendingFileLoads.length; i++) {
+            if (this._pendingFileLoads[i].cancellable == fileLoad.cancellable) {
+                this._pendingFileLoads.splice(i, 1);
+                break;
+            }
+        }
+    },
+
+    getImageContent: function(params) {
+        params = Params.parse(params, { monitorIndex: 0,
+                                        style: null,
+                                        filename: null,
+                                        effects: Meta.BackgroundEffects.NONE,
+                                        cancellable: null,
+                                        onFinished: null });
+
+        let content = null;
+        let candidateContent = null;
+        for (let i = 0; i < this._images.length; i++) {
+            if (!this._images[i])
+                continue;
+
+            if (this._images[i].get_style() != params.style)
+                continue;
+
+            if (this._images[i].get_filename() != params.filename)
+                continue;
+
+            if (params.style == GDesktopEnums.BackgroundStyle.SPANNED &&
+                this._images[i].monitor_index != this._monitorIndex)
+                continue;
+
+            candidateContent = this._images[i];
+
+            if (params.effects != this._images[i].effects)
+                continue;
+
+            break;
+        }
+
+        if (candidateContent) {
+            content = candidateContent.copy(params.monitorIndex, params.effects);
+
+            if (params.cancellable && params.cancellable.is_cancelled())
+                content = null;
+            else
+                this._images.push(content);
+
+            if (params.onFinished)
+                params.onFinished(content);
+        } else {
+            this._loadImageContent({ filename: params.filename,
+                                     style: params.style,
+                                     effects: params.effects,
+                                     monitorIndex: params.monitorIndex,
+                                     cancellable: params.cancellable,
+                                     onFinished: params.onFinished });
+
+        }
+    },
+
+    getAnimation: function(params) {
+        params = Params.parse(params, { filename: null,
+                                        onLoaded: null });
+
+        if (this._animationFilename == params.filename) {
+            if (params.onLoaded) {
+                GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
+                    params.onLoaded(this._animation);
+                }));
+            }
+        }
+
+        let animation = new Animation({ filename: params.filename });
+
+        animation.load(Lang.bind(this, function() {
+                           this._monitorFile(params.filename);
+                           this._animationFilename = params.filename;
+                           this._animation = animation;
+
+                           if (params.onLoaded) {
+                               GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
+                                   params.onLoaded(this._animation);
+                               }));
+                           }
+                       }));
+    }
+});
+Signals.addSignalMethods(BackgroundCache.prototype);
+
+function getBackgroundCache() {
+    if (!_backgroundCache)
+        _backgroundCache = new BackgroundCache();
+    return _backgroundCache;
+}
+
+const Background = new Lang.Class({
+    Name: 'Background',
+
+    _init: function(params) {
+        params = Params.parse(params, { monitorIndex: 0,
+                                        layoutManager: Main.layoutManager,
+                                        effects: Meta.BackgroundEffects.NONE });
+        this.actor = new Meta.BackgroundGroup();
+        this.actor._delegate = this;
+
+        this._destroySignalId = this.actor.connect('destroy',
+                                                   Lang.bind(this, this._destroy));
+
+        this._settings = new Gio.Settings({ schema: BACKGROUND_SCHEMA });
+        this._monitorIndex = params.monitorIndex;
+        this._layoutManager = params.layoutManager;
+        this._effects = params.effects;
+        this._fileWatches = {};
+        this._pattern = null;
+        // contains a single image for static backgrounds and
+        // two images (from and to) for slide shows
+        this._images = {};
+
+        this._brightness = 1.0;
+        this._vignetteSharpness = 0.2;
+        this._saturation = 1.0;
+        this._cancellable = new Gio.Cancellable();
+        this.isLoaded = false;
+
+        this._settings.connect('changed', Lang.bind(this, function() {
+                                   this.emit('changed');
+                               }));
+
+        this._load();
+    },
+
+    _destroy: function() {
+        this._cancellable.cancel();
+
+        if (this._updateAnimationTimeoutId) {
+            GLib.source_remove (this._updateAnimationTimeoutId);
+            this._updateAnimationTimeoutId = 0;
+        }
+
+        let i;
+        let keys = Object.keys(this._fileWatches);
+        for (i = 0; i < keys.length; i++) {
+            this._cache.disconnect(this._fileWatches[keys[i]]);
+        }
+        this._fileWatches = null;
+
+        if (this._pattern) {
+            if (this._pattern.content)
+                this._cache.removePatternContent(this._pattern.content);
+
+            this._pattern.destroy();
+            this._pattern = null;
+        }
+
+        keys = Object.keys(this._images);
+        for (i = 0; i < keys.length; i++) {
+            let actor = this._images[keys[i]];
+
+            if (actor.content)
+                this._cache.removeImageContent(actor.content);
+
+            actor.destroy();
+            this._images[keys[i]] = null;
+        }
+
+        this.actor.disconnect(this._destroySignalId);
+        this._destroySignalId = 0;
+    },
+
+    _setLoaded: function() {
+        if (this.isLoaded)
+            return;
+
+        this.isLoaded = true;
+
+        GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
+            this.emit('loaded');
+            return false;
+        }));
+    },
+
+    _loadPattern: function() {
+        let colorString, res, color, secondColor;
+
+        colorString = this._settings.get_string(PRIMARY_COLOR_KEY);
+        [res, color] = Clutter.Color.from_string(colorString);
+        colorString = this._settings.get_string(SECONDARY_COLOR_KEY);
+        [res, secondColor] = Clutter.Color.from_string(colorString);
+
+        let shadingType = this._settings.get_enum(COLOR_SHADING_TYPE_KEY);
+
+        let content = this._cache.getPatternContent({ monitorIndex: this._monitorIndex,
+                                                      effects: this._effects,
+                                                      color: color,
+                                                      secondColor: secondColor,
+                                                      shadingType: shadingType });
+
+        this._pattern = new Meta.BackgroundActor();
+        this.actor.add_child(this._pattern);
+
+        this._pattern.content = content;
+    },
+
+    _watchCacheFile: function(filename) {
+        if (this._fileWatches[filename])
+            return;
+
+        let signalId = this._cache.connect('file-changed',
+                                           Lang.bind(this, function(cache, changedFile) {
+                                               if (changedFile == filename) {
+                                                   this.emit('changed');
+                                               }
+                                           }));
+        this._fileWatches[filename] = signalId;
+    },
+
+    _addImage: function(content, index, filename) {
+        content.saturation = this._saturation;
+        content.brightness = this._brightness;
+        content.vignette_sharpness = this._vignetteSharpness;
+
+        let actor = new Meta.BackgroundActor();
+        actor.content = content;
+
+        // The background pattern is the first actor in
+        // the group, and all images should be above that.
+        this.actor.insert_child_at_index(actor, index + 1);
+
+        this._images[index] = actor;
+        this._watchCacheFile(filename);
+    },
+
+    _updateImage: function(content, index, filename) {
+        content.saturation = this._saturation;
+        content.brightness = this._brightness;
+        content.vignette_sharpness = this._vignetteSharpness;
+
+        this._cache.removeImageContent(this._images[index].content);
+        this._images[index].content = content;
+        this._watchCacheFile(filename);
+    },
+
+    _updateAnimationProgress: function() {
+        if (this._images[1])
+            this._images[1].opacity = this._animation.transitionProgress * 255;
+
+        this._queueUpdateAnimation();
+    },
+
+    _updateAnimation: function() {
+        this._updateAnimationTimeoutId = 0;
+
+        this._animation.update(this._layoutManager.monitors[this._monitorIndex]);
+        let files = this._animation.keyFrameFiles;
+
+        if (files.length == 0) {
+            this._setLoaded();
+            this._queueUpdateAnimation();
+            return;
+        }
+
+        let numPendingImages = files.length;
+        for (let i = 0; i < files.length; i++) {
+            if (this._images[i] && this._images[i].content &&
+                this._images[i].content.get_filename() == files[i]) {
+
+                numPendingImages--;
+                if (numPendingImages == 0)
+                    this._updateAnimationProgress();
+                continue;
+            }
+            this._cache.getImageContent({ monitorIndex: this._monitorIndex,
+                                          effects: this._effects,
+                                          style: this._style,
+                                          filename: files[i],
+                                          cancellable: this._cancellable,
+                                          onFinished: Lang.bind(this, function(content, i) {
+                                              numPendingImages--;
+
+                                              if (!content) {
+                                                  this._setLoaded();
+                                                  if (numPendingImages == 0)
+                                                      this._updateAnimationProgress();
+                                                  return;
+                                              }
+
+                                              if (!this._images[i]) {
+                                                  this._addImage(content, i, files[i]);
+                                              } else {
+                                                  this._updateImage(content, i, files[i]);
+                                              }
+
+                                              if (numPendingImages == 0) {
+                                                  this._setLoaded();
+                                                  this._updateAnimationProgress();
+                                              }
+                                          }, i)
+                                        });
+        }
+    },
+
+    _queueUpdateAnimation: function() {
+        if (this._updateAnimationTimeoutId != 0)
+            return;
+
+        if (!this._cancellable || this._cancellable.is_cancelled())
+            return;
+
+        if (!this._animation.transitionDuration)
+            return;
+
+        let nSteps = 255 / ANIMATION_OPACITY_STEP_INCREMENT;
+        let timePerStep = (this._animation.transitionDuration * 1000) / nSteps;
+
+        let interval = Math.max(ANIMATION_MIN_WAKEUP_INTERVAL * 1000,
+                                timePerStep);
+
+        if (interval > GLib.MAXUINT32)
+            return;
+
+        this._updateAnimationTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
+                                                      interval,
+                                                      Lang.bind(this, function() {
+                                                                    this._updateAnimationTimeoutId = 0;
+                                                                    this._updateAnimation();
+                                                                    return false;
+                                                                }));
+    },
+
+    _loadAnimation: function(filename) {
+        this._cache.getAnimation({ filename: filename,
+                                             onLoaded: Lang.bind(this, function(animation) {
+                                                 this._animation = animation;
+
+                                                 if (!this._animation || this._cancellable.is_cancelled()) {
+                                                     this._setLoaded();
+                                                     return;
+                                                 }
+
+                                                 this._updateAnimation();
+                                                 this._watchCacheFile(filename);
+                                             })
+                                           });
+    },
+
+    _loadFile: function(filename) {
+        this._cache.getImageContent({ monitorIndex: this._monitorIndex,
+                                      effects: this._effects,
+                                      style: this._style,
+                                      filename: filename,
+                                      cancellable: this._cancellable,
+                                      onFinished: Lang.bind(this, function(content) {
+                                          if (!content) {
+                                              if (!this._cancellable.is_cancelled())
+                                                  this._loadAnimation(filename);
+                                              return;
+                                          }
+
+                                          this._addImage(content, 0, filename);
+                                          this._setLoaded();
+                                      })
+                                    });
+
+    },
+
+    _load: function () {
+        this._cache = getBackgroundCache();
+
+        this._loadPattern(this._cache);
+
+        this._style = this._settings.get_enum(BACKGROUND_STYLE_KEY);
+        if (this._style == GDesktopEnums.BackgroundStyle.NONE) {
+            this._setLoaded();
+            return;
+        }
+
+        let uri = this._settings.get_string(PICTURE_URI_KEY);
+        let filename;
+        if (GLib.uri_parse_scheme(uri) != null)
+            filename = Gio.File.new_for_uri(uri).get_path();
+        else
+            filename = uri;
+
+        if (!filename) {
+            this._setLoaded();
+            return;
+        }
+
+        this._loadFile(filename);
+    },
+
+    get saturation() {
+        return this._saturation;
+    },
+
+    set saturation(saturation) {
+        this._saturation = saturation;
+
+        if (this._pattern && this._pattern.content)
+            this._pattern.content.saturation = saturation;
+
+        let keys = Object.keys(this._images);
+        for (let i = 0; i < keys.length; i++) {
+            let image = this._images[keys[i]];
+            if (image && image.content)
+                image.content.saturation = saturation;
+        }
+    },
+
+    get brightness() {
+        return this._brightness;
+    },
+
+    set brightness(factor) {
+        this._brightness = factor;
+        if (this._pattern && this._pattern.content)
+            this._pattern.content.brightness = factor;
+
+        let keys = Object.keys(this._images);
+        for (let i = 0; i < keys.length; i++) {
+            let image = this._images[keys[i]];
+            if (image && image.content)
+                image.content.brightness = factor;
+        }
+    },
+
+    get vignetteSharpness() {
+        return this._vignetteSharpness;
+    },
+
+    set vignetteSharpness(sharpness) {
+        this._vignetteSharpness = sharpness;
+        if (this._pattern && this._pattern.content)
+            this._pattern.content.vignette_sharpness = sharpness;
+
+        let keys = Object.keys(this._images);
+        for (let i = 0; i < keys.length; i++) {
+            let image = this._images[keys[i]];
+            if (image && image.content)
+                image.content.vignette_sharpness = sharpness;
+        }
+    }
+});
+Signals.addSignalMethods(Background.prototype);
+
+const SystemBackground = new Lang.Class({
+    Name: 'SystemBackground',
+
+    _init: function() {
+        this._cache = getBackgroundCache();
+        this.actor = new Meta.BackgroundActor();
+
+        this._cache.getImageContent({ style: GDesktopEnums.BackgroundStyle.WALLPAPER,
+                                      filename: global.datadir + '/theme/noise-texture.png',
+                                      effects: Meta.BackgroundEffects.NONE,
+                                      onFinished: Lang.bind(this, function(content) {
+                                          this.actor.content = content;
+                                          this.emit('loaded');
+                                      })
+                                    });
+    }
+});
+Signals.addSignalMethods(SystemBackground.prototype);
+
+const Animation = new Lang.Class({
+    Name: 'Animation',
+
+    _init: function(params) {
+        params = Params.parse(params, { filename: null });
+
+        this.filename = params.filename;
+        this.keyFrameFiles = [];
+        this.transitionProgress = 0.0;
+        this.transitionDuration = 0.0;
+        this.loaded = false;
+    },
+
+    load: function(callback) {
+        let file = Gio.File.new_for_path(this.filename);
+
+        this._show = new GnomeDesktop.BGSlideShow({ filename: this.filename });
+
+        this._show.load_async(null,
+                              Lang.bind(this,
+                                        function(object, result) {
+                                            this.loaded = true;
+                                            if (callback)
+                                                callback();
+                                        }));
+    },
+
+    update: function(monitor) {
+        this.keyFrameFiles = [];
+
+        if (!this._show)
+            return;
+
+        if (this._show.get_num_slides() < 1)
+            return;
+
+        let [progress, duration, isFixed, file1, file2] = this._show.get_current_slide(monitor.width, monitor.height);
+
+        this.transitionDuration = duration;
+        this.transitionProgress = progress;
+
+        if (file1)
+            this.keyFrameFiles.push(file1);
+
+        if (file2)
+            this.keyFrameFiles.push(file2);
+    },
+});
+Signals.addSignalMethods(Animation.prototype);
+
+const BackgroundManager = new Lang.Class({
+    Name: 'BackgroundManager',
+
+    _init: function(params) {
+        params = Params.parse(params, { container: null,
+                                        layoutManager: Main.layoutManager,
+                                        monitorIndex: null,
+                                        effects: Meta.BackgroundEffects.NONE,
+                                        controlPosition: true });
+
+        this._container = params.container;
+        this._layoutManager = params.layoutManager;
+        this._effects = params.effects;
+        this._monitorIndex = params.monitorIndex;
+        this._controlPosition = params.controlPosition;
+
+        this.background = this._createBackground();
+        this._newBackground = null;
+    },
+
+    destroy: function() {
+        if (this._newBackground) {
+            this._newBackground.actor.destroy();
+            this._newBackground = null;
+        }
+
+        if (this.background) {
+            this.background.actor.destroy();
+            this.background = null;
+        }
+    },
+
+    _updateBackground: function(background, monitorIndex) {
+        let newBackground = this._createBackground(monitorIndex);
+        newBackground.vignetteSharpness = background.vignetteSharpness;
+        newBackground.brightness = background.brightness;
+        newBackground.saturation = background.saturation;
+        newBackground.visible = background.visible;
+
+        newBackground.loadedSignalId = newBackground.connect('loaded',
+            Lang.bind(this, function() {
+                newBackground.disconnect(newBackground.loadedSignalId);
+                newBackground.loadedSignalId = 0;
+                Tweener.addTween(background.actor,
+                                 { opacity: 0,
+                                   time: FADE_ANIMATION_TIME,
+                                   transition: 'easeOutQuad',
+                                   onComplete: Lang.bind(this, function() {
+                                       if (this._newBackground == newBackground) {
+                                           this.background = newBackground;
+                                           this._newBackground = null;
+                                       } else {
+                                           newBackground.actor.destroy();
+                                       }
+
+                                       background.actor.destroy();
+
+                                       this.emit('changed');
+                                   })
+                                 });
+        }));
+
+        this._newBackground = newBackground;
+    },
+
+    _createBackground: function() {
+        let background = new Background({ monitorIndex: this._monitorIndex,
+                                          layoutManager: this._layoutManager,
+                                          effects: this._effects });
+        this._container.add_child(background.actor);
+
+        let monitor = this._layoutManager.monitors[this._monitorIndex];
+
+        background.actor.set_size(monitor.width, monitor.height);
+        if (this._controlPosition) {
+            background.actor.set_position(monitor.x, monitor.y);
+            background.actor.lower_bottom();
+        }
+
+        background.changeSignalId = background.connect('changed', Lang.bind(this, function() {
+            background.disconnect(background.changeSignalId);
+            background.changeSignalId = 0;
+            this._updateBackground(background, this._monitorIndex);
+        }));
+
+        background.actor.connect('destroy', Lang.bind(this, function() {
+            if (background.changeSignalId)
+                background.disconnect(background.changeSignalId);
+
+            if (background.loadedSignalId)
+                background.disconnect(background.loadedSignalId);
+        }));
+
+        return background;
+    },
+});
+Signals.addSignalMethods(BackgroundManager.prototype);

js/ui/backgroundMenu.js

@@ -0,0 +1,68 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Clutter = imports.gi.Clutter;
+const Lang = imports.lang;
+const St = imports.gi.St;
+const Shell = imports.gi.Shell;
+
+const BoxPointer = imports.ui.boxpointer;
+const Main = imports.ui.main;
+const PopupMenu = imports.ui.popupMenu;
+
+const BackgroundMenu = new Lang.Class({
+    Name: 'BackgroundMenu',
+    Extends: PopupMenu.PopupMenu,
+
+    _init: function(source) {
+        this.parent(source, 0, St.Side.TOP);
+
+        this.addSettingsAction(_("Settings"), 'gnome-control-center.desktop');
+        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+        this.addSettingsAction(_("Change Background…"), 'gnome-background-panel.desktop');
+
+        this.actor.add_style_class_name('background-menu');
+
+        Main.uiGroup.add_actor(this.actor);
+        this.actor.hide();
+    }
+});
+
+function addBackgroundMenu(actor) {
+    let cursor = new St.Bin({ opacity: 0 });
+    Main.uiGroup.add_actor(cursor);
+
+    actor.reactive = true;
+    actor._backgroundMenu = new BackgroundMenu(cursor);
+    actor._backgroundManager = new PopupMenu.PopupMenuManager({ actor: actor });
+    actor._backgroundManager.addMenu(actor._backgroundMenu);
+
+    function openMenu() {
+        let [x, y] = global.get_pointer();
+        cursor.set_position(x, y);
+        actor._backgroundMenu.open(BoxPointer.PopupAnimation.NONE);
+    }
+
+    let clickAction = new Clutter.ClickAction();
+    clickAction.connect('long-press', function(action, actor, state) {
+        if (state == Clutter.LongPressState.QUERY)
+            return action.get_button() == 1 && !actor._backgroundMenu.isOpen;
+        if (state == Clutter.LongPressState.ACTIVATE) {
+            openMenu();
+            actor._backgroundManager.ignoreRelease();
+        }
+        return true;
+    });
+    clickAction.connect('clicked', function(action) {
+        if (action.get_button() == 3)
+            openMenu();
+    });
+    actor.add_action(clickAction);
+
+    actor.connect('destroy', function() {
+                      actor._backgroundMenu.destroy();
+                      actor._backgroundMenu = null;
+                      actor._backgroundManager = null;
+
+                      cursor.destroy();
+                  });
+}

js/ui/boxpointer.js

@@ -38,6 +38,7 @@ const BoxPointer = new Lang.Class({
         this._arrowSide = arrowSide;
         this._userArrowSide = arrowSide;
         this._arrowOrigin = 0;
+        this._arrowActor = null;
         this.actor = new St.Bin({ x_fill: true,
                                   y_fill: true });
         this._container = new Shell.GenericContainer();
@@ -228,6 +229,19 @@ const BoxPointer = new Lang.Class({
     _drawBorder: function(area) {
         let themeNode = this.actor.get_theme_node();
 
+        if (this._arrowActor) {
+            let [sourceX, sourceY] = this._arrowActor.get_transformed_position();
+            let [sourceWidth, sourceHeight] = this._arrowActor.get_transformed_size();
+            let [absX, absY] = this.actor.get_transformed_position();
+
+            if (this._arrowSide == St.Side.TOP ||
+                this._arrowSide == St.Side.BOTTOM) {
+                this._arrowOrigin = sourceX - absX + sourceWidth / 2;
+            } else {
+                this._arrowOrigin = sourceY - absY + sourceHeight / 2;
+            }
+        }
+
         let borderWidth = themeNode.get_length('-arrow-border-width');
         let base = themeNode.get_length('-arrow-base');
         let rise = themeNode.get_length('-arrow-rise');
@@ -537,6 +551,16 @@ const BoxPointer = new Lang.Class({
         }
     },
 
+    // @actor: an actor relative to which the arrow is positioned.
+    // Differently from setPosition, this will not move the boxpointer itself,
+    // on the arrow
+    setArrowActor: function(actor) {
+        if (this._arrowActor != actor) {
+            this._arrowActor = actor;
+            this._border.queue_repaint();
+        }
+    },
+
     _shiftActor : function() {
         // Since the position of the BoxPointer depends on the allocated size
         // of the BoxPointer and the position of the source actor, trying
@@ -565,12 +589,12 @@ const BoxPointer = new Lang.Class({
                 return St.Side.TOP;
             break;
         case St.Side.LEFT:
-            if (sourceAllocation.y2 + boxWidth > monitor.x + monitor.width &&
+            if (sourceAllocation.x2 + boxWidth > monitor.x + monitor.width &&
                 boxWidth < sourceAllocation.x1 - monitor.x)
                 return St.Side.RIGHT;
             break;
         case St.Side.RIGHT:
-            if (sourceAllocation.y1 - boxWidth < monitor.x &&
+            if (sourceAllocation.x1 - boxWidth < monitor.x &&
                 boxWidth < monitor.x + monitor.width - sourceAllocation.x2)
                 return St.Side.LEFT;
             break;

js/ui/calendar.js

@@ -2,6 +2,7 @@
 
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
 const Lang = imports.lang;
 const St = imports.gi.St;
 const Signals = imports.signals;
@@ -62,15 +63,18 @@ function _formatEventTime(event, clockFormat) {
     } else {
         switch (clockFormat) {
         case '24h':
-            /* Translators: Shown in calendar event list, if 24h format */
-            ret = event.date.toLocaleFormat(C_("event list time", "%H:%M"));
+            /* Translators: Shown in calendar event list, if 24h format,
+               \u2236 is a ratio character, similar to : */
+            ret = event.date.toLocaleFormat(C_("event list time", "%H\u2236%M"));
             break;
 
         default:
             /* explicit fall-through */
         case '12h':
-            /* Transators: Shown in calendar event list, if 12h format */
-            ret = event.date.toLocaleFormat(C_("event list time", "%l:%M %p"));
+            /* Translators: Shown in calendar event list, if 12h format,
+               \u2236 is a ratio character, similar to : and \u2009 is
+               a thin space */
+            ret = event.date.toLocaleFormat(C_("event list time", "%l\u2236%M\u2009%p"));
             break;
         }
     }
@@ -164,6 +168,12 @@ const EmptyEventSource = new Lang.Class({
     Name: 'EmptyEventSource',
 
     _init: function() {
+        this.isLoading = false;
+        this.isDummy = true;
+        this.hasCalendars = false;
+    },
+
+    destroy: function() {
     },
 
     requestRange: function(begin, end) {
@@ -187,21 +197,18 @@ const CalendarServerIface = <interface name="org.gnome.Shell.CalendarServer">
     <arg type="b" direction="in" />
     <arg type="a(sssbxxa{sv})" direction="out" />
 </method>
+<property name="HasCalendars" type="b" access="read" />
 <signal name="Changed" />
 </interface>;
 
 const CalendarServerInfo  = Gio.DBusInterfaceInfo.new_for_xml(CalendarServerIface);
 
 function CalendarServer() {
-    var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
-                                   g_interface_name: CalendarServerInfo.name,
-                                   g_interface_info: CalendarServerInfo,
-                                   g_name: 'org.gnome.Shell.CalendarServer',
-                                   g_object_path: '/org/gnome/Shell/CalendarServer',
-                                   g_flags: Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES });
-
-    self.init(null);
-    return self;
+    return new Gio.DBusProxy({ g_connection: Gio.DBus.session,
+                               g_interface_name: CalendarServerInfo.name,
+                               g_interface_info: CalendarServerInfo,
+                               g_name: 'org.gnome.Shell.CalendarServer',
+                               g_object_path: '/org/gnome/Shell/CalendarServer' });
 }
 
 function _datesEqual(a, b) {
@@ -228,18 +235,49 @@ const DBusEventSource = new Lang.Class({
 
     _init: function() {
         this._resetCache();
+        this.isLoading = false;
+        this.isDummy = false;
 
+        this._initialized = false;
         this._dbusProxy = new CalendarServer();
-        this._dbusProxy.connectSignal('Changed', Lang.bind(this, this._onChanged));
+        this._dbusProxy.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(object, result) {
+            try {
+                this._dbusProxy.init_finish(result);
+            } catch(e) {
+                log('Error loading calendars: ' + e.message);
+                return;
+            }
 
-        this._dbusProxy.connect('notify::g-name-owner', Lang.bind(this, function() {
-            if (this._dbusProxy.g_name_owner)
-                this._onNameAppeared();
-            else
-                this._onNameVanished();
+            this._dbusProxy.connectSignal('Changed', Lang.bind(this, this._onChanged));
+
+            this._dbusProxy.connect('notify::g-name-owner', Lang.bind(this, function() {
+                if (this._dbusProxy.g_name_owner)
+                    this._onNameAppeared();
+                else
+                    this._onNameVanished();
+            }));
+
+            this._dbusProxy.connect('g-properties-changed', Lang.bind(this, function() {
+                this.emit('notify::has-calendars');
+            }));
+
+            this._initialized = true;
+            this.emit('notify::has-calendars');
+            this._onNameAppeared();
         }));
     },
 
+    destroy: function() {
+        this._dbusProxy.run_dispose();
+    },
+
+    get hasCalendars() {
+        if (this._initialized)
+            return this._dbusProxy.HasCalendars;
+        else
+            return false;
+    },
+
     _resetCache: function() {
         this._events = [];
         this._lastRequestBegin = null;
@@ -279,10 +317,15 @@ const DBusEventSource = new Lang.Class({
         }
 
         this._events = newEvents;
+        this.isLoading = false;
         this.emit('changed');
     },
 
     _loadEvents: function(forceReload) {
+        // Ignore while loading
+        if (!this._initialized)
+            return;
+
         if (this._curRequestBegin && this._curRequestEnd){
             let callFlags = Gio.DBusCallFlags.NO_AUTO_START;
             if (forceReload)
@@ -297,6 +340,7 @@ const DBusEventSource = new Lang.Class({
 
     requestRange: function(begin, end, forceReload) {
         if (forceReload || !(_datesEqual(begin, this._lastRequestBegin) && _datesEqual(end, this._lastRequestEnd))) {
+            this.isLoading = true;
             this._lastRequestBegin = begin;
             this._lastRequestEnd = end;
             this._curRequestBegin = begin;
@@ -371,19 +415,11 @@ const Calendar = new Lang.Class({
     // @eventSource: is an object implementing the EventSource API, e.g. the
     // requestRange(), getEvents(), hasEvents() methods and the ::changed signal.
     setEventSource: function(eventSource) {
-        if (this._eventSource) {
-            this._eventSource.disconnect(this._eventSourceChangedId);
-            this._eventSource = null;
-        }
-
         this._eventSource = eventSource;
-
-        if (this._eventSource) {
-            this._eventSourceChangedId = this._eventSource.connect('changed', Lang.bind(this, function() {
-                this._update(false);
-            }));
-            this._update(true);
-        }
+        this._eventSource.connect('changed', Lang.bind(this, function() {
+            this._update(false);
+        }));
+        this._update(true);
     },
 
     // Sets the calendar to show a specific date
@@ -407,16 +443,18 @@ const Calendar = new Lang.Class({
         this.actor.add(this._topBox,
                        { row: 0, col: 0, col_span: offsetCols + 7 });
 
-        let back = new St.Button({ style_class: 'calendar-change-month-back' });
-        this._topBox.add(back);
-        back.connect('clicked', Lang.bind(this, this._onPrevMonthButtonClicked));
+        this._backButton = new St.Button({ style_class: 'calendar-change-month-back',
+                                           can_focus: true });
+        this._topBox.add(this._backButton);
+        this._backButton.connect('clicked', Lang.bind(this, this._onPrevMonthButtonClicked));
 
         this._monthLabel = new St.Label({style_class: 'calendar-month-label'});
         this._topBox.add(this._monthLabel, { expand: true, x_fill: false, x_align: St.Align.MIDDLE });
 
-        let forward = new St.Button({ style_class: 'calendar-change-month-forward' });
-        this._topBox.add(forward);
-        forward.connect('clicked', Lang.bind(this, this._onNextMonthButtonClicked));
+        this._forwardButton = new St.Button({ style_class: 'calendar-change-month-forward',
+                                              can_focus: true });
+        this._topBox.add(this._forwardButton);
+        this._forwardButton.connect('clicked', Lang.bind(this, this._onNextMonthButtonClicked));
 
         // Add weekday labels...
         //
@@ -475,10 +513,12 @@ const Calendar = new Lang.Class({
             }
         }
 
-        this.setDate(newDate, false);
-   },
+        this._backButton.grab_key_focus();
 
-   _onNextMonthButtonClicked: function() {
+        this.setDate(newDate, false);
+    },
+
+    _onNextMonthButtonClicked: function() {
         let newDate = new Date(this._selectedDate);
         let oldMonth = newDate.getMonth();
         if (oldMonth == 11) {
@@ -497,7 +537,9 @@ const Calendar = new Lang.Class({
             }
         }
 
-       this.setDate(newDate, false);
+        this._forwardButton.grab_key_focus();
+
+        this.setDate(newDate, false);
     },
 
     _onSettingsChange: function() {
@@ -520,30 +562,60 @@ const Calendar = new Lang.Class({
             children[i].destroy();
 
         // Start at the beginning of the week before the start of the month
+        //
+        // We want to show always 6 weeks (to keep the calendar menu at the same
+        // height if there are no events), so we pad it according to the following
+        // policy:
+        //
+        // 1 - If a month has 6 weeks, we place no padding (example: Dec 2012)
+        // 2 - If a month has 5 weeks and it starts on week start, we pad one week
+        //     before it (example: Apr 2012)
+        // 3 - If a month has 5 weeks and it starts on any other day, we pad one week
+        //     after it (example: Nov 2012)
+        // 4 - If a month has 4 weeks, we pad one week before and one after it
+        //     (example: Feb 2010)
+        //
+        // Actually computing the number of weeks is complex, but we know that the
+        // problematic categories (2 and 4) always start on week start, and that
+        // all months at the end have 6 weeks.
+
         let beginDate = new Date(this._selectedDate);
         beginDate.setDate(1);
         beginDate.setSeconds(0);
         beginDate.setHours(12);
+        let year = beginDate.getYear();
+
         let daysToWeekStart = (7 + beginDate.getDay() - this._weekStart) % 7;
-        beginDate.setTime(beginDate.getTime() - daysToWeekStart * MSECS_IN_DAY);
+        let startsOnWeekStart = daysToWeekStart == 0;
+        let weekPadding = startsOnWeekStart ? 7 : 0;
+
+        beginDate.setTime(beginDate.getTime() - (weekPadding + daysToWeekStart) * MSECS_IN_DAY);
 
         let iter = new Date(beginDate);
         let row = 2;
-        while (true) {
-            let button = new St.Button({ label: iter.getDate().toString() });
+        // nRows here means 6 weeks + one header + one navbar
+        let nRows = 8;
+        while (row < 8) {
+            let button = new St.Button({ label: iter.getDate().toString(),
+                                         can_focus: true });
             let rtl = button.get_text_direction() == Clutter.TextDirection.RTL;
 
-            if (!this._eventSource)
+            if (this._eventSource.isDummy)
                 button.reactive = false;
 
             let iterStr = iter.toUTCString();
             button.connect('clicked', Lang.bind(this, function() {
+                this._shouldDateGrabFocus = true;
+
                 let newlySelectedDate = new Date(iterStr);
                 this.setDate(newlySelectedDate, false);
+
+                this._shouldDateGrabFocus = false;
             }));
 
-            let hasEvents = this._eventSource && this._eventSource.hasEvents(iter);
+            let hasEvents = this._eventSource.hasEvents(iter);
             let styleClass = 'calendar-day-base calendar-day';
+
             if (_isWorkDay(iter))
                 styleClass += ' calendar-work-day'
             else
@@ -563,9 +635,6 @@ const Calendar = new Lang.Class({
             else if (iter.getMonth() != this._selectedDate.getMonth())
                 styleClass += ' calendar-other-month-day';
 
-            if (_sameDay(this._selectedDate, iter))
-                button.add_style_pseudo_class('active');
-
             if (hasEvents)
                 styleClass += ' calendar-day-with-events'
 
@@ -575,6 +644,13 @@ const Calendar = new Lang.Class({
             this.actor.add(button,
                            { row: row, col: offsetCols + (7 + iter.getDay() - this._weekStart) % 7 });
 
+            if (_sameDay(this._selectedDate, iter)) {
+                button.add_style_pseudo_class('active');
+
+                if (this._shouldDateGrabFocus)
+                    button.grab_key_focus();
+            }
+
             if (this._useWeekdate && iter.getDay() == 4) {
                 let label = new St.Label({ text: _getCalendarWeekForDate(iter).toString(),
                                            style_class: 'calendar-day-base calendar-week-number'});
@@ -583,17 +659,13 @@ const Calendar = new Lang.Class({
             }
 
             iter.setTime(iter.getTime() + MSECS_IN_DAY);
-            if (iter.getDay() == this._weekStart) {
-                // We stop on the first "first day of the week" after the month we are displaying
-                if (iter.getMonth() > this._selectedDate.getMonth() || iter.getYear() > this._selectedDate.getYear())
-                    break;
+
+            if (iter.getDay() == this._weekStart)
                 row++;
-            }
         }
         // Signal to the event source that we are interested in events
         // only from this date range
-        if (this._eventSource)
-            this._eventSource.requestRange(beginDate, iter, forceReload);
+        this._eventSource.requestRange(beginDate, iter, forceReload);
     }
 });
 
@@ -603,7 +675,7 @@ const EventsList = new Lang.Class({
     Name: 'EventsList',
 
     _init: function() {
-        this.actor = new St.BoxLayout({ vertical: true, style_class: 'events-header-vbox'});
+        this.actor = new St.Table({ style_class: 'events-table' });
         this._date = new Date();
         this._desktopSettings = new Gio.Settings({ schema: 'org.gnome.desktop.interface' });
         this._desktopSettings.connect('changed', Lang.bind(this, this._update));
@@ -611,70 +683,76 @@ const EventsList = new Lang.Class({
     },
 
     setEventSource: function(eventSource) {
-        if (this._eventSource) {
-            this._eventSource.disconnect(this._eventSourceChangedId);
-            this._eventSource = null;
-        }
-
         this._eventSource = eventSource;
-
-        if (this._eventSource) {
-            this._eventSourceChangedId = this._eventSource.connect('changed', Lang.bind(this, this._update));
-        }
+        this._eventSource.connect('changed', Lang.bind(this, this._update));
     },
 
-    _addEvent: function(dayNameBox, timeBox, eventTitleBox, includeDayName, day, time, desc) {
-        if (includeDayName) {
-            dayNameBox.add(new St.Label( { style_class: 'events-day-dayname',
-                                           text: day } ),
-                           { x_fill: true } );
-        }
-        timeBox.add(new St.Label( { style_class: 'events-day-time',
-                                    text: time} ),
-                    { x_fill: true } );
-        eventTitleBox.add(new St.Label( { style_class: 'events-day-task',
-                                          text: desc} ));
+    _addEvent: function(event, index, includeDayName) {
+        let dayString;
+        if (includeDayName)
+            dayString = _getEventDayAbbreviation(event.date.getDay());
+        else
+            dayString = '';
+
+        let dayLabel = new St.Label({ style_class: 'events-day-dayname',
+                                      text: dayString });
+        dayLabel.clutter_text.line_wrap = false;
+        dayLabel.clutter_text.ellipsize = false;
+
+        this.actor.add(dayLabel, { row: index, col: 0,
+                                   x_expand: false, x_align: St.Align.END,
+                                   y_fill: false, y_align: St.Align.START });
+
+        let clockFormat = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);
+        let timeString = _formatEventTime(event, clockFormat);
+        let timeLabel = new St.Label({ style_class: 'events-day-time',
+                                       text: timeString });
+        timeLabel.clutter_text.line_wrap = false;
+        timeLabel.clutter_text.ellipsize = false;
+
+        this.actor.add(timeLabel, { row: index, col: 1,
+                                    x_expand: false, x_align: St.Align.MIDDLE,
+                                    y_fill: false, y_align: St.Align.START });
+
+        let titleLabel = new St.Label({ style_class: 'events-day-task',
+                                        text: event.summary });
+        titleLabel.clutter_text.line_wrap = true;
+        titleLabel.clutter_text.ellipsize = false;
+
+        this.actor.add(titleLabel, { row: index, col: 2,
+                                     x_expand: true, x_align: St.Align.START,
+                                     y_fill: false, y_align: St.Align.START });
     },
 
-    _addPeriod: function(header, begin, end, includeDayName, showNothingScheduled) {
-        if (!this._eventSource)
-            return;
-
+    _addPeriod: function(header, index, begin, end, includeDayName, showNothingScheduled) {
         let events = this._eventSource.getEvents(begin, end);
 
-        let clockFormat = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);;
-
         if (events.length == 0 && !showNothingScheduled)
-            return;
+            return index;
 
-        let vbox = new St.BoxLayout( {vertical: true} );
-        this.actor.add(vbox);
-
-        vbox.add(new St.Label({ style_class: 'events-day-header', text: header }));
-        let box = new St.BoxLayout({style_class: 'events-header-hbox'});
-        let dayNameBox = new St.BoxLayout({ vertical: true, style_class: 'events-day-name-box' });
-        let timeBox = new St.BoxLayout({ vertical: true, style_class: 'events-time-box' });
-        let eventTitleBox = new St.BoxLayout({ vertical: true, style_class: 'events-event-box' });
-        box.add(dayNameBox, {x_fill: false});
-        box.add(timeBox, {x_fill: false});
-        box.add(eventTitleBox, {expand: true});
-        vbox.add(box);
+        this.actor.add(new St.Label({ style_class: 'events-day-header', text: header }),
+                       { row: index, col: 0, col_span: 3,
+                         // In theory, x_expand should be true here, but x_expand
+                         // is a property of the column for StTable, ie all day cells
+                         // get it too
+                         x_expand: false, x_align: St.Align.START,
+                         y_fill: false, y_align: St.Align.START });
+        index++;
 
         for (let n = 0; n < events.length; n++) {
-            let event = events[n];
-            let dayString = _getEventDayAbbreviation(event.date.getDay());
-            let timeString = _formatEventTime(event, clockFormat);
-            let summaryString = event.summary;
-            this._addEvent(dayNameBox, timeBox, eventTitleBox, includeDayName, dayString, timeString, summaryString);
+            this._addEvent(events[n], index, includeDayName);
+            index++;
         }
 
         if (events.length == 0 && showNothingScheduled) {
             let now = new Date();
             /* Translators: Text to show if there are no events */
             let nothingEvent = new CalendarEvent(now, now, _("Nothing Scheduled"), true);
-            let timeString = _formatEventTime(nothingEvent, clockFormat);
-            this._addEvent(dayNameBox, timeBox, eventTitleBox, false, "", timeString, nothingEvent.summary);
+            this._addEvent(nothingEvent, index, false);
+            index++;
         }
+
+        return index;
     },
 
     _showOtherDay: function(day) {
@@ -691,20 +769,21 @@ const EventsList = new Lang.Class({
         else
             /* Translators: Shown on calendar heading when selected day occurs on different year */
             dayString = day.toLocaleFormat(C_("calendar heading", "%A, %B %d, %Y"));
-        this._addPeriod(dayString, dayBegin, dayEnd, false, true);
+        this._addPeriod(dayString, 0, dayBegin, dayEnd, false, true);
     },
 
     _showToday: function() {
         this.actor.destroy_all_children();
+        let index = 0;
 
         let now = new Date();
         let dayBegin = _getBeginningOfDay(now);
         let dayEnd = _getEndOfDay(now);
-        this._addPeriod(_("Today"), dayBegin, dayEnd, false, true);
+        index = this._addPeriod(_("Today"), index, dayBegin, dayEnd, false, true);
 
         let tomorrowBegin = new Date(dayBegin.getTime() + 86400 * 1000);
         let tomorrowEnd = new Date(dayEnd.getTime() + 86400 * 1000);
-        this._addPeriod(_("Tomorrow"), tomorrowBegin, tomorrowEnd, false, true);
+        index = this._addPeriod(_("Tomorrow"), index, tomorrowBegin, tomorrowEnd, false, true);
 
         let dayInWeek = (dayEnd.getDay() - this._weekStart + 7) % 7;
 
@@ -715,7 +794,7 @@ const EventsList = new Lang.Class({
              */
             let thisWeekBegin = new Date(dayBegin.getTime() + 2 * 86400 * 1000);
             let thisWeekEnd = new Date(dayEnd.getTime() + (6 - dayInWeek) * 86400 * 1000);
-            this._addPeriod(_("This week"), thisWeekBegin, thisWeekEnd, true, false);
+            index = this._addPeriod(_("This week"), index, thisWeekBegin, thisWeekEnd, true, false);
         } else {
             /* otherwise it's one of the two last days of the week ... show
              * "Next week" and include events up until and including *next*
@@ -723,7 +802,7 @@ const EventsList = new Lang.Class({
              */
             let nextWeekBegin = new Date(dayBegin.getTime() + 2 * 86400 * 1000);
             let nextWeekEnd = new Date(dayEnd.getTime() + (13 - dayInWeek) * 86400 * 1000);
-            this._addPeriod(_("Next week"), nextWeekBegin, nextWeekEnd, true, false);
+            index = this._addPeriod(_("Next week"), index, nextWeekBegin, nextWeekEnd, true, false);
         }
     },
 
@@ -736,6 +815,9 @@ const EventsList = new Lang.Class({
     },
 
     _update: function() {
+        if (this._eventSource.isLoading)
+            return;
+
         let today = new Date();
         if (_sameDay (this._date, today)) {
             this._showToday();

js/ui/components/automountManager.js

@@ -8,7 +8,6 @@ const Params = imports.misc.params;
 const Shell = imports.gi.Shell;
 
 const GnomeSession = imports.misc.gnomeSession;
-const LoginManager = imports.misc.loginManager;
 const Main = imports.ui.main;
 const ShellMountOperation = imports.ui.shellMountOperation;
 
@@ -33,7 +32,6 @@ const AutomountManager = new Lang.Class({
                                     Lang.bind(this, this._InhibitorsChanged));
         this._inhibited = false;
 
-        this._loginManager = LoginManager.getLoginManager();
         this._volumeMonitor = Gio.VolumeMonitor.get();
     },
 
@@ -85,25 +83,29 @@ const AutomountManager = new Lang.Class({
     _onDriveConnected: function() {
         // if we're not in the current ConsoleKit session,
         // or screensaver is active, don't play sounds
-        if (!this._loginManager.sessionActive)
+        if (!this._session.SessionIsActive)
             return;
 
-        global.play_theme_sound(0, 'device-added-media');
+        global.play_theme_sound(0, 'device-added-media',
+                                _("External drive connected"),
+                                null);
     },
 
     _onDriveDisconnected: function() {
         // if we're not in the current ConsoleKit session,
         // or screensaver is active, don't play sounds
-        if (!this._loginManager.sessionActive)
+        if (!this._session.SessionIsActive)
             return;
 
-        global.play_theme_sound(0, 'device-removed-media');        
+        global.play_theme_sound(0, 'device-removed-media',
+                                _("External drive disconnected"),
+                                null);
     },
 
     _onDriveEjectButton: function(monitor, drive) {
         // TODO: this code path is not tested, as the GVfs volume monitor
         // doesn't emit this signal just yet.
-        if (!this._loginManager.sessionActive)
+        if (!this._session.SessionIsActive)
             return;
 
         // we force stop/eject in this case, so we don't have to pass a
@@ -143,7 +145,7 @@ const AutomountManager = new Lang.Class({
         if (params.checkSession) {
             // if we're not in the current ConsoleKit session,
             // don't attempt automount
-            if (!this._loginManager.sessionActive)
+            if (!this._session.SessionIsActive)
                 return;
         }
 

js/ui/components/autorunManager.js

@@ -4,7 +4,7 @@ const Lang = imports.lang;
 const Gio = imports.gi.Gio;
 const St = imports.gi.St;
 
-const LoginManager = imports.misc.loginManager;
+const GnomeSession = imports.misc.gnomeSession;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const ShellMountOperation = imports.ui.shellMountOperation;
@@ -31,7 +31,7 @@ function shouldAutorunMount(mount, forTransient) {
     if (!volume || (!volume.allowAutorun && forTransient))
         return false;
 
-    if (!root.is_native() || isMountRootHidden(root))
+    if (root.is_native() && isMountRootHidden(root))
         return false;
 
     return true;
@@ -162,8 +162,7 @@ const AutorunManager = new Lang.Class({
     Name: 'AutorunManager',
 
     _init: function() {
-        this._loginManager = LoginManager.getLoginManager();
-
+        this._session = new GnomeSession.SessionManager();
         this._volumeMonitor = Gio.VolumeMonitor.get();
 
         this._transDispatcher = new AutorunTransientDispatcher(this);
@@ -215,7 +214,7 @@ const AutorunManager = new Lang.Class({
     _onMountAdded: function(monitor, mount) {
         // don't do anything if our session is not the currently
         // active one
-        if (!this._loginManager.sessionActive)
+        if (!this._session.SessionIsActive)
             return;
 
         this._processMount(mount, true);
@@ -293,7 +292,7 @@ const AutorunResidentSource = new Lang.Class({
 
     _init: function(manager) {
         this.parent(_("Removable Devices"), 'media-removable');
-        this.showInLockScreen = false;
+        this.resident = true;
 
         this._mounts = [];
 
@@ -301,6 +300,10 @@ const AutorunResidentSource = new Lang.Class({
         this._notification = new AutorunResidentNotification(this._manager, this);
     },
 
+    _createPolicy: function() {
+        return new MessageTray.NotificationPolicy({ showInLockScreen: false });
+    },
+
     buildRightClickMenu: function() {
         return null;
     },

js/ui/components/keyring.js

@@ -25,7 +25,7 @@ const KeyringDialog = new Lang.Class({
         this.prompt = new Shell.KeyringPrompt();
         this.prompt.connect('show-password', Lang.bind(this, this._onShowPassword));
         this.prompt.connect('show-confirm', Lang.bind(this, this._onShowConfirm));
-        this.prompt.connect('hide-prompt', Lang.bind(this, this._onHidePrompt));
+        this.prompt.connect('prompt-close', Lang.bind(this, this._onHidePrompt));
 
         let mainContentBox = new St.BoxLayout({ style_class: 'prompt-dialog-main-layout',
                                                 vertical: false });
@@ -63,11 +63,17 @@ const KeyringDialog = new Lang.Class({
 
         this._cancelButton = this.addButton({ label: '',
                                               action: Lang.bind(this, this._onCancelButton),
-                                              key: Clutter.Escape });
+                                              key: Clutter.Escape },
+                                            { expand: true, x_fill: false, x_align: St.Align.START });
+        this.placeSpinner({ expand: false,
+                            x_fill: false,
+                            y_fill: false,
+                            x_align: St.Align.END,
+                            y_align: St.Align.MIDDLE });
         this._continueButton = this.addButton({ label: '',
                                                 action: Lang.bind(this, this._onContinueButton),
                                                 default: true },
-                                              { expand: true, x_fill: false, x_align: St.Align.END });
+                                              { expand: false, x_fill: false, x_align: St.Align.END });
 
         this.prompt.bind_property('cancel-label', this._cancelButton, 'label', GObject.BindingFlags.SYNC_CREATE);
         this.prompt.bind_property('continue-label', this._continueButton, 'label', GObject.BindingFlags.SYNC_CREATE);
@@ -143,11 +149,19 @@ const KeyringDialog = new Lang.Class({
     },
 
     _updateSensitivity: function(sensitive) {
-        this._passwordEntry.reactive = sensitive;
-        this._passwordEntry.clutter_text.editable = sensitive;
+        if (this._passwordEntry) {
+            this._passwordEntry.reactive = sensitive;
+            this._passwordEntry.clutter_text.editable = sensitive;
+        }
+
+        if (this._confirmEntry) {
+            this._confirmEntry.reactive = sensitive;
+            this._confirmEntry.clutter_text.editable = sensitive;
+        }
 
         this._continueButton.can_focus = sensitive;
         this._continueButton.reactive = sensitive;
+        this.setWorking(!sensitive);
     },
 
     _ensureOpen: function() {
@@ -222,7 +236,7 @@ const KeyringPrompter = new Lang.Class({
     enable: function() {
         this._prompter.register(Gio.DBus.session);
         this._dbusId = Gio.DBus.session.own_name('org.gnome.keyring.SystemPrompter',
-                                                 Gio.BusNameOwnerFlags.REPLACE, null, null);
+                                                 Gio.BusNameOwnerFlags.ALLOW_REPLACEMENT, null, null);
     },
 
     disable: function() {

js/ui/components/networkAgent.js

@@ -587,18 +587,19 @@ const NetworkAgent = new Lang.Class({
     Name: 'NetworkAgent',
 
     _init: function() {
-        this._native = new Shell.NetworkAgent({ auto_register: false,
-                                                identifier: 'org.gnome.Shell.NetworkAgent' });
+        this._native = new Shell.NetworkAgent({ identifier: 'org.gnome.Shell.NetworkAgent' });
 
         this._dialogs = { };
         this._vpnRequests = { };
 
         this._native.connect('new-request', Lang.bind(this, this._newRequest));
         this._native.connect('cancel-request', Lang.bind(this, this._cancelRequest));
+
+        this._enabled = false;
     },
 
     enable: function() {
-        this._native.auto_register = true;
+        this._enabled = true;
     },
 
     disable: function() {
@@ -612,12 +613,15 @@ const NetworkAgent = new Lang.Class({
             this._vpnRequests[requestId].cancel(true);
         this._vpnRequests = { };
 
-        this._native.auto_register = false;
-        if (this._native.registered)
-            this._native.unregister();
+        this._enabled = false;
     },
 
     _newRequest:  function(agent, requestId, connection, settingName, hints, flags) {
+        if (!this._enabled) {
+            agent.respond(requestId, Shell.NetworkAgentResponse.USER_CANCELED);
+            return;
+        }
+
         if (settingName == 'vpn') {
             this._vpnRequest(requestId, connection, hints, flags);
             return;

js/ui/components/polkitAgent.js

@@ -16,7 +16,7 @@ const PolkitAgent = imports.gi.PolkitAgent;
 const Components = imports.ui.components;
 const ModalDialog = imports.ui.modalDialog;
 const ShellEntry = imports.ui.shellEntry;
-const UserMenu = imports.ui.userMenu;
+const UserWidget = imports.ui.userWidget;
 
 const DIALOG_ICON_SIZE = 48;
 
@@ -31,7 +31,6 @@ const AuthenticationDialog = new Lang.Class({
         this.message = message;
         this.userNames = userNames;
         this._wasDismissed = false;
-        this._completed = false;
 
         let mainContentBox = new St.BoxLayout({ style_class: 'prompt-dialog-main-layout',
                                                 vertical: false });
@@ -101,9 +100,9 @@ const AuthenticationDialog = new Lang.Class({
             let userBox = new St.BoxLayout({ style_class: 'polkit-dialog-user-layout',
                                              vertical: false });
             messageBox.add(userBox);
-            this._userAvatar = new UserMenu.UserAvatarWidget(this._user,
-                                                             { iconSize: DIALOG_ICON_SIZE,
-                                                               styleClass: 'polkit-dialog-user-icon' });
+            this._userAvatar = new UserWidget.Avatar(this._user,
+                                                     { iconSize: DIALOG_ICON_SIZE,
+                                                       styleClass: 'polkit-dialog-user-icon' });
             this._userAvatar.actor.hide();
             userBox.add(this._userAvatar.actor,
                         { x_fill:  true,
@@ -161,26 +160,32 @@ const AuthenticationDialog = new Lang.Class({
 
         this._cancelButton = this.addButton({ label: _("Cancel"),
                                               action: Lang.bind(this, this.cancel),
-                                              key: Clutter.Escape });
+                                              key: Clutter.Escape },
+                                            { expand: true, x_fill: false, x_align: St.Align.START });
+        this.placeSpinner({ expand: false,
+                            x_fill: false,
+                            y_fill: false,
+                            x_align: St.Align.END,
+                            y_align: St.Align.MIDDLE });
         this._okButton = this.addButton({ label:  _("Authenticate"),
                                           action: Lang.bind(this, this._onAuthenticateButtonPressed),
                                           default: true },
-                                        { expand: true, x_fill: false, x_align: St.Align.END });
+                                        { expand: false, x_fill: false, x_align: St.Align.END });
 
         this._doneEmitted = false;
 
         this._identityToAuth = Polkit.UnixUser.new_for_name(userName);
         this._cookie = cookie;
+    },
 
+    performAuthentication: function() {
+        this.destroySession();
         this._session = new PolkitAgent.Session({ identity: this._identityToAuth,
                                                   cookie: this._cookie });
         this._session.connect('completed', Lang.bind(this, this._onSessionCompleted));
         this._session.connect('request', Lang.bind(this, this._onSessionRequest));
         this._session.connect('show-error', Lang.bind(this, this._onSessionShowError));
         this._session.connect('show-info', Lang.bind(this, this._onSessionShowInfo));
-    },
-
-    startAuthentication: function() {
         this._session.initiate();
     },
 
@@ -202,14 +207,14 @@ const AuthenticationDialog = new Lang.Class({
             log('polkitAuthenticationAgent: Failed to show modal dialog.' +
                 ' Dismissing authentication request for action-id ' + this.actionId +
                 ' cookie ' + this._cookie);
-            this._emitDone(false, true);
+            this._emitDone(true);
         }
     },
 
-    _emitDone: function(keepVisible, dismissed) {
+    _emitDone: function(dismissed) {
         if (!this._doneEmitted) {
             this._doneEmitted = true;
-            this.emit('done', keepVisible, dismissed);
+            this.emit('done', dismissed);
         }
     },
 
@@ -219,6 +224,7 @@ const AuthenticationDialog = new Lang.Class({
 
         this._okButton.can_focus = sensitive;
         this._okButton.reactive = sensitive;
+        this.setWorking(!sensitive);
     },
 
     _onEntryActivate: function() {
@@ -237,12 +243,16 @@ const AuthenticationDialog = new Lang.Class({
     },
 
     _onSessionCompleted: function(session, gainedAuthorization) {
-        if (this._completed)
+        if (this._completed || this._doneEmitted)
             return;
 
         this._completed = true;
 
-        if (!gainedAuthorization) {
+        /* Yay, all done */
+        if (gainedAuthorization) {
+            this._emitDone(false);
+
+        } else {
             /* Unless we are showing an existing error message from the PAM
              * module (the PAM module could be reporting the authentication
              * error providing authentication-method specific information),
@@ -258,8 +268,10 @@ const AuthenticationDialog = new Lang.Class({
                 this._infoMessageLabel.hide();
                 this._nullMessageLabel.hide();
             }
+
+            /* Try and authenticate again */
+            this.performAuthentication();
         }
-        this._emitDone(!gainedAuthorization, false);
     },
 
     _onSessionRequest: function(session, request, echo_on) {
@@ -303,6 +315,7 @@ const AuthenticationDialog = new Lang.Class({
         if (this._session) {
             if (!this._completed)
                 this._session.cancel();
+            this._completed = false;
             this._session = null;
         }
     },
@@ -317,7 +330,7 @@ const AuthenticationDialog = new Lang.Class({
     cancel: function() {
         this._wasDismissed = true;
         this.close(global.get_current_time());
-        this._emitDone(false, true);
+        this._emitDone(true);
     },
 });
 Signals.addSignalMethods(AuthenticationDialog.prototype);
@@ -327,7 +340,6 @@ const AuthenticationAgent = new Lang.Class({
 
     _init: function() {
         this._currentDialog = null;
-        this._isCompleting = false;
         this._handle = null;
         this._native = new Shell.PolkitAuthenticationAgent();
         this._native.connect('initiate', Lang.bind(this, this._onInitiate));
@@ -335,11 +347,19 @@ const AuthenticationAgent = new Lang.Class({
     },
 
     enable: function() {
-        this._native.register();
+        try {
+            this._native.register();
+        } catch(e) {
+            log('Failed to register AuthenticationAgent');
+        }
     },
 
     disable: function() {
-        this._native.unregister();
+        try {
+            this._native.unregister();
+        } catch(e) {
+            log('Failed to unregister AuthenticationAgent');
+        }
     },
 
     _onInitiate: function(nativeAgent, actionId, message, iconName, cookie, userNames) {
@@ -356,45 +376,24 @@ const AuthenticationAgent = new Lang.Class({
         // discussion.
 
         this._currentDialog.connect('done', Lang.bind(this, this._onDialogDone));
-        this._currentDialog.startAuthentication();
+        this._currentDialog.performAuthentication();
     },
 
     _onCancel: function(nativeAgent) {
-        this._completeRequest(false, false);
+        this._completeRequest(false);
     },
 
-    _onDialogDone: function(dialog, keepVisible, dismissed) {
-        this._completeRequest(keepVisible, dismissed);
+    _onDialogDone: function(dialog, dismissed) {
+        this._completeRequest(dismissed);
     },
 
-    _reallyCompleteRequest: function(dismissed) {
+    _completeRequest: function(dismissed) {
         this._currentDialog.close();
         this._currentDialog.destroySession();
         this._currentDialog = null;
-        this._isCompleting = false;
 
-        this._native.complete(dismissed)
+        this._native.complete(dismissed);
     },
-
-    _completeRequest: function(keepVisible, wasDismissed) {
-        if (this._isCompleting)
-            return;
-
-        this._isCompleting = true;
-
-        if (keepVisible) {
-            // Give the user 2 seconds to read 'Authentication Failure' before
-            // dismissing the dialog
-            Mainloop.timeout_add(2000,
-                                 Lang.bind(this,
-                                           function() {
-                                               this._reallyCompleteRequest(wasDismissed);
-                                               return false;
-                                           }));
-        } else {
-            this._reallyCompleteRequest(wasDismissed);
-        }
-    }
 });
 
 const Component = AuthenticationAgent;

js/ui/components/recorder.js

@@ -20,8 +20,7 @@ const Recorder = new Lang.Class({
         Main.wm.addKeybinding('toggle-recording',
                               this._bindingSettings,
                               Meta.KeyBindingFlags.NONE,
-                              Main.KeybindingMode.NORMAL |
-                              Main.KeybindingMode.OVERVIEW,
+                              Shell.KeyBindingMode.ALL,
                               Lang.bind(this, this._toggleRecorder));
     },
 

js/ui/components/telepathyClient.js

@@ -13,11 +13,12 @@ const Tp = imports.gi.TelepathyGLib;
 const History = imports.misc.history;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
+const NotificationDaemon = imports.ui.notificationDaemon;
 const Params = imports.misc.params;
 const PopupMenu = imports.ui.popupMenu;
 
 // See Notification.appendMessage
-const SCROLLBACK_IMMEDIATE_TIME = 60; // 1 minute
+const SCROLLBACK_IMMEDIATE_TIME = 3 * 60; // 3 minutes
 const SCROLLBACK_RECENT_TIME = 15 * 60; // 15 minutes
 const SCROLLBACK_RECENT_LENGTH = 20;
 const SCROLLBACK_IDLE_LENGTH = 5;
@@ -415,6 +416,8 @@ const TelepathyClient = new Lang.Class({
     _ensureAppSource: function() {
         if (this._appSource == null) {
             this._appSource = new MessageTray.Source(_("Chat"), 'empathy');
+            this._appSource.policy = new NotificationDaemon.NotificationApplicationPolicy('empathy');
+
             Main.messageTray.add(this._appSource);
             this._appSource.connect('destroy', Lang.bind(this, function () {
                 this._appSource = null;
@@ -484,6 +487,10 @@ const ChatSource = new Lang.Class({
         return rightClickMenu;
     },
 
+    _createPolicy: function() {
+        return new NotificationDaemon.NotificationApplicationPolicy('empathy');
+    },
+
     _updateAlias: function() {
         let oldAlias = this.title;
         let newAlias = this._contact.get_alias();
@@ -633,6 +640,10 @@ const ChatSource = new Lang.Class({
         return this._pendingMessages.length;
     },
 
+    get indicatorCount() {
+        return this.count;
+    },
+
     get unseenCount() {
         return this.count;
     },
@@ -956,7 +967,8 @@ const ChatNotification = new Lang.Class({
         let timeLabel = this._append({ body: this._formatTimestamp(lastMessageDate),
                                        group: 'meta',
                                        styles: ['chat-meta-message'],
-                                       childProps: { expand: true, x_fill: false },
+                                       childProps: { expand: true, x_fill: false,
+                                                     x_align: St.Align.END },
                                        noTimestamp: true,
                                        timestamp: lastMessageTime });
 
@@ -1048,6 +1060,10 @@ const ApproverSource = new Lang.Class({
         }));
     },
 
+    _createPolicy: function() {
+        return new NotificationDaemon.NotificationApplicationPolicy('empathy');
+    },
+
     destroy: function() {
         if (this._invalidId != 0) {
             this._dispatchOp.disconnect(this._invalidId);

js/ui/ctrlAltTab.js

@@ -58,15 +58,10 @@ const CtrlAltTabManager = new Lang.Class({
     },
 
     focusGroup: function(item, timestamp) {
-        if (item.focusCallback) {
+        if (item.focusCallback)
             item.focusCallback(timestamp);
-        } else {
-            if (global.stage_input_mode == Shell.StageInputMode.NONREACTIVE ||
-                global.stage_input_mode == Shell.StageInputMode.NORMAL)
-                global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
-
+        else
             item.root.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
-        }
     },
 
     // Sort the items into a consistent order; panel first, tray last,
@@ -89,21 +84,33 @@ const CtrlAltTabManager = new Lang.Class({
         let items = this._items.filter(function (item) { return item.proxy.mapped; });
 
         // And add the windows metacity would show in its Ctrl-Alt-Tab list
-        if (!Main.overview.visible) {
+        if (Main.sessionMode.hasWindows && !Main.overview.visible) {
             let screen = global.screen;
             let display = screen.get_display();
             let windows = display.get_tab_list(Meta.TabList.DOCKS, screen, screen.get_active_workspace ());
             let windowTracker = Shell.WindowTracker.get_default();
             let textureCache = St.TextureCache.get_default();
             for (let i = 0; i < windows.length; i++) {
-                let icon;
-                let app = windowTracker.get_window_app(windows[i]);
-                if (app)
-                    icon = app.create_icon_texture(POPUP_APPICON_SIZE);
-                else
-                    icon = textureCache.bind_pixbuf_property(windows[i], 'icon');
+                let icon = null;
+                let iconName = null;
+                if (windows[i].get_window_type () == Meta.WindowType.DESKTOP) {
+                    iconName = 'video-display-symbolic';
+                } else {
+                    let app = windowTracker.get_window_app(windows[i]);
+                    if (app)
+                        icon = app.create_icon_texture(POPUP_APPICON_SIZE);
+                    else
+                        icon = textureCache.bind_pixbuf_property(windows[i], 'icon');
+                }
+
                 items.push({ name: windows[i].title,
+                             proxy: windows[i].get_compositor_private(),
+                             focusCallback: Lang.bind(windows[i],
+                                 function(timestamp) {
+                                     Main.activateWindow(this, timestamp);
+                                 }),
                              iconActor: icon,
+                             iconName: iconName,
                              sortGroup: SortGroup.MIDDLE });
             }
         }
@@ -125,8 +132,6 @@ const CtrlAltTabManager = new Lang.Class({
     },
 
     _focusWindows: function(timestamp) {
-        global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
-        global.stage.key_focus = null;
         global.screen.focus_default_window(timestamp);
     }
 });

js/ui/dash.js

@@ -22,11 +22,8 @@ const DASH_ITEM_LABEL_HIDE_TIME = 0.1;
 const DASH_ITEM_HOVER_TIMEOUT = 300;
 
 function getAppFromSource(source) {
-    if (source instanceof AppDisplay.AppWellIcon) {
+    if (source instanceof AppDisplay.AppIcon) {
         return source.app;
-    } else if (source.metaWindow) {
-        let tracker = Shell.WindowTracker.get_default();
-        return tracker.get_window_app(source.metaWindow);
     } else {
         return null;
     }
@@ -36,30 +33,26 @@ function getAppFromSource(source) {
 // when requesting a size
 const DashItemContainer = new Lang.Class({
     Name: 'DashItemContainer',
+    Extends: St.Widget,
 
     _init: function() {
-        this.actor = new Shell.GenericContainer({ style_class: 'dash-item-container' });
-        this.actor.connect('get-preferred-width',
-                           Lang.bind(this, this._getPreferredWidth));
-        this.actor.connect('get-preferred-height',
-                           Lang.bind(this, this._getPreferredHeight));
-        this.actor.connect('allocate',
-                           Lang.bind(this, this._allocate));
-        this.actor._delegate = this;
+        this.parent({ style_class: 'dash-item-container' });
 
         this._labelText = "";
         this.label = new St.Label({ style_class: 'dash-label'});
         this.label.hide();
         Main.layoutManager.addChrome(this.label);
-        this.actor.label_actor = this.label;
+        this.label_actor = this.label;
 
         this.child = null;
-        this._childScale = 1;
-        this._childOpacity = 255;
+        this._childScale = 0;
+        this._childOpacity = 0;
         this.animatingOut = false;
     },
 
-    _allocate: function(actor, box, flags) {
+    vfunc_allocate: function(box, flags) {
+        this.set_allocation(box, flags);
+
         if (this.child == null)
             return;
 
@@ -81,28 +74,28 @@ const DashItemContainer = new Lang.Class({
         this.child.allocate(childBox, flags);
     },
 
-    _getPreferredHeight: function(actor, forWidth, alloc) {
-        alloc.min_size = 0;
-        alloc.natural_size = 0;
+    vfunc_get_preferred_height: function(forWidth) {
+        let themeNode = this.get_theme_node();
 
         if (this.child == null)
-            return;
+            return [0, 0];
 
+        forWidth = themeNode.adjust_for_width(forWidth);
         let [minHeight, natHeight] = this.child.get_preferred_height(forWidth);
-        alloc.min_size += minHeight * this.child.scale_y;
-        alloc.natural_size += natHeight * this.child.scale_y;
+        return themeNode.adjust_preferred_height(minHeight * this.child.scale_y,
+                                                 natHeight * this.child.scale_y);
     },
 
-    _getPreferredWidth: function(actor, forHeight, alloc) {
-        alloc.min_size = 0;
-        alloc.natural_size = 0;
+    vfunc_get_preferred_width: function(forHeight) {
+        let themeNode = this.get_theme_node();
 
         if (this.child == null)
-            return;
+            return [0, 0];
 
+        forHeight = themeNode.adjust_for_height(forHeight);
         let [minWidth, natWidth] = this.child.get_preferred_width(forHeight);
-        alloc.min_size = minWidth * this.child.scale_y;
-        alloc.natural_size = natWidth * this.child.scale_y;
+        return themeNode.adjust_preferred_width(minWidth * this.child.scale_y,
+                                                natWidth * this.child.scale_y);
     },
 
     showLabel: function() {
@@ -113,9 +106,9 @@ const DashItemContainer = new Lang.Class({
         this.label.opacity = 0;
         this.label.show();
 
-        let [stageX, stageY] = this.actor.get_transformed_position();
+        let [stageX, stageY] = this.get_transformed_position();
 
-        let itemHeight = this.actor.allocation.y2 - this.actor.allocation.y1;
+        let itemHeight = this.allocation.y2 - this.allocation.y1;
 
         let labelHeight = this.label.get_height();
         let yOffset = Math.floor((itemHeight - labelHeight) / 2)
@@ -129,7 +122,7 @@ const DashItemContainer = new Lang.Class({
         if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
             x = stageX - this.label.get_width() - xOffset;
         else
-            x = stageX + this.actor.get_width() + xOffset;
+            x = stageX + this.get_width() + xOffset;
 
         this.label.set_position(x, y);
         Tweener.addTween(this.label,
@@ -159,22 +152,25 @@ const DashItemContainer = new Lang.Class({
         if (this.child == actor)
             return;
 
-        this.actor.destroy_all_children();
+        this.destroy_all_children();
 
         this.child = actor;
-        this.actor.add_actor(this.child);
+        this.add_actor(this.child);
+
+        this.child.set_scale_with_gravity(this._childScale, this._childScale,
+                                          Clutter.Gravity.CENTER);
+        this.child.set_opacity(this._childOpacity);
     },
 
-    animateIn: function() {
+    show: function(animate) {
         if (this.child == null)
             return;
 
-        this.childScale = 0;
-        this.childOpacity = 0;
+        let time = animate ? DASH_ANIMATION_TIME : 0;
         Tweener.addTween(this,
                          { childScale: 1.0,
                            childOpacity: 255,
-                           time: DASH_ANIMATION_TIME,
+                           time: time,
                            transition: 'easeOutQuad'
                          });
     },
@@ -183,7 +179,7 @@ const DashItemContainer = new Lang.Class({
         if (this.label)
             this.label.destroy();
 
-        this.actor.destroy();
+        this.parent();
     },
 
     animateOutAndDestroy: function() {
@@ -191,19 +187,18 @@ const DashItemContainer = new Lang.Class({
             this.label.destroy();
 
         if (this.child == null) {
-            this.actor.destroy();
+            this.destroy();
             return;
         }
 
         this.animatingOut = true;
-        this.childScale = 1.0;
         Tweener.addTween(this,
                          { childScale: 0.0,
                            childOpacity: 0,
                            time: DASH_ANIMATION_TIME,
                            transition: 'easeOutQuad',
                            onComplete: Lang.bind(this, function() {
-                               this.actor.destroy();
+                               this.destroy();
                            })
                          });
     },
@@ -216,7 +211,7 @@ const DashItemContainer = new Lang.Class({
 
         this.child.set_scale_with_gravity(scale, scale,
                                           Clutter.Gravity.CENTER);
-        this.actor.queue_relayout();
+        this.queue_relayout();
     },
 
     get childScale() {
@@ -230,7 +225,7 @@ const DashItemContainer = new Lang.Class({
             return;
 
         this.child.set_opacity(opacity);
-        this.actor.queue_redraw();
+        this.queue_redraw();
     },
 
     get childOpacity() {
@@ -292,13 +287,7 @@ const ShowAppsIcon = new Lang.Class({
     },
 
     handleDragOver: function(source, actor, x, y, time) {
-        let app = getAppFromSource(source);
-        if (app == null)
-            return DND.DragMotionResult.NO_DROP;
-
-        let id = app.get_id();
-        let isFavorite = AppFavorites.getAppFavorites().isFavorite(id);
-        if (!isFavorite)
+        if (!this._canRemoveApp(getAppFromSource(source)))
             return DND.DragMotionResult.NO_DROP;
 
         return DND.DragMotionResult.MOVE_DROP;
@@ -306,7 +295,7 @@ const ShowAppsIcon = new Lang.Class({
 
     acceptDrop: function(source, actor, x, y, time) {
         let app = getAppFromSource(source);
-        if (app == null)
+        if (!this._canRemoveApp(app))
             return false;
 
         let id = app.get_id();
@@ -331,6 +320,16 @@ const DragPlaceholderItem = new Lang.Class({
     }
 });
 
+const EmptyDropTargetItem = new Lang.Class({
+    Name: 'EmptyDropTargetItem',
+    Extends: DashItemContainer,
+
+    _init: function() {
+        this.parent();
+        this.setChild(new St.Bin({ style_class: 'empty-dash-drop-target' }));
+    }
+});
+
 const DashActor = new Lang.Class({
     Name: 'DashActor',
     Extends: St.Widget,
@@ -361,6 +360,23 @@ const DashActor = new Lang.Class({
         childBox.y1 = contentBox.y2 - showAppsNatHeight;
         childBox.y2 = contentBox.y2;
         showAppsButton.allocate(childBox, flags);
+    },
+
+    vfunc_get_preferred_height: function(forWidth) {
+        // We want to request the natural height of all our children
+        // as our natural height, so we chain up to StWidget (which
+        // then calls BoxLayout), but we only request the showApps
+        // button as the minimum size
+
+        let [, natHeight] = this.parent(forWidth);
+
+        let themeNode = this.get_theme_node();
+        let adjustedForWidth = themeNode.adjust_for_width(forWidth);
+        let [, showAppsButton] = this.get_children();
+        let [minHeight, ] = showAppsButton.get_preferred_height(adjustedForWidth);
+        [minHeight, ] = themeNode.adjust_preferred_height(minHeight, natHeight);
+
+        return [minHeight, natHeight];
     }
 });
 
@@ -386,12 +402,14 @@ const Dash = new Lang.Class({
         this._container.add_actor(this._box);
 
         this._showAppsIcon = new ShowAppsIcon();
+        this._showAppsIcon.childScale = 1;
+        this._showAppsIcon.childOpacity = 255;
         this._showAppsIcon.icon.setIconSize(this.iconSize);
         this._hookUpLabel(this._showAppsIcon);
 
         this.showAppsButton = this._showAppsIcon.toggleButton;
 
-        this._container.add_actor(this._showAppsIcon.actor);
+        this._container.add_actor(this._showAppsIcon);
 
         this.actor = new St.Bin({ child: this._container });
         this.actor.connect('notify::height', Lang.bind(this,
@@ -415,12 +433,10 @@ const Dash = new Lang.Class({
                               Lang.bind(this, this._onDragEnd));
         Main.overview.connect('item-drag-cancelled',
                               Lang.bind(this, this._onDragCancelled));
-        Main.overview.connect('window-drag-begin',
-                              Lang.bind(this, this._onDragBegin));
-        Main.overview.connect('window-drag-cancelled',
-                              Lang.bind(this, this._onDragCancelled));
-        Main.overview.connect('window-drag-end',
-                              Lang.bind(this, this._onDragEnd));
+
+        // Translators: this is the name of the dock/favorites area on
+        // the left of the overview
+        Main.ctrlAltTabManager.addGroup(this.actor, _("Dash"), 'user-bookmarks-symbolic');
     },
 
     _onDragBegin: function() {
@@ -429,6 +445,12 @@ const Dash = new Lang.Class({
             dragMotion: Lang.bind(this, this._onDragMotion)
         };
         DND.addDragMonitor(this._dragMonitor);
+
+        if (this._box.get_n_children() == 0) {
+            this._emptyDropTarget = new EmptyDropTargetItem();
+            this._box.insert_child_at_index(this._emptyDropTarget, 0);
+            this._emptyDropTarget.show(true);
+        }
     },
 
     _onDragCancelled: function() {
@@ -445,6 +467,7 @@ const Dash = new Lang.Class({
 
     _endDrag: function() {
         this._clearDragPlaceholder();
+        this._clearEmptyDropTarget();
         this._showAppsIcon.setDragApp(null);
         DND.removeDragMonitor(this._dragMonitor);
     },
@@ -455,7 +478,7 @@ const Dash = new Lang.Class({
             return DND.DragMotionResult.CONTINUE;
 
         let showAppsHovered =
-                this._showAppsIcon.actor.contains(dragEvent.targetActor);
+                this._showAppsIcon.contains(dragEvent.targetActor);
 
         if (!this._box.contains(dragEvent.targetActor) || showAppsHovered)
             this._clearDragPlaceholder();
@@ -491,9 +514,9 @@ const Dash = new Lang.Class({
     },
 
     _createAppItem: function(app) {
-        let appIcon = new AppDisplay.AppWellIcon(app,
-                                                 { setSizeManually: true,
-                                                   showLabel: false });
+        let appIcon = new AppDisplay.AppIcon(app,
+                                             { setSizeManually: true,
+                                               showLabel: false });
         appIcon._draggable.connect('drag-begin',
                                    Lang.bind(this, function() {
                                        appIcon.actor.opacity = 50;
@@ -510,7 +533,7 @@ const Dash = new Lang.Class({
         let item = new DashItemContainer();
         item.setChild(appIcon.actor);
 
-        // Override default AppWellIcon label_actor, now the
+        // Override default AppIcon label_actor, now the
         // accessible_name is set at DashItemContainer.setLabelText
         appIcon.actor.label_actor = null;
         item.setLabelText(app.get_name());
@@ -570,13 +593,13 @@ const Dash = new Lang.Class({
         // animating out (which means they will be destroyed at the end of
         // the animation)
         let iconChildren = this._box.get_children().filter(function(actor) {
-            return actor._delegate.child &&
-                   actor._delegate.child._delegate &&
-                   actor._delegate.child._delegate.icon &&
-                   !actor._delegate.animatingOut;
+            return actor.child &&
+                   actor.child._delegate &&
+                   actor.child._delegate.icon &&
+                   !actor.animatingOut;
         });
 
-        iconChildren.push(this._showAppsIcon.actor);
+        iconChildren.push(this._showAppsIcon);
 
         if (this._maxHeight == -1)
             return;
@@ -589,23 +612,18 @@ const Dash = new Lang.Class({
         let availHeight = maxContent.y2 - maxContent.y1;
         let spacing = themeNode.get_length('spacing');
 
-
-        let firstIcon = iconChildren[0]._delegate.child._delegate.icon;
+        let firstButton = iconChildren[0].child;
+        let firstIcon = firstButton._delegate.icon;
 
         let minHeight, natHeight;
 
-        // Enforce the current icon size during the size request if
-        // the icon is animating
-        if (firstIcon._animating) {
-            let [currentWidth, currentHeight] = firstIcon.icon.get_size();
+        // Enforce the current icon size during the size request
+        let [currentWidth, currentHeight] = firstIcon.icon.get_size();
 
-            firstIcon.icon.set_size(this.iconSize, this.iconSize);
-            [minHeight, natHeight] = iconChildren[0].get_preferred_height(-1);
+        firstIcon.icon.set_size(this.iconSize, this.iconSize);
+        [minHeight, natHeight] = firstButton.get_preferred_height(-1);
 
-            firstIcon.icon.set_size(currentWidth, currentHeight);
-        } else {
-            [minHeight, natHeight] = iconChildren[0].get_preferred_height(-1);
-        }
+        firstIcon.icon.set_size(currentWidth, currentHeight);
 
         // Subtract icon padding and box spacing from the available height
         availHeight -= iconChildren.length * (natHeight - this.iconSize) +
@@ -630,7 +648,7 @@ const Dash = new Lang.Class({
 
         let scale = oldIconSize / newIconSize;
         for (let i = 0; i < iconChildren.length; i++) {
-            let icon = iconChildren[i]._delegate.child._delegate.icon;
+            let icon = iconChildren[i].child._delegate.icon;
 
             // Set the new size immediately, to keep the icons' sizes
             // in sync with this.iconSize
@@ -650,15 +668,11 @@ const Dash = new Lang.Class({
             icon.icon.set_size(icon.icon.width * scale,
                                icon.icon.height * scale);
 
-            icon._animating = true;
             Tweener.addTween(icon.icon,
                              { width: targetWidth,
                                height: targetHeight,
                                time: DASH_ANIMATION_TIME,
                                transition: 'easeOutQuad',
-                               onComplete: function() {
-                                   icon._animating = false;
-                               }
                              });
         }
     },
@@ -669,13 +683,13 @@ const Dash = new Lang.Class({
         let running = this._appSystem.get_running();
 
         let children = this._box.get_children().filter(function(actor) {
-                return actor._delegate.child &&
-                       actor._delegate.child._delegate &&
-                       actor._delegate.child._delegate.app;
+                return actor.child &&
+                       actor.child._delegate &&
+                       actor.child._delegate.app;
             });
         // Apps currently in the dash
         let oldApps = children.map(function(actor) {
-                return actor._delegate.child._delegate.app;
+                return actor.child._delegate.app;
             });
         // Apps supposed to be in the dash
         let newApps = [];
@@ -741,7 +755,7 @@ const Dash = new Lang.Class({
             let insertHere = newApps[newIndex + 1] &&
                              newApps[newIndex + 1] == oldApps[oldIndex];
             let alreadyRemoved = removedActors.reduce(function(result, actor) {
-                let removedApp = actor._delegate.child._delegate.app;
+                let removedApp = actor.child._delegate.app;
                 return result || removedApp == newApps[newIndex];
             }, false);
 
@@ -758,11 +772,11 @@ const Dash = new Lang.Class({
         }
 
         for (let i = 0; i < addedItems.length; i++)
-            this._box.insert_child_at_index(addedItems[i].item.actor,
+            this._box.insert_child_at_index(addedItems[i].item,
                                             addedItems[i].pos);
 
         for (let i = 0; i < removedActors.length; i++) {
-            let item = removedActors[i]._delegate;
+            let item = removedActors[i];
 
             // Don't animate item removal when the overview is transitioning
             // or hidden
@@ -776,25 +790,39 @@ const Dash = new Lang.Class({
 
         // Skip animations on first run when adding the initial set
         // of items, to avoid all items zooming in at once
-        if (!this._shownInitially) {
+
+        let animate = this._shownInitially && Main.overview.visible &&
+            !Main.overview.animationInProgress;
+
+        if (!this._shownInitially)
             this._shownInitially = true;
-            return;
+
+        for (let i = 0; i < addedItems.length; i++) {
+            addedItems[i].item.show(animate);
         }
 
-        // Don't animate item addition when the overview is transitioning
-        // or hidden
-        if (!Main.overview.visible || Main.overview.animationInProgress)
-            return;
-
-        for (let i = 0; i < addedItems.length; i++)
-            addedItems[i].item.animateIn();
+        // Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=692744
+        // Without it, StBoxLayout may use a stale size cache
+        this._box.queue_relayout();
     },
 
     _clearDragPlaceholder: function() {
         if (this._dragPlaceholder) {
+            this._animatingPlaceholdersCount++;
             this._dragPlaceholder.animateOutAndDestroy();
+            this._dragPlaceholder.connect('destroy',
+                Lang.bind(this, function() {
+                    this._animatingPlaceholdersCount--;
+                }));
             this._dragPlaceholder = null;
-            this._dragPlaceholderPos = -1;
+        }
+        this._dragPlaceholderPos = -1;
+    },
+
+    _clearEmptyDropTarget: function() {
+        if (this._emptyDropTarget) {
+            this._emptyDropTarget.animateOutAndDestroy();
+            this._emptyDropTarget = null;
         }
     },
 
@@ -818,27 +846,22 @@ const Dash = new Lang.Class({
         // the remove target has the same size as "normal" items, we don't
         // need to do the same adjustment there.
         if (this._dragPlaceholder) {
-            boxHeight -= this._dragPlaceholder.actor.height;
+            boxHeight -= this._dragPlaceholder.height;
             numChildren--;
         }
 
-        let pos = Math.floor(y * numChildren / boxHeight);
+        let pos;
+        if (!this._emptyDropTarget)
+            pos = Math.floor(y * numChildren / boxHeight);
+        else
+            pos = 0; // always insert at the top when dash is empty
 
         if (pos != this._dragPlaceholderPos && pos <= numFavorites && this._animatingPlaceholdersCount == 0) {
             this._dragPlaceholderPos = pos;
 
             // Don't allow positioning before or after self
             if (favPos != -1 && (pos == favPos || pos == favPos + 1)) {
-                if (this._dragPlaceholder) {
-                    this._dragPlaceholder.animateOutAndDestroy();
-                    this._animatingPlaceholdersCount++;
-                    this._dragPlaceholder.actor.connect('destroy',
-                        Lang.bind(this, function() {
-                            this._animatingPlaceholdersCount--;
-                        }));
-                }
-                this._dragPlaceholder = null;
-
+                this._clearDragPlaceholder();
                 return DND.DragMotionResult.CONTINUE;
             }
 
@@ -847,7 +870,7 @@ const Dash = new Lang.Class({
             // an animation
             let fadeIn;
             if (this._dragPlaceholder) {
-                this._dragPlaceholder.actor.destroy();
+                this._dragPlaceholder.destroy();
                 fadeIn = false;
             } else {
                 fadeIn = true;
@@ -856,17 +879,16 @@ const Dash = new Lang.Class({
             this._dragPlaceholder = new DragPlaceholderItem();
             this._dragPlaceholder.child.set_width (this.iconSize);
             this._dragPlaceholder.child.set_height (this.iconSize / 2);
-            this._box.insert_child_at_index(this._dragPlaceholder.actor,
+            this._box.insert_child_at_index(this._dragPlaceholder,
                                             this._dragPlaceholderPos);
-            if (fadeIn)
-                this._dragPlaceholder.animateIn();
+            this._dragPlaceholder.show(fadeIn);
         }
 
         // Remove the drag placeholder if we are not in the
         // "favorites zone"
-        if (pos > numFavorites && this._dragPlaceholder) {
+        if (pos > numFavorites)
             this._clearDragPlaceholder();
-        }
+
         if (!this._dragPlaceholder)
             return DND.DragMotionResult.NO_DROP;
 
@@ -897,10 +919,10 @@ const Dash = new Lang.Class({
         let children = this._box.get_children();
         for (let i = 0; i < this._dragPlaceholderPos; i++) {
             if (this._dragPlaceholder &&
-                children[i] == this._dragPlaceholder.actor)
+                children[i] == this._dragPlaceholder)
                 continue;
 
-            let childId = children[i]._delegate.child._delegate.app.get_id();
+            let childId = children[i].child._delegate.app.get_id();
             if (childId == id)
                 continue;
             if (childId in favorites)

js/ui/dateMenu.js

@@ -49,11 +49,6 @@ const DateMenuButton = new Lang.Class({
             menuAlignment = 1.0 - menuAlignment;
         this.parent(menuAlignment);
 
-        // At this moment calendar menu is not keyboard navigable at
-        // all (so not accessible), so it doesn't make sense to set as
-        // role ATK_ROLE_MENU like other elements of the panel.
-        this.actor.accessible_role = Atk.Role.LABEL;
-
         this._clockDisplay = new St.Label();
         this.actor.add_actor(this._clockDisplay);
 
@@ -85,27 +80,22 @@ const DateMenuButton = new Lang.Class({
         vbox.add(this._calendar.actor);
 
         let separator = new PopupMenu.PopupSeparatorMenuItem();
-        separator.setColumnWidths(1);
-        vbox.add(separator.actor, {y_align: St.Align.END, expand: true, y_fill: false});
+        vbox.add(separator.actor, { y_align: St.Align.END, expand: true, y_fill: false });
 
         this._openCalendarItem = new PopupMenu.PopupMenuItem(_("Open Calendar"));
         this._openCalendarItem.connect('activate', Lang.bind(this, this._onOpenCalendarActivate));
-        this._openCalendarItem.actor.can_focus = false;
         vbox.add(this._openCalendarItem.actor, {y_align: St.Align.END, expand: true, y_fill: false});
 
         this._openClocksItem = new PopupMenu.PopupMenuItem(_("Open Clocks"));
         this._openClocksItem.connect('activate', Lang.bind(this, this._onOpenClocksActivate));
-        this._openClocksItem.actor.can_focus = false;
         vbox.add(this._openClocksItem.actor, {y_align: St.Align.END, expand: true, y_fill: false});
 
         Shell.AppSystem.get_default().connect('installed-changed',
                                               Lang.bind(this, this._appInstalledChanged));
-        this._appInstalledChanged();
 
-        item = this.menu.addSettingsAction(_("Date and Time Settings"), 'gnome-datetime-panel.desktop');
+        item = this.menu.addSettingsAction(_("Date & Time Settings"), 'gnome-datetime-panel.desktop');
         if (item) {
             item.actor.show_on_set_parent = false;
-            item.actor.can_focus = false;
             item.actor.reparent(vbox);
             this._dateAndTimeSeparator = separator;
         }
@@ -116,12 +106,7 @@ const DateMenuButton = new Lang.Class({
         hbox.add(this._separator);
 
         // Fill up the second column
-        vbox = new St.BoxLayout({ name: 'calendarEventsArea',
-                                  vertical: true });
-        hbox.add(vbox, { expand: true });
-
-        // Event list
-        vbox.add(this._eventList.actor, { expand: true });
+        hbox.add(this._eventList.actor, { expand: true, y_fill: false, y_align: St.Align.START });
 
         // Whenever the menu is opened, select today
         this.menu.connect('open-state-changed', Lang.bind(this, function(menu, isOpen) {
@@ -157,28 +142,39 @@ const DateMenuButton = new Lang.Class({
     },
 
     _appInstalledChanged: function() {
-        let app = Shell.AppSystem.get_default().lookup_app('gnome-clocks.desktop');
-        this._openClocksItem.actor.visible = app !== null;
+        this._calendarApp = undefined;
+        this._updateEventsVisibility();
     },
 
-    _setEventsVisibility: function(visible) {
-        this._openCalendarItem.actor.visible = visible;
+    _updateEventsVisibility: function() {
+        let visible = this._eventSource.hasCalendars;
+        this._openCalendarItem.actor.visible = visible &&
+            (this._getCalendarApp() != null);
+        this._openClocksItem.actor.visible = visible &&
+            (this._getClockApp() != null);
         this._separator.visible = visible;
+        this._eventList.actor.visible = visible;
         if (visible) {
-          let alignment = 0.25;
-          if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
-            alignment = 1.0 - alignment;
-          this.menu._arrowAlignment = alignment;
-          this._eventList.actor.get_parent().show();
+            let alignment = 0.25;
+            if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
+                alignment = 1.0 - alignment;
+            this.menu._arrowAlignment = alignment;
         } else {
-          this.menu._arrowAlignment = 0.5;
-          this._eventList.actor.get_parent().hide();
+            this.menu._arrowAlignment = 0.5;
         }
     },
 
     _setEventSource: function(eventSource) {
+        if (this._eventSource)
+            this._eventSource.destroy();
+
         this._calendar.setEventSource(eventSource);
         this._eventList.setEventSource(eventSource);
+
+        this._eventSource = eventSource;
+        this._eventSource.connect('notify::has-calendars', Lang.bind(this, function() {
+            this._updateEventsVisibility();
+        }));
     },
 
     _sessionUpdated: function() {
@@ -187,10 +183,10 @@ const DateMenuButton = new Lang.Class({
         if (showEvents) {
             eventSource = new Calendar.DBusEventSource();
         } else {
-            eventSource = null;
+            eventSource = new Calendar.EmptyEventSource();
         }
         this._setEventSource(eventSource);
-        this._setEventsVisibility(showEvents);
+        this._updateEventsVisibility();
 
         // This needs to be handled manually, as the code to
         // autohide separators doesn't work across the vbox
@@ -207,16 +203,34 @@ const DateMenuButton = new Lang.Class({
         this._date.set_text(displayDate.toLocaleFormat(dateFormat));
     },
 
+    _getCalendarApp: function() {
+        if (this._calendarApp !== undefined)
+            return this._calendarApp;
+
+        let apps = Gio.AppInfo.get_recommended_for_type('text/calendar');
+        if (apps && (apps.length > 0))
+            this._calendarApp = apps[0];
+        else
+            this._calendarApp = null;
+        return this._calendarApp;
+    },
+
+    _getClockApp: function() {
+        return Shell.AppSystem.get_default().lookup_app('gnome-clocks.desktop');
+    },
+
     _onOpenCalendarActivate: function() {
         this.menu.close();
 
-        let app = Gio.AppInfo.get_default_for_type('text/calendar', false);
+        let app = this._getCalendarApp();
+        if (app.get_id() == 'evolution.desktop')
+            app = Gio.DesktopAppInfo.new('evolution-calendar.desktop');
         app.launch([], global.create_app_launch_context());
     },
 
     _onOpenClocksActivate: function() {
         this.menu.close();
-        let app = Shell.AppSystem.get_default().lookup_app('gnome-clocks.desktop');
+        let app = this._getClockApp();
         app.activate();
     }
 });

js/ui/dnd.js

@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
+const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
 const St = imports.gi.St;
 const Lang = imports.lang;
@@ -43,9 +44,7 @@ let dragMonitors = [];
 
 function _getEventHandlerActor() {
     if (!eventHandlerActor) {
-        eventHandlerActor = new Clutter.Rectangle();
-        eventHandlerActor.width = 0;
-        eventHandlerActor.height = 0;
+        eventHandlerActor = new Clutter.Actor({ width: 0, height: 0 });
         Main.uiGroup.add_actor(eventHandlerActor);
         // We connect to 'event' rather than 'captured-event' because the capturing phase doesn't happen
         // when you've grabbed the pointer.
@@ -85,11 +84,13 @@ const _Draggable = new Lang.Class({
 
         this.actor.connect('destroy', Lang.bind(this, function() {
             this._actorDestroyed = true;
+
             // If the drag actor is destroyed and we were going to fix
             // up its hover state, fix up the parent hover state instead
             if (this.actor == this._firstLeaveActor)
                 this._firstLeaveActor = this._dragOrigParent;
-            if (this._dragInProgress)
+
+            if (this._dragInProgress && this._dragCancellable)
                 this._cancelDrag(global.get_current_time());
             this.disconnectAll();
         }));
@@ -102,6 +103,7 @@ const _Draggable = new Lang.Class({
         this._buttonDown = false; // The mouse button has been pressed and has not yet been released.
         this._dragInProgress = false; // The drag has been started, and has not been dropped or cancelled yet.
         this._animationInProgress = false; // The drag is over and the item is in the process of animating to its original position (snapping back or reverting).
+        this._dragCancellable = true;
 
         // During the drag, we eat enter/leave events so that actors don't prelight.
         // But we remember the actors that we first left/last entered so we can
@@ -136,25 +138,26 @@ const _Draggable = new Lang.Class({
     },
 
     _ungrabActor: function() {
-        Clutter.ungrab_pointer();
         if (!this._onEventId)
             return;
+
+        Clutter.ungrab_pointer();
         this.actor.disconnect(this._onEventId);
         this._onEventId = null;
     },
 
     _grabEvents: function() {
         if (!this._eventsGrabbed) {
-            Clutter.grab_pointer(_getEventHandlerActor());
-            Clutter.grab_keyboard(_getEventHandlerActor());
-            this._eventsGrabbed = true;
+            this._eventsGrabbed = Main.pushModal(_getEventHandlerActor());
+            if (this._eventsGrabbed)
+                Clutter.grab_pointer(_getEventHandlerActor());
         }
     },
 
     _ungrabEvents: function() {
         if (this._eventsGrabbed) {
             Clutter.ungrab_pointer();
-            Clutter.ungrab_keyboard();
+            Main.popModal(_getEventHandlerActor());
             this._eventsGrabbed = false;
         }
     },
@@ -203,6 +206,19 @@ const _Draggable = new Lang.Class({
         return false;
     },
 
+    /**
+     * fakeRelease:
+     *
+     * Fake a release event.
+     * Must be called if you want to intercept release events on draggable
+     * actors for other purposes (for example if you're using
+     * PopupMenu.ignoreRelease())
+     */
+    fakeRelease: function() {
+        this._buttonDown = false;
+        this._ungrabActor();
+    },
+
     /**
      * startDrag:
      * @stageX: X coordinate of event
@@ -274,19 +290,19 @@ const _Draggable = new Lang.Class({
             this._dragOrigY = this._dragActor.y;
             this._dragOrigScale = this._dragActor.scale_x;
 
-            this._dragActor.reparent(Main.uiGroup);
-            this._dragActor.raise_top();
-            Shell.util_set_hidden_from_pick(this._dragActor, true);
+            // Set the actor's scale such that it will keep the same
+            // transformed size when it's reparented to the uiGroup
+            let [scaledWidth, scaledHeight] = this.actor.get_transformed_size();
+            this._dragActor.set_scale(scaledWidth / this.actor.width,
+                                      scaledHeight / this.actor.height);
 
             let [actorStageX, actorStageY] = this.actor.get_transformed_position();
             this._dragOffsetX = actorStageX - this._dragStartX;
             this._dragOffsetY = actorStageY - this._dragStartY;
 
-            // Set the actor's scale such that it will keep the same
-            // transformed size when it's reparented to the uiGroup
-            let [scaledWidth, scaledHeight] = this.actor.get_transformed_size();
-            this.actor.set_scale(scaledWidth / this.actor.width,
-                                 scaledHeight / this.actor.height);
+            this._dragActor.reparent(Main.uiGroup);
+            this._dragActor.raise_top();
+            Shell.util_set_hidden_from_pick(this._dragActor, true);
         }
 
         this._dragOrigOpacity = this._dragActor.opacity;
@@ -343,60 +359,65 @@ const _Draggable = new Lang.Class({
         return true;
     },
 
+    _updateDragHover : function () {
+        let target = this._dragActor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
+                                                                  this._dragX, this._dragY);
+        let dragEvent = {
+            x: this._dragX,
+            y: this._dragY,
+            dragActor: this._dragActor,
+            source: this.actor._delegate,
+            targetActor: target
+        };
+        for (let i = 0; i < dragMonitors.length; i++) {
+            let motionFunc = dragMonitors[i].dragMotion;
+            if (motionFunc) {
+                let result = motionFunc(dragEvent);
+                if (result != DragMotionResult.CONTINUE) {
+                    global.set_cursor(DRAG_CURSOR_MAP[result]);
+                    return false;
+                }
+            }
+        }
+
+        while (target) {
+            if (target._delegate && target._delegate.handleDragOver) {
+                let [r, targX, targY] = target.transform_stage_point(this._dragX, this._dragY);
+                // We currently loop through all parents on drag-over even if one of the children has handled it.
+                // We can check the return value of the function and break the loop if it's true if we don't want
+                // to continue checking the parents.
+                let result = target._delegate.handleDragOver(this.actor._delegate,
+                                                             this._dragActor,
+                                                             targX,
+                                                             targY,
+                                                             0);
+                if (result != DragMotionResult.CONTINUE) {
+                    global.set_cursor(DRAG_CURSOR_MAP[result]);
+                    return false;
+                }
+            }
+            target = target.get_parent();
+        }
+        global.set_cursor(Shell.Cursor.DND_IN_DRAG);
+        return false;
+    },
+
+    _queueUpdateDragHover: function() {
+        if (this._updateHoverId)
+            GLib.source_remove(this._updateHoverId);
+
+        this._updateHoverId = GLib.idle_add(GLib.PRIORITY_DEFAULT,
+                                            Lang.bind(this, this._updateDragHover));
+    },
+
     _updateDragPosition : function (event) {
         let [stageX, stageY] = event.get_coords();
         this._dragX = stageX;
         this._dragY = stageY;
+        this._dragActor.set_position(stageX + this._dragOffsetX,
+                                     stageY + this._dragOffsetY);
 
-        // If we are dragging, update the position
-        if (this._dragActor) {
-            this._dragActor.set_position(stageX + this._dragOffsetX,
-                                         stageY + this._dragOffsetY);
-
-            let target = this._dragActor.get_stage().get_actor_at_pos(Clutter.PickMode.ALL,
-                                                                      stageX, stageY);
-
-            // We call observers only once per motion with the innermost
-            // target actor. If necessary, the observer can walk the
-            // parent itself.
-            let dragEvent = {
-                x: stageX,
-                y: stageY,
-                dragActor: this._dragActor,
-                source: this.actor._delegate,
-                targetActor: target
-            };
-            for (let i = 0; i < dragMonitors.length; i++) {
-                let motionFunc = dragMonitors[i].dragMotion;
-                if (motionFunc) {
-                    let result = motionFunc(dragEvent);
-                    if (result != DragMotionResult.CONTINUE) {
-                        global.set_cursor(DRAG_CURSOR_MAP[result]);
-                        return true;
-                    }
-                }
-            }
-            while (target) {
-                if (target._delegate && target._delegate.handleDragOver) {
-                    let [r, targX, targY] = target.transform_stage_point(stageX, stageY);
-                    // We currently loop through all parents on drag-over even if one of the children has handled it.
-                    // We can check the return value of the function and break the loop if it's true if we don't want
-                    // to continue checking the parents.
-                    let result = target._delegate.handleDragOver(this.actor._delegate,
-                                                                 this._dragActor,
-                                                                 targX,
-                                                                 targY,
-                                                                 event.get_time());
-                    if (result != DragMotionResult.CONTINUE) {
-                        global.set_cursor(DRAG_CURSOR_MAP[result]);
-                        return true;
-                    }
-                }
-                target = target.get_parent();
-            }
-            global.set_cursor(Shell.Cursor.DND_IN_DRAG);
-        }
-
+        this._queueUpdateDragHover();
         return true;
     },
 
@@ -425,6 +446,11 @@ const _Draggable = new Lang.Class({
                 }
         }
 
+        // At this point it is too late to cancel a drag by destroying
+        // the actor, the fate of which is decided by acceptDrop and its
+        // side-effects
+        this._dragCancellable = false;
+
         while (target) {
             if (target._delegate && target._delegate.acceptDrop) {
                 let [r, targX, targY] = target.transform_stage_point(dropX, dropY);
@@ -433,8 +459,6 @@ const _Draggable = new Lang.Class({
                                                 targX,
                                                 targY,
                                                 event.get_time())) {
-                    if (this._actorDestroyed)
-                        return true;
                     // If it accepted the drop without taking the actor,
                     // handle it ourselves.
                     if (this._dragActor.get_parent() == Main.uiGroup) {
@@ -493,6 +517,11 @@ const _Draggable = new Lang.Class({
     },
 
     _cancelDrag: function(eventTime) {
+        if (this._updateHoverId) {
+            GLib.source_remove(this._updateHoverId);
+            this._updateHoverId = 0;
+        }
+
         this.emit('drag-cancelled', eventTime);
         this._dragInProgress = false;
         let [snapBackX, snapBackY, snapBackScale] = this._getRestoreLocation();

js/ui/endSessionDialog.js

@@ -19,6 +19,7 @@
  */
 
 const Lang = imports.lang;
+const Mainloop = imports.mainloop;
 const Signals = imports.signals;
 
 const AccountsService = imports.gi.AccountsService;
@@ -34,7 +35,7 @@ const GnomeSession = imports.misc.gnomeSession;
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
 const Tweener = imports.ui.tweener;
-const UserMenu = imports.ui.userMenu;
+const UserWidget = imports.ui.userWidget;
 
 let _endSessionDialog = null;
 
@@ -50,6 +51,7 @@ const EndSessionDialogIface = <interface name="org.gnome.SessionManager.EndSessi
     <arg type="u" direction="in" />
     <arg type="ao" direction="in" />
 </method>
+<method name="Close" />
 <signal name="ConfirmedLogout" />
 <signal name="ConfirmedReboot" />
 <signal name="ConfirmedShutdown" />
@@ -223,7 +225,8 @@ const EndSessionDialog = new Lang.Class({
     Extends: ModalDialog.ModalDialog,
 
     _init: function() {
-        this.parent({ styleClass: 'end-session-dialog' });
+        this.parent({ styleClass: 'end-session-dialog',
+                      destroyOnClose: false });
 
         this._user = AccountsService.UserManager.get_default().get_user(GLib.get_user_name());
 
@@ -357,9 +360,9 @@ const EndSessionDialog = new Lang.Class({
                                                 icon_size: _DIALOG_ICON_SIZE,
                                                 style_class: dialogContent.iconStyleClass });
         } else {
-            let avatarWidget = new UserMenu.UserAvatarWidget(this._user,
-                                                             { iconSize: _DIALOG_ICON_SIZE,
-                                                               styleClass: dialogContent.iconStyleClass });
+            let avatarWidget = new UserWidget.Avatar(this._user,
+                                                     { iconSize: _DIALOG_ICON_SIZE,
+                                                       styleClass: dialogContent.iconStyleClass });
             this._iconBin.child = avatarWidget.actor;
             avatarWidget.update();
         }
@@ -377,7 +380,12 @@ const EndSessionDialog = new Lang.Class({
             let signal = dialogContent.confirmButtons[i].signal;
             let label = dialogContent.confirmButtons[i].label;
             buttons.push({ action: Lang.bind(this, function() {
-                                       this._confirm(signal);
+                                       this.close(true);
+                                       let signalId = this.connect('closed',
+                                                                   Lang.bind(this, function() {
+                                                                       this.disconnect(signalId);
+                                                                       this._confirm(signal);
+                                                                   }));
                                    }),
                            label: label });
         }
@@ -385,15 +393,17 @@ const EndSessionDialog = new Lang.Class({
         this.setButtons(buttons);
     },
 
-    close: function() {
+    close: function(skipSignal) {
         this.parent();
-        this._dbusImpl.emit_signal('Closed', null);
+
+        if (!skipSignal)
+            this._dbusImpl.emit_signal('Closed', null);
     },
 
     cancel: function() {
         this._stopTimer();
         this._dbusImpl.emit_signal('Canceled', null);
-        this.close(global.get_current_time());
+        this.close();
     },
 
     _confirm: function(signal) {
@@ -408,22 +418,35 @@ const EndSessionDialog = new Lang.Class({
     },
 
     _startTimer: function() {
+        let startTime = GLib.get_monotonic_time();
         this._secondsLeft = this._totalSecondsToStayOpen;
-        Tweener.addTween(this,
-                         { _secondsLeft: 0,
-                           time: this._secondsLeft,
-                           transition: 'linear',
-                           onUpdate: Lang.bind(this, this._updateDescription),
-                           onComplete: Lang.bind(this, function() {
-                                           let dialogContent = DialogContent[this._type];
-                                           let button = dialogContent.confirmButtons[dialogContent.confirmButtons.length - 1];
-                                           this._confirm(button.signal);
-                                       }),
-                         });
+        this._updateDescription();
+
+        this._timerId = Mainloop.timeout_add_seconds(1, Lang.bind(this,
+            function() {
+                let currentTime = GLib.get_monotonic_time();
+                let secondsElapsed = ((currentTime - startTime) / 1000000);
+
+                this._secondsLeft = this._totalSecondsToStayOpen - secondsElapsed;
+                if (this._secondsLeft > 0) {
+                    this._updateDescription();
+                    return true;
+                }
+
+                let dialogContent = DialogContent[this._type];
+                let button = dialogContent.confirmButtons[dialogContent.confirmButtons.length - 1];
+                this._confirm(button.signal);
+
+                return false;
+            }));
     },
 
     _stopTimer: function() {
-        Tweener.removeTweens(this);
+        if (this._timerId != 0) {
+            Mainloop.source_remove(this._timerId);
+            this._timerId = 0;
+        }
+
         this._secondsLeft = 0;
     },
 
@@ -440,7 +463,7 @@ const EndSessionDialog = new Lang.Class({
             let item = new ListItem(app, reason);
             item.connect('activate',
                          Lang.bind(this, function() {
-                             this.close(global.get_current_time());
+                             this.close();
                          }));
             this._applicationList.add(item.actor, { x_fill: true });
             this._stopTimer();
@@ -488,5 +511,9 @@ const EndSessionDialog = new Lang.Class({
                                         invocation.return_value(null);
                                         this.disconnect(signalId);
                                     }));
+    },
+
+    Close: function(parameters, invocation) {
+        this.close();
     }
 });

js/ui/environment.js

@@ -10,6 +10,7 @@ const Clutter = imports.gi.Clutter;;
 const Gettext = imports.gettext;
 const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 
@@ -39,6 +40,22 @@ function _patchContainerClass(containerClass) {
     };
 }
 
+function _patchLayoutClass(layoutClass, styleProps) {
+    if (styleProps)
+        layoutClass.prototype.hookup_style = function(container) {
+            container.connect('style-changed', Lang.bind(this, function() {
+                let node = container.get_theme_node();
+                for (let prop in styleProps)
+                    this[prop] = node.get_length(styleProps[prop]);
+            }));
+        };
+    layoutClass.prototype.child_set = function(actor, props) {
+        let meta = this.get_child_meta(actor.get_parent(), actor);
+        for (let prop in props)
+            meta[prop] = props[prop];
+    };
+}
+
 function _makeLoggingFunc(func) {
     return function() {
         return func([].join.call(arguments, ', '));
@@ -60,6 +77,12 @@ function init() {
     _patchContainerClass(St.BoxLayout);
     _patchContainerClass(St.Table);
 
+    _patchLayoutClass(Clutter.TableLayout, { row_spacing: 'spacing-rows',
+                                             column_spacing: 'spacing-columns' });
+    _patchLayoutClass(Clutter.GridLayout, { row_spacing: 'spacing-rows',
+                                            column_spacing: 'spacing-columns' });
+    _patchLayoutClass(Clutter.BoxLayout, { spacing: 'spacing' });
+
     Clutter.Actor.prototype.toString = function() {
         return St.describe_actor(this);
     };

js/ui/extensionDownloader.js

@@ -215,7 +215,7 @@ const InstallExtensionDialog = new Lang.Class({
     },
 
     _onCancelButtonPressed: function(button, event) {
-        this.close(global.get_current_time());
+        this.close();
         this._invocation.return_value(GLib.Variant.new('(s)', ['cancelled']));
     },
 
@@ -257,7 +257,7 @@ const InstallExtensionDialog = new Lang.Class({
             gotExtensionZipFile(session, message, uuid, dir, callback, errback);
         }));
 
-        this.close(global.get_current_time());
+        this.close();
     }
 });
 

js/ui/extensionSystem.js

@@ -106,11 +106,15 @@ function enableExtension(uuid) {
 
     extensionOrder.push(uuid);
 
-    let stylesheetFile = extension.dir.get_child('stylesheet.css');
-    if (stylesheetFile.query_exists(null)) {
-        let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
-        theme.load_stylesheet(stylesheetFile.get_path());
-        extension.stylesheet = stylesheetFile;
+    let stylesheetNames = [global.session_mode + '.css', 'stylesheet.css'];
+    for (let i = 0; i < stylesheetNames.length; i++) {
+        let stylesheetFile = extension.dir.get_child(stylesheetNames[i]);
+        if (stylesheetFile.query_exists(null)) {
+            let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
+            theme.load_stylesheet(stylesheetFile.get_path());
+            extension.stylesheet = stylesheetFile;
+            break;
+        }
     }
 
     extension.stateObj.enable();
@@ -288,7 +292,7 @@ function disableAllExtensions() {
         return;
 
     if (initted) {
-        enabledExtensions.forEach(function(uuid) {
+        extensionOrder.slice().reverse().forEach(function(uuid) {
             disableExtension(uuid);
         });
     }

js/ui/grabHelper.js

@@ -1,4 +1,4 @@
-/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;
@@ -10,17 +10,6 @@ const St = imports.gi.St;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 
-function _navigateActor(actor) {
-    if (!actor)
-        return;
-
-    let needsGrab = true;
-    if (actor instanceof St.Widget)
-        needsGrab = !actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
-    if (needsGrab)
-        actor.grab_key_focus();
-}
-
 // GrabHelper:
 // @owner: the actor that owns the GrabHelper
 // @params: optional parameters to pass to Main.pushModal()
@@ -43,12 +32,9 @@ const GrabHelper = new Lang.Class({
 
         this._actors = [];
         this._capturedEventId = 0;
-        this._keyFocusNotifyId = 0;
-        this._focusWindowChangedId = 0;
         this._ignoreRelease = false;
 
         this._modalCount = 0;
-        this._grabFocusCount = 0;
     },
 
     // addActor:
@@ -77,7 +63,7 @@ const GrabHelper = new Lang.Class({
     },
 
     _isWithinGrabbedActor: function(actor) {
-       let currentActor = this.currentGrab.actor;
+        let currentActor = this.currentGrab.actor;
         while (actor) {
             if (this._actors.indexOf(actor) != -1)
                 return true;
@@ -128,38 +114,36 @@ const GrabHelper = new Lang.Class({
     // grab:
     // @params: A bunch of parameters, see below
     //
-    // Grabs the mouse and keyboard, according to the GrabHelper's
-    // parameters. If @newFocus is not %null, then the keyboard focus
-    // is moved to the first #StWidget:can-focus widget inside it.
+    // The general effect of a "grab" is to ensure that the passed in actor
+    // and all actors inside the grab get exclusive control of the mouse and
+    // keyboard, with the grab automatically being dropped if the user tries
+    // to dismiss it. The actor is passed in through @params.actor.
     //
-    // The grab will automatically be dropped if:
-    //   - The user clicks outside the grabbed actors
-    //   - The user types Escape
-    //   - The keyboard focus is moved outside the grabbed actors
-    //   - A window is focused
+    // grab() can be called multiple times, with the scope of the grab being
+    // changed to a different actor every time. A nested grab does not have
+    // to have its grabbed actor inside the parent grab actors.
     //
-    // If @params.actor is not null, then it will be focused as the
-    // new actor. If you attempt to grab an already focused actor, the
-    // request to be focused will be ignored. The actor will not be
-    // added to the grab stack, so do not call a paired ungrab().
+    // Grabs can be automatically dropped if the user tries to dismiss it
+    // in one of two ways: the user clicking outside the currently grabbed
+    // actor, or the user typing the Escape key.
     //
-    // If @params contains { modal: true }, then grab() will push a modal
-    // on the owner of the GrabHelper. As long as there is at least one
-    // { modal: true } actor on the grab stack, the grab will be kept.
-    // When the last { modal: true } actor is ungrabbed, then the modal
-    // will be dropped. A modal grab can fail if there is already a grab
-    // in effect from aother application; in this case the function returns
-    // false and nothing happens. Non-modal grabs can never fail.
+    // If the user clicks outside the grabbed actors, and the clicked on
+    // actor is part of a previous grab in the stack, grabs will be popped
+    // until that grab is active. However, the click event will not be
+    // replayed to the actor.
     //
-    // If @params contains { grabFocus: true }, then if you call grab()
-    // while the shell is outside the overview, it will set the stage
-    // input mode to %Shell.StageInputMode.FOCUSED, and ungrab() will
-    // revert it back, and re-focus the previously-focused window (if
-    // another window hasn't been explicitly focused before then).
+    // If the user types the Escape key, one grab from the grab stack will
+    // be popped.
+    //
+    // When a grab is popped by user interacting as described above, if you
+    // pass a callback as @params.onUngrab, it will be called with %true.
+    //
+    // If @params.focus is not null, we'll set the key focus directly
+    // to that actor instead of navigating in @params.actor. This is for
+    // use cases like menus, where we want to grab the menu actor, but keep
+    // focus on the clicked on menu item.
     grab: function(params) {
         params = Params.parse(params, { actor: null,
-                                        modal: false,
-                                        grabFocus: false,
                                         focus: null,
                                         onUngrab: null });
 
@@ -172,21 +156,18 @@ const GrabHelper = new Lang.Class({
 
         params.savedFocus = focus;
 
-        if (params.modal && !this._takeModalGrab())
+        if (!this._takeModalGrab())
             return false;
 
-        if (params.grabFocus && !this._takeFocusGrab(hadFocus))
-            return false;
-
-        if (params.focus)
-            params.focus.grab_key_focus();
-        else if (hadFocus || params.grabFocus)
-            _navigateActor(newFocus);
-
-        if ((params.grabFocus || params.modal) && !this._capturedEventId)
-            this._capturedEventId = global.stage.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
-
         this._grabStack.push(params);
+
+        if (params.focus) {
+            params.focus.grab_key_focus();
+        } else if (newFocus && hadFocus) {
+            if (!newFocus.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false))
+                newFocus.grab_key_focus();
+        }
+
         return true;
     },
 
@@ -195,6 +176,8 @@ const GrabHelper = new Lang.Class({
         if (firstGrab) {
             if (!Main.pushModal(this._owner, this._modalParams))
                 return false;
+
+            this._capturedEventId = global.stage.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
         }
 
         this._modalCount++;
@@ -206,58 +189,15 @@ const GrabHelper = new Lang.Class({
         if (this._modalCount > 0)
             return;
 
+        global.stage.disconnect(this._capturedEventId);
+        this._capturedEventId = 0;
+
+        this._ignoreRelease = false;
+
         Main.popModal(this._owner);
         global.sync_pointer();
     },
 
-    _takeFocusGrab: function(hadFocus) {
-        let firstGrab = (this._grabFocusCount == 0);
-        if (firstGrab) {
-            let metaDisplay = global.screen.get_display();
-
-            this._grabbedFromKeynav = hadFocus;
-            this._preGrabInputMode = global.stage_input_mode;
-
-            if (this._preGrabInputMode == Shell.StageInputMode.NONREACTIVE ||
-                this._preGrabInputMode == Shell.StageInputMode.NORMAL) {
-                global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
-            }
-
-            this._keyFocusNotifyId = global.stage.connect('notify::key-focus', Lang.bind(this, this._onKeyFocusChanged));
-            this._focusWindowChangedId = metaDisplay.connect('notify::focus-window', Lang.bind(this, this._focusWindowChanged));
-        }
-
-        this._grabFocusCount++;
-        return true;
-    },
-
-    _releaseFocusGrab: function() {
-        this._grabFocusCount--;
-        if (this._grabFocusCount > 0)
-            return;
-
-        if (this._keyFocusNotifyId > 0) {
-            global.stage.disconnect(this._keyFocusNotifyId);
-            this._keyFocusNotifyId = 0;
-        }
-
-        if (!this._focusWindowChanged > 0) {
-            let metaDisplay = global.screen.get_display();
-            metaDisplay.disconnect(this._focusWindowChangedId);
-            this._focusWindowChangedId = 0;
-        }
-
-        let prePopInputMode = global.stage_input_mode;
-
-        if (this._grabbedFromKeynav) {
-            if (this._preGrabInputMode == Shell.StageInputMode.FOCUSED &&
-                prePopInputMode != Shell.StageInputMode.FULLSCREEN)
-                global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
-        }
-
-        global.screen.focus_default_window(global.get_current_time());
-    },
-
     // ignoreRelease:
     //
     // Make sure that the next button release event evaluated by the
@@ -271,10 +211,14 @@ const GrabHelper = new Lang.Class({
     // ungrab:
     // @params: The parameters for the grab; see below.
     //
-    // Pops an actor from the grab stack, potentially dropping the grab.
+    // Pops @params.actor from the grab stack, potentially dropping
+    // the grab. If the actor is not on the grab stack, this call is
+    // ignored with no ill effects.
     //
-    // If the actor that was popped from the grab stack was not the actor
-    // That was passed in, this call is ignored.
+    // If the actor is not at the top of the grab stack, grabs are
+    // popped until the grabbed actor is at the top of the grab stack.
+    // The onUngrab callback for every grab is called for every popped
+    // grab with the parameter %false.
     ungrab: function(params) {
         params = Params.parse(params, { actor: this.currentGrab.actor,
                                         isUser: false });
@@ -297,21 +241,13 @@ const GrabHelper = new Lang.Class({
             if (poppedGrab.onUngrab)
                 poppedGrab.onUngrab(params.isUser);
 
-            if (poppedGrab.modal)
-                this._releaseModalGrab();
-
-            if (poppedGrab.grabFocus)
-                this._releaseFocusGrab();
-        }
-
-        if (!this.grabbed && this._capturedEventId > 0) {
-            global.stage.disconnect(this._capturedEventId);
-            this._capturedEventId = 0;
+            this._releaseModalGrab();
         }
 
         if (hadFocus) {
             let poppedGrab = poppedGrabs[0];
-            _navigateActor(poppedGrab.savedFocus);
+            if (poppedGrab.savedFocus)
+                poppedGrab.savedFocus.grab_key_focus();
         }
     },
 
@@ -333,9 +269,6 @@ const GrabHelper = new Lang.Class({
             return true;
         }
 
-        if (!button && this._modalCount == 0)
-            return false;
-
         if (this._isWithinGrabbedActor(event.get_source()))
             return false;
 
@@ -349,20 +282,9 @@ const GrabHelper = new Lang.Class({
                 this._ignoreRelease = true;
             let i = this._actorInGrabStack(event.get_source()) + 1;
             this.ungrab({ actor: this._grabStack[i].actor, isUser: true });
+            return true;
         }
 
-        return this._modalCount > 0;
+        return true;
     },
-
-    _onKeyFocusChanged: function() {
-        let focus = global.stage.key_focus;
-        if (!focus || !this._isWithinGrabbedActor(focus))
-            this.ungrab({ isUser: true });
-    },
-
-    _focusWindowChanged: function() {
-        let metaDisplay = global.screen.get_display();
-        if (metaDisplay.focus_window != null)
-            this.ungrab({ isUser: true });
-    }
 });

js/ui/ibusCandidatePopup.js

@@ -3,107 +3,149 @@
 const Clutter = imports.gi.Clutter;
 const IBus = imports.gi.IBus;
 const Lang = imports.lang;
+const Signals = imports.signals;
 const St = imports.gi.St;
 
 const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;
-const PopupMenu = imports.ui.popupMenu;
 
 const MAX_CANDIDATES_PER_PAGE = 16;
 
 const CandidateArea = new Lang.Class({
     Name: 'CandidateArea',
-    Extends: PopupMenu.PopupBaseMenuItem,
 
     _init: function() {
-        this.parent({ reactive: false });
-
-        // St.Table exhibits some sizing problems so let's go with a
-        // clutter layout manager for now.
-        this._table = new Clutter.Actor();
-        this.addActor(this._table);
-
-        this._tableLayout = new Clutter.TableLayout();
-        this._table.set_layout_manager(this._tableLayout);
-
-        this._indexLabels = [];
-        this._candidateLabels = [];
+        this.actor = new St.BoxLayout({ vertical: true,
+                                        visible: false });
+        this._candidateBoxes = [];
         for (let i = 0; i < MAX_CANDIDATES_PER_PAGE; ++i) {
-            this._indexLabels.push(new St.Label({ style_class: 'candidate-index' }));
-            this._candidateLabels.push(new St.Label({ style_class: 'candidate-label' }));
+            let box = new St.BoxLayout({ style_class: 'candidate-box',
+                                         reactive: true,
+                                         track_hover: true });
+            box._indexLabel = new St.Label({ style_class: 'candidate-index' });
+            box._candidateLabel = new St.Label({ style_class: 'candidate-label' });
+            box.add(box._indexLabel, { y_fill: false });
+            box.add(box._candidateLabel, { y_fill: false });
+            this._candidateBoxes.push(box);
+            this.actor.add(box);
+
+            let j = i;
+            box.connect('button-release-event', Lang.bind(this, function(actor, event) {
+                this.emit('candidate-clicked', j, event.get_button(), event.get_state());
+            }));
         }
 
+        this._buttonBox = new St.BoxLayout({ style_class: 'candidate-page-button-box' });
+
+        this._previousButton = new St.Button({ style_class: 'candidate-page-button candidate-page-button-previous' });
+        this._previousButton.child = new St.Icon({ style_class: 'candidate-page-button-icon' });
+        this._buttonBox.add(this._previousButton, { expand: true });
+
+        this._nextButton = new St.Button({ style_class: 'candidate-page-button candidate-page-button-next' });
+        this._nextButton.child = new St.Icon({ style_class: 'candidate-page-button-icon' });
+        this._buttonBox.add(this._nextButton, { expand: true });
+
+        this.actor.add(this._buttonBox);
+
+        this._previousButton.connect('clicked', Lang.bind(this, function() {
+            this.emit('previous-page');
+        }));
+        this._nextButton.connect('clicked', Lang.bind(this, function() {
+            this.emit('next-page');
+        }));
+
         this._orientation = -1;
         this._cursorPosition = 0;
     },
 
-    _setOrientation: function(orientation) {
+    setOrientation: function(orientation) {
         if (this._orientation == orientation)
             return;
 
         this._orientation = orientation;
 
-        this._table.remove_all_children();
-
-        if (this._orientation == IBus.Orientation.HORIZONTAL)
-            for (let i = 0; i < MAX_CANDIDATES_PER_PAGE; ++i) {
-                this._tableLayout.pack(this._indexLabels[i], i*2, 0);
-                this._tableLayout.pack(this._candidateLabels[i], i*2 + 1, 0);
-            }
-        else                    // VERTICAL || SYSTEM
-            for (let i = 0; i < MAX_CANDIDATES_PER_PAGE; ++i) {
-                this._tableLayout.pack(this._indexLabels[i], 0, i);
-                this._tableLayout.pack(this._candidateLabels[i], 1, i);
-            }
+        if (this._orientation == IBus.Orientation.HORIZONTAL) {
+            this.actor.vertical = false;
+            this.actor.remove_style_class_name('vertical');
+            this.actor.add_style_class_name('horizontal');
+            this._previousButton.child.icon_name = 'go-previous-symbolic';
+            this._nextButton.child.icon_name = 'go-next-symbolic';
+        } else {                // VERTICAL || SYSTEM
+            this.actor.vertical = true;
+            this.actor.add_style_class_name('vertical');
+            this.actor.remove_style_class_name('horizontal');
+            this._previousButton.child.icon_name = 'go-up-symbolic';
+            this._nextButton.child.icon_name = 'go-down-symbolic';
+        }
     },
 
-    setCandidates: function(indexes, candidates, orientation, cursorPosition, cursorVisible) {
-        this._setOrientation(orientation);
-
+    setCandidates: function(indexes, candidates, cursorPosition, cursorVisible) {
         for (let i = 0; i < MAX_CANDIDATES_PER_PAGE; ++i) {
             let visible = i < candidates.length;
-            this._indexLabels[i].visible = visible;
-            this._candidateLabels[i].visible = visible;
+            let box = this._candidateBoxes[i];
+            box.visible = visible;
 
             if (!visible)
                 continue;
 
-            this._indexLabels[i].text = ((indexes && indexes[i]) ? indexes[i] : '%x.'.format(i + 1));
-            this._candidateLabels[i].text = candidates[i];
+            box._indexLabel.text = ((indexes && indexes[i]) ? indexes[i] : '%x'.format(i + 1));
+            box._candidateLabel.text = candidates[i];
         }
 
-        this._candidateLabels[this._cursorPosition].remove_style_pseudo_class('selected');
+        this._candidateBoxes[this._cursorPosition].remove_style_pseudo_class('selected');
         this._cursorPosition = cursorPosition;
         if (cursorVisible)
-            this._candidateLabels[cursorPosition].add_style_pseudo_class('selected');
+            this._candidateBoxes[cursorPosition].add_style_pseudo_class('selected');
+    },
+
+    updateButtons: function(wrapsAround, page, nPages) {
+        if (nPages < 2) {
+            this._buttonBox.hide();
+            return;
+        }
+        this._buttonBox.show();
+        this._previousButton.reactive = wrapsAround || page > 0;
+        this._nextButton.reactive = wrapsAround || page < nPages - 1;
     },
 });
+Signals.addSignalMethods(CandidateArea.prototype);
 
 const CandidatePopup = new Lang.Class({
     Name: 'CandidatePopup',
-    Extends: PopupMenu.PopupMenu,
 
     _init: function() {
         this._cursor = new St.Bin({ opacity: 0 });
         Main.uiGroup.add_actor(this._cursor);
 
-        this.parent(this._cursor, 0, St.Side.TOP);
-        this.actor.hide();
-        Main.uiGroup.add_actor(this.actor);
+        this._boxPointer = new BoxPointer.BoxPointer(St.Side.TOP);
+        this._boxPointer.actor.visible = false;
+        this._boxPointer.actor.style_class = 'candidate-popup-boxpointer';
+        Main.layoutManager.addChrome(this._boxPointer.actor);
 
-        this._preeditTextItem = new PopupMenu.PopupMenuItem('', { reactive: false });
-        this._preeditTextItem.actor.hide();
-        this.addMenuItem(this._preeditTextItem);
+        let box = new St.BoxLayout({ style_class: 'candidate-popup-content',
+                                     vertical: true });
+        this._boxPointer.bin.set_child(box);
 
-        this._auxTextItem = new PopupMenu.PopupMenuItem('', { reactive: false });
-        this._auxTextItem.actor.hide();
-        this.addMenuItem(this._auxTextItem);
+        this._preeditText = new St.Label({ style_class: 'candidate-popup-text',
+                                           visible: false });
+        box.add(this._preeditText);
 
-        this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+        this._auxText = new St.Label({ style_class: 'candidate-popup-text',
+                                       visible: false });
+        box.add(this._auxText);
 
-        this._lookupTableItem = new CandidateArea();
-        this._lookupTableItem.actor.hide();
-        this.addMenuItem(this._lookupTableItem);
+        this._candidateArea = new CandidateArea();
+        box.add(this._candidateArea.actor);
+
+        this._candidateArea.connect('previous-page', Lang.bind(this, function() {
+            this._panelService.page_up();
+        }));
+        this._candidateArea.connect('next-page', Lang.bind(this, function() {
+            this._panelService.page_down();
+        }));
+        this._candidateArea.connect('candidate-clicked', Lang.bind(this, function(ca, index, button, state) {
+            this._panelService.candidate_clicked(index, button, state);
+        }));
 
         this._panelService = null;
     },
@@ -117,66 +159,61 @@ const CandidatePopup = new Lang.Class({
                              Lang.bind(this, function(ps, x, y, w, h) {
                                  this._cursor.set_position(x, y);
                                  this._cursor.set_size(w, h);
+                                 if (this._boxPointer.actor.visible)
+                                     this._boxPointer.setPosition(this._cursor, 0);
                              }));
         panelService.connect('update-preedit-text',
                              Lang.bind(this, function(ps, text, cursorPosition, visible) {
-                                 if (visible)
-                                     this._preeditTextItem.actor.show();
-                                 else
-                                     this._preeditTextItem.actor.hide();
+                                 this._preeditText.visible = visible;
                                  this._updateVisibility();
 
-                                 this._preeditTextItem.actor.label_actor.text = text.get_text();
+                                 this._preeditText.text = text.get_text();
 
                                  let attrs = text.get_attributes();
                                  if (attrs)
-                                     this._setTextAttributes(this._preeditTextItem.actor.label_actor.clutter_text,
+                                     this._setTextAttributes(this._preeditText.clutter_text,
                                                              attrs);
                              }));
         panelService.connect('show-preedit-text',
                              Lang.bind(this, function(ps) {
-                                 this._preeditTextItem.actor.show();
+                                 this._preeditText.show();
                                  this._updateVisibility();
                              }));
         panelService.connect('hide-preedit-text',
                              Lang.bind(this, function(ps) {
-                                 this._preeditTextItem.actor.hide();
+                                 this._preeditText.hide();
                                  this._updateVisibility();
                              }));
         panelService.connect('update-auxiliary-text',
                              Lang.bind(this, function(ps, text, visible) {
-                                 if (visible)
-                                     this._auxTextItem.actor.show();
-                                 else
-                                     this._auxTextItem.actor.hide();
+                                 this._auxText.visible = visible;
                                  this._updateVisibility();
 
-                                 this._auxTextItem.actor.label_actor.text = text.get_text();
+                                 this._auxText.text = text.get_text();
                              }));
         panelService.connect('show-auxiliary-text',
                              Lang.bind(this, function(ps) {
-                                 this._auxTextItem.actor.show();
+                                 this._auxText.show();
                                  this._updateVisibility();
                              }));
         panelService.connect('hide-auxiliary-text',
                              Lang.bind(this, function(ps) {
-                                 this._auxTextItem.actor.hide();
+                                 this._auxText.hide();
                                  this._updateVisibility();
                              }));
         panelService.connect('update-lookup-table',
                              Lang.bind(this, function(ps, lookupTable, visible) {
-                                 if (visible)
-                                     this._lookupTableItem.actor.show();
-                                 else
-                                     this._lookupTableItem.actor.hide();
+                                 this._candidateArea.actor.visible = visible;
                                  this._updateVisibility();
 
+                                 let nCandidates = lookupTable.get_number_of_candidates();
                                  let cursorPos = lookupTable.get_cursor_pos();
                                  let pageSize = lookupTable.get_page_size();
+                                 let nPages = Math.ceil(nCandidates / pageSize);
                                  let page = ((cursorPos == 0) ? 0 : Math.floor(cursorPos / pageSize));
                                  let startIndex = page * pageSize;
-                                 let endIndex = Math.min((page + 1) * pageSize,
-                                                         lookupTable.get_number_of_candidates());
+                                 let endIndex = Math.min((page + 1) * pageSize, nCandidates);
+
                                  let indexes = [];
                                  let indexLabel;
                                  for (let i = 0; indexLabel = lookupTable.get_label(i); ++i)
@@ -186,37 +223,41 @@ const CandidatePopup = new Lang.Class({
                                  for (let i = startIndex; i < endIndex; ++i)
                                      candidates.push(lookupTable.get_candidate(i).get_text());
 
-                                 this._lookupTableItem.setCandidates(indexes,
-                                                                     candidates,
-                                                                     lookupTable.get_orientation(),
-                                                                     cursorPos % pageSize,
-                                                                     lookupTable.is_cursor_visible());
+                                 this._candidateArea.setCandidates(indexes,
+                                                                   candidates,
+                                                                   cursorPos % pageSize,
+                                                                   lookupTable.is_cursor_visible());
+                                 this._candidateArea.setOrientation(lookupTable.get_orientation());
+                                 this._candidateArea.updateButtons(lookupTable.is_round(), page, nPages);
                              }));
         panelService.connect('show-lookup-table',
                              Lang.bind(this, function(ps) {
-                                 this._lookupTableItem.actor.show();
+                                 this._candidateArea.actor.show();
                                  this._updateVisibility();
                              }));
         panelService.connect('hide-lookup-table',
                              Lang.bind(this, function(ps) {
-                                 this._lookupTableItem.actor.hide();
+                                 this._candidateArea.actor.hide();
                                  this._updateVisibility();
                              }));
         panelService.connect('focus-out',
                              Lang.bind(this, function(ps) {
-                                 this.close(BoxPointer.PopupAnimation.NONE);
+                                 this._boxPointer.hide(BoxPointer.PopupAnimation.NONE);
                              }));
     },
 
     _updateVisibility: function() {
-        let isVisible = (this._preeditTextItem.actor.visible ||
-                         this._auxTextItem.actor.visible ||
-                         this._lookupTableItem.actor.visible);
+        let isVisible = (this._preeditText.visible ||
+                         this._auxText.visible ||
+                         this._candidateArea.actor.visible);
 
-        if (isVisible)
-            this.open(BoxPointer.PopupAnimation.NONE);
-        else
-            this.close(BoxPointer.PopupAnimation.NONE);
+        if (isVisible) {
+            this._boxPointer.setPosition(this._cursor, 0);
+            this._boxPointer.show(BoxPointer.PopupAnimation.NONE);
+            this._boxPointer.actor.raise_top();
+        } else {
+            this._boxPointer.hide(BoxPointer.PopupAnimation.NONE);
+        }
     },
 
     _setTextAttributes: function(clutterText, ibusAttrList) {

js/ui/iconGrid.js

@@ -176,13 +176,16 @@ const IconGrid = new Lang.Class({
     _init: function(params) {
         params = Params.parse(params, { rowLimit: null,
                                         columnLimit: null,
+                                        fillParent: false,
                                         xAlign: St.Align.MIDDLE });
         this._rowLimit = params.rowLimit;
         this._colLimit = params.columnLimit;
         this._xAlign = params.xAlign;
+        this._fillParent = params.fillParent;
 
         this.actor = new St.BoxLayout({ style_class: 'icon-grid',
                                         vertical: true });
+
         // Pulled from CSS, but hardcode some defaults here
         this._spacing = 0;
         this._hItemSize = this._vItemSize = ICON_SIZE;
@@ -196,6 +199,11 @@ const IconGrid = new Lang.Class({
     },
 
     _getPreferredWidth: function (grid, forHeight, alloc) {
+        if (this._fillParent)
+            // Ignore all size requests of children and request a size of 0;
+            // later we'll allocate as many children as fit the parent
+            return;
+
         let children = this._grid.get_children();
         let nColumns = this._colLimit ? Math.min(this._colLimit,
                                                  children.length)
@@ -217,12 +225,20 @@ const IconGrid = new Lang.Class({
     },
 
     _getPreferredHeight: function (grid, forWidth, alloc) {
+        if (this._fillParent)
+            // Ignore all size requests of children and request a size of 0;
+            // later we'll allocate as many children as fit the parent
+            return;
+
         let children = this._getVisibleChildren();
-        let nColumns;
-        if (forWidth < 0)
+        let nColumns, spacing;
+        if (forWidth < 0) {
             nColumns = children.length;
-        else
-            nColumns = this._computeLayout(forWidth)[0];
+            spacing = this._spacing;
+        } else {
+            [nColumns, , spacing] = this._computeLayout(forWidth);
+        }
+
         let nRows;
         if (nColumns > 0)
             nRows = Math.ceil(children.length / nColumns);
@@ -230,18 +246,25 @@ const IconGrid = new Lang.Class({
             nRows = 0;
         if (this._rowLimit)
             nRows = Math.min(nRows, this._rowLimit);
-        let totalSpacing = Math.max(0, nRows - 1) * this._spacing;
+        let totalSpacing = Math.max(0, nRows - 1) * spacing;
         let height = nRows * this._vItemSize + totalSpacing;
         alloc.min_size = height;
         alloc.natural_size = height;
     },
 
     _allocate: function (grid, box, flags) {
+        if (this._fillParent) {
+            // Reset the passed in box to fill the parent
+            let parentBox = this.actor.get_parent().allocation;
+            let gridBox = this.actor.get_theme_node().get_content_box(parentBox);
+            box = this._grid.get_theme_node().get_content_box(gridBox);
+        }
+
         let children = this._getVisibleChildren();
         let availWidth = box.x2 - box.x1;
         let availHeight = box.y2 - box.y1;
 
-        let [nColumns, usedWidth] = this._computeLayout(availWidth);
+        let [nColumns, usedWidth, spacing] = this._computeLayout(availWidth);
 
         let leftPadding;
         switch(this._xAlign) {
@@ -280,7 +303,8 @@ const IconGrid = new Lang.Class({
             childBox.x2 = childBox.x1 + width;
             childBox.y2 = childBox.y1 + height;
 
-            if (this._rowLimit && rowIndex >= this._rowLimit) {
+            if (this._rowLimit && rowIndex >= this._rowLimit ||
+                this._fillParent && childBox.y2 > availHeight) {
                 this._grid.set_skip_paint(children[i], true);
             } else {
                 children[i].allocate(childBox, flags);
@@ -294,10 +318,10 @@ const IconGrid = new Lang.Class({
             }
 
             if (columnIndex == 0) {
-                y += this._vItemSize + this._spacing;
+                y += this._vItemSize + spacing;
                 x = box.x1 + leftPadding;
             } else {
-                x += this._hItemSize + this._spacing;
+                x += this._hItemSize + spacing;
             }
         }
     },
@@ -313,16 +337,25 @@ const IconGrid = new Lang.Class({
     _computeLayout: function (forWidth) {
         let nColumns = 0;
         let usedWidth = 0;
+        let spacing = this._spacing;
+
+        if (this._colLimit) {
+            let itemWidth = this._hItemSize * this._colLimit;
+            let emptyArea = forWidth - itemWidth;
+            spacing = Math.max(this._spacing, emptyArea / (2 * this._colLimit));
+            spacing = Math.round(spacing);
+        }
+
         while ((this._colLimit == null || nColumns < this._colLimit) &&
                (usedWidth + this._hItemSize <= forWidth)) {
-            usedWidth += this._hItemSize + this._spacing;
+            usedWidth += this._hItemSize + spacing;
             nColumns += 1;
         }
 
         if (nColumns > 0)
-            usedWidth -= this._spacing;
+            usedWidth -= spacing;
 
-        return [nColumns, usedWidth];
+        return [nColumns, usedWidth, spacing];
     },
 
     _onStyleChanged: function() {

js/ui/keyboard.js

@@ -142,7 +142,6 @@ const Keyboard = new Lang.Class({
         this._focusInExtendedKeys = false;
 
         this._timestamp = global.display.get_current_time_roundtrip();
-        Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._redraw));
 
         this._keyboardSettings = new Gio.Settings({ schema: KEYBOARD_SCHEMA });
         this._keyboardSettings.connect('changed', Lang.bind(this, this._settingsChanged));
@@ -161,9 +160,8 @@ const Keyboard = new Lang.Class({
         }));
         this._keyboardRequested = false;
         this._keyboardRestingId = 0;
-    },
 
-    init: function () {
+        Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._redraw));
         this._redraw();
     },
 
@@ -178,25 +176,19 @@ const Keyboard = new Lang.Class({
         if (this._keyboard)
             this._destroyKeyboard();
 
-        if (this._enableKeyboard) {
-            // If we've been called because the setting actually just
-            // changed to true (as opposed to being called from
-            // this._init()), then we want to pop up the keyboard.
-            let showKeyboard = (settings != null);
-
-            // However, caribou-gtk-module or this._onKeyFocusChanged
-            // will probably immediately tell us to hide it, so we
-            // have to fake things out so we'll ignore that request.
-            if (showKeyboard)
-                this._timestamp = global.display.get_current_time_roundtrip() + 1;
-            this._setupKeyboard(showKeyboard);
-        } else
+        if (this._enableKeyboard)
+            this._setupKeyboard();
+        else
             Main.layoutManager.hideKeyboard(true);
     },
 
     _destroyKeyboard: function() {
         if (this._keyboardNotifyId)
             this._keyboard.disconnect(this._keyboardNotifyId);
+        if (this._keyboardGroupAddedId)
+            this._keyboard.disconnect(this._keyboardGroupAddedId);
+        if (this._keyboardGroupRemovedId)
+            this._keyboard.disconnect(this._keyboardGroupRemovedId);
         if (this._focusNotifyId)
             global.stage.disconnect(this._focusNotifyId);
         this._keyboard = null;
@@ -206,7 +198,7 @@ const Keyboard = new Lang.Class({
         this._destroySource();
     },
 
-    _setupKeyboard: function(show) {
+    _setupKeyboard: function() {
         this.actor = new St.BoxLayout({ name: 'keyboard', vertical: true, reactive: true });
         Main.layoutManager.keyboardBox.add_actor(this.actor);
         Main.layoutManager.trackChrome(this.actor);
@@ -227,12 +219,11 @@ const Keyboard = new Lang.Class({
         this.actor.text_direction = Clutter.TextDirection.LTR;
 
         this._keyboardNotifyId = this._keyboard.connect('notify::active-group', Lang.bind(this, this._onGroupChanged));
+        this._keyboardGroupAddedId = this._keyboard.connect('group-added', Lang.bind(this, this._onGroupAdded));
+        this._keyboardGroupRemovedId = this._keyboard.connect('group-removed', Lang.bind(this, this._onGroupRemoved));
         this._focusNotifyId = global.stage.connect('notify::key-focus', Lang.bind(this, this._onKeyFocusChanged));
 
-        if (show)
-            this.show(Main.layoutManager.focusIndex);
-        else
-            this._createSource();
+        this._createSource();
     },
 
     _onKeyFocusChanged: function () {
@@ -262,58 +253,35 @@ const Keyboard = new Lang.Class({
                                              Lang.bind(this, function() { this.Show(time); }));
     },
 
+    _createLayersForGroup: function (gname) {
+        let group = this._keyboard.get_group(gname);
+        group.connect('notify::active-level', Lang.bind(this, this._onLevelChanged));
+        let layers = {};
+        let levels = group.get_levels();
+        for (let j = 0; j < levels.length; ++j) {
+            let lname = levels[j];
+            let level = group.get_level(lname);
+            let layout = new St.BoxLayout({ style_class: 'keyboard-layout',
+                                                 vertical: true });
+            this._loadRows(level, layout);
+            layers[lname] = layout;
+            this.actor.add(layout, { x_fill: false });
+
+            layout.hide();
+        }
+        return layers;
+    },
+
     _addKeys: function () {
         let groups = this._keyboard.get_groups();
         for (let i = 0; i < groups.length; ++i) {
              let gname = groups[i];
-             let group = this._keyboard.get_group(gname);
-             group.connect('notify::active-level', Lang.bind(this, this._onLevelChanged));
-             let layers = {};
-             let levels = group.get_levels();
-             for (let j = 0; j < levels.length; ++j) {
-                 let lname = levels[j];
-                 let level = group.get_level(lname);
-                 let layout = new St.BoxLayout({ style_class: 'keyboard-layout',
-                                                 vertical: true });
-                 this._loadRows(level, layout);
-                 layers[lname] = layout;
-                 this.actor.add(layout, { x_fill: false });
-
-                 layout.hide();
-             }
-             this._groups[gname] = layers;
+             this._groups[gname] = this._createLayersForGroup(gname);
         }
 
         this._setActiveLayer();
     },
 
-    _getTrayIcon: function () {
-        let trayButton = new St.Button ({ label: _("tray"),
-                                          style_class: 'keyboard-key' });
-        trayButton.key_width = 1;
-        trayButton.connect('button-press-event', Lang.bind(this, function () {
-            Main.messageTray.toggle();
-        }));
-
-        Main.overview.connect('showing', Lang.bind(this, function () {
-            trayButton.reactive = false;
-            trayButton.add_style_pseudo_class('grayed');
-        }));
-        Main.overview.connect('hiding', Lang.bind(this, function () {
-            trayButton.reactive = true;
-            trayButton.remove_style_pseudo_class('grayed');
-        }));
-        Main.sessionMode.connect('updated', Lang.bind(this, function() {
-            trayButton.reactive = !Main.sessionMode.isLocked;
-            if (Main.sessionMode.isLocked)
-                trayButton.add_style_pseudo_class('grayed');
-            else
-                trayButton.remove_style_pseudo_class('grayed');
-        }));
-
-        return trayButton;
-    },
-
     _onCapturedEvent: function(actor, event) {
         let type = event.type();
         let press = type == Clutter.EventType.BUTTON_PRESS;
@@ -331,23 +299,29 @@ const Keyboard = new Lang.Class({
         let keyboard_row = new St.BoxLayout();
         for (let i = 0; i < keys.length; ++i) {
             let children = keys[i].get_children();
-            let right_box = new St.BoxLayout({ style_class: 'keyboard-row' });
             let left_box = new St.BoxLayout({ style_class: 'keyboard-row' });
+            let center_box = new St.BoxLayout({ style_class: 'keyboard-row' });
+            let right_box = new St.BoxLayout({ style_class: 'keyboard-row' });
             for (let j = 0; j < children.length; ++j) {
                 if (this._numOfHorizKeys == 0)
                     this._numOfHorizKeys = children.length;
                 let key = children[j];
                 let button = new Key(key);
 
-                if (key.align == 'right')
+                switch (key.align) {
+                case 'right':
                     right_box.add(button.actor);
-                else
+                    break;
+                case 'center':
+                    center_box.add(button.actor);
+                    break;
+                case 'left':
+                default:
                     left_box.add(button.actor);
+                    break;
+                }
                 if (key.name == 'Caribou_Prefs') {
                     key.connect('key-released', Lang.bind(this, this.hide));
-
-                    // Add new key for hiding message tray
-                    right_box.add(this._getTrayIcon());
                 }
 
                 button.connect('show-subkeys', Lang.bind(this, function() {
@@ -364,6 +338,7 @@ const Keyboard = new Lang.Class({
                 }));
             }
             keyboard_row.add(left_box, { expand: true, x_fill: false, x_align: St.Align.START });
+            keyboard_row.add(center_box, { expand: true, x_fill: false, x_align: St.Align.MIDDLE });
             keyboard_row.add(right_box, { expand: true, x_fill: false, x_align: St.Align.END });
         }
         layout.add(keyboard_row);
@@ -436,6 +411,14 @@ const Keyboard = new Lang.Class({
         this._redraw();
     },
 
+    _onGroupAdded: function (keyboard, gname) {
+        this._groups[gname] = this._createLayersForGroup(gname);
+    },
+
+    _onGroupRemoved: function (keyboard, gname) {
+        delete this._groups[gname];
+    },
+
     _setActiveLayer: function () {
         let active_group_name = this._keyboard.active_group;
         let active_group = this._keyboard.get_group(active_group_name);
@@ -637,11 +620,7 @@ const KeyboardSource = new Lang.Class({
         this.keepTrayOnSummaryClick = true;
     },
 
-    handleSummaryClick: function() {
-        let event = Clutter.get_current_event();
-        if (event.type() != Clutter.EventType.BUTTON_RELEASE)
-            return false;
-
+    handleSummaryClick: function(button) {
         this.open();
         return true;
     },

js/ui/lightbox.js

@@ -3,6 +3,7 @@
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
+const Signals = imports.signals;
 const St = imports.gi.St;
 
 const Params = imports.misc.params;
@@ -101,6 +102,7 @@ const Lightbox = new Lang.Class({
     },
 
     show: function() {
+        Tweener.removeTweens(this.actor);
         if (this._fadeInTime) {
             this.shown = false;
             this.actor.opacity = 0;
@@ -110,17 +112,20 @@ const Lightbox = new Lang.Class({
                                transition: 'easeOutQuad',
                                onComplete: Lang.bind(this, function() {
                                    this.shown = true;
+                                   this.emit('shown');
                                })
                              });
         } else {
             this.actor.opacity = 255 * this._fadeFactor;
             this.shown = true;
+            this.emit('shown');
         }
         this.actor.show();
     },
 
     hide: function() {
         this.shown = false;
+        Tweener.removeTweens(this.actor);
         if (this._fadeOutTime) {
             Tweener.addTween(this.actor,
                              { opacity: 0,
@@ -197,3 +202,4 @@ const Lightbox = new Lang.Class({
         this.highlight(null);
     }
 });
+Signals.addSignalMethods(Lightbox.prototype);

js/ui/lookingGlass.js

@@ -308,10 +308,6 @@ const Result = new Lang.Class({
         box.add(resultTxt);
         let objLink = new ObjLink(this._lookingGlass, o);
         box.add(objLink.actor);
-        let line = new Clutter.Rectangle({ name: 'Separator' });
-        let padBin = new St.Bin({ name: 'Separator', x_fill: true, y_fill: true });
-        padBin.add_actor(line);
-        this.actor.add(padBin);
     }
 });
 
@@ -685,7 +681,8 @@ const Memory = new Lang.Class({
 const Extensions = new Lang.Class({
     Name: 'Extensions',
 
-    _init: function() {
+    _init: function(lookingGlass) {
+        this._lookingGlass = lookingGlass;
         this.actor = new St.BoxLayout({ vertical: true,
                                         name: 'lookingGlassExtensions' });
         this._noExtensions = new St.Label({ style_class: 'lg-extensions-none',
@@ -852,8 +849,9 @@ const LookingGlass = new Lang.Class({
         this._updateFont();
 
         // We want it to appear to slide out from underneath the panel
-        Main.layoutManager.panelBox.add_actor(this.actor);
-        this.actor.lower_bottom();
+        Main.uiGroup.add_actor(this.actor);
+        Main.uiGroup.set_child_below_sibling(this.actor,
+                                             Main.layoutManager.panelBox);
         Main.layoutManager.panelBox.connect('allocation-changed',
                                             Lang.bind(this, this._queueResize));
         Main.layoutManager.keyboardBox.connect('allocation-changed',
@@ -912,7 +910,7 @@ const LookingGlass = new Lang.Class({
         this._memory = new Memory();
         notebook.appendPage('Memory', this._memory.actor);
 
-        this._extensions = new Extensions();
+        this._extensions = new Extensions(this);
         notebook.appendPage('Extensions', this._extensions.actor);
 
         this._entry.clutter_text.connect('activate', Lang.bind(this, function (o, e) {
@@ -950,9 +948,7 @@ const LookingGlass = new Lang.Class({
 
     _updateFont: function() {
         let fontName = this._interfaceSettings.get_string('monospace-font-name');
-        // This is mishandled by the scanner - should by Pango.FontDescription_from_string(fontName);
-        // https://bugzilla.gnome.org/show_bug.cgi?id=595889
-        let fontDesc = Pango.font_description_from_string(fontName);
+        let fontDesc = Pango.FontDescription.from_string(fontName);
         // We ignore everything but size and style; you'd be crazy to set your system-wide
         // monospace font to be bold/oblique/etc. Could easily be added here.
         this.actor.style =
@@ -990,28 +986,18 @@ const LookingGlass = new Lang.Class({
 
     _showCompletions: function(completions) {
         if (!this._completionActor) {
-            let actor = new St.BoxLayout({ vertical: true });
-
-            this._completionText = new St.Label({ name: 'LookingGlassAutoCompletionText', style_class: 'lg-completions-text' });
-            this._completionText.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
-            this._completionText.clutter_text.line_wrap = true;
-            actor.add(this._completionText);
-
-            let line = new Clutter.Rectangle();
-            let padBin = new St.Bin({ x_fill: true, y_fill: true });
-            padBin.add_actor(line);
-            actor.add(padBin);
-
-            this._completionActor = actor;
+            this._completionActor = new St.Label({ name: 'LookingGlassAutoCompletionText', style_class: 'lg-completions-text' });
+            this._completionActor.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
+            this._completionActor.clutter_text.line_wrap = true;
             this._evalBox.insert_child_below(this._completionActor, this._entryArea);
         }
 
-        this._completionText.set_text(completions.join(', '));
+        this._completionActor.set_text(completions.join(', '));
 
         // Setting the height to -1 allows us to get its actual preferred height rather than
         // whatever was last given in set_height by Tweener.
         this._completionActor.set_height(-1);
-        let [minHeight, naturalHeight] = this._completionText.get_preferred_height(this._resultsArea.get_width());
+        let [minHeight, naturalHeight] = this._completionActor.get_preferred_height(this._resultsArea.get_width());
 
         // Don't reanimate if we are already visible
         if (this._completionActor.visible) {
@@ -1087,7 +1073,7 @@ const LookingGlass = new Lang.Class({
         let availableHeight = primary.height - Main.layoutManager.keyboardBox.height;
         let myHeight = Math.min(primary.height * 0.7, availableHeight * 0.9);
         this.actor.x = (primary.width - myWidth) / 2;
-        this._hiddenY = this.actor.get_parent().height - myHeight - 4; // -4 to hide the top corners
+        this._hiddenY = Main.layoutManager.panelBox.height - myHeight - 4; // -4 to hide the top corners
         this._targetY = this._hiddenY + myHeight;
         this.actor.y = this._hiddenY;
         this.actor.width = myWidth;
@@ -1133,7 +1119,7 @@ const LookingGlass = new Lang.Class({
         if (this._open)
             return;
 
-        if (!Main.pushModal(this._entry, { keybindingMode: Main.KeybindingMode.LOOKING_GLASS }))
+        if (!Main.pushModal(this._entry, { keybindingMode: Shell.KeyBindingMode.LOOKING_GLASS }))
             return;
 
         this._notebook.selectIndex(0);

js/ui/main.js

@@ -18,11 +18,13 @@ const ExtensionSystem = imports.ui.extensionSystem;
 const ExtensionDownloader = imports.ui.extensionDownloader;
 const Keyboard = imports.ui.keyboard;
 const MessageTray = imports.ui.messageTray;
+const OsdWindow = imports.ui.osdWindow;
 const Overview = imports.ui.overview;
 const Panel = imports.ui.panel;
 const Params = imports.misc.params;
 const RunDialog = imports.ui.runDialog;
 const Layout = imports.ui.layout;
+const LoginManager = imports.misc.loginManager;
 const LookingGlass = imports.ui.lookingGlass;
 const NotificationDaemon = imports.ui.notificationDaemon;
 const WindowAttentionHandler = imports.ui.windowAttentionHandler;
@@ -31,27 +33,15 @@ const Scripting = imports.ui.scripting;
 const SessionMode = imports.ui.sessionMode;
 const ShellDBus = imports.ui.shellDBus;
 const ShellMountOperation = imports.ui.shellMountOperation;
-const UnlockDialog = imports.ui.unlockDialog;
 const WindowManager = imports.ui.windowManager;
 const Magnifier = imports.ui.magnifier;
 const XdndHandler = imports.ui.xdndHandler;
 const Util = imports.misc.util;
 
-const OVERRIDES_SCHEMA = 'org.gnome.shell.overrides';
 const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);
 
-const KeybindingMode = {
-    NONE:          0,       // block all keybindings
-    NORMAL:        1 << 0,  // window mode
-    OVERVIEW:      1 << 1,
-    LOCK_SCREEN:   1 << 2,
-    UNLOCK_SCREEN: 1 << 3,
-    LOGIN_SCREEN:  1 << 4,
-    MESSAGE_TRAY:  1 << 5,
-    SYSTEM_MODAL:  1 << 6,
-    LOOKING_GLASS: 1 << 7,
-    ALL:           ~0,
-};
+const A11Y_SCHEMA = 'org.gnome.desktop.a11y.keyboard';
+const STICKY_KEYS_ENABLE = 'stickykeys-enable';
 
 let componentManager = null;
 let panel = null;
@@ -64,12 +54,13 @@ let screenShield = null;
 let notificationDaemon = null;
 let windowAttentionHandler = null;
 let ctrlAltTabManager = null;
+let osdWindow = null;
 let sessionMode = null;
 let shellDBusService = null;
 let shellMountOpDBusService = null;
 let screenSaverDBus = null;
 let modalCount = 0;
-let keybindingMode = KeybindingMode.NORMAL;
+let keybindingMode = Shell.KeyBindingMode.NONE;
 let modalActorFocusStack = [];
 let uiGroup = null;
 let magnifier = null;
@@ -79,22 +70,26 @@ let layoutManager = null;
 let _startDate;
 let _defaultCssStylesheet = null;
 let _cssStylesheet = null;
-let _overridesSettings = null;
+let _a11ySettings = null;
+let dynamicWorkspacesSchema = null;
 
 function _sessionUpdated() {
+    _loadDefaultStylesheet();
+
     wm.setCustomKeybindingHandler('panel-main-menu',
-                                  KeybindingMode.NORMAL |
-                                  KeybindingMode.OVERVIEW,
+                                  Shell.KeyBindingMode.NORMAL |
+                                  Shell.KeyBindingMode.OVERVIEW,
                                   sessionMode.hasOverview ? Lang.bind(overview, overview.toggle) : null);
-    wm.allowKeybinding('overlay-key', KeybindingMode.NORMAL |
-                                      KeybindingMode.OVERVIEW);
+    wm.allowKeybinding('overlay-key', Shell.KeyBindingMode.NORMAL |
+                                      Shell.KeyBindingMode.OVERVIEW);
 
     wm.setCustomKeybindingHandler('panel-run-dialog',
-                                  KeybindingMode.NORMAL |
-                                  KeybindingMode.OVERVIEW,
+                                  Shell.KeyBindingMode.NORMAL |
+                                  Shell.KeyBindingMode.OVERVIEW,
                                   sessionMode.hasRunDialog ? openRunDialog : null);
-    if (sessionMode.isGreeter)
-        screenShield.showDialog();
+
+    if (!sessionMode.hasRunDialog && lookingGlass)
+        lookingGlass.close();
 }
 
 function start() {
@@ -108,9 +103,33 @@ function start() {
     Gio.DesktopAppInfo.set_desktop_env('GNOME');
 
     sessionMode = new SessionMode.SessionMode();
+    sessionMode.connect('sessions-loaded', _sessionsLoaded);
+    sessionMode.init();
+}
+
+function _sessionsLoaded() {
+    sessionMode.connect('updated', _sessionUpdated);
+    _initializePrefs();
+    _initializeUI();
+
     shellDBusService = new ShellDBus.GnomeShell();
     shellMountOpDBusService = new ShellMountOperation.GnomeShellMountOpHandler();
 
+    _sessionUpdated();
+}
+
+function _initializePrefs() {
+    let keys = new Gio.Settings({ schema: sessionMode.overridesSchema }).list_keys();
+    for (let i = 0; i < keys.length; i++)
+        Meta.prefs_override_preference_schema(keys[i], sessionMode.overridesSchema);
+
+    if (keys.indexOf('dynamic-workspaces') > -1)
+        dynamicWorkspacesSchema = sessionMode.overridesSchema;
+    else
+        dynamicWorkspacesSchema = 'org.gnome.mutter';
+}
+
+function _initializeUI() {
     // Ensure ShellWindowTracker and ShellAppUsage are initialized; this will
     // also initialize ShellAppSystem first.  ShellAppSystem
     // needs to load all the .desktop files, and ShellWindowTracker
@@ -119,52 +138,28 @@ function start() {
     // and recalculate application associations, so to avoid
     // races for now we initialize it here.  It's better to
     // be predictable anyways.
-    let tracker = Shell.WindowTracker.get_default();
+    Shell.WindowTracker.get_default();
     Shell.AppUsage.get_default();
 
-    tracker.connect('startup-sequence-changed', _queueCheckWorkspaces);
-
-    // The stage is always covered so Clutter doesn't need to clear it; however
-    // the color is used as the default contents for the Mutter root background
-    // actor so set it anyways.
-    global.stage.color = DEFAULT_BACKGROUND_COLOR;
-    global.stage.no_clear_hint = true;
-
-    _defaultCssStylesheet = global.datadir + '/theme/gnome-shell.css';
-    loadTheme();
-
-    // Set up stage hierarchy to group all UI actors under one container.
-    uiGroup = new Shell.GenericContainer({ name: 'uiGroup' });
-    uiGroup.connect('allocate',
-                    function (actor, box, flags) {
-                        let children = uiGroup.get_children();
-                        for (let i = 0; i < children.length; i++)
-                            children[i].allocate_preferred_size(flags);
-                    });
-    uiGroup.connect('get-preferred-width',
-                    function(actor, forHeight, alloc) {
-                        let width = global.stage.width;
-                        [alloc.min_size, alloc.natural_size] = [width, width];
-                    });
-    uiGroup.connect('get-preferred-height',
-                    function(actor, forWidth, alloc) {
-                        let height = global.stage.height;
-                        [alloc.min_size, alloc.natural_size] = [height, height];
-                    });
-    global.window_group.reparent(uiGroup);
-    global.overlay_group.reparent(uiGroup);
-    global.stage.add_actor(uiGroup);
+    _loadDefaultStylesheet();
 
+    // Setup the stage hierarchy early
     layoutManager = new Layout.LayoutManager();
+
+    // Various parts of the codebase still refers to Main.uiGroup
+    // instead using the layoutManager.  This keeps that code
+    // working until it's updated.
+    uiGroup = layoutManager.uiGroup;
+
     xdndHandler = new XdndHandler.XdndHandler();
     ctrlAltTabManager = new CtrlAltTab.CtrlAltTabManager();
+    osdWindow = new OsdWindow.OsdWindow();
     overview = new Overview.Overview();
     wm = new WindowManager.WindowManager();
     magnifier = new Magnifier.Magnifier();
-    if (UnlockDialog.isSupported())
+    if (LoginManager.canLock())
         screenShield = new ScreenShield.ScreenShield();
-    else
-        screenShield = new ScreenShield.ScreenShieldFallback();
+
     panel = new Panel.Panel();
     messageTray = new MessageTray.MessageTray();
     keyboard = new Keyboard.Keyboard();
@@ -173,19 +168,22 @@ function start() {
     componentManager = new Components.ComponentManager();
 
     layoutManager.init();
-    keyboard.init();
     overview.init();
 
-    global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
-                                            false, -1, 1);
-    global.display.connect('overlay-key', Lang.bind(overview, overview.toggle));
-    sessionMode.connect('updated', _sessionUpdated);
-    _sessionUpdated();
+    _a11ySettings = new Gio.Settings({ schema: A11Y_SCHEMA });
+
+    global.display.connect('overlay-key', Lang.bind(overview, function () {
+        if (!_a11ySettings.get_boolean (STICKY_KEYS_ENABLE))
+            overview.toggle();
+    }));
 
     // Provide the bus object for gnome-session to
     // initiate logouts.
     EndSessionDialog.init();
 
+    // We're ready for the session manager to move to the next phase
+    Meta.register_with_session();
+
     _startDate = new Date();
 
     log('GNOME Shell started at ' + _startDate);
@@ -197,200 +195,35 @@ function start() {
         Scripting.runPerfScript(module, perfOutput);
     }
 
-    _overridesSettings = new Gio.Settings({ schema: OVERRIDES_SCHEMA });
-    _overridesSettings.connect('changed::dynamic-workspaces', _queueCheckWorkspaces);
-
-    global.screen.connect('notify::n-workspaces', _nWorkspacesChanged);
-
-    global.screen.connect('window-entered-monitor', _windowEnteredMonitor);
-    global.screen.connect('window-left-monitor', _windowLeftMonitor);
-    global.screen.connect('restacked', _windowsRestacked);
-
-    _nWorkspacesChanged();
-
     ExtensionDownloader.init();
     ExtensionSystem.init();
+
+    if (sessionMode.isGreeter && screenShield) {
+        layoutManager.connect('startup-prepared', function() {
+            screenShield.showDialog();
+        });
+    }
+
+    layoutManager.connect('startup-complete', function() {
+                              if (keybindingMode == Shell.KeyBindingMode.NONE) {
+                                  keybindingMode = Shell.KeyBindingMode.NORMAL;
+                              }
+                              if (screenShield) {
+                                  screenShield.lockIfWasLocked();
+                              }
+                          });
 }
 
-let _workspaces = [];
-let _checkWorkspacesId = 0;
+function _loadDefaultStylesheet() {
+    if (!sessionMode.isPrimary)
+        return;
 
-/*
- * When the last window closed on a workspace is a dialog or splash
- * screen, we assume that it might be an initial window shown before
- * the main window of an application, and give the app a grace period
- * where it can map another window before we remove the workspace.
- */
-const LAST_WINDOW_GRACE_TIME = 1000;
+    let stylesheet = global.datadir + '/theme/' + sessionMode.stylesheetName;
+    if (_defaultCssStylesheet == stylesheet)
+        return;
 
-function _checkWorkspaces() {
-    let i;
-    let emptyWorkspaces = [];
-
-    if (!Meta.prefs_get_dynamic_workspaces()) {
-        _checkWorkspacesId = 0;
-        return false;
-    }
-
-    for (i = 0; i < _workspaces.length; i++) {
-        let lastRemoved = _workspaces[i]._lastRemovedWindow;
-        if ((lastRemoved &&
-             (lastRemoved.get_window_type() == Meta.WindowType.SPLASHSCREEN ||
-              lastRemoved.get_window_type() == Meta.WindowType.DIALOG ||
-              lastRemoved.get_window_type() == Meta.WindowType.MODAL_DIALOG)) ||
-            _workspaces[i]._keepAliveId)
-                emptyWorkspaces[i] = false;
-        else
-            emptyWorkspaces[i] = true;
-    }
-
-    let sequences = Shell.WindowTracker.get_default().get_startup_sequences();
-    for (i = 0; i < sequences.length; i++) {
-        let index = sequences[i].get_workspace();
-        if (index >= 0 && index <= global.screen.n_workspaces)
-            emptyWorkspaces[index] = false;
-    }
-
-    let windows = global.get_window_actors();
-    for (i = 0; i < windows.length; i++) {
-        let win = windows[i];
-
-        if (win.get_meta_window().is_on_all_workspaces())
-            continue;
-
-        let workspaceIndex = win.get_workspace();
-        emptyWorkspaces[workspaceIndex] = false;
-    }
-
-    // If we don't have an empty workspace at the end, add one
-    if (!emptyWorkspaces[emptyWorkspaces.length -1]) {
-        global.screen.append_new_workspace(false, global.get_current_time());
-        emptyWorkspaces.push(false);
-    }
-
-    let activeWorkspaceIndex = global.screen.get_active_workspace_index();
-    let removingCurrentWorkspace = (emptyWorkspaces[activeWorkspaceIndex] &&
-                                    activeWorkspaceIndex < emptyWorkspaces.length - 1);
-    // Don't enter the overview when removing multiple empty workspaces at startup
-    let showOverview  = (removingCurrentWorkspace &&
-                         !emptyWorkspaces.every(function(x) { return x; }));
-
-    if (removingCurrentWorkspace) {
-        // "Merge" the empty workspace we are removing with the one at the end
-        wm.blockAnimations();
-    }
-
-    // Delete other empty workspaces; do it from the end to avoid index changes
-    for (i = emptyWorkspaces.length - 2; i >= 0; i--) {
-        if (emptyWorkspaces[i])
-            global.screen.remove_workspace(_workspaces[i], global.get_current_time());
-    }
-
-    if (removingCurrentWorkspace) {
-        global.screen.get_workspace_by_index(global.screen.n_workspaces - 1).activate(global.get_current_time());
-        wm.unblockAnimations();
-
-        if (!overview.visible && showOverview)
-            overview.show();
-    }
-
-    _checkWorkspacesId = 0;
-    return false;
-}
-
-function keepWorkspaceAlive(workspace, duration) {
-    if (workspace._keepAliveId)
-        Mainloop.source_remove(workspace._keepAliveId);
-
-    workspace._keepAliveId = Mainloop.timeout_add(duration, function() {
-        workspace._keepAliveId = 0;
-        _queueCheckWorkspaces();
-        return false;
-    });
-}
-
-function _windowRemoved(workspace, window) {
-    workspace._lastRemovedWindow = window;
-    _queueCheckWorkspaces();
-    Mainloop.timeout_add(LAST_WINDOW_GRACE_TIME, function() {
-        if (workspace._lastRemovedWindow == window) {
-            workspace._lastRemovedWindow = null;
-            _queueCheckWorkspaces();
-        }
-        return false;
-    });
-}
-
-function _windowLeftMonitor(metaScreen, monitorIndex, metaWin) {
-    // If the window left the primary monitor, that
-    // might make that workspace empty
-    if (monitorIndex == layoutManager.primaryIndex)
-        _queueCheckWorkspaces();
-}
-
-function _windowEnteredMonitor(metaScreen, monitorIndex, metaWin) {
-    // If the window entered the primary monitor, that
-    // might make that workspace non-empty
-    if (monitorIndex == layoutManager.primaryIndex)
-        _queueCheckWorkspaces();
-}
-
-function _windowsRestacked() {
-    // Figure out where the pointer is in case we lost track of
-    // it during a grab. (In particular, if a trayicon popup menu
-    // is dismissed, see if we need to close the message tray.)
-    global.sync_pointer();
-}
-
-function _queueCheckWorkspaces() {
-    if (_checkWorkspacesId == 0)
-        _checkWorkspacesId = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, _checkWorkspaces);
-}
-
-function _nWorkspacesChanged() {
-    let oldNumWorkspaces = _workspaces.length;
-    let newNumWorkspaces = global.screen.n_workspaces;
-
-    if (oldNumWorkspaces == newNumWorkspaces)
-        return false;
-
-    let lostWorkspaces = [];
-    if (newNumWorkspaces > oldNumWorkspaces) {
-        let w;
-
-        // Assume workspaces are only added at the end
-        for (w = oldNumWorkspaces; w < newNumWorkspaces; w++)
-            _workspaces[w] = global.screen.get_workspace_by_index(w);
-
-        for (w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
-            let workspace = _workspaces[w];
-            workspace._windowAddedId = workspace.connect('window-added', _queueCheckWorkspaces);
-            workspace._windowRemovedId = workspace.connect('window-removed', _windowRemoved);
-        }
-
-    } else {
-        // Assume workspaces are only removed sequentially
-        // (e.g. 2,3,4 - not 2,4,7)
-        let removedIndex;
-        let removedNum = oldNumWorkspaces - newNumWorkspaces;
-        for (let w = 0; w < oldNumWorkspaces; w++) {
-            let workspace = global.screen.get_workspace_by_index(w);
-            if (_workspaces[w] != workspace) {
-                removedIndex = w;
-                break;
-            }
-        }
-
-        let lostWorkspaces = _workspaces.splice(removedIndex, removedNum);
-        lostWorkspaces.forEach(function(workspace) {
-                                   workspace.disconnect(workspace._windowAddedId);
-                                   workspace.disconnect(workspace._windowRemovedId);
-                               });
-    }
-
-    _queueCheckWorkspaces();
-
-    return false;
+    _defaultCssStylesheet = stylesheet;
+    loadTheme();
 }
 
 /**
@@ -431,7 +264,8 @@ function loadTheme() {
     if (_cssStylesheet != null)
         cssStylesheet = _cssStylesheet;
 
-    let theme = new St.Theme ({ application_stylesheet: cssStylesheet });
+    let theme = new St.Theme ({ application_stylesheet: cssStylesheet,
+                                default_stylesheet: _defaultCssStylesheet });
 
     if (previousTheme) {
         let customStylesheets = previousTheme.get_custom_stylesheets();
@@ -473,17 +307,6 @@ function notifyError(msg, details) {
     notify(msg, details);
 }
 
-function isWindowActorDisplayedOnWorkspace(win, workspaceIndex) {
-    return win.get_workspace() == workspaceIndex ||
-        (win.get_meta_window() && win.get_meta_window().is_on_all_workspaces());
-}
-
-function getWindowActorsForWorkspace(workspaceIndex) {
-    return global.get_window_actors().filter(function (win) {
-        return isWindowActorDisplayedOnWorkspace(win, workspaceIndex);
-    });
-}
-
 function _findModal(actor) {
     for (let i = 0; i < modalActorFocusStack.length; i++) {
         if (modalActorFocusStack[i].actor == actor)
@@ -492,10 +315,6 @@ function _findModal(actor) {
     return -1;
 }
 
-function isInModalStack(actor) {
-    return _findModal(actor) != -1;
-}
-
 /**
  * pushModal:
  * @actor: #ClutterActor which will be given keyboard focus
@@ -518,7 +337,7 @@ function isInModalStack(actor) {
  *  - options: Meta.ModalOptions flags to indicate that the pointer is
  *             already grabbed
  *
- *  - keybindingMode: used to set the current Main.KeybindingMode to filter
+ *  - keybindingMode: used to set the current Shell.KeyBindingMode to filter
  *                    global keybindings; the default of NONE will filter
  *                    out all keybindings
  *
@@ -527,7 +346,7 @@ function isInModalStack(actor) {
 function pushModal(actor, params) {
     params = Params.parse(params, { timestamp: global.get_current_time(),
                                     options: 0,
-                                    keybindingMode: KeybindingMode.NONE });
+                                    keybindingMode: Shell.KeyBindingMode.NONE });
 
     if (modalCount == 0) {
         if (!global.begin_modal(params.timestamp, params.options)) {
@@ -537,8 +356,6 @@ function pushModal(actor, params) {
         Meta.disable_unredirect_for_screen(global.screen);
     }
 
-    global.set_stage_input_mode(Shell.StageInputMode.FULLSCREEN);
-
     modalCount += 1;
     let actorDestroyId = actor.connect('destroy', function() {
         let index = _findModal(actor);
@@ -587,8 +404,7 @@ function popModal(actor, timestamp) {
     if (focusIndex < 0) {
         global.stage.set_key_focus(null);
         global.end_modal(timestamp);
-        global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
-        keybindingMode = KeybindingMode.NORMAL;
+        keybindingMode = Shell.KeyBindingMode.NORMAL;
 
         throw new Error('incorrect pop');
     }
@@ -635,9 +451,8 @@ function popModal(actor, timestamp) {
         return;
 
     global.end_modal(timestamp);
-    global.set_stage_input_mode(Shell.StageInputMode.NORMAL);
     Meta.enable_unredirect_for_screen(global.screen);
-    keybindingMode = KeybindingMode.NORMAL;
+    keybindingMode = Shell.KeyBindingMode.NORMAL;
 }
 
 function createLookingGlass() {

js/ui/modalDialog.js

@@ -14,6 +14,7 @@ const Atk = imports.gi.Atk;
 
 const Params = imports.misc.params;
 
+const Animation = imports.ui.animation;
 const Layout = imports.ui.layout;
 const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
@@ -22,6 +23,10 @@ const Tweener = imports.ui.tweener;
 const OPEN_AND_CLOSE_TIME = 0.1;
 const FADE_OUT_DIALOG_TIME = 1.0;
 
+const WORK_SPINNER_ICON_SIZE = 24;
+const WORK_SPINNER_ANIMATION_DELAY = 1.0;
+const WORK_SPINNER_ANIMATION_TIME = 0.3;
+
 const State = {
     OPENED: 0,
     CLOSED: 1,
@@ -37,14 +42,16 @@ const ModalDialog = new Lang.Class({
         params = Params.parse(params, { shellReactive: false,
                                         styleClass: null,
                                         parentActor: Main.uiGroup,
-                                        keybindingMode: Main.KeybindingMode.SYSTEM_MODAL,
-                                        shouldFadeIn: true });
+                                        keybindingMode: Shell.KeyBindingMode.SYSTEM_MODAL,
+                                        shouldFadeIn: true,
+                                        destroyOnClose: true });
 
         this.state = State.CLOSED;
         this._hasModal = false;
         this._keybindingMode = params.keybindingMode;
         this._shellReactive = params.shellReactive;
         this._shouldFadeIn = params.shouldFadeIn;
+        this._destroyOnClose = params.destroyOnClose;
 
         this._group = new St.Widget({ visible: false,
                                       x: 0,
@@ -58,34 +65,32 @@ const ModalDialog = new Lang.Class({
 
         this._group.connect('destroy', Lang.bind(this, this._onGroupDestroy));
 
+        this._pressedKey = null;
         this._buttonKeys = {};
+        this._group.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
         this._group.connect('key-release-event', Lang.bind(this, this._onKeyReleaseEvent));
 
-        this._backgroundBin = new St.Bin();
+        this.backgroundStack = new St.Widget({ layout_manager: new Clutter.BinLayout() });
+        this._backgroundBin = new St.Bin({ child: this.backgroundStack,
+                                           x_fill: true, y_fill: true });
         this._monitorConstraint = new Layout.MonitorConstraint();
         this._backgroundBin.add_constraint(this._monitorConstraint);
         this._group.add_actor(this._backgroundBin);
 
         this.dialogLayout = new St.BoxLayout({ style_class: 'modal-dialog',
                                                vertical:    true });
-        if (params.styleClass != null) {
+        if (params.styleClass != null)
             this.dialogLayout.add_style_class_name(params.styleClass);
-        }
 
         if (!this._shellReactive) {
             this._lightbox = new Lightbox.Lightbox(this._group,
                                                    { inhibitEvents: true });
             this._lightbox.highlight(this._backgroundBin);
 
-            let stack = new Shell.Stack();
-            this._backgroundBin.child = stack;
-
-            this._eventBlocker = new Clutter.Group({ reactive: true });
-            stack.add_actor(this._eventBlocker);
-            stack.add_actor(this.dialogLayout);
-        } else {
-            this._backgroundBin.child = this.dialogLayout;
+            this._eventBlocker = new Clutter.Actor({ reactive: true });
+            this.backgroundStack.add_actor(this._eventBlocker);
         }
+        this.backgroundStack.add_actor(this.dialogLayout);
 
 
         this.contentLayout = new St.BoxLayout({ vertical: true });
@@ -106,6 +111,8 @@ const ModalDialog = new Lang.Class({
         this._initialKeyFocus = this.dialogLayout;
         this._initialKeyFocusDestroyId = 0;
         this._savedKeyFocus = null;
+
+        this._workSpinner = null;
     },
 
     destroy: function() {
@@ -157,6 +164,7 @@ const ModalDialog = new Lang.Class({
             keys = [];
 
         let button = new St.Button({ style_class: 'modal-dialog-button',
+                                     button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE,
                                      reactive:    true,
                                      can_focus:   true,
                                      label:       label });
@@ -178,10 +186,55 @@ const ModalDialog = new Lang.Class({
         return button;
     },
 
-    _onKeyReleaseEvent: function(object, event) {
-        let symbol = event.get_key_symbol();
-        let buttonInfo = this._buttonKeys[symbol];
+    placeSpinner: function(layoutInfo) {
+        let spinnerIcon = global.datadir + '/theme/process-working.svg';
+        this._workSpinner = new Animation.AnimatedIcon(spinnerIcon, WORK_SPINNER_ICON_SIZE);
+        this._workSpinner.actor.opacity = 0;
+        this._workSpinner.actor.show();
 
+        this.buttonLayout.add(this._workSpinner.actor, layoutInfo);
+    },
+
+    setWorking: function(working) {
+        if (!this._workSpinner)
+            return;
+
+        Tweener.removeTweens(this._workSpinner.actor);
+        if (working) {
+            this._workSpinner.play();
+            Tweener.addTween(this._workSpinner.actor,
+                             { opacity: 255,
+                               delay: WORK_SPINNER_ANIMATION_DELAY,
+                               time: WORK_SPINNER_ANIMATION_TIME,
+                               transition: 'linear'
+                             });
+        } else {
+            Tweener.addTween(this._workSpinner.actor,
+                             { opacity: 0,
+                               time: WORK_SPINNER_ANIMATION_TIME,
+                               transition: 'linear',
+                               onCompleteScope: this,
+                               onComplete: function() {
+                                   if (this._workSpinner)
+                                       this._workSpinner.stop();
+                               }
+                             });
+        }
+    },
+
+    _onKeyPressEvent: function(object, event) {
+        this._pressedKey = event.get_key_symbol();
+    },
+
+    _onKeyReleaseEvent: function(object, event) {
+        let pressedKey = this._pressedKey;
+        this._pressedKey = null;
+
+        let symbol = event.get_key_symbol();
+        if (symbol != pressedKey)
+            return false;
+
+        let buttonInfo = this._buttonKeys[symbol];
         if (!buttonInfo)
             return false;
 
@@ -264,6 +317,10 @@ const ModalDialog = new Lang.Class({
                                function() {
                                    this.state = State.CLOSED;
                                    this._group.hide();
+                                   this.emit('closed');
+
+                                   if (this._destroyOnClose)
+                                       this.destroy();
                                })
                          });
     },
@@ -299,8 +356,9 @@ const ModalDialog = new Lang.Class({
         if (this._savedKeyFocus) {
             this._savedKeyFocus.grab_key_focus();
             this._savedKeyFocus = null;
-        } else
+        } else {
             this._initialKeyFocus.grab_key_focus();
+        }
 
         if (!this._shellReactive)
             this._eventBlocker.lower_bottom();

js/ui/notificationDaemon.js

@@ -103,6 +103,126 @@ const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
     'ibus-ui-gtk': 'keyboard'
 };
 
+const NotificationGenericPolicy = new Lang.Class({
+    Name: 'NotificationGenericPolicy',
+    Extends: MessageTray.NotificationPolicy,
+
+    _init: function() {
+        // Don't chain to parent, it would try setting
+        // our properties to the defaults
+
+        this.id = 'generic';
+
+        this._masterSettings = new Gio.Settings({ schema: 'org.gnome.desktop.notifications' });
+        this._masterSettings.connect('changed', Lang.bind(this, this._changed));
+    },
+
+    store: function() { },
+
+    destroy: function() {
+        this._masterSettings.run_dispose();
+    },
+
+    _changed: function(settings, key) {
+        this.emit('policy-changed', key);
+    },
+
+    get enable() {
+        return true;
+    },
+
+    get enableSound() {
+        return true;
+    },
+
+    get showBanners() {
+        return this._masterSettings.get_boolean('show-banners');
+    },
+
+    get forceExpanded() {
+        return false;
+    },
+
+    get showInLockScreen() {
+        return this._masterSettings.get_boolean('show-in-lock-screen');
+    },
+
+    get detailsInLockScreen() {
+        return false;
+    }
+});
+
+const NotificationApplicationPolicy = new Lang.Class({
+    Name: 'NotificationApplicationPolicy',
+    Extends: MessageTray.NotificationPolicy,
+
+    _init: function(id) {
+        // Don't chain to parent, it would try setting
+        // our properties to the defaults
+
+        this.id = id;
+        this._canonicalId = this._canonicalizeId(id)
+
+        this._masterSettings = new Gio.Settings({ schema: 'org.gnome.desktop.notifications' });
+        this._settings = new Gio.Settings({ schema: 'org.gnome.desktop.notifications.application',
+                                            path: '/org/gnome/desktop/notifications/application/' + this._canonicalId + '/' });
+
+        this._masterSettings.connect('changed', Lang.bind(this, this._changed));
+        this._settings.connect('changed', Lang.bind(this, this._changed));
+    },
+
+    store: function() {
+        this._settings.set_string('application-id', this.id + '.desktop');
+
+        let apps = this._masterSettings.get_strv('application-children');
+        if (apps.indexOf(this._canonicalId) < 0) {
+            apps.push(this._canonicalId);
+            this._masterSettings.set_strv('application-children', apps);
+        }
+    },
+
+    destroy: function() {
+        this._masterSettings.run_dispose();
+        this._settings.run_dispose();
+    },
+
+    _changed: function(settings, key) {
+        this.emit('policy-changed', key);
+    },
+
+    _canonicalizeId: function(id) {
+        // Keys are restricted to lowercase alphanumeric characters and dash,
+        // and two dashes cannot be in succession
+        return id.toLowerCase().replace(/[^a-z0-9\-]/g, '-').replace(/--+/g, '-');
+    },
+
+    get enable() {
+        return this._settings.get_boolean('enable');
+    },
+
+    get enableSound() {
+        return this._settings.get_boolean('enable-sound-alerts');
+    },
+
+    get showBanners() {
+        return this._masterSettings.get_boolean('show-banners') &&
+            this._settings.get_boolean('show-banners');
+    },
+
+    get forceExpanded() {
+        return this._settings.get_boolean('force-expanded');
+    },
+
+    get showInLockScreen() {
+        return this._masterSettings.get_boolean('show-in-lock-screen') &&
+            this._settings.get_boolean('show-in-lock-screen');
+    },
+
+    get detailsInLockScreen() {
+        return this._settings.get_boolean('details-in-lock-screen');
+    }
+});
+
 const NotificationDaemon = new Lang.Class({
     Name: 'NotificationDaemon',
 
@@ -124,7 +244,7 @@ const NotificationDaemon = new Lang.Class({
         Main.overview.connect('hidden',
             Lang.bind(this, this._onFocusAppChanged));
 
-        this._trayManager.manage_stage(global.stage, Main.messageTray.actor);
+        this._trayManager.manage_screen(global.screen, Main.messageTray.actor);
     },
 
     _imageForNotificationData: function(hints) {
@@ -213,7 +333,7 @@ const NotificationDaemon = new Lang.Class({
             }
         }
 
-        let source = new Source(title, pid, sender, trayIcon);
+        let source = new Source(title, pid, sender, trayIcon, ndata ? ndata.hints['desktop-entry'] : null);
         source.setTransient(isForTransientNotification);
 
         if (!isForTransientNotification) {
@@ -381,6 +501,9 @@ const NotificationDaemon = new Lang.Class({
                 }));
         }
 
+        // Mark music notifications so they can be shown in the screen shield
+        notification.isMusic = (ndata.hints['category'] == 'x-gnome.music');
+
         let gicon = this._iconForNotificationData(icon, hints);
         let gimage = this._imageForNotificationData(hints);
 
@@ -395,17 +518,19 @@ const NotificationDaemon = new Lang.Class({
         // one of 'image-data' or 'image-path' are specified, we show both an icon and
         // a large image.
         if (gicon && gimage)
-            image = new St.Icon({ gicon: gimage });
+            image = new St.Icon({ gicon: gimage,
+                                  icon_size: notification.IMAGE_SIZE });
         else if (!gicon && gimage)
             gicon = gimage;
         else if (!gicon)
             gicon = this._fallbackIconForNotificationData(hints);
 
-        notification.setImage(image);
-
         notification.update(summary, body, { gicon: gicon,
                                              bannerMarkup: true,
-                                             clear: true });
+                                             clear: true,
+                                             soundFile: hints['sound-file'],
+                                             soundName: hints['sound-name'] });
+        notification.setImage(image);
 
         if (actions.length) {
             notification.setUseActionIcons(hints['action-icons'] == true);
@@ -459,7 +584,7 @@ const NotificationDaemon = new Lang.Class({
             // 'icon-multi',
             'icon-static',
             'persistence',
-            // 'sound',
+            'sound',
         ];
     },
 
@@ -515,12 +640,22 @@ const Source = new Lang.Class({
     Name: 'NotificationDaemonSource',
     Extends: MessageTray.Source,
 
-    _init: function(title, pid, sender, trayIcon) {
+    _init: function(title, pid, sender, trayIcon, appId) {
+        // Need to set the app before chaining up, so
+        // methods called from the parent constructor can find it
+        this.trayIcon = trayIcon;
+        this.pid = pid;
+        this.app = this._getApp(appId);
+
         this.parent(title);
 
         this.initialTitle = title;
 
-        this.pid = pid;
+        if (this.app)
+            this.title = this.app.get_name();
+        else
+            this.useNotificationIcon = true;
+
         if (sender)
             this._nameWatcherId = Gio.DBus.session.watch_name(sender,
                                                               Gio.BusNameWatcherFlags.NONE,
@@ -529,16 +664,19 @@ const Source = new Lang.Class({
         else
             this._nameWatcherId = 0;
 
-        this._setApp();
-        if (this.app)
-            this.title = this.app.get_name();
-        else
-            this.useNotificationIcon = true;
-
-        this.trayIcon = trayIcon;
         if (this.trayIcon) {
-           this._setSummaryIcon(this.trayIcon);
-           this.useNotificationIcon = false;
+            // Try again finding the app, using the WM_CLASS from the tray icon
+            this._setSummaryIcon(this.trayIcon);
+            this.useNotificationIcon = false;
+        }
+    },
+
+    _createPolicy: function() {
+        if (this.app) {
+            let id = this.app.get_id().replace(/\.desktop$/,'');
+            return new NotificationApplicationPolicy(id);
+        } else {
+            return new NotificationGenericPolicy();
         }
     },
 
@@ -565,24 +703,22 @@ const Source = new Lang.Class({
             this.notify(notification);
     },
 
-    handleSummaryClick: function() {
+    handleSummaryClick: function(button) {
         if (!this.trayIcon)
             return false;
 
         let event = Clutter.get_current_event();
-        if (event.type() != Clutter.EventType.BUTTON_RELEASE)
-            return false;
 
         // Left clicks are passed through only where there aren't unacknowledged
         // notifications, so it possible to open them in summary mode; right
         // clicks are always forwarded, as the right click menu is not useful for
         // tray icons
-        if (event.get_button() == 1 &&
+        if (button == 1 &&
             this.notifications.length > 0)
             return false;
 
-        let id = global.connect('notify::stage-input-mode', Lang.bind(this, function () {
-            global.disconnect(id);
+        let id = global.stage.connect('deactivate', Lang.bind(this, function () {
+            global.stage.disconnect(id);
             this.trayIcon.click(event);
         }));
 
@@ -590,7 +726,7 @@ const Source = new Lang.Class({
         return true;
     },
 
-    _getApp: function() {
+    _getApp: function(appId) {
         let app;
 
         app = Shell.WindowTracker.get_default().get_app_from_pid(this.pid);
@@ -598,7 +734,13 @@ const Source = new Lang.Class({
             return app;
 
         if (this.trayIcon) {
-            app = Shell.AppSystem.get_default().lookup_wmclass(this.trayIcon.wmclass);
+            app = Shell.AppSystem.get_default().lookup_wmclass(this.trayIcon.wm_class);
+            if (app != null)
+                return app;
+        }
+
+        if (appId) {
+            app = Shell.AppSystem.get_default().lookup_app(appId + '.desktop');
             if (app != null)
                 return app;
         }
@@ -606,11 +748,11 @@ const Source = new Lang.Class({
         return null;
     },
 
-    _setApp: function() {
+    _setApp: function(appId) {
         if (this.app)
             return;
 
-        this.app = this._getApp();
+        this.app = this._getApp(appId);
         if (!this.app)
             return;
 

js/ui/osdWindow.js

@@ -0,0 +1,210 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Clutter = imports.gi.Clutter;
+const St = imports.gi.St;
+
+const Lang = imports.lang;
+const Layout = imports.ui.layout;
+const Main = imports.ui.main;
+const Mainloop = imports.mainloop;
+const Tweener = imports.ui.tweener;
+const Meta = imports.gi.Meta;
+
+const HIDE_TIMEOUT = 1500;
+const FADE_TIME = 0.1;
+const LEVEL_ANIMATION_TIME = 0.1;
+
+const LevelBar = new Lang.Class({
+    Name: 'LevelBar',
+
+    _init: function() {
+        this._level = 0;
+
+        this.actor = new St.Bin({ style_class: 'level',
+                                  x_fill: true, y_fill: true });
+        this._bar = new St.DrawingArea();
+        this._bar.connect('repaint', Lang.bind(this, this._repaint));
+
+        this.actor.set_child(this._bar);
+    },
+
+    get level() {
+        return this._level;
+    },
+
+    set level(value) {
+        let newValue = Math.max(0, Math.min(value, 100));
+        if (newValue == this._level)
+            return;
+        this._level = newValue;
+        this._bar.queue_repaint();
+    },
+
+    _repaint: function() {
+        let cr = this._bar.get_context();
+
+        let node = this.actor.get_theme_node();
+        let radius = node.get_border_radius(0); // assume same radius for all corners
+        Clutter.cairo_set_source_color(cr, node.get_foreground_color());
+
+        let [w, h] = this._bar.get_surface_size();
+        w *= (this._level / 100.);
+
+        if (w == 0)
+            return;
+
+        cr.moveTo(radius, 0);
+        if (w >= radius)
+            cr.arc(w - radius, radius, radius, 1.5 * Math.PI, 2. * Math.PI);
+        else
+            cr.lineTo(w, 0);
+        if (w >= radius)
+            cr.arc(w - radius, h - radius, radius, 0, 0.5 * Math.PI);
+        else
+            cr.lineTo(w, h);
+        cr.arc(radius, h - radius, radius, 0.5 * Math.PI, Math.PI);
+        cr.arc(radius, radius, radius, Math.PI, 1.5 * Math.PI);
+        cr.fill();
+    }
+});
+
+const OsdWindow = new Lang.Class({
+    Name: 'OsdWindow',
+
+    _init: function() {
+        this._popupSize = 0;
+        this.actor = new St.Widget({ x_expand: true,
+                                     y_expand: true,
+                                     x_align: Clutter.ActorAlign.CENTER,
+                                     y_align: Clutter.ActorAlign.CENTER });
+        this.actor.add_constraint(new Layout.MonitorConstraint({ primary: true }));
+        this._box = new St.BoxLayout({ style_class: 'osd-window',
+                                       vertical: true });
+        this.actor.add_actor(this._box);
+
+        this._box.connect('style-changed', Lang.bind(this, this._onStyleChanged));
+        this._box.connect('notify::height', Lang.bind(this,
+            function() {
+                Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this,
+                    function() {
+                        this._box.width = this._box.height;
+                    }));
+            }));
+
+        this._icon = new St.Icon();
+        this._box.add(this._icon, { expand: true });
+
+        this._label = new St.Label();
+        this._box.add(this._label);
+
+        this._level = new LevelBar();
+        this._box.add(this._level.actor);
+
+        this._hideTimeoutId = 0;
+        this._reset();
+
+        Main.layoutManager.connect('monitors-changed',
+                                   Lang.bind(this, this._monitorsChanged));
+        this._monitorsChanged();
+
+        Main.uiGroup.add_child(this.actor);
+    },
+
+    setIcon: function(icon) {
+        this._icon.gicon = icon;
+    },
+
+    setLabel: function(label) {
+        this._label.visible = (label != undefined);
+        if (label)
+            this._label.text = label;
+    },
+
+    setLevel: function(level) {
+        this._level.actor.visible = (level != undefined);
+        if (this.actor.visible)
+            Tweener.addTween(this._level,
+                             { level: level,
+                               time: LEVEL_ANIMATION_TIME,
+                               transition: 'easeOutQuad' });
+        else
+            this._level.level = level;
+    },
+
+    show: function() {
+        if (!this._icon.gicon)
+            return;
+
+        if (!this.actor.visible) {
+            Meta.disable_unredirect_for_screen(global.screen);
+            this.actor.show();
+            this.actor.opacity = 0;
+            this.actor.get_parent().set_child_above_sibling(this.actor, null);
+
+            Tweener.addTween(this.actor,
+                             { opacity: 255,
+                               time: FADE_TIME,
+                               transition: 'easeOutQuad' });
+        }
+
+        if (this._hideTimeoutId)
+            Mainloop.source_remove(this._hideTimeoutId);
+        this._hideTimeoutId = Mainloop.timeout_add(HIDE_TIMEOUT,
+                                                   Lang.bind(this, this._hide));
+    },
+
+    cancel: function() {
+        if (!this._hideTimeoutId)
+            return;
+
+        Mainloop.source_remove(this._hideTimeoutId);
+        this._hide();
+    },
+
+    _hide: function() {
+        this._hideTimeoutId = 0;
+        Tweener.addTween(this.actor,
+                         { opacity: 0,
+                           time: FADE_TIME,
+                           transition: 'easeOutQuad',
+                           onComplete: Lang.bind(this, function() {
+                              this._reset();
+                              Meta.enable_unredirect_for_screen(global.screen);
+                           })
+                         });
+    },
+
+    _reset: function() {
+        this.actor.hide();
+        this.setLabel(null);
+        this.setLevel(null);
+    },
+
+    _monitorsChanged: function() {
+        /* assume 110x110 on a 640x480 display and scale from there */
+        let monitor = Main.layoutManager.primaryMonitor;
+        let scalew = monitor.width / 640.0;
+        let scaleh = monitor.height / 480.0;
+        let scale = Math.min(scalew, scaleh);
+        this._popupSize = 110 * Math.max(1, scale);
+
+        this._box.translation_y = monitor.height / 4;
+        this._icon.icon_size = this._popupSize / 2;
+        this._box.style_changed();
+    },
+
+    _onStyleChanged: function() {
+        let themeNode = this._box.get_theme_node();
+        let horizontalPadding = themeNode.get_horizontal_padding();
+        let verticalPadding = themeNode.get_vertical_padding();
+        let topBorder = themeNode.get_border_width(St.Side.TOP);
+        let bottomBorder = themeNode.get_border_width(St.Side.BOTTOM);
+        let leftBorder = themeNode.get_border_width(St.Side.LEFT);
+        let rightBorder = themeNode.get_border_width(St.Side.RIGHT);
+
+        let minWidth = this._popupSize - verticalPadding - leftBorder - rightBorder;
+        let minHeight = this._popupSize - horizontalPadding - topBorder - bottomBorder;
+
+        this._box.style = 'min-height: %dpx;'.format(Math.max(minWidth, minHeight));
+    }
+});

js/ui/overview.js

@@ -10,38 +10,28 @@ const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 const Gdk = imports.gi.Gdk;
 
-const Dash = imports.ui.dash;
+const Background = imports.ui.background;
 const DND = imports.ui.dnd;
+const LayoutManager = imports.ui.layout;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
+const OverviewControls = imports.ui.overviewControls;
 const Panel = imports.ui.panel;
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
-const ViewSelector = imports.ui.viewSelector;
 const WorkspaceThumbnail = imports.ui.workspaceThumbnail;
 
 // Time for initial animation going into Overview mode
 const ANIMATION_TIME = 0.25;
 
-const DND_WINDOW_SWITCH_TIMEOUT = 1250;
+// Must be less than ANIMATION_TIME, since we switch to
+// or from the overview completely after ANIMATION_TIME,
+// and don't want the shading animation to get cut off
+const SHADE_ANIMATION_TIME = .20;
 
-const GLSL_DIM_EFFECT_DECLARATIONS = '';
-const GLSL_DIM_EFFECT_CODE = '\
-   vec2 dist = cogl_tex_coord_in[0].xy - vec2(0.5, 0.5); \
-   float elipse_radius = 0.5; \
-   /* from https://bugzilla.gnome.org/show_bug.cgi?id=669798: \
-      the alpha on the gradient goes from 250 at its darkest to 180 at its most transparent. */ \
-   float y = 250.0 / 255.0; \
-   float x = 180.0 / 255.0; \
-   /* interpolate darkening value, based on distance from screen center */ \
-   float val = min(length(dist), elipse_radius); \
-   float a = mix(x, y, val / elipse_radius); \
-   /* dim_factor varies from [1.0 -> 0.5] when overview is showing \
-      We use it to smooth value, then we clamp it to valid color interval */ \
-   a = clamp(a - cogl_color_in.r + 0.5, 0.0, 1.0); \
-   /* We\'re blending between: color and black color (obviously omitted in the equation) */ \
-   cogl_color_out.xyz = cogl_color_out.xyz * (1.0 - a); \
-   cogl_color_out.a = 1.0;';
+const DND_WINDOW_SWITCH_TIMEOUT = 750;
+
+const OVERVIEW_ACTIVATION_TIMEOUT = 0.5;
 
 const ShellInfo = new Lang.Class({
     Name: 'ShellInfo',
@@ -117,52 +107,52 @@ const Overview = new Lang.Class({
 
         this._overviewCreated = true;
 
-        // The main BackgroundActor is inside global.window_group which is
+        // The main Background actors are inside global.window_group which are
         // hidden when displaying the overview, so we create a new
         // one. Instances of this class share a single CoglTexture behind the
         // scenes which allows us to show the background with different
         // rendering options without duplicating the texture data.
-        this._background = Meta.BackgroundActor.new_for_screen(global.screen);
-        this._background.add_glsl_snippet(Meta.SnippetHook.FRAGMENT,
-                                          GLSL_DIM_EFFECT_DECLARATIONS,
-                                          GLSL_DIM_EFFECT_CODE,
-                                          false);
-        this._background.hide();
-        global.overlay_group.add_actor(this._background);
+        let monitor = Main.layoutManager.primaryMonitor;
 
         this._desktopFade = new St.Bin();
-        global.overlay_group.add_actor(this._desktopFade);
+        Main.layoutManager.overviewGroup.add_child(this._desktopFade);
+
+        let layout = new Clutter.BinLayout();
+        this._stack = new Clutter.Actor({ layout_manager: layout });
+        this._stack.add_constraint(new LayoutManager.MonitorConstraint({ primary: true }));
 
         /* Translators: This is the main view to select
            activities. See also note for "Activities" string. */
         this._overview = new St.BoxLayout({ name: 'overview',
                                             accessible_name: _("Overview"),
                                             reactive: true,
-                                            vertical: true });
+                                            vertical: true,
+                                            x_expand: true,
+                                            y_expand: true });
         this._overview._delegate = this;
 
-        this._group = new St.BoxLayout({ name: 'overview-group' });
+        this._backgroundGroup = new Meta.BackgroundGroup();
+        Main.layoutManager.overviewGroup.add_child(this._backgroundGroup);
+        this._bgManagers = [];
 
-        this._capturedEventId = 0;
-        this._buttonPressId = 0;
+        this._activationTime = 0;
 
         this.visible = false;           // animating to overview, in overview, animating out
         this._shown = false;            // show() and not hide()
-        this._shownTemporarily = false; // showTemporarily() and not hideTemporarily()
         this._modal = false;            // have a modal grab
         this.animationInProgress = false;
-        this._hideInProgress = false;
+        this.visibleTarget = false;
 
         // During transitions, we raise this to the top to avoid having the overview
         // area be reactive; it causes too many issues such as double clicks on
         // Dash elements, or mouseover handlers in the workspaces.
-        this._coverPane = new Clutter.Rectangle({ opacity: 0,
-                                                  reactive: true });
-        this._overview.add_actor(this._coverPane);
+        this._coverPane = new Clutter.Actor({ opacity: 0,
+                                              reactive: true });
+        this._stack.add_actor(this._coverPane);
         this._coverPane.connect('event', Lang.bind(this, function (actor, event) { return true; }));
 
-        this._overview.hide();
-        global.overlay_group.add_actor(this._overview);
+        this._stack.add_actor(this._overview);
+        Main.layoutManager.overviewGroup.add_child(this._stack);
 
         this._coverPane.hide();
 
@@ -186,6 +176,56 @@ const Overview = new Lang.Class({
             this.init();
     },
 
+    _updateBackgrounds: function() {
+        for (let i = 0; i < this._bgManagers.length; i++)
+            this._bgManagers[i].destroy();
+
+        this._bgManagers = [];
+
+        for (let i = 0; i < Main.layoutManager.monitors.length; i++) {
+            let bgManager = new Background.BackgroundManager({ container: this._backgroundGroup,
+                                                               monitorIndex: i,
+                                                               effects: Meta.BackgroundEffects.VIGNETTE });
+            this._bgManagers.push(bgManager);
+        }
+    },
+
+    _unshadeBackgrounds: function() {
+        let backgrounds = this._backgroundGroup.get_children();
+        for (let i = 0; i < backgrounds.length; i++) {
+            let background = backgrounds[i]._delegate;
+
+            Tweener.addTween(background,
+                             { brightness: 1.0,
+                               time: SHADE_ANIMATION_TIME,
+                               transition: 'easeOutQuad'
+                             });
+            Tweener.addTween(background,
+                             { vignetteSharpness: 0.0,
+                               time: SHADE_ANIMATION_TIME,
+                               transition: 'easeOutQuad'
+                             });
+        }
+    },
+
+    _shadeBackgrounds: function() {
+        let backgrounds = this._backgroundGroup.get_children();
+        for (let i = 0; i < backgrounds.length; i++) {
+            let background = backgrounds[i]._delegate;
+
+            Tweener.addTween(background,
+                             { brightness: 0.8,
+                               time: SHADE_ANIMATION_TIME,
+                               transition: 'easeOutQuad'
+                             });
+            Tweener.addTween(background,
+                             { vignetteSharpness: 0.7,
+                               time: SHADE_ANIMATION_TIME,
+                               transition: 'easeOutQuad'
+                             });
+        }
+    },
+
     _sessionUpdated: function() {
         this.isDummy = !Main.sessionMode.hasOverview;
         this._createOverview();
@@ -215,43 +255,31 @@ const Overview = new Lang.Class({
                                               in the search entry when no search is
                                               active; it should not exceed ~30
                                               characters. */
-                                           hint_text: _("Type to search..."),
+                                           hint_text: _("Type to search…"),
                                            track_hover: true,
                                            can_focus: true });
         this._searchEntryBin = new St.Bin({ child: this._searchEntry,
                                             x_align: St.Align.MIDDLE });
         this._overview.add_actor(this._searchEntryBin);
 
+        // Create controls
+        this._controls = new OverviewControls.ControlsManager(this._searchEntry);
+        this._dash = this._controls.dash;
+        this._viewSelector = this._controls.viewSelector;
+
+        // Add our same-line elements after the search entry
+        this._overview.add(this._controls.actor, { y_fill: true, expand: true });
+        this._controls.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
+
+        this._stack.add_actor(this._controls.indicatorActor);
+
         // TODO - recalculate everything when desktop size changes
-        this._dash = new Dash.Dash();
-        this._group.add_actor(this._dash.actor);
         this.dashIconSize = this._dash.iconSize;
         this._dash.connect('icon-size-changed',
                            Lang.bind(this, function() {
                                this.dashIconSize = this._dash.iconSize;
                            }));
 
-        // Translators: this is the name of the dock/favorites area on
-        // the left of the overview
-        Main.ctrlAltTabManager.addGroup(this._dash.actor, _("Dash"), 'user-bookmarks-symbolic');
-
-        this._viewSelector = new ViewSelector.ViewSelector(this._searchEntry,
-                                                           this._dash.showAppsButton);
-        this._group.add(this._viewSelector.actor, { x_fill: true,
-                                                    expand: true });
-
-        // Add our same-line elements after the search entry
-        this._overview.add(this._group, { y_fill: true,
-                                          expand: true });
-
-        // Then account for message tray
-        this._messageTrayGhost = new St.Bin({ style_class: 'message-tray-summary',
-                                              reactive: false,
-                                              opacity: 0,
-                                              x_fill: true,
-                                              y_fill: true });
-        this._overview.add_actor(this._messageTrayGhost);
-
         Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._relayout));
         this._relayout();
     },
@@ -277,18 +305,22 @@ const Overview = new Lang.Class({
     },
 
     _onDragBegin: function() {
+        this._inXdndDrag = true;
+
         DND.addDragMonitor(this._dragMonitor);
         // Remember the workspace we started from
         this._lastActiveWorkspaceIndex = global.screen.get_active_workspace_index();
     },
 
     _onDragEnd: function(time) {
+        this._inXdndDrag = false;
+
         // In case the drag was canceled while in the overview
         // we have to go back to where we started and hide
         // the overview
-        if (this._shownTemporarily)  {
+        if (this._shown) {
             global.screen.get_workspace_by_index(this._lastActiveWorkspaceIndex).activate(time);
-            this.hideTemporarily();
+            this.hide();
         }
         this._resetWindowSwitchTimeout();
         this._lastHoveredWindow = null;
@@ -336,7 +368,7 @@ const Overview = new Lang.Class({
                                                 this._needsFakePointerEvent = true;
                                                 Main.activateWindow(dragEvent.targetActor._delegate.metaWindow,
                                                                     this._windowSwitchTimestamp);
-                                                this.hideTemporarily();
+                                                this.hide();
                                                 this._lastHoveredWindow = null;
                                             }));
         }
@@ -344,6 +376,10 @@ const Overview = new Lang.Class({
         return DND.DragMotionResult.CONTINUE;
     },
 
+    _onScrollEvent: function(actor, event) {
+        this.emit('scroll-event', event);
+    },
+
     addAction: function(action) {
         if (this.isDummy)
             return;
@@ -373,16 +409,12 @@ const Overview = new Lang.Class({
         // when it is next shown.
         this.hide();
 
-        let primary = Main.layoutManager.primaryMonitor;
+        let workArea = Main.layoutManager.getWorkAreaForMonitor(Main.layoutManager.primaryIndex);
 
-        let contentY = Main.panel.actor.height;
-        let contentHeight = primary.height - contentY - Main.messageTray.actor.height;
+        this._coverPane.set_position(0, workArea.y);
+        this._coverPane.set_size(workArea.width, workArea.height);
 
-        this._overview.set_position(primary.x, primary.y);
-        this._overview.set_size(primary.width, primary.height);
-
-        this._coverPane.set_position(0, contentY);
-        this._coverPane.set_size(primary.width, contentHeight);
+        this._updateBackgrounds();
     },
 
     _onRestacked: function() {
@@ -401,6 +433,7 @@ const Overview = new Lang.Class({
 
     beginItemDrag: function(source) {
         this.emit('item-drag-begin');
+        this._inDrag = true;
     },
 
     cancelledItemDrag: function(source) {
@@ -409,10 +442,12 @@ const Overview = new Lang.Class({
 
     endItemDrag: function(source) {
         this.emit('item-drag-end');
+        this._inDrag = false;
     },
 
     beginWindowDrag: function(source) {
         this.emit('window-drag-begin');
+        this._inDrag = true;
     },
 
     cancelledWindowDrag: function(source) {
@@ -421,23 +456,31 @@ const Overview = new Lang.Class({
 
     endWindowDrag: function(source) {
         this.emit('window-drag-end');
+        this._inDrag = false;
     },
 
     // show:
     //
     // Animates the overview visible and grabs mouse and keyboard input
-    show : function() {
+    show: function() {
         if (this.isDummy)
             return;
         if (this._shown)
             return;
         this._shown = true;
-        this._syncInputMode();
-        if (!this._modal)
+
+        if (!this._syncGrab())
             return;
+
+        Main.layoutManager.showOverview();
         this._animateVisible();
     },
 
+    focusSearch: function() {
+        this.show();
+        this._searchEntry.grab_key_focus();
+    },
+
     fadeInDesktop: function() {
             this._desktopFade.opacity = 0;
             this._desktopFade.show();
@@ -466,6 +509,8 @@ const Overview = new Lang.Class({
 
         this.visible = true;
         this.animationInProgress = true;
+        this.visibleTarget = true;
+        this._activationTime = Date.now() / 1000;
 
         // All the the actors in the window group are completely obscured,
         // hiding the group holding them while the Overview is displayed greatly
@@ -477,49 +522,23 @@ const Overview = new Lang.Class({
         //
         // Disable unredirection while in the overview
         Meta.disable_unredirect_for_screen(global.screen);
-        global.window_group.hide();
-        this._overview.show();
-        this._background.show();
         this._viewSelector.show();
 
-        this._overview.opacity = 0;
-        Tweener.addTween(this._overview,
+        this._stack.opacity = 0;
+        Tweener.addTween(this._stack,
                          { opacity: 255,
                            transition: 'easeOutQuad',
                            time: ANIMATION_TIME,
                            onComplete: this._showDone,
                            onCompleteScope: this
                          });
-
-        Tweener.addTween(this._background,
-                         { dim_factor: 0.8,
-                           time: ANIMATION_TIME,
-                           transition: 'easeOutQuad'
-                         });
+        this._shadeBackgrounds();
 
         this._coverPane.raise_top();
         this._coverPane.show();
         this.emit('showing');
     },
 
-    // showTemporarily:
-    //
-    // Animates the overview visible without grabbing mouse and keyboard input;
-    // if show() has already been called, this has no immediate effect, but
-    // will result in the overview not being hidden until hideTemporarily() is
-    // called.
-    showTemporarily: function() {
-        if (this.isDummy)
-            return;
-
-        if (this._shownTemporarily)
-            return;
-
-        this._syncInputMode();
-        this._animateVisible();
-        this._shownTemporarily = true;
-    },
-
     // hide:
     //
     // Reverses the effect of show()
@@ -530,28 +549,20 @@ const Overview = new Lang.Class({
         if (!this._shown)
             return;
 
-        if (!this._shownTemporarily)
-            this._animateNotVisible();
+        let event = Clutter.get_current_event();
+        if (event) {
+            let type = event.type();
+            let button = (type == Clutter.EventType.BUTTON_PRESS ||
+                          type == Clutter.EventType.BUTTON_RELEASE);
+            let ctrl = (event.get_state() & Clutter.ModifierType.CONTROL_MASK) != 0;
+            if (button && ctrl)
+                return;
+        }
+
+        this._animateNotVisible();
 
         this._shown = false;
-        this._syncInputMode();
-    },
-
-    // hideTemporarily:
-    //
-    // Reverses the effect of showTemporarily()
-    hideTemporarily: function() {
-        if (this.isDummy)
-            return;
-
-        if (!this._shownTemporarily)
-            return;
-
-        if (!this._shown)
-            this._animateNotVisible();
-
-        this._shownTemporarily = false;
-        this._syncInputMode();
+        this._syncGrab();
     },
 
     toggle: function() {
@@ -564,37 +575,51 @@ const Overview = new Lang.Class({
             this.show();
     },
 
+    // Checks if the Activities button is currently sensitive to
+    // clicks. The first call to this function within the
+    // OVERVIEW_ACTIVATION_TIMEOUT time of the hot corner being
+    // triggered will return false. This avoids opening and closing
+    // the overview if the user both triggered the hot corner and
+    // clicked the Activities button.
+    shouldToggleByCornerOrButton: function() {
+        if (this.animationInProgress)
+            return false;
+        if (this._inDrag)
+            return false;
+        if (this._activationTime == 0 || Date.now() / 1000 - this._activationTime > OVERVIEW_ACTIVATION_TIMEOUT)
+            return true;
+        return false;
+    },
+
     //// Private methods ////
 
-    _syncInputMode: function() {
-        // We delay input mode changes during animation so that when removing the
+    _syncGrab: function() {
+        // We delay grab changes during animation so that when removing the
         // overview we don't have a problem with the release of a press/release
         // going to an application.
         if (this.animationInProgress)
-            return;
+            return true;
 
         if (this._shown) {
-            if (!this._modal) {
-                if (Main.pushModal(this._overview,
-                                   { keybindingMode: Main.KeybindingMode.OVERVIEW }))
-                    this._modal = true;
-                else
-                    this.hide();
+            let shouldBeModal = !this._inXdndDrag;
+            if (shouldBeModal) {
+                if (!this._modal) {
+                    if (Main.pushModal(this._overview,
+                                       { keybindingMode: Shell.KeyBindingMode.OVERVIEW })) {
+                        this._modal = true;
+                    } else {
+                        this.hide();
+                        return false;
+                    }
+                }
             }
-        } else if (this._shownTemporarily) {
-            if (this._modal) {
-                Main.popModal(this._overview);
-                this._modal = false;
-            }
-            global.stage_input_mode = Shell.StageInputMode.FULLSCREEN;
         } else {
             if (this._modal) {
                 Main.popModal(this._overview);
                 this._modal = false;
             }
-            else if (global.stage_input_mode == Shell.StageInputMode.FULLSCREEN)
-                global.stage_input_mode = Shell.StageInputMode.NORMAL;
         }
+        return true;
     },
 
     _animateNotVisible: function() {
@@ -602,24 +627,19 @@ const Overview = new Lang.Class({
             return;
 
         this.animationInProgress = true;
-        this._hideInProgress = true;
+        this.visibleTarget = false;
 
         this._viewSelector.zoomFromOverview();
 
         // Make other elements fade out.
-        Tweener.addTween(this._overview,
+        Tweener.addTween(this._stack,
                          { opacity: 0,
                            transition: 'easeOutQuad',
                            time: ANIMATION_TIME,
                            onComplete: this._hideDone,
                            onCompleteScope: this
                          });
-
-        Tweener.addTween(this._background,
-                         { dim_factor: 1.0,
-                           time: ANIMATION_TIME,
-                           transition: 'easeOutQuad'
-                         });
+        this._unshadeBackgrounds();
 
         this._coverPane.raise_top();
         this._coverPane.show();
@@ -633,10 +653,10 @@ const Overview = new Lang.Class({
 
         this.emit('shown');
         // Handle any calls to hide* while we were showing
-        if (!this._shown && !this._shownTemporarily)
+        if (!this._shown)
             this._animateNotVisible();
 
-        this._syncInputMode();
+        this._syncGrab();
         global.sync_pointer();
     },
 
@@ -644,25 +664,21 @@ const Overview = new Lang.Class({
         // Re-enable unredirection
         Meta.enable_unredirect_for_screen(global.screen);
 
-        global.window_group.show();
-
         this._viewSelector.hide();
         this._desktopFade.hide();
-        this._background.hide();
-        this._overview.hide();
+        this._coverPane.hide();
 
         this.visible = false;
         this.animationInProgress = false;
-        this._hideInProgress = false;
-
-        this._coverPane.hide();
 
         this.emit('hidden');
         // Handle any calls to show* while we were hiding
-        if (this._shown || this._shownTemporarily)
+        if (this._shown)
             this._animateVisible();
+        else
+            Main.layoutManager.hideOverview();
 
-        this._syncInputMode();
+        this._syncGrab();
 
         // Fake a pointer event if requested
         if (this._needsFakePointerEvent) {

js/ui/overviewControls.js

@@ -0,0 +1,603 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const GObject = imports.gi.GObject;
+const Clutter = imports.gi.Clutter;
+const Lang = imports.lang;
+const Meta = imports.gi.Meta;
+const St = imports.gi.St;
+const Shell = imports.gi.Shell;
+
+const Dash = imports.ui.dash;
+const Main = imports.ui.main;
+const Params = imports.misc.params;
+const Tweener = imports.ui.tweener;
+const ViewSelector = imports.ui.viewSelector;
+const WorkspaceThumbnail = imports.ui.workspaceThumbnail;
+
+const SIDE_CONTROLS_ANIMATION_TIME = 0.16;
+
+function getRtlSlideDirection(direction, actor) {
+    let rtl = (actor.text_direction == Clutter.TextDirection.RTL);
+    if (rtl)
+        direction = (direction == SlideDirection.LEFT) ?
+            SlideDirection.RIGHT : SlideDirection.LEFT;
+
+    return direction;
+};
+
+const SlideDirection = {
+    LEFT: 0,
+    RIGHT: 1
+};
+
+const SlideLayout = new Lang.Class({
+    Name: 'SlideLayout',
+    Extends: Clutter.FixedLayout,
+
+    _init: function(params) {
+        this._slideX = 1;
+        this._direction = SlideDirection.LEFT;
+
+        this.parent(params);
+    },
+
+    vfunc_get_preferred_width: function(container, forHeight) {
+        let child = container.get_first_child();
+
+        let [minWidth, natWidth] = child.get_preferred_width(forHeight);
+
+        minWidth *= this._slideX;
+        natWidth *= this._slideX;
+
+        return [minWidth, natWidth];
+    },
+
+    vfunc_allocate: function(container, box, flags) {
+        let child = container.get_first_child();
+
+        let [, , natWidth, natHeight] = child.get_preferred_size();
+        let availWidth = Math.round(box.x2 - box.x1);
+        let availHeight = Math.round(box.y2 - box.y1);
+
+        let realDirection = getRtlSlideDirection(this._direction, child);
+        let translationX = (realDirection == SlideDirection.LEFT) ?
+            (availWidth - natWidth) : (natWidth - availWidth);
+
+        let actorBox = new Clutter.ActorBox({ x1: translationX,
+                                              y1: 0,
+                                              x2: child.x_expand ? availWidth : natWidth,
+                                              y2: child.y_expand ? availHeight : natHeight });
+
+        child.allocate(actorBox, flags);
+    },
+
+    set slideX(value) {
+        this._slideX = value;
+        this.layout_changed();
+    },
+
+    get slideX() {
+        return this._slideX;
+    },
+
+    set slideDirection(direction) {
+        this._direction = direction;
+        this.layout_changed();
+    },
+
+    get slideDirection() {
+        return this._direction;
+    }
+});
+
+const SlidingControl = new Lang.Class({
+    Name: 'SlidingControl',
+
+    _init: function(params) {
+        params = Params.parse(params, { slideDirection: SlideDirection.LEFT });
+
+        this.visible = true;
+        this.inDrag = false;
+
+        this.layout = new SlideLayout();
+        this.layout.slideDirection = params.slideDirection;
+        this.actor = new St.Widget({ layout_manager: this.layout,
+                                     style_class: 'overview-controls',
+                                     clip_to_allocation: true });
+
+        Main.overview.connect('showing', Lang.bind(this, this._onOverviewShowing));
+
+        Main.overview.connect('item-drag-begin', Lang.bind(this, this._onDragBegin));
+        Main.overview.connect('item-drag-end', Lang.bind(this, this._onDragEnd));
+        Main.overview.connect('item-drag-cancelled', Lang.bind(this, this._onDragEnd));
+
+        Main.overview.connect('window-drag-begin', Lang.bind(this, this._onWindowDragBegin));
+        Main.overview.connect('window-drag-cancelled', Lang.bind(this, this._onWindowDragEnd));
+        Main.overview.connect('window-drag-end', Lang.bind(this, this._onWindowDragEnd));
+    },
+
+    getSlide: function() {
+        throw new Error('getSlide() must be overridden');
+    },
+
+    updateSlide: function() {
+        Tweener.addTween(this.layout, { slideX: this.getSlide(),
+                                        time: SIDE_CONTROLS_ANIMATION_TIME,
+                                        transition: 'easeOutQuad' });
+    },
+
+    getVisibleWidth: function() {
+        let child = this.actor.get_first_child();
+        let [, , natWidth, ] = child.get_preferred_size();
+        return natWidth;
+    },
+
+    _getTranslation: function() {
+        let child = this.actor.get_first_child();
+        let direction = getRtlSlideDirection(this.layout.slideDirection, child);
+        let visibleWidth = this.getVisibleWidth();
+
+        if (direction == SlideDirection.LEFT)
+            return - visibleWidth;
+        else
+            return visibleWidth;
+    },
+
+    _updateTranslation: function() {
+        let translationStart = 0;
+        let translationEnd = 0;
+        let translation = this._getTranslation();
+
+        if (this.visible) {
+            translationStart = translation;
+        } else {
+            translationEnd = translation;
+        }
+
+        if (this.actor.translation_x == translationEnd)
+            return;
+
+        this.actor.translation_x = translationStart;
+        Tweener.addTween(this.actor, { translation_x: translationEnd,
+                                       time: SIDE_CONTROLS_ANIMATION_TIME,
+                                       transition: 'easeOutQuad'
+                                     });
+    },
+
+    _onOverviewShowing: function() {
+        // reset any translation and make sure the actor is visible when
+        // entering the overview
+        this.visible = true;
+        this.layout.slideX = this.getSlide();
+        this.actor.translation_x = 0;
+    },
+
+    _onWindowDragBegin: function() {
+        this._onDragBegin();
+    },
+
+    _onWindowDragEnd: function() {
+        this._onDragEnd();
+    },
+
+    _onDragBegin: function() {
+        this.inDrag = true;
+        this.actor.translation_x = 0;
+        this.updateSlide();
+    },
+
+    _onDragEnd: function() {
+        this.inDrag = false;
+        this.updateSlide();
+    },
+
+    fadeIn: function() {
+        Tweener.addTween(this.actor, { opacity: 255,
+                                       time: SIDE_CONTROLS_ANIMATION_TIME / 2,
+                                       transition: 'easeInQuad'
+                                     });
+    },
+
+    fadeHalf: function() {
+        Tweener.addTween(this.actor, { opacity: 128,
+                                       time: SIDE_CONTROLS_ANIMATION_TIME / 2,
+                                       transition: 'easeOutQuad'
+                                     });
+    },
+
+    slideIn: function() {
+        this.visible = true;
+        // we will update slideX and the translation from pageEmpty
+    },
+
+    slideOut: function() {
+        this.visible = false;
+        this._updateTranslation();
+        // we will update slideX from pageEmpty
+    },
+
+    pageEmpty: function() {
+        // When pageEmpty is received, there's no visible view in the
+        // selector; this means we can now safely set the full slide for
+        // the next page, since slideIn or slideOut might have been called,
+        // changing the visiblity
+        this.layout.slideX = this.getSlide();
+        this._updateTranslation();
+    }
+});
+
+const ThumbnailsSlider = new Lang.Class({
+    Name: 'ThumbnailsSlider',
+    Extends: SlidingControl,
+
+    _init: function(thumbnailsBox) {
+        this.parent({ slideDirection: SlideDirection.RIGHT });
+
+        this._thumbnailsBox = thumbnailsBox;
+
+        // SlideLayout reads the actor's expand flags to decide
+        // whether to allocate the natural size to its child, or the whole
+        // available allocation
+        this._thumbnailsBox.actor.y_expand = true;
+
+        this.actor.request_mode = Clutter.RequestMode.WIDTH_FOR_HEIGHT;
+        this.actor.reactive = true;
+        this.actor.track_hover = true;
+        this.actor.add_actor(this._thumbnailsBox.actor);
+
+        Main.layoutManager.connect('monitors-changed', Lang.bind(this, this.updateSlide));
+        this.actor.connect('notify::hover', Lang.bind(this, this.updateSlide));
+        this._thumbnailsBox.actor.bind_property('visible', this.actor, 'visible', GObject.BindingFlags.SYNC_CREATE);
+    },
+
+    _getAlwaysZoomOut: function() {
+        // Always show the pager when hover, during a drag, or if workspaces are
+        // actually used, e.g. there are windows on more than one
+        let alwaysZoomOut = this.actor.hover || this.inDrag || !Meta.prefs_get_dynamic_workspaces() || global.screen.n_workspaces > 2;
+
+        if (!alwaysZoomOut) {
+            let monitors = Main.layoutManager.monitors;
+            let primary = Main.layoutManager.primaryMonitor;
+
+            /* Look for any monitor to the right of the primary, if there is
+             * one, we always keep zoom out, otherwise its hard to reach
+             * the thumbnail area without passing into the next monitor. */
+            for (let i = 0; i < monitors.length; i++) {
+                if (monitors[i].x >= primary.x + primary.width) {
+                    alwaysZoomOut = true;
+                    break;
+                }
+            }
+        }
+
+        return alwaysZoomOut;
+    },
+
+    getNonExpandedWidth: function() {
+        let child = this.actor.get_first_child();
+        return child.get_theme_node().get_length('visible-width');
+    },
+
+    getSlide: function() {
+        if (!this.visible)
+            return 0;
+
+        let alwaysZoomOut = this._getAlwaysZoomOut();
+        if (alwaysZoomOut)
+            return 1;
+
+        let child = this.actor.get_first_child();
+        let preferredHeight = child.get_preferred_height(-1)[1];
+        let expandedWidth = child.get_preferred_width(preferredHeight)[1];
+
+        return this.getNonExpandedWidth() / expandedWidth;
+    },
+
+    getVisibleWidth: function() {
+        let alwaysZoomOut = this._getAlwaysZoomOut();
+        if (alwaysZoomOut)
+            return this.parent();
+        else
+            return this.getNonExpandedWidth();
+    }
+});
+
+const DashSlider = new Lang.Class({
+    Name: 'DashSlider',
+    Extends: SlidingControl,
+
+    _init: function(dash) {
+        this.parent({ slideDirection: SlideDirection.LEFT });
+
+        this._dash = dash;
+
+        // SlideLayout reads the actor's expand flags to decide
+        // whether to allocate the natural size to its child, or the whole
+        // available allocation
+        this._dash.actor.x_expand = true;
+        this._dash.actor.y_expand = true;
+
+        this.actor.x_align = Clutter.ActorAlign.START;
+        this.actor.y_expand = true;
+
+        this.actor.add_actor(this._dash.actor);
+
+        this._dash.connect('icon-size-changed', Lang.bind(this, this.updateSlide));
+    },
+
+    getSlide: function() {
+        if (this.visible || this.inDrag)
+            return 1;
+        else
+            return 0;
+    },
+
+    _onWindowDragBegin: function() {
+        this.fadeHalf();
+    },
+
+    _onWindowDragEnd: function() {
+        this.fadeIn();
+    }
+});
+
+const DashSpacer = new Lang.Class({
+    Name: 'DashSpacer',
+    Extends: St.Widget,
+
+    _init: function(params) {
+        this.parent(params);
+
+        this._bindConstraint = null;
+    },
+
+    setDashActor: function(dashActor) {
+        if (this._bindConstraint) {
+            this.remove_constraint(this._bindConstraint);
+            this._bindConstraint = null;
+        }
+
+        if (dashActor) {
+            this._bindConstraint = new Clutter.BindConstraint({ source: dashActor,
+                                                                coordinate: Clutter.BindCoordinate.SIZE });
+            this.add_constraint(this._bindConstraint);
+        }
+    },
+
+    vfunc_get_preferred_width: function(forHeight) {
+        let box = this.get_allocation_box();
+        let minWidth = this.parent(forHeight)[0];
+        let natWidth = box.x2 - box.x1;
+        return [minWidth, natWidth];
+    },
+
+    vfunc_get_preferred_height: function(forWidth) {
+        let box = this.get_allocation_box();
+        let minHeight = this.parent(forWidth)[0];
+        let natHeight = box.y2 - box.y1;
+        return [minHeight, natHeight];
+    }
+});
+
+const MessagesIndicator = new Lang.Class({
+    Name: 'MessagesIndicator',
+
+    _init: function(viewSelector) {
+        this._count = 0;
+        this._sources = [];
+        this._viewSelector = viewSelector;
+
+        this._container = new St.BoxLayout({ style_class: 'messages-indicator-contents',
+                                             reactive: true,
+                                             track_hover: true,
+                                             x_expand: true,
+                                             y_expand: true,
+                                             x_align: Clutter.ActorAlign.CENTER });
+
+        this._icon = new St.Icon({ icon_name: 'user-idle-symbolic',
+                                   icon_size: 16 });
+        this._container.add_actor(this._icon);
+
+        this._label = new St.Label();
+        this._container.add_actor(this._label);
+
+        this._highlight = new St.Widget({ style_class: 'messages-indicator-highlight',
+                                          x_expand: true,
+                                          y_expand: true,
+                                          y_align: Clutter.ActorAlign.END,
+                                          visible: false });
+
+        this._container.connect('notify::hover', Lang.bind(this,
+            function() {
+                this._highlight.visible = this._container.hover;
+            }));
+
+        let clickAction = new Clutter.ClickAction();
+        this._container.add_action(clickAction);
+        clickAction.connect('clicked', Lang.bind(this,
+            function() {
+                Main.messageTray.openTray();
+            }));
+
+        Main.messageTray.connect('showing', Lang.bind(this,
+            function() {
+                this._highlight.visible = false;
+                this._container.hover = false;
+            }));
+
+        let layout = new Clutter.BinLayout();
+        this.actor = new St.Widget({ layout_manager: layout,
+                                     style_class: 'messages-indicator',
+                                     y_expand: true,
+                                     y_align: Clutter.ActorAlign.END,
+                                     visible: false });
+        this.actor.add_actor(this._container);
+        this.actor.add_actor(this._highlight);
+
+        Main.messageTray.connect('source-added', Lang.bind(this, this._onSourceAdded));
+        Main.messageTray.connect('source-removed', Lang.bind(this, this._onSourceRemoved));
+
+        let sources = Main.messageTray.getSources();
+        sources.forEach(Lang.bind(this, function(source) { this._onSourceAdded(null, source); }));
+
+        this._viewSelector.connect('page-changed', Lang.bind(this, this._updateVisibility));
+        Main.overview.connect('showing', Lang.bind(this, this._updateVisibility));
+    },
+
+    _onSourceAdded: function(tray, source) {
+        if (source.trayIcon)
+            return;
+
+        if (source.isTransient)
+            return;
+
+        source.connect('count-updated', Lang.bind(this, this._updateCount));
+        this._sources.push(source);
+        this._updateCount();
+    },
+
+    _onSourceRemoved: function(tray, source) {
+        this._sources.splice(this._sources.indexOf(source), 1);
+        this._updateCount();
+    },
+
+    _updateCount: function() {
+        let count = 0;
+        let hasChats = false;
+        this._sources.forEach(Lang.bind(this,
+            function(source) {
+                count += source.indicatorCount;
+                hasChats |= source.isChat;
+            }));
+
+        this._count = count;
+        this._label.text = ngettext("%d new message",
+                                    "%d new messages",
+                                   count).format(count);
+
+        this._icon.visible = hasChats;
+        this._updateVisibility();
+    },
+
+    _updateVisibility: function() {
+        let activePage = this._viewSelector.getActivePage();
+        let visible = ((this._count > 0) && (activePage == ViewSelector.ViewPage.WINDOWS));
+
+        this.actor.visible = visible;
+    }
+});
+
+const ControlsManager = new Lang.Class({
+    Name: 'ControlsManager',
+
+    _init: function(searchEntry) {
+        this.dash = new Dash.Dash();
+        this._dashSlider = new DashSlider(this.dash);
+        this._dashSpacer = new DashSpacer();
+        this._dashSpacer.setDashActor(this._dashSlider.actor);
+
+        this._thumbnailsBox = new WorkspaceThumbnail.ThumbnailsBox();
+        this._thumbnailsSlider = new ThumbnailsSlider(this._thumbnailsBox);
+
+        this.viewSelector = new ViewSelector.ViewSelector(searchEntry,
+                                                          this.dash.showAppsButton);
+        this.viewSelector.connect('page-changed', Lang.bind(this, this._setVisibility));
+        this.viewSelector.connect('page-empty', Lang.bind(this, this._onPageEmpty));
+
+        this._indicator = new MessagesIndicator(this.viewSelector);
+        this.indicatorActor = this._indicator.actor;
+
+        this.actor = new St.Widget({ layout_manager: new Clutter.BinLayout(),
+                                     reactive: true,
+                                     x_expand: true, y_expand: true,
+                                     clip_to_allocation: true });
+        this._group = new St.BoxLayout({ name: 'overview-group',
+                                        x_expand: true, y_expand: true });
+        this.actor.add_actor(this._group);
+
+        this.actor.add_actor(this._dashSlider.actor);
+
+        this._group.add_actor(this._dashSpacer);
+        this._group.add(this.viewSelector.actor, { x_fill: true,
+                                                   expand: true });
+        this._group.add_actor(this._thumbnailsSlider.actor);
+
+        this._group.connect('notify::allocation', Lang.bind(this, this._updateWorkspacesGeometry));
+
+        Main.overview.connect('showing', Lang.bind(this, this._updateSpacerVisibility));
+        Main.overview.connect('item-drag-begin', Lang.bind(this,
+            function() {
+                let activePage = this.viewSelector.getActivePage();
+                if (activePage != ViewSelector.ViewPage.WINDOWS)
+                    this.viewSelector.fadeHalf();
+            }));
+        Main.overview.connect('item-drag-end', Lang.bind(this,
+            function() {
+                this.viewSelector.fadeIn();
+            }));
+        Main.overview.connect('item-drag-cancelled', Lang.bind(this,
+            function() {
+                this.viewSelector.fadeIn();
+            }));
+    },
+
+    _updateWorkspacesGeometry: function() {
+        let [x, y] = this.actor.get_transformed_position();
+        let [width, height] = this.actor.get_transformed_size();
+        let geometry = { x: x, y: y, width: width, height: height };
+
+        let spacing = this.actor.get_theme_node().get_length('spacing');
+        let dashWidth = this._dashSlider.getVisibleWidth() + spacing;
+        let thumbnailsWidth = this._thumbnailsSlider.getNonExpandedWidth() + spacing;
+
+        geometry.width -= dashWidth;
+        geometry.width -= thumbnailsWidth;
+
+        if (this.actor.get_text_direction() == Clutter.TextDirection.LTR)
+            geometry.x += dashWidth;
+        else
+            geometry.x += thumbnailsWidth;
+
+        this.viewSelector.setWorkspacesFullGeometry(geometry);
+    },
+
+    _setVisibility: function() {
+        // Ignore the case when we're leaving the overview, since
+        // actors will be made visible again when entering the overview
+        // next time, and animating them while doing so is just
+        // unnecessary noise
+        if (!Main.overview.visible ||
+            (Main.overview.animationInProgress && !Main.overview.visibleTarget))
+            return;
+
+        let activePage = this.viewSelector.getActivePage();
+        let dashVisible = (activePage == ViewSelector.ViewPage.WINDOWS ||
+                           activePage == ViewSelector.ViewPage.APPS);
+        let thumbnailsVisible = (activePage == ViewSelector.ViewPage.WINDOWS);
+
+        if (dashVisible)
+            this._dashSlider.slideIn();
+        else
+            this._dashSlider.slideOut();
+
+        if (thumbnailsVisible)
+            this._thumbnailsSlider.slideIn();
+        else
+            this._thumbnailsSlider.slideOut();
+    },
+
+    _updateSpacerVisibility: function() {
+        if (Main.overview.animationInProgress && !Main.overview.visibleTarget)
+            return;
+
+        let activePage = this.viewSelector.getActivePage();
+        this._dashSpacer.visible = (activePage == ViewSelector.ViewPage.WINDOWS);
+    },
+
+    _onPageEmpty: function() {
+        this._dashSlider.pageEmpty();
+        this._thumbnailsSlider.pageEmpty();
+
+        this._updateSpacerVisibility();
+    }
+});

js/ui/panel.js

@@ -15,13 +15,14 @@ const Signals = imports.signals;
 const Atk = imports.gi.Atk;
 
 
+const Animation = imports.ui.animation;
 const Config = imports.misc.config;
 const CtrlAltTab = imports.ui.ctrlAltTab;
 const DND = imports.ui.dnd;
-const Layout = imports.ui.layout;
 const Overview = imports.ui.overview;
 const PopupMenu = imports.ui.popupMenu;
 const PanelMenu = imports.ui.panelMenu;
+const RemoteMenu = imports.ui.remoteMenu;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
 
@@ -29,7 +30,6 @@ const PANEL_ICON_SIZE = 24;
 
 const BUTTON_DND_ACTIVATION_TIMEOUT = 250;
 
-const ANIMATED_ICON_UPDATE_TIMEOUT = 100;
 const SPINNER_ANIMATION_TIME = 0.2;
 
 // To make sure the panel corners blend nicely with the panel,
@@ -75,81 +75,6 @@ function _unpremultiply(color) {
                                blue: blue, alpha: color.alpha });
 };
 
-const Animation = new Lang.Class({
-    Name: 'Animation',
-
-    _init: function(filename, width, height, speed) {
-        this.actor = new St.Bin();
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-        this._speed = speed;
-
-        this._isLoaded = false;
-        this._isPlaying = false;
-        this._timeoutId = 0;
-        this._frame = 0;
-        this._animations = St.TextureCache.get_default().load_sliced_image (filename, width, height,
-                                                                            Lang.bind(this, this._animationsLoaded));
-        this.actor.set_child(this._animations);
-    },
-
-    play: function() {
-        if (this._isLoaded && this._timeoutId == 0) {
-            if (this._frame == 0)
-                this._showFrame(0);
-
-            this._timeoutId = Mainloop.timeout_add(this._speed, Lang.bind(this, this._update));
-        }
-
-        this._isPlaying = true;
-    },
-
-    stop: function() {
-        if (this._timeoutId > 0) {
-            Mainloop.source_remove(this._timeoutId);
-            this._timeoutId = 0;
-        }
-
-        this._isPlaying = false;
-    },
-
-    _showFrame: function(frame) {
-        let oldFrameActor = this._animations.get_child_at_index(this._frame);
-        if (oldFrameActor)
-            oldFrameActor.hide();
-
-        this._frame = (frame % this._animations.get_n_children());
-
-        let newFrameActor = this._animations.get_child_at_index(this._frame);
-        if (newFrameActor)
-            newFrameActor.show();
-    },
-
-    _update: function() {
-        this._showFrame(this._frame + 1);
-        return true;
-    },
-
-    _animationsLoaded: function() {
-        this._isLoaded = true;
-
-        if (this._isPlaying)
-            this.play();
-    },
-
-    _onDestroy: function() {
-        this.stop();
-    }
-});
-
-const AnimatedIcon = new Lang.Class({
-    Name: 'AnimatedIcon',
-    Extends: Animation,
-
-    _init: function(name, size) {
-        this.parent(global.datadir + '/theme/' + name, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
-    }
-});
-
 const TextShadower = new Lang.Class({
     Name: 'TextShadower',
 
@@ -203,7 +128,7 @@ const TextShadower = new Lang.Class({
             let child = children[i];
             let childBox = new Clutter.ActorBox();
             // The order of the labels here is arbitrary, except
-            // we know the "real" label is at the end because Clutter.Group
+            // we know the "real" label is at the end because Clutter.Actor
             // sorts by Z order
             switch (i) {
                 case 0: // top
@@ -259,6 +184,7 @@ const AppMenuButton = new Lang.Class({
         this._actionGroupNotifyId = 0;
 
         let bin = new St.Bin({ name: 'appMenu' });
+        bin.connect('style-changed', Lang.bind(this, this._onStyleChanged));
         this.actor.add_actor(bin);
 
         this.actor.bind_property("reactive", this.actor, "can-focus", 0);
@@ -289,33 +215,31 @@ const AppMenuButton = new Lang.Class({
         this._visible = !Main.overview.visible;
         if (!this._visible)
             this.actor.hide();
-        Main.overview.connect('hiding', Lang.bind(this, function () {
+        this._overviewHidingId = Main.overview.connect('hiding', Lang.bind(this, function () {
             this.show();
         }));
-        Main.overview.connect('showing', Lang.bind(this, function () {
+        this._overviewShowingId = Main.overview.connect('showing', Lang.bind(this, function () {
             this.hide();
         }));
 
         this._stop = true;
 
-        this._spinner = new AnimatedIcon('process-working.svg',
-                                         PANEL_ICON_SIZE);
-        this._container.add_actor(this._spinner.actor);
-        this._spinner.actor.hide();
-        this._spinner.actor.lower_bottom();
+        this._spinner = null;
 
         let tracker = Shell.WindowTracker.get_default();
         let appSys = Shell.AppSystem.get_default();
-        tracker.connect('notify::focus-app', Lang.bind(this, this._focusAppChanged));
-        appSys.connect('app-state-changed', Lang.bind(this, this._onAppStateChanged));
-
-        global.window_manager.connect('switch-workspace', Lang.bind(this, this._sync));
+        this._focusAppNotifyId =
+            tracker.connect('notify::focus-app', Lang.bind(this, this._focusAppChanged));
+        this._appStateChangedSignalId =
+            appSys.connect('app-state-changed', Lang.bind(this, this._onAppStateChanged));
+        this._switchWorkspaceNotifyId =
+            global.window_manager.connect('switch-workspace', Lang.bind(this, this._sync));
 
         this._sync();
     },
 
     show: function() {
-        if (this._visible || Main.screenShield.locked)
+        if (this._visible)
             return;
 
         this._visible = true;
@@ -355,19 +279,34 @@ const AppMenuButton = new Lang.Class({
                            onCompleteScope: this });
     },
 
+    _onStyleChanged: function(actor) {
+        let node = actor.get_theme_node();
+        let [success, icon] = node.lookup_url('spinner-image', false);
+        if (!success || this._spinnerIcon == icon)
+            return;
+        this._spinnerIcon = icon;
+        this._spinner = new Animation.AnimatedIcon(this._spinnerIcon, PANEL_ICON_SIZE);
+        this._container.add_actor(this._spinner.actor);
+        this._spinner.actor.hide();
+        this._spinner.actor.lower_bottom();
+    },
+
     _onIconBoxStyleChanged: function() {
         let node = this._iconBox.get_theme_node();
         this._iconBottomClip = node.get_length('app-icon-bottom-clip');
         this._updateIconBoxClip();
     },
 
+    _syncIcon: function() {
+        let icon = this._targetApp.get_faded_icon(2 * PANEL_ICON_SIZE, this._iconBox.text_direction);
+        this._iconBox.set_child(icon);
+    },
+
     _onIconThemeChanged: function() {
         if (this._iconBox.child == null)
             return;
 
-        this._iconBox.child.destroy();
-        let icon = this._targetApp.get_faded_icon(2 * PANEL_ICON_SIZE);
-        this._iconBox.set_child(icon);
+        this._syncIcon();
     },
 
     _updateIconBoxClip: function() {
@@ -386,6 +325,10 @@ const AppMenuButton = new Lang.Class({
 
         this._stop = true;
         this.actor.reactive = true;
+
+        if (this._spinner == null)
+            return;
+
         Tweener.addTween(this._spinner.actor,
                          { opacity: 0,
                            time: SPINNER_ANIMATION_TIME,
@@ -402,6 +345,10 @@ const AppMenuButton = new Lang.Class({
     startAnimation: function() {
         this._stop = false;
         this.actor.reactive = false;
+
+        if (this._spinner == null)
+            return;
+
         this._spinner.play();
         this._spinner.actor.show();
     },
@@ -464,6 +411,9 @@ const AppMenuButton = new Lang.Class({
         }
         this._label.actor.allocate(childBox, flags);
 
+        if (this._spinner == null)
+            return;
+
         if (direction == Clutter.TextDirection.LTR) {
             childBox.x1 = Math.floor(iconWidth / 2) + this._label.actor.width;
             childBox.x2 = childBox.x1 + this._spinner.actor.width;
@@ -502,7 +452,7 @@ const AppMenuButton = new Lang.Class({
             // If the app has just lost focus to the panel, pretend
             // nothing happened; otherwise you can't keynav to the
             // app menu.
-            if (global.stage_input_mode == Shell.StageInputMode.FOCUSED)
+            if (global.stage.key_focus != null)
                 return;
         }
         this._sync();
@@ -547,14 +497,20 @@ const AppMenuButton = new Lang.Class({
         }
 
         if (targetApp == this._targetApp) {
-            if (targetApp && targetApp.get_state() != Shell.AppState.STARTING) {
+            if (targetApp &&
+                targetApp.get_state() != Shell.AppState.STARTING &&
+                targetApp.get_state() != Shell.AppState.BUSY) {
                 this.stopAnimation();
                 this._maybeSetMenu();
+            } else if (targetApp &&
+                       targetApp.get_state() == Shell.AppState.BUSY) {
+                this.startAnimation();
             }
             return;
         }
 
-        this._spinner.actor.hide();
+        if (this._spinner)
+            this._spinner.actor.hide();
         if (this._iconBox.child != null)
             this._iconBox.child.destroy();
         this._iconBox.hide();
@@ -573,15 +529,14 @@ const AppMenuButton = new Lang.Class({
         }
 
         this._targetApp = targetApp;
-        let icon = targetApp.get_faded_icon(2 * PANEL_ICON_SIZE);
-
         this._label.setText(targetApp.get_name());
         this.setName(targetApp.get_name());
 
-        this._iconBox.set_child(icon);
+        this._syncIcon();
         this._iconBox.show();
 
-        if (targetApp.get_state() == Shell.AppState.STARTING)
+        if (targetApp.get_state() == Shell.AppState.STARTING ||
+            targetApp.get_state() == Shell.AppState.BUSY)
             this.startAnimation();
         else
             this._maybeSetMenu();
@@ -593,11 +548,11 @@ const AppMenuButton = new Lang.Class({
         let menu;
 
         if (this._targetApp.action_group && this._targetApp.menu) {
-            if (this.menu instanceof PopupMenu.RemoteMenu &&
+            if (this.menu instanceof RemoteMenu.RemoteMenu &&
                 this.menu.actionGroup == this._targetApp.action_group)
                 return;
 
-            menu = new PopupMenu.RemoteMenu(this.actor, this._targetApp.menu, this._targetApp.action_group);
+            menu = new RemoteMenu.RemoteMenu(this.actor, this._targetApp.menu, this._targetApp.action_group);
             menu.connect('activate', Lang.bind(this, function() {
                 let win = this._targetApp.get_windows()[0];
                 win.check_alive(global.get_current_time());
@@ -617,6 +572,33 @@ const AppMenuButton = new Lang.Class({
 
         this.setMenu(menu);
         this._menuManager.addMenu(menu);
+    },
+
+    destroy: function() {
+        if (this._appStateChangedSignalId > 0) {
+            let appSys = Shell.AppSystem.get_default();
+            appSys.disconnect(this._appStateChangedSignalId);
+            this._appStateChangedSignalId = 0;
+        }
+        if (this._focusAppNotifyId > 0) {
+            let tracker = Shell.WindowTracker.get_default();
+            tracker.disconnect(this._focusAppNotifyId);
+            this._focusAppNotifyId = 0;
+        }
+        if (this._overviewHidingId > 0) {
+            Main.overview.disconnect(this._overviewHidingId);
+            this._overviewHidingId = 0;
+        }
+        if (this._overviewShowingId > 0) {
+            Main.overview.disconnect(this._overviewShowingId);
+            this._overviewShowingId = 0;
+        }
+        if (this._switchWorkspaceNotifyId > 0) {
+            global.window_manager.disconnect(this._switchWorkspaceNotifyId);
+            this._switchWorkspaceNotifyId = 0;
+        }
+
+        this.parent();
     }
 });
 
@@ -630,23 +612,15 @@ const ActivitiesButton = new Lang.Class({
         this.parent(0.0, null, true);
         this.actor.accessible_role = Atk.Role.TOGGLE_BUTTON;
 
-        let container = new Shell.GenericContainer();
-        container.connect('get-preferred-width', Lang.bind(this, this._containerGetPreferredWidth));
-        container.connect('get-preferred-height', Lang.bind(this, this._containerGetPreferredHeight));
-        container.connect('allocate', Lang.bind(this, this._containerAllocate));
-        this.actor.add_actor(container);
         this.actor.name = 'panelActivities';
 
         /* Translators: If there is no suitable word for "Activities"
            in your language, you can use the word for "Overview". */
         this._label = new St.Label({ text: _("Activities") });
-        container.add_actor(this._label);
+        this.actor.add_actor(this._label);
 
         this.actor.label_actor = this._label;
 
-        this.hotCorner = new Layout.HotCorner();
-        container.add_actor(this.hotCorner.actor);
-
         this.actor.connect('captured-event', Lang.bind(this, this._onCapturedEvent));
         this.actor.connect_after('button-release-event', Lang.bind(this, this._onButtonRelease));
         this.actor.connect_after('key-release-event', Lang.bind(this, this._onKeyRelease));
@@ -661,44 +635,6 @@ const ActivitiesButton = new Lang.Class({
         }));
 
         this._xdndTimeOut = 0;
-
-        // Since the hot corner uses stage coordinates, Clutter won't
-        // queue relayouts for us when the panel moves. Queue a relayout
-        // when that happens.
-        Main.layoutManager.connect('panel-box-changed', Lang.bind(this, function() {
-            container.queue_relayout();
-        }));
-    },
-
-    _containerGetPreferredWidth: function(actor, forHeight, alloc) {
-        [alloc.min_size, alloc.natural_size] = this._label.get_preferred_width(forHeight);
-    },
-
-    _containerGetPreferredHeight: function(actor, forWidth, alloc) {
-        [alloc.min_size, alloc.natural_size] = this._label.get_preferred_height(forWidth);
-    },
-
-    _containerAllocate: function(actor, box, flags) {
-        this._label.allocate(box, flags);
-
-        // The hot corner needs to be outside any padding/alignment
-        // that has been imposed on us
-        let primary = Main.layoutManager.primaryMonitor;
-        let hotBox = new Clutter.ActorBox();
-        let ok, x, y;
-        if (actor.get_text_direction() == Clutter.TextDirection.LTR) {
-            [ok, x, y] = actor.transform_stage_point(primary.x, primary.y)
-        } else {
-            [ok, x, y] = actor.transform_stage_point(primary.x + primary.width, primary.y);
-            // hotCorner.actor has northeast gravity, so we don't need
-            // to adjust x for its width
-        }
-
-        hotBox.x1 = Math.round(x);
-        hotBox.x2 = hotBox.x1 + this.hotCorner.actor.width;
-        hotBox.y1 = Math.round(y);
-        hotBox.y2 = hotBox.y1 + this.hotCorner.actor.height;
-        this.hotCorner.actor.allocate(hotBox, flags);
     },
 
     handleDragOver: function(source, actor, x, y, time) {
@@ -708,14 +644,14 @@ const ActivitiesButton = new Lang.Class({
         if (this._xdndTimeOut != 0)
             Mainloop.source_remove(this._xdndTimeOut);
         this._xdndTimeOut = Mainloop.timeout_add(BUTTON_DND_ACTIVATION_TIMEOUT,
-                                                 Lang.bind(this, this._xdndShowOverview, actor));
+                                                 Lang.bind(this, this._xdndToggleOverview, actor));
 
         return DND.DragMotionResult.CONTINUE;
     },
 
     _onCapturedEvent: function(actor, event) {
         if (event.type() == Clutter.EventType.BUTTON_PRESS) {
-            if (!this.hotCorner.shouldToggleOverviewOnClick())
+            if (!Main.overview.shouldToggleByCornerOrButton())
                 return true;
         }
         return false;
@@ -732,16 +668,12 @@ const ActivitiesButton = new Lang.Class({
         }
     },
 
-    _xdndShowOverview: function(actor) {
+    _xdndToggleOverview: function(actor) {
         let [x, y, mask] = global.get_pointer();
         let pickedActor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, x, y);
 
-        if (pickedActor == this.actor) {
-            if (!Main.overview.visible && !Main.overview.animationInProgress) {
-                Main.overview.showTemporarily();
-                Main.overview.beginItemDrag(actor);
-            }
-        }
+        if (pickedActor == this.actor && Main.overview.shouldToggleByCornerOrButton())
+            Main.overview.toggle();
 
         Mainloop.source_remove(this._xdndTimeOut);
         this._xdndTimeOut = 0;
@@ -920,13 +852,13 @@ const PANEL_ITEM_IMPLEMENTATIONS = {
     'appMenu': AppMenuButton,
     'dateMenu': imports.ui.dateMenu.DateMenuButton,
     'a11y': imports.ui.status.accessibility.ATIndicator,
+    'a11yGreeter': imports.ui.status.accessibility.ATGreeterIndicator,
     'volume': imports.ui.status.volume.Indicator,
     'battery': imports.ui.status.power.Indicator,
     'lockScreen': imports.ui.status.lockScreenMenu.Indicator,
-    'logo': imports.gdm.loginDialog.LogoMenuButton,
     'keyboard': imports.ui.status.keyboard.InputSourceIndicator,
     'powerMenu': imports.gdm.powerMenu.PowerMenuButton,
-    'userMenu': imports.ui.userMenu.UserMenuButton
+    'system': imports.ui.status.system.Indicator,
 };
 
 if (Config.HAVE_BLUETOOTH)
@@ -952,7 +884,7 @@ const Panel = new Lang.Class({
 
         this.statusArea = {};
 
-        this.menuManager = new PopupMenu.PopupMenuManager(this);
+        this.menuManager = new PopupMenu.PopupMenuManager(this, { keybindingMode: Shell.KeyBindingMode.TOPBAR_POPUP });
 
         this._leftBox = new St.BoxLayout({ name: 'panelLeft' });
         this.actor.add_actor(this._leftBox);
@@ -972,6 +904,13 @@ const Panel = new Lang.Class({
         this.actor.connect('allocate', Lang.bind(this, this._allocate));
         this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
 
+        Main.overview.connect('showing', Lang.bind(this, function () {
+            this.actor.add_style_pseudo_class('overview');
+        }));
+        Main.overview.connect('hiding', Lang.bind(this, function () {
+            this.actor.remove_style_pseudo_class('overview');
+        }));
+
         Main.layoutManager.panelBox.add(this.actor);
         Main.ctrlAltTabManager.addGroup(this.actor, _("Top Bar"), 'emblem-system-symbolic',
                                         { sortGroup: CtrlAltTab.SortGroup.TOP });
@@ -1058,6 +997,9 @@ const Panel = new Lang.Class({
     },
 
     _onButtonPress: function(actor, event) {
+        if (Main.modalCount > 0)
+            return false;
+
         if (event.get_source() != actor)
             return false;
 
@@ -1096,17 +1038,18 @@ const Panel = new Lang.Class({
         return true;
     },
 
-    openAppMenu: function() {
+    toggleAppMenu: function() {
         let indicator = this.statusArea.appMenu;
         if (!indicator) // appMenu not supported by current session mode
             return;
 
         let menu = indicator.menu;
-        if (!indicator.actor.reactive || menu.isOpen)
+        if (!indicator.actor.reactive)
             return;
 
-        menu.open();
-        menu.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+        menu.toggle();
+        if (menu.isOpen)
+            menu.actor.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
     },
 
     set boxOpacity(value) {

js/ui/panelMenu.js

@@ -110,6 +110,7 @@ const Button = new Lang.Class({
 
         this.actor.connect('button-press-event', Lang.bind(this, this._onButtonPress));
         this.actor.connect('key-press-event', Lang.bind(this, this._onSourceKeyPress));
+        this.actor.connect('notify::visible', Lang.bind(this, this._onVisibilityChanged));
 
         if (dontCreateMenu)
             this.menu = new PopupMenu.PopupDummyMenu(this.actor);
@@ -183,7 +184,18 @@ const Button = new Lang.Class({
             return false;
     },
 
+    _onVisibilityChanged: function() {
+        if (!this.menu)
+            return;
+
+        if (!this.actor.visible)
+            this.menu.close();
+    },
+
     _onMenuKeyPress: function(actor, event) {
+        if (global.focus_manager.navigate_from_event(event))
+            return true;
+
         let symbol = event.get_key_symbol();
         if (symbol == Clutter.KEY_Left || symbol == Clutter.KEY_Right) {
             let group = global.focus_manager.get_group(this.actor);
@@ -205,10 +217,8 @@ const Button = new Lang.Class({
         // Setting the max-height won't do any good if the minimum height of the
         // menu is higher then the screen; it's useful if part of the menu is
         // scrollable so the minimum height is smaller than the natural height
-        let monitor = Main.layoutManager.primaryMonitor;
-        this.menu.actor.style = ('max-height: ' +
-                                 Math.round(monitor.height - Main.panel.actor.height) +
-                                 'px;');
+        let workArea = Main.layoutManager.getWorkAreaForMonitor(Main.layoutManager.primaryIndex);
+        this.menu.actor.style = ('max-height: ' + Math.round(workArea.height) + 'px;');
     },
 
     destroy: function() {

js/ui/pointerWatcher.js

@@ -41,10 +41,9 @@ const PointerWatcher = new Lang.Class({
     Name: 'PointerWatcher',
 
     _init: function() {
-        let idleMonitor = new GnomeDesktop.IdleMonitor();
-        idleMonitor.connect('became-active', Lang.bind(this, this._onIdleMonitorBecameActive));
-        idleMonitor.add_watch(IDLE_TIME, Lang.bind(this, this._onIdleMonitorBecameIdle));
-        this._idle = idleMonitor.get_idletime() > IDLE_TIME;
+        this._idleMonitor = new GnomeDesktop.IdleMonitor();
+        this._idleMonitor.add_idle_watch(IDLE_TIME, Lang.bind(this, this._onIdleMonitorBecameIdle));
+        this._idle = this._idleMonitor.get_idletime() > IDLE_TIME;
         this._watches = [];
         this.pointerX = null;
         this.pointerY = null;
@@ -87,6 +86,7 @@ const PointerWatcher = new Lang.Class({
 
     _onIdleMonitorBecameIdle: function(monitor) {
         this._idle = true;
+        this._idleMonitor.add_user_active_watch(Lang.bind(this, this._onIdleMonitorBecameActive));
         this._updateTimeout();
     },
 

js/ui/remoteMenu.js

@@ -0,0 +1,199 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Atk = imports.gi.Atk;
+const GLib = imports.gi.GLib;
+const GObject = imports.gi.GObject;
+const Gio = imports.gi.Gio;
+const Lang = imports.lang;
+const Shell = imports.gi.Shell;
+const ShellMenu = imports.gi.ShellMenu;
+const St = imports.gi.St;
+
+const PopupMenu = imports.ui.popupMenu;
+
+function stripMnemonics(label) {
+    if (!label)
+        return '';
+
+    // remove all underscores that are not followed by another underscore
+    return label.replace(/_([^_])/, '$1');
+}
+
+function _insertItem(menu, trackerItem, position) {
+    let mapper;
+
+    if (trackerItem.get_is_separator())
+        mapper = new RemoteMenuSeparatorItemMapper(trackerItem);
+    else if (trackerItem.get_has_submenu())
+        mapper = new RemoteMenuSubmenuItemMapper(trackerItem);
+    else
+        mapper = new RemoteMenuItemMapper(trackerItem);
+
+    let item = mapper.menuItem;
+    menu.addMenuItem(item, position);
+}
+
+function _removeItem(menu, position) {
+    let items = menu._getMenuItems();
+    items[position].destroy();
+}
+
+const RemoteMenuSeparatorItemMapper = new Lang.Class({
+    Name: 'RemoteMenuSeparatorItemMapper',
+
+    _init: function(trackerItem) {
+        this._trackerItem = trackerItem;
+        this.menuItem = new PopupMenu.PopupSeparatorMenuItem();
+        this._trackerItem.connect('notify::label', Lang.bind(this, this._updateLabel));
+        this._updateLabel();
+
+        this.menuItem.connect('destroy', function() {
+            trackerItem.run_dispose();
+        });
+    },
+
+    _updateLabel: function() {
+        this.menuItem.label.text = stripMnemonics(this._trackerItem.label);
+    },
+});
+
+const RequestSubMenu = new Lang.Class({
+    Name: 'RequestSubMenu',
+    Extends: PopupMenu.PopupSubMenuMenuItem,
+
+    _init: function() {
+        this.parent('');
+        this._requestOpen = false;
+    },
+
+    _setOpenState: function(open) {
+        this.emit('request-open', open);
+        this._requestOpen = open;
+    },
+
+    _getOpenState: function() {
+        return this._requestOpen;
+    },
+});
+
+const RemoteMenuSubmenuItemMapper = new Lang.Class({
+    Name: 'RemoteMenuSubmenuItemMapper',
+
+    _init: function(trackerItem) {
+        this._trackerItem = trackerItem;
+        this.menuItem = new RequestSubMenu();
+        this._trackerItem.connect('notify::label', Lang.bind(this, this._updateLabel));
+        this._updateLabel();
+
+        this._tracker = Shell.MenuTracker.new_for_item_submenu(this._trackerItem,
+                                                               _insertItem.bind(null, this.menuItem.menu),
+                                                               _removeItem.bind(null, this.menuItem.menu));
+
+        this.menuItem.connect('request-open', Lang.bind(this, function(menu, open) {
+            this._trackerItem.request_submenu_shown(open);
+        }));
+
+        this._trackerItem.connect('notify::submenu-shown', Lang.bind(this, function() {
+            this.menuItem.setSubmenuShown(this._trackerItem.get_submenu_shown());
+        }));
+
+        this.menuItem.connect('destroy', function() {
+            trackerItem.run_dispose();
+        });
+    },
+
+    destroy: function() {
+        this._tracker.destroy();
+        this.parent();
+    },
+
+    _updateLabel: function() {
+        this.menuItem.label.text = stripMnemonics(this._trackerItem.label);
+    },
+});
+
+const RemoteMenuItemMapper = new Lang.Class({
+    Name: 'RemoteMenuItemMapper',
+
+    _init: function(trackerItem) {
+        this._trackerItem = trackerItem;
+
+        this.menuItem = new PopupMenu.PopupBaseMenuItem();
+        this._label = new St.Label();
+        this.menuItem.addActor(this._label);
+        this.menuItem.actor.label_actor = this._label;
+
+        this.menuItem.connect('activate', Lang.bind(this, function() {
+            this._trackerItem.activated();
+        }));
+
+        this._trackerItem.bind_property('visible', this.menuItem.actor, 'visible', GObject.BindingFlags.SYNC_CREATE);
+
+        this._trackerItem.connect('notify::label', Lang.bind(this, this._updateLabel));
+        this._trackerItem.connect('notify::sensitive', Lang.bind(this, this._updateSensitivity));
+        this._trackerItem.connect('notify::role', Lang.bind(this, this._updateRole));
+        this._trackerItem.connect('notify::toggled', Lang.bind(this, this._updateDecoration));
+
+        this._updateLabel();
+        this._updateSensitivity();
+        this._updateRole();
+
+        this.menuItem.connect('destroy', function() {
+            trackerItem.run_dispose();
+        });
+    },
+
+    _updateLabel: function() {
+        this._label.text = stripMnemonics(this._trackerItem.label);
+    },
+
+    _updateSensitivity: function() {
+        this.menuItem.setSensitive(this._trackerItem.sensitive);
+    },
+
+    _updateDecoration: function() {
+        let ornamentForRole = {};
+        ornamentForRole[ShellMenu.MenuTrackerItemRole.RADIO] = PopupMenu.Ornament.DOT;
+        ornamentForRole[ShellMenu.MenuTrackerItemRole.CHECK] = PopupMenu.Ornament.CHECK;
+
+        let ornament = PopupMenu.Ornament.NONE;
+        if (this._trackerItem.toggled)
+            ornament = ornamentForRole[this._trackerItem.role];
+
+        this.menuItem.setOrnament(ornament);
+    },
+
+    _updateRole: function() {
+        let a11yRoles = {};
+        a11yRoles[ShellMenu.MenuTrackerItemRole.NORMAL] = Atk.Role.MENU_ITEM;
+        a11yRoles[ShellMenu.MenuTrackerItemRole.RADIO] = Atk.Role.RADIO_MENU_ITEM;
+        a11yRoles[ShellMenu.MenuTrackerItemRole.CHECK] = Atk.Role.CHECK_MENU_ITEM;
+
+        let a11yRole = a11yRoles[this._trackerItem.role];
+        this.menuItem.actor.accessible_role = a11yRole;
+
+        this._updateDecoration();
+    },
+});
+
+const RemoteMenu = new Lang.Class({
+    Name: 'RemoteMenu',
+    Extends: PopupMenu.PopupMenu,
+
+    _init: function(sourceActor, model, actionGroup) {
+        this.parent(sourceActor, 0.0, St.Side.TOP);
+
+        this._model = model;
+        this._actionGroup = actionGroup;
+        this._tracker = Shell.MenuTracker.new(this._actionGroup,
+                                              this._model,
+                                              null, /* action namespace */
+                                              _insertItem.bind(null, this),
+                                              _removeItem.bind(null, this));
+    },
+
+    destroy: function() {
+        this._tracker.destroy();
+        this.parent();
+    },
+});

js/ui/remoteSearch.js

@@ -7,7 +7,6 @@ const Lang = imports.lang;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 
-const FileUtils = imports.misc.fileUtils;
 const Search = imports.ui.search;
 
 const KEY_FILE_GROUP = 'Shell Search Provider';
@@ -60,111 +59,114 @@ var SearchProviderProxy = Gio.DBusProxy.makeProxyWrapper(SearchProviderIface);
 var SearchProvider2Proxy = Gio.DBusProxy.makeProxyWrapper(SearchProvider2Iface);
 
 function loadRemoteSearchProviders(addProviderCallback) {
-    let data = { loadedProviders: [],
-                 objectPaths: {},
-                 addProviderCallback: addProviderCallback };
-    FileUtils.collectFromDatadirsAsync('search-providers',
-                                       { loadedCallback: remoteProvidersLoaded,
-                                         processFile: loadRemoteSearchProvider,
-                                         data: data
-                                       });
-}
+    let objectPaths = {};
+    let loadedProviders = [];
 
-function loadRemoteSearchProvider(file, info, data) {
-    let keyfile = new GLib.KeyFile();
-    let path = file.get_path();
+    function loadRemoteSearchProvider(file) {
+        let keyfile = new GLib.KeyFile();
+        let path = file.get_path();
 
-    try {
-        keyfile.load_from_file(path, 0);
-    } catch(e) {
-        return;
-    }
-
-    if (!keyfile.has_group(KEY_FILE_GROUP))
-        return;
-
-    let remoteProvider;
-    try {
-        let group = KEY_FILE_GROUP;
-        let busName = keyfile.get_string(group, 'BusName');
-        let objectPath = keyfile.get_string(group, 'ObjectPath');
-
-        if (data.objectPaths[objectPath])
-            return;
-
-        let appInfo = null;
         try {
-            let desktopId = keyfile.get_string(group, 'DesktopId');
-            appInfo = Gio.DesktopAppInfo.new(desktopId);
-        } catch (e) {
-            log('Ignoring search provider ' + path + ': missing DesktopId');
+            keyfile.load_from_file(path, 0);
+        } catch(e) {
             return;
         }
 
-        let version = '1';
+        if (!keyfile.has_group(KEY_FILE_GROUP))
+            return;
+
+        let remoteProvider;
         try {
-            version = keyfile.get_string(group, 'Version');
-        } catch (e) {
-            // ignore error
-        }
+            let group = KEY_FILE_GROUP;
+            let busName = keyfile.get_string(group, 'BusName');
+            let objectPath = keyfile.get_string(group, 'ObjectPath');
 
-        if (version >= 2)
-            remoteProvider = new RemoteSearchProvider2(appInfo, busName, objectPath);
-        else
-            remoteProvider = new RemoteSearchProvider(appInfo, busName, objectPath);
+            if (objectPaths[objectPath])
+                return;
 
-        data.objectPaths[objectPath] = remoteProvider;
-        data.loadedProviders.push(remoteProvider);
-    } catch(e) {
-        log('Failed to add search provider %s: %s'.format(path, e.toString()));
-    }
-}
-
-function remoteProvidersLoaded(loadState) {
-    let searchSettings = new Gio.Settings({ schema: Search.SEARCH_PROVIDERS_SCHEMA });
-    let sortOrder = searchSettings.get_strv('sort-order');
-    let numSorted = sortOrder.length;
-
-    loadState.loadedProviders.sort(
-        function(providerA, providerB) {
-            let idxA, idxB;
-            let appIdA, appIdB;
-
-            appIdA = providerA.appInfo.get_id();
-            appIdB = providerB.appInfo.get_id();
-
-            idxA = sortOrder.indexOf(appIdA);
-            idxB = sortOrder.indexOf(appIdB);
-
-            // if no provider is found in the order, use alphabetical order
-            if ((idxA == -1) && (idxB == -1))
-                return GLib.utf8_collate(providerA.title, providerB.title);
-
-            if (numSorted > 1) {
-                // if providerA is the last, it goes after everything
-                if ((idxA + 1) == numSorted)
-                    return 1;
-                // if providerB is the last, it goes after everything
-                else if ((idxB + 1) == numSorted)
-                    return -1;
+            let appInfo = null;
+            try {
+                let desktopId = keyfile.get_string(group, 'DesktopId');
+                appInfo = Gio.DesktopAppInfo.new(desktopId);
+            } catch (e) {
+                log('Ignoring search provider ' + path + ': missing DesktopId');
+                return;
             }
 
-            // if providerA isn't found, it's sorted after providerB
-            if (idxA == -1)
-                return 1;
+            let version = '1';
+            try {
+                version = keyfile.get_string(group, 'Version');
+            } catch (e) {
+                // ignore error
+            }
 
-            // if providerB isn't found, it's sorted after providerA
-            if (idxB == -1)
-                return -1;
+            if (version >= 2)
+                remoteProvider = new RemoteSearchProvider2(appInfo, busName, objectPath);
+            else
+                remoteProvider = new RemoteSearchProvider(appInfo, busName, objectPath);
 
-            // finally, if both providers are found, return their order in the list
-            return (idxA - idxB);
-        });
+            objectPaths[objectPath] = remoteProvider;
+            loadedProviders.push(remoteProvider);
+        } catch(e) {
+            log('Failed to add search provider %s: %s'.format(path, e.toString()));
+        }
+    }
 
-    loadState.loadedProviders.forEach(
-        function(provider) {
-            loadState.addProviderCallback(provider);
-        });
+    let dataDirs = GLib.get_system_data_dirs();
+    dataDirs.forEach(function(dataDir) {
+        let path = GLib.build_filenamev([dataDir, 'gnome-shell', 'search-providers']);
+        let dir = Gio.File.new_for_path(path);
+        let fileEnum;
+        try {
+            fileEnum = dir.enumerate_children('standard::name,standard::type',
+                                              Gio.FileQueryInfoFlags.NONE, null);
+        } catch (e) {
+            fileEnum = null;
+        }
+        if (fileEnum != null) {
+            let info;
+            while ((info = fileEnum.next_file(null)))
+                loadRemoteSearchProvider(fileEnum.get_child(info));
+        }
+    });
+
+    let searchSettings = new Gio.Settings({ schema: Search.SEARCH_PROVIDERS_SCHEMA });
+    let sortOrder = searchSettings.get_strv('sort-order');
+
+    // Special case gnome-control-center to be always active and always first
+    sortOrder.unshift('gnome-control-center.desktop');
+
+    loadedProviders.sort(function(providerA, providerB) {
+        let idxA, idxB;
+        let appIdA, appIdB;
+
+        appIdA = providerA.appInfo.get_id();
+        appIdB = providerB.appInfo.get_id();
+
+        idxA = sortOrder.indexOf(appIdA);
+        idxB = sortOrder.indexOf(appIdB);
+
+        // if no provider is found in the order, use alphabetical order
+        if ((idxA == -1) && (idxB == -1)) {
+            let nameA = providerA.appInfo.get_name();
+            let nameB = providerB.appInfo.get_name();
+
+            return GLib.utf8_collate(nameA, nameB);
+        }
+
+        // if providerA isn't found, it's sorted after providerB
+        if (idxA == -1)
+            return 1;
+
+        // if providerB isn't found, it's sorted after providerA
+        if (idxB == -1)
+            return -1;
+
+        // finally, if both providers are found, return their order in the list
+        return (idxA - idxB);
+    });
+
+    loadedProviders.forEach(addProviderCallback);
 }
 
 const RemoteSearchProvider = new Lang.Class({
@@ -190,7 +192,9 @@ const RemoteSearchProvider = new Lang.Class({
 
     createIcon: function(size, meta) {
         let gicon;
-        if (meta['gicon']) {
+        if (meta['icon']) {
+            gicon = Gio.icon_deserialize(meta['icon']);
+        } else if (meta['gicon']) {
             gicon = Gio.icon_new_for_string(meta['gicon']);
         } else if (meta['icon-data']) {
             let [width, height, rowStride, hasAlpha,
@@ -206,7 +210,7 @@ const RemoteSearchProvider = new Lang.Class({
     _getResultsFinished: function(results, error) {
         if (error)
             return;
-        this.searchSystem.pushResults(this, results[0]);
+        this.searchSystem.setResults(this, results[0]);
     },
 
     getInitialResultSet: function(terms) {
@@ -217,8 +221,8 @@ const RemoteSearchProvider = new Lang.Class({
                                                  Lang.bind(this, this._getResultsFinished),
                                                  this._cancellable);
         } catch(e) {
-            log('Error calling GetInitialResultSet for provider %s: %s'.format( this.title, e.toString()));
-            this.searchSystem.pushResults(this, []);
+            log('Error calling GetInitialResultSet for provider %s: %s'.format(this.id, e.toString()));
+            this.searchSystem.setResults(this, []);
         }
     },
 
@@ -230,8 +234,8 @@ const RemoteSearchProvider = new Lang.Class({
                                                    Lang.bind(this, this._getResultsFinished),
                                                    this._cancellable);
         } catch(e) {
-            log('Error calling GetSubsearchResultSet for provider %s: %s'.format(this.title, e.toString()));
-            this.searchSystem.pushResults(this, []);
+            log('Error calling GetSubsearchResultSet for provider %s: %s'.format(this.id, e.toString()));
+            this.searchSystem.setResults(this, []);
         }
     },
 
@@ -243,10 +247,15 @@ const RemoteSearchProvider = new Lang.Class({
         let metas = results[0];
         let resultMetas = [];
         for (let i = 0; i < metas.length; i++) {
-            for (let prop in metas[i])
-                metas[i][prop] = metas[i][prop].deep_unpack();
+            for (let prop in metas[i]) {
+                // we can use the serialized icon variant directly
+                if (prop != 'icon')
+                    metas[i][prop] = metas[i][prop].deep_unpack();
+            }
+
             resultMetas.push({ id: metas[i]['id'],
                                name: metas[i]['name'],
+                               description: metas[i]['description'],
                                createIcon: Lang.bind(this,
                                                      this.createIcon, metas[i]) });
         }
@@ -261,7 +270,7 @@ const RemoteSearchProvider = new Lang.Class({
                                             Lang.bind(this, this._getResultMetasFinished, callback),
                                             this._cancellable);
         } catch(e) {
-            log('Error calling GetResultMetas for provider %s: %s'.format(this.title, e.toString()));
+            log('Error calling GetResultMetas for provider %s: %s'.format(this.id, e.toString()));
             callback([]);
         }
     },

js/ui/runDialog.js

@@ -30,144 +30,13 @@ const EXEC_ARG_KEY = 'exec-arg';
 
 const DIALOG_GROW_TIME = 0.1;
 
-const CommandCompleter = new Lang.Class({
-    Name: 'CommandCompleter',
-
-    _init : function() {
-        this._changedCount = 0;
-        this._paths = GLib.getenv('PATH').split(':');
-        this._paths.push(GLib.get_home_dir());
-        this._valid = false;
-        this._updateInProgress = false;
-        this._childs = new Array(this._paths.length);
-        this._monitors = new Array(this._paths.length);
-        for (let i = 0; i < this._paths.length; i++) {
-            this._childs[i] = [];
-            let file = Gio.file_new_for_path(this._paths[i]);
-            let info;
-            try {
-                info = file.query_info(Gio.FILE_ATTRIBUTE_STANDARD_TYPE, Gio.FileQueryInfoFlags.NONE, null);
-            } catch (e) {
-                // FIXME catchall
-                this._paths[i] = null;
-                continue;
-            }
-
-            if (info.get_attribute_uint32(Gio.FILE_ATTRIBUTE_STANDARD_TYPE) != Gio.FileType.DIRECTORY)
-                continue;
-
-            this._paths[i] = file.get_path();
-            this._monitors[i] = file.monitor_directory(Gio.FileMonitorFlags.NONE, null);
-            if (this._monitors[i] != null) {
-                this._monitors[i].connect('changed', Lang.bind(this, this._onChanged));
-            }
-        }
-        this._paths = this._paths.filter(function(a) {
-            return a != null;
-        });
-        this._update(0);
-    },
-
-    update : function() {
-        if (this._valid)
-            return;
-        this._update(0);
-    },
-
-    _update : function(i) {
-        if (i == 0 && this._updateInProgress)
-            return;
-        this._updateInProgress = true;
-        this._changedCount = 0;
-        this._i = i;
-        if (i >= this._paths.length) {
-            this._valid = true;
-            this._updateInProgress = false;
-            return;
-        }
-        let file = Gio.file_new_for_path(this._paths[i]);
-        this._childs[this._i] = [];
-        FileUtils.listDirAsync(file, Lang.bind(this, function (files) {
-            for (let i = 0; i < files.length; i++) {
-                this._childs[this._i].push(files[i].get_name());
-            }
-            this._update(this._i + 1);
-        }));
-    },
-
-    _onChanged : function(m, f, of, type) {
-        if (!this._valid)
-            return;
-        let path = f.get_parent().get_path();
-        let k = undefined;
-        for (let i = 0; i < this._paths.length; i++) {
-            if (this._paths[i] == path)
-                k = i;
-        }
-        if (k === undefined) {
-            return;
-        }
-        if (type == Gio.FileMonitorEvent.CREATED) {
-            this._childs[k].push(f.get_basename());
-        }
-        if (type == Gio.FileMonitorEvent.DELETED) {
-            this._changedCount++;
-            if (this._changedCount > MAX_FILE_DELETED_BEFORE_INVALID) {
-                this._valid = false;
-            }
-            let name = f.get_basename();
-            this._childs[k] = this._childs[k].filter(function(e) {
-                return e != name;
-            });
-        }
-        if (type == Gio.FileMonitorEvent.UNMOUNTED) {
-            this._childs[k] = [];
-        }
-    },
-
-    getCompletion: function(text) {
-        let common = '';
-        let notInit = true;
-        if (!this._valid) {
-            this._update(0);
-            return common;
-        }
-        function _getCommon(s1, s2) {
-            let k = 0;
-            for (; k < s1.length && k < s2.length; k++) {
-                if (s1[k] != s2[k])
-                    break;
-            }
-            if (k == 0)
-                return '';
-            return s1.substr(0, k);
-        }
-        function _hasPrefix(s1, prefix) {
-            return s1.indexOf(prefix) == 0;
-        }
-        for (let i = 0; i < this._childs.length; i++) {
-            for (let k = 0; k < this._childs[i].length; k++) {
-                if (!_hasPrefix(this._childs[i][k], text))
-                    continue;
-                if (notInit) {
-                    common = this._childs[i][k];
-                    notInit = false;
-                }
-                common = _getCommon(common, this._childs[i][k]);
-            }
-        }
-        if (common.length)
-            return common.substr(text.length);
-        return common;
-    }
-});
-
 const RunDialog = new Lang.Class({
     Name: 'RunDialog',
     Extends: ModalDialog.ModalDialog,
 
     _init : function() {
-        this.parent({ styleClass: 'run-dialog' });
+        this.parent({ styleClass: 'run-dialog',
+                      destroyOnClose: false });
 
         this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
         this._terminalSettings = new Gio.Settings({ schema: TERMINAL_SCHEMA });
@@ -242,8 +111,6 @@ const RunDialog = new Lang.Class({
                            key: Clutter.Escape }]);
 
         this._pathCompleter = new Gio.FilenameCompleter();
-        this._commandCompleter = new CommandCompleter();
-        this._group.connect('notify::visible', Lang.bind(this._commandCompleter, this._commandCompleter.update));
 
         this._history = new History.HistoryManager({ gsettingsKey: HISTORY_KEY,
                                                      entry: this._entryText });
@@ -259,18 +126,6 @@ const RunDialog = new Lang.Class({
 
                 return true;
             }
-            if (symbol == Clutter.slash) {
-                // Need preload data before get completion. GFilenameCompleter load content of parent directory.
-                // Parent directory for /usr/include/ is /usr/. So need to add fake name('a').
-                let text = o.get_text().concat('/a');
-                let prefix;
-                if (text.lastIndexOf(' ') == -1)
-                    prefix = text;
-                else
-                    prefix = text.substr(text.lastIndexOf(' ') + 1);
-                this._getCompletion(prefix);
-                return false;
-            }
             if (symbol == Clutter.Tab) {
                 let text = o.get_text();
                 let prefix;
@@ -282,8 +137,6 @@ const RunDialog = new Lang.Class({
                 if (postfix != null && postfix.length > 0) {
                     o.insert_text(postfix, -1);
                     o.set_cursor_position(text.length + postfix.length);
-                    if (postfix[postfix.length - 1] == '/')
-                        this._getCompletion(text + postfix + 'a');
                 }
                 return true;
             }
@@ -291,11 +144,53 @@ const RunDialog = new Lang.Class({
         }));
     },
 
+    _getCommandCompletion: function(text) {
+        function _getCommon(s1, s2) {
+            if (s1 == null)
+                return s2;
+
+            let k = 0;
+            for (; k < s1.length && k < s2.length; k++) {
+                if (s1[k] != s2[k])
+                    break;
+            }
+            if (k == 0)
+                return '';
+            return s1.substr(0, k);
+        }
+
+        let paths = GLib.getenv('PATH').split(':');
+        paths.push(GLib.get_home_dir());
+        let someResults = paths.map(function(path) {
+            let results = [];
+            try {
+                let file = Gio.File.new_for_path(path);
+                let fileEnum = file.enumerate_children('standard::name', Gio.FileQueryInfoFlags.NONE, null);
+                let info;
+                while ((info = fileEnum.next_file(null))) {
+                    let name = info.get_name();
+                    if (name.slice(0, text.length) == text)
+                        results.push(name);
+                }
+            } catch (e if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND) &&
+                           !e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_DIRECTORY))) {
+                log(e);
+            } finally {
+                return results;
+            }
+        });
+        let results = someResults.reduce(function(a, b) {
+            return a.concat(b);
+        }, []);
+        let common = results.reduce(_getCommon, null);
+        return common.substr(text.length);
+    },
+
     _getCompletion : function(text) {
         if (text.indexOf('/') != -1) {
             return this._pathCompleter.get_completion_suffix(text);
         } else {
-            return this._commandCompleter.getCompletion(text);
+            return this._getCommandCompletion(text);
         }
     },
 

js/ui/screencast.js

@@ -0,0 +1,140 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Lang = imports.lang;
+const Shell = imports.gi.Shell;
+
+const Hash = imports.misc.hash;
+const Main = imports.ui.main;
+
+const ScreencastIface = <interface name="org.gnome.Shell.Screencast">
+<method name="Screencast">
+    <arg type="s" direction="in" name="file_template"/>
+    <arg type="a{sv}" direction="in" name="options"/>
+    <arg type="b" direction="out" name="success"/>
+    <arg type="s" direction="out" name="filename_used"/>
+</method>
+<method name="ScreencastArea">
+    <arg type="i" direction="in" name="x"/>
+    <arg type="i" direction="in" name="y"/>
+    <arg type="i" direction="in" name="width"/>
+    <arg type="i" direction="in" name="height"/>
+    <arg type="s" direction="in" name="file_template"/>
+    <arg type="a{sv}" direction="in" name="options"/>
+    <arg type="b" direction="out" name="success"/>
+    <arg type="s" direction="out" name="filename_used"/>
+</method>
+<method name="StopScreencast">
+    <arg type="b" direction="out" name="success"/>
+</method>
+</interface>;
+
+const ScreencastService = new Lang.Class({
+    Name: 'ScreencastService',
+
+    _init: function() {
+        this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(ScreencastIface, this);
+        this._dbusImpl.export(Gio.DBus.session, '/org/gnome/Shell/Screencast');
+
+        Gio.DBus.session.own_name('org.gnome.Shell.Screencast', Gio.BusNameOwnerFlags.REPLACE, null, null);
+
+        this._recorders = new Hash.Map();
+
+        Main.sessionMode.connect('updated',
+                                 Lang.bind(this, this._sessionModeChanged));
+    },
+
+    _ensureRecorderForSender: function(sender) {
+        let recorder = this._recorders.get(sender);
+        if (!recorder) {
+            recorder = new Shell.Recorder({ stage: global.stage });
+            recorder._watchNameId =
+                Gio.bus_watch_name(Gio.BusType.SESSION, sender, 0, null,
+                                   Lang.bind(this, this._onNameVanished));
+            this._recorders.set(sender, recorder);
+        }
+        return recorder;
+    },
+
+    _sessionModeChanged: function() {
+        if (Main.sessionMode.allowScreencast)
+            return;
+
+        for (let sender in this._recorders.keys())
+            this._recorders.delete(sender);
+    },
+
+    _onNameVanished: function(connection, name) {
+        this._stopRecordingForSender(name);
+    },
+
+    _stopRecordingForSender: function(sender) {
+        let recorder = this._recorders.get(sender);
+        if (!recorder)
+            return false;
+
+        Gio.bus_unwatch_name(recorder._watchNameId);
+        recorder.close();
+        this._recorders.delete(sender);
+
+        return true;
+    },
+
+    _applyOptionalParameters: function(recorder, options) {
+        for (let option in options)
+            options[option] = options[option].deep_unpack();
+
+        if (options['pipeline'])
+            recorder.set_pipeline(options['pipeline']);
+        if (options['framerate'])
+            recorder.set_framerate(options['framerate']);
+        if (options['draw-cursor'])
+            recorder.set_draw_cursor(options['draw-cursor']);
+    },
+
+    ScreencastAsync: function(params, invocation) {
+        let returnValue = [false, ''];
+        if (!Main.sessionMode.allowScreencast)
+            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+
+        let sender = invocation.get_sender();
+        let recorder = this._ensureRecorderForSender(sender);
+        if (!recorder.is_recording()) {
+            let [fileTemplate, options] = params;
+
+            recorder.set_file_template(fileTemplate);
+            this._applyOptionalParameters(recorder, options);
+            let [success, fileName] = recorder.record();
+            returnValue = [success, fileName ? fileName : ''];
+        }
+
+        invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+    },
+
+    ScreencastAreaAsync: function(params, invocation) {
+        let returnValue = [false, ''];
+        if (!Main.sessionMode.allowScreencast)
+            invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+
+        let sender = invocation.get_sender();
+        let recorder = this._ensureRecorderForSender(sender);
+
+        if (!recorder.is_recording()) {
+            let [x, y, width, height, fileTemplate, options] = params;
+
+            recorder.set_file_template(fileTemplate);
+            recorder.set_area(x, y, width, height);
+            this._applyOptionalParameters(recorder, options);
+            let [success, fileName] = recorder.record();
+            returnValue = [success, fileName ? fileName : ''];
+        }
+
+        invocation.return_value(GLib.Variant.new('(bs)', returnValue));
+    },
+
+    StopScreencastAsync: function(params, invocation) {
+        let success = this._stopRecordingForSender(invocation.get_sender());
+        invocation.return_value(GLib.Variant.new('(b)', [success]));
+    }
+});

js/ui/screenshot.js

@@ -76,6 +76,11 @@ const ScreenshotService = new Lang.Class({
 
     ScreenshotAreaAsync : function (params, invocation) {
         let [x, y, width, height, flash, filename, callback] = params;
+        if (height <= 0 || width <= 0) {
+            invocation.return_error_literal(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED,
+                        "Invalid params");
+            return;
+        }
         let screenshot = new Shell.Screenshot();
         screenshot.screenshot_area (x, y, width, height, filename,
                                 Lang.bind(this, this._onScreenshotComplete,

js/ui/search.js

@@ -31,7 +31,7 @@ const SearchSystem = new Lang.Class({
 
         let remoteIndex = this._remoteProviders.indexOf(provider);
         if (remoteIndex != -1)
-            this._remoteProviders.splice(index, 1);
+            this._remoteProviders.splice(remoteIndex, 1);
     },
 
     getProviders: function() {
@@ -51,7 +51,7 @@ const SearchSystem = new Lang.Class({
         this._previousResults = [];
     },
 
-    pushResults: function(provider, results) {
+    setResults: function(provider, results) {
         let i = this._providers.indexOf(provider);
         if (i == -1)
             return;
@@ -60,28 +60,18 @@ const SearchSystem = new Lang.Class({
         this.emit('search-updated', this._previousResults[i]);
     },
 
-    updateSearch: function(searchString) {
-        searchString = searchString.replace(/^\s+/g, '').replace(/\s+$/g, '');
-        if (searchString == '')
-            return;
-
-        let terms = searchString.split(/\s+/);
-        this.updateSearchResults(terms);
-    },
-
     updateSearchResults: function(terms) {
         if (!terms)
             return;
 
-        let isSubSearch = terms.length == this._previousTerms.length;
-        if (isSubSearch) {
-            for (let i = 0; i < terms.length; i++) {
-                if (terms[i].indexOf(this._previousTerms[i]) != 0) {
-                    isSubSearch = false;
-                    break;
-                }
-            }
-        }
+        let searchString = terms.join(' ');
+        let previousSearchString = this._previousTerms.join(' ');
+        if (searchString == previousSearchString)
+            return;
+
+        let isSubSearch = false;
+        if (this._previousTerms.length > 0)
+            isSubSearch = searchString.indexOf(previousSearchString) == 0;
 
         let previousResultsArr = this._previousResults;
 
@@ -110,6 +100,6 @@ const SearchSystem = new Lang.Class({
                 }
             }
         }
-    },
+    }
 });
 Signals.addSignalMethods(SearchSystem.prototype);

js/ui/searchDisplay.js

@@ -4,6 +4,7 @@ const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Gtk = imports.gi.Gtk;
 const Meta = imports.gi.Meta;
+const Signals = imports.signals;
 const St = imports.gi.St;
 const Atk = imports.gi.Atk;
 
@@ -13,10 +14,31 @@ const Main = imports.ui.main;
 const Overview = imports.ui.overview;
 const Separator = imports.ui.separator;
 const Search = imports.ui.search;
+const Util = imports.misc.util;
 
 const MAX_LIST_SEARCH_RESULTS_ROWS = 3;
 const MAX_GRID_SEARCH_RESULTS_ROWS = 1;
 
+const MaxWidthBin = new Lang.Class({
+    Name: 'MaxWidthBin',
+    Extends: St.Bin,
+
+    vfunc_allocate: function(box, flags) {
+        let themeNode = this.get_theme_node();
+        let maxWidth = themeNode.get_max_width();
+        let availWidth = box.x2 - box.x1;
+        let adjustedBox = box;
+
+        if (availWidth > maxWidth) {
+            let excessWidth = availWidth - maxWidth;
+            adjustedBox.x1 += Math.floor(excessWidth / 2);
+            adjustedBox.x2 -= Math.floor(excessWidth / 2);
+        }
+
+        this.parent(adjustedBox, flags);
+    }
+});
+
 const SearchResult = new Lang.Class({
     Name: 'SearchResult',
 
@@ -82,11 +104,11 @@ const ListSearchResult = new Lang.Class({
                              y_fill: false,
                              x_align: St.Align.START,
                              y_align: St.Align.START });
+        this.actor.label_actor = title;
 
-        // TODO: should highlight terms in the description here
         if (this.metaInfo['description']) {
-            let description = new St.Label({ style_class: 'list-search-result-description',
-                                             text: '"' + this.metaInfo['description'] + '"' });
+            let description = new St.Label({ style_class: 'list-search-result-description' });
+            description.clutter_text.set_markup(this.metaInfo['description']);
             details.add(description, { x_fill: false,
                                        y_fill: false,
                                        x_align: St.Align.START,
@@ -120,6 +142,7 @@ const GridSearchResult = new Lang.Class({
         }
 
         this.actor.set_child(content);
+        this.actor.label_actor = content.label_actor;
 
         let draggable = DND.makeDraggable(this.actor);
         draggable.connect('drag-begin',
@@ -157,13 +180,82 @@ const GridSearchResult = new Lang.Class({
     }
 });
 
-const ListSearchResults = new Lang.Class({
-    Name: 'ListSearchResults',
+const SearchResultsBase = new Lang.Class({
+    Name: 'SearchResultsBase',
 
     _init: function(provider) {
         this.provider = provider;
 
-        this.actor = new St.BoxLayout({ style_class: 'search-section-content' });
+        this._terms = [];
+
+        this.actor = new St.BoxLayout({ style_class: 'search-section',
+                                        vertical: true });
+
+        this._resultDisplayBin = new St.Bin({ x_fill: true,
+                                              y_fill: true });
+        this.actor.add(this._resultDisplayBin, { expand: true });
+
+        let separator = new Separator.HorizontalSeparator({ style_class: 'search-section-separator' });
+        this.actor.add(separator.actor);
+    },
+
+    destroy: function() {
+        this.actor.destroy();
+        this._terms = [];
+    },
+
+    _clearResultDisplay: function() {
+    },
+
+    clear: function() {
+        this._clearResultDisplay();
+        this.actor.hide();
+    },
+
+    _keyFocusIn: function(icon) {
+        this.emit('key-focus-in', icon);
+    },
+
+    _setMoreIconVisible: function(visible) {
+    },
+
+    updateSearch: function(providerResults, terms, callback) {
+        this._terms = terms;
+
+        if (providerResults.length == 0) {
+            this._clearResultDisplay();
+            this.actor.hide();
+            callback();
+        } else {
+            let maxResults = this._getMaxDisplayedResults();
+            let results = providerResults.slice(0, maxResults);
+            let hasMoreResults = results.length < providerResults.length;
+
+            this.provider.getResultMetas(results, Lang.bind(this, function(metas) {
+                this.clear();
+
+                // To avoid CSS transitions causing flickering when
+                // the first search result stays the same, we hide the
+                // content while filling in the results.
+                this.actor.hide();
+                this._clearResultDisplay();
+                this._renderResults(metas);
+                this._setMoreIconVisible(hasMoreResults && this.provider.canLaunchSearch);
+                this.actor.show();
+                callback();
+            }));
+        }
+    }
+});
+
+const ListSearchResults = new Lang.Class({
+    Name: 'ListSearchResults',
+    Extends: SearchResultsBase,
+
+    _init: function(provider) {
+        this.parent(provider);
+
+        this._container = new St.BoxLayout({ style_class: 'search-section-content' });
         this.providerIcon = new ProviderIcon(provider);
         this.providerIcon.connect('clicked', Lang.bind(this,
             function() {
@@ -171,123 +263,86 @@ const ListSearchResults = new Lang.Class({
                 Main.overview.toggle();
             }));
 
-        this.actor.add(this.providerIcon, { x_fill: false,
-                                            y_fill: false,
-                                            x_align: St.Align.START,
-                                            y_align: St.Align.START });
+        this._container.add(this.providerIcon, { x_fill: false,
+                                                 y_fill: false,
+                                                 x_align: St.Align.START,
+                                                 y_align: St.Align.START });
 
         this._content = new St.BoxLayout({ style_class: 'list-search-results',
                                            vertical: true });
-        this.actor.add_actor(this._content);
+        this._container.add(this._content, { expand: true });
 
-        this._notDisplayedResult = [];
-        this._terms = [];
-        this._pendingClear = false;
+        this._resultDisplayBin.set_child(this._container);
     },
 
-    getResultsForDisplay: function() {
-        let alreadyVisible = this._pendingClear ? 0 : this.getVisibleResultCount();
-        let canDisplay = MAX_LIST_SEARCH_RESULTS_ROWS - alreadyVisible;
-
-        let newResults = this._notDisplayedResult.splice(0, canDisplay);
-        return newResults;
+    _setMoreIconVisible: function(visible) {
+        this.providerIcon.moreIcon.visible = true;
     },
 
-    getVisibleResultCount: function() {
-        return this._content.get_n_children();
+    _getMaxDisplayedResults: function() {
+        return MAX_LIST_SEARCH_RESULTS_ROWS;
     },
 
-    hasMoreResults: function() {
-        return this._notDisplayedResult.length > 0;
-    },
-
-    setResults: function(results, terms) {
-        // copy the lists
-        this._notDisplayedResult = results.slice(0);
-        this._terms = terms.slice(0);
-        this._pendingClear = true;
-    },
-
-    renderResults: function(metas) {
+    _renderResults: function(metas) {
         for (let i = 0; i < metas.length; i++) {
             let display = new ListSearchResult(this.provider, metas[i], this._terms);
+            display.actor.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
             this._content.add_actor(display.actor);
         }
     },
 
-    clear: function () {
+    _clearResultDisplay: function () {
         this._content.destroy_all_children();
-        this._pendingClear = false;
     },
 
     getFirstResult: function() {
-        if (this.getVisibleResultCount() > 0)
+        if (this._content.get_n_children() > 0)
             return this._content.get_child_at_index(0)._delegate;
         else
             return null;
     }
 });
+Signals.addSignalMethods(ListSearchResults.prototype);
 
 const GridSearchResults = new Lang.Class({
     Name: 'GridSearchResults',
+    Extends: SearchResultsBase,
 
     _init: function(provider) {
-        this.provider = provider;
+        this.parent(provider);
 
         this._grid = new IconGrid.IconGrid({ rowLimit: MAX_GRID_SEARCH_RESULTS_ROWS,
                                              xAlign: St.Align.START });
-        this.actor = new St.Bin({ x_align: St.Align.MIDDLE });
+        this._bin = new St.Bin({ x_align: St.Align.MIDDLE });
+        this._bin.set_child(this._grid.actor);
 
-        this.actor.set_child(this._grid.actor);
-
-        this._notDisplayedResult = [];
-        this._terms = [];
-        this._pendingClear = false;
+        this._resultDisplayBin.set_child(this._bin);
     },
 
-    getResultsForDisplay: function() {
-        let alreadyVisible = this._pendingClear ? 0 : this._grid.visibleItemsCount();
-        let canDisplay = this._grid.childrenInRow(this.actor.width) * this._grid.getRowLimit()
-                         - alreadyVisible;
-
-        let newResults = this._notDisplayedResult.splice(0, canDisplay);
-        return newResults;
+    _getMaxDisplayedResults: function() {
+        return this._grid.childrenInRow(this._bin.width) * this._grid.getRowLimit();
     },
 
-    getVisibleResultCount: function() {
-        return this._grid.visibleItemsCount();
-    },
-
-    hasMoreResults: function() {
-        return this._notDisplayedResult.length > 0;
-    },
-
-    setResults: function(results, terms) {
-        // copy the lists
-        this._notDisplayedResult = results.slice(0);
-        this._terms = terms.slice(0);
-        this._pendingClear = true;
-    },
-
-    renderResults: function(metas) {
+    _renderResults: function(metas) {
         for (let i = 0; i < metas.length; i++) {
             let display = new GridSearchResult(this.provider, metas[i], this._terms);
+            display.actor.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
             this._grid.addItem(display.actor);
         }
     },
 
-    clear: function () {
+    _clearResultDisplay: function () {
         this._grid.removeAll();
-        this._pendingClear = false;
     },
 
     getFirstResult: function() {
-        if (this.getVisibleResultCount() > 0)
+        if (this._grid.visibleItemsCount() > 0)
             return this._grid.getItemAtIndex(0)._delegate;
         else
             return null;
     }
 });
+Signals.addSignalMethods(GridSearchResults.prototype);
 
 const SearchResults = new Lang.Class({
     Name: 'SearchResults',
@@ -301,12 +356,20 @@ const SearchResults = new Lang.Class({
 
         this._content = new St.BoxLayout({ name: 'searchResultsContent',
                                            vertical: true });
+        this._contentBin = new MaxWidthBin({ name: 'searchResultsBin',
+                                             x_fill: true,
+                                             y_fill: true,
+                                             child: this._content });
+
+        let scrollChild = new St.BoxLayout();
+        scrollChild.add(this._contentBin, { expand: true });
 
         this._scrollView = new St.ScrollView({ x_fill: true,
                                                y_fill: false,
-                                               style_class: 'vfade' });
+                                               overlay_scrollbars: true,
+                                               style_class: 'search-display vfade' });
         this._scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
-        this._scrollView.add_actor(this._content);
+        this._scrollView.add_actor(scrollChild);
         let action = new Clutter.PanAction({ interpolate: true });
         action.connect('pan', Lang.bind(this, this._onPan));
         this._scrollView.add_action(action);
@@ -323,9 +386,9 @@ const SearchResults = new Lang.Class({
         this._content.add(this._statusBin, { expand: true });
         this._statusBin.add_actor(this._statusText);
         this._providers = this._searchSystem.getProviders();
-        this._providerMeta = [];
+        this._providerDisplays = {};
         for (let i = 0; i < this._providers.length; i++) {
-            this.createProviderMeta(this._providers[i]);
+            this.createProviderDisplay(this._providers[i]);
         }
 
         this._highlightDefault = false;
@@ -339,89 +402,61 @@ const SearchResults = new Lang.Class({
         return false;
     },
 
-    createProviderMeta: function(provider) {
-        let providerBox = new St.BoxLayout({ style_class: 'search-section',
-                                             vertical: true });
-        let providerIcon = null;
-        let resultDisplay = null;
-
-        if (provider.appInfo) {
-            resultDisplay = new ListSearchResults(provider);
-            providerIcon = resultDisplay.providerIcon;
-        } else {
-            resultDisplay = new GridSearchResults(provider);
-        }
-
-        let resultDisplayBin = new St.Bin({ child: resultDisplay.actor,
-                                            x_fill: true,
-                                            y_fill: true });
-        providerBox.add(resultDisplayBin, { expand: true });
-
-        let separator = new Separator.HorizontalSeparator({ style_class: 'search-section-separator' });
-        providerBox.add(separator.actor);
-
-        this._providerMeta.push({ provider: provider,
-                                  actor: providerBox,
-                                  icon: providerIcon,
-                                  resultDisplay: resultDisplay });
-        this._content.add(providerBox);
+    _keyFocusIn: function(provider, icon) {
+        Util.ensureActorVisibleInScrollView(this._scrollView, icon);
     },
 
-    destroyProviderMeta: function(provider) {
-        for (let i=0; i < this._providerMeta.length; i++) {
-            let meta = this._providerMeta[i];
-            if (meta.provider == provider) {
-                meta.actor.destroy();
-                this._providerMeta.splice(i, 1);
-                break;
-            }
+    createProviderDisplay: function(provider) {
+        let providerDisplay = null;
+
+        if (provider.appInfo) {
+            providerDisplay = new ListSearchResults(provider);
+        } else {
+            providerDisplay = new GridSearchResults(provider);
         }
+
+        providerDisplay.connect('key-focus-in', Lang.bind(this, this._keyFocusIn));
+        this._providerDisplays[provider.id] = providerDisplay;
+        this._content.add(providerDisplay.actor);
+    },
+
+    destroyProviderDisplay: function(provider) {
+        this._providerDisplays[provider.id].destroy();
+        delete this._providerDisplays[provider.id];
     },
 
     _clearDisplay: function() {
-        for (let i = 0; i < this._providerMeta.length; i++) {
-            let meta = this._providerMeta[i];
-            meta.resultDisplay.clear();
-            meta.actor.hide();
+        for (let i = 0; i < this._providers.length; i++) {
+            let provider = this._providers[i];
+            let providerDisplay = this._providerDisplays[provider.id];
+            providerDisplay.clear();
         }
     },
 
-    _clearDisplayForProvider: function(provider) {
-        let meta = this._metaForProvider(provider);
-        meta.resultDisplay.clear();
-        meta.actor.hide();
-    },
-
     reset: function() {
         this._searchSystem.reset();
         this._statusBin.hide();
         this._clearDisplay();
+        this._defaultResult = null;
     },
 
     startingSearch: function() {
         this.reset();
-        this._statusText.set_text(_("Searching..."));
+        this._statusText.set_text(_("Searching…"));
         this._statusBin.show();
     },
 
-    doSearch: function (searchString) {
-        this._searchSystem.updateSearch(searchString);
-    },
-
-    _metaForProvider: function(provider) {
-        return this._providerMeta[this._providers.indexOf(provider)];
-    },
-
     _maybeSetInitialSelection: function() {
         let newDefaultResult = null;
 
-        for (let i = 0; i < this._providerMeta.length; i++) {
-            let meta = this._providerMeta[i];
+        for (let i = 0; i < this._providers.length; i++) {
+            let provider = this._providers[i];
+            let display = this._providerDisplays[provider.id];
 
-            if (!meta.actor.visible)
+            if (!display.actor.visible)
                 continue;
 
-            let firstResult = meta.resultDisplay.getFirstResult();
+            let firstResult = display.getFirstResult();
             if (firstResult) {
                 newDefaultResult = firstResult;
                 break; // select this one!
@@ -441,11 +476,14 @@ const SearchResults = new Lang.Class({
     _updateStatusText: function () {
         let haveResults = false;
 
-        for (let i = 0; i < this._providerMeta.length; ++i)
-            if (this._providerMeta[i].resultDisplay.getFirstResult()) {
+        for (let i = 0; i < this._providers.length; i++) {
+            let provider = this._providers[i];
+            let display = this._providerDisplays[provider.id];
+            if (display.getFirstResult()) {
                 haveResults = true;
                 break;
             }
+        }
 
         if (!haveResults) {
             this._statusText.set_text(_("No results."));
@@ -458,42 +496,12 @@ const SearchResults = new Lang.Class({
     _updateResults: function(searchSystem, results) {
         let terms = searchSystem.getTerms();
         let [provider, providerResults] = results;
-        let meta = this._metaForProvider(provider);
+        let display = this._providerDisplays[provider.id];
 
-        if (providerResults.length == 0) {
-            this._clearDisplayForProvider(provider);
-            meta.resultDisplay.setResults([], []);
+        display.updateSearch(providerResults, terms, Lang.bind(this, function() {
             this._maybeSetInitialSelection();
             this._updateStatusText();
-        } else {
-            meta.resultDisplay.setResults(providerResults, terms);
-            let results = meta.resultDisplay.getResultsForDisplay();
-
-            if (meta.icon)
-                meta.icon.moreIcon.visible =
-                    meta.resultDisplay.hasMoreResults() &&
-                    provider.canLaunchSearch;
-
-            provider.getResultMetas(results, Lang.bind(this, function(metas) {
-                this._clearDisplayForProvider(provider);
-                meta.actor.show();
-
-                // Hiding drops the key focus if we have it
-                let focus = global.stage.get_key_focus();
-                // To avoid CSS transitions causing flickering when
-                // the first search result stays the same, we hide the
-                // content while filling in the results.
-                this._content.hide();
-
-                meta.resultDisplay.renderResults(metas);
-                this._maybeSetInitialSelection();
-                this._updateStatusText();
-
-                this._content.show();
-                if (this._content.contains(focus))
-                    global.stage.set_key_focus(focus);
-            }));
-        }
+        }));
     },
 
     activateDefault: function() {
@@ -533,6 +541,7 @@ const ProviderIcon = new Lang.Class({
         this.parent({ style_class: 'search-provider-icon',
                       reactive: true,
                       can_focus: true,
+                      accessible_name: provider.appInfo.get_name(),
                       track_hover: true });
 
         this._content = new St.Widget({ layout_manager: new Clutter.BinLayout() });

js/ui/sessionMode.js

@@ -15,6 +15,8 @@ const DEFAULT_MODE = 'restrictive';
 const _modes = {
     'restrictive': {
         parentMode: null,
+        stylesheetName: 'gnome-shell.css',
+        overridesSchema: 'org.gnome.shell.overrides',
         hasOverview: false,
         showCalendarEvents: false,
         allowSettings: false,
@@ -44,9 +46,9 @@ const _modes = {
         unlockDialog: imports.gdm.loginDialog.LoginDialog,
         components: ['polkitAgent'],
         panel: {
-            left: ['logo'],
+            left: [],
             center: ['dateMenu'],
-            right: ['a11y', 'display', 'keyboard',
+            right: ['a11yGreeter', 'display', 'keyboard',
                     'volume', 'battery', 'powerMenu']
         },
         panelStyle: 'login-screen'
@@ -58,7 +60,7 @@ const _modes = {
         unlockDialog: undefined,
         components: ['polkitAgent', 'telepathyClient'],
         panel: {
-            left: ['userMenu'],
+            left: [],
             center: [],
             right: ['lockScreen']
         },
@@ -70,23 +72,13 @@ const _modes = {
         unlockDialog: undefined,
         components: ['polkitAgent', 'telepathyClient'],
         panel: {
-            left: ['userMenu'],
+            left: [],
             center: [],
             right: ['a11y', 'keyboard', 'lockScreen']
         },
         panelStyle: 'unlock-screen'
     },
 
-    'initial-setup': {
-        isPrimary: true,
-        components: ['keyring'],
-        panel: {
-            left: [],
-            center: ['dateMenu'],
-            right: ['a11y', 'keyboard', 'volume']
-        }
-    },
-
     'user': {
         hasOverview: true,
         showCalendarEvents: true,
@@ -105,7 +97,7 @@ const _modes = {
             left: ['activities', 'appMenu'],
             center: ['dateMenu'],
             right: ['a11y', 'keyboard', 'volume', 'bluetooth',
-                    'network', 'battery', 'userMenu']
+                    'network', 'battery', 'system']
         }
     }
 };
@@ -157,12 +149,7 @@ function listModes() {
 const SessionMode = new Lang.Class({
     Name: 'SessionMode',
 
-    _init: function() {
-        global.connect('notify::session-mode', Lang.bind(this, this._sync));
-        this._modes = _modes;
-        this._modeStack = [DEFAULT_MODE];
-        this._sync();
-
+    init: function() {
         _getModes(Lang.bind(this, function(modes) {
             this._modes = modes;
             let primary = modes[global.session_mode] &&
@@ -170,6 +157,8 @@ const SessionMode = new Lang.Class({
             let mode = primary ? global.session_mode : 'user';
             this._modeStack = [mode];
             this._sync();
+
+            this.emit('sessions-loaded');
         }));
     },
 
@@ -196,6 +185,10 @@ const SessionMode = new Lang.Class({
         return this._modeStack[this._modeStack.length - 1];
     },
 
+    get allowScreencast() {
+        return this.components.indexOf('recorder') != -1;
+    },
+
     _sync: function() {
         let params = this._modes[this.currentMode];
         let defaults;

js/ui/shellDBus.js

@@ -1,15 +1,18 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Lang = imports.lang;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
+const Lang = imports.lang;
+const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
 
 const Config = imports.misc.config;
 const ExtensionSystem = imports.ui.extensionSystem;
 const ExtensionDownloader = imports.ui.extensionDownloader;
 const ExtensionUtils = imports.misc.extensionUtils;
+const Hash = imports.misc.hash;
 const Main = imports.ui.main;
+const Screencast = imports.ui.screencast;
 const Screenshot = imports.ui.screenshot;
 
 const GnomeShellIface = <interface name="org.gnome.Shell">
@@ -18,6 +21,28 @@ const GnomeShellIface = <interface name="org.gnome.Shell">
     <arg type="b" direction="out" name="success" />
     <arg type="s" direction="out" name="result" />
 </method>
+<method name="FocusSearch"/>
+<method name="ShowOSD">
+    <arg type="a{sv}" direction="in" name="params"/>
+</method>
+<method name="GrabAccelerator">
+    <arg type="s" direction="in" name="accelerator"/>
+    <arg type="u" direction="in" name="flags"/>
+    <arg type="u" direction="out" name="action"/>
+</method>
+<method name="GrabAccelerators">
+    <arg type="a(su)" direction="in" name="accelerators"/>
+    <arg type="au" direction="out" name="actions"/>
+</method>
+<method name="UngrabAccelerator">
+    <arg type="u" direction="in" name="action"/>
+    <arg type="b" direction="out" name="success"/>
+</method>
+<signal name="AcceleratorActivated">
+    <arg name="action" type="u" />
+    <arg name="deviceid" type="u" />
+    <arg name="timestamp" type="u" />
+</signal>
 <property name="Mode" type="s" access="read" />
 <property name="OverviewActive" type="b" access="readwrite" />
 <property name="ShellVersion" type="s" access="read" />
@@ -47,8 +72,17 @@ const GnomeShell = new Lang.Class({
         this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(GnomeShellIface, this);
         this._dbusImpl.export(Gio.DBus.session, '/org/gnome/Shell');
 
-        this._extensionsSerivce = new GnomeShellExtensions();
+        this._extensionsService = new GnomeShellExtensions();
+        this._screencastService = new Screencast.ScreencastService();
         this._screenshotService = new Screenshot.ScreenshotService();
+
+        this._grabbedAccelerators = new Hash.Map();
+        this._grabbers = new Hash.Map();
+
+        global.display.connect('accelerator-activated', Lang.bind(this,
+            function(display, action, deviceid, timestamp) {
+                this._emitAcceleratorActivated(action, deviceid, timestamp);
+            }));
     },
 
     /**
@@ -67,7 +101,7 @@ const GnomeShell = new Lang.Class({
      */
     Eval: function(code) {
         if (!global.settings.get_boolean('development-tools'))
-            return [false, null];
+            return [false, ''];
 
         let returnValue;
         let success;
@@ -84,6 +118,106 @@ const GnomeShell = new Lang.Class({
         return [success, returnValue];
     },
 
+    FocusSearch: function() {
+        Main.overview.focusSearch();
+    },
+
+    ShowOSD: function(params) {
+        for (let param in params)
+            params[param] = params[param].deep_unpack();
+
+        let icon = null;
+        if (params['icon'])
+            icon = Gio.Icon.new_for_string(params['icon']);
+
+        Main.osdWindow.setIcon(icon);
+        Main.osdWindow.setLabel(params['label']);
+        Main.osdWindow.setLevel(params['level']);
+
+        Main.osdWindow.show();
+    },
+
+    GrabAcceleratorAsync: function(params, invocation) {
+        let [accel, flags] = params;
+        let sender = invocation.get_sender();
+        let bindingAction = this._grabAcceleratorForSender(accel, flags, sender);
+        return invocation.return_value(GLib.Variant.new('(u)', [bindingAction]));
+    },
+
+    GrabAcceleratorsAsync: function(params, invocation) {
+        let [accels] = params;
+        let sender = invocation.get_sender();
+        let bindingActions = [];
+        for (let i = 0; i < accels.length; i++) {
+            let [accel, flags] = accels[i];
+            bindingActions.push(this._grabAcceleratorForSender(accel, flags, sender));
+        }
+        return invocation.return_value(GLib.Variant.new('(au)', [bindingActions]));
+    },
+
+    UngrabAcceleratorAsync: function(params, invocation) {
+        let [action] = params;
+        let grabbedBy = this._grabbedAccelerators.get(action);
+        if (invocation.get_sender() != grabbedBy)
+            return invocation.return_value(GLib.Variant.new('(b)', [false]));
+
+        let ungrabSucceeded = global.display.ungrab_accelerator(action);
+        if (ungrabSucceeded)
+            this._grabbedAccelerators.delete(action);
+        return invocation.return_value(GLib.Variant.new('(b)', [ungrabSucceeded]));
+    },
+
+    _emitAcceleratorActivated: function(action, deviceid, timestamp) {
+        let destination = this._grabbedAccelerators.get(action);
+        if (!destination)
+            return;
+
+        let connection = this._dbusImpl.get_connection();
+        let info = this._dbusImpl.get_info();
+        connection.emit_signal(destination,
+                               this._dbusImpl.get_object_path(),
+                               info ? info.name : null,
+                               'AcceleratorActivated',
+                               GLib.Variant.new('(uuu)', [action, deviceid, timestamp]));
+    },
+
+    _grabAcceleratorForSender: function(accelerator, flags, sender) {
+        let bindingAction = global.display.grab_accelerator(accelerator);
+        if (bindingAction == Meta.KeyBindingAction.NONE)
+            return Meta.KeyBindingAction.NONE;
+
+        let bindingName = Meta.external_binding_name_for_action(bindingAction);
+        Main.wm.allowKeybinding(bindingName, flags);
+
+        this._grabbedAccelerators.set(bindingAction, sender);
+
+        if (!this._grabbers.has(sender)) {
+            let id = Gio.bus_watch_name(Gio.BusType.SESSION, sender, 0, null,
+                                        Lang.bind(this, this._onGrabberBusNameVanished));
+            this._grabbers.set(sender, id);
+        }
+
+        return bindingAction;
+    },
+
+    _ungrabAccelerator: function(action) {
+        let ungrabSucceeded = global.display.ungrab_accelerator(action);
+        if (ungrabSucceeded)
+            this._grabbedAccelerators.delete(action);
+    },
+
+    _onGrabberBusNameVanished: function(connection, name) {
+        let grabs = this._grabbedAccelerators.items();
+        for (let i = 0; i < grabs.length; i++) {
+            let [action, sender] = grabs[i];
+            if (sender == name)
+                this._ungrabAccelerator(action);
+        }
+        Gio.bus_unwatch_name(this._grabbers.get(name));
+        this._grabbers.delete(name);
+    },
+
+
     Mode: global.session_mode,
 
     get OverviewActive() {
@@ -247,8 +381,8 @@ const ScreenSaverDBus = new Lang.Class({
         this.parent();
 
         this._screenShield = screenShield;
-        screenShield.connect('lock-status-changed', Lang.bind(this, function(shield) {
-            this._dbusImpl.emit_signal('ActiveChanged', GLib.Variant.new('(b)', [shield.locked]));
+        screenShield.connect('active-changed', Lang.bind(this, function(shield) {
+            this._dbusImpl.emit_signal('ActiveChanged', GLib.Variant.new('(b)', [shield.active]));
         }));
 
         this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(ScreenSaverIface, this);
@@ -269,13 +403,13 @@ const ScreenSaverDBus = new Lang.Class({
 
     SetActive: function(active) {
         if (active)
-            this._screenShield.lock(true);
+            this._screenShield.activate(true);
         else
-            this._screenShield.unlock();
+            this._screenShield.deactivate(false);
     },
 
     GetActive: function() {
-        return this._screenShield.locked;
+        return this._screenShield.active;
     },
 
     GetActiveTime: function() {

js/ui/shellEntry.js

@@ -1,8 +1,11 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const St = imports.gi.St;
 
+const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 const PopupMenu = imports.ui.popupMenu;
@@ -11,9 +14,7 @@ const EntryMenu = new Lang.Class({
     Name: 'ShellEntryMenu',
     Extends: PopupMenu.PopupMenu,
 
-    _init: function(entry, params) {
-        params = Params.parse (params, { isPassword: false });
-
+    _init: function(entry) {
         this.parent(entry, 0, St.Side.TOP);
 
         this.actor.add_style_class_name('entry-context-menu');
@@ -34,8 +35,6 @@ const EntryMenu = new Lang.Class({
         this._pasteItem = item;
 
         this._passwordItem = null;
-        if (params.isPassword)
-	    this._makePasswordItem();
 
         Main.uiGroup.add_actor(this.actor);
         this.actor.hide();
@@ -50,47 +49,45 @@ const EntryMenu = new Lang.Class({
     },
 
     get isPassword() {
-	return this._passwordItem != null;
+        return this._passwordItem != null;
     },
 
     set isPassword(v) {
-	if (v == this.isPassword)
-	    return;
+        if (v == this.isPassword)
+            return;
 
-	if (v)
-	    this._makePasswordItem();
-	else {
-	    this._passwordItem.destroy();
-	    this._passwordItem = null;
-	}
+        if (v) {
+            this._makePasswordItem();
+            this._entry.input_purpose = Gtk.InputPurpose.PASSWORD;
+        } else {
+            this._passwordItem.destroy();
+            this._passwordItem = null;
+            this._entry.input_purpose = Gtk.InputPurpose.FREE_FORM;
+        }
     },
 
-    open: function() {
+    open: function(animate) {
         this._updatePasteItem();
         this._updateCopyItem();
         if (this._passwordItem)
             this._updatePasswordItem();
 
+        this.parent(animate);
+        this._entry.add_style_pseudo_class('focus');
+
         let direction = Gtk.DirectionType.TAB_FORWARD;
         if (!this.actor.navigate_focus(null, direction, false))
             this.actor.grab_key_focus();
-
-        this.parent();
-        this._entry.add_style_pseudo_class('focus');
-    },
-
-    close: function() {
-        this._entry.grab_key_focus();
-        this.parent();
     },
 
     _updateCopyItem: function() {
         let selection = this._entry.clutter_text.get_selection();
-        this._copyItem.setSensitive(selection && selection != '');
+        this._copyItem.setSensitive(!this._entry.clutter_text.password_char &&
+                                    selection && selection != '');
     },
 
     _updatePasteItem: function() {
-        this._clipboard.get_text(Lang.bind(this,
+        this._clipboard.get_text(St.ClipboardType.CLIPBOARD, Lang.bind(this,
             function(clipboard, text) {
                 this._pasteItem.setSensitive(text && text != '');
             }));
@@ -106,11 +103,11 @@ const EntryMenu = new Lang.Class({
 
     _onCopyActivated: function() {
         let selection = this._entry.clutter_text.get_selection();
-        this._clipboard.set_text(selection);
+        this._clipboard.set_text(St.ClipboardType.CLIPBOARD, selection);
     },
 
     _onPasteActivated: function() {
-        this._clipboard.get_text(Lang.bind(this,
+        this._clipboard.get_text(St.ClipboardType.CLIPBOARD, Lang.bind(this,
             function(clipboard, text) {
                 if (!text)
                     return;
@@ -134,12 +131,12 @@ function _setMenuAlignment(entry, stageX) {
 
 function _onButtonPressEvent(actor, event, entry) {
     if (entry.menu.isOpen) {
-        entry.menu.close();
+        entry.menu.close(BoxPointer.PopupAnimation.FULL);
         return true;
     } else if (event.get_button() == 3) {
         let [stageX, stageY] = event.get_coords();
         _setMenuAlignment(entry, stageX);
-        entry.menu.open();
+        entry.menu.open(BoxPointer.PopupAnimation.FULL);
         return true;
     }
     return false;
@@ -149,14 +146,17 @@ function _onPopup(actor, entry) {
     let [success, textX, textY, lineHeight] = entry.clutter_text.position_to_coords(-1);
     if (success)
         entry.menu.setSourceAlignment(textX / entry.width);
-    entry.menu.open();
+    entry.menu.open(BoxPointer.PopupAnimation.FULL);
 };
 
 function addContextMenu(entry, params) {
     if (entry.menu)
         return;
 
-    entry.menu = new EntryMenu(entry, params);
+    params = Params.parse (params, { isPassword: false });
+
+    entry.menu = new EntryMenu(entry);
+    entry.menu.isPassword = params.isPassword;
     entry._menuManager = new PopupMenu.PopupMenuManager({ actor: entry });
     entry._menuManager.addMenu(entry.menu);
 
@@ -167,4 +167,10 @@ function addContextMenu(entry, params) {
     entry.connect('button-press-event', Lang.bind(null, _onButtonPressEvent, entry));
 
     entry.connect('popup-menu', Lang.bind(null, _onPopup, entry));
+
+    entry.connect('destroy', function() {
+        entry.menu.destroy();
+        entry.menu = null;
+        entry._menuManager = null;
+    });
 }

js/ui/slider.js

@@ -0,0 +1,210 @@
+/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
+
+const Cairo = imports.cairo;
+const Clutter = imports.gi.Clutter;
+const Lang = imports.lang;
+const St = imports.gi.St;
+const Signals = imports.signals;
+
+const SLIDER_SCROLL_STEP = 0.05; /* Slider scrolling step in % */
+
+const Slider = new Lang.Class({
+    Name: "Slider",
+
+    _init: function(value) {
+        if (isNaN(value))
+            // Avoid spreading NaNs around
+            throw TypeError('The slider value must be a number');
+        this._value = Math.max(Math.min(value, 1), 0);
+
+        this.actor = new St.DrawingArea({ style_class: 'slider',
+                                          can_focus: true,
+                                          reactive: true });
+        this.actor.connect('repaint', Lang.bind(this, this._sliderRepaint));
+        this.actor.connect('button-press-event', Lang.bind(this, this._startDragging));
+        this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
+        this.actor.connect('key-press-event', Lang.bind(this, this._onKeyPressEvent));
+
+        this._releaseId = this._motionId = 0;
+        this._dragging = false;
+    },
+
+    setValue: function(value) {
+        if (isNaN(value))
+            throw TypeError('The slider value must be a number');
+
+        this._value = Math.max(Math.min(value, 1), 0);
+        this.actor.queue_repaint();
+    },
+
+    _sliderRepaint: function(area) {
+        let cr = area.get_context();
+        let themeNode = area.get_theme_node();
+        let [width, height] = area.get_surface_size();
+
+        let handleRadius = themeNode.get_length('-slider-handle-radius');
+
+        let handleBorderWidth = themeNode.get_length('-slider-handle-border-width');
+        let [hasHandleColor, handleBorderColor] =
+            themeNode.lookup_color('-slider-handle-border-color', false);
+
+        let sliderHeight = themeNode.get_length('-slider-height');
+
+        let sliderBorderWidth = themeNode.get_length('-slider-border-width');
+        let sliderBorderRadius = Math.min(width, sliderHeight) / 2;
+
+        let sliderBorderColor = themeNode.get_color('-slider-border-color');
+        let sliderColor = themeNode.get_color('-slider-background-color');
+
+        let sliderActiveBorderColor = themeNode.get_color('-slider-active-border-color');
+        let sliderActiveColor = themeNode.get_color('-slider-active-background-color');
+
+        const TAU = Math.PI * 2;
+
+        let handleX = handleRadius + (width - 2 * handleRadius) * this._value;
+
+        cr.arc(sliderBorderRadius + sliderBorderWidth, height / 2, sliderBorderRadius, TAU * 1/4, TAU * 3/4);
+        cr.lineTo(handleX, (height - sliderHeight) / 2);
+        cr.lineTo(handleX, (height + sliderHeight) / 2);
+        cr.lineTo(sliderBorderRadius + sliderBorderWidth, (height + sliderHeight) / 2);
+        Clutter.cairo_set_source_color(cr, sliderActiveColor);
+        cr.fillPreserve();
+        Clutter.cairo_set_source_color(cr, sliderActiveBorderColor);
+        cr.setLineWidth(sliderBorderWidth);
+        cr.stroke();
+
+        cr.arc(width - sliderBorderRadius - sliderBorderWidth, height / 2, sliderBorderRadius, TAU * 3/4, TAU * 1/4);
+        cr.lineTo(handleX, (height + sliderHeight) / 2);
+        cr.lineTo(handleX, (height - sliderHeight) / 2);
+        cr.lineTo(width - sliderBorderRadius - sliderBorderWidth, (height - sliderHeight) / 2);
+        Clutter.cairo_set_source_color(cr, sliderColor);
+        cr.fillPreserve();
+        Clutter.cairo_set_source_color(cr, sliderBorderColor);
+        cr.setLineWidth(sliderBorderWidth);
+        cr.stroke();
+
+        let handleY = height / 2;
+
+        let color = themeNode.get_foreground_color();
+        Clutter.cairo_set_source_color(cr, color);
+        cr.arc(handleX, handleY, handleRadius, 0, 2 * Math.PI);
+        cr.fillPreserve();
+        if (hasHandleColor && handleBorderWidth) {
+            Clutter.cairo_set_source_color(cr, handleBorderColor);
+            cr.setLineWidth(handleBorderWidth);
+            cr.stroke();
+        }
+        cr.$dispose();
+    },
+
+    _startDragging: function(actor, event) {
+        this.startDragging(event);
+    },
+
+    startDragging: function(event) {
+        if (this._dragging)
+            return false;
+
+        this._dragging = true;
+
+        let device = event.get_device();
+        device.grab(this.actor);
+        this._grabbedDevice = device;
+
+        this._releaseId = this.actor.connect('button-release-event', Lang.bind(this, this._endDragging));
+        this._motionId = this.actor.connect('motion-event', Lang.bind(this, this._motionEvent));
+        let absX, absY;
+        [absX, absY] = event.get_coords();
+        this._moveHandle(absX, absY);
+        return true;
+    },
+
+    _endDragging: function() {
+        if (this._dragging) {
+            this.actor.disconnect(this._releaseId);
+            this.actor.disconnect(this._motionId);
+
+            this._grabbedDevice.ungrab();
+            this._grabbedDevice = null;
+            this._dragging = false;
+
+            this.emit('drag-end');
+        }
+        return true;
+    },
+
+    scroll: function(event) {
+        let direction = event.get_scroll_direction();
+        let delta;
+
+        if (event.is_pointer_emulated())
+            return;
+
+        if (direction == Clutter.ScrollDirection.DOWN) {
+            delta = -SLIDER_SCROLL_STEP;
+        } else if (direction == Clutter.ScrollDirection.UP) {
+            delta = +SLIDER_SCROLL_STEP;
+        } else if (direction == Clutter.ScrollDirection.SMOOTH) {
+            let [dx, dy] = event.get_scroll_delta();
+            // Even though the slider is horizontal, use dy to match
+            // the UP/DOWN above.
+            delta = -dy / 10;
+        }
+
+        this._value = Math.min(Math.max(0, this._value + delta), 1);
+
+        this.actor.queue_repaint();
+        this.emit('value-changed', this._value);
+    },
+
+    _onScrollEvent: function(actor, event) {
+        this.scroll(event);
+    },
+
+    _motionEvent: function(actor, event) {
+        let absX, absY;
+        [absX, absY] = event.get_coords();
+        this._moveHandle(absX, absY);
+        return true;
+    },
+
+    _onKeyPressEvent: function (actor, event) {
+        let key = event.get_key_symbol();
+        if (key == Clutter.KEY_Right || key == Clutter.KEY_Left) {
+            let delta = key == Clutter.KEY_Right ? 0.1 : -0.1;
+            this._value = Math.max(0, Math.min(this._value + delta, 1));
+            this._slider.queue_repaint();
+            this.emit('value-changed', this._value);
+            this.emit('drag-end');
+            return true;
+        }
+        return false;
+    },
+
+    _moveHandle: function(absX, absY) {
+        let relX, relY, sliderX, sliderY;
+        [sliderX, sliderY] = this.actor.get_transformed_position();
+        relX = absX - sliderX;
+        relY = absY - sliderY;
+
+        let width = this.actor.width;
+        let handleRadius = this.actor.get_theme_node().get_length('-slider-handle-radius');
+
+        let newvalue;
+        if (relX < handleRadius)
+            newvalue = 0;
+        else if (relX > width - handleRadius)
+            newvalue = 1;
+        else
+            newvalue = (relX - handleRadius) / (width - 2 * handleRadius);
+        this._value = newvalue;
+        this.actor.queue_repaint();
+        this.emit('value-changed', this._value);
+    },
+
+    get value() {
+        return this._value;
+    }
+});
+
+Signals.addSignalMethods(Slider.prototype);

js/ui/status/accessibility.js

@@ -2,6 +2,7 @@
 
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
+const Mainloop = imports.mainloop;
 
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
@@ -14,12 +15,7 @@ const KEY_MOUSE_KEYS_ENABLED  = 'mousekeys-enable';
 
 const APPLICATIONS_SCHEMA = 'org.gnome.desktop.a11y.applications';
 
-const DPI_LOW_REASONABLE_VALUE  = 50;
-const DPI_HIGH_REASONABLE_VALUE = 500;
-
 const DPI_FACTOR_LARGE   = 1.25;
-const DPI_FACTOR_LARGER  = 1.5;
-const DPI_FACTOR_LARGEST = 2.0;
 
 const WM_SCHEMA            = 'org.gnome.desktop.wm.preferences';
 const KEY_VISUAL_BELL      = 'visual-bell';
@@ -72,8 +68,24 @@ const ATIndicator = new Lang.Class({
         let mouseKeys = this._buildItem(_("Mouse Keys"), A11Y_SCHEMA, KEY_MOUSE_KEYS_ENABLED);
         this.menu.addMenuItem(mouseKeys);
 
-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.menu.addSettingsAction(_("Universal Access Settings"), 'gnome-universal-access-panel.desktop');
+        this._syncMenuVisibility();
+    },
+
+    _syncMenuVisibility: function() {
+        this._syncMenuVisibilityIdle = 0;
+
+        let items = this.menu._getMenuItems();
+
+        this.actor.visible = items.some(function(f) { return !!f.state; });
+
+        return false;
+    },
+
+    _queueSyncMenuVisibility: function() {
+        if (this._syncMenuVisibilityIdle)
+            return;
+
+        this._syncMenuVisbilityIdle = Mainloop.idle_add(Lang.bind(this, this._syncMenuVisibility));
     },
 
     _buildItemExtended: function(string, initial_value, writable, on_set) {
@@ -95,9 +107,11 @@ const ATIndicator = new Lang.Class({
             function(enabled) {
                 return settings.set_boolean(key, enabled);
             });
-        settings.connect('changed::'+key, function() {
+        settings.connect('changed::'+key, Lang.bind(this, function() {
             widget.setToggleState(settings.get_boolean(key));
-        });
+
+            this._queueSyncMenuVisibility();
+        }));
         return widget;
     },
 
@@ -129,7 +143,7 @@ const ATIndicator = new Lang.Class({
                     wmSettings.reset(KEY_WM_THEME);
                 }
             });
-        interfaceSettings.connect('changed::' + KEY_GTK_THEME, function() {
+        interfaceSettings.connect('changed::' + KEY_GTK_THEME, Lang.bind(this, function() {
             let value = interfaceSettings.get_string(KEY_GTK_THEME);
             if (value == HIGH_CONTRAST_THEME) {
                 highContrast.setToggleState(true);
@@ -137,7 +151,9 @@ const ATIndicator = new Lang.Class({
                 highContrast.setToggleState(false);
                 gtkTheme = value;
             }
-        });
+
+            this._queueSyncMenuVisibility();
+        }));
         interfaceSettings.connect('changed::' + KEY_ICON_THEME, function() {
             let value = interfaceSettings.get_string(KEY_ICON_THEME);
             if (value != HIGH_CONTRAST_THEME)
@@ -166,11 +182,22 @@ const ATIndicator = new Lang.Class({
                 else
                     settings.reset(KEY_TEXT_SCALING_FACTOR);
             });
-        settings.connect('changed::' + KEY_TEXT_SCALING_FACTOR, function() {
+        settings.connect('changed::' + KEY_TEXT_SCALING_FACTOR, Lang.bind(this, function() {
             let factor = settings.get_double(KEY_TEXT_SCALING_FACTOR);
             let active = (factor > 1.0);
             widget.setToggleState(active);
-        });
+
+            this._queueSyncMenuVisibility();
+        }));
         return widget;
     }
 });
+
+const ATGreeterIndicator = new Lang.Class({
+    Name: 'ATGreeterIndicator',
+    Extends: ATIndicator,
+
+    // Override visibility handling to be always visible
+    _syncMenuVisibility: function() { },
+    _queueSyncMenuVisibility: function() { }
+});

js/ui/status/bluetooth.js

@@ -9,16 +9,10 @@ const St = imports.gi.St;
 
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
+const NotificationDaemon = imports.ui.notificationDaemon;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 
-const ConnectionState = {
-    DISCONNECTED: 0,
-    CONNECTED: 1,
-    DISCONNECTING: 2,
-    CONNECTING: 3
-}
-
 const Indicator = new Lang.Class({
     Name: 'BTIndicator',
     Extends: PanelMenu.SystemStatusButton,
@@ -26,273 +20,56 @@ const Indicator = new Lang.Class({
     _init: function() {
         this.parent('bluetooth-disabled-symbolic', _("Bluetooth"));
 
+        // The Bluetooth menu only appears when Bluetooth is in use,
+        // so just statically build it with a "Turn Off" menu item.
+        this._item = new PopupMenu.PopupSubMenuMenuItem(_("Bluetooth"), true);
+        this._item.icon.icon_name = 'bluetooth-active-symbolic';
+        this._item.menu.addAction(_("Turn Off"), Lang.bind(this, function() {
+            this._applet.killswitch_state = GnomeBluetooth.KillswitchState.SOFT_BLOCKED;
+        }));
+        this._item.menu.addSettingsAction(_("Bluetooth Settings"), 'gnome-bluetooth-panel.desktop');
+
         this._applet = new GnomeBluetoothApplet.Applet();
-
-        this._killswitch = new PopupMenu.PopupSwitchMenuItem(_("Bluetooth"), false);
-        this._applet.connect('notify::killswitch-state', Lang.bind(this, this._updateKillswitch));
-        this._killswitch.connect('toggled', Lang.bind(this, function() {
-            let current_state = this._applet.killswitch_state;
-            if (current_state != GnomeBluetooth.KillswitchState.HARD_BLOCKED &&
-                current_state != GnomeBluetooth.KillswitchState.NO_ADAPTER) {
-                this._applet.killswitch_state = this._killswitch.state ?
-                    GnomeBluetooth.KillswitchState.UNBLOCKED:
-                    GnomeBluetooth.KillswitchState.SOFT_BLOCKED;
-            } else
-                this._killswitch.setToggleState(false);
-        }));
-
-        this._discoverable = new PopupMenu.PopupSwitchMenuItem(_("Visibility"), this._applet.discoverable);
-        this._applet.connect('notify::discoverable', Lang.bind(this, function() {
-            this._discoverable.setToggleState(this._applet.discoverable);
-        }));
-        this._discoverable.connect('toggled', Lang.bind(this, function() {
-            this._applet.discoverable = this._discoverable.state;
-        }));
-
-        this._updateKillswitch();
-        this.menu.addMenuItem(this._killswitch);
-        this.menu.addMenuItem(this._discoverable);
-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-
-        this._fullMenuItems = [new PopupMenu.PopupSeparatorMenuItem(),
-                               new PopupMenu.PopupMenuItem(_("Send Files to Device...")),
-                               new PopupMenu.PopupMenuItem(_("Set up a New Device...")),
-                               new PopupMenu.PopupSeparatorMenuItem()];
-        this._hasDevices = false;
-
-        this._fullMenuItems[1].connect('activate', function() {
-            GLib.spawn_command_line_async('bluetooth-sendto');
-        });
-        this._fullMenuItems[2].connect('activate', function() {
-            GLib.spawn_command_line_async('bluetooth-wizard');
-        });
-
-        for (let i = 0; i < this._fullMenuItems.length; i++) {
-            let item = this._fullMenuItems[i];
-            this.menu.addMenuItem(item);
-        }
-
-        this._deviceItemPosition = 3;
-        this._deviceItems = [];
-        this._applet.connect('devices-changed', Lang.bind(this, this._updateDevices));
-        this._updateDevices();
-
-        this._applet.connect('notify::show-full-menu', Lang.bind(this, this._updateFullMenu));
-        this._updateFullMenu();
-
-        this.menu.addSettingsAction(_("Bluetooth Settings"), 'gnome-bluetooth-panel.desktop');
+        this._applet.connect('devices-changed', Lang.bind(this, this._sync));
+        this._sync();
 
         this._applet.connect('pincode-request', Lang.bind(this, this._pinRequest));
         this._applet.connect('confirm-request', Lang.bind(this, this._confirmRequest));
         this._applet.connect('auth-request', Lang.bind(this, this._authRequest));
+        this._applet.connect('auth-service-request', Lang.bind(this, this._authServiceRequest));
         this._applet.connect('cancel-request', Lang.bind(this, this._cancelRequest));
     },
 
-    _updateKillswitch: function() {
-        let current_state = this._applet.killswitch_state;
-        let on = current_state == GnomeBluetooth.KillswitchState.UNBLOCKED;
-        let has_adapter = current_state != GnomeBluetooth.KillswitchState.NO_ADAPTER;
-        let can_toggle = current_state != GnomeBluetooth.KillswitchState.NO_ADAPTER &&
-                         current_state != GnomeBluetooth.KillswitchState.HARD_BLOCKED;
+    _sync: function() {
+        let connectedDevices = this._applet.get_devices().filter(function(device) {
+            return device.connected;
+        });
+        let nDevices = connectedDevices.length;
 
-        this._killswitch.setToggleState(on);
-        if (can_toggle)
-            this._killswitch.setStatus(null);
-        else
-            /* TRANSLATORS: this means that bluetooth was disabled by hardware rfkill */
-            this._killswitch.setStatus(_("hardware disabled"));
+        let on = nDevices > 0;
+        this.mainIcon.visible = on;
+        this.actor.visible = on;
 
-        this.actor.visible = has_adapter;
-
-        if (on) {
-            this._discoverable.actor.show();
-            this.setIcon('bluetooth-active-symbolic');
-        } else {
-            this._discoverable.actor.hide();
-            this.setIcon('bluetooth-disabled-symbolic');
-        }
-    },
-
-    _updateDevices: function() {
-        let devices = this._applet.get_devices();
-
-        let newlist = [ ];
-        for (let i = 0; i < this._deviceItems.length; i++) {
-            let item = this._deviceItems[i];
-            let destroy = true;
-            for (let j = 0; j < devices.length; j++) {
-                if (item._device.device_path == devices[j].device_path) {
-                    this._updateDeviceItem(item, devices[j]);
-                    destroy = false;
-                    break;
-                }
-            }
-            if (destroy)
-                item.destroy();
-            else
-                newlist.push(item);
-        }
-
-        this._deviceItems = newlist;
-        this._hasDevices = newlist.length > 0;
-        for (let i = 0; i < devices.length; i++) {
-            let d = devices[i];
-            if (d._item)
-                continue;
-            let item = this._createDeviceItem(d);
-            if (item) {
-                this.menu.addMenuItem(item, this._deviceItemPosition + this._deviceItems.length);
-                this._deviceItems.push(item);
-                this._hasDevices = true;
-            }
-        }
-    },
-
-    _updateDeviceItem: function(item, device) {
-        if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE) {
-            item.destroy();
-            return;
-        }
-
-        let prevDevice = item._device;
-        let prevCapabilities = prevDevice.capabilities;
-        let prevCanConnect = prevDevice.can_connect;
-
-        // adopt the new device object
-        item._device = device;
-        device._item = item;
-
-        // update properties
-        item.label.text = device.alias;
-
-        if (prevCapabilities != device.capabilities ||
-            prevCanConnect != device.can_connect) {
-            // need to rebuild the submenu
-            item.menu.removeAll();
-            this._buildDeviceSubMenu(item, device);
-        }
-
-        // update connected property
-        if (device.can_connect)
-            item._connectedMenuItem.setToggleState(device.connected);
-    },
-
-    _createDeviceItem: function(device) {
-        if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE)
-            return null;
-        let item = new PopupMenu.PopupSubMenuMenuItem(device.alias);
-
-        // adopt the device object, and add a back link
-        item._device = device;
-        device._item = item;
-
-        this._buildDeviceSubMenu(item, device);
-
-        return item;
-    },
-
-    _buildDeviceSubMenu: function(item, device) {
-        if (device.can_connect) {
-            let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
-            item._connected = device.connected;
-            item._connectedMenuItem = menuitem;
-            menuitem.connect('toggled', Lang.bind(this, function() {
-                if (item._connected > ConnectionState.CONNECTED) {
-                    // operation already in progress, revert
-                    // (should not happen anyway)
-                    menuitem.setToggleState(menuitem.state);
-                }
-                if (item._connected) {
-                    item._connected = ConnectionState.DISCONNECTING;
-                    menuitem.setStatus(_("disconnecting..."));
-                    this._applet.disconnect_device(item._device.device_path, function(applet, success) {
-                        if (success) { // apply
-                            item._connected = ConnectionState.DISCONNECTED;
-                            menuitem.setToggleState(false);
-                        } else { // revert
-                            item._connected = ConnectionState.CONNECTED;
-                            menuitem.setToggleState(true);
-                        }
-                        menuitem.setStatus(null);
-                    });
-                } else {
-                    item._connected = ConnectionState.CONNECTING;
-                    menuitem.setStatus(_("connecting..."));
-                    this._applet.connect_device(item._device.device_path, function(applet, success) {
-                        if (success) { // apply
-                            item._connected = ConnectionState.CONNECTED;
-                            menuitem.setToggleState(true);
-                        } else { // revert
-                            item._connected = ConnectionState.DISCONNECTED;
-                            menuitem.setToggleState(false);
-                        }
-                        menuitem.setStatus(null);
-                    });
-                }
-            }));
-
-            item.menu.addMenuItem(menuitem);
-        }
-
-        if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_PUSH) {
-            item.menu.addAction(_("Send Files..."), Lang.bind(this, function() {
-                this._applet.send_to_address(device.bdaddr, device.alias);
-            }));
-        }
-
-        switch (device.type) {
-        case GnomeBluetoothApplet.Type.KEYBOARD:
-            item.menu.addSettingsAction(_("Keyboard Settings"), 'gnome-keyboard-panel.desktop');
-            break;
-        case GnomeBluetoothApplet.Type.MOUSE:
-            item.menu.addSettingsAction(_("Mouse Settings"), 'gnome-mouse-panel.desktop');
-            break;
-        case GnomeBluetoothApplet.Type.HEADSET:
-        case GnomeBluetoothApplet.Type.HEADPHONES:
-        case GnomeBluetoothApplet.Type.OTHER_AUDIO:
-            item.menu.addSettingsAction(_("Sound Settings"), 'gnome-sound-panel.desktop');
-            break;
-        default:
-            break;
-        }
-    },
-
-    _updateFullMenu: function() {
-        if (this._applet.show_full_menu) {
-            this._showAll(this._fullMenuItems);
-            if (this._hasDevices)
-                this._showAll(this._deviceItems);
-        } else {
-            this._hideAll(this._fullMenuItems);
-            this._hideAll(this._deviceItems);
-        }
-    },
-
-    _showAll: function(items) {
-        for (let i = 0; i < items.length; i++)
-            items[i].actor.show();
-    },
-
-    _hideAll: function(items) {
-        for (let i = 0; i < items.length; i++)
-            items[i].actor.hide();
-    },
-
-    _destroyAll: function(items) {
-        for (let i = 0; i < items.length; i++)
-            items[i].destroy();
+        if (on)
+            this._item.status.text = ngettext("%d Connected Device", "%d Connected Devices").format(nDevices);
     },
 
     _ensureSource: function() {
         if (!this._source) {
             this._source = new MessageTray.Source(_("Bluetooth"), 'bluetooth-active');
+            this._source.policy = new NotificationDaemon.NotificationApplicationPolicy('gnome-bluetooth-panel');
             Main.messageTray.add(this._source);
         }
     },
 
-    _authRequest: function(applet, device_path, name, long_name, uuid) {
+    _authRequest: function(applet, device_path, name, long_name) {
         this._ensureSource();
-        this._source.notify(new AuthNotification(this._source, this._applet, device_path, name, long_name, uuid));
+        this._source.notify(new AuthNotification(this._source, this._applet, device_path, name, long_name));
+    },
+
+    _authServiceRequest: function(applet, device_path, name, long_name, uuid) {
+        this._ensureSource();
+        this._source.notify(new AuthServiceNotification(this._source, this._applet, device_path, name, long_name, uuid));
     },
 
     _confirmRequest: function(applet, device_path, name, long_name, pin) {
@@ -314,6 +91,34 @@ const AuthNotification = new Lang.Class({
     Name: 'AuthNotification',
     Extends: MessageTray.Notification,
 
+    _init: function(source, applet, device_path, name, long_name) {
+        this.parent(source,
+                    _("Bluetooth"),
+                    _("Authorization request from %s").format(name),
+                    { customContent: true });
+        this.setResident(true);
+
+        this._applet = applet;
+        this._devicePath = device_path;
+        this.addBody(_("Device %s wants to pair with this computer").format(long_name));
+
+        this.addButton('allow', _("Allow"));
+        this.addButton('deny', _("Deny"));
+
+        this.connect('action-invoked', Lang.bind(this, function(self, action) {
+            if (action == 'allow')
+                this._applet.agent_reply_confirm(this._devicePath, true);
+            else
+                this._applet.agent_reply_confirm(this._devicePath, false);
+            this.destroy();
+        }));
+    }
+});
+
+const AuthServiceNotification = new Lang.Class({
+    Name: 'AuthServiceNotification',
+    Extends: MessageTray.Notification,
+
     _init: function(source, applet, device_path, name, long_name, uuid) {
         this.parent(source,
                     _("Bluetooth"),
@@ -332,14 +137,14 @@ const AuthNotification = new Lang.Class({
         this.connect('action-invoked', Lang.bind(this, function(self, action) {
             switch (action) {
             case 'always-grant':
-                this._applet.agent_reply_auth(this._devicePath, true, true);
+                this._applet.agent_reply_auth_service(this._devicePath, true, true);
                 break;
             case 'grant':
-                this._applet.agent_reply_auth(this._devicePath, true, false);
+                this._applet.agent_reply_auth_service(this._devicePath, true, false);
                 break;
             case 'reject':
             default:
-                this._applet.agent_reply_auth(this._devicePath, false, false);
+                this._applet.agent_reply_auth_service(this._devicePath, false, false);
             }
             this.destroy();
         }));
@@ -361,7 +166,7 @@ const ConfirmNotification = new Lang.Class({
         this._applet = applet;
         this._devicePath = device_path;
         this.addBody(_("Device %s wants to pair with this computer").format(long_name));
-        this.addBody(_("Please confirm whether the PIN '%06d' matches the one on the device.").format(pin));
+        this.addBody(_("Please confirm whether the Passkey '%06d' matches the one on the device.").format(pin));
 
         /* Translators: this is the verb, not the noun */
         this.addButton('matches', _("Matches"));

js/ui/status/keyboard.js

@@ -33,6 +33,33 @@ const KEY_INPUT_SOURCES = 'sources';
 const INPUT_SOURCE_TYPE_XKB = 'xkb';
 const INPUT_SOURCE_TYPE_IBUS = 'ibus';
 
+// This is the longest we'll keep the keyboard frozen until an input
+// source is active.
+const MAX_INPUT_SOURCE_ACTIVATION_TIME = 4000; // ms
+
+const BUS_NAME = 'org.gnome.SettingsDaemon.Keyboard';
+const OBJECT_PATH = '/org/gnome/SettingsDaemon/Keyboard';
+
+const KeyboardManagerInterface =
+<interface name="org.gnome.SettingsDaemon.Keyboard">
+<method name="SetInputSource">
+    <arg type="u" direction="in" />
+</method>
+</interface>;
+
+const KeyboardManagerProxy = Gio.DBusProxy.makeProxyWrapper(KeyboardManagerInterface);
+
+function releaseKeyboard() {
+    if (Main.modalCount > 0)
+        global.display.unfreeze_keyboard(global.get_current_time());
+    else
+        global.display.ungrab_keyboard(global.get_current_time());
+}
+
+function holdKeyboard() {
+    global.freeze_keyboard(global.get_current_time());
+}
+
 const IBusManager = new Lang.Class({
     Name: 'IBusManager',
 
@@ -45,26 +72,24 @@ const IBusManager = new Lang.Class({
         this._readyCallback = readyCallback;
         this._candidatePopup = new IBusCandidatePopup.CandidatePopup();
 
-        this._ibus = null;
         this._panelService = null;
         this._engines = {};
         this._ready = false;
         this._registerPropertiesId = 0;
         this._currentEngineName = null;
 
-        this._nameWatcherId = Gio.DBus.session.watch_name(IBus.SERVICE_IBUS,
-                                                          Gio.BusNameWatcherFlags.NONE,
-                                                          Lang.bind(this, this._onNameAppeared),
-                                                          Lang.bind(this, this._clear));
+        this._ibus = IBus.Bus.new_async();
+        this._ibus.connect('connected', Lang.bind(this, this._onConnected));
+        this._ibus.connect('disconnected', Lang.bind(this, this._clear));
+        // Need to set this to get 'global-engine-changed' emitions
+        this._ibus.set_watch_ibus_signal(true);
+        this._ibus.connect('global-engine-changed', Lang.bind(this, this._engineChanged));
     },
 
     _clear: function() {
         if (this._panelService)
             this._panelService.destroy();
-        if (this._ibus)
-            this._ibus.destroy();
 
-        this._ibus = null;
         this._panelService = null;
         this._candidatePopup.setPanelService(null);
         this._engines = {};
@@ -76,18 +101,12 @@ const IBusManager = new Lang.Class({
             this._readyCallback(false);
     },
 
-    _onNameAppeared: function() {
-        this._ibus = IBus.Bus.new_async();
-        this._ibus.connect('connected', Lang.bind(this, this._onConnected));
-    },
-
     _onConnected: function() {
         this._ibus.list_engines_async(-1, null, Lang.bind(this, this._initEngines));
         this._ibus.request_name_async(IBus.SERVICE_PANEL,
                                       IBus.BusNameFlag.REPLACE_EXISTING,
                                       -1, null,
                                       Lang.bind(this, this._initPanelService));
-        this._ibus.connect('disconnected', Lang.bind(this, this._clear));
     },
 
     _initEngines: function(ibus, result) {
@@ -109,15 +128,17 @@ const IBusManager = new Lang.Class({
             this._panelService = new IBus.PanelService({ connection: this._ibus.get_connection(),
                                                          object_path: IBus.PATH_PANEL });
             this._candidatePopup.setPanelService(this._panelService);
-            // Need to set this to get 'global-engine-changed' emitions
-            this._ibus.set_watch_ibus_signal(true);
-            this._ibus.connect('global-engine-changed', Lang.bind(this, this._engineChanged));
             this._panelService.connect('update-property', Lang.bind(this, this._updateProperty));
             // If an engine is already active we need to get its properties
             this._ibus.get_global_engine_async(-1, null, Lang.bind(this, function(i, result) {
-                let engine = this._ibus.get_global_engine_async_finish(result);
-                if (!engine)
+                let engine;
+                try {
+                    engine = this._ibus.get_global_engine_async_finish(result);
+                    if (!engine)
+                        return;
+                } catch(e) {
                     return;
+                }
                 this._engineChanged(this._ibus, engine.get_name());
             }));
             this._updateReadiness();
@@ -135,6 +156,9 @@ const IBusManager = new Lang.Class({
     },
 
     _engineChanged: function(bus, engineName) {
+        if (!this._ready)
+            return;
+
         this._currentEngineName = engineName;
 
         if (this._registerPropertiesId != 0)
@@ -332,14 +356,14 @@ const InputSourceIndicator = new Lang.Class({
             Main.wm.addKeybinding('switch-input-source',
                                   new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
                                   Meta.KeyBindingFlags.REVERSES,
-                                  Main.KeybindingMode.ALL,
+                                  Shell.KeyBindingMode.ALL,
                                   Lang.bind(this, this._switchInputSource));
         this._keybindingActionBackward =
             Main.wm.addKeybinding('switch-input-source-backward',
                                   new Gio.Settings({ schema: "org.gnome.desktop.wm.keybindings" }),
                                   Meta.KeyBindingFlags.REVERSES |
                                   Meta.KeyBindingFlags.REVERSED,
-                                  Main.KeybindingMode.ALL,
+                                  Shell.KeyBindingMode.ALL,
                                   Lang.bind(this, this._switchInputSource));
         this._settings = new Gio.Settings({ schema: DESKTOP_INPUT_SOURCES_SCHEMA });
         this._settings.connect('changed::' + KEY_CURRENT_INPUT_SOURCE, Lang.bind(this, this._currentInputSourceChanged));
@@ -359,14 +383,21 @@ const InputSourceIndicator = new Lang.Class({
         this._ibusManager.connect('property-updated', Lang.bind(this, this._ibusPropertyUpdated));
         this._inputSourcesChanged();
 
+        this._keyboardManager = new KeyboardManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH,
+                                                         function(proxy, error) {
+                                                             if (error)
+                                                                 log(error.message);
+                                                         });
+        this._keyboardManager.g_default_timeout = MAX_INPUT_SOURCE_ACTIVATION_TIME;
+
+        global.display.connect('modifiers-accelerator-activated', Lang.bind(this, this._modifiersSwitcher));
+
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
         this._showLayoutItem = this.menu.addAction(_("Show Keyboard Layout"), Lang.bind(this, this._showLayout));
 
         Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
         this._sessionUpdated();
 
-        this.menu.addSettingsAction(_("Region and Language Settings"), 'gnome-region-panel.desktop');
-
         this._sourcesPerWindow = false;
         this._focusWindowNotifyId = 0;
         this._overviewShowingId = 0;
@@ -392,7 +423,43 @@ const InputSourceIndicator = new Lang.Class({
         this._inputSourcesChanged();
     },
 
+    _modifiersSwitcher: function() {
+        let sourceIndexes = Object.keys(this._inputSources);
+        if (sourceIndexes.length == 0) {
+            releaseKeyboard();
+            return true;
+        }
+
+        let is = this._currentSource;
+        if (!is)
+            is = this._inputSources[sourceIndexes[0]];
+
+        let nextIndex = is.index + 1;
+        if (nextIndex > sourceIndexes[sourceIndexes.length - 1])
+            nextIndex = 0;
+
+        while (!(is = this._inputSources[nextIndex]))
+            nextIndex += 1;
+
+        is.activate();
+        return true;
+    },
+
     _switchInputSource: function(display, screen, window, binding) {
+        if (this._mruSources.length < 2)
+            return;
+
+        // HACK: Fall back on simple input source switching since we
+        // can't show a popup switcher while a GrabHelper grab is in
+        // effect without considerable work to consolidate the usage
+        // of pushModal/popModal and grabHelper. See
+        // https://bugzilla.gnome.org/show_bug.cgi?id=695143 .
+        if (Main.keybindingMode == Shell.KeyBindingMode.MESSAGE_TRAY ||
+            Main.keybindingMode == Shell.KeyBindingMode.TOPBAR_POPUP) {
+            this._modifiersSwitcher();
+            return;
+        }
+
         let popup = new InputSourcePopup(this._mruSources, this._keybindingAction, this._keybindingActionBackward);
         let modifiers = binding.get_modifiers();
         let backwards = modifiers & Meta.VirtualModifier.SHIFT_MASK;
@@ -405,6 +472,14 @@ const InputSourceIndicator = new Lang.Class({
         let newSourceIndex = this._settings.get_uint(KEY_CURRENT_INPUT_SOURCE);
         let newSource = this._inputSources[newSourceIndex];
 
+        let oldSource;
+        [oldSource, this._currentSource] = [this._currentSource, newSource];
+
+        if (oldSource) {
+            oldSource.menuItem.setOrnament(PopupMenu.Ornament.NONE);
+            oldSource.indicatorLabel.hide();
+        }
+
         if (!newSource || (nVisibleSources < 2 && !newSource.properties)) {
             // This source index might be invalid if we weren't able
             // to build a menu item for it, so we hide ourselves since
@@ -419,16 +494,8 @@ const InputSourceIndicator = new Lang.Class({
 
         this.actor.show();
 
-        let oldSource;
-        [oldSource, this._currentSource] = [this._currentSource, newSource];
-
-        if (oldSource) {
-            oldSource.menuItem.setShowDot(false);
-            this._container.set_skip_paint(oldSource.indicatorLabel, true);
-        }
-
-        newSource.menuItem.setShowDot(true);
-        this._container.set_skip_paint(newSource.indicatorLabel, false);
+        newSource.menuItem.setOrnament(PopupMenu.Ornament.DOT);
+        newSource.indicatorLabel.show();
 
         this._buildPropSection(newSource.properties);
 
@@ -451,6 +518,7 @@ const InputSourceIndicator = new Lang.Class({
 
         this._inputSources = {};
         this._ibusSources = {};
+        this._currentSource = null;
 
         let inputSourcesByShortName = {};
 
@@ -479,10 +547,8 @@ const InputSourceIndicator = new Lang.Class({
             let is = new InputSource(type, id, displayName, shortName, i);
 
             is.connect('activate', Lang.bind(this, function() {
-                if (this._currentSource.index == is.index)
-                    return;
-                this._settings.set_value(KEY_CURRENT_INPUT_SOURCE,
-                                         GLib.Variant.new_uint32(is.index));
+                holdKeyboard();
+                this._keyboardManager.SetInputSourceRemote(is.index, releaseKeyboard);
             }));
 
             if (!(is.shortName in inputSourcesByShortName))
@@ -505,8 +571,8 @@ const InputSourceIndicator = new Lang.Class({
 
             this.menu.addMenuItem(is.menuItem, menuIndex++);
 
+            is.indicatorLabel.hide();
             this._container.add_actor(is.indicatorLabel);
-            this._container.set_skip_paint(is.indicatorLabel, true);
         }
 
         let sourcesList = [];
@@ -652,7 +718,8 @@ const InputSourceIndicator = new Lang.Class({
                 item.prop = prop;
                 radioGroup.push(item);
                 item.radioGroup = radioGroup;
-                item.setShowDot(prop.get_state() == IBus.PropState.CHECKED);
+                item.setOrnament(prop.get_state() == IBus.PropState.CHECKED ?
+                                 PopupMenu.Ornament.DOT : PopupMenu.Ornament.NONE);
                 item.connect('activate', Lang.bind(this, function() {
                     if (item.prop.get_state() == IBus.PropState.CHECKED)
                         return;
@@ -660,12 +727,12 @@ const InputSourceIndicator = new Lang.Class({
                     let group = item.radioGroup;
                     for (let i = 0; i < group.length; ++i) {
                         if (group[i] == item) {
-                            item.setShowDot(true);
+                            item.setOrnament(PopupMenu.Ornament.DOT);
                             item.prop.set_state(IBus.PropState.CHECKED);
                             this._ibusManager.activateProperty(item.prop.get_key(),
                                                                IBus.PropState.CHECKED);
                         } else {
-                            group[i].setShowDot(false);
+                            group[i].setOrnament(PopupMenu.Ornament.NONE);
                             group[i].prop.set_state(IBus.PropState.UNCHECKED);
                             this._ibusManager.activateProperty(group[i].prop.get_key(),
                                                                IBus.PropState.UNCHECKED);
@@ -695,7 +762,7 @@ const InputSourceIndicator = new Lang.Class({
                 item.prop = prop;
                 item.connect('activate', Lang.bind(this, function() {
                     this._ibusManager.activateProperty(item.prop.get_key(),
-                                                       IBus.PropState.CHECKED);
+                                                       item.prop.get_state());
                 }));
                 break;
 

js/ui/status/power.js

@@ -2,39 +2,15 @@
 
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
-const St = imports.gi.St;
+const UPower = imports.gi.UPowerGlib;
 
+const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 
 const BUS_NAME = 'org.gnome.SettingsDaemon.Power';
 const OBJECT_PATH = '/org/gnome/SettingsDaemon/Power';
 
-const UPDeviceType = {
-    UNKNOWN: 0,
-    AC_POWER: 1,
-    BATTERY: 2,
-    UPS: 3,
-    MONITOR: 4,
-    MOUSE: 5,
-    KEYBOARD: 6,
-    PDA: 7,
-    PHONE: 8,
-    MEDIA_PLAYER: 9,
-    TABLET: 10,
-    COMPUTER: 11
-};
-
-const UPDeviceState = {
-    UNKNOWN: 0,
-    CHARGING: 1,
-    DISCHARGING: 2,
-    EMPTY: 3,
-    FULLY_CHARGED: 4,
-    PENDING_CHARGE: 5,
-    PENDING_DISCHARGE: 6
-};
-
 const PowerManagerInterface = <interface name="org.gnome.SettingsDaemon.Power">
 <method name="GetDevices">
     <arg type="a(susdut)" direction="out" />
@@ -54,92 +30,74 @@ const Indicator = new Lang.Class({
     _init: function() {
         this.parent('battery-missing-symbolic', _("Battery"));
 
-        this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH);
+        this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH,
+                                            Lang.bind(this, function(proxy, error) {
+                                                if (error) {
+                                                    log(error.message);
+                                                    return;
+                                                }
+                                                this._proxy.connect('g-properties-changed',
+                                                                    Lang.bind(this, this._sync));
+                                                this._sync();
+                                            }));
 
-        this._deviceItems = [ ];
-        this._hasPrimary = false;
-        this._primaryDeviceId = null;
+        this._item = new PopupMenu.PopupSubMenuMenuItem(_("Battery"), true);
+        this._item.menu.addSettingsAction(_("Power Settings"), 'gnome-power-panel.desktop');
+        this.menu.addMenuItem(this._item);
 
-        this._batteryItem = new PopupMenu.PopupMenuItem('', { reactive: false });
-        this._primaryPercentage = new St.Label({ style_class: 'popup-battery-percentage' });
-        this._batteryItem.addActor(this._primaryPercentage, { align: St.Align.END });
-        this.menu.addMenuItem(this._batteryItem);
-
-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this._otherDevicePosition = 2;
-
-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.menu.addSettingsAction(_("Power Settings"), 'gnome-power-panel.desktop');
-
-        this._proxy.connect('g-properties-changed',
-                            Lang.bind(this, this._devicesChanged));
-        this._devicesChanged();
+        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
+        this._sessionUpdated();
     },
 
-    _readPrimaryDevice: function() {
+    _sessionUpdated: function() {
+        let sensitive = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
+        this.menu.setSensitive(sensitive);
+    },
+
+    _statusForDevice: function(device) {
+        let [device_id, device_type, icon, percentage, state, seconds] = device;
+
+        if (state == UPower.DeviceState.FULLY_CHARGED)
+            return _("Fully Charged");
+
+        let time = Math.round(seconds / 60);
+        if (time == 0) {
+            // 0 is reported when UPower does not have enough data
+            // to estimate battery life
+            return _("Estimating…");
+        }
+
+        let minutes = time % 60;
+        let hours = Math.floor(time / 60);
+
+        if (state == UPower.DeviceState.DISCHARGING) {
+            // Translators: this is <hours>:<minutes> Remaining (<percentage>)
+            return _("%d\u2236%d Remaining (%d%%)".format(hours, minutes, percentage));
+        }
+
+        if (state == UPower.DeviceState.CHARGING) {
+            // Translators: this is <hours>:<minutes> Until Full (<percentage>)
+            return _("%d\u2236%d Until Full (%d%%)".format(hours, minutes, percentage));
+        }
+
+        // state is one of PENDING_CHARGING, PENDING_DISCHARGING
+        return _("Estimating…");
+    },
+
+    _syncStatusLabel: function() {
         this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(result, error) {
             if (error) {
-                this._hasPrimary = false;
-                this._primaryDeviceId = null;
-                this._batteryItem.actor.hide();
+                this._item.actor.hide();
                 return;
             }
-            let [[device_id, device_type, icon, percentage, state, seconds]] = result;
-            if (device_type == UPDeviceType.BATTERY) {
-                this._hasPrimary = true;
-                let time = Math.round(seconds / 60);
-                if (time == 0) {
-                    // 0 is reported when UPower does not have enough data
-                    // to estimate battery life
-                    this._batteryItem.label.text = _("Estimating...");
-                } else {
-                    let minutes = time % 60;
-                    let hours = Math.floor(time / 60);
-                    let timestring;
-                    if (time >= 60) {
-                        if (minutes == 0) {
-                            timestring = ngettext("%d hour remaining", "%d hours remaining", hours).format(hours);
-                        } else {
-                            /* TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining" */
-                            let template = _("%d %s %d %s remaining");
 
-                            timestring = template.format (hours, ngettext("hour", "hours", hours), minutes, ngettext("minute", "minutes", minutes));
-                        }
-                    } else
-                        timestring = ngettext("%d minute remaining", "%d minutes remaining", minutes).format(minutes);
-                    this._batteryItem.label.text = timestring;
-                }
-                this._primaryPercentage.text = C_("percent of battery remaining", "%d%%").format(Math.round(percentage));
-                this._batteryItem.actor.show();
+            let [device] = result;
+            let [device_id, device_type] = device;
+            if (device_type == UPower.DeviceKind.BATTERY) {
+                this._item.status.text = this._statusForDevice(device);
+                this._item.actor.show();
             } else {
-                this._hasPrimary = false;
-                this._batteryItem.actor.hide();
-            }
-
-            this._primaryDeviceId = device_id;
-        }));
-    },
-
-    _readOtherDevices: function() {
-        this._proxy.GetDevicesRemote(Lang.bind(this, function(result, error) {
-            this._deviceItems.forEach(function(i) { i.destroy(); });
-            this._deviceItems = [];
-
-            if (error) {
-                return;
-            }
-
-            let position = 0;
-            let [devices] = result;
-            for (let i = 0; i < devices.length; i++) {
-                let [device_id, device_type] = devices[i];
-                if (device_type == UPDeviceType.AC_POWER || device_id == this._primaryDeviceId)
-                    continue;
-
-                let item = new DeviceItem (devices[i]);
-                this._deviceItems.push(item);
-                this.menu.addMenuItem(item, this._otherDevicePosition + position);
-                position++;
+                this._item.actor.hide();
             }
         }));
     },
@@ -151,71 +109,15 @@ const Indicator = new Lang.Class({
         if (icon) {
             let gicon = Gio.icon_new_for_string(icon);
             this.setGIcon(gicon);
+            this._item.icon.gicon = gicon;
             hasIcon = true;
         }
         this.mainIcon.visible = hasIcon;
         this.actor.visible = hasIcon;
     },
 
-    _devicesChanged: function() {
+    _sync: function() {
         this._syncIcon();
-        this._readPrimaryDevice();
-        this._readOtherDevices();
-    }
-});
-
-const DeviceItem = new Lang.Class({
-    Name: 'DeviceItem',
-    Extends: PopupMenu.PopupBaseMenuItem,
-
-    _init: function(device) {
-        this.parent({ reactive: false });
-
-        let [device_id, device_type, icon, percentage, state, time] = device;
-
-        this._box = new St.BoxLayout({ style_class: 'popup-device-menu-item' });
-        this._label = new St.Label({ text: this._deviceTypeToString(device_type) });
-
-        this._icon = new St.Icon({ gicon: Gio.icon_new_for_string(icon),
-                                   style_class: 'popup-menu-icon' });
-
-        this._box.add_actor(this._icon);
-        this._box.add_actor(this._label);
-        this.addActor(this._box);
-
-        let percentLabel = new St.Label({ text: C_("percent of battery remaining", "%d%%").format(Math.round(percentage)),
-                                          style_class: 'popup-battery-percentage' });
-        this.addActor(percentLabel, { align: St.Align.END });
-        //FIXME: ideally we would like to expose this._label and percentLabel
-        this.actor.label_actor = percentLabel;
-    },
-
-    _deviceTypeToString: function(type) {
-	switch (type) {
-	case UPDeviceType.AC_POWER:
-            return _("AC adapter");
-        case UPDeviceType.BATTERY:
-            return _("Laptop battery");
-        case UPDeviceType.UPS:
-            return _("UPS");
-        case UPDeviceType.MONITOR:
-            return _("Monitor");
-        case UPDeviceType.MOUSE:
-            return _("Mouse");
-        case UPDeviceType.KEYBOARD:
-            return _("Keyboard");
-        case UPDeviceType.PDA:
-            return _("PDA");
-        case UPDeviceType.PHONE:
-            return _("Cell phone");
-        case UPDeviceType.MEDIA_PLAYER:
-            return _("Media player");
-        case UPDeviceType.TABLET:
-            return _("Tablet");
-        case UPDeviceType.COMPUTER:
-            return _("Computer");
-        default:
-            return C_("device", "Unknown");
-        }
+        this._syncStatusLabel();
     }
 });

js/ui/status/system.js

@@ -0,0 +1,358 @@
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+
+const AccountsService = imports.gi.AccountsService;
+const Gdm = imports.gi.Gdm;
+const Gio = imports.gi.Gio;
+const GLib = imports.gi.GLib;
+const Gtk = imports.gi.Gtk;
+const Lang = imports.lang;
+const Shell = imports.gi.Shell;
+const St = imports.gi.St;
+const Clutter = imports.gi.Clutter;
+
+const BoxPointer = imports.ui.boxpointer;
+const GnomeSession = imports.misc.gnomeSession;
+const LoginManager = imports.misc.loginManager;
+const Main = imports.ui.main;
+const ModalDialog = imports.ui.modalDialog;
+const PanelMenu = imports.ui.panelMenu;
+const PopupMenu = imports.ui.popupMenu;
+const Util = imports.misc.util;
+const UserWidget = imports.ui.userWidget;
+
+const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';
+const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
+const PRIVACY_SCHEMA = 'org.gnome.desktop.privacy'
+const DISABLE_USER_SWITCH_KEY = 'disable-user-switching';
+const DISABLE_LOCK_SCREEN_KEY = 'disable-lock-screen';
+const DISABLE_LOG_OUT_KEY = 'disable-log-out';
+const ALWAYS_SHOW_LOG_OUT_KEY = 'always-show-log-out';
+
+const MAX_USERS_IN_SESSION_DIALOG = 5;
+
+const SystemdLoginSessionIface = <interface name='org.freedesktop.login1.Session'>
+    <property name="Id" type="s" access="read"/>
+    <property name="Remote" type="b" access="read"/>
+    <property name="Class" type="s" access="read"/>
+    <property name="Type" type="s" access="read"/>
+    <property name="State" type="s" access="read"/>
+</interface>;
+
+const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface);
+
+const Indicator = new Lang.Class({
+    Name: 'SystemIndicator',
+    Extends: PanelMenu.SystemStatusButton,
+
+    _init: function() {
+        this.parent('system-shutdown-symbolic', _("System"));
+
+        this._screenSaverSettings = new Gio.Settings({ schema: SCREENSAVER_SCHEMA });
+        this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
+        this._privacySettings = new Gio.Settings({ schema: PRIVACY_SCHEMA });
+
+        this._session = new GnomeSession.SessionManager();
+        this._haveShutdown = true;
+
+        this._loginManager = LoginManager.getLoginManager();
+        this._userManager = AccountsService.UserManager.get_default();
+        this._user = this._userManager.get_user(GLib.get_user_name());
+
+        this._createSubMenu();
+
+        this._userManager.connect('notify::is-loaded',
+                                  Lang.bind(this, this._updateMultiUser));
+        this._userManager.connect('notify::has-multiple-users',
+                                  Lang.bind(this, this._updateMultiUser));
+        this._userManager.connect('user-added',
+                                  Lang.bind(this, this._updateMultiUser));
+        this._userManager.connect('user-removed',
+                                  Lang.bind(this, this._updateMultiUser));
+        this._lockdownSettings.connect('changed::' + DISABLE_USER_SWITCH_KEY,
+                                       Lang.bind(this, this._updateMultiUser));
+        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
+                                       Lang.bind(this, this._updateMultiUser));
+        this._lockdownSettings.connect('changed::' + DISABLE_LOCK_SCREEN_KEY,
+                                       Lang.bind(this, this._updateLockScreen));
+        global.settings.connect('changed::' + ALWAYS_SHOW_LOG_OUT_KEY,
+                                Lang.bind(this, this._updateMultiUser));
+        this._updateSwitchUser();
+        this._updateMultiUser();
+
+        // Whether shutdown is available or not depends on both lockdown
+        // settings (disable-log-out) and Polkit policy - the latter doesn't
+        // notify, so we update the menu item each time the menu opens or
+        // the lockdown setting changes, which should be close enough.
+        this.menu.connect('open-state-changed', Lang.bind(this,
+            function(menu, open) {
+                if (!open)
+                    return;
+
+                this._updateHaveShutdown();
+            }));
+        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
+                                       Lang.bind(this, this._updateHaveShutdown));
+
+        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
+        this._sessionUpdated();
+    },
+
+    _sessionUpdated: function() {
+        this._updateLockScreen();
+        this._updatePowerOff();
+        this._settingsAction.visible = Main.sessionMode.allowSettings;
+    },
+
+    _updateMultiUser: function() {
+        let shouldShowInMode = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
+        let hasSwitchUser = this._updateSwitchUser();
+        let hasLogout = this._updateLogout();
+
+        this._switchUserSubMenu.actor.visible = shouldShowInMode && (hasSwitchUser || hasLogout);
+    },
+
+    _updateSwitchUser: function() {
+        let allowSwitch = !this._lockdownSettings.get_boolean(DISABLE_USER_SWITCH_KEY);
+        let multiUser = this._userManager.can_switch() && this._userManager.has_multiple_users;
+
+        let visible = allowSwitch && multiUser;
+        this._loginScreenItem.actor.visible = visible;
+        return visible;
+    },
+
+    _updateLogout: function() {
+        let allowLogout = !this._lockdownSettings.get_boolean(DISABLE_LOG_OUT_KEY);
+        let alwaysShow = global.settings.get_boolean(ALWAYS_SHOW_LOG_OUT_KEY);
+        let systemAccount = this._user.system_account;
+        let localAccount = this._user.local_account;
+        let multiUser = this._userManager.has_multiple_users;
+        let multiSession = Gdm.get_session_ids().length > 1;
+
+        let visible = allowLogout && (alwaysShow || multiUser || multiSession || systemAccount || !localAccount);
+        this._logoutItem.actor.visible = visible;
+        return visible;
+    },
+
+    _updateSwitchUserSubMenu: function() {
+        this._switchUserSubMenu.label.text = this._user.get_real_name();
+
+        let iconFile = this._user.get_icon_file();
+        if (iconFile && !GLib.file_test(iconFile, GLib.FileTest.EXISTS))
+            iconFile = null;
+
+        if (iconFile) {
+            let file = Gio.File.new_for_path(iconFile);
+            let gicon = new Gio.FileIcon({ file: file });
+            this._switchUserSubMenu.icon.gicon = gicon;
+        } else {
+            this._switchUserSubMenu.icon_name = 'avatar-default-symbolic';
+        }
+    },
+
+    _updateLockScreen: function() {
+        let showLock = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
+        let allowLockScreen = !this._lockdownSettings.get_boolean(DISABLE_LOCK_SCREEN_KEY);
+        this._lockScreenAction.visible = showLock && allowLockScreen && LoginManager.canLock();
+    },
+
+    _updateHaveShutdown: function() {
+        this._session.CanShutdownRemote(Lang.bind(this,
+            function(result, error) {
+                if (!error) {
+                    this._haveShutdown = result[0];
+                    this._updatePowerOff();
+                }
+            }));
+    },
+
+    _updatePowerOff: function() {
+        this._powerOffAction.visible = this._haveShutdown && !Main.sessionMode.isLocked;
+    },
+
+    _createActionButton: function(iconName, accessibleName) {
+        let icon = new St.Button({ reactive: true,
+                                   can_focus: true,
+                                   track_hover: true,
+                                   accessible_name: accessibleName,
+                                   style_class: 'system-menu-action' });
+        icon.child = new St.Icon({ icon_name: iconName });
+        return icon;
+    },
+
+    _createSubMenu: function() {
+        let item;
+
+        this._switchUserSubMenu = new PopupMenu.PopupSubMenuMenuItem('', true);
+        this._switchUserSubMenu.icon.style_class = 'system-switch-user-submenu-icon';
+
+        item = new PopupMenu.PopupMenuItem(_("Switch User"));
+        item.connect('activate', Lang.bind(this, this._onLoginScreenActivate));
+        this._switchUserSubMenu.menu.addMenuItem(item);
+        this._loginScreenItem = item;
+
+        item = new PopupMenu.PopupMenuItem(_("Log Out"));
+        item.connect('activate', Lang.bind(this, this._onQuitSessionActivate));
+        this._switchUserSubMenu.menu.addMenuItem(item);
+        this._logoutItem = item;
+
+        this._user.connect('notify::is-loaded', Lang.bind(this, this._updateSwitchUserSubMenu));
+        this._user.connect('changed', Lang.bind(this, this._updateSwitchUserSubMenu));
+
+        this.menu.addMenuItem(this._switchUserSubMenu);
+
+        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+
+        let hbox = new St.BoxLayout({ style_class: 'system-menu-actions-box' });
+
+        this._settingsAction = this._createActionButton('preferences-system-symbolic', _("Settings"));
+        this._settingsAction.connect('clicked', Lang.bind(this, this._onSettingsClicked));
+        hbox.add(this._settingsAction, { expand: true, x_fill: false });
+
+        this._lockScreenAction = this._createActionButton('changes-prevent-symbolic', _("Lock"));
+        this._lockScreenAction.connect('clicked', Lang.bind(this, this._onLockScreenClicked));
+        hbox.add(this._lockScreenAction, { expand: true, x_fill: false });
+
+        this._powerOffAction = this._createActionButton('system-shutdown-symbolic', _("Power Off"));
+        this._powerOffAction.connect('clicked', Lang.bind(this, this._onPowerOffClicked));
+        hbox.add(this._powerOffAction, { expand: true, x_fill: false });
+
+        item = new PopupMenu.PopupBaseMenuItem({ reactive: false,
+                                                 can_focus: false });
+        item.addActor(hbox, { expand: true });
+
+        this.menu.addMenuItem(item);
+    },
+
+    _onSettingsClicked: function() {
+        this.menu.itemActivated();
+        let app = Shell.AppSystem.get_default().lookup_app('gnome-control-center.desktop');
+        Main.overview.hide();
+        app.activate();
+    },
+
+    _onLockScreenClicked: function() {
+        this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
+        Main.overview.hide();
+        Main.screenShield.lock(true);
+    },
+
+    _onLoginScreenActivate: function() {
+        this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
+        Main.overview.hide();
+        if (Main.screenShield)
+            Main.screenShield.lock(false);
+        Gdm.goto_login_session_sync(null);
+    },
+
+    _onQuitSessionActivate: function() {
+        Main.overview.hide();
+        this._session.LogoutRemote(0);
+    },
+
+    _openSessionWarnDialog: function(sessions) {
+        let dialog = new ModalDialog.ModalDialog();
+        let subjectLabel = new St.Label({ style_class: 'end-session-dialog-subject',
+                                          text: _("Other users are logged in.") });
+        dialog.contentLayout.add(subjectLabel, { y_fill: true,
+                                                 y_align: St.Align.START });
+
+        let descriptionLabel = new St.Label({ style_class: 'end-session-dialog-description'});
+        descriptionLabel.set_text(_("Shutting down might cause them to lose unsaved work."));
+        descriptionLabel.clutter_text.line_wrap = true;
+        dialog.contentLayout.add(descriptionLabel, { x_fill: true,
+                                                     y_fill: true,
+                                                     y_align: St.Align.START });
+
+        let scrollView = new St.ScrollView({ style_class: 'end-session-dialog-app-list' });
+        scrollView.add_style_class_name('vfade');
+        scrollView.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
+        dialog.contentLayout.add(scrollView, { x_fill: true, y_fill: true });
+
+        let userList = new St.BoxLayout({ vertical: true });
+        scrollView.add_actor(userList);
+
+        for (let i = 0; i < sessions.length; i++) {
+            let session = sessions[i];
+            let userEntry = new St.BoxLayout({ style_class: 'login-dialog-user-list-item',
+                                               vertical: false });
+            let avatar = new UserWidget.Avatar(session.user);
+            avatar.update();
+            userEntry.add(avatar.actor);
+
+            let userLabelText = "";;
+            let userName = session.user.get_real_name() ?
+                           session.user.get_real_name() : session.username;
+
+            if (session.info.remote)
+                /* Translators: Remote here refers to a remote session, like a ssh login */
+                userLabelText = _("%s (remote)").format(userName);
+            else if (session.info.type == "tty")
+                /* Translators: Console here refers to a tty like a VT console */
+                userLabelText = _("%s (console)").format(userName);
+            else
+                userLabelText = userName;
+
+            let textLayout = new St.BoxLayout({ style_class: 'login-dialog-user-list-item-text-box',
+                                                vertical: true });
+            textLayout.add(new St.Label({ text: userLabelText }),
+                           { y_fill: false,
+                             y_align: St.Align.MIDDLE,
+                             expand: true });
+            userEntry.add(textLayout, { expand: true });
+            userList.add(userEntry, { x_fill: true });
+        }
+
+        let cancelButton = { label: _("Cancel"),
+                             action: function() { dialog.close(); },
+                             key: Clutter.Escape };
+
+        let powerOffButton = { label: _("Power Off"),  action: Lang.bind(this, function() {
+            dialog.close();
+            this._session.ShutdownRemote();
+        }), default: true };
+
+        dialog.setButtons([cancelButton, powerOffButton]);
+
+        dialog.open();
+    },
+
+    _onPowerOffClicked: function() {
+        this.menu.itemActivated();
+        Main.overview.hide();
+        this._loginManager.listSessions(Lang.bind(this, function(result) {
+            let sessions = [];
+            let n = 0;
+            for (let i = 0; i < result.length; i++) {
+                let[id, uid, userName, seat, sessionPath] = result[i];
+                let proxy = new SystemdLoginSession(Gio.DBus.system,
+                                                    'org.freedesktop.login1',
+                                                    sessionPath);
+
+                if (proxy.Class != 'user')
+                    continue;
+
+                if (proxy.State == 'closing')
+                    continue;
+
+                if (proxy.Id == GLib.getenv('XDG_SESSION_ID'))
+                    continue;
+
+                sessions.push({ user: this._userManager.get_user(userName),
+                                username: userName,
+                                info: { type: proxy.Type,
+                                        remote: proxy.Remote }
+                              });
+
+                // limit the number of entries
+                n++;
+                if (n == MAX_USERS_IN_SESSION_DIALOG)
+                    break;
+            }
+
+            if (n != 0)
+                this._openSessionWarnDialog(sessions);
+            else
+                this._session.ShutdownRemote();
+        }));
+    }
+});

js/ui/status/volume.js

@@ -9,8 +9,7 @@ const Signals = imports.signals;
 
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
-
-const VOLUME_ADJUSTMENT_STEP = 0.05; /* Volume adjustment step in % */
+const Slider = imports.ui.slider;
 
 const VOLUME_NOTIFY_ID = 1;
 
@@ -30,21 +29,25 @@ function getMixerControl() {
 const StreamSlider = new Lang.Class({
     Name: 'StreamSlider',
 
-    _init: function(control, title) {
+    _init: function(control) {
         this._control = control;
 
-        this.item = new PopupMenu.PopupMenuSection();
+        this.item = new PopupMenu.PopupBaseMenuItem({ activate: false });
 
-        this._title = new PopupMenu.PopupMenuItem(title, { reactive: false });
-        this._slider = new PopupMenu.PopupSliderMenuItem(0);
+        this._slider = new Slider.Slider(0);
         this._slider.connect('value-changed', Lang.bind(this, this._sliderChanged));
         this._slider.connect('drag-end', Lang.bind(this, this._notifyVolumeChange));
 
-        this.item.addMenuItem(this._title);
-        this.item.addMenuItem(this._slider);
+        this._icon = new St.Icon({ style_class: 'popup-menu-icon' });
+
+        this.item.addActor(this._icon, { align: St.Align.MIDDLE });
+        this.item.addActor(this._slider.actor, { expand: true });
+
+        this.item.actor.connect('button-press-event', Lang.bind(this, function(actor, event) {
+            this._slider.startDragging(event);
+        }));
 
         this._stream = null;
-        this._shouldShow = true;
     },
 
     get stream() {
@@ -86,8 +89,7 @@ const StreamSlider = new Lang.Class({
 
     _updateVisibility: function() {
         let visible = this._shouldBeVisible();
-        this._title.actor.visible = visible;
-        this._slider.actor.visible = visible;
+        this.item.actor.visible = visible;
     },
 
     scroll: function(event) {
@@ -119,7 +121,10 @@ const StreamSlider = new Lang.Class({
 
     _notifyVolumeChange: function() {
         global.cancel_theme_sound(VOLUME_NOTIFY_ID);
-        global.play_theme_sound(VOLUME_NOTIFY_ID, 'audio-volume-change');
+        global.play_theme_sound(VOLUME_NOTIFY_ID,
+                                'audio-volume-change',
+                                _("Volume changed"),
+                                Clutter.get_current_event ());
     },
 
     _updateVolume: function() {
@@ -166,9 +171,8 @@ const OutputStreamSlider = new Lang.Class({
         // a bit hackish, but ALSA/PulseAudio have a number
         // of different identifiers for headphones, and I could
         // not find the complete list
-        let port = sink.get_port();
-        if (port)
-            return port.port.indexOf('headphone') >= 0;
+        if (sink.get_ports().length > 0)
+            return sink.get_port().port.indexOf('headphone') >= 0;
 
         return false;
     },
@@ -179,11 +183,17 @@ const OutputStreamSlider = new Lang.Class({
         this._portChangedId = 0;
     },
 
+    _updateSliderIcon: function() {
+        this._icon.icon_name = (this._hasHeadphones ?
+                                'audio-headphones-symbolic' :
+                                'audio-speakers-symbolic');
+    },
+
     _portChanged: function() {
         let hasHeadphones = this._findHeadphones(this._stream);
         if (hasHeadphones != this._hasHeadphones) {
             this._hasHeadphones = hasHeadphones;
-            this.emit('headphones-changed', this._hasHeadphones);
+            this._updateSliderIcon();
         }
     }
 });
@@ -192,10 +202,11 @@ const InputStreamSlider = new Lang.Class({
     Name: 'InputStreamSlider',
     Extends: StreamSlider,
 
-    _init: function(control, title) {
-        this.parent(control, title);
+    _init: function(control) {
+        this.parent(control);
         this._control.connect('stream-added', Lang.bind(this, this._maybeShowInput));
         this._control.connect('stream-removed', Lang.bind(this, this._maybeShowInput));
+        this._icon.icon_name = 'audio-input-microphone-symbolic';
     },
 
     _connectStream: function(stream) {
@@ -243,17 +254,13 @@ const VolumeMenu = new Lang.Class({
         this._control.connect('default-sink-changed', Lang.bind(this, this._readOutput));
         this._control.connect('default-source-changed', Lang.bind(this, this._readInput));
 
-        /* Translators: This is the label for audio volume */
-        this._output = new OutputStreamSlider(this._control, _("Volume"));
+        this._output = new OutputStreamSlider(this._control);
         this._output.connect('stream-updated', Lang.bind(this, function() {
             this.emit('icon-changed');
         }));
-        this._output.connect('headphones-changed', Lang.bind(this, function(stream, value) {
-            this.emit('headphones-changed', value);
-        }));
         this.addMenuItem(this._output.item);
 
-        this._input = new InputStreamSlider(this._control, _("Microphone"));
+        this._input = new InputStreamSlider(this._control);
         this.addMenuItem(this._input.item);
 
         this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
@@ -301,18 +308,9 @@ const Indicator = new Lang.Class({
             this.actor.visible = (icon != null);
             this.setIcon(icon);
         }));
-        this._volumeMenu.connect('headphones-changed', Lang.bind(this, function(menu, value) {
-            this._headphoneIcon.visible = value;
-        }));
-
-        this._headphoneIcon = this.addIcon(new Gio.ThemedIcon({ name: 'headphones-symbolic' }));
-        this._headphoneIcon.visible = false;
 
         this.menu.addMenuItem(this._volumeMenu);
 
-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.menu.addSettingsAction(_("Sound Settings"), 'gnome-sound-panel.desktop');
-
         this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
     },
 

js/ui/switcherPopup.js

@@ -46,7 +46,8 @@ const SwitcherPopup = new Lang.Class({
         this._selectedIndex = 0;
 
         this.actor = new Shell.GenericContainer({ style_class: 'switcher-popup',
-                                                  reactive: true });
+                                                  reactive: true,
+                                                  visible: false });
         this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
         this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
         this.actor.connect('allocate', Lang.bind(this, this._allocate));
@@ -159,6 +160,7 @@ const SwitcherPopup = new Lang.Class({
         // disturbed by the popup briefly flashing.
         this._initialDelayTimeoutId = Mainloop.timeout_add(POPUP_DELAY_TIMEOUT,
                                                            Lang.bind(this, function () {
+                                                               Main.osdWindow.cancel();
                                                                this.actor.opacity = 255;
                                                                this._initialDelayTimeoutId = 0;
                                                            }));
@@ -303,7 +305,7 @@ const SwitcherList = new Lang.Class({
         this.actor.connect('allocate', Lang.bind(this, this._allocateTop));
 
         // Here we use a GenericContainer so that we can force all the
-        // children except the separator to have the same width.
+        // children to have the same width.
         this._list = new Shell.GenericContainer({ style_class: 'switcher-list-item-container' });
         this._list.spacing = 0;
         this._list.connect('style-changed', Lang.bind(this, function() {
@@ -338,7 +340,6 @@ const SwitcherList = new Lang.Class({
 
         this._items = [];
         this._highlighted = -1;
-        this._separator = null;
         this._squareItems = squareItems;
         this._minSize = 0;
         this._scrollableRight = true;
@@ -401,12 +402,6 @@ const SwitcherList = new Lang.Class({
         this._itemEntered(index);
     },
 
-    addSeparator: function () {
-        let box = new St.Bin({ style_class: 'separator' });
-        this._separator = box;
-        this._list.add_actor(box);
-    },
-
     highlight: function(index, justOutline) {
         if (this._highlighted != -1) {
             this._items[this._highlighted].remove_style_pseudo_class('outlined');
@@ -514,14 +509,8 @@ const SwitcherList = new Lang.Class({
     _getPreferredWidth: function (actor, forHeight, alloc) {
         let [maxChildMin, maxChildNat] = this._maxChildWidth(forHeight);
 
-        let separatorWidth = 0;
-        if (this._separator) {
-            let [sepMin, sepNat] = this._separator.get_preferred_width(forHeight);
-            separatorWidth = sepNat + this._list.spacing;
-        }
-
         let totalSpacing = this._list.spacing * (this._items.length - 1);
-        alloc.min_size = this._items.length * maxChildMin + separatorWidth + totalSpacing;
+        alloc.min_size = this._items.length * maxChildMin + totalSpacing;
         alloc.natural_size = alloc.min_size;
         this._minSize = alloc.min_size;
     },
@@ -552,14 +541,7 @@ const SwitcherList = new Lang.Class({
         let [maxChildMin, maxChildNat] = this._maxChildWidth(childHeight);
         let totalSpacing = this._list.spacing * (this._items.length - 1);
 
-        let separatorWidth = 0;
-        if (this._separator) {
-            let [sepMin, sepNat] = this._separator.get_preferred_width(childHeight);
-            separatorWidth = sepNat;
-            totalSpacing += this._list.spacing;
-        }
-
-        let childWidth = Math.floor(Math.max(0, box.x2 - box.x1 - totalSpacing - separatorWidth) / this._items.length);
+        let childWidth = Math.floor(Math.max(0, box.x2 - box.x1 - totalSpacing) / this._items.length);
 
         let x = 0;
         let children = this._list.get_children();
@@ -579,14 +561,6 @@ const SwitcherList = new Lang.Class({
                 children[i].allocate(childBox, flags);
 
                 x += this._list.spacing + childWidth;
-            } else if (children[i] == this._separator) {
-                // We want the separator to be more compact than the rest.
-                childBox.x1 = x;
-                childBox.y1 = 0;
-                childBox.x2 = x + separatorWidth;
-                childBox.y2 = childHeight;
-                children[i].allocate(childBox, flags);
-                x += this._list.spacing + separatorWidth;
             } else {
                 // Something else, eg, AppSwitcher's arrows;
                 // we don't allocate it.

js/ui/tweener.js

@@ -2,6 +2,7 @@
 
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
+const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;
@@ -73,6 +74,9 @@ function _wrapTweening(target, tweeningParameters) {
         }
     }
 
+    if (!Gtk.Settings.get_default().gtk_enable_animations)
+        tweeningParameters['time'] = 0.000001;
+
     _addHandler(target, tweeningParameters, 'onStart', _tweenStarted);
     _addHandler(target, tweeningParameters, 'onComplete', _tweenCompleted);
 }

js/ui/unlockDialog.js

@@ -1,6 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const AccountsService = imports.gi.AccountsService;
+const Atk = imports.gi.Atk;
 const Clutter = imports.gi.Clutter;
 const Gdm  = imports.gi.Gdm;
 const Gio = imports.gi.Gio;
@@ -12,13 +13,13 @@ const Signals = imports.signals;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 
+const Layout = imports.ui.layout;
 const Main = imports.ui.main;
-const ModalDialog = imports.ui.modalDialog;
 const Panel = imports.ui.panel;
-const ShellEntry = imports.ui.shellEntry;
 const Tweener = imports.ui.tweener;
-const UserMenu = imports.ui.userMenu;
+const UserWidget = imports.ui.userWidget;
 
+const AuthPrompt = imports.gdm.authPrompt;
 const Batch = imports.gdm.batch;
 const GdmUtil = imports.gdm.util;
 const LoginDialog = imports.gdm.loginDialog;
@@ -26,177 +27,36 @@ const LoginDialog = imports.gdm.loginDialog;
 // The timeout before going back automatically to the lock screen (in seconds)
 const IDLE_TIMEOUT = 2 * 60;
 
-function versionCompare(required, reference) {
-    required = required.split('.');
-    reference = reference.split('.');
-
-    for (let i = 0; i < required.length; i++) {
-        if (required[i] != reference[i])
-            return required[i] < reference[i];
-    }
-
-    return true;
-}
-
-function isSupported() {
-    try {
-        let params = GLib.Variant.new('(ss)', ['org.gnome.DisplayManager.Manager', 'Version']);
-        let result = Gio.DBus.system.call_sync('org.gnome.DisplayManager',
-                                               '/org/gnome/DisplayManager/Manager',
-                                               'org.freedesktop.DBus.Properties',
-                                               'Get', params, null,
-                                               Gio.DBusCallFlags.NONE,
-                                               -1, null);
-
-        let version = result.deep_unpack()[0].deep_unpack();
-        return versionCompare('3.5.91', version);
-    } catch(e) {
-        return false;
-    }
-}
-
-// A widget showing the user avatar and name
-const UserWidget = new Lang.Class({
-    Name: 'UserWidget',
-
-    _init: function(user) {
-        this._user = user;
-
-        this.actor = new St.BoxLayout({ style_class: 'unlock-dialog-user-name-container',
-                                        vertical: false });
-
-        this._avatar = new UserMenu.UserAvatarWidget(user);
-        this.actor.add(this._avatar.actor,
-                       { x_fill: true, y_fill: true });
-
-        this._label = new St.Label({ style_class: 'login-dialog-username' });
-        this.actor.add(this._label,
-                       { expand: true,
-                         x_fill: true,
-                         y_fill: false,
-                         y_align: St.Align.MIDDLE });
-
-        this._userLoadedId = this._user.connect('notify::is-loaded',
-                                                Lang.bind(this, this._updateUser));
-        this._userChangedId = this._user.connect('changed',
-                                                 Lang.bind(this, this._updateUser));
-        if (this._user.is_loaded)
-            this._updateUser();
-    },
-
-    destroy: function() {
-        if (this._userLoadedId != 0) {
-            this._user.disconnect(this._userLoadedId);
-            this._userLoadedId = 0;
-        }
-
-        if (this._userChangedId != 0) {
-            this._user.disconnect(this._userChangedId);
-            this._userChangedId = 0;
-        }
-
-        this.actor.destroy();
-    },
-
-    _updateUser: function() {
-        if (this._user.is_loaded)
-            this._label.text = this._user.get_real_name();
-        else
-            this._label.text = '';
-
-        this._avatar.update();
-    }
-});
-
 const UnlockDialog = new Lang.Class({
     Name: 'UnlockDialog',
-    Extends: ModalDialog.ModalDialog,
 
     _init: function(parentActor) {
-        this.parent({ shellReactive: true,
-                      styleClass: 'login-dialog',
-                      keybindingMode: Main.KeybindingMode.UNLOCK_SCREEN,
-                      parentActor: parentActor
-                    });
+        this.actor = new St.Widget({ accessible_role: Atk.Role.WINDOW,
+                                     style_class: 'login-dialog',
+                                     visible: false });
+
+        this.actor.add_constraint(new Layout.MonitorConstraint({ primary: true }));
+        parentActor.add_child(this.actor);
 
         this._userManager = AccountsService.UserManager.get_default();
         this._userName = GLib.get_user_name();
         this._user = this._userManager.get_user(this._userName);
 
-        this._failCounter = 0;
-        this._firstQuestion = true;
+        this._promptBox = new St.BoxLayout({ vertical: true });
+        this.actor.add_child(this._promptBox);
+        this._promptBox.add_constraint(new Clutter.AlignConstraint({ source: this.actor,
+                                                                     align_axis: Clutter.AlignAxis.BOTH,
+                                                                     factor: 0.5 }));
 
-        this._greeterClient = new Gdm.Client();
-        this._userVerifier = new GdmUtil.ShellUserVerifier(this._greeterClient, { reauthenticationOnly: true });
+        this._authPrompt = new AuthPrompt.AuthPrompt(new Gdm.Client(), AuthPrompt.AuthPromptMode.UNLOCK_ONLY);
+        this._authPrompt.connect('reset', Lang.bind(this, this._onReset));
+        this._authPrompt.setUser(this._user);
+        this._authPrompt.setPasswordChar('\u25cf');
+        this._authPrompt.nextButton.label = _("Unlock");
 
-        this._userVerifier.connect('ask-question', Lang.bind(this, this._onAskQuestion));
-        this._userVerifier.connect('show-message', Lang.bind(this, this._showMessage));
-        this._userVerifier.connect('verification-complete', Lang.bind(this, this._onVerificationComplete));
-        this._userVerifier.connect('verification-failed', Lang.bind(this, this._onVerificationFailed));
-        this._userVerifier.connect('reset', Lang.bind(this, this._onReset));
-
-        this._userVerifier.connect('show-login-hint', Lang.bind(this, this._showLoginHint));
-        this._userVerifier.connect('hide-login-hint', Lang.bind(this, this._hideLoginHint));
-
-        this._userWidget = new UserWidget(this._user);
-        this.contentLayout.add_actor(this._userWidget.actor);
-
-        this._promptLayout = new St.BoxLayout({ style_class: 'login-dialog-prompt-layout',
-                                                vertical: true });
-
-        this._promptLabel = new St.Label({ style_class: 'login-dialog-prompt-label' });
-        this._promptLayout.add(this._promptLabel,
-                               { x_align: St.Align.START });
-
-        this._promptEntry = new St.Entry({ style_class: 'login-dialog-prompt-entry',
-                                           can_focus: true });
-        this._promptEntry.clutter_text.set_password_char('\u25cf');
-        ShellEntry.addContextMenu(this._promptEntry, { isPassword: true });
-        this.setInitialKeyFocus(this._promptEntry);
-        this._promptEntry.clutter_text.connect('text-changed', Lang.bind(this, function() {
-            this._updateOkButtonSensitivity(this._promptEntry.text.length > 0);
-        }));
-
-        this._promptLayout.add(this._promptEntry,
-                               { expand: true,
-                                 x_fill: true });
-
-        this.contentLayout.add_actor(this._promptLayout);
-
-        this._promptMessage = new St.Label({ visible: false });
-        this.contentLayout.add(this._promptMessage, { x_fill: true });
-
-        this._promptLoginHint = new St.Label({ style_class: 'login-dialog-prompt-login-hint' });
-        this._promptLoginHint.hide();
-        this.contentLayout.add_actor(this._promptLoginHint);
-
-        this._workSpinner = new Panel.AnimatedIcon('process-working.svg', LoginDialog.WORK_SPINNER_ICON_SIZE);
-        this._workSpinner.actor.opacity = 0;
+        this._promptBox.add_child(this._authPrompt.actor);
 
         this.allowCancel = false;
-        this.buttonLayout.visible = true;
-        this.addButton({ label: _("Cancel"),
-                         action: Lang.bind(this, this._escape),
-                         key: Clutter.KEY_Escape },
-                       { expand: true,
-                         x_fill: false,
-                         y_fill: false,
-                         x_align: St.Align.START,
-                         y_align: St.Align.MIDDLE });
-        this.buttonLayout.add(this._workSpinner.actor,
-                              { expand: false,
-                                x_fill: false,
-                                y_fill: false,
-                                x_align: St.Align.END,
-                                y_align: St.Align.MIDDLE });
-        this._okButton = this.addButton({ label: _("Unlock"),
-                                          action: Lang.bind(this, this._doUnlock),
-                                          default: true },
-                                        { expand: false,
-                                          x_fill: false,
-                                          y_fill: false,
-                                          x_align: St.Align.END,
-                                          y_align: St.Align.MIDDLE });
 
         let screenSaverSettings = new Gio.Settings({ schema: 'org.gnome.desktop.screensaver' });
         if (screenSaverSettings.get_boolean('user-switch-enabled')) {
@@ -209,155 +69,36 @@ const UnlockDialog = new Lang.Class({
                                                     x_align: St.Align.START,
                                                     x_fill: true });
             this._otherUserButton.connect('clicked', Lang.bind(this, this._otherUserClicked));
-            this.dialogLayout.add(this._otherUserButton,
-                                  { x_align: St.Align.START,
-                                    x_fill: false });
+            this._promptBox.add_child(this._otherUserButton);
         } else {
             this._otherUserButton = null;
         }
 
+        this._authPrompt.begin({ userName: this._userName });
         this._updateSensitivity(true);
 
-        let batch = new Batch.Hold();
-        this._userVerifier.begin(this._userName, batch);
-
-        GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
-            this.emit('loaded');
-            return false;
-        }));
-
-        Main.ctrlAltTabManager.addGroup(this.dialogLayout, _("Unlock Window"), 'dialog-password-symbolic');
+        Main.ctrlAltTabManager.addGroup(this.actor, _("Unlock Window"), 'dialog-password-symbolic');
 
         this._idleMonitor = new GnomeDesktop.IdleMonitor();
-        this._idleWatchId = this._idleMonitor.add_watch(IDLE_TIMEOUT * 1000, Lang.bind(this, this._escape));
+        this._idleWatchId = this._idleMonitor.add_idle_watch(IDLE_TIMEOUT * 1000, Lang.bind(this, this._escape));
     },
 
     _updateSensitivity: function(sensitive) {
-        this._promptEntry.reactive = sensitive;
-        this._promptEntry.clutter_text.editable = sensitive;
-        this._updateOkButtonSensitivity(sensitive && this._promptEntry.text.length > 0);
+        this._authPrompt.updateSensitivity(sensitive);
+
         if (this._otherUserButton) {
             this._otherUserButton.reactive = sensitive;
             this._otherUserButton.can_focus = sensitive;
         }
     },
 
-    _updateOkButtonSensitivity: function(sensitive) {
-        this._okButton.reactive = sensitive;
-        this._okButton.can_focus = sensitive;
-    },
-
-    _setWorking: function(working) {
-        if (working) {
-            this._workSpinner.play();
-            Tweener.addTween(this._workSpinner.actor,
-                             { opacity: 255,
-                               delay: LoginDialog.WORK_SPINNER_ANIMATION_DELAY,
-                               time: LoginDialog.WORK_SPINNER_ANIMATION_TIME,
-                               transition: 'linear'
-                             });
-        } else {
-            Tweener.addTween(this._workSpinner.actor,
-                             { opacity: 0,
-                               time: LoginDialog.WORK_SPINNER_ANIMATION_TIME,
-                               transition: 'linear',
-                               onCompleteScope: this,
-                               onComplete: function() {
-                                   this._workSpinner.stop();
-                               }
-                             });
-        }
-    },
-
-    _showMessage: function(userVerifier, message, styleClass) {
-        if (message) {
-            this._promptMessage.text = message;
-            this._promptMessage.styleClass = styleClass;
-            GdmUtil.fadeInActor(this._promptMessage);
-        } else {
-            GdmUtil.fadeOutActor(this._promptMessage);
-        }
-    },
-
-    _onAskQuestion: function(verifier, serviceName, question, passwordChar) {
-        if (this._firstQuestion && this._firstQuestionAnswer) {
-            this._userVerifier.answerQuery(serviceName, this._firstQuestionAnswer);
-            this._firstQuestionAnswer = null;
-            this._firstQuestion = false;
-            return;
-        }
-
-        this._promptLabel.text = question;
-
-        if (!this._firstQuestion)
-            this._promptEntry.text = '';
-        else
-            this._firstQuestion = false;
-
-        this._promptEntry.clutter_text.set_password_char(passwordChar);
-        this._promptEntry.menu.isPassword = passwordChar != '';
-
-        this._currentQuery = serviceName;
-        this._updateSensitivity(true);
-        this._setWorking(false);
-    },
-
-    _showLoginHint: function(verifier, message) {
-        this._promptLoginHint.set_text(message)
-        GdmUtil.fadeInActor(this._promptLoginHint);
-    },
-
-    _hideLoginHint: function() {
-        GdmUtil.fadeOutActor(this._promptLoginHint);
-    },
-
-    _doUnlock: function() {
-        if (this._firstQuestion) {
-            // we haven't received a query yet, so stash the answer
-            // and make ourself non-reactive
-            // the actual reply to GDM will be sent as soon as asked
-            this._firstQuestionAnswer = this._promptEntry.text;
-            this._updateSensitivity(false);
-            this._setWorking(true);
-            return;
-        }
-
-        if (!this._currentQuery)
-            return;
-
-        let query = this._currentQuery;
-        this._currentQuery = null;
-
-        this._updateSensitivity(false);
-        this._setWorking(true);
-
-        this._userVerifier.answerQuery(query, this._promptEntry.text);
-    },
-
-    _onVerificationComplete: function() {
-        this._userVerifier.clear();
-        this.emit('unlocked');
-    },
-
     _onReset: function() {
         this.emit('failed');
     },
 
-    _onVerificationFailed: function() {
-        this._currentQuery = null;
-        this._firstQuestion = true;
-
-        this._promptEntry.text = '';
-        this._promptEntry.clutter_text.set_password_char('\u25cf');
-        this._promptEntry.menu.isPassword = true;
-
-        this._updateSensitivity(false);
-        this._setWorking(false);
-    },
-
     _escape: function() {
         if (this.allowCancel) {
-            this._userVerifier.cancel();
+            this._authPrompt.cancel();
             this.emit('failed');
         }
     },
@@ -365,24 +106,53 @@ const UnlockDialog = new Lang.Class({
     _otherUserClicked: function(button, event) {
         Gdm.goto_login_session_sync(null);
 
-        this._userVerifier.cancel();
-        this.emit('failed');
+        this._authPrompt.cancel();
     },
 
     destroy: function() {
-        this._userVerifier.clear();
+        this.popModal();
+        this.actor.destroy();
 
         if (this._idleWatchId) {
             this._idleMonitor.remove_watch(this._idleWatchId);
             this._idleWatchId = 0;
         }
-
-        this.parent();
     },
 
     cancel: function() {
-        this._userVerifier.cancel(null);
+        this._authPrompt.cancel();
 
         this.destroy();
     },
+
+    addCharacter: function(unichar) {
+        this._authPrompt.addCharacter(unichar);
+    },
+
+    finish: function(onComplete) {
+        this._authPrompt.finish(onComplete);
+    },
+
+    open: function(timestamp) {
+        this.actor.show();
+
+        if (this._isModal)
+            return true;
+
+        if (!Main.pushModal(this.actor, { timestamp: timestamp,
+                                          keybindingMode: Shell.KeyBindingMode.UNLOCK_SCREEN }))
+            return false;
+
+        this._isModal = true;
+
+        return true;
+    },
+
+    popModal: function(timestamp) {
+        if (this._isModal) {
+            Main.popModal(this.actor, timestamp);
+            this._isModal = false;
+        }
+    }
 });
+Signals.addSignalMethods(UnlockDialog.prototype);

js/ui/userMenu.js

@@ -1,881 +0,0 @@
-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
-
-const AccountsService = imports.gi.AccountsService;
-const Gdm = imports.gi.Gdm;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Lang = imports.lang;
-const Pango = imports.gi.Pango;
-const Shell = imports.gi.Shell;
-const St = imports.gi.St;
-const Tp = imports.gi.TelepathyGLib;
-const Atk = imports.gi.Atk;
-
-const BoxPointer = imports.ui.boxpointer;
-const GnomeSession = imports.misc.gnomeSession;
-const LoginManager = imports.misc.loginManager;
-const Main = imports.ui.main;
-const PanelMenu = imports.ui.panelMenu;
-const PopupMenu = imports.ui.popupMenu;
-const Params = imports.misc.params;
-const Util = imports.misc.util;
-
-const LOCKDOWN_SCHEMA = 'org.gnome.desktop.lockdown';
-const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
-const PRIVACY_SCHEMA = 'org.gnome.desktop.privacy'
-const DISABLE_USER_SWITCH_KEY = 'disable-user-switching';
-const DISABLE_LOCK_SCREEN_KEY = 'disable-lock-screen';
-const DISABLE_LOG_OUT_KEY = 'disable-log-out';
-const LOCK_ENABLED_KEY = 'lock-enabled';
-const ALWAYS_SHOW_LOG_OUT_KEY = 'always-show-log-out';
-const SHOW_FULL_NAME_IN_TOP_BAR_KEY = 'show-full-name-in-top-bar';
-
-const DIALOG_ICON_SIZE = 64;
-
-const IMStatus = {
-    AVAILABLE: 0,
-    BUSY: 1,
-    HIDDEN: 2,
-    AWAY: 3,
-    IDLE: 4,
-    OFFLINE: 5,
-    LAST: 6
-};
-
-// Adapted from gdm/gui/user-switch-applet/applet.c
-//
-// Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>.
-// Copyright (C) 2008,2009 Red Hat, Inc.
-
-const UserAvatarWidget = new Lang.Class({
-    Name: 'UserAvatarWidget',
-
-    _init: function(user, params) {
-        this._user = user;
-        params = Params.parse(params, { reactive: false,
-                                        iconSize: DIALOG_ICON_SIZE,
-                                        styleClass: 'status-chooser-user-icon' });
-        this._iconSize = params.iconSize;
-
-        this.actor = new St.Bin({ style_class: params.styleClass,
-                                  track_hover: params.reactive,
-                                  reactive: params.reactive });
-    },
-
-    setSensitive: function(sensitive) {
-        this.actor.can_focus = sensitive;
-        this.actor.reactive = sensitive;
-    },
-
-    update: function() {
-        let iconFile = this._user.get_icon_file();
-        if (!GLib.file_test(iconFile, GLib.FileTest.EXISTS))
-            iconFile = null;
-
-        if (iconFile) {
-            let file = Gio.File.new_for_path(iconFile);
-            this.actor.child = null;
-            this.actor.style = 'background-image: url("%s");'.format(iconFile);
-        } else {
-            this.actor.style = null;
-            this.actor.child = new St.Icon({ icon_name: 'avatar-default-symbolic',
-                                             icon_size: this._iconSize });
-        }
-    }
-});
-
-const IMStatusItem = new Lang.Class({
-    Name: 'IMStatusItem',
-    Extends: PopupMenu.PopupBaseMenuItem,
-
-    _init: function(label, iconName) {
-        this.parent();
-
-        this.actor.add_style_class_name('status-chooser-status-item');
-
-        this._icon = new St.Icon({ style_class: 'popup-menu-icon' });
-        this.addActor(this._icon);
-
-        if (iconName)
-            this._icon.icon_name = iconName;
-
-        this.label = new St.Label({ text: label });
-        this.actor.label_actor = this.label;
-        this.addActor(this.label);
-    }
-});
-
-const IMUserNameItem = new Lang.Class({
-    Name: 'IMUserNameItem',
-    Extends: PopupMenu.PopupBaseMenuItem,
-
-    _init: function() {
-        this.parent({ reactive: false,
-                      can_focus: false,
-                      style_class: 'status-chooser-user-name' });
-
-        this._wrapper = new Shell.GenericContainer();
-        this._wrapper.connect('get-preferred-width',
-                              Lang.bind(this, this._wrapperGetPreferredWidth));
-        this._wrapper.connect('get-preferred-height',
-                              Lang.bind(this, this._wrapperGetPreferredHeight));
-        this._wrapper.connect('allocate',
-                              Lang.bind(this, this._wrapperAllocate));
-        this.addActor(this._wrapper, { expand: true, span: -1 });
-
-        this.label = new St.Label();
-        this.label.clutter_text.set_line_wrap(true);
-        this.label.clutter_text.set_ellipsize(Pango.EllipsizeMode.NONE);
-        this._wrapper.add_actor(this.label);
-    },
-
-    _wrapperGetPreferredWidth: function(actor, forHeight, alloc) {
-        alloc.min_size = 1;
-        alloc.natural_size = 1;
-    },
-
-    _wrapperGetPreferredHeight: function(actor, forWidth, alloc) {
-        [alloc.min_size, alloc.natural_size] = this.label.get_preferred_height(forWidth);
-    },
-
-    _wrapperAllocate: function(actor, box, flags) {
-        this.label.allocate(box, flags);
-    }
-});
-
-const IMStatusChooserItem = new Lang.Class({
-    Name: 'IMStatusChooserItem',
-    Extends: PopupMenu.PopupBaseMenuItem,
-
-    _init: function() {
-        this.parent({ reactive: false,
-                      can_focus: false,
-                      style_class: 'status-chooser' });
-
-        this._userManager = AccountsService.UserManager.get_default();
-        this._user = this._userManager.get_user(GLib.get_user_name());
-
-        this._avatar = new UserAvatarWidget(this._user, { reactive: true });
-        this._iconBin = new St.Button({ child: this._avatar.actor });
-        this.addActor(this._iconBin);
-
-        this._iconBin.connect('clicked', Lang.bind(this,
-            function() {
-                this.activate();
-            }));
-
-        this._section = new PopupMenu.PopupMenuSection();
-        this.addActor(this._section.actor);
-
-        this._name = new IMUserNameItem();
-        this._section.addMenuItem(this._name);
-
-        this._combo = new PopupMenu.PopupComboBoxMenuItem({ style_class: 'status-chooser-combo' });
-        this._section.addMenuItem(this._combo);
-
-        let item;
-
-        item = new IMStatusItem(_("Available"), 'user-available-symbolic');
-        this._combo.addMenuItem(item, IMStatus.AVAILABLE);
-
-        item = new IMStatusItem(_("Busy"), 'user-busy-symbolic');
-        this._combo.addMenuItem(item, IMStatus.BUSY);
-
-        item = new IMStatusItem(_("Invisible"), 'user-invisible-symbolic');
-        this._combo.addMenuItem(item, IMStatus.HIDDEN);
-
-        item = new IMStatusItem(_("Away"), 'user-away-symbolic');
-        this._combo.addMenuItem(item, IMStatus.AWAY);
-
-        item = new IMStatusItem(_("Idle"), 'user-idle-symbolic');
-        this._combo.addMenuItem(item, IMStatus.IDLE);
-
-        item = new IMStatusItem(_("Offline"), 'user-offline-symbolic');
-        this._combo.addMenuItem(item, IMStatus.OFFLINE);
-
-        this._combo.connect('active-item-changed',
-                            Lang.bind(this, this._changeIMStatus));
-
-        this._presence = new GnomeSession.Presence();
-        this._presence.connectSignal('StatusChanged', Lang.bind(this, function(proxy, senderName, [status]) {
-            this._sessionStatusChanged(status);
-        }));
-
-        this._sessionPresenceRestored = false;
-        this._imPresenceRestored = false;
-        this._currentPresence = undefined;
-
-        this._accountMgr = Tp.AccountManager.dup();
-        this._accountMgr.connect('most-available-presence-changed',
-                                 Lang.bind(this, this._IMStatusChanged));
-        this._accountMgr.connect('account-enabled',
-                                 Lang.bind(this, this._IMAccountsChanged));
-        this._accountMgr.connect('account-disabled',
-                                 Lang.bind(this, this._IMAccountsChanged));
-        this._accountMgr.connect('account-removed',
-                                 Lang.bind(this, this._IMAccountsChanged));
-        this._accountMgr.connect('account-validity-changed',
-                                 Lang.bind(this, this._IMAccountsChanged));
-        this._accountMgr.prepare_async(null, Lang.bind(this,
-            function(mgr) {
-                this._IMAccountsChanged(mgr);
-
-                if (this._networkMonitor.network_available)
-                    this._restorePresence();
-                else
-                    this._setComboboxPresence(Tp.ConnectionPresenceType.OFFLINE);
-            }));
-
-        this._networkMonitor = Gio.NetworkMonitor.get_default();
-        this._networkMonitor.connect('network-changed',
-            Lang.bind(this, function(monitor, available) {
-                this._IMAccountsChanged(this._accountMgr);
-
-                if (available && !this._imPresenceRestored)
-                    this._restorePresence();
-            }));
-
-        this._userLoadedId = this._user.connect('notify::is-loaded',
-                                                Lang.bind(this,
-                                                          this._updateUser));
-        this._userChangedId = this._user.connect('changed',
-                                                 Lang.bind(this,
-                                                           this._updateUser));
-        this.actor.connect('notify::mapped', Lang.bind(this, function() {
-            if (this.actor.mapped)
-                this._updateUser();
-        }));
-
-        this.connect('sensitive-changed', function(sensitive) {
-            this._avatar.setSensitive(sensitive);
-        });
-    },
-
-    _restorePresence: function() {
-        let [presence, status, msg] = this._accountMgr.get_most_available_presence();
-
-        let savedPresence = global.settings.get_int('saved-im-presence');
-
-        if (savedPresence == presence) {
-            this._IMStatusChanged(this._accountMgr, presence, status, msg);
-        } else {
-            this._setComboboxPresence(savedPresence);
-            status = this._statusForPresence(savedPresence);
-            msg = msg ? msg : '';
-            this._accountMgr.set_all_requested_presences(savedPresence, status, msg);
-        }
-    },
-
-    destroy: function() {
-        // clean up signal handlers
-        if (this._userLoadedId != 0) {
-            this._user.disconnect(this._userLoadedId);
-            this._userLoadedId = 0;
-        }
-
-        if (this._userChangedId != 0) {
-            this._user.disconnect(this._userChangedId);
-            this._userChangedId = 0;
-        }
-
-        this.parent();
-    },
-
-    // Override getColumnWidths()/setColumnWidths() to make the item
-    // independent from the overall column layout of the menu
-    getColumnWidths: function() {
-        return [];
-    },
-
-    setColumnWidths: function(widths) {
-    },
-
-    _updateUser: function() {
-        if (this._user.is_loaded)
-            this._name.label.set_text(this._user.get_real_name());
-        else
-            this._name.label.set_text("");
-
-        this._avatar.update();
-    },
-
-    _statusForPresence: function(presence) {
-        switch(presence) {
-            case Tp.ConnectionPresenceType.AVAILABLE:
-                return 'available';
-            case Tp.ConnectionPresenceType.BUSY:
-                return 'busy';
-            case Tp.ConnectionPresenceType.OFFLINE:
-                return 'offline';
-            case Tp.ConnectionPresenceType.HIDDEN:
-                return 'hidden';
-            case Tp.ConnectionPresenceType.AWAY:
-                return 'away';
-            case Tp.ConnectionPresenceType.EXTENDED_AWAY:
-                return 'xa';
-            default:
-                return 'unknown';
-        }
-    },
-
-    _IMAccountsChanged: function(mgr) {
-        let accounts = mgr.get_valid_accounts().filter(function(account) {
-            return account.enabled;
-        });
-        let sensitive = accounts.length > 0 && this._networkMonitor.network_available;
-        this._combo.setSensitive(sensitive);
-    },
-
-    _IMStatusChanged: function(accountMgr, presence, status, message) {
-        if (!this._imPresenceRestored)
-            this._imPresenceRestored = true;
-
-        if (presence == this._currentPresence)
-            return;
-
-        this._currentPresence = presence;
-        this._setComboboxPresence(presence);
-
-        if (!this._sessionPresenceRestored) {
-            this._sessionStatusChanged(this._presence.status);
-            return;
-        }
-
-        if (presence == Tp.ConnectionPresenceType.AVAILABLE)
-            this._presence.status = GnomeSession.PresenceStatus.AVAILABLE;
-
-        // We ignore the actual value of _expectedPresence and never safe
-        // the first presence change after an "automatic" change, assuming
-        // that it is the response to our request; this is to account for
-        // mission control falling back to "similar" presences if an account
-        // type does not implement the requested presence.
-        if (!this._expectedPresence)
-            global.settings.set_int('saved-im-presence', presence);
-        else
-            this._expectedPresence = undefined;
-    },
-
-    _setComboboxPresence: function(presence) {
-        let activatedItem;
-
-        if (presence == Tp.ConnectionPresenceType.AVAILABLE)
-            activatedItem = IMStatus.AVAILABLE;
-        else if (presence == Tp.ConnectionPresenceType.BUSY)
-            activatedItem = IMStatus.BUSY;
-        else if (presence == Tp.ConnectionPresenceType.HIDDEN)
-            activatedItem = IMStatus.HIDDEN;
-        else if (presence == Tp.ConnectionPresenceType.AWAY)
-            activatedItem = IMStatus.AWAY;
-        else if (presence == Tp.ConnectionPresenceType.EXTENDED_AWAY)
-            activatedItem = IMStatus.IDLE;
-        else
-            activatedItem = IMStatus.OFFLINE;
-
-        this._combo.setActiveItem(activatedItem);
-        for (let i = 0; i < IMStatus.LAST; i++) {
-            if (i == IMStatus.AVAILABLE || i == IMStatus.OFFLINE)
-                continue;   // always visible
-
-            this._combo.setItemVisible(i, i == activatedItem);
-        }
-    },
-
-    _changeIMStatus: function(menuItem, id) {
-        let [presence, s, msg] = this._accountMgr.get_most_available_presence();
-        let newPresence, status;
-
-        if (id == IMStatus.AVAILABLE) {
-            newPresence = Tp.ConnectionPresenceType.AVAILABLE;
-        } else if (id == IMStatus.OFFLINE) {
-            newPresence = Tp.ConnectionPresenceType.OFFLINE;
-        } else
-            return;
-
-        status = this._statusForPresence(newPresence);
-        msg = msg ? msg : '';
-        this._accountMgr.set_all_requested_presences(newPresence, status, msg);
-    },
-
-    getIMPresenceForSessionStatus: function(sessionStatus) {
-        // Restore the last user-set presence when coming back from
-        // BUSY/IDLE (otherwise the last user-set presence matches
-        // the current one)
-        if (sessionStatus == GnomeSession.PresenceStatus.AVAILABLE)
-            return global.settings.get_int('saved-im-presence');
-
-        if (sessionStatus == GnomeSession.PresenceStatus.BUSY) {
-            // Only change presence if the current one is "more present" than
-            // busy, or if coming back from idle
-            if (this._currentPresence == Tp.ConnectionPresenceType.AVAILABLE ||
-                this._currentPresence == Tp.ConnectionPresenceType.EXTENDED_AWAY)
-                return Tp.ConnectionPresenceType.BUSY;
-        }
-
-        if (sessionStatus == GnomeSession.PresenceStatus.IDLE) {
-            // Only change presence if the current one is "more present" than
-            // idle
-            if (this._currentPresence != Tp.ConnectionPresenceType.OFFLINE &&
-                this._currentPresence != Tp.ConnectionPresenceType.HIDDEN)
-                return Tp.ConnectionPresenceType.EXTENDED_AWAY;
-        }
-
-        return this._currentPresence;
-    },
-
-    _sessionStatusChanged: function(sessionStatus) {
-        if (!this._imPresenceRestored)
-            return;
-
-        let savedStatus = global.settings.get_int('saved-session-presence');
-        if (!this._sessionPresenceRestored) {
-
-            // We should never save/restore a status other than AVAILABLE
-            // or BUSY
-            if (savedStatus != GnomeSession.PresenceStatus.AVAILABLE &&
-                savedStatus != GnomeSession.PresenceStatus.BUSY)
-                savedStatus = GnomeSession.PresenceStatus.AVAILABLE;
-
-            if (sessionStatus != savedStatus) {
-                this._presence.status = savedStatus;
-                return;
-            }
-            this._sessionPresenceRestored = true;
-        }
-
-        if ((sessionStatus == GnomeSession.PresenceStatus.AVAILABLE ||
-             sessionStatus == GnomeSession.PresenceStatus.BUSY) &&
-            savedStatus != sessionStatus)
-            global.settings.set_int('saved-session-presence', sessionStatus);
-
-        let [presence, s, msg] = this._accountMgr.get_most_available_presence();
-        let newPresence, status;
-
-        let newPresence = this.getIMPresenceForSessionStatus(sessionStatus);
-
-        if (!newPresence || newPresence == presence)
-            return;
-
-        status = this._statusForPresence(newPresence);
-        msg = msg ? msg : '';
-
-        this._expectedPresence = newPresence;
-        this._accountMgr.set_all_requested_presences(newPresence, status, msg);
-    }
-});
-
-
-const UserMenuButton = new Lang.Class({
-    Name: 'UserMenuButton',
-    Extends: PanelMenu.Button,
-
-    _init: function() {
-        this.parent(0.0);
-
-        this.actor.accessible_role = Atk.Role.MENU;
-
-        let box = new St.BoxLayout({ name: 'panelUserMenu' });
-        this.actor.add_actor(box);
-
-        this._screenSaverSettings = new Gio.Settings({ schema: SCREENSAVER_SCHEMA });
-        this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
-        this._privacySettings = new Gio.Settings({ schema: PRIVACY_SCHEMA });
-
-        this._userManager = AccountsService.UserManager.get_default();
-
-        this._user = this._userManager.get_user(GLib.get_user_name());
-        this._presence = new GnomeSession.Presence();
-        this._session = new GnomeSession.SessionManager();
-        this._haveShutdown = true;
-        this._haveSuspend = true;
-
-        this._accountMgr = Tp.AccountManager.dup();
-
-        this._loginManager = LoginManager.getLoginManager();
-        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
-
-        this._iconBox = new St.Bin();
-        box.add(this._iconBox, { y_align: St.Align.MIDDLE, y_fill: false });
-
-        let textureCache = St.TextureCache.get_default();
-        this._offlineIcon = new St.Icon({ icon_name: 'user-offline-symbolic',
-                                          style_class: 'popup-menu-icon' });
-        this._availableIcon = new St.Icon({ icon_name: 'user-available-symbolic',
-                                            style_class: 'popup-menu-icon' });
-        this._busyIcon = new St.Icon({ icon_name: 'user-busy-symbolic',
-                                       style_class: 'popup-menu-icon' });
-        this._invisibleIcon = new St.Icon({ icon_name: 'user-invisible-symbolic',
-                                            style_class: 'popup-menu-icon' });
-        this._awayIcon = new St.Icon({ icon_name: 'user-away-symbolic',
-                                       style_class: 'popup-menu-icon' });
-        this._idleIcon = new St.Icon({ icon_name: 'user-idle-symbolic',
-                                       style_class: 'popup-menu-icon' });
-        this._pendingIcon = new St.Icon({ icon_name: 'user-status-pending-symbolic',
-                                          style_class: 'popup-menu-icon' });
-        this._lockedIcon = new St.Icon({ icon_name: 'changes-prevent-symbolic',
-                                         style_class: 'popup-menu-icon' });
-
-        this._accountMgr.connect('most-available-presence-changed',
-                                  Lang.bind(this, this._updatePresenceIcon));
-        this._accountMgr.connect('account-enabled',
-                                  Lang.bind(this, this._onAccountEnabled));
-        this._accountMgr.connect('account-removed',
-                                  Lang.bind(this, this._onAccountRemoved));
-        this._accountMgr.prepare_async(null, Lang.bind(this,
-            function(mgr) {
-                let [presence, s, msg] = mgr.get_most_available_presence();
-                this._updatePresenceIcon(mgr, presence, s, msg);
-                this._setupAccounts();
-            }));
-
-        this._name = new St.Label();
-        this.actor.label_actor = this._name;
-        box.add(this._name, { y_align: St.Align.MIDDLE, y_fill: false });
-        this._userLoadedId = this._user.connect('notify::is-loaded', Lang.bind(this, this._updateUserName));
-        this._userChangedId = this._user.connect('changed', Lang.bind(this, this._updateUserName));
-        this._updateUserName();
-
-        this._createSubMenu();
-
-        this._updateSwitch(this._presence.status);
-        this._presence.connectSignal('StatusChanged', Lang.bind(this, function (proxy, senderName, [status]) {
-            this._updateSwitch(status);
-        }));
-
-        this._userManager.connect('notify::is-loaded',
-                                  Lang.bind(this, this._updateMultiUser));
-        this._userManager.connect('notify::has-multiple-users',
-                                  Lang.bind(this, this._updateMultiUser));
-        this._userManager.connect('user-added',
-                                  Lang.bind(this, this._updateMultiUser));
-        this._userManager.connect('user-removed',
-                                  Lang.bind(this, this._updateMultiUser));
-        this._lockdownSettings.connect('changed::' + DISABLE_USER_SWITCH_KEY,
-                                       Lang.bind(this, this._updateSwitchUser));
-        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
-                                       Lang.bind(this, this._updateLogout));
-        this._lockdownSettings.connect('changed::' + DISABLE_LOCK_SCREEN_KEY,
-                                       Lang.bind(this, this._updateLockScreen));
-        this._screenSaverSettings.connect('changed::' + SHOW_FULL_NAME_IN_TOP_BAR_KEY,
-                                           Lang.bind(this, this._updateUserName));
-        this._privacySettings.connect('changed::' + SHOW_FULL_NAME_IN_TOP_BAR_KEY,
-                                      Lang.bind(this, this._updateUserName));
-        this._updateSwitchUser();
-        this._updateLogout();
-        this._updateLockScreen();
-
-        this._updatesFile = Gio.File.new_for_path('/var/lib/PackageKit/prepared-update');
-        this._updatesMonitor = this._updatesFile.monitor(Gio.FileMonitorFlags.NONE, null);
-        this._updatesMonitor.connect('changed', Lang.bind(this, this._updateInstallUpdates));
-
-        // Whether shutdown is available or not depends on both lockdown
-        // settings (disable-log-out) and Polkit policy - the latter doesn't
-        // notify, so we update the menu item each time the menu opens or
-        // the lockdown setting changes, which should be close enough.
-        this.menu.connect('open-state-changed', Lang.bind(this,
-            function(menu, open) {
-                if (!open)
-                    return;
-
-                this._updateHaveShutdown();
-                this._updateHaveSuspend();
-            }));
-        this._lockdownSettings.connect('changed::' + DISABLE_LOG_OUT_KEY,
-                                       Lang.bind(this, this._updateHaveShutdown));
-
-        Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
-        this._sessionUpdated();
-    },
-
-    _sessionUpdated: function() {
-        this.actor.visible = !Main.sessionMode.isGreeter;
-
-        let allowSettings = Main.sessionMode.allowSettings;
-        this._statusChooser.setSensitive(allowSettings);
-        this._systemSettings.visible = allowSettings;
-
-        this.setSensitive(!Main.sessionMode.isLocked);
-        this._updatePresenceIcon();
-        this._updateUserName();
-    },
-
-    _onDestroy: function() {
-        this._user.disconnect(this._userLoadedId);
-        this._user.disconnect(this._userChangedId);
-    },
-
-    _updateUserName: function() {
-        let settings = this._privacySettings;
-        if (Main.sessionMode.isLocked)
-            settings = this._screenSaverSettings;
-        if (this._user.is_loaded && settings.get_boolean(SHOW_FULL_NAME_IN_TOP_BAR_KEY))
-            this._name.set_text(this._user.get_real_name());
-        else
-            this._name.set_text("");
-    },
-
-    _updateMultiUser: function() {
-        this._updateSwitchUser();
-        this._updateLogout();
-    },
-
-    _updateSwitchUser: function() {
-        let allowSwitch = !this._lockdownSettings.get_boolean(DISABLE_USER_SWITCH_KEY);
-        let multiUser = this._userManager.can_switch() && this._userManager.has_multiple_users;
-
-        this._loginScreenItem.actor.visible = allowSwitch && multiUser;
-    },
-
-    _updateLogout: function() {
-        let allowLogout = !this._lockdownSettings.get_boolean(DISABLE_LOG_OUT_KEY);
-        let alwaysShow = global.settings.get_boolean(ALWAYS_SHOW_LOG_OUT_KEY);
-        let systemAccount = this._user.system_account;
-        let localAccount = this._user.local_account;
-        let multiUser = this._userManager.has_multiple_users;
-        let multiSession = Gdm.get_session_ids().length > 1;
-
-        this._logoutItem.actor.visible = allowLogout && (alwaysShow || multiUser || multiSession || systemAccount || !localAccount);
-    },
-
-    _updateLockScreen: function() {
-        let allowLockScreen = !this._lockdownSettings.get_boolean(DISABLE_LOCK_SCREEN_KEY);
-        this._lockScreenItem.actor.visible = allowLockScreen;
-    },
-
-    _updateInstallUpdates: function() {
-        let haveUpdates = this._updatesFile.query_exists(null);
-        this._installUpdatesItem.actor.visible = haveUpdates && this._haveShutdown;
-    },
-
-    _updateHaveShutdown: function() {
-        this._session.CanShutdownRemote(Lang.bind(this,
-            function(result, error) {
-                if (!error) {
-                    this._haveShutdown = result[0];
-                    this._updateInstallUpdates();
-                    this._updateSuspendOrPowerOff();
-                }
-            }));
-    },
-
-    _updateHaveSuspend: function() {
-        this._loginManager.canSuspend(Lang.bind(this,
-            function(result) {
-                this._haveSuspend = result;
-                this._updateSuspendOrPowerOff();
-        }));
-    },
-
-    _updateSuspendOrPowerOff: function() {
-        if (!this._suspendOrPowerOffItem)
-            return;
-
-        this._suspendOrPowerOffItem.actor.visible = this._haveShutdown || this._haveSuspend;
-
-        // If we can't power off show Suspend instead
-        // and disable the alt key
-        if (!this._haveShutdown) {
-            this._suspendOrPowerOffItem.updateText(_("Suspend"), null);
-        } else if (!this._haveSuspend) {
-            this._suspendOrPowerOffItem.updateText(_("Power Off"), null);
-        } else {
-            this._suspendOrPowerOffItem.updateText(_("Power Off"), _("Suspend"));
-        }
-    },
-
-    _updateSwitch: function(status) {
-        let active = status == GnomeSession.PresenceStatus.AVAILABLE;
-        this._notificationsSwitch.setToggleState(active);
-    },
-
-    _updatePresenceIcon: function(accountMgr, presence, status, message) {
-        if (Main.sessionMode.isLocked)
-            this._iconBox.child = this._lockedIcon;
-        else if (presence == Tp.ConnectionPresenceType.AVAILABLE)
-            this._iconBox.child = this._availableIcon;
-        else if (presence == Tp.ConnectionPresenceType.BUSY)
-            this._iconBox.child = this._busyIcon;
-        else if (presence == Tp.ConnectionPresenceType.HIDDEN)
-            this._iconBox.child = this._invisibleIcon;
-        else if (presence == Tp.ConnectionPresenceType.AWAY)
-            this._iconBox.child = this._awayIcon;
-        else if (presence == Tp.ConnectionPresenceType.EXTENDED_AWAY)
-            this._iconBox.child = this._idleIcon;
-        else
-            this._iconBox.child = this._offlineIcon;
-    },
-
-    _setupAccounts: function() {
-        let accounts = this._accountMgr.get_valid_accounts();
-        for (let i = 0; i < accounts.length; i++) {
-            accounts[i]._changingId = accounts[i].connect('notify::connection-status',
-                                                          Lang.bind(this, this._updateChangingPresence));
-        }
-        this._updateChangingPresence();
-    },
-
-    _onAccountEnabled: function(accountMgr, account) {
-        if (!account._changingId)
-            account._changingId = account.connect('notify::connection-status',
-                                                  Lang.bind(this, this._updateChangingPresence));
-        this._updateChangingPresence();
-    },
-
-    _onAccountRemoved: function(accountMgr, account) {
-        if (account._changingId) {
-            account.disconnect(account._changingId);
-            account._changingId = 0;
-        }
-        this._updateChangingPresence();
-    },
-
-    _updateChangingPresence: function() {
-        let accounts = this._accountMgr.get_valid_accounts();
-        let changing = false;
-        for (let i = 0; i < accounts.length; i++) {
-            if (accounts[i].connection_status == Tp.ConnectionStatus.CONNECTING) {
-                changing = true;
-                break;
-            }
-        }
-
-        if (changing) {
-            this._iconBox.child = this._pendingIcon;
-        } else {
-            let [presence, s, msg] = this._accountMgr.get_most_available_presence();
-            this._updatePresenceIcon(this._accountMgr, presence, s, msg);
-        }
-    },
-
-    _createSubMenu: function() {
-        let item;
-
-        item = new IMStatusChooserItem();
-        item.connect('activate', Lang.bind(this, this._onMyAccountActivate));
-        this.menu.addMenuItem(item);
-        this._statusChooser = item;
-
-        item = new PopupMenu.PopupSwitchMenuItem(_("Notifications"));
-        item.connect('toggled', Lang.bind(this, this._updatePresenceStatus));
-        this.menu.addMenuItem(item);
-        this._notificationsSwitch = item;
-
-        item = new PopupMenu.PopupSeparatorMenuItem();
-        this.menu.addMenuItem(item);
-
-        item = new PopupMenu.PopupMenuItem(_("Settings"));
-        item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
-        this.menu.addMenuItem(item);
-        this._systemSettings = item;
-
-        item = new PopupMenu.PopupSeparatorMenuItem();
-        this.menu.addMenuItem(item);
-
-        item = new PopupMenu.PopupMenuItem(_("Switch User"));
-        item.connect('activate', Lang.bind(this, this._onLoginScreenActivate));
-        this.menu.addMenuItem(item);
-        this._loginScreenItem = item;
-
-        item = new PopupMenu.PopupMenuItem(_("Log Out"));
-        item.connect('activate', Lang.bind(this, this._onQuitSessionActivate));
-        this.menu.addMenuItem(item);
-        this._logoutItem = item;
-
-        item = new PopupMenu.PopupMenuItem(_("Lock"));
-        item.connect('activate', Lang.bind(this, this._onLockScreenActivate));
-        this.menu.addMenuItem(item);
-        this._lockScreenItem = item;
-
-        item = new PopupMenu.PopupSeparatorMenuItem();
-        this.menu.addMenuItem(item);
-
-        item = new PopupMenu.PopupAlternatingMenuItem(_("Power Off"),
-                                                      _("Suspend"));
-        this.menu.addMenuItem(item);
-        item.connect('activate', Lang.bind(this, this._onSuspendOrPowerOffActivate));
-        this._suspendOrPowerOffItem = item;
-        this._updateSuspendOrPowerOff();
-
-        item = new PopupMenu.PopupMenuItem(_("Install Updates & Restart"));
-        item.connect('activate', Lang.bind(this, this._onInstallUpdatesActivate));
-        this.menu.addMenuItem(item);
-        this._installUpdatesItem = item;
-    },
-
-    _updatePresenceStatus: function(item, event) {
-        let status;
-
-        if (item.state) {
-            status = GnomeSession.PresenceStatus.AVAILABLE;
-        } else {
-            status = GnomeSession.PresenceStatus.BUSY;
-
-            let [presence, s, msg] = this._accountMgr.get_most_available_presence();
-            let newPresence = this._statusChooser.getIMPresenceForSessionStatus(status);
-            if (newPresence != presence &&
-                newPresence == Tp.ConnectionPresenceType.BUSY)
-                Main.notify(_("Your chat status will be set to busy"),
-                            _("Notifications are now disabled, including chat messages. Your online status has been adjusted to let others know that you might not see their messages."));
-        }
-
-        this._presence.status = status;
-    },
-
-    _onMyAccountActivate: function() {
-        Main.overview.hide();
-        let app = Shell.AppSystem.get_default().lookup_setting('gnome-user-accounts-panel.desktop');
-        app.activate();
-    },
-
-    _onPreferencesActivate: function() {
-        Main.overview.hide();
-        let app = Shell.AppSystem.get_default().lookup_app('gnome-control-center.desktop');
-        app.activate();
-    },
-
-    _onLockScreenActivate: function() {
-        this.menu.close(BoxPointer.PopupAnimation.NONE);
-        Main.overview.hide();
-        Main.screenShield.lock(true);
-    },
-
-    _onLoginScreenActivate: function() {
-        this.menu.close(BoxPointer.PopupAnimation.NONE);
-        Main.overview.hide();
-        Main.screenShield.lock(false);
-        Gdm.goto_login_session_sync(null);
-    },
-
-    _onQuitSessionActivate: function() {
-        Main.overview.hide();
-        this._session.LogoutRemote(0);
-    },
-
-    _onInstallUpdatesActivate: function() {
-        Main.overview.hide();
-        Util.spawn(['pkexec', '/usr/libexec/pk-trigger-offline-update']);
-
-        this._session.RebootRemote();
-    },
-
-    _onSuspendOrPowerOffActivate: function() {
-        Main.overview.hide();
-
-        if (this._haveShutdown &&
-            this._suspendOrPowerOffItem.state == PopupMenu.PopupAlternatingMenuItemState.DEFAULT) {
-            this._session.ShutdownRemote();
-        } else {
-            if (this._screenSaverSettings.get_boolean(LOCK_ENABLED_KEY)) {
-                let tmpId = Main.screenShield.connect('lock-screen-shown', Lang.bind(this, function() {
-                    Main.screenShield.disconnect(tmpId);
-
-                    this._loginManager.suspend();
-                }));
-
-                this.menu.close(BoxPointer.PopupAnimation.NONE);
-                Main.screenShield.lock(true);
-            } else {
-                this._loginManager.suspend();
-            }
-        }
-    }
-});

js/ui/userWidget.js

@@ -0,0 +1,106 @@
+
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
+//
+// A widget showing the user avatar and name
+const AccountsService = imports.gi.AccountsService;
+const GLib = imports.gi.GLib;
+const Gio = imports.gi.Gio;
+const Lang = imports.lang;
+const St = imports.gi.St;
+
+const Params = imports.misc.params;
+
+const AVATAR_ICON_SIZE = 64;
+
+// Adapted from gdm/gui/user-switch-applet/applet.c
+//
+// Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>.
+// Copyright (C) 2008,2009 Red Hat, Inc.
+
+const Avatar = new Lang.Class({
+    Name: 'Avatar',
+
+    _init: function(user, params) {
+        this._user = user;
+        params = Params.parse(params, { reactive: false,
+                                        iconSize: AVATAR_ICON_SIZE,
+                                        styleClass: 'framed-user-icon' });
+        this._iconSize = params.iconSize;
+
+        this.actor = new St.Bin({ style_class: params.styleClass,
+                                  track_hover: params.reactive,
+                                  reactive: params.reactive });
+    },
+
+    setSensitive: function(sensitive) {
+        this.actor.can_focus = sensitive;
+        this.actor.reactive = sensitive;
+    },
+
+    update: function() {
+        let iconFile = this._user.get_icon_file();
+        if (iconFile && !GLib.file_test(iconFile, GLib.FileTest.EXISTS))
+            iconFile = null;
+
+        if (iconFile) {
+            let file = Gio.File.new_for_path(iconFile);
+            this.actor.child = null;
+            this.actor.style = 'background-image: url("%s");'.format(iconFile);
+        } else {
+            this.actor.style = null;
+            this.actor.child = new St.Icon({ icon_name: 'avatar-default-symbolic',
+                                             icon_size: this._iconSize });
+        }
+    }
+});
+
+const UserWidget = new Lang.Class({
+    Name: 'UserWidget',
+
+    _init: function(user) {
+        this._user = user;
+
+        this.actor = new St.BoxLayout({ style_class: 'user-widget',
+                                        vertical: false });
+        this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
+
+        this._avatar = new Avatar(user);
+        this.actor.add(this._avatar.actor,
+                       { x_fill: true, y_fill: true });
+
+        this._label = new St.Label({ style_class: 'user-widget-label' });
+        this.actor.add(this._label,
+                       { expand: true,
+                         x_fill: true,
+                         y_fill: false,
+                         y_align: St.Align.MIDDLE });
+
+        this._userLoadedId = this._user.connect('notify::is-loaded',
+                                                Lang.bind(this, this._updateUser));
+        this._userChangedId = this._user.connect('changed',
+                                                 Lang.bind(this, this._updateUser));
+        if (this._user.is_loaded)
+            this._updateUser();
+    },
+
+    _onDestroy: function() {
+        if (this._userLoadedId != 0) {
+            this._user.disconnect(this._userLoadedId);
+            this._userLoadedId = 0;
+        }
+
+        if (this._userChangedId != 0) {
+            this._user.disconnect(this._userChangedId);
+            this._userChangedId = 0;
+        }
+    },
+
+    _updateUser: function() {
+        if (this._user.is_loaded)
+            this._label.text = this._user.get_real_name();
+        else
+            this._label.text = '';
+
+        this._avatar.update();
+    }
+});

js/ui/viewSelector.js

@@ -12,6 +12,8 @@ const St = imports.gi.St;
 
 const AppDisplay = imports.ui.appDisplay;
 const Main = imports.ui.main;
+const OverviewControls = imports.ui.overviewControls;
+const Params = imports.misc.params;
 const RemoteSearch = imports.ui.remoteSearch;
 const Search = imports.ui.search;
 const SearchDisplay = imports.ui.searchDisplay;
@@ -22,6 +24,12 @@ const WorkspacesView = imports.ui.workspacesView;
 
 const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
 
+const ViewPage = {
+    WINDOWS: 1,
+    APPS: 2,
+    SEARCH: 3
+};
+
 const FocusTrap = new Lang.Class({
     Name: 'FocusTrap',
     Extends: St.Widget,
@@ -34,6 +42,14 @@ const FocusTrap = new Lang.Class({
     }
 });
 
+function getTermsForSearchString(searchString) {
+    searchString = searchString.replace(/^\s+/g, '').replace(/\s+$/g, '');
+    if (searchString == '')
+        return [];
+
+    let terms = searchString.split(/\s+/);
+    return terms;
+}
 
 const ViewSelector = new Lang.Class({
     Name: 'ViewSelector',
@@ -41,13 +57,13 @@ const ViewSelector = new Lang.Class({
     _init : function(searchEntry, showAppsButton) {
         this.actor = new Shell.Stack({ name: 'viewSelector' });
 
+        this._showAppsBlocked = false;
         this._showAppsButton = showAppsButton;
         this._showAppsButton.connect('notify::checked', Lang.bind(this, this._onShowAppsButtonToggled));
 
         this._activePage = null;
 
-        this.active = false;
-        this._searchPending = false;
+        this._searchActive = false;
         this._searchTimeoutId = 0;
 
         this._searchSystem = new Search.SearchSystem();
@@ -67,26 +83,26 @@ const ViewSelector = new Lang.Class({
         this._entry.connect('notify::mapped', Lang.bind(this, this._onMapped));
         global.stage.connect('notify::key-focus', Lang.bind(this, this._onStageKeyFocusChanged));
 
-        this._inactiveIcon = new St.Icon({ style_class: 'search-entry-icon',
-                                           icon_name: 'edit-find-symbolic' });
-        this._activeIcon = new St.Icon({ style_class: 'search-entry-icon',
-                                         icon_name: 'edit-clear-symbolic' });
-        this._entry.set_secondary_icon(this._inactiveIcon);
+        this._entry.set_primary_icon(new St.Icon({ style_class: 'search-entry-icon',
+                                                   icon_name: 'edit-find-symbolic' }));
+        this._clearIcon = new St.Icon({ style_class: 'search-entry-icon',
+                                        icon_name: 'edit-clear-symbolic' });
 
         this._iconClickedId = 0;
         this._capturedEventId = 0;
 
         this._workspacesDisplay = new WorkspacesView.WorkspacesDisplay();
-        this._workspacesPage = this._addPage(this._workspacesDisplay.actor, null,
+        this._workspacesPage = this._addPage(this._workspacesDisplay.actor,
                                              _("Windows"), 'emblem-documents-symbolic');
 
-        this._appDisplay = new AppDisplay.AllAppDisplay();
-        this._appsPage = this._addPage(this._appDisplay.actor, null,
+        this._appDisplay = new AppDisplay.AppDisplay();
+        this._appsPage = this._addPage(this._appDisplay.actor,
                                        _("Applications"), 'view-grid-symbolic');
 
         this._searchResults = new SearchDisplay.SearchResults(this._searchSystem);
-        this._searchPage = this._addPage(this._searchResults.actor, this._entry,
-                                         _("Search"), 'edit-find-symbolic');
+        this._searchPage = this._addPage(this._searchResults.actor,
+                                         _("Search"), 'edit-find-symbolic',
+                                         { a11yFocus: this._entry });
 
         this._searchSettings = new Gio.Settings({ schema: Search.SEARCH_PROVIDERS_SCHEMA });
         this._searchSettings.connect('changed::disabled', Lang.bind(this, this._reloadRemoteProviders));
@@ -97,7 +113,6 @@ const ViewSelector = new Lang.Class({
         // Wanda comes obviously first
         this.addSearchProvider(new Wanda.WandaSearchProvider());
         this.addSearchProvider(new AppDisplay.AppSearchProvider());
-        this.addSearchProvider(new AppDisplay.SettingsSearchProvider());
 
         // Load remote search providers provided by applications
         RemoteSearch.loadRemoteSearchProviders(Lang.bind(this, this.addSearchProvider));
@@ -113,9 +128,6 @@ const ViewSelector = new Lang.Class({
 
         global.focus_manager.add_group(this._searchResults.actor);
 
-        Main.overview.connect('item-drag-begin',
-                              Lang.bind(this, this._resetShowAppsButton));
-
         this._stageKeyPressId = 0;
         Main.overview.connect('showing', Lang.bind(this,
             function () {
@@ -135,9 +147,17 @@ const ViewSelector = new Lang.Class({
         Main.wm.addKeybinding('toggle-application-view',
                               new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
                               Meta.KeyBindingFlags.NONE,
-                              Main.KeybindingMode.NORMAL |
-                              Main.KeybindingMode.OVERVIEW,
+                              Shell.KeyBindingMode.NORMAL |
+                              Shell.KeyBindingMode.OVERVIEW,
                               Lang.bind(this, this._toggleAppsPage));
+
+        Main.wm.addKeybinding('toggle-overview',
+                              new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
+                              Meta.KeyBindingFlags.NONE,
+                              Shell.KeyBindingMode.NORMAL |
+                              Shell.KeyBindingMode.OVERVIEW,
+                              Lang.bind(Main.overview, Main.overview.toggle));
+
     },
 
     _toggleAppsPage: function() {
@@ -148,6 +168,7 @@ const ViewSelector = new Lang.Class({
     show: function() {
         this._activePage = this._workspacesPage;
 
+        this.reset();
         this._appsPage.hide();
         this._searchPage.hide();
         this._workspacesDisplay.show();
@@ -155,7 +176,7 @@ const ViewSelector = new Lang.Class({
         if (!this._workspacesDisplay.activeWorkspaceHasMaximizedWindows())
             Main.overview.fadeOutDesktop();
 
-        this._showPage(this._workspacesPage);
+        this._showPage(this._workspacesPage, true);
     },
 
     zoomFromOverview: function() {
@@ -165,18 +186,24 @@ const ViewSelector = new Lang.Class({
             Main.overview.fadeInDesktop();
     },
 
+    setWorkspacesFullGeometry: function(geom) {
+        this._workspacesDisplay.setWorkspacesFullGeometry(geom);
+    },
+
     hide: function() {
         this._workspacesDisplay.hide();
     },
 
-    _addPage: function(actor, a11yFocus, name, a11yIcon) {
+    _addPage: function(actor, name, a11yIcon, params) {
+        params = Params.parse(params, { a11yFocus: null });
+
         let page = new St.Bin({ child: actor,
                                 x_align: St.Align.START,
                                 y_align: St.Align.START,
                                 x_fill: true,
                                 y_fill: true });
-        if (a11yFocus)
-            Main.ctrlAltTabManager.addGroup(a11yFocus, name, a11yIcon);
+        if (params.a11yFocus)
+            Main.ctrlAltTabManager.addGroup(params.a11yFocus, name, a11yIcon);
         else
             Main.ctrlAltTabManager.addGroup(actor, name, a11yIcon,
                                             { proxy: this.actor,
@@ -189,29 +216,40 @@ const ViewSelector = new Lang.Class({
         return page;
     },
 
-    _showPage: function(page) {
-        if(page == this._activePage)
+    _fadePageIn: function(oldPage) {
+        if (oldPage)
+            oldPage.hide();
+
+        this.emit('page-empty');
+
+        this._activePage.show();
+        Tweener.addTween(this._activePage,
+            { opacity: 255,
+              time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
+              transition: 'easeOutQuad'
+            });
+    },
+
+    _showPage: function(page, noFade) {
+        if (page == this._activePage)
             return;
 
-        if(this._activePage) {
-            Tweener.addTween(this._activePage,
+        let oldPage = this._activePage;
+        this._activePage = page;
+        this.emit('page-changed');
+
+        if (oldPage && !noFade)
+            Tweener.addTween(oldPage,
                              { opacity: 0,
-                               time: 0.1,
+                               time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME,
                                transition: 'easeOutQuad',
                                onComplete: Lang.bind(this,
                                    function() {
-                                       this._activePage.hide();
-                                       this._activePage = page;
+                                       this._fadePageIn(oldPage);
                                    })
                              });
-        }
-
-        page.show();
-        Tweener.addTween(page,
-                         { opacity: 255,
-                           time: 0.1,
-                           transition: 'easeOutQuad'
-                         });
+        else
+            this._fadePageIn(oldPage);
     },
 
     _a11yFocusPage: function(page) {
@@ -220,15 +258,19 @@ const ViewSelector = new Lang.Class({
     },
 
     _onShowAppsButtonToggled: function() {
-        if (this.active)
-            this.reset();
-        else
-            this._showPage(this._showAppsButton.checked ? this._appsPage
-                                                        : this._workspacesPage);
+        if (this._showAppsBlocked)
+            return;
+
+        this._showPage(this._showAppsButton.checked ?
+                       this._appsPage : this._workspacesPage);
     },
 
     _resetShowAppsButton: function() {
+        this._showAppsBlocked = true;
         this._showAppsButton.checked = false;
+        this._showAppsBlocked = false;
+
+        this._showPage(this._workspacesPage, true);
     },
 
     _onStageKeyPress: function(actor, event) {
@@ -241,17 +283,16 @@ const ViewSelector = new Lang.Class({
         let symbol = event.get_key_symbol();
 
         if (symbol == Clutter.Escape) {
-            if (this.active)
+            if (this._searchActive)
                 this.reset();
             else if (this._showAppsButton.checked)
-                this._resetShowAppsButton();
+                this._showAppsButton.checked = false;
             else
                 Main.overview.hide();
             return true;
-        } else if (Clutter.keysym_to_unicode(symbol) ||
-                   (symbol == Clutter.BackSpace && this.active)) {
+        } else if (this._shouldTriggerSearch(symbol)) {
             this.startSearch(event);
-        } else if (!this.active) {
+        } else if (!this._searchActive) {
             if (symbol == Clutter.Tab || symbol == Clutter.Down) {
                 this._activePage.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
                 return true;
@@ -314,6 +355,17 @@ const ViewSelector = new Lang.Class({
         }
     },
 
+    _shouldTriggerSearch: function(symbol) {
+        let unicode = Clutter.keysym_to_unicode(symbol);
+        if (unicode == 0)
+            return false;
+
+        if (getTermsForSearchString(String.fromCharCode(unicode)).length > 0)
+            return true;
+
+        return symbol == Clutter.BackSpace && this._searchActive;
+    },
+
     startSearch: function(event) {
         global.stage.set_key_focus(this._text);
         this._text.event(event, true);
@@ -325,39 +377,39 @@ const ViewSelector = new Lang.Class({
     },
 
     _onTextChanged: function (se, prop) {
-        let searchPreviouslyActive = this.active;
-        this.active = this._entry.get_text() != '';
-        this._searchPending = this.active && !searchPreviouslyActive;
-        if (this._searchPending) {
+        let terms = getTermsForSearchString(this._entry.get_text());
+
+        let searchPreviouslyActive = this._searchActive;
+        this._searchActive = (terms.length > 0);
+
+        let startSearch = this._searchActive && !searchPreviouslyActive;
+        if (startSearch)
             this._searchResults.startingSearch();
-        }
-        if (this.active) {
-            this._entry.set_secondary_icon(this._activeIcon);
 
-            if (this._iconClickedId == 0) {
+        if (this._searchActive) {
+            this._entry.set_secondary_icon(this._clearIcon);
+
+            if (this._iconClickedId == 0)
                 this._iconClickedId = this._entry.connect('secondary-icon-clicked',
-                    Lang.bind(this, function() {
-                        this.reset();
-                    }));
-            }
-        } else {
-            if (this._iconClickedId > 0)
-                this._entry.disconnect(this._iconClickedId);
-            this._iconClickedId = 0;
+                    Lang.bind(this, this.reset));
+
+            if (this._searchTimeoutId == 0)
+                this._searchTimeoutId = Mainloop.timeout_add(150,
+                    Lang.bind(this, this._doSearch));
+        } else {
+            if (this._iconClickedId > 0) {
+                this._entry.disconnect(this._iconClickedId);
+                this._iconClickedId = 0;
+            }
 
-            this._entry.set_secondary_icon(this._inactiveIcon);
-            this._searchCancelled();
-        }
-        if (!this.active) {
             if (this._searchTimeoutId > 0) {
                 Mainloop.source_remove(this._searchTimeoutId);
                 this._searchTimeoutId = 0;
             }
-            return;
+
+            this._entry.set_secondary_icon(null);
+            this._searchCancelled();
         }
-        if (this._searchTimeoutId > 0)
-            return;
-        this._searchTimeoutId = Mainloop.timeout_add(150, Lang.bind(this, this._doSearch));
     },
 
     _onKeyPress: function(entry, event) {
@@ -367,16 +419,7 @@ const ViewSelector = new Lang.Class({
                 this.reset();
                 return true;
             }
-        } else if (symbol == Clutter.Return || symbol == Clutter.KP_Enter) {
-            // We can't connect to 'activate' here because search providers
-            // might want to do something with the modifiers in activateDefault.
-            if (this._searchTimeoutId > 0) {
-                Mainloop.source_remove(this._searchTimeoutId);
-                this._doSearch();
-            }
-            this._searchResults.activateDefault();
-            return true;
-        } else if (this.active) {
+        } else if (this._searchActive) {
             let arrowNext, nextDirection;
             if (entry.get_text_direction() == Clutter.TextDirection.RTL) {
                 arrowNext = Clutter.Left;
@@ -400,6 +443,15 @@ const ViewSelector = new Lang.Class({
             } else if (symbol == arrowNext && this._text.position == -1) {
                 this._searchResults.navigateFocus(nextDirection);
                 return true;
+            } else if (symbol == Clutter.Return || symbol == Clutter.KP_Enter) {
+                // We can't connect to 'activate' here because search providers
+                // might want to do something with the modifiers in activateDefault.
+                if (this._searchTimeoutId > 0) {
+                    Mainloop.source_remove(this._searchTimeoutId);
+                    this._doSearch();
+                }
+                this._searchResults.activateDefault();
+                return true;
             }
         }
         return false;
@@ -422,9 +474,10 @@ const ViewSelector = new Lang.Class({
 
     _doSearch: function () {
         this._searchTimeoutId = 0;
-        let text = this._text.get_text().replace(/^\s+/g, '').replace(/\s+$/g, '');
-        this._searchResults.doSearch(text);
 
+        let terms = getTermsForSearchString(this._entry.get_text());
+
+        this._searchSystem.updateSearchResults(terms);
         this._showPage(this._searchPage);
     },
 
@@ -455,12 +508,37 @@ const ViewSelector = new Lang.Class({
             return;
 
         this._searchSystem.registerProvider(provider);
-        this._searchResults.createProviderMeta(provider);
+        this._searchResults.createProviderDisplay(provider);
     },
 
     removeSearchProvider: function(provider) {
         this._searchSystem.unregisterProvider(provider);
-        this._searchResults.destroyProviderMeta(provider);
+        this._searchResults.destroyProviderDisplay(provider);
+    },
+
+    getActivePage: function() {
+        if (this._activePage == this._workspacesPage)
+            return ViewPage.WINDOWS;
+        else if (this._activePage == this._appsPage)
+            return ViewPage.APPS;
+        else
+            return ViewPage.SEARCH;
+    },
+
+    fadeIn: function() {
+        let actor = this._activePage;
+        Tweener.addTween(actor, { opacity: 255,
+                                  time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME / 2,
+                                  transition: 'easeInQuad'
+                                });
+    },
+
+    fadeHalf: function() {
+        let actor = this._activePage;
+        Tweener.addTween(actor, { opacity: 128,
+                                  time: OverviewControls.SIDE_CONTROLS_ANIMATION_TIME / 2,
+                                  transition: 'easeOutQuad'
+                                });
     }
 });
 Signals.addSignalMethods(ViewSelector.prototype);

js/ui/wanda.js

@@ -11,12 +11,14 @@ const Layout = imports.ui.layout;
 const Main = imports.ui.main;
 const Panel = imports.ui.panel;
 
-// we could make these gsettings
 const FISH_NAME = 'wanda';
+const FISH_FILENAME = 'wanda.png';
 const FISH_SPEED = 300;
 const FISH_COMMAND = 'fortune';
+// The size of an individual frame in the animation
+const FISH_HEIGHT = 22;
+const FISH_WIDTH = 36;
 
-const GNOME_PANEL_PIXMAPDIR = '../gnome-panel/fish';
 const FISH_GROUP = 'Fish Animation';
 
 const MAGIC_FISH_KEY = 'free the fish';
@@ -26,33 +28,16 @@ const WandaIcon = new Lang.Class({
     Extends: IconGrid.BaseIcon,
 
     _init : function(fish, label, params) {
-        this._fish = fish;
-        let file = GLib.build_filenamev([global.datadir, GNOME_PANEL_PIXMAPDIR, fish + '.fish']);
-
-        if (GLib.file_test(file, GLib.FileTest.EXISTS)) {
-            this._keyfile = new GLib.KeyFile();
-            this._keyfile.load_from_file(file, GLib.KeyFileFlags.NONE);
-
-            this._imageFile = GLib.build_filenamev([global.datadir, GNOME_PANEL_PIXMAPDIR,
-                                                    this._keyfile.get_string(FISH_GROUP, 'image')]);
-
-            let tmpPixbuf = GdkPixbuf.Pixbuf.new_from_file(this._imageFile);
-
-            this._imgHeight = tmpPixbuf.height;
-            this._imgWidth = tmpPixbuf.width / this._keyfile.get_integer(FISH_GROUP, 'frames');
-        } else {
-            this._imageFile = null;
-        }
-
         this.parent(label, params);
+
+        this._fish = fish;
+        this._imageFile = GLib.build_filenamev([global.datadir, fish + '.png']);
+
+        this._imgHeight = FISH_HEIGHT;
+        this._imgWidth = FISH_WIDTH;
     },
 
     createIcon: function(iconSize) {
-        if (!this._imageFile) {
-            return new St.Icon({ icon_name: 'face-smile',
-                                 icon_size: iconSize });
-        }
-
         this._animations = new Panel.Animation(this._imageFile, this._imgWidth, this._imgHeight, FISH_SPEED);
         this._animations.play();
         return this._animations.actor;
@@ -149,9 +134,9 @@ const WandaSearchProvider = new Lang.Class({
 
     getInitialResultSet: function(terms) {
         if (terms.join(' ') == MAGIC_FISH_KEY) {
-            this.searchSystem.pushResults(this, [ FISH_NAME ]);
+            this.searchSystem.setResults(this, [ FISH_NAME ]);
         } else {
-            this.searchSystem.pushResults(this, []);
+            this.searchSystem.setResults(this, []);
         }
     },
 

js/ui/windowManager.js

@@ -4,6 +4,7 @@ const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Lang = imports.lang;
+const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
@@ -66,6 +67,209 @@ function getWindowDimmer(actor) {
     }
 }
 
+/*
+ * When the last window closed on a workspace is a dialog or splash
+ * screen, we assume that it might be an initial window shown before
+ * the main window of an application, and give the app a grace period
+ * where it can map another window before we remove the workspace.
+ */
+const LAST_WINDOW_GRACE_TIME = 1000;
+
+const WorkspaceTracker = new Lang.Class({
+    Name: 'WorkspaceTracker',
+
+    _init: function(wm) {
+        this._wm = wm;
+
+        this._workspaces = [];
+        this._checkWorkspacesId = 0;
+
+        let tracker = Shell.WindowTracker.get_default();
+        tracker.connect('startup-sequence-changed', Lang.bind(this, this._queueCheckWorkspaces));
+
+        global.screen.connect('notify::n-workspaces', Lang.bind(this, this._nWorkspacesChanged));
+
+        global.screen.connect('window-entered-monitor', Lang.bind(this, this._windowEnteredMonitor));
+        global.screen.connect('window-left-monitor', Lang.bind(this, this._windowLeftMonitor));
+        global.screen.connect('restacked', Lang.bind(this, this._windowsRestacked));
+
+        this._workspaceSettings = new Gio.Settings({ schema: Main.dynamicWorkspacesSchema });
+        this._workspaceSettings.connect('changed::dynamic-workspaces', Lang.bind(this, this._queueCheckWorkspaces));
+
+        this._nWorkspacesChanged();
+    },
+
+    _checkWorkspaces: function() {
+        let i;
+        let emptyWorkspaces = [];
+
+        if (!Meta.prefs_get_dynamic_workspaces()) {
+            this._checkWorkspacesId = 0;
+            return false;
+        }
+
+        for (i = 0; i < this._workspaces.length; i++) {
+            let lastRemoved = this._workspaces[i]._lastRemovedWindow;
+            if ((lastRemoved &&
+                 (lastRemoved.get_window_type() == Meta.WindowType.SPLASHSCREEN ||
+                  lastRemoved.get_window_type() == Meta.WindowType.DIALOG ||
+                  lastRemoved.get_window_type() == Meta.WindowType.MODAL_DIALOG)) ||
+                this._workspaces[i]._keepAliveId)
+                emptyWorkspaces[i] = false;
+            else
+                emptyWorkspaces[i] = true;
+        }
+
+        let sequences = Shell.WindowTracker.get_default().get_startup_sequences();
+        for (i = 0; i < sequences.length; i++) {
+            let index = sequences[i].get_workspace();
+            if (index >= 0 && index <= global.screen.n_workspaces)
+                emptyWorkspaces[index] = false;
+        }
+
+        let windows = global.get_window_actors();
+        for (i = 0; i < windows.length; i++) {
+            let win = windows[i];
+
+            if (win.get_meta_window().is_on_all_workspaces())
+                continue;
+
+            let workspaceIndex = win.get_workspace();
+            emptyWorkspaces[workspaceIndex] = false;
+        }
+
+        // If we don't have an empty workspace at the end, add one
+        if (!emptyWorkspaces[emptyWorkspaces.length -1]) {
+            global.screen.append_new_workspace(false, global.get_current_time());
+            emptyWorkspaces.push(false);
+        }
+
+        let activeWorkspaceIndex = global.screen.get_active_workspace_index();
+        let removingCurrentWorkspace = (emptyWorkspaces[activeWorkspaceIndex] &&
+                                        activeWorkspaceIndex < emptyWorkspaces.length - 1);
+        // Don't enter the overview when removing multiple empty workspaces at startup
+        let showOverview  = (removingCurrentWorkspace &&
+                             !emptyWorkspaces.every(function(x) { return x; }));
+
+        if (removingCurrentWorkspace) {
+            // "Merge" the empty workspace we are removing with the one at the end
+            this._wm.blockAnimations();
+        }
+
+        // Delete other empty workspaces; do it from the end to avoid index changes
+        for (i = emptyWorkspaces.length - 2; i >= 0; i--) {
+            if (emptyWorkspaces[i])
+                global.screen.remove_workspace(this._workspaces[i], global.get_current_time());
+        }
+
+        if (removingCurrentWorkspace) {
+            global.screen.get_workspace_by_index(global.screen.n_workspaces - 1).activate(global.get_current_time());
+            this._wm.unblockAnimations();
+
+            if (!Main.overview.visible && showOverview)
+                Main.overview.show();
+        }
+
+        this._checkWorkspacesId = 0;
+        return false;
+    },
+
+    keepWorkspaceAlive: function(workspace, duration) {
+        if (workspace._keepAliveId)
+            Mainloop.source_remove(workspace._keepAliveId);
+
+        workspace._keepAliveId = Mainloop.timeout_add(duration, Lang.bind(this, function() {
+            workspace._keepAliveId = 0;
+            this._queueCheckWorkspaces();
+            return false;
+        }));
+    },
+
+    _windowRemoved: function(workspace, window) {
+        workspace._lastRemovedWindow = window;
+        this._queueCheckWorkspaces();
+        Mainloop.timeout_add(LAST_WINDOW_GRACE_TIME, Lang.bind(this, function() {
+            if (workspace._lastRemovedWindow == window) {
+                workspace._lastRemovedWindow = null;
+                this._queueCheckWorkspaces();
+            }
+            return false;
+        }));
+    },
+
+    _windowLeftMonitor: function(metaScreen, monitorIndex, metaWin) {
+        // If the window left the primary monitor, that
+        // might make that workspace empty
+        if (monitorIndex == Main.layoutManager.primaryIndex)
+            this._queueCheckWorkspaces();
+    },
+
+    _windowEnteredMonitor: function(metaScreen, monitorIndex, metaWin) {
+        // If the window entered the primary monitor, that
+        // might make that workspace non-empty
+        if (monitorIndex == Main.layoutManager.primaryIndex)
+            this._queueCheckWorkspaces();
+    },
+
+    _windowsRestacked: function() {
+        // Figure out where the pointer is in case we lost track of
+        // it during a grab. (In particular, if a trayicon popup menu
+        // is dismissed, see if we need to close the message tray.)
+        global.sync_pointer();
+    },
+
+    _queueCheckWorkspaces: function() {
+        if (this._checkWorkspacesId == 0)
+            this._checkWorkspacesId = Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, this._checkWorkspaces));
+    },
+
+    _nWorkspacesChanged: function() {
+        let oldNumWorkspaces = this._workspaces.length;
+        let newNumWorkspaces = global.screen.n_workspaces;
+
+        if (oldNumWorkspaces == newNumWorkspaces)
+            return false;
+
+        let lostWorkspaces = [];
+        if (newNumWorkspaces > oldNumWorkspaces) {
+            let w;
+
+            // Assume workspaces are only added at the end
+            for (w = oldNumWorkspaces; w < newNumWorkspaces; w++)
+                this._workspaces[w] = global.screen.get_workspace_by_index(w);
+
+            for (w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
+                let workspace = this._workspaces[w];
+                workspace._windowAddedId = workspace.connect('window-added', Lang.bind(this, this._queueCheckWorkspaces));
+                workspace._windowRemovedId = workspace.connect('window-removed', Lang.bind(this, this._windowRemoved));
+            }
+
+        } else {
+            // Assume workspaces are only removed sequentially
+            // (e.g. 2,3,4 - not 2,4,7)
+            let removedIndex;
+            let removedNum = oldNumWorkspaces - newNumWorkspaces;
+            for (let w = 0; w < oldNumWorkspaces; w++) {
+                let workspace = global.screen.get_workspace_by_index(w);
+                if (this._workspaces[w] != workspace) {
+                    removedIndex = w;
+                    break;
+                }
+            }
+
+            let lostWorkspaces = this._workspaces.splice(removedIndex, removedNum);
+            lostWorkspaces.forEach(function(workspace) {
+                workspace.disconnect(workspace._windowAddedId);
+                workspace.disconnect(workspace._windowRemovedId);
+            });
+        }
+
+        this._queueCheckWorkspaces();
+
+        return false;
+    }
+});
+
 const WindowManager = new Lang.Class({
     Name: 'WindowManager',
 
@@ -105,75 +309,160 @@ const WindowManager = new Lang.Class({
 
         this._workspaceSwitcherPopup = null;
         this.setCustomKeybindingHandler('switch-to-workspace-left',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-right',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-up',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-to-workspace-down',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-left',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-right',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-up',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('move-to-workspace-down',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('switch-to-workspace-1',
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('switch-to-workspace-2',
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('switch-to-workspace-3',
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('switch-to-workspace-4',
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('switch-to-workspace-5',
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('switch-to-workspace-6',
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('switch-to-workspace-7',
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('switch-to-workspace-8',
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('switch-to-workspace-9',
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('switch-to-workspace-10',
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('switch-to-workspace-11',
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('switch-to-workspace-12',
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('move-to-workspace-1',
+                                        Shell.KeyBindingMode.NORMAL,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('move-to-workspace-2',
+                                        Shell.KeyBindingMode.NORMAL,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('move-to-workspace-3',
+                                        Shell.KeyBindingMode.NORMAL,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('move-to-workspace-4',
+                                        Shell.KeyBindingMode.NORMAL,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('move-to-workspace-5',
+                                        Shell.KeyBindingMode.NORMAL,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('move-to-workspace-6',
+                                        Shell.KeyBindingMode.NORMAL,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('move-to-workspace-7',
+                                        Shell.KeyBindingMode.NORMAL,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('move-to-workspace-8',
+                                        Shell.KeyBindingMode.NORMAL,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('move-to-workspace-9',
+                                        Shell.KeyBindingMode.NORMAL,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('move-to-workspace-10',
+                                        Shell.KeyBindingMode.NORMAL,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('move-to-workspace-11',
+                                        Shell.KeyBindingMode.NORMAL,
+                                        Lang.bind(this, this._showWorkspaceSwitcher));
+        this.setCustomKeybindingHandler('move-to-workspace-12',
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._showWorkspaceSwitcher));
         this.setCustomKeybindingHandler('switch-applications',
-                                        Main.KeybindingMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._startAppSwitcher));
         this.setCustomKeybindingHandler('switch-group',
-                                        Main.KeybindingMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._startAppSwitcher));
         this.setCustomKeybindingHandler('switch-applications-backward',
-                                        Main.KeybindingMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._startAppSwitcher));
         this.setCustomKeybindingHandler('switch-group-backward',
-                                        Main.KeybindingMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._startAppSwitcher));
         this.setCustomKeybindingHandler('switch-windows',
-                                        Main.KeybindingMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._startWindowSwitcher));
         this.setCustomKeybindingHandler('switch-windows-backward',
-                                        Main.KeybindingMode.NORMAL,
+                                        Shell.KeyBindingMode.NORMAL,
                                         Lang.bind(this, this._startWindowSwitcher));
         this.setCustomKeybindingHandler('switch-panels',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW |
-                                        Main.KeybindingMode.LOCK_SCREEN |
-                                        Main.KeybindingMode.UNLOCK_SCREEN |
-                                        Main.KeybindingMode.LOGIN_SCREEN,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW |
+                                        Shell.KeyBindingMode.LOCK_SCREEN |
+                                        Shell.KeyBindingMode.UNLOCK_SCREEN |
+                                        Shell.KeyBindingMode.LOGIN_SCREEN,
                                         Lang.bind(this, this._startA11ySwitcher));
         this.setCustomKeybindingHandler('switch-panels-backward',
-                                        Main.KeybindingMode.NORMAL |
-                                        Main.KeybindingMode.OVERVIEW |
-                                        Main.KeybindingMode.LOCK_SCREEN |
-                                        Main.KeybindingMode.UNLOCK_SCREEN |
-                                        Main.KeybindingMode.LOGIN_SCREEN,
+                                        Shell.KeyBindingMode.NORMAL |
+                                        Shell.KeyBindingMode.OVERVIEW |
+                                        Shell.KeyBindingMode.LOCK_SCREEN |
+                                        Shell.KeyBindingMode.UNLOCK_SCREEN |
+                                        Shell.KeyBindingMode.LOGIN_SCREEN,
                                         Lang.bind(this, this._startA11ySwitcher));
 
         this.addKeybinding('open-application-menu',
                            new Gio.Settings({ schema: SHELL_KEYBINDINGS_SCHEMA }),
                            Meta.KeyBindingFlags.NONE,
-                           Main.KeybindingMode.NORMAL,
-                           Lang.bind(this, this._openAppMenu));
+                           Shell.KeyBindingMode.NORMAL |
+                           Shell.KeyBindingMode.TOPBAR_POPUP,
+                           Lang.bind(this, this._toggleAppMenu));
 
         Main.overview.connect('showing', Lang.bind(this, function() {
             for (let i = 0; i < this._dimmedWindows.length; i++)
@@ -183,6 +472,19 @@ const WindowManager = new Lang.Class({
             for (let i = 0; i < this._dimmedWindows.length; i++)
                 this._dimWindow(this._dimmedWindows[i]);
         }));
+
+        if (Main.sessionMode.hasWorkspaces)
+            this._workspaceTracker = new WorkspaceTracker(this);
+
+        global.screen.override_workspace_layout(Meta.ScreenCorner.TOPLEFT,
+                                                false, -1, 1);
+    },
+
+    keepWorkspaceAlive: function(workspace, duration) {
+        if (!this._workspaceTracker)
+            return;
+
+        this._workspaceTracker.keepWorkspaceAlive(workspace, duration);
     },
 
     setCustomKeybindingHandler: function(name, modes, handler) {
@@ -199,7 +501,7 @@ const WindowManager = new Lang.Class({
 
     removeKeybinding: function(name) {
         if (global.display.remove_keybinding(name))
-            this.allowKeybinding(name, Main.KeybindingMode.NONE);
+            this.allowKeybinding(name, Shell.KeyBindingMode.NONE);
     },
 
     allowKeybinding: function(name, modes) {
@@ -242,24 +544,12 @@ const WindowManager = new Lang.Class({
         }
 
         actor.set_scale(1.0, 1.0);
-        actor.move_anchor_point_from_gravity(Clutter.Gravity.CENTER);
 
-        /* scale window down to 0x0.
-         * maybe TODO: get icon geometry passed through and move the window towards it?
-         */
         this._minimizing.push(actor);
 
-        let monitor = Main.layoutManager.findMonitorForWindow(actor.meta_window);
-        let xDest = monitor.x;
-        let yDest = monitor.y;
-        if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
-            xDest += monitor.width;
-
-        Tweener.addTween(actor,
-                         { scale_x: 0.0,
-                           scale_y: 0.0,
-                           x: xDest,
-                           y: yDest,
+        if (actor.meta_window.is_monitor_sized()) {
+            Tweener.addTween(actor,
+                         { opacity: 0,
                            time: WINDOW_ANIMATION_TIME,
                            transition: 'easeOutQuad',
                            onComplete: this._minimizeWindowDone,
@@ -269,12 +559,46 @@ const WindowManager = new Lang.Class({
                            onOverwriteScope: this,
                            onOverwriteParams: [shellwm, actor]
                          });
+        } else {
+            let xDest, yDest, xScale, yScale;
+            let [success, geom] = actor.meta_window.get_icon_geometry();
+            if (success) {
+                xDest = geom.x;
+                yDest = geom.y;
+                xScale = geom.width / actor.width;
+                yScale = geom.height / actor.height;
+            } else {
+                let monitor = Main.layoutManager.monitors[actor.meta_window.get_monitor()];
+                xDest = monitor.x;
+                yDest = monitor.y;
+                if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
+                    xDest += monitor.width;
+                xScale = 0;
+                yScale = 0;
+            }
+
+            Tweener.addTween(actor,
+                             { scale_x: xScale,
+                               scale_y: yScale,
+                               x: xDest,
+                               y: yDest,
+                               time: WINDOW_ANIMATION_TIME,
+                               transition: 'easeOutQuad',
+                               onComplete: this._minimizeWindowDone,
+                               onCompleteScope: this,
+                               onCompleteParams: [shellwm, actor],
+                               onOverwrite: this._minimizeWindowOverwritten,
+                               onOverwriteScope: this,
+                               onOverwriteParams: [shellwm, actor]
+                             });
+        }
     },
 
     _minimizeWindowDone : function(shellwm, actor) {
         if (this._removeEffect(this._minimizing, actor)) {
             Tweener.removeTweens(actor);
             actor.set_scale(1.0, 1.0);
+            actor.set_opacity(255);
             actor.move_anchor_point_from_gravity(Clutter.Gravity.NORTH_WEST);
 
             shellwm.completed_minimize(actor);
@@ -494,14 +818,14 @@ const WindowManager = new Lang.Class({
     },
 
     _filterKeybinding: function(shellwm, binding) {
-        if (Main.keybindingMode == Main.KeybindingMode.NONE)
+        if (Main.keybindingMode == Shell.KeyBindingMode.NONE)
             return true;
 
         // There's little sense in implementing a keybinding in mutter and
         // not having it work in NORMAL mode; handle this case generically
         // so we don't have to explicitly allow all builtin keybindings in
         // NORMAL mode.
-        if (Main.keybindingMode == Main.KeybindingMode.NORMAL &&
+        if (Main.keybindingMode == Shell.KeyBindingMode.NORMAL &&
             binding.is_builtin())
             return false;
 
@@ -509,7 +833,7 @@ const WindowManager = new Lang.Class({
     },
 
     _switchWorkspace : function(shellwm, from, to, direction) {
-        if (!this._shouldAnimate()) {
+        if (!Main.sessionMode.hasWorkspaces || !this._shouldAnimate()) {
             shellwm.completed_switch_workspace();
             return;
         }
@@ -525,11 +849,11 @@ const WindowManager = new Lang.Class({
         if (direction == Meta.MotionDirection.UP ||
             direction == Meta.MotionDirection.UP_LEFT ||
             direction == Meta.MotionDirection.UP_RIGHT)
-                yDest = global.screen_height;
+                yDest = global.screen_height - Main.panel.actor.height;
         else if (direction == Meta.MotionDirection.DOWN ||
             direction == Meta.MotionDirection.DOWN_LEFT ||
             direction == Meta.MotionDirection.DOWN_RIGHT)
-                yDest = -global.screen_height;
+                yDest = -global.screen_height + Main.panel.actor.height;
 
         if (direction == Meta.MotionDirection.LEFT ||
             direction == Meta.MotionDirection.UP_LEFT ||
@@ -542,9 +866,9 @@ const WindowManager = new Lang.Class({
 
         let switchData = {};
         this._switchData = switchData;
-        switchData.inGroup = new Clutter.Group();
-        switchData.outGroup = new Clutter.Group();
-        switchData.movingWindowBin = new Clutter.Group();
+        switchData.inGroup = new Clutter.Actor();
+        switchData.outGroup = new Clutter.Actor();
+        switchData.movingWindowBin = new Clutter.Actor();
         switchData.windows = [];
 
         let wgroup = global.window_group;
@@ -571,7 +895,7 @@ const WindowManager = new Lang.Class({
                 switchData.windows.push({ window: window,
                                           parent: window.get_parent() });
                 window.reparent(switchData.inGroup);
-                window.show_all();
+                window.show();
             }
         }
 
@@ -657,27 +981,42 @@ const WindowManager = new Lang.Class({
         Main.ctrlAltTabManager.popup(backwards, binding.get_name(), binding.get_mask());
     },
 
-    _openAppMenu : function(display, screen, window, event, binding) {
-        Main.panel.openAppMenu();
+    _toggleAppMenu : function(display, screen, window, event, binding) {
+        Main.panel.toggleAppMenu();
     },
 
     _showWorkspaceSwitcher : function(display, screen, window, binding) {
+        if (!Main.sessionMode.hasWorkspaces)
+            return;
+
         if (screen.n_workspaces == 1)
             return;
 
-        let [action,,,direction] = binding.get_name().split('-');
-        let direction = Meta.MotionDirection[direction.toUpperCase()];
+        let [action,,,target] = binding.get_name().split('-');
         let newWs;
+        let direction;
 
+        if (isNaN(target)) {
+            direction = Meta.MotionDirection[target.toUpperCase()];
+            newWs = screen.get_active_workspace().get_neighbor(direction);
+        } else if (target > 0) {
+            target--;
+            newWs = screen.get_workspace_by_index(target);
+
+            if (screen.get_active_workspace().index() > target)
+                direction = Meta.MotionDirection.UP;
+            else
+                direction = Meta.MotionDirection.DOWN;
+        }
 
         if (direction != Meta.MotionDirection.UP &&
             direction != Meta.MotionDirection.DOWN)
             return;
 
         if (action == 'switch')
-            newWs = this.actionMoveWorkspace(direction);
+            this.actionMoveWorkspace(newWs);
         else
-            newWs = this.actionMoveWindow(window, direction);
+            this.actionMoveWindow(window, newWs);
 
         if (!Main.overview.visible) {
             if (this._workspaceSwitcherPopup == null) {
@@ -690,31 +1029,31 @@ const WindowManager = new Lang.Class({
         }
     },
 
-    actionMoveWorkspace: function(direction) {
+    actionMoveWorkspace: function(workspace) {
+        if (!Main.sessionMode.hasWorkspaces)
+            return;
+
         let activeWorkspace = global.screen.get_active_workspace();
-        let toActivate = activeWorkspace.get_neighbor(direction);
 
-        if (activeWorkspace != toActivate)
-            toActivate.activate(global.get_current_time());
-
-        return toActivate;
+        if (activeWorkspace != workspace)
+            workspace.activate(global.get_current_time());
     },
 
-    actionMoveWindow: function(window, direction) {
-        let activeWorkspace = global.screen.get_active_workspace();
-        let toActivate = activeWorkspace.get_neighbor(direction);
+    actionMoveWindow: function(window, workspace) {
+        if (!Main.sessionMode.hasWorkspaces)
+            return;
 
-        if (activeWorkspace != toActivate) {
+        let activeWorkspace = global.screen.get_active_workspace();
+
+        if (activeWorkspace != workspace) {
             // This won't have any effect for "always sticky" windows
             // (like desktop windows or docks)
 
             this._movingWindow = window;
-            window.change_workspace(toActivate);
+            window.change_workspace(workspace);
 
             global.display.clear_mouse_mode();
-            toActivate.activate_with_focus (window, global.get_current_time());
+            workspace.activate_with_focus (window, global.get_current_time());
         }
-
-        return toActivate;
     },
 });

js/ui/workspaceSwitcherPopup.js

@@ -55,10 +55,9 @@ const WorkspaceSwitcherPopup = new Lang.Class({
 
     _getPreferredHeight : function (actor, forWidth, alloc) {
         let children = this._list.get_children();
-        let primary = Main.layoutManager.primaryMonitor;
+        let workArea = Main.layoutManager.getWorkAreaForMonitor(Main.layoutManager.primaryIndex);
 
-        let availHeight = primary.height;
-        availHeight -= Main.panel.actor.height;
+        let availHeight = workArea.height;
         availHeight -= this.actor.get_theme_node().get_vertical_padding();
         availHeight -= this._container.get_theme_node().get_vertical_padding();
         availHeight -= this._list.get_theme_node().get_vertical_padding();
@@ -67,7 +66,7 @@ const WorkspaceSwitcherPopup = new Lang.Class({
         for (let i = 0; i < children.length; i++) {
             let [childMinHeight, childNaturalHeight] = children[i].get_preferred_height(-1);
             let [childMinWidth, childNaturalWidth] = children[i].get_preferred_width(childNaturalHeight);
-            height += childNaturalHeight * primary.width / primary.height;
+            height += childNaturalHeight * workArea.width / workArea.height;
         }
 
         let spacing = this._itemSpacing * (global.screen.n_workspaces - 1);
@@ -81,8 +80,8 @@ const WorkspaceSwitcherPopup = new Lang.Class({
     },
 
     _getPreferredWidth : function (actor, forHeight, alloc) {
-        let primary = Main.layoutManager.primaryMonitor;
-        this._childWidth = Math.round(this._childHeight * primary.width / primary.height);
+        let workArea = Main.layoutManager.getWorkAreaForMonitor(Main.layoutManager.primaryIndex);
+        this._childWidth = Math.round(this._childHeight * workArea.width / workArea.height);
 
         alloc.min_size = this._childWidth;
         alloc.natural_size = this._childWidth;
@@ -122,12 +121,11 @@ const WorkspaceSwitcherPopup = new Lang.Class({
 
         }
 
-        let primary = Main.layoutManager.primaryMonitor;
+        let workArea = Main.layoutManager.getWorkAreaForMonitor(Main.layoutManager.primaryIndex);
         let [containerMinHeight, containerNatHeight] = this._container.get_preferred_height(global.screen_width);
         let [containerMinWidth, containerNatWidth] = this._container.get_preferred_width(containerNatHeight);
-        this._container.x = primary.x + Math.floor((primary.width - containerNatWidth) / 2);
-        this._container.y = primary.y + Main.panel.actor.height +
-                            Math.floor(((primary.height - Main.panel.actor.height) - containerNatHeight) / 2);
+        this._container.x = workArea.x + Math.floor((workArea.width - containerNatWidth) / 2);
+        this._container.y = workArea.y + Math.floor((workArea.height - containerNatHeight) / 2);
     },
 
     _show : function() {

js/ui/workspaceThumbnail.js

@@ -9,6 +9,7 @@ const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
 
+const Background = imports.ui.background;
 const DND = imports.ui.dnd;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
@@ -61,12 +62,35 @@ const WindowClone = new Lang.Class({
         this.inDrag = false;
     },
 
+    // Find the actor just below us, respecting reparenting done
+    // by DND code
+    getActualStackAbove: function() {
+        if (this._stackAbove == null)
+            return null;
+
+        if (this.inDrag) {
+            if (this._stackAbove._delegate)
+                return this._stackAbove._delegate.getActualStackAbove();
+            else
+                return null;
+        } else {
+            return this._stackAbove;
+        }
+    },
+
     setStackAbove: function (actor) {
         this._stackAbove = actor;
-        if (this._stackAbove == null)
+
+        // Don't apply the new stacking now, it will be applied
+        // when dragging ends and window are stacked again
+        if (actor.inDrag)
+            return;
+
+        let actualAbove = this.getActualStackAbove();
+        if (actualAbove == null)
             this.actor.lower_bottom();
         else
-            this.actor.raise(this._stackAbove);
+            this.actor.raise(actualAbove);
     },
 
     destroy: function () {
@@ -165,18 +189,20 @@ const WorkspaceThumbnail = new Lang.Class({
                                      style_class: 'workspace-thumbnail' });
         this.actor._delegate = this;
 
-        this._contents = new Clutter.Group();
-        this.actor.add_actor(this._contents);
+        this._contents = new Clutter.Actor();
+        this.actor.add_child(this._contents);
 
         this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
 
-        this._background = Meta.BackgroundActor.new_for_screen(global.screen);
-        this._contents.add_actor(this._background);
+        this._createBackground();
 
         let monitor = Main.layoutManager.primaryMonitor;
         this.setPorthole(monitor.x, monitor.y, monitor.width, monitor.height);
 
-        let windows = global.get_window_actors().filter(this._isWorkspaceWindow, this);
+        let windows = global.get_window_actors().filter(Lang.bind(this, function(actor) {
+            let win = actor.meta_window;
+            return win.located_on_workspace(metaWorkspace);
+        }));
 
         // Create clones for windows that should be visible in the Overview
         this._windows = [];
@@ -210,6 +236,12 @@ const WorkspaceThumbnail = new Lang.Class({
         this._collapseFraction = 0; // Not collapsed
     },
 
+    _createBackground: function() {
+        this._bgManager = new Background.BackgroundManager({ monitorIndex: Main.layoutManager.primaryIndex,
+                                                             container: this._contents,
+                                                             effects: Meta.BackgroundEffects.NONE });
+    },
+
     setPorthole: function(x, y, width, height) {
         this._portholeX = x;
         this._portholeY = y;
@@ -233,7 +265,7 @@ const WorkspaceThumbnail = new Lang.Class({
             let clone = this._windows[i];
             let metaWindow = clone.metaWindow;
             if (i == 0) {
-                clone.setStackAbove(this._background);
+                clone.setStackAbove(this._bgManager.background.actor);
             } else {
                 let previousClone = this._windows[i - 1];
                 clone.setStackAbove(previousClone.actor);
@@ -352,7 +384,8 @@ const WorkspaceThumbnail = new Lang.Class({
     },
 
     destroy : function() {
-        this.actor.destroy();
+        if (this.actor)
+          this.actor.destroy();
     },
 
     workspaceRemoved : function() {
@@ -373,19 +406,20 @@ const WorkspaceThumbnail = new Lang.Class({
     _onDestroy: function(actor) {
         this.workspaceRemoved();
 
+        if (this._bgManager) {
+          this._bgManager.destroy();
+          this._bgManager = null;
+        }
+
         this._windows = [];
         this.actor = null;
     },
 
-    // Tests if @win belongs to this workspace
-    _isWorkspaceWindow : function (win) {
-        return Main.isWindowActorDisplayedOnWorkspace(win, this.metaWorkspace.index());
-    },
-
-    // Tests if @win belongs to this workspace and monitor
-    _isMyWindow : function (win) {
-        return this._isWorkspaceWindow(win) &&
-            (!win.get_meta_window() || win.get_meta_window().get_monitor() == this.monitorIndex);
+    // Tests if @actor belongs to this workspace and monitor
+    _isMyWindow : function (actor) {
+        let win = actor.meta_window;
+        return win.located_on_workspace(this.metaWorkspace) &&
+            (win.get_monitor() == this.monitorIndex);
     },
 
     // Tests if @win should be shown in the Overview
@@ -418,7 +452,7 @@ const WorkspaceThumbnail = new Lang.Class({
         this._contents.add_actor(clone.actor);
 
         if (this._windows.length == 0)
-            clone.setStackAbove(this._background);
+            clone.setStackAbove(this._bgManager.background.actor);
         else
             clone.setStackAbove(this._windows[this._windows.length - 1].actor);
 
@@ -528,6 +562,7 @@ const ThumbnailsBox = new Lang.Class({
         this._dropPlaceholderPos = -1;
         this._dropPlaceholder = new St.Bin({ style_class: 'placeholder' });
         this.actor.add_actor(this._dropPlaceholder);
+        this._spliceIndex = -1;
 
         this._targetScale = 0;
         this._scale = 0;
@@ -544,7 +579,6 @@ const ThumbnailsBox = new Lang.Class({
 
         this.actor.connect('button-press-event', function() { return true; });
         this.actor.connect('button-release-event', Lang.bind(this, this._onButtonRelease));
-        this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
 
         Main.overview.connect('showing',
                               Lang.bind(this, this._createThumbnails));
@@ -583,7 +617,7 @@ const ThumbnailsBox = new Lang.Class({
             let thumbnail = this._thumbnails[i]
             let [w, h] = thumbnail.actor.get_transformed_size();
             if (y >= thumbnail.actor.y && y <= thumbnail.actor.y + h) {
-                thumbnail.activate(event.time);
+                thumbnail.activate(event.get_time());
                 break;
             }
         }
@@ -711,6 +745,8 @@ const ThumbnailsBox = new Lang.Class({
                     return win.get_workspace() >= newWorkspaceIndex;
             });
 
+            this._spliceIndex = newWorkspaceIndex;
+
             // ... move them down one.
             windows.forEach(function(win) {
                 win.meta_window.change_workspace_by_index(win.get_workspace() + 1,
@@ -728,10 +764,18 @@ const ThumbnailsBox = new Lang.Class({
                 // to open its first window within some time, as tracked by Shell.WindowTracker.
                 // Here, we only add a very brief timeout to avoid the _immediate_ removal of the
                 // workspace while we wait for the startup sequence to load.
-                Main.keepWorkspaceAlive(global.screen.get_workspace_by_index(newWorkspaceIndex),
-                                        WORKSPACE_KEEP_ALIVE_TIME);
+                Main.wm.keepWorkspaceAlive(global.screen.get_workspace_by_index(newWorkspaceIndex),
+                                           WORKSPACE_KEEP_ALIVE_TIME);
             }
 
+            // Start the animation on the workspace (which is actually
+            // an old one which just became empty)
+            let thumbnail = this._thumbnails[newWorkspaceIndex];
+            this._setThumbnailState(thumbnail, ThumbnailState.NEW);
+            thumbnail.slidePosition = 1;
+
+            this._queueUpdateStates();
+
             return true;
         } else {
             return false;
@@ -759,14 +803,7 @@ const ThumbnailsBox = new Lang.Class({
             this._stateCounts[ThumbnailState[key]] = 0;
 
         // The "porthole" is the portion of the screen that we show in the workspaces
-        let panelHeight = Main.panel.actor.height;
-        let monitor = Main.layoutManager.primaryMonitor;
-        this._porthole = {
-            x: monitor.x,
-            y: monitor.y + panelHeight,
-            width: monitor.width,
-            height: monitor.height - panelHeight
-        };
+        this._porthole = Main.layoutManager.getWorkAreaForMonitor(Main.layoutManager.primaryIndex);
 
         this.addThumbnails(0, global.screen.n_workspaces);
 
@@ -826,7 +863,8 @@ const ThumbnailsBox = new Lang.Class({
             this._thumbnails.push(thumbnail);
             this.actor.add_actor(thumbnail.actor);
 
-            if (start > 0) { // not the initial fill
+            if (start > 0 && this._spliceIndex == -1) {
+                // not the initial fill, and not splicing via DND
                 thumbnail.state = ThumbnailState.NEW;
                 thumbnail.slidePosition = 1; // start slid out
                 this._haveNewThumbnails = true;
@@ -841,6 +879,9 @@ const ThumbnailsBox = new Lang.Class({
 
         // The thumbnails indicator actually needs to be on top of the thumbnails
         this._indicator.raise_top();
+
+        // Clear the splice index, we got the message
+        this._spliceIndex = -1;
     },
 
     removeThumbnails: function(start, count) {
@@ -1000,8 +1041,6 @@ const ThumbnailsBox = new Lang.Class({
         // See comment about this._background in _init()
         let themeNode = this._background.get_theme_node();
 
-        forWidth = themeNode.adjust_for_width(forWidth);
-
         // Note that for getPreferredWidth/Height we cheat a bit and skip propagating
         // the size request to our children because we know how big they are and know
         // that the actors aren't depending on the virtual functions being called.
@@ -1217,16 +1256,5 @@ const ThumbnailsBox = new Lang.Class({
                            },
                            onCompleteScope: this
                          });
-    },
-
-    _onScrollEvent: function (actor, event) {
-        switch (event.get_scroll_direction()) {
-        case Clutter.ScrollDirection.UP:
-            Main.wm.actionMoveWorkspace(Meta.MotionDirection.UP);
-            break;
-        case Clutter.ScrollDirection.DOWN:
-            Main.wm.actionMoveWorkspace(Meta.MotionDirection.DOWN);
-            break;
-        }
     }
 });

js/ui/workspacesView.js

@@ -23,14 +23,25 @@ const MAX_WORKSPACES = 16;
 
 const OVERRIDE_SCHEMA = 'org.gnome.shell.overrides';
 
-const CONTROLS_POP_IN_TIME = 0.1;
+function rectEqual(one, two) {
+    if (one == two)
+        return true;
 
+    if (!one || !two)
+        return false;
+
+    return (one.x == two.x &&
+            one.y == two.y &&
+            one.width == two.width &&
+            one.height == two.height);
+}
 
 const WorkspacesView = new Lang.Class({
     Name: 'WorkspacesView',
 
     _init: function(workspaces) {
-        this.actor = new St.Widget({ style_class: 'workspaces-view' });
+        this.actor = new St.Widget({ style_class: 'workspaces-view',
+                                     reactive: true });
 
         // The actor itself isn't a drop target, so we don't want to pick on its area
         this.actor.set_size(0, 0);
@@ -44,14 +55,9 @@ const WorkspacesView = new Lang.Class({
                 this._updateWorkspaceActors(false);
             }));
 
-        this._width = 0;
-        this._height = 0;
-        this._x = 0;
-        this._y = 0;
-        this._clipX = 0;
-        this._clipY = 0;
-        this._clipWidth = 0;
-        this._clipHeight = 0;
+        this._fullGeometry = null;
+        this._actualGeometry = null;
+
         this._spacing = 0;
         this._animating = false; // tweening
         this._scrolling = false; // swipe-scrolling
@@ -90,8 +96,8 @@ const WorkspacesView = new Lang.Class({
         this._overviewShownId =
             Main.overview.connect('shown',
                                  Lang.bind(this, function() {
-                this.actor.set_clip(this._clipX, this._clipY,
-                                    this._clipWidth, this._clipHeight);
+                this.actor.set_clip(this._fullGeometry.x, this._fullGeometry.y,
+                                    this._fullGeometry.width, this._fullGeometry.height);
         }));
 
         this.scrollAdjustment = new St.Adjustment({ value: activeWorkspaceIndex,
@@ -129,11 +135,9 @@ const WorkspacesView = new Lang.Class({
                 continue;
 
             let ws = new Workspace.Workspace(null, i);
-            ws.setGeometry(monitors[i].x,
-                           monitors[i].y,
-                           monitors[i].width,
-                           monitors[i].height);
-            global.overlay_group.add_actor(ws.actor);
+            ws.setFullGeometry(monitors[i]);
+            ws.setActualGeometry(monitors[i]);
+            Main.layoutManager.overviewGroup.add_actor(ws.actor);
             this._extraWorkspaces.push(ws);
         }
     },
@@ -144,25 +148,24 @@ const WorkspacesView = new Lang.Class({
         this._extraWorkspaces = [];
     },
 
-    setGeometry: function(x, y, width, height) {
-      if (this._x == x && this._y == y &&
-          this._width == width && this._height == height)
-          return;
+    setFullGeometry: function(geom) {
+        if (rectEqual(this._fullGeometry, geom))
+            return;
 
-        this._width = width;
-        this._height = height;
-        this._x = x;
-        this._y = y;
+        this._fullGeometry = geom;
 
         for (let i = 0; i < this._workspaces.length; i++)
-            this._workspaces[i].setGeometry(x, y, width, height);
+            this._workspaces[i].setFullGeometry(geom);
     },
 
-    setClipRect: function(x, y, width, height) {
-        this._clipX = x;
-        this._clipY = y;
-        this._clipWidth = width;
-        this._clipHeight = height;
+    setActualGeometry: function(geom) {
+        if (rectEqual(this._actualGeometry, geom))
+            return;
+
+        this._actualGeometry = geom;
+
+        for (let i = 0; i < this._workspaces.length; i++)
+            this._workspaces[i].setActualGeometry(geom);
     },
 
     _lookupWorkspaceForMetaWindow: function (metaWindow) {
@@ -203,11 +206,6 @@ const WorkspacesView = new Lang.Class({
             this._extraWorkspaces[i].syncStacking(stackIndices);
     },
 
-    updateWindowPositions: function() {
-        for (let w = 0; w < this._workspaces.length; w++)
-            this._workspaces[w].positionWindows(Workspace.WindowPositionFlags.ANIMATE);
-    },
-
     _scrollToActive: function() {
         let active = global.screen.get_active_workspace_index();
 
@@ -227,7 +225,7 @@ const WorkspacesView = new Lang.Class({
 
             Tweener.removeTweens(workspace.actor);
 
-            let y = (w - active) * (this._height + this._spacing);
+            let y = (w - active) * (this._fullGeometry.height + this._spacing);
 
             if (showAnimation) {
                 let params = { y: y,
@@ -298,8 +296,9 @@ const WorkspacesView = new Lang.Class({
 
         if (newNumWorkspaces > oldNumWorkspaces) {
             for (let w = oldNumWorkspaces; w < newNumWorkspaces; w++) {
-                this._workspaces[w].setGeometry(this._x, this._y,
-                                                this._width, this._height);
+                this._workspaces[w].setFullGeometry(this._fullGeometry);
+                if (this._actualGeometry)
+                    this._workspaces[w].setActualGeometry(this._actualGeometry);
                 this.actor.add_actor(this._workspaces[w].actor);
             }
 
@@ -403,6 +402,15 @@ const WorkspacesView = new Lang.Class({
         let current = Math.round(adj.value);
 
         if (active != current) {
+            if (!this._workspaces[current]) {
+                // The current workspace was destroyed. This could happen
+                // when you are on the last empty workspace, and consolidate
+                // windows using the thumbnail bar.
+                // In that case, the intended behavior is to stay on the empty
+                // workspace, which is the last one, so pick it.
+                current = this._workspaces.length - 1;
+            }
+
             let metaWorkspace = this._workspaces[current].metaWorkspace;
             metaWorkspace.activate(global.get_current_time());
         }
@@ -437,23 +445,9 @@ const WorkspacesDisplay = new Lang.Class({
     Name: 'WorkspacesDisplay',
 
     _init: function() {
-        this.actor = new Shell.GenericContainer({ style_class: 'workspaces-display' });
-        this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
-        this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
-        this.actor.connect('allocate', Lang.bind(this, this._allocate));
+        this.actor = new St.Widget({ clip_to_allocation: true });
+        this.actor.connect('notify::allocation', Lang.bind(this, this._updateWorkspacesActualGeometry));
         this.actor.connect('parent-set', Lang.bind(this, this._parentSet));
-        this.actor.set_clip_to_allocation(true);
-
-        this._spacing = 0;
-        this.actor.connect('style-changed', Lang.bind(this,
-            function() {
-                let node = this.actor.get_theme_node();
-                let spacing = node.get_length('spacing');
-                if (spacing != this._spacing) {
-                    this._spacing = spacing;
-                    this._updateWorkspacesGeometry();
-                }
-            }));
 
         let clickAction = new Clutter.ClickAction()
         clickAction.connect('clicked', Lang.bind(this, function(action) {
@@ -474,6 +468,11 @@ const WorkspacesDisplay = new Lang.Class({
                 this._workspacesViews[i].startSwipeScroll();
             return true;
         }));
+        panAction.connect('gesture-cancel', Lang.bind(this, function() {
+            clickAction.release();
+            for (let i = 0; i < this._workspacesViews.length; i++)
+                this._workspacesViews[i].endSwipeScroll();
+        }));
         panAction.connect('gesture-end', Lang.bind(this, function() {
             clickAction.release();
             for (let i = 0; i < this._workspacesViews.length; i++)
@@ -482,23 +481,8 @@ const WorkspacesDisplay = new Lang.Class({
         Main.overview.addAction(panAction);
         this.actor.bind_property('mapped', panAction, 'enabled', GObject.BindingFlags.SYNC_CREATE);
 
-        let controls = new St.Bin({ style_class: 'workspace-controls',
-                                    request_mode: Clutter.RequestMode.WIDTH_FOR_HEIGHT,
-                                    y_align: St.Align.START,
-                                    y_fill: true });
-        this._controls = controls;
-        this.actor.add_actor(controls);
-
-        controls.reactive = true;
-        controls.track_hover = true;
-        controls.connect('notify::hover',
-                         Lang.bind(this, this._onControlsHoverChanged));
-
         this._primaryIndex = Main.layoutManager.primaryIndex;
 
-        this._thumbnailsBox = new WorkspaceThumbnail.ThumbnailsBox();
-        controls.add_actor(this._thumbnailsBox.actor);
-
         this._workspacesViews = [];
         this._workspaces = [];
         this._primaryScrollAdjustment = null;
@@ -509,43 +493,15 @@ const WorkspacesDisplay = new Lang.Class({
                                          this._workspacesOnlyOnPrimaryChanged));
         this._workspacesOnlyOnPrimaryChanged();
 
-        this._inDrag = false;
-        this._cancelledDrag = false;
-
-        this._controlsInitiallyHovered = false;
-        this._alwaysZoomOut = false;
-        this._zoomOut = false;
-        this._zoomFraction = 0;
-
-        this._updateAlwaysZoom();
-
-        // If we stop hiding the overview on layout changes, we will need to
-        // update the _workspacesViews here
-        Main.layoutManager.connect('monitors-changed', Lang.bind(this, this._updateAlwaysZoom));
-
-        Main.xdndHandler.connect('drag-begin', Lang.bind(this, function(){
-            this._alwaysZoomOut = true;
-        }));
-
-        Main.xdndHandler.connect('drag-end', Lang.bind(this, function(){
-            this._alwaysZoomOut = false;
-            this._updateAlwaysZoom();
-        }));
-
         global.screen.connect('notify::n-workspaces',
                               Lang.bind(this, this._workspacesChanged));
 
         this._switchWorkspaceNotifyId = 0;
 
-        this._itemDragBeginId = 0;
-        this._itemDragCancelledId = 0;
-        this._itemDragEndId = 0;
-        this._windowDragBeginId = 0;
-        this._windowDragCancelledId = 0;
-        this._windowDragEndId = 0;
         this._notifyOpacityId = 0;
-        this._swipeScrollBeginId = 0;
-        this._swipeScrollEndId = 0;
+        this._scrollEventId = 0;
+
+        this._fullGeometry = null;
     },
 
     _onPan: function(action) {
@@ -556,49 +512,13 @@ const WorkspacesDisplay = new Lang.Class({
     },
 
     show: function() {
-        if(!this._alwaysZoomOut) {
-            let [mouseX, mouseY] = global.get_pointer();
-            let [x, y] = this._controls.get_transformed_position();
-            let [width, height] = this._controls.get_transformed_size();
-            let visibleWidth = this._controls.get_theme_node().get_length('visible-width');
-            let rtl = (Clutter.get_default_text_direction () == Clutter.TextDirection.RTL);
-            if(rtl)
-                x = x + width - visibleWidth;
-            if(mouseX > x - 0.5 && mouseX < x + visibleWidth + 0.5 &&
-               mouseY > y - 0.5 && mouseY < y + height + 0.5)
-                this._controlsInitiallyHovered = true;
-        }
-
-        this._zoomOut = this._alwaysZoomOut;
-        this._zoomFraction = this._alwaysZoomOut ? 1 : 0;
-        this._updateZoom();
-
-        this._controls.show();
-
         this._updateWorkspacesViews();
 
         this._restackedNotifyId =
             Main.overview.connect('windows-restacked',
                                   Lang.bind(this, this._onRestacked));
-
-        if (this._itemDragBeginId == 0)
-            this._itemDragBeginId = Main.overview.connect('item-drag-begin',
-                                                          Lang.bind(this, this._dragBegin));
-        if (this._itemDragCancelledId == 0)
-            this._itemDragCancelledId = Main.overview.connect('item-drag-cancelled',
-                                                              Lang.bind(this, this._dragCancelled));
-        if (this._itemDragEndId == 0)
-            this._itemDragEndId = Main.overview.connect('item-drag-end',
-                                                        Lang.bind(this, this._dragEnd));
-        if (this._windowDragBeginId == 0)
-            this._windowDragBeginId = Main.overview.connect('window-drag-begin',
-                                                            Lang.bind(this, this._dragBegin));
-        if (this._windowDragCancelledId == 0)
-            this._windowDragCancelledId = Main.overview.connect('window-drag-cancelled',
-                                                            Lang.bind(this, this._dragCancelled));
-        if (this._windowDragEndId == 0)
-            this._windowDragEndId = Main.overview.connect('window-drag-end',
-                                                          Lang.bind(this, this._dragEnd));
+        if (this._scrollEventId == 0)
+            this._scrollEventId = Main.overview.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
     },
 
     zoomFromOverview: function() {
@@ -608,38 +528,13 @@ const WorkspacesDisplay = new Lang.Class({
     },
 
     hide: function() {
-        this._controls.hide();
-
-        if (!this._alwaysZoomOut)
-            this.zoomFraction = 0;
-
         if (this._restackedNotifyId > 0){
             Main.overview.disconnect(this._restackedNotifyId);
             this._restackedNotifyId = 0;
         }
-        if (this._itemDragBeginId > 0) {
-            Main.overview.disconnect(this._itemDragBeginId);
-            this._itemDragBeginId = 0;
-        }
-        if (this._itemDragCancelledId > 0) {
-            Main.overview.disconnect(this._itemDragCancelledId);
-            this._itemDragCancelledId = 0;
-        }
-        if (this._itemDragEndId > 0) {
-            Main.overview.disconnect(this._itemDragEndId);
-            this._itemDragEndId = 0;
-        }
-        if (this._windowDragBeginId > 0) {
-            Main.overview.disconnect(this._windowDragBeginId);
-            this._windowDragBeginId = 0;
-        }
-        if (this._windowDragCancelledId > 0) {
-            Main.overview.disconnect(this._windowDragCancelledId);
-            this._windowDragCancelledId = 0;
-        }
-        if (this._windowDragEndId > 0) {
-            Main.overview.disconnect(this._windowDragEndId);
-            this._windowDragEndId = 0;
+        if (this._scrollEventId > 0) {
+            Main.overview.disconnect(this._scrollEventId);
+            this._scrollEventId = 0;
         }
 
         for (let i = 0; i < this._workspacesViews.length; i++)
@@ -686,6 +581,7 @@ const WorkspacesDisplay = new Lang.Class({
             this._workspaces.push(monitorWorkspaces);
 
             let view = new WorkspacesView(monitorWorkspaces);
+            view.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
             if (this._workspacesOnlyOnPrimary || i == this._primaryIndex) {
                 this._scrollAdjustment = view.scrollAdjustment;
                 this._scrollAdjustment.connect('notify::value',
@@ -694,10 +590,11 @@ const WorkspacesDisplay = new Lang.Class({
             this._workspacesViews.push(view);
         }
 
-        this._updateWorkspacesGeometry();
+        this._updateWorkspacesFullGeometry();
+        this._updateWorkspacesActualGeometry();
 
         for (let i = 0; i < this._workspacesViews.length; i++)
-            global.overlay_group.add_actor(this._workspacesViews[i].actor);
+            Main.layoutManager.overviewGroup.add_actor(this._workspacesViews[i].actor);
     },
 
     _scrollValueChanged: function() {
@@ -728,76 +625,6 @@ const WorkspacesDisplay = new Lang.Class({
         return this._getPrimaryView().getActiveWorkspace().hasMaximizedWindows();
     },
 
-    // zoomFraction property allows us to tween the controls sliding in and out
-    set zoomFraction(fraction) {
-        this._zoomFraction = fraction;
-        this.actor.queue_relayout();
-    },
-
-    get zoomFraction() {
-        return this._zoomFraction;
-    },
-
-    _updateAlwaysZoom: function()  {
-        // Always show the pager if workspaces are actually used,
-        // e.g. there are windows on more than one
-        this._alwaysZoomOut = global.screen.n_workspaces > 2;
-
-        if (this._alwaysZoomOut)
-            return;
-
-        let monitors = Main.layoutManager.monitors;
-        let primary = Main.layoutManager.primaryMonitor;
-
-        /* Look for any monitor to the right of the primary, if there is
-         * one, we always keep zoom out, otherwise its hard to reach
-         * the thumbnail area without passing into the next monitor. */
-        for (let i = 0; i < monitors.length; i++) {
-            if (monitors[i].x >= primary.x + primary.width) {
-                this._alwaysZoomOut = true;
-                break;
-            }
-        }
-    },
-
-    _getPreferredWidth: function (actor, forHeight, alloc) {
-        // pass through the call in case the child needs it, but report 0x0
-        this._controls.get_preferred_width(forHeight);
-    },
-
-    _getPreferredHeight: function (actor, forWidth, alloc) {
-        // pass through the call in case the child needs it, but report 0x0
-        this._controls.get_preferred_height(forWidth);
-    },
-
-    _allocate: function (actor, box, flags) {
-        let childBox = new Clutter.ActorBox();
-
-        let totalWidth = box.x2 - box.x1;
-
-        // width of the controls
-        let [controlsMin, controlsNatural] = this._controls.get_preferred_width(box.y2 - box.y1);
-
-        // Amount of space on the screen we reserve for the visible control
-        let controlsVisible = this._controls.get_theme_node().get_length('visible-width');
-        let controlsReserved = controlsVisible * (1 - this._zoomFraction) + controlsNatural * this._zoomFraction;
-
-        let rtl = (Clutter.get_default_text_direction () == Clutter.TextDirection.RTL);
-        if (rtl) {
-            childBox.x2 = controlsReserved;
-            childBox.x1 = childBox.x2 - controlsNatural;
-        } else {
-            childBox.x1 = totalWidth - controlsReserved;
-            childBox.x2 = childBox.x1 + controlsNatural;
-        }
-
-        childBox.y1 = 0;
-        childBox.y2 = box.y2- box.y1;
-        this._controls.allocate(childBox, flags);
-
-        this._updateWorkspacesGeometry();
-    },
-
     _parentSet: function(actor, oldParent) {
         if (oldParent && this._notifyOpacityId)
             oldParent.disconnect(this._notifyOpacityId);
@@ -811,7 +638,7 @@ const WorkspacesDisplay = new Lang.Class({
 
                 // This is kinda hackish - we want the primary view to
                 // appear as parent of this.actor, though in reality it
-                // is added directly to overlay_group
+                // is added directly to Main.layoutManager.overviewGroup
                 this._notifyOpacityId = newParent.connect('notify::opacity',
                     Lang.bind(this, function() {
                         let opacity = this.actor.get_parent().opacity;
@@ -824,51 +651,48 @@ const WorkspacesDisplay = new Lang.Class({
         }));
     },
 
-    _updateWorkspacesGeometry: function() {
+    // This geometry should always be the fullest geometry
+    // the workspaces switcher can ever be allocated, as if
+    // the sliding controls were never slid in at all.
+    setWorkspacesFullGeometry: function(geom) {
+        this._fullGeometry = geom;
+        this._updateWorkspacesFullGeometry();
+    },
+
+    _updateWorkspacesFullGeometry: function() {
         if (!this._workspacesViews.length)
             return;
 
-        let fullWidth = this.actor.allocation.x2 - this.actor.allocation.x1;
-        let fullHeight = this.actor.allocation.y2 - this.actor.allocation.y1;
-
-        let width = fullWidth;
-        let height = fullHeight;
-
-        let [controlsMin, controlsNatural] = this._controls.get_preferred_width(height);
-        let controlsVisible = this._controls.get_theme_node().get_length('visible-width');
-
-        let [x, y] = this.actor.get_transformed_position();
-
-        let rtl = (Clutter.get_default_text_direction () == Clutter.TextDirection.RTL);
-
-        let clipWidth = width - controlsVisible;
-        let clipHeight = fullHeight;
-        let clipX = rtl ? x + controlsVisible : x;
-        let clipY = y + (fullHeight - clipHeight) / 2;
-
-        let widthAdjust = this._zoomOut ? controlsNatural : controlsVisible;
-        widthAdjust += this._spacing;
-        width -= widthAdjust;
-        if (rtl)
-            x += widthAdjust;
-
         let monitors = Main.layoutManager.monitors;
         let m = 0;
         for (let i = 0; i < monitors.length; i++) {
             if (i == this._primaryIndex) {
-                this._workspacesViews[m].setClipRect(clipX, clipY,
-                                                     clipWidth, clipHeight);
-                this._workspacesViews[m].setGeometry(x, y, width, height);
+                this._workspacesViews[m].setFullGeometry(this._fullGeometry);
                 m++;
             } else if (!this._workspacesOnlyOnPrimary) {
-                this._workspacesViews[m].setClipRect(monitors[i].x,
-                                                     monitors[i].y,
-                                                     monitors[i].width,
-                                                     monitors[i].height);
-                this._workspacesViews[m].setGeometry(monitors[i].x,
-                                                     monitors[i].y,
-                                                     monitors[i].width,
-                                                     monitors[i].height);
+                this._workspacesViews[m].setFullGeometry(monitors[i]);
+                m++;
+            }
+        }
+    },
+
+    _updateWorkspacesActualGeometry: function() {
+        if (!this._workspacesViews.length)
+            return;
+
+        let [x, y] = this.actor.get_transformed_position();
+        let width = this.actor.allocation.x2 - this.actor.allocation.x1;
+        let height = this.actor.allocation.y2 - this.actor.allocation.y1;
+        let geometry = { x: x, y: y, width: width, height: height };
+
+        let monitors = Main.layoutManager.monitors;
+        let m = 0;
+        for (let i = 0; i < monitors.length; i++) {
+            if (i == this._primaryIndex) {
+                this._workspacesViews[m].setActualGeometry(geometry);
+                m++;
+            } else if (!this._workspacesOnlyOnPrimary) {
+                this._workspacesViews[m].setActualGeometry(monitors[i]);
                 m++;
             }
         }
@@ -880,9 +704,6 @@ const WorkspacesDisplay = new Lang.Class({
     },
 
     _workspacesChanged: function() {
-        this._updateAlwaysZoom();
-        this._updateZoom();
-
         if (!this._workspacesViews.length)
             return;
 
@@ -936,66 +757,23 @@ const WorkspacesDisplay = new Lang.Class({
                                                       newNumWorkspaces);
     },
 
-    _updateZoom : function() {
-        if (Main.overview.animationInProgress)
-            return;
-
-        let shouldZoom = this._alwaysZoomOut || this._controls.hover;
-        if (shouldZoom != this._zoomOut) {
-            this._zoomOut = shouldZoom;
-            this._updateWorkspacesGeometry();
-
-            if (!this._workspacesViews.length)
-                return;
-
-            Tweener.addTween(this,
-                             { zoomFraction: this._zoomOut ? 1 : 0,
-                               time: WORKSPACE_SWITCH_TIME,
-                               transition: 'easeOutQuad' });
-
-            for (let i = 0; i < this._workspacesViews.length; i++)
-                this._workspacesViews[i].updateWindowPositions();
+    _onScrollEvent: function(actor, event) {
+        if (!this.actor.mapped)
+            return false;
+        let activeWs = global.screen.get_active_workspace();
+        let ws;
+        switch (event.get_scroll_direction()) {
+        case Clutter.ScrollDirection.UP:
+            ws = activeWs.get_neighbor(Meta.MotionDirection.UP);
+            break;
+        case Clutter.ScrollDirection.DOWN:
+            ws = activeWs.get_neighbor(Meta.MotionDirection.DOWN);
+            break;
+        default:
+            return false;
         }
-    },
-
-    _onControlsHoverChanged: function() {
-        if(!this._controls.hover)
-            this._controlsInitiallyHovered = false;
-        if(!this._controlsInitiallyHovered)
-            this._updateZoom();
-    },
-
-    _dragBegin: function() {
-        this._inDrag = true;
-        this._cancelledDrag = false;
-        this._dragMonitor = {
-            dragMotion: Lang.bind(this, this._onDragMotion)
-        };
-        DND.addDragMonitor(this._dragMonitor);
-    },
-
-    _dragCancelled: function() {
-        this._cancelledDrag = true;
-        DND.removeDragMonitor(this._dragMonitor);
-    },
-
-    _onDragMotion: function(dragEvent) {
-        let controlsHovered = this._controls.contains(dragEvent.targetActor);
-        this._controls.set_hover(controlsHovered);
-
-        return DND.DragMotionResult.CONTINUE;
-    },
-
-    _dragEnd: function() {
-        this._inDrag = false;
-
-        // We do this deferred because drag-end is emitted before dnd.js emits
-        // event/leave events that were suppressed during the drag. If we didn't
-        // defer this, we'd zoom out then immediately zoom in because of the
-        // enter event we received. That would normally be invisible but we
-        // might as well avoid it.
-        Meta.later_add(Meta.LaterType.BEFORE_REDRAW,
-                       Lang.bind(this, this._updateZoom));
+        Main.wm.actionMoveWorkspace(ws);
+        return true;
     }
 });
 Signals.addSignalMethods(WorkspacesDisplay.prototype);

js/ui/xdndHandler.js

@@ -2,6 +2,7 @@
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
+const Main = imports.ui.main;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const DND = imports.ui.dnd;
@@ -15,19 +16,12 @@ const XdndHandler = new Lang.Class({
         this._cursorWindowClone = null;
 
         // Used as a drag actor in case we don't have a cursor window clone
-        this._dummy = new Clutter.Rectangle({ width: 1, height: 1, opacity: 0 });
-        global.stage.add_actor(this._dummy);
+        this._dummy = new Clutter.Actor({ width: 1, height: 1, opacity: 0 });
+        Main.uiGroup.add_actor(this._dummy);
         Shell.util_set_hidden_from_pick(this._dummy, true);
         this._dummy.hide();
 
-        // Mutter delays the creation of the output window as long
-        // as possible to avoid flicker. In case a plugin wants to
-        // access it directly it has to connect to the stage's show
-        // signal. (see comment in compositor.c:meta_compositor_manage_screen)
-        global.stage.connect('show', function () {
-                                        global.init_xdnd();
-                                        return false;
-                                      });
+        global.init_xdnd();
 
         global.connect('xdnd-enter', Lang.bind(this, this._onEnter));
         global.connect('xdnd-position-changed', Lang.bind(this, this._onPositionChanged));
@@ -74,7 +68,7 @@ const XdndHandler = new Lang.Class({
                                                                    source: cursorWindow});
 
             this._cursorWindowClone = new Clutter.Clone({ source: cursorWindow });
-            global.overlay_group.add_actor(this._cursorWindowClone);
+            Main.uiGroup.add_actor(this._cursorWindowClone);
             Shell.util_set_hidden_from_pick(this._cursorWindowClone, true);
 
             // Make sure that the clone has the same position as the source
@@ -88,7 +82,7 @@ const XdndHandler = new Lang.Class({
     },
 
     _onPositionChanged: function(obj, x, y) {
-        let pickedActor = global.stage.get_actor_at_pos(Clutter.PickMode.ALL, x, y);
+        let pickedActor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, x, y);
 
         // Make sure that the cursor window is on top
         if (this._cursorWindowClone)

man/gnome-shell.xml

@@ -125,6 +125,12 @@
                                 <listitem><para>List possible modes and exit</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>--clutter-display=<replaceable>DISPLAY</replaceable></option></term>
+
+                                <listitem><para>Clutter the option display (otherwise ignored)</para></listitem>
+                        </varlistentry>
+
                 </variablelist>
 
         </refsect1>

po/LINGUAS

@@ -21,12 +21,14 @@ eu
 fa
 fi
 fr
+fur
 ga
 gl
 gu
 he
 hi
 hu
+ia
 id
 it
 ja
@@ -59,6 +61,7 @@ sr@latin
 sv
 ta
 te
+tg
 th
 tr
 ug 

po/POTFILES.in

@@ -1,16 +1,22 @@
+# List of source files containing translatable strings.
+# Please keep this file sorted alphabetically.
+[encoding: UTF-8]
 data/50-gnome-shell-screenshot.xml.in
 data/50-gnome-shell-system.xml.in
 data/gnome-shell.desktop.in.in
 data/gnome-shell-extension-prefs.desktop.in.in
 data/org.gnome.shell.gschema.xml.in.in
 js/extensionPrefs/main.js
+js/gdm/authPrompt.js
 js/gdm/loginDialog.js
 js/gdm/powerMenu.js
 js/gdm/util.js
 js/misc/util.js
 js/ui/appDisplay.js
 js/ui/appFavorites.js
+js/ui/backgroundMenu.js
 js/ui/calendar.js
+js/ui/components/automountManager.js
 js/ui/components/autorunManager.js
 js/ui/components/keyring.js
 js/ui/components/networkAgent.js
@@ -28,6 +34,7 @@ js/ui/lookingGlass.js
 js/ui/main.js
 js/ui/messageTray.js
 js/ui/notificationDaemon.js
+js/ui/overviewControls.js
 js/ui/overview.js
 js/ui/panel.js
 js/ui/popupMenu.js
@@ -42,19 +49,19 @@ js/ui/status/keyboard.js
 js/ui/status/lockScreenMenu.js
 js/ui/status/network.js
 js/ui/status/power.js
+js/ui/status/system.js
 js/ui/status/volume.js
 js/ui/unlockDialog.js
-js/ui/userMenu.js
 js/ui/viewSelector.js
 js/ui/wanda.js
 js/ui/windowAttentionHandler.js
 src/calendar-server/evolution-calendar.desktop.in.in
+# Please do not remove this file from POTFILES.in. Run "git submodule init && git submodule update" to get it.
 src/gvc/gvc-mixer-control.c
 src/main.c
 src/shell-app.c
 src/shell-app-system.c
 src/shell-global.c
 src/shell-keyring-prompt.c
-src/shell-mobile-providers.c
 src/shell-polkit-authentication-agent.c
 src/shell-util.c