[gnome-shell-extensions/gnome-2-32] Backport to GNOME 2.32

[Giovanni Campagna <gcampagna src gnome org>]

commit 72da7d47b3bc5e4605df233687da3deb554676ee
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Wed Jan 12 21:26:54 2011 +0100

    Backport to GNOME 2.32
    
    Which means GNOME Shell 2.31.5.
    The available extensions are HelloWorld and AlternateTab, and I'm
    not sure about the latter (seems to miss a function, but I cannot
    test since I've moved to master)

 extensions/alternate-tab/extension.js      |  113 +++++++-----------------
 extensions/alternate-tab/metadata.json     |    2 +-
 extensions/example/metadata.json           |    7 ++-
 extensions/xrandr-indicator/Makefile.am    |    3 -
 extensions/xrandr-indicator/extension.js   |  135 ----------------------------
 extensions/xrandr-indicator/extension.js~  |  132 ---------------------------
 extensions/xrandr-indicator/metadata.json  |    6 --
 extensions/xrandr-indicator/stylesheet.css |    3 -
 8 files changed, 38 insertions(+), 363 deletions(-)
---
diff --git a/extensions/alternate-tab/extension.js b/extensions/alternate-tab/extension.js
index ce8575d..793cf07 100644
--- a/extensions/alternate-tab/extension.js
+++ b/extensions/alternate-tab/extension.js
@@ -12,7 +12,7 @@ const Tweener = imports.ui.tweener;
 const WindowManager = imports.ui.windowManager;
 
 function AltTabPopup2() {
-    this._init();
+  this._init();
 }
 
 AltTabPopup2.prototype = {
@@ -39,18 +39,19 @@ AltTabPopup2.prototype = {
         // the switcher appears underneath the current pointer location
         this._disableHover();
 
-	this.show();
+        this.show();
         Main.uiGroup.add_actor(this.actor);
     },
 
-    show : function(backward) {
-        let windows = global.get_window_actors();
 
-	let list = '';
-	let normal_windows= [];
+    show: function(backward) {
+        let tracker = Shell.WindowTracker.get_default();
+        let windows = global.get_windows();
+	let liste = '';
+	let normal_windows = [];
 	let appIcons = [];
 	let tracker = Shell.WindowTracker.get_default();
-	let apps = tracker.get_running_apps ('');
+	let apps = tracker.get_running_apps('');
 
 	for (let w = windows.length-1; w >= 0; w--) {
 	    let win = windows[w].get_meta_window();
@@ -67,9 +68,9 @@ AltTabPopup2.prototype = {
 	    let win = windows[w];
 
 	    let ap1 = null;
-	    for (let i = 0;i < apps.length; i++) {
+	    for (let i = 0; i < apps.length; i++) {
 	        let app_wins = apps[i].get_windows();
-	        for (let j = 0;j < app_wins.length; j++) {
+	        for (let j = 0; j < app_wins.length; j++) {
 	            if (app_wins[j] == win)
 		        ap1 = new AltTab.AppIcon(apps[i]);
 	        }
@@ -85,8 +86,8 @@ AltTabPopup2.prototype = {
             return false;
         this._haveModal = true;
 
-        this.actor.connect('key-press-event', Lang.bind(this, this._keyPressEvent));
-        this.actor.connect('key-release-event', Lang.bind(this, this._keyReleaseEvent));
+        this._keyPressEventId = global.stage.connect('key-press-event', Lang.bind(this, this._keyPressEvent));
+	this._keyReleaseEventId = global.stage.connect('key-release-event', Lang.bind(this, this._keyReleaseEvent));
 
         this.actor.connect('button-press-event', Lang.bind(this, this._clickedOutside));
         this.actor.connect('scroll-event', Lang.bind(this, this._onScroll));
@@ -98,74 +99,27 @@ AltTabPopup2.prototype = {
         this._appSwitcher.connect('item-entered', Lang.bind(this, this._appEntered));
 
         this._appIcons = appIcons;
-
 	return true
     },
 
-    _keyPressEvent : function(actor, event) {
-        let keysym = event.get_key_symbol();
-        let shift = (Shell.get_event_state(event) & Clutter.ModifierType.SHIFT_MASK);
-        // X allows servers to represent Shift+Tab in two different ways
-        if (shift && keysym == Clutter.Tab)
-            keysym = Clutter.ISO_Left_Tab;
-
-        this._disableHover();
-
-        if (keysym == Clutter.grave)
-            this._select(this._currentApp, this._nextWindow());
-        else if (keysym == Clutter.asciitilde)
-            this._select(this._currentApp, this._previousWindow());
-        else if (keysym == Clutter.Escape)
-            this.destroy();
-        else if (this._thumbnailsFocused) {
-            if (keysym == Clutter.Tab) {
-                if (this._currentWindow == this._appIcons[this._currentApp].cachedWindows.length - 1)
-                    this._select(this._nextApp());
-                else
-                    this._select(this._currentApp, this._nextWindow());
-            } else if (keysym == Clutter.ISO_Left_Tab) {
-                if (this._currentWindow == 0 || this._currentWindow == -1)
-                    this._select(this._previousApp());
-                else
-                    this._select(this._currentApp, this._previousWindow());
-            } else if (keysym == Clutter.Left)
-                this._select(this._currentApp, this._previousWindow());
-            else if (keysym == Clutter.Right)
-                this._select(this._currentApp, this._nextWindow());
-            else if (keysym == Clutter.Up)
-                this._select(this._currentApp, null, true);
-        } else {
-            if (keysym == Clutter.Tab)
-                this._select(this._nextApp());
-            else if (keysym == Clutter.ISO_Left_Tab)
-                this._select(this._previousApp());
-            else if (keysym == Clutter.Left)
-                this._select(this._previousApp());
-            else if (keysym == Clutter.Right)
-                this._select(this._nextApp());
-        }
-
-        return true;
-    },
-
-    _sortWindows : function(win1,win2) {
+    _sortWindows: function(win1,win2) {
         let t1 = win1.get_user_time();
         let t2 = win2.get_user_time();
         if (t2 > t1) return 1;
         else return -1;
     },
 
-    _appActivated : function(thumbnailList, n) {
+    _appActivated: function(thumbnailList, n) {
         let appIcon = this._appIcons[this._currentApp];
         Main.activateWindow(appIcon.cachedWindows[0]);
         this.destroy();
     },
 
-    _finish : function() {
+    _finish: function() {
         let app = this._appIcons[this._currentApp];
         Main.activateWindow(app.cachedWindows[0]);
         this.destroy();
-    },
+    }
 };
 
 function WindowList(windows) {
@@ -175,17 +129,16 @@ function WindowList(windows) {
 WindowList.prototype = {
     __proto__ : AltTab.AppSwitcher.prototype,
 
-    _init : function(windows) {
+    _init: function(windows) {
         AltTab.AppSwitcher.prototype._init.call(this, []);
-
         let activeWorkspace = global.screen.get_active_workspace();
         this._labels = new Array();
         this._thumbnailBins = new Array();
         this._clones = new Array();
         this._windows = windows;
-        this._arrows= new Array();
-        this.icons= new Array();
-	for (let w = 0; w < windows.length; w++) {
+        this._arrows = new Array();
+        this.icons = new Array();
+	for (let w = 0; w < windows.length; w++) {	
             let arrow = new St.DrawingArea({ style_class: 'switcher-arrow' });
             arrow.connect('repaint', Lang.bind(this, function (area) {
                 Shell.draw_box_pointer(area, Shell.PointerDirection.DOWN);
@@ -195,27 +148,27 @@ WindowList.prototype = {
 
             arrow.hide();
 
-	    let win=windows[w];
+	    let win = windows[w];
 
 	    let tracker = Shell.WindowTracker.get_default();
 	    let apps = tracker.get_running_apps ('');
 	    let ap1 = null;
-	    for (let i = 0; i < apps.length; i++) {
+	    for (let i = 0;i < apps.length; i++) {
 	        let app_wins = apps[i].get_windows();
-	        for (let j = 0; j < app_wins.length; j++) {
-	            if (app_wins[j] == win) {
-                        ap1 = new AltTab.AppIcon(apps[i]);
+	        for (let j = 0;j < app_wins.length; j++) {
+                    if (app_wins[j] == win) {
+           	        ap1 = new AltTab.AppIcon(apps[i]);
                         let mutterWindow = win.get_compositor_private();
-                        let windowTexture = mutterWindow.get_texture ();
+                        let windowTexture = mutterWindow.get_texture();
                         let [width, height] = windowTexture.get_size();
                         let scale = Math.min(1.0, 128 / width, 128 / height);
 
                         let clone = new Clutter.Clone ({ source: windowTexture, reactive: true,  width: width * scale, height: height * scale });
-                        ap1.icon = ap1.app.create_icon_texture(128);
-                        ap1._iconBin.set_size(128,128);
-	                ap1._iconBin.child=clone;
+		        ap1.icon = ap1.app.create_icon_texture(128);
+		        ap1._iconBin.set_size(128,128);
+	                ap1._iconBin.child = clone;
 
-                        ap1.label.text=win.get_title();
+                        ap1.label.text = win.get_title();
 	            }
 	        }
   	    }
@@ -224,16 +177,12 @@ WindowList.prototype = {
 	}
     },
 
-    _sortAppIcon : function(appIcon1, appIcon2) {
-        log ("Function not implemented: _sortAppIcon");
-        return 1;
-    },
-
     addSeparator: function () {
         this._separator=null;
     }
 };
 
+// Put your extension initialization code here
 function main() {
     Main.wm.setKeybindingHandler('switch_windows', function() {
         let alpopup = new AltTabPopup2();
diff --git a/extensions/alternate-tab/metadata.json b/extensions/alternate-tab/metadata.json
index 29df952..131fd08 100644
--- a/extensions/alternate-tab/metadata.json
+++ b/extensions/alternate-tab/metadata.json
@@ -3,5 +3,5 @@
 "name": "AlternateTab",
 "description": "A replacement for Alt-Tab, allows to cycle between windows and does not group by application",
 "original-author": "thomas bouffon gmail com",
-"shell-version": [ "2.91.5" ]
+"shell-version": [ "2.31.5" ]
 }
diff --git a/extensions/example/metadata.json b/extensions/example/metadata.json
index ff70959..6e1879d 100644
--- a/extensions/example/metadata.json
+++ b/extensions/example/metadata.json
@@ -1 +1,6 @@
-{"uuid": "example gnome-shell-extensions gnome org", "name": "Hello, World!", "description": "An example extension to show how it works. Shows Hello, world when clicking on the top panel.", "shell-version": [ "2.91.5" ]}
+{
+"uuid": "example gnome-shell-extensions gnome org",
+"name": "Hello, World!",
+"description": "An example extension to show how it works. Shows Hello, world when clicking on the top panel.",
+"shell-version": [ "2.31.5", "2.31.6" ]
+}