Merge pull request #713 from SherLock707/development

Improved Dropdown terminal

2 files changed, 284 insertions, 1 deletions

diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf
index 871f2ffb..ce501d85 100644
--- a/config/hypr/UserConfigs/UserKeybinds.conf
+++ b/config/hypr/UserConfigs/UserKeybinds.conf
@@ -39,7 +39,7 @@ bind = $mainMod SHIFT, F, fullscreen # whole full screen
 bind = $mainMod CTRL, F, fullscreen, 1 # fake full screen
 bind = $mainMod, SPACE, togglefloating, #Float Mode
 bind = $mainMod ALT, SPACE, exec, hyprctl dispatch workspaceopt allfloat #All Float Mode
-bind = $mainMod SHIFT, Return, exec, [float; move 15% 5%; size 70% 60%] $term # Dropdown terminal
+bind = $mainMod SHIFT, Return, exec, $scriptsDir/Dropterminal.sh $term # Dropdown terminal
 
 # Desktop zooming or magnifier
 bind = $mainMod ALT, mouse_down, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor * 2.0}')"
diff --git a/config/hypr/scripts/Dropterminal.sh b/config/hypr/scripts/Dropterminal.sh
new file mode 100755
index 00000000..51cdf31f
--- /dev/null
+++ b/config/hypr/scripts/Dropterminal.sh
@@ -0,0 +1,283 @@
+#!/bin/bash
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Dropdown Terminal 
+# Usage: ./Dropdown.sh [-d] <terminal_command>
+# Example: ./Dropdown.sh foot
+#          ./Dropdown.sh -d foot (with debug output)
+#          ./Dropdown.sh "kitty -e zsh"
+#          ./Dropdown.sh "alacritty --working-directory /home/user"
+
+DEBUG=false
+SPECIAL_WS="special:scratchpad"
+ADDR_FILE="/tmp/dropdown_terminal_addr"
+
+# Animation settings
+ANIMATION_DURATION=100  # milliseconds
+SLIDE_STEPS=10
+SLIDE_DELAY=5  # milliseconds between steps
+
+# Parse arguments
+if [ "$1" = "-d" ]; then
+    DEBUG=true
+    shift
+fi
+
+TERMINAL_CMD="$1"
+
+# Debug echo function
+debug_echo() {
+    if [ "$DEBUG" = true ]; then
+        echo "$@"
+    fi
+}
+
+# Validate input
+if [ -z "$TERMINAL_CMD" ]; then
+    echo "Missing terminal command. Usage: $0 [-d] <terminal_command>"
+    echo "Examples:"
+    echo "  $0 foot"
+    echo "  $0 -d foot (with debug output)"
+    echo "  $0 'kitty -e zsh'"
+    echo "  $0 'alacritty --working-directory /home/user'"
+    exit 1
+fi
+
+# Function to get window geometry
+get_window_geometry() {
+    local addr="$1"
+    hyprctl clients -j | jq -r --arg ADDR "$addr" '.[] | select(.address == $ADDR) | "\(.at[0]) \(.at[1]) \(.size[0]) \(.size[1])"'
+}
+
+# Function to animate window slide down (show)
+animate_slide_down() {
+    local addr="$1"
+    local target_x="$2"
+    local target_y="$3"
+    local width="$4"
+    local height="$5"
+    
+    debug_echo "Animating slide down for window $addr to position $target_x,$target_y"
+    
+    # Start position (above screen)
+    local start_y=$((target_y - height - 50))
+    
+    # Calculate step size
+    local step_y=$(((target_y - start_y) / SLIDE_STEPS))
+    
+    # Move window to start position instantly (off-screen)
+    hyprctl dispatch movewindowpixel "exact $target_x $start_y,address:$addr" >/dev/null 2>&1
+    sleep 0.05
+    
+    # Animate slide down
+    for i in $(seq 1 $SLIDE_STEPS); do
+        local current_y=$((start_y + (step_y * i)))
+        hyprctl dispatch movewindowpixel "exact $target_x $current_y,address:$addr" >/dev/null 2>&1
+        sleep 0.03
+    done
+    
+    # Ensure final position is exact
+    hyprctl dispatch movewindowpixel "exact $target_x $target_y,address:$addr" >/dev/null 2>&1
+}
+
+# Function to animate window slide up (hide)
+animate_slide_up() {
+    local addr="$1"
+    local start_x="$2"
+    local start_y="$3"
+    local width="$4"
+    local height="$5"
+    
+    debug_echo "Animating slide up for window $addr from position $start_x,$start_y"
+    
+    # End position (above screen)
+    local end_y=$((start_y - height - 50))
+    
+    # Calculate step size
+    local step_y=$(((start_y - end_y) / SLIDE_STEPS))
+    
+    # Animate slide up
+    for i in $(seq 1 $SLIDE_STEPS); do
+        local current_y=$((start_y - (step_y * i)))
+        hyprctl dispatch movewindowpixel "exact $start_x $current_y,address:$addr" >/dev/null 2>&1
+        sleep 0.03
+    done
+    
+    debug_echo "Slide up animation completed"
+}
+
+# Function to get monitor info for centering
+get_monitor_info() {
+    hyprctl monitors -j | jq -r '.[0] | "\(.x) \(.y) \(.width) \(.height)"'
+}
+
+# Function to calculate dropdown position
+calculate_dropdown_position() {
+    local monitor_info=$(get_monitor_info)
+    local mon_x=$(echo $monitor_info | cut -d' ' -f1)
+    local mon_y=$(echo $monitor_info | cut -d' ' -f2)
+    local mon_width=$(echo $monitor_info | cut -d' ' -f3)
+    local mon_height=$(echo $monitor_info | cut -d' ' -f4)
+    
+    # Calculate 50% width, 50% height, centered horizontally, 5% from top
+    local width=$((mon_width / 2))
+    local height=$((mon_height / 2))
+    local x=$((mon_x + (mon_width - width) / 2))
+    local y=$((mon_y + mon_height / 20))  # 5% from top
+    
+    echo "$x $y $width $height"
+}
+
+# Get the current workspace
+CURRENT_WS=$(hyprctl activeworkspace -j | jq -r '.id')
+
+# Function to get stored terminal address
+get_terminal_address() {
+    if [ -f "$ADDR_FILE" ] && [ -s "$ADDR_FILE" ]; then
+        cat "$ADDR_FILE"
+    fi
+}
+
+# Function to check if terminal exists
+terminal_exists() {
+    local addr=$(get_terminal_address)
+    if [ -n "$addr" ]; then
+        hyprctl clients -j | jq -e --arg ADDR "$addr" 'any(.[]; .address == $ADDR)' >/dev/null 2>&1
+    else
+        return 1
+    fi
+}
+
+# Function to check if terminal is in special workspace
+terminal_in_special() {
+    local addr=$(get_terminal_address)
+    if [ -n "$addr" ]; then
+        hyprctl clients -j | jq -e --arg ADDR "$addr" 'any(.[]; .address == $ADDR and .workspace.name == "special:scratchpad")' >/dev/null 2>&1
+    else
+        return 1
+    fi
+}
+
+# Function to spawn terminal and capture its address
+spawn_terminal() {
+    debug_echo "Creating new dropdown terminal with command: $TERMINAL_CMD"
+    
+    # Calculate dropdown position for later use
+    pos_info=$(calculate_dropdown_position)
+    target_x=$(echo $pos_info | cut -d' ' -f1)
+    target_y=$(echo $pos_info | cut -d' ' -f2)
+    width=$(echo $pos_info | cut -d' ' -f3)
+    height=$(echo $pos_info | cut -d' ' -f4)
+    
+    debug_echo "Target position: ${target_x}x${target_y}, size: ${width}x${height}"
+    
+    # Get window count before spawning
+    windows_before=$(hyprctl clients -j)
+    count_before=$(echo "$windows_before" | jq 'length')
+    
+    # Launch terminal directly in special workspace to avoid visible spawn
+    hyprctl dispatch exec "[float; size $width $height; workspace special:scratchpad silent] $TERMINAL_CMD"
+    
+    # Wait for window to appear
+    sleep 0.1
+    
+    # Get windows after spawning
+    windows_after=$(hyprctl clients -j)
+    count_after=$(echo "$windows_after" | jq 'length')
+    
+    new_addr=""
+    
+    if [ "$count_after" -gt "$count_before" ]; then
+        # Find the new window by comparing before/after lists
+        new_addr=$(comm -13 \
+            <(echo "$windows_before" | jq -r '.[].address' | sort) \
+            <(echo "$windows_after" | jq -r '.[].address' | sort) \
+            | head -1)
+    fi
+    
+    # Fallback: try to find by the most recently mapped window
+    if [ -z "$new_addr" ] || [ "$new_addr" = "null" ]; then
+        new_addr=$(hyprctl clients -j | jq -r 'sort_by(.focusHistoryID) | .[-1] | .address')
+    fi
+    
+    if [ -n "$new_addr" ] && [ "$new_addr" != "null" ]; then
+        # Store the address
+        echo "$new_addr" > "$ADDR_FILE"
+        debug_echo "Terminal created with address: $new_addr in special workspace"
+        
+        # Small delay to ensure it's properly in special workspace
+        sleep 0.2
+        
+        # Now bring it back with the same animation as subsequent shows
+        hyprctl dispatch movetoworkspace "$CURRENT_WS,address:$new_addr"
+        hyprctl dispatch pin "address:$new_addr"
+        animate_slide_down "$new_addr" "$target_x" "$target_y" "$width" "$height"
+        
+        return 0
+    fi
+    
+    debug_echo "Failed to get terminal address"
+    return 1
+}
+
+# Main logic
+if terminal_exists; then
+    TERMINAL_ADDR=$(get_terminal_address)
+    debug_echo "Found existing terminal: $TERMINAL_ADDR"
+
+    if terminal_in_special; then
+        debug_echo "Bringing terminal from scratchpad with slide down animation"
+        
+        # Calculate target position
+        pos_info=$(calculate_dropdown_position)
+        target_x=$(echo $pos_info | cut -d' ' -f1)
+        target_y=$(echo $pos_info | cut -d' ' -f2)
+        width=$(echo $pos_info | cut -d' ' -f3)
+        height=$(echo $pos_info | cut -d' ' -f4)
+        
+        # Move to current workspace and pin
+        hyprctl dispatch movetoworkspace "$CURRENT_WS,address:$TERMINAL_ADDR"
+        hyprctl dispatch pin "address:$TERMINAL_ADDR"
+        
+        # Set size and animate slide down
+        hyprctl dispatch resizewindowpixel "exact $width $height,address:$TERMINAL_ADDR"
+        animate_slide_down "$TERMINAL_ADDR" "$target_x" "$target_y" "$width" "$height"
+        
+        hyprctl dispatch focuswindow "address:$TERMINAL_ADDR"
+    else
+        debug_echo "Hiding terminal to scratchpad with slide up animation"
+        
+        # Get current geometry for animation
+        geometry=$(get_window_geometry "$TERMINAL_ADDR")
+        if [ -n "$geometry" ]; then
+            curr_x=$(echo $geometry | cut -d' ' -f1)
+            curr_y=$(echo $geometry | cut -d' ' -f2)
+            curr_width=$(echo $geometry | cut -d' ' -f3)
+            curr_height=$(echo $geometry | cut -d' ' -f4)
+            
+            debug_echo "Current geometry: ${curr_x},${curr_y} ${curr_width}x${curr_height}"
+            
+            # Animate slide up first
+            animate_slide_up "$TERMINAL_ADDR" "$curr_x" "$curr_y" "$curr_width" "$curr_height"
+            
+            # Small delay then move to special workspace and unpin
+            sleep 0.1
+            hyprctl dispatch pin "address:$TERMINAL_ADDR"  # Unpin (toggle)
+            hyprctl dispatch movetoworkspacesilent "$SPECIAL_WS,address:$TERMINAL_ADDR"
+        else
+            debug_echo "Could not get window geometry, moving to scratchpad without animation"
+            hyprctl dispatch pin "address:$TERMINAL_ADDR"
+            hyprctl dispatch movetoworkspacesilent "$SPECIAL_WS,address:$TERMINAL_ADDR"
+        fi
+    fi
+else
+    debug_echo "No existing terminal found, creating new one"
+    if spawn_terminal; then
+        TERMINAL_ADDR=$(get_terminal_address)
+        if [ -n "$TERMINAL_ADDR" ]; then
+            hyprctl dispatch focuswindow "address:$TERMINAL_ADDR"
+        fi
+    else
+        echo "Failed to create terminal"
+        exit 1
+    fi
+fi
\ No newline at end of file