Changeset 25781 for lang/javascript/vimperator-plugins

Timestamp:

12/03/08 19:08:23 (5 weeks ago)

Author:

anekos

Message:

フルスクリーン化などの追加

Files:

• lang/javascript/vimperator-plugins/trunk/stella.js (modified) (25 diffs)

lang/javascript/vimperator-plugins/trunk/stella.js

@@ -3 +3 @@
 // @description-ja ステータスラインに動画の再生時間などを表示する。
 // @license        Creative Commons Attribution-Share Alike 3.0 Unported
-// @version        0.06
+// @version        0.07
 // @author         anekos (anekos@snca.net)
 // @minVersion     2.0pre
@@ -13 +13 @@
 //
 // TODO
-//    user command
-//    :fetchvideo
 //    Icons
 //    Other video hosting websites
+//    auto fullscreen
 //
-// Links:
+// Link:
 //    http://d.hatena.ne.jp/nokturnalmortum/
+//
+// Refs:
+//    http://yuichis.homeip.net/nicodai.user.html
+//    http://coderepos.org/share/browser/lang/javascript/vimperator-plugins/trunk/nicontroller.js
+//    http://coderepos.org/share/browser/lang/javascript/vimperator-plugins/trunk/youtubeamp.js
+//    Thanks!
 //
 // License:
@@ -33 +38 @@
   const ID_PREFIX = 'anekos-stela-';
   const InVimperator = !!(liberator && modules && modules.liberator);
+  const DOUBLE_CLICK_INTERVAL = 300;
 
   // }}}
@@ -121 +127 @@
               : '??:??');
 
-  function setWithBackup (target, values) {
-    let backup = target.__stella_backup = {};
+  function storeStyle (target, values) {
+    let [style, cstyle] = [target.style, content.getComputedStyle(target, '')];
+    let backup = style.__stella_backup = {};
     for (let [name, value] in Iterator(values)) {
-      backup[name] = target[name];
-      target[name] = value;
+      backup[name] = cstyle[name];
+      style[name] = value;
     }
-    liberator.log(target.__stella_backup)
-  }
-
-  function restoreFromBackup (target, doDelete) {
-    if (!target.__stella_backup)
+  }
+
+  function restoreStyle (target, doDelete) {
+    let style = target.style;
+    if (!style.__stella_backup)
       return;
-    for (let [name, value] in Iterator(target.__stella_backup))
-      target[name] = value;
+    let backup = style.__stella_backup;
+    for (let name in Iterator(backup))
+      style[name] = backup[name];
     if (doDelete)
-      delete target.__stella_backup;
+      delete style.__stella_backup;
+  }
+
+  function getElementByIdEx (id)
+    let (p = content.document.getElementById(id))
+      (p && (p.wrappedJSObject || p));
+
+  function fixDoubleClick (obj, click, dblClick) {
+    let clicked = 0;
+    let original = {click: obj[click], dblClick: obj[dblClick]};
+    liberator.log(original);
+    obj[click] = function () {
+      let self = this, args = arguments;
+      let _clicked = ++clicked;
+      setTimeout(function () {
+        if (_clicked == clicked--)
+          original.click.apply(self, args);
+        else
+          clicked = 0;
+      }, DOUBLE_CLICK_INTERVAL);
+    };
+    obj[dblClick] = function () {
+      clicked = 0;
+      original.dblClick.apply(this, arguments);
+    };
   }
 
@@ -194 +226 @@
     initialize: function () void null,
 
+    finalize: function () {
+      // 念のためフルスクリーンは解除しておく
+      if (this.has('fullscreen', 'rwt') && this.isValid && this.fullscreen)
+        this.fullscreen = false;
+    },
+
     is: function (state) (this.state == state),
 
@@ -223 +261 @@
     get statusText () this.timeCodes,
 
+    get storage ()
+      (content.document.__stella_storage || (content.document.__stella_storage = {})),
+
     get timeCodes () (toTimeCode(this.currentTime) + '/' + toTimeCode(this.totalTime)),
 
     get title () undefined,
+
+    get isValid () (~buffer.URL.indexOf('http://www.nicovideo.jp/watch/')),
 
     get volume () undefined,
@@ -318 +361 @@
       if (this.fullscreen) {
         liberator.log('full')
-        setWithBackup(this.player.style, {
+        storeStyle(this.player, {
           position: 'fixed',
           left: '0px',
@@ -327 +370 @@
       } else {
         liberator.log('normal')
-        restoreFromBackup(this.player.style);
+        restoreStyle(this.player);
       }
     },
@@ -359 +402 @@
     get totalTime () parseInt(this.player.getDuration()),
 
+    get isValid () buffer.URL.match(/^http:\/\/(?:[^.]+\.)?youtube\.com\/watch/),
+
     get volume () parseInt(this.player.getVolume()),
     set volume (value) (this.player.setVolume(value), value),
@@ -377 +422 @@
   }
 
+  // Normal / Fullscreen
+  NicoPlayer.Variables = [
+    ['videowindow._xscale',                     100,   null],
+    ['videowindow._yscale',                     100,   null],
+    ['videowindow._x',                            6,      0],
+    ['videowindow._y',                           65,      0],
+    ['controller._x',                             6,  -1000],
+    ['inputArea._x',                              4,  -1000],
+    ['controller._visible',                       1,      1],
+    ['inputArea._visible',                        1,      1],
+    ['waku._visible',                             1,      0],
+    ['tabmenu._visible',                          1,      0],
+    ['videowindow.video_mc.video.smoothing',   null,      1],
+    ['videowindow.video_mc.video.deblocking',  null,      5]
+  ];
+
   NicoPlayer.prototype = {
     __proto__: Player.prototype,
 
     functions: {
+      comment: 'rwt',
       currentTime: 'rw',
+      fetch: 'x',
+      fileURL: '',
+      fullscreen: 'rwt',
+      id: 'r',
+      muted: 'rwt',
+      pause: 'x',
+      play: 'x',
+      playEx: 'x',
+      playOrPause: 'x',
+      repeating: 'rwt',
+      title: 'r',
       totalTime: 'r',
-      volume: 'rw',
-      play: 'x',
-      playOrPause: 'x',
-      playEx: 'x',
-      pause: 'x',
-      muted: 'rwt',
-      repeating: 'rwt',
-      comment: 'rwt',
-      title: 'r',
-      fileURL: '',
-      id: 'r',
-      fetch: 'x',
-      title: 'r'
+      volume: 'rw'
     },
 
@@ -403 +464 @@
     set comment (value) (this.player.ext_setCommentVisible(value), value),
 
+    get playerContainer () getElementByIdEx('flvplayer_container'),
+
     get currentTime () parseInt(this.player.ext_getPlayheadTime()),
     set currentTime (value) (this.player.ext_setPlayheadTime(value), value),
 
     get fileExtension () '.flv',
+
+    get fullscreen () !!this.storage.fullscreen,
+    set fullscreen (value) {
+      let self = this;
+      value = !!value;
+
+      if (this.storage.fullscreen === value)
+        return;
+
+      this.storage.fullscreen = value;
+
+      let variablesSetter = function () {
+        NicoPlayer.Variables.forEach(function ([name, normal, full]) {
+          let v = value ? full : normal;
+          if (v !== null)
+            self.player.SetVariable(name, v);
+        });
+      };
+
+      let doc = content.document.wrappedJSObject;
+      let win = content.wrappedJSObject;
+      let player = getElementByIdEx('flvplayer');
+
+      win.toggleMaximizePlayer();
+
+      if(value)  {
+        let f = function () {
+          let viewer = {w: 544, h: 384};
+          let screen = {
+            w: content.innerWidth,
+            h: content.innerHeight
+          };
+          let scale = {
+            w: Math.max(1, screen.w / viewer.w),
+            h: Math.max(1, screen.h / viewer.h)
+          };
+          scale.v = Math.min(scale.w, scale.h);
+          storeStyle(doc.body, {
+            backgroundImage: 'url()',
+            backgroundRepeat: '',
+            backgroundColor: 'black'
+          });
+          player.SetVariable('videowindow.video_mc.video.smoothing' , 1);
+          player.SetVariable('videowindow.video_mc.video.deblocking', 5);
+          storeStyle(
+            player,
+            (scale.w >= scale.h) ? {
+              width:       Math.floor(viewer.w * scale.h) + 'px',
+              height:      screen.h + 'px',
+              marginLeft:  ((screen.w - viewer.w * scale.h) / 2) + 'px',
+              marginTop:   '0px'
+            } : {
+              width:       screen.w + 'px',
+              height:      Math.floor(viewer.h * scale.w) + 'px',
+              marginLeft:  '0px',
+              marginTop:   ((screen.h - viewer.h * scale.w) / 2) + 'px'
+            }
+          );
+          player.SetVariable('videowindow._xscale', 100 * scale.v);
+          player.SetVariable('videowindow._yscale', 100 * scale.v);
+          variablesSetter();
+        };
+        f();
+        win.onresize = function ()
+          (InVimperator && liberator.mode === modes.COMMAND_LINE) || setTimeout(f, 1000);
+      } else {
+        restoreStyle(doc.body);
+        //restoreStyle(player);
+        player.style.marginLeft = '';
+        player.style.marginTop  = '';
+        variablesSetter();
+        delete win.onresize;
+      }
+      win.scrollTo(0, 0);
+    },
 
     get id ()
@@ -415 +553 @@
     set muted (value) (this.player.ext_setMute(value), value),
 
-    get player ()
-      let (p = content.document.getElementById('flvplayer'))
-        (p && (p.wrappedJSObject || p)),
+    get player () getElementByIdEx('flvplayer'),
 
     get repeating () this.player.ext_isRepeat(),
@@ -444 +580 @@
 
     fetch: function (filepath) {
-      liberator.log(this.id)
       let onComplete = function (xhr) {
           let res = xhr.responseText;
@@ -483 +618 @@
     'comment',
     'repeat',
+    'fullscreen',
     {
       name: 'volume-root',
@@ -593 +729 @@
       this.disable();
       this.progressListener.uninstall();
+      for each (let player in this.players)
+        player.finalize();
       window.removeEventListener('resize', this.__onResize, false);
     },
@@ -599 +737 @@
     set hidden (v) (this.panel.hidden = v),
 
-    get valid () (this.where),
+    get isValid () (this.where),
 
     get player () this.players[this.where],
@@ -608 +746 @@
     set statusBarVisible (value) (this.statusBar.setAttribute('moz-collapsed', !value), value),
 
-    get where () (
-      (~buffer.URL.indexOf('http://www.nicovideo.jp/watch/') && 'niconico')
-      ||
-      (buffer.URL.match(/^http:\/\/(?:[^.]+\.)?youtube\.com\/watch/) && 'youtube')
-    ),
-
+    get where () {
+      for (let [name, player] in Iterator(this.players))
+        if (player.isValid)
+          return name;
+    },
 
     addUserCommands: function () {
@@ -624 +761 @@
             ? funcS
             : function (arg, bang) {
-                if (!stella.valid)
+                if (!stella.isValid)
                   raise('Stella: Current page is not supported');
                 let p = stella.player;
@@ -685 +822 @@
       icon.style.marginRight = '4px';
       setClickEvent('icon', icon);
+      icon.addEventListener('dblclick', bindr(this, this.onIconDblClick), false);
 
       let labels = this.labels = {};
@@ -760 +898 @@
     },
 
+    onFullscreenClick: function () this.player.toggle('fullscreen'),
+
     onIconClick: function () this.player.playOrPause(),
 
+    onIconDblClick: function () this.player.toggle('fullscreen'),
+
     onLocationChange: function () {
-      if (this.__valid !== this.valid) {
-        (this.__valid = this.valid) ? this.enable() : this.disable();
+      if (this.__valid !== this.isValid) {
+        (this.__valid = this.isValid) ? this.enable() : this.disable();
       }
     },
@@ -780 +922 @@
     },
 
-    onMutedClick: function (event) (this.player.toggle('muted')),
+    onMutedClick: function (event) this.player.toggle('muted'),
 
     onPauseClick: function () this.player.pause(),
@@ -786 +928 @@
     onPlayClick: function () this.player.play(),
 
-    onRepeatingClick: function () (this.player.toggle('repeating')),
+    onRepeatingClick: function () this.player.toggle('repeating'),
 
     onResize: function () {
@@ -795 +937 @@
     },
 
-    onSetMutedClick: function (event) (this.player.volume = event.target.getAttribute('volume'))
+    onSetVolumeClick: function (event) (this.player.volume = event.target.getAttribute('volume'))
   };
+
+  fixDoubleClick(Stella.prototype, 'onIconClick', 'onIconDblClick');
 
   // }}}
@@ -804 +948 @@
   *********************************************************************************/
 
-  let (nsl = liberator.plugins.nico_statusline) {
+  if (InVimperator) {
+    let estella = liberator.plugins.stella;
+
     let install = function () {
-      let stella = liberator.plugins.nico_statusline = new Stella();
+      let stella = liberator.plugins.stella = new Stella();
       stella.addUserCommands();
       liberator.log('Stella: installed.')
     }
-    if (nsl) {
-      nsl.finalize();
+
+    // すでにインストール済みの場合は、一度ファイナライズする
+    // (デバッグ時に前のパネルが残ってしまうため)
+    if (estella) {
+      estella.finalize();
       install();
     } else {
@@ -823 +972 @@
       );
     }
+  } else {
+    /* do something */
   }