mue/xkcdlock
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add tooltip overlay

Browse Source
This commit is contained in:
Björn Busse 2016-12-23 15:30:27 +01:00
parent 549752100f
commit 32638099f8
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
xkcdlock
View File

@ -22,10 +22,10 @@
# Thanks to Michael Stapelberg for an awesome window manager - i3 # Thanks to Michael Stapelberg for an awesome window manager - i3
# #
# TODO: # TODO:
# - make sure we do not exceed screen boundaries in x and y # - Make sure we do not exceed screen boundaries in x and y
# - add tooltip overlay and xkcd number # - Prevent text overflow wrt tooltip
# - add support for other screen lockers # - Add support for other screen lockers
# - parallelize downloads # - Parallelize downloads
[[ "$TRACE" ]] && set -x [[ "$TRACE" ]] && set -x
set -eo pipefail set -eo pipefail
@ -176,6 +176,11 @@ xkcd_get_hotlink_url() {
echo $url_hotlink echo $url_hotlink
} }
xkcd_get_img_tooltip() {
local url="https://xkcd.com/$1"
echo $(curl -sL $url | grep -A 1 '<div id=\"comic\">' | awk -F "\"" '/src=/ {print $4}')
}
get_nscreens() { get_nscreens() {
local nscreens=$(xrandr -q | awk '/ connected/ {count++} END {print count}') local nscreens=$(xrandr -q | awk '/ connected/ {count++} END {print count}')
echo "$nscreens" echo "$nscreens"
@ -208,8 +213,8 @@ get_random_image() {
image_add_text() { image_add_text() {
local tmp_file=$(mktemp) local tmp_file=$(mktemp)
log "Adding number ${img_nr} to $tmp_file_c and saving image to $tmp_file" log "Adding \""${2}"\" to ${1} and saving image to ${tmp_file}"
$(convert $1 -font xkcd-Regular -gravity Northeast -pointsize 50 -fill green -annotate +50+50 $img_nr $tmp_file) $(convert "${1}" -font "${5}" -gravity "${3}" -pointsize "${7}" -fill "${4}" $8 -annotate "${6}" "${2}" "${tmp_file}")
if ! [[ -e "$tmp_file" ]]; then if ! [[ -e "$tmp_file" ]]; then
error "Could not find image with text overlay" error "Could not find image with text overlay"
@ -237,7 +242,7 @@ center_image() {
local tmp_file=$(mktemp) local tmp_file=$(mktemp)
log "Centering $tmp_file and saving image to $tmp_file" log "Centering $tmp_file and saving image to $tmp_file"
convert $tmp_file_r -gravity center -background $BG_COLOUR -extent $res $tmp_file $(convert $tmp_file_r -gravity center -background $BG_COLOUR -extent $res $tmp_file)
if ! [[ -e "$tmp_file" ]]; then if ! [[ -e "$tmp_file" ]]; then
error "Could not find centered image" error "Could not find centered image"
@ -251,12 +256,14 @@ prepare_image() {
local res=$(screen_get_highest_resolution) local res=$(screen_get_highest_resolution)
local img_name=$(xkcd_get_img_name_from_file $img_fn) local img_name=$(xkcd_get_img_name_from_file $img_fn)
local img_nr=$(xkcd_get_img_nr $img_name) local img_nr=$(xkcd_get_img_nr $img_name)
local img_tooltip=$(xkcd_get_img_tooltip $img_nr)
local tmp_file_r=$(resize_image $img_fn $res) local tmp_file_r=$(resize_image $img_fn $res)
local tmp_file_c=$(center_image $tmp_file_r $res) local tmp_file_c=$(center_image $tmp_file_r $res)
local tmp_file_t=$(image_add_text $tmp_file_c $img_nr) local tmp_file_t1=$(image_add_text "${tmp_file_c}" "${img_nr}" "Northeast" "green" "xkcd-Regular" "+50+50" "50")
local tmp_file_t2=$(image_add_text "${tmp_file_t1}" "${img_tooltip}" "Southwest" "red" "xkcd-Regular" "+0+0" "30" " -undercolor '#00000080' ")
echo "$tmp_file_t" echo "$tmp_file_t2"
} }
screen_lock() { screen_lock() {