mirror of
https://github.com/Trensa-Organization/hy3.git
synced 2025-03-15 18:53:40 +01:00
Merge branch 'master' into tabs
This commit is contained in:
commit
7061981a1e
2 changed files with 9 additions and 9 deletions
|
@ -9,7 +9,7 @@
|
||||||
hyprlandSystems = fn: nixpkgs.lib.genAttrs (builtins.attrNames hyprland.packages) (system: fn system nixpkgs.legacyPackages.${system});
|
hyprlandSystems = fn: nixpkgs.lib.genAttrs (builtins.attrNames hyprland.packages) (system: fn system nixpkgs.legacyPackages.${system});
|
||||||
in {
|
in {
|
||||||
packages = hyprlandSystems (system: pkgs: rec {
|
packages = hyprlandSystems (system: pkgs: rec {
|
||||||
hy3 = pkgs.gcc12Stdenv.mkDerivation {
|
hy3 = pkgs.stdenv.mkDerivation {
|
||||||
pname = "hy3";
|
pname = "hy3";
|
||||||
version = "0.1";
|
version = "0.1";
|
||||||
src = ./.;
|
src = ./.;
|
||||||
|
@ -38,7 +38,7 @@
|
||||||
});
|
});
|
||||||
|
|
||||||
devShells = hyprlandSystems (system: pkgs: {
|
devShells = hyprlandSystems (system: pkgs: {
|
||||||
default = pkgs.mkShell.override { stdenv = pkgs.gcc12Stdenv; } {
|
default = pkgs.mkShell {
|
||||||
name = "hy3";
|
name = "hy3";
|
||||||
|
|
||||||
nativeBuildInputs = with pkgs; [
|
nativeBuildInputs = with pkgs; [
|
||||||
|
|
14
src/main.cpp
14
src/main.cpp
|
@ -29,7 +29,7 @@ int workspace_for_action() {
|
||||||
|
|
||||||
int workspace_id = g_pCompositor->m_pLastMonitor->activeWorkspace;
|
int workspace_id = g_pCompositor->m_pLastMonitor->activeWorkspace;
|
||||||
|
|
||||||
if (workspace_id < 0) return -1;
|
if (workspace_id == -1) return -1;
|
||||||
auto* workspace = g_pCompositor->getWorkspaceByID(workspace_id);
|
auto* workspace = g_pCompositor->getWorkspaceByID(workspace_id);
|
||||||
if (workspace == nullptr) return -1;
|
if (workspace == nullptr) return -1;
|
||||||
if (workspace->m_bHasFullscreenWindow) return -1;
|
if (workspace->m_bHasFullscreenWindow) return -1;
|
||||||
|
@ -39,7 +39,7 @@ int workspace_for_action() {
|
||||||
|
|
||||||
void dispatch_makegroup(std::string arg) {
|
void dispatch_makegroup(std::string arg) {
|
||||||
int workspace = workspace_for_action();
|
int workspace = workspace_for_action();
|
||||||
if (workspace < 0) return;
|
if (workspace == -1) return;
|
||||||
|
|
||||||
if (arg == "h") {
|
if (arg == "h") {
|
||||||
g_Hy3Layout->makeGroupOnWorkspace(workspace, Hy3GroupLayout::SplitH);
|
g_Hy3Layout->makeGroupOnWorkspace(workspace, Hy3GroupLayout::SplitH);
|
||||||
|
@ -62,7 +62,7 @@ std::optional<ShiftDirection> parseShiftArg(std::string arg) {
|
||||||
|
|
||||||
void dispatch_movewindow(std::string value) {
|
void dispatch_movewindow(std::string value) {
|
||||||
int workspace = workspace_for_action();
|
int workspace = workspace_for_action();
|
||||||
if (workspace < 0) return;
|
if (workspace == -1) return;
|
||||||
|
|
||||||
auto args = CVarList(value);
|
auto args = CVarList(value);
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ void dispatch_movewindow(std::string value) {
|
||||||
|
|
||||||
void dispatch_movefocus(std::string arg) {
|
void dispatch_movefocus(std::string arg) {
|
||||||
int workspace = workspace_for_action();
|
int workspace = workspace_for_action();
|
||||||
if (workspace < 0) return;
|
if (workspace == -1) return;
|
||||||
|
|
||||||
if (auto shift = parseShiftArg(arg)) {
|
if (auto shift = parseShiftArg(arg)) {
|
||||||
g_Hy3Layout->shiftFocus(workspace, shift.value());
|
g_Hy3Layout->shiftFocus(workspace, shift.value());
|
||||||
|
@ -83,17 +83,17 @@ void dispatch_movefocus(std::string arg) {
|
||||||
|
|
||||||
void dispatch_raisefocus(std::string arg) {
|
void dispatch_raisefocus(std::string arg) {
|
||||||
int workspace = workspace_for_action();
|
int workspace = workspace_for_action();
|
||||||
if (workspace < 0) return;
|
if (workspace == -1) return;
|
||||||
|
|
||||||
g_Hy3Layout->raiseFocus(workspace);
|
g_Hy3Layout->raiseFocus(workspace);
|
||||||
}
|
}
|
||||||
|
|
||||||
void dispatch_debug(std::string arg) {
|
void dispatch_debug(std::string arg) {
|
||||||
int workspace = workspace_for_action();
|
int workspace = workspace_for_action();
|
||||||
if (workspace < 0) return;
|
if (workspace == -1) return;
|
||||||
|
|
||||||
auto* root = g_Hy3Layout->getWorkspaceRootGroup(workspace);
|
auto* root = g_Hy3Layout->getWorkspaceRootGroup(workspace);
|
||||||
if (workspace < 0) {
|
if (workspace == -1) {
|
||||||
Debug::log(LOG, "DEBUG NODES: no nodes on workspace");
|
Debug::log(LOG, "DEBUG NODES: no nodes on workspace");
|
||||||
} else {
|
} else {
|
||||||
Debug::log(LOG, "DEBUG NODES\n%s", root->debugNode().c_str());
|
Debug::log(LOG, "DEBUG NODES\n%s", root->debugNode().c_str());
|
||||||
|
|
Loading…
Add table
Reference in a new issue