Skip to content

Commit

Permalink
fix(OSK): Fix OSK in overlay and full session
Browse files Browse the repository at this point in the history
- Change default mapping to use a dbus event  for OSK always.
- Fix overlay mode input manager chord for OSK when triggered by a dbus
  event.
- Removed keyboard button from quick bar in overlay mode.
- Fix crashes when an app is detected that isn't a part of a library.
- Finish updating make deploy so it works again.
  • Loading branch information
pastaq committed Dec 17, 2024
1 parent d1a6a98 commit bd78605
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 11 deletions.
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@ assets/crypto/keys/opengamepadui.pub: assets/crypto/keys/opengamepadui.key
.PHONY: deploy
deploy: dist-archive ## Build and deploy to a remote device
scp dist/opengamepadui.tar.gz $(SSH_USER)@$(SSH_HOST):$(SSH_DATA_PATH)
cd $(SSH_MOUNT_PATH) #&& tar xvfz opengamepadui.tar.gz
ssh -t $(SSH_USER)@$(SSH_HOST) tar xvfz "$(SSH_DATA_PATH)/opengamepadui.tar.gz"


Expand Down
9 changes: 1 addition & 8 deletions assets/gamepad/profiles/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,7 @@
},
"target_events": [
{
"gamepad": {
"button": "Guide"
}
},
{
"gamepad": {
"button": "North"
}
"dbus": "ui_osk"
}
]
},
Expand Down
3 changes: 3 additions & 0 deletions core/global/boxart_manager.gd
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ func get_boxart(item: LibraryItem, kind: BoxArtProvider.LAYOUT) -> Texture2D:


func _get_boxart_sync(item: LibraryItem, kind: BoxArtProvider.LAYOUT) -> Texture2D:
if not item:
return null

if _providers.is_empty():
logger.error("No box art providers were found!")
return null
Expand Down
2 changes: 2 additions & 0 deletions core/global/launch_manager.gd
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,8 @@ func _get_name_from_steam_library() -> String:
var library_data := _parse_data_from_steam_file(steam_library_path + "/steamapps/libraryfolders.vdf")
for library in library_data:
logger.debug("Library: " + library + " : " + str(library_data[library]))
if not "apps" in library_data[library]:
continue
if library_data[library]["apps"].has(str(missing_app_id)):
var app_path : String = library_data[library]["path"] +"/steamapps/appmanifest_" + str(missing_app_id) + ".acf"
logger.debug("Found app ID in a steam library:" + app_path)
Expand Down
2 changes: 2 additions & 0 deletions core/global/settings_manager.gd
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ func get_value(section: String, key: String, default: Variant = null) -> Variant


func get_library_value(item: LibraryItem, key: String, default: Variant = null) -> Variant:
if not item:
return null
var section := ".".join(["game", item.name.to_lower()])
return get_value(section, key, default)

Expand Down
2 changes: 1 addition & 1 deletion core/systems/input/overlay_mode_input_manager.gd
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ func _send_steam_chord(event: InputEvent) -> bool:
# Steam On-Screen Keyboard
elif event.is_action_pressed("ogui_osk_ov"):
logger.debug("Trigger Steam OSK")
chord.append("Gamepad:Button:East")
chord.append("Gamepad:Button:North")

# Steam Video-Capture
elif event.is_action_pressed("ogui_vc_ov"):
Expand Down
3 changes: 3 additions & 0 deletions core/ui/card_ui/navigation/running_game_card.gd
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ func set_running_app(app: RunningApp):
return
running_app = app
var item := library_manager.get_app_by_name(app.launch_item.name)
if not item:
logger.warn("App", app.app_id, "has no library item.")
return
game_logo.visible = false
game_label.visible = false
var logo := await boxart_manager.get_boxart(item, BoxArtProvider.LAYOUT.LOGO) as Texture2D
Expand Down
2 changes: 1 addition & 1 deletion core/ui/card_ui_overlay_mode/card_ui_overlay_mode.gd
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ func _setup_overlay_mode(args: PackedStringArray) -> void:
_start_underlay_process(args, log_path)

# Remove unneeded/conflicting elements from default menues
var remove_list: PackedStringArray = ["PerformanceCard", "NotifyButton", "HelpButton", "VolumeSlider", "BrightnessSlider", "PerGameToggle"]
var remove_list: PackedStringArray = ["PerformanceCard", "KeyboardButton", "NotifyButton", "HelpButton", "VolumeSlider", "BrightnessSlider", "PerGameToggle"]
_remove_children(remove_list, quick_bar_menu)
var settings_remove_list: PackedStringArray = ["LibraryButton", "NetworkButton", "BluetoothButton", "AudioButton"]
_remove_children(settings_remove_list, settings_menu)
Expand Down

0 comments on commit bd78605

Please sign in to comment.