mirror of
https://github.com/vincentbernat/i3wm-configuration.git
synced 2025-07-03 06:44:21 +02:00
xss-dimmer: be more precise with timer duration
This commit is contained in:
parent
0106eddaff
commit
cef1c1982b
1 changed files with 20 additions and 15 deletions
|
@ -15,6 +15,7 @@ from gi.repository import Gtk, Gdk, GLib, GdkPixbuf
|
||||||
import cairo
|
import cairo
|
||||||
import argparse
|
import argparse
|
||||||
import threading
|
import threading
|
||||||
|
import time
|
||||||
from Xlib import display, X
|
from Xlib import display, X
|
||||||
from Xlib.error import BadWindow
|
from Xlib.error import BadWindow
|
||||||
from Xlib.protocol.event import MapNotify
|
from Xlib.protocol.event import MapNotify
|
||||||
|
@ -40,7 +41,7 @@ def on_realize(widget):
|
||||||
window.set_override_redirect(True)
|
window.set_override_redirect(True)
|
||||||
|
|
||||||
|
|
||||||
def on_draw(widget, event, options, background, elapsed):
|
def on_draw(widget, event, options, background, start):
|
||||||
def _dim():
|
def _dim():
|
||||||
r = cairo.Region(cairo.RectangleInt(0, 0, *widget.get_size()))
|
r = cairo.Region(cairo.RectangleInt(0, 0, *widget.get_size()))
|
||||||
dctx = window.begin_draw_frame(r)
|
dctx = window.begin_draw_frame(r)
|
||||||
|
@ -52,7 +53,8 @@ def on_draw(widget, event, options, background, elapsed):
|
||||||
x, y = widget.get_position()
|
x, y = widget.get_position()
|
||||||
wwidth, wheight = widget.get_size()
|
wwidth, wheight = widget.get_size()
|
||||||
delta = options.end_opacity - options.start_opacity
|
delta = options.end_opacity - options.start_opacity
|
||||||
current = elapsed[0] / options.delay
|
elapsed = time.monotonic() - start
|
||||||
|
current = elapsed / options.delay
|
||||||
opacity = delta * current + options.start_opacity
|
opacity = delta * current + options.start_opacity
|
||||||
|
|
||||||
# Background
|
# Background
|
||||||
|
@ -62,39 +64,41 @@ def on_draw(widget, event, options, background, elapsed):
|
||||||
cctx.paint()
|
cctx.paint()
|
||||||
else:
|
else:
|
||||||
scale = widget.get_scale_factor()
|
scale = widget.get_scale_factor()
|
||||||
bg = background.new_subpixbuf(x, y, wwidth*scale, wheight*scale)
|
bg = background.new_subpixbuf(x, y, wwidth * scale, wheight * scale)
|
||||||
cctx.save()
|
cctx.save()
|
||||||
cctx.scale(1/scale, 1/scale)
|
cctx.scale(1 / scale, 1 / scale)
|
||||||
Gdk.cairo_set_source_pixbuf(cctx, bg, 0, 0)
|
Gdk.cairo_set_source_pixbuf(cctx, bg, 0, 0)
|
||||||
cctx.paint_with_alpha(opacity)
|
cctx.paint_with_alpha(opacity)
|
||||||
cctx.restore()
|
cctx.restore()
|
||||||
|
|
||||||
# Remaining time
|
# Remaining time
|
||||||
remaining = str(round(options.delay - elapsed[0]))
|
if elapsed >= options.delay:
|
||||||
cctx.set_source_rgba(1, 1, 1, opacity)
|
return
|
||||||
|
remaining = str(round(options.delay - elapsed))
|
||||||
cctx.select_font_face(
|
cctx.select_font_face(
|
||||||
options.font, cairo.FONT_SLANT_NORMAL, cairo.FONT_WEIGHT_BOLD
|
options.font, cairo.FONT_SLANT_NORMAL, cairo.FONT_WEIGHT_BOLD
|
||||||
)
|
)
|
||||||
cctx.set_font_size(wheight // 4)
|
cctx.set_font_size(wheight // 4)
|
||||||
_, _, twidth, theight, _, _ = cctx.text_extents(remaining)
|
_, _, twidth, theight, _, _ = cctx.text_extents(remaining)
|
||||||
cctx.move_to(wwidth // 2 - twidth // 2, wheight // 2 + theight // 2)
|
text_position = wwidth // 2 - twidth // 2, wheight // 2 + theight // 2
|
||||||
|
cctx.move_to(*text_position)
|
||||||
|
cctx.set_source_rgba(1, 1, 1, opacity)
|
||||||
cctx.show_text(remaining)
|
cctx.show_text(remaining)
|
||||||
|
cctx.move_to(*text_position)
|
||||||
cctx.set_source_rgba(0, 0, 0, opacity * 2)
|
cctx.set_source_rgba(0, 0, 0, opacity * 2)
|
||||||
cctx.move_to(wwidth // 2 - twidth // 2, wheight // 2 + theight // 2)
|
|
||||||
cctx.text_path(remaining)
|
|
||||||
cctx.set_line_width(4)
|
cctx.set_line_width(4)
|
||||||
|
cctx.text_path(remaining)
|
||||||
cctx.stroke()
|
cctx.stroke()
|
||||||
|
|
||||||
# Rearm timer
|
# Rearm timer
|
||||||
if not once:
|
if not once:
|
||||||
elapsed[0] += options.step
|
next_step = min(options.step, options.delay - elapsed)
|
||||||
if elapsed[0] <= options.delay:
|
on_draw.timer = GLib.timeout_add(next_step * 1000, _dim)
|
||||||
GLib.timeout_add(options.step * 1000, _dim)
|
|
||||||
|
|
||||||
window = widget.get_window()
|
window = widget.get_window()
|
||||||
if not elapsed:
|
dim(event)
|
||||||
|
if not hasattr(on_draw, "timer"):
|
||||||
# First time we are called.
|
# First time we are called.
|
||||||
elapsed.append(0)
|
|
||||||
dim(event)
|
dim(event)
|
||||||
else:
|
else:
|
||||||
# Timers already running, just repaint
|
# Timers already running, just repaint
|
||||||
|
@ -102,6 +106,7 @@ def on_draw(widget, event, options, background, elapsed):
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
now = time.monotonic()
|
||||||
parser = argparse.ArgumentParser()
|
parser = argparse.ArgumentParser()
|
||||||
add = parser.add_argument
|
add = parser.add_argument
|
||||||
add("--start-opacity", type=float, default=0, help="initial opacity")
|
add("--start-opacity", type=float, default=0, help="initial opacity")
|
||||||
|
@ -134,7 +139,7 @@ if __name__ == "__main__":
|
||||||
window.set_default_size(geom.width, geom.height)
|
window.set_default_size(geom.width, geom.height)
|
||||||
window.move(geom.x, geom.y)
|
window.move(geom.x, geom.y)
|
||||||
|
|
||||||
window.connect("draw", on_draw, options, background, [])
|
window.connect("draw", on_draw, options, background, now)
|
||||||
window.connect("delete-event", Gtk.main_quit)
|
window.connect("delete-event", Gtk.main_quit)
|
||||||
window.connect("realize", on_realize)
|
window.connect("realize", on_realize)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue