mirror of
https://github.com/Rafostar/clapper.git
synced 2025-08-30 16:02:00 +02:00
Major code cleanup
This commit is contained in:
Rafostar
@@ -1,17 +1,12 @@
|
||||
const { Gdk, Gio, GLib, GObject, Gtk, GstPlayer } = imports.gi;
|
||||
const Debug = imports.clapper_src.debug;
|
||||
const { Gio, GObject, Gtk } = imports.gi;
|
||||
const { HeaderBar } = imports.clapper_src.headerbar;
|
||||
const { Interface } = imports.clapper_src.interface;
|
||||
const { Player } = imports.clapper_src.player;
|
||||
const { Widget } = imports.clapper_src.widget;
|
||||
const Menu = imports.clapper_src.menu;
|
||||
const { Window } = imports.clapper_src.window;
|
||||
|
||||
const APP_NAME = pkg.name.substring(
|
||||
const APP_NAME = 'Clapper' || pkg.name.substring(
|
||||
pkg.name.lastIndexOf('.') + 1
|
||||
);
|
||||
|
||||
let { debug } = Debug;
|
||||
|
||||
var App = GObject.registerClass(
|
||||
class ClapperApp extends Gtk.Application
|
||||
{
|
||||
@@ -25,41 +20,24 @@ class ClapperApp extends Gtk.Application
|
||||
playlist: [],
|
||||
};
|
||||
Object.assign(this, defaults, opts);
|
||||
|
||||
this.cssProvider = new Gtk.CssProvider();
|
||||
this.cssProvider.load_from_path(
|
||||
`${pkg.datadir}/${pkg.name}/css/styles.css`
|
||||
);
|
||||
|
||||
this.window = null;
|
||||
this.interface = null;
|
||||
this.player = null;
|
||||
this.dragAllowed = false;
|
||||
|
||||
this.posX = 0;
|
||||
this.posY = 0;
|
||||
}
|
||||
|
||||
vfunc_startup()
|
||||
{
|
||||
super.vfunc_startup();
|
||||
this.window = new Window(this, APP_NAME);
|
||||
|
||||
this.windowRealizeSignal = this.window.connect(
|
||||
'realize', this._onWindowRealize.bind(this)
|
||||
);
|
||||
this.window.connect(
|
||||
'fullscreen-changed', this._onWindowFullscreenChanged.bind(this)
|
||||
);
|
||||
this.window.connect(
|
||||
'close-request', this._onWindowCloseRequest.bind(this)
|
||||
);
|
||||
let window = new Gtk.ApplicationWindow({
|
||||
application: this,
|
||||
title: APP_NAME,
|
||||
});
|
||||
|
||||
for(let action of Menu.actions) {
|
||||
let simpleAction = new Gio.SimpleAction({
|
||||
name: action.name
|
||||
});
|
||||
simpleAction.connect('activate', () => action(this.active_window, APP_NAME));
|
||||
simpleAction.connect('activate', () =>
|
||||
action(this.active_window, APP_NAME)
|
||||
);
|
||||
this.add_action(simpleAction);
|
||||
}
|
||||
let uiBuilder = Gtk.Builder.new_from_file(
|
||||
@@ -68,17 +46,11 @@ class ClapperApp extends Gtk.Application
|
||||
let models = {
|
||||
settingsMenu: uiBuilder.get_object('settingsMenu')
|
||||
};
|
||||
let headerBar = new HeaderBar(this.window, models);
|
||||
let headerBar = new HeaderBar(window, models);
|
||||
window.set_titlebar(headerBar);
|
||||
|
||||
this.interface = new Interface();
|
||||
this.interface.addHeaderBar(headerBar, APP_NAME);
|
||||
|
||||
this.interface.controls.unfullscreenButton.connect(
|
||||
'clicked', () => this.active_window.unfullscreen()
|
||||
);
|
||||
|
||||
this.window.set_titlebar(this.interface.headerBar);
|
||||
this.window.set_child(this.interface);
|
||||
let clapperWidget = new Widget();
|
||||
window.set_child(clapperWidget);
|
||||
}
|
||||
|
||||
vfunc_activate()
|
||||
@@ -89,310 +61,21 @@ class ClapperApp extends Gtk.Application
|
||||
'show', this._onWindowShow.bind(this)
|
||||
);
|
||||
this.active_window.present();
|
||||
|
||||
Gtk.StyleContext.add_provider_for_display(
|
||||
Gdk.Display.get_default(),
|
||||
this.cssProvider,
|
||||
Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
|
||||
);
|
||||
}
|
||||
|
||||
run(arr)
|
||||
{
|
||||
arr = arr || [];
|
||||
super.run(arr);
|
||||
}
|
||||
|
||||
setHideCursorTimeout()
|
||||
{
|
||||
this.clearTimeout('hideCursor');
|
||||
this.hideCursorTimeout = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 1, () => {
|
||||
this.hideCursorTimeout = null;
|
||||
|
||||
if(this.player.motionController.is_pointer)
|
||||
this.player.widget.set_cursor(this.blankCursor);
|
||||
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
}
|
||||
|
||||
setHideControlsTimeout()
|
||||
{
|
||||
this.clearTimeout('hideControls');
|
||||
this.hideControlsTimeout = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 3, () => {
|
||||
this.hideControlsTimeout = null;
|
||||
|
||||
if(this.window.isFullscreen && this.player.motionController.is_pointer) {
|
||||
this.clearTimeout('updateTime');
|
||||
this.interface.revealControls(false);
|
||||
}
|
||||
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
}
|
||||
|
||||
setUpdateTimeInterval()
|
||||
{
|
||||
this.clearTimeout('updateTime');
|
||||
let nextUpdate = this.interface.updateTime();
|
||||
this.updateTimeTimeout = GLib.timeout_add(GLib.PRIORITY_DEFAULT, nextUpdate, () => {
|
||||
this.updateTimeTimeout = null;
|
||||
|
||||
if(this.window.isFullscreen)
|
||||
this.setUpdateTimeInterval();
|
||||
|
||||
return GLib.SOURCE_REMOVE;
|
||||
});
|
||||
}
|
||||
|
||||
clearTimeout(name)
|
||||
{
|
||||
if(!this[`${name}Timeout`])
|
||||
return;
|
||||
|
||||
GLib.source_remove(this[`${name}Timeout`]);
|
||||
this[`${name}Timeout`] = null;
|
||||
|
||||
if(name === 'updateTime')
|
||||
debug('cleared update time interval');
|
||||
}
|
||||
|
||||
_onWindowRealize()
|
||||
{
|
||||
this.window.disconnect(this.windowRealizeSignal);
|
||||
|
||||
this.player = new Player();
|
||||
|
||||
if(!this.player.widget)
|
||||
return this.quit();
|
||||
|
||||
this.player.widget.width_request = 960;
|
||||
this.player.widget.height_request = 540;
|
||||
|
||||
this.interface.addPlayer(this.player);
|
||||
this.player.connect('state-changed', this._onPlayerStateChanged.bind(this));
|
||||
|
||||
this.player.clickGesture.connect(
|
||||
'pressed', this._onPlayerPressed.bind(this)
|
||||
);
|
||||
this.player.keyController.connect(
|
||||
'key-pressed', this._onPlayerKeyPressed.bind(this)
|
||||
);
|
||||
this.player.motionController.connect(
|
||||
'enter', this._onPlayerEnter.bind(this)
|
||||
);
|
||||
this.player.motionController.connect(
|
||||
'leave', this._onPlayerLeave.bind(this)
|
||||
);
|
||||
this.player.motionController.connect(
|
||||
'motion', this._onPlayerMotion.bind(this)
|
||||
);
|
||||
this.player.dragGesture.connect(
|
||||
'drag-update', this._onPlayerDragUpdate.bind(this)
|
||||
);
|
||||
|
||||
/* Widget signals that are disconnected after first run */
|
||||
this._playerRealizeSignal = this.player.widget.connect(
|
||||
'realize', this._onPlayerRealize.bind(this)
|
||||
);
|
||||
}
|
||||
|
||||
_onWindowFullscreenChanged(window, isFullscreen)
|
||||
{
|
||||
if(isFullscreen) {
|
||||
this.setUpdateTimeInterval();
|
||||
this.setHideControlsTimeout();
|
||||
}
|
||||
else {
|
||||
this.clearTimeout('updateTime');
|
||||
}
|
||||
|
||||
this.interface.setFullscreenMode(isFullscreen);
|
||||
}
|
||||
|
||||
_onPlayerKeyPressed(self, keyval, keycode, state)
|
||||
{
|
||||
let bool = false;
|
||||
|
||||
switch(keyval) {
|
||||
case Gdk.KEY_space:
|
||||
case Gdk.KEY_Return:
|
||||
this.player.toggle_play();
|
||||
break;
|
||||
case Gdk.KEY_Right:
|
||||
bool = true;
|
||||
case Gdk.KEY_Left:
|
||||
// disabled due to missing "seek on drop" support
|
||||
//this.interface.controls.handleScaleIncrement('position', bool);
|
||||
break;
|
||||
case Gdk.KEY_Up:
|
||||
bool = true;
|
||||
case Gdk.KEY_Down:
|
||||
this.interface.controls.handleScaleIncrement('volume', bool);
|
||||
break;
|
||||
case Gdk.KEY_F11:
|
||||
this.window.toggleFullscreen();
|
||||
break;
|
||||
case Gdk.KEY_Escape:
|
||||
if(this.window.isFullscreen)
|
||||
this.window.unfullscreen();
|
||||
break;
|
||||
case Gdk.KEY_q:
|
||||
case Gdk.KEY_Q:
|
||||
this._onWindowCloseRequest();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
_onPlayerRealize()
|
||||
{
|
||||
this.player.widget.disconnect(this._playerRealizeSignal);
|
||||
this.player.renderer.expose();
|
||||
|
||||
this.defaultCursor = Gdk.Cursor.new_from_name('default', null);
|
||||
this.blankCursor = Gdk.Cursor.new_from_name('none', null);
|
||||
|
||||
this.setHideCursorTimeout();
|
||||
super.run(arr || []);
|
||||
}
|
||||
|
||||
_onWindowShow(window)
|
||||
{
|
||||
this.window.disconnect(this.windowShowSignal);
|
||||
window.disconnect(this.windowShowSignal);
|
||||
this.windowShowSignal = null;
|
||||
|
||||
if(this.playlist.length)
|
||||
this.player.set_playlist(this.playlist);
|
||||
}
|
||||
|
||||
_onPlayerStateChanged(self, state)
|
||||
{
|
||||
if(state === GstPlayer.PlayerState.BUFFERING)
|
||||
return;
|
||||
|
||||
let isInhibited = false;
|
||||
let flags = Gtk.ApplicationInhibitFlags.SUSPEND
|
||||
| Gtk.ApplicationInhibitFlags.IDLE;
|
||||
|
||||
if(state === GstPlayer.PlayerState.PLAYING) {
|
||||
if(this.inhibitCookie)
|
||||
return;
|
||||
|
||||
this.inhibitCookie = this.inhibit(
|
||||
this.window,
|
||||
flags,
|
||||
'video is playing'
|
||||
);
|
||||
if(!this.inhibitCookie)
|
||||
debug(new Error('could not inhibit session!'));
|
||||
|
||||
isInhibited = (this.inhibitCookie > 0);
|
||||
}
|
||||
else {
|
||||
//if(!this.inhibitCookie)
|
||||
return;
|
||||
|
||||
/* Uninhibit seems to be broken as of GTK 3.99.2
|
||||
this.uninhibit(this.inhibitCookie);
|
||||
this.inhibitCookie = null;
|
||||
*/
|
||||
}
|
||||
|
||||
debug(`set prevent suspend to: ${isInhibited}`);
|
||||
}
|
||||
|
||||
_onPlayerPressed(gesture, nPress, x, y)
|
||||
{
|
||||
let button = gesture.get_current_button();
|
||||
let isDouble = (nPress % 2 == 0);
|
||||
this.dragAllowed = !isDouble;
|
||||
|
||||
switch(button) {
|
||||
case Gdk.BUTTON_PRIMARY:
|
||||
if(isDouble)
|
||||
this.window.toggleFullscreen();
|
||||
break;
|
||||
case Gdk.BUTTON_SECONDARY:
|
||||
this.player.toggle_play();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
_onPlayerEnter(controller, x, y)
|
||||
{
|
||||
this.setHideCursorTimeout();
|
||||
if(this.window.isFullscreen)
|
||||
this.setHideControlsTimeout();
|
||||
}
|
||||
|
||||
_onPlayerLeave(controller)
|
||||
{
|
||||
this.clearTimeout('hideCursor');
|
||||
this.clearTimeout('hideControls');
|
||||
}
|
||||
|
||||
_onPlayerMotion(controller, posX, posY)
|
||||
{
|
||||
/* GTK4 sometimes generates motions with same coords */
|
||||
if(this.posX === posX && this.posY === posY)
|
||||
return;
|
||||
|
||||
/* Do not show cursor on small movements */
|
||||
if(
|
||||
Math.abs(this.posX - posX) >= 0.5
|
||||
|| Math.abs(this.posY - posY) >= 0.5
|
||||
) {
|
||||
this.player.widget.set_cursor(this.defaultCursor);
|
||||
this.setHideCursorTimeout();
|
||||
|
||||
if(this.window.isFullscreen) {
|
||||
if(!this.interface.revealerTop.get_reveal_child()) {
|
||||
this.setUpdateTimeInterval();
|
||||
this.interface.revealControls(true);
|
||||
}
|
||||
this.setHideControlsTimeout();
|
||||
}
|
||||
else if(this.hideControlsTimeout) {
|
||||
this.clearTimeout('hideControls');
|
||||
}
|
||||
}
|
||||
|
||||
this.posX = posX;
|
||||
this.posY = posY;
|
||||
}
|
||||
|
||||
_onPlayerDragUpdate(gesture, offsetX, offsetY)
|
||||
{
|
||||
if(!this.dragAllowed || this.active_window.isFullscreen)
|
||||
return;
|
||||
|
||||
let { gtk_double_click_distance } = this.player.widget.get_settings();
|
||||
|
||||
if (
|
||||
Math.abs(offsetX) > gtk_double_click_distance
|
||||
|| Math.abs(offsetY) > gtk_double_click_distance
|
||||
) {
|
||||
let [isActive, startX, startY] = gesture.get_start_point();
|
||||
if(!isActive) return;
|
||||
|
||||
this.active_window.get_surface().begin_move(
|
||||
gesture.get_device(),
|
||||
gesture.get_current_button(),
|
||||
startX,
|
||||
startY,
|
||||
gesture.get_current_event_time()
|
||||
);
|
||||
|
||||
gesture.reset();
|
||||
}
|
||||
}
|
||||
|
||||
_onWindowCloseRequest()
|
||||
{
|
||||
this.interface.emit('destroy');
|
||||
this.quit();
|
||||
if(this.playlist.length) {
|
||||
let { player } = window.get_child();
|
||||
player.set_playlist(this.playlist);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user