Compare commits
1 Commits
v0.2.2
..
0ddac224fb
| Author | SHA1 | Date | |
|---|---|---|---|
| 0ddac224fb |
@@ -1,99 +0,0 @@
|
|||||||
name: Build and Test
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
pull_request:
|
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: archlinux
|
|
||||||
container:
|
|
||||||
image: node:25
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Install pnpm and TypeScript
|
|
||||||
run: npm install -g pnpm typescript@5.8.3
|
|
||||||
|
|
||||||
- name: Install just
|
|
||||||
run: |
|
|
||||||
curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to /usr/local/bin
|
|
||||||
|
|
||||||
- name: Install system dependencies
|
|
||||||
run: |
|
|
||||||
apt-get update
|
|
||||||
apt-get install -y libglib2.0-dev glib-networking zip
|
|
||||||
|
|
||||||
- name: Install project dependencies
|
|
||||||
run: pnpm install
|
|
||||||
|
|
||||||
- name: Run unit tests
|
|
||||||
run: just test
|
|
||||||
|
|
||||||
- name: Build and package extension
|
|
||||||
run: just build-package
|
|
||||||
|
|
||||||
- name: Upload extension package
|
|
||||||
uses: actions/upload-artifact@v3
|
|
||||||
with:
|
|
||||||
name: aerospike-extension
|
|
||||||
path: aerospike.zip
|
|
||||||
retention-days: 30
|
|
||||||
|
|
||||||
release:
|
|
||||||
needs: build
|
|
||||||
runs-on: archlinux
|
|
||||||
if: github.ref == 'refs/heads/main' && github.event_name == 'push'
|
|
||||||
environment:
|
|
||||||
name: production
|
|
||||||
container:
|
|
||||||
image: node:25
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v6
|
|
||||||
|
|
||||||
- name: Download artifact
|
|
||||||
uses: actions/download-artifact@v3
|
|
||||||
with:
|
|
||||||
name: aerospike-extension
|
|
||||||
|
|
||||||
- name: Get version from package.json
|
|
||||||
id: get_version
|
|
||||||
run: |
|
|
||||||
VERSION=$(node -p "require('./package.json').version")
|
|
||||||
echo "version=v${VERSION}" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Create Gitea Release
|
|
||||||
env:
|
|
||||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
|
||||||
run: |
|
|
||||||
curl -X POST \
|
|
||||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d '{
|
|
||||||
"tag_name": "${{ steps.get_version.outputs.version }}",
|
|
||||||
"name": "Release ${{ steps.get_version.outputs.version }}",
|
|
||||||
"body": "Automated release of aerospike GNOME extension ${{ steps.get_version.outputs.version }}\n\n## Installation\nDownload aerospike.zip and install it as a GNOME extension."
|
|
||||||
}' \
|
|
||||||
"${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases"
|
|
||||||
|
|
||||||
- name: Upload Release Asset
|
|
||||||
env:
|
|
||||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
|
||||||
run: |
|
|
||||||
RELEASE_ID=$(curl -H "Authorization: token ${GITEA_TOKEN}" \
|
|
||||||
"${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases/tags/${{ steps.get_version.outputs.version }}" | \
|
|
||||||
grep -Po '"id":\s*\K[0-9]+' | head -1)
|
|
||||||
|
|
||||||
curl -X POST \
|
|
||||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
|
||||||
-H "Content-Type: multipart/form-data" \
|
|
||||||
-F "attachment=@aerospike.zip" \
|
|
||||||
"${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets?name=aerospike.zip"
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
.idea
|
|
||||||
node_modules
|
|
||||||
dist
|
|
||||||
/schemas/gschemas.compiled
|
|
||||||
/aerospike.zip
|
|
||||||
/debug.log
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
25
|
|
||||||
-674
@@ -1,674 +0,0 @@
|
|||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 29 June 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The GNU General Public License is a free, copyleft license for
|
|
||||||
software and other kinds of works.
|
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
|
||||||
to take away your freedom to share and change the works. By contrast,
|
|
||||||
the GNU General Public License is intended to guarantee your freedom to
|
|
||||||
share and change all versions of a program--to make sure it remains free
|
|
||||||
software for all its users. We, the Free Software Foundation, use the
|
|
||||||
GNU General Public License for most of our software; it applies also to
|
|
||||||
any other work released this way by its authors. You can apply it to
|
|
||||||
your programs, too.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
them if you wish), that you receive source code or can get it if you
|
|
||||||
want it, that you can change the software or use pieces of it in new
|
|
||||||
free programs, and that you know you can do these things.
|
|
||||||
|
|
||||||
To protect your rights, we need to prevent others from denying you
|
|
||||||
these rights or asking you to surrender the rights. Therefore, you have
|
|
||||||
certain responsibilities if you distribute copies of the software, or if
|
|
||||||
you modify it: responsibilities to respect the freedom of others.
|
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
|
||||||
gratis or for a fee, you must pass on to the recipients the same
|
|
||||||
freedoms that you received. You must make sure that they, too, receive
|
|
||||||
or can get the source code. And you must show them these terms so they
|
|
||||||
know their rights.
|
|
||||||
|
|
||||||
Developers that use the GNU GPL protect your rights with two steps:
|
|
||||||
(1) assert copyright on the software, and (2) offer you this License
|
|
||||||
giving you legal permission to copy, distribute and/or modify it.
|
|
||||||
|
|
||||||
For the developers' and authors' protection, the GPL clearly explains
|
|
||||||
that there is no warranty for this free software. For both users' and
|
|
||||||
authors' sake, the GPL requires that modified versions be marked as
|
|
||||||
changed, so that their problems will not be attributed erroneously to
|
|
||||||
authors of previous versions.
|
|
||||||
|
|
||||||
Some devices are designed to deny users access to install or run
|
|
||||||
modified versions of the software inside them, although the manufacturer
|
|
||||||
can do so. This is fundamentally incompatible with the aim of
|
|
||||||
protecting users' freedom to change the software. The systematic
|
|
||||||
pattern of such abuse occurs in the area of products for individuals to
|
|
||||||
use, which is precisely where it is most unacceptable. Therefore, we
|
|
||||||
have designed this version of the GPL to prohibit the practice for those
|
|
||||||
products. If such problems arise substantially in other domains, we
|
|
||||||
stand ready to extend this provision to those domains in future versions
|
|
||||||
of the GPL, as needed to protect the freedom of users.
|
|
||||||
|
|
||||||
Finally, every program is threatened constantly by software patents.
|
|
||||||
States should not allow patents to restrict development and use of
|
|
||||||
software on general-purpose computers, but in those that do, we wish to
|
|
||||||
avoid the special danger that patents applied to a free program could
|
|
||||||
make it effectively proprietary. To prevent this, the GPL assures that
|
|
||||||
patents cannot be used to render the program non-free.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
0. Definitions.
|
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU General Public License.
|
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
|
||||||
works, such as semiconductor masks.
|
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
|
||||||
"recipients" may be individuals or organizations.
|
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
|
||||||
in a fashion requiring copyright permission, other than the making of an
|
|
||||||
exact copy. The resulting work is called a "modified version" of the
|
|
||||||
earlier work or a work "based on" the earlier work.
|
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
|
||||||
on the Program.
|
|
||||||
|
|
||||||
To "propagate" a work means to do anything with it that, without
|
|
||||||
permission, would make you directly or secondarily liable for
|
|
||||||
infringement under applicable copyright law, except executing it on a
|
|
||||||
computer or modifying a private copy. Propagation includes copying,
|
|
||||||
distribution (with or without modification), making available to the
|
|
||||||
public, and in some countries other activities as well.
|
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
|
||||||
parties to make or receive copies. Mere interaction with a user through
|
|
||||||
a computer network, with no transfer of a copy, is not conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices"
|
|
||||||
to the extent that it includes a convenient and prominently visible
|
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
|
||||||
tells the user that there is no warranty for the work (except to the
|
|
||||||
extent that warranties are provided), that licensees may convey the
|
|
||||||
work under this License, and how to view a copy of this License. If
|
|
||||||
the interface presents a list of user commands or options, such as a
|
|
||||||
menu, a prominent item in the list meets this criterion.
|
|
||||||
|
|
||||||
1. Source Code.
|
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work
|
|
||||||
for making modifications to it. "Object code" means any non-source
|
|
||||||
form of a work.
|
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
|
||||||
standard defined by a recognized standards body, or, in the case of
|
|
||||||
interfaces specified for a particular programming language, one that
|
|
||||||
is widely used among developers working in that language.
|
|
||||||
|
|
||||||
The "System Libraries" of an executable work include anything, other
|
|
||||||
than the work as a whole, that (a) is included in the normal form of
|
|
||||||
packaging a Major Component, but which is not part of that Major
|
|
||||||
Component, and (b) serves only to enable use of the work with that
|
|
||||||
Major Component, or to implement a Standard Interface for which an
|
|
||||||
implementation is available to the public in source code form. A
|
|
||||||
"Major Component", in this context, means a major essential component
|
|
||||||
(kernel, window system, and so on) of the specific operating system
|
|
||||||
(if any) on which the executable work runs, or a compiler used to
|
|
||||||
produce the work, or an object code interpreter used to run it.
|
|
||||||
|
|
||||||
The "Corresponding Source" for a work in object code form means all
|
|
||||||
the source code needed to generate, install, and (for an executable
|
|
||||||
work) run the object code and to modify the work, including scripts to
|
|
||||||
control those activities. However, it does not include the work's
|
|
||||||
System Libraries, or general-purpose tools or generally available free
|
|
||||||
programs which are used unmodified in performing those activities but
|
|
||||||
which are not part of the work. For example, Corresponding Source
|
|
||||||
includes interface definition files associated with source files for
|
|
||||||
the work, and the source code for shared libraries and dynamically
|
|
||||||
linked subprograms that the work is specifically designed to require,
|
|
||||||
such as by intimate data communication or control flow between those
|
|
||||||
subprograms and other parts of the work.
|
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users
|
|
||||||
can regenerate automatically from other parts of the Corresponding
|
|
||||||
Source.
|
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that
|
|
||||||
same work.
|
|
||||||
|
|
||||||
2. Basic Permissions.
|
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
|
||||||
conditions are met. This License explicitly affirms your unlimited
|
|
||||||
permission to run the unmodified Program. The output from running a
|
|
||||||
covered work is covered by this License only if the output, given its
|
|
||||||
content, constitutes a covered work. This License acknowledges your
|
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not
|
|
||||||
convey, without conditions so long as your license otherwise remains
|
|
||||||
in force. You may convey covered works to others for the sole purpose
|
|
||||||
of having them make modifications exclusively for you, or provide you
|
|
||||||
with facilities for running those works, provided that you comply with
|
|
||||||
the terms of this License in conveying all material for which you do
|
|
||||||
not control copyright. Those thus making or running the covered works
|
|
||||||
for you must do so exclusively on your behalf, under your direction
|
|
||||||
and control, on terms that prohibit them from making any copies of
|
|
||||||
your copyrighted material outside their relationship with you.
|
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under
|
|
||||||
the conditions stated below. Sublicensing is not allowed; section 10
|
|
||||||
makes it unnecessary.
|
|
||||||
|
|
||||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
|
||||||
measure under any applicable law fulfilling obligations under article
|
|
||||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
|
||||||
similar laws prohibiting or restricting circumvention of such
|
|
||||||
measures.
|
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
|
||||||
circumvention of technological measures to the extent such circumvention
|
|
||||||
is effected by exercising rights under this License with respect to
|
|
||||||
the covered work, and you disclaim any intention to limit operation or
|
|
||||||
modification of the work as a means of enforcing, against the work's
|
|
||||||
users, your or third parties' legal rights to forbid circumvention of
|
|
||||||
technological measures.
|
|
||||||
|
|
||||||
4. Conveying Verbatim Copies.
|
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
|
||||||
receive it, in any medium, provided that you conspicuously and
|
|
||||||
appropriately publish on each copy an appropriate copyright notice;
|
|
||||||
keep intact all notices stating that this License and any
|
|
||||||
non-permissive terms added in accord with section 7 apply to the code;
|
|
||||||
keep intact all notices of the absence of any warranty; and give all
|
|
||||||
recipients a copy of this License along with the Program.
|
|
||||||
|
|
||||||
You may charge any price or no price for each copy that you convey,
|
|
||||||
and you may offer support or warranty protection for a fee.
|
|
||||||
|
|
||||||
5. Conveying Modified Source Versions.
|
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
|
||||||
produce it from the Program, in the form of source code under the
|
|
||||||
terms of section 4, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) The work must carry prominent notices stating that you modified
|
|
||||||
it, and giving a relevant date.
|
|
||||||
|
|
||||||
b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under section
|
|
||||||
7. This requirement modifies the requirement in section 4 to
|
|
||||||
"keep intact all notices".
|
|
||||||
|
|
||||||
c) You must license the entire work, as a whole, under this
|
|
||||||
License to anyone who comes into possession of a copy. This
|
|
||||||
License will therefore apply, along with any applicable section 7
|
|
||||||
additional terms, to the whole of the work, and all its parts,
|
|
||||||
regardless of how they are packaged. This License gives no
|
|
||||||
permission to license the work in any other way, but it does not
|
|
||||||
invalidate such permission if you have separately received it.
|
|
||||||
|
|
||||||
d) If the work has interactive user interfaces, each must display
|
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
|
||||||
work need not make them do so.
|
|
||||||
|
|
||||||
A compilation of a covered work with other separate and independent
|
|
||||||
works, which are not by their nature extensions of the covered work,
|
|
||||||
and which are not combined with it such as to form a larger program,
|
|
||||||
in or on a volume of a storage or distribution medium, is called an
|
|
||||||
"aggregate" if the compilation and its resulting copyright are not
|
|
||||||
used to limit the access or legal rights of the compilation's users
|
|
||||||
beyond what the individual works permit. Inclusion of a covered work
|
|
||||||
in an aggregate does not cause this License to apply to the other
|
|
||||||
parts of the aggregate.
|
|
||||||
|
|
||||||
6. Conveying Non-Source Forms.
|
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms
|
|
||||||
of sections 4 and 5, provided that you also convey the
|
|
||||||
machine-readable Corresponding Source under the terms of this License,
|
|
||||||
in one of these ways:
|
|
||||||
|
|
||||||
a) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by the
|
|
||||||
Corresponding Source fixed on a durable physical medium
|
|
||||||
customarily used for software interchange.
|
|
||||||
|
|
||||||
b) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by a
|
|
||||||
written offer, valid for at least three years and valid for as
|
|
||||||
long as you offer spare parts or customer support for that product
|
|
||||||
model, to give anyone who possesses the object code either (1) a
|
|
||||||
copy of the Corresponding Source for all the software in the
|
|
||||||
product that is covered by this License, on a durable physical
|
|
||||||
medium customarily used for software interchange, for a price no
|
|
||||||
more than your reasonable cost of physically performing this
|
|
||||||
conveying of source, or (2) access to copy the
|
|
||||||
Corresponding Source from a network server at no charge.
|
|
||||||
|
|
||||||
c) Convey individual copies of the object code with a copy of the
|
|
||||||
written offer to provide the Corresponding Source. This
|
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
|
||||||
only if you received the object code with such an offer, in accord
|
|
||||||
with subsection 6b.
|
|
||||||
|
|
||||||
d) Convey the object code by offering access from a designated
|
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
|
||||||
Corresponding Source in the same way through the same place at no
|
|
||||||
further charge. You need not require recipients to copy the
|
|
||||||
Corresponding Source along with the object code. If the place to
|
|
||||||
copy the object code is a network server, the Corresponding Source
|
|
||||||
may be on a different server (operated by you or a third party)
|
|
||||||
that supports equivalent copying facilities, provided you maintain
|
|
||||||
clear directions next to the object code saying where to find the
|
|
||||||
Corresponding Source. Regardless of what server hosts the
|
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
|
||||||
available for as long as needed to satisfy these requirements.
|
|
||||||
|
|
||||||
e) Convey the object code using peer-to-peer transmission, provided
|
|
||||||
you inform other peers where the object code and Corresponding
|
|
||||||
Source of the work are being offered to the general public at no
|
|
||||||
charge under subsection 6d.
|
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
|
||||||
from the Corresponding Source as a System Library, need not be
|
|
||||||
included in conveying the object code work.
|
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
|
||||||
tangible personal property which is normally used for personal, family,
|
|
||||||
or household purposes, or (2) anything designed or sold for incorporation
|
|
||||||
into a dwelling. In determining whether a product is a consumer product,
|
|
||||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
|
||||||
product received by a particular user, "normally used" refers to a
|
|
||||||
typical or common use of that class of product, regardless of the status
|
|
||||||
of the particular user or of the way in which the particular user
|
|
||||||
actually uses, or expects or is expected to use, the product. A product
|
|
||||||
is a consumer product regardless of whether the product has substantial
|
|
||||||
commercial, industrial or non-consumer uses, unless such uses represent
|
|
||||||
the only significant mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
|
||||||
procedures, authorization keys, or other information required to install
|
|
||||||
and execute modified versions of a covered work in that User Product from
|
|
||||||
a modified version of its Corresponding Source. The information must
|
|
||||||
suffice to ensure that the continued functioning of the modified object
|
|
||||||
code is in no case prevented or interfered with solely because
|
|
||||||
modification has been made.
|
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
|
||||||
part of a transaction in which the right of possession and use of the
|
|
||||||
User Product is transferred to the recipient in perpetuity or for a
|
|
||||||
fixed term (regardless of how the transaction is characterized), the
|
|
||||||
Corresponding Source conveyed under this section must be accompanied
|
|
||||||
by the Installation Information. But this requirement does not apply
|
|
||||||
if neither you nor any third party retains the ability to install
|
|
||||||
modified object code on the User Product (for example, the work has
|
|
||||||
been installed in ROM).
|
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
|
||||||
requirement to continue to provide support service, warranty, or updates
|
|
||||||
for a work that has been modified or installed by the recipient, or for
|
|
||||||
the User Product in which it has been modified or installed. Access to a
|
|
||||||
network may be denied when the modification itself materially and
|
|
||||||
adversely affects the operation of the network or violates the rules and
|
|
||||||
protocols for communication across the network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
|
||||||
in accord with this section must be in a format that is publicly
|
|
||||||
documented (and with an implementation available to the public in
|
|
||||||
source code form), and must require no special password or key for
|
|
||||||
unpacking, reading or copying.
|
|
||||||
|
|
||||||
7. Additional Terms.
|
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
|
||||||
License by making exceptions from one or more of its conditions.
|
|
||||||
Additional permissions that are applicable to the entire Program shall
|
|
||||||
be treated as though they were included in this License, to the extent
|
|
||||||
that they are valid under applicable law. If additional permissions
|
|
||||||
apply only to part of the Program, that part may be used separately
|
|
||||||
under those permissions, but the entire Program remains governed by
|
|
||||||
this License without regard to the additional permissions.
|
|
||||||
|
|
||||||
When you convey a copy of a covered work, you may at your option
|
|
||||||
remove any additional permissions from that copy, or from any part of
|
|
||||||
it. (Additional permissions may be written to require their own
|
|
||||||
removal in certain cases when you modify the work.) You may place
|
|
||||||
additional permissions on material, added by you to a covered work,
|
|
||||||
for which you have or can give appropriate copyright permission.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
|
||||||
add to a covered work, you may (if authorized by the copyright holders of
|
|
||||||
that material) supplement the terms of this License with terms:
|
|
||||||
|
|
||||||
a) Disclaiming warranty or limiting liability differently from the
|
|
||||||
terms of sections 15 and 16 of this License; or
|
|
||||||
|
|
||||||
b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
author attributions in that material or in the Appropriate Legal
|
|
||||||
Notices displayed by works containing it; or
|
|
||||||
|
|
||||||
c) Prohibiting misrepresentation of the origin of that material, or
|
|
||||||
requiring that modified versions of such material be marked in
|
|
||||||
reasonable ways as different from the original version; or
|
|
||||||
|
|
||||||
d) Limiting the use for publicity purposes of names of licensors or
|
|
||||||
authors of the material; or
|
|
||||||
|
|
||||||
e) Declining to grant rights under trademark law for use of some
|
|
||||||
trade names, trademarks, or service marks; or
|
|
||||||
|
|
||||||
f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions of
|
|
||||||
it) with contractual assumptions of liability to the recipient, for
|
|
||||||
any liability that these contractual assumptions directly impose on
|
|
||||||
those licensors and authors.
|
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
|
||||||
received it, or any part of it, contains a notice stating that it is
|
|
||||||
governed by this License along with a term that is a further
|
|
||||||
restriction, you may remove that term. If a license document contains
|
|
||||||
a further restriction but permits relicensing or conveying under this
|
|
||||||
License, you may add to a covered work material governed by the terms
|
|
||||||
of that license document, provided that the further restriction does
|
|
||||||
not survive such relicensing or conveying.
|
|
||||||
|
|
||||||
If you add terms to a covered work in accord with this section, you
|
|
||||||
must place, in the relevant source files, a statement of the
|
|
||||||
additional terms that apply to those files, or a notice indicating
|
|
||||||
where to find the applicable terms.
|
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
|
||||||
form of a separately written license, or stated as exceptions;
|
|
||||||
the above requirements apply either way.
|
|
||||||
|
|
||||||
8. Termination.
|
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
|
||||||
modify it is void, and will automatically terminate your rights under
|
|
||||||
this License (including any patent licenses granted under the third
|
|
||||||
paragraph of section 11).
|
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your
|
|
||||||
license from a particular copyright holder is reinstated (a)
|
|
||||||
provisionally, unless and until the copyright holder explicitly and
|
|
||||||
finally terminates your license, and (b) permanently, if the copyright
|
|
||||||
holder fails to notify you of the violation by some reasonable means
|
|
||||||
prior to 60 days after the cessation.
|
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
|
||||||
violation by some reasonable means, this is the first time you have
|
|
||||||
received notice of violation of this License (for any work) from that
|
|
||||||
copyright holder, and you cure the violation prior to 30 days after
|
|
||||||
your receipt of the notice.
|
|
||||||
|
|
||||||
Termination of your rights under this section does not terminate the
|
|
||||||
licenses of parties who have received copies or rights from you under
|
|
||||||
this License. If your rights have been terminated and not permanently
|
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
|
||||||
material under section 10.
|
|
||||||
|
|
||||||
9. Acceptance Not Required for Having Copies.
|
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or
|
|
||||||
run a copy of the Program. Ancillary propagation of a covered work
|
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
|
||||||
to receive a copy likewise does not require acceptance. However,
|
|
||||||
nothing other than this License grants you permission to propagate or
|
|
||||||
modify any covered work. These actions infringe copyright if you do
|
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
|
||||||
|
|
||||||
10. Automatic Licensing of Downstream Recipients.
|
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
|
||||||
receives a license from the original licensors, to run, modify and
|
|
||||||
propagate that work, subject to this License. You are not responsible
|
|
||||||
for enforcing compliance by third parties with this License.
|
|
||||||
|
|
||||||
An "entity transaction" is a transaction transferring control of an
|
|
||||||
organization, or substantially all assets of one, or subdividing an
|
|
||||||
organization, or merging organizations. If propagation of a covered
|
|
||||||
work results from an entity transaction, each party to that
|
|
||||||
transaction who receives a copy of the work also receives whatever
|
|
||||||
licenses to the work the party's predecessor in interest had or could
|
|
||||||
give under the previous paragraph, plus a right to possession of the
|
|
||||||
Corresponding Source of the work from the predecessor in interest, if
|
|
||||||
the predecessor has it or can get it with reasonable efforts.
|
|
||||||
|
|
||||||
You may not impose any further restrictions on the exercise of the
|
|
||||||
rights granted or affirmed under this License. For example, you may
|
|
||||||
not impose a license fee, royalty, or other charge for exercise of
|
|
||||||
rights granted under this License, and you may not initiate litigation
|
|
||||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
|
||||||
sale, or importing the Program or any portion of it.
|
|
||||||
|
|
||||||
11. Patents.
|
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
|
||||||
License of the Program or a work on which the Program is based. The
|
|
||||||
work thus licensed is called the contributor's "contributor version".
|
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims
|
|
||||||
owned or controlled by the contributor, whether already acquired or
|
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
|
||||||
by this License, of making, using, or selling its contributor version,
|
|
||||||
but do not include claims that would be infringed only as a
|
|
||||||
consequence of further modification of the contributor version. For
|
|
||||||
purposes of this definition, "control" includes the right to grant
|
|
||||||
patent sublicenses in a manner consistent with the requirements of
|
|
||||||
this License.
|
|
||||||
|
|
||||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
|
||||||
patent license under the contributor's essential patent claims, to
|
|
||||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
|
||||||
propagate the contents of its contributor version.
|
|
||||||
|
|
||||||
In the following three paragraphs, a "patent license" is any express
|
|
||||||
agreement or commitment, however denominated, not to enforce a patent
|
|
||||||
(such as an express permission to practice a patent or covenant not to
|
|
||||||
sue for patent infringement). To "grant" such a patent license to a
|
|
||||||
party means to make such an agreement or commitment not to enforce a
|
|
||||||
patent against the party.
|
|
||||||
|
|
||||||
If you convey a covered work, knowingly relying on a patent license,
|
|
||||||
and the Corresponding Source of the work is not available for anyone
|
|
||||||
to copy, free of charge and under the terms of this License, through a
|
|
||||||
publicly available network server or other readily accessible means,
|
|
||||||
then you must either (1) cause the Corresponding Source to be so
|
|
||||||
available, or (2) arrange to deprive yourself of the benefit of the
|
|
||||||
patent license for this particular work, or (3) arrange, in a manner
|
|
||||||
consistent with the requirements of this License, to extend the patent
|
|
||||||
license to downstream recipients. "Knowingly relying" means you have
|
|
||||||
actual knowledge that, but for the patent license, your conveying the
|
|
||||||
covered work in a country, or your recipient's use of the covered work
|
|
||||||
in a country, would infringe one or more identifiable patents in that
|
|
||||||
country that you have reason to believe are valid.
|
|
||||||
|
|
||||||
If, pursuant to or in connection with a single transaction or
|
|
||||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
|
||||||
covered work, and grant a patent license to some of the parties
|
|
||||||
receiving the covered work authorizing them to use, propagate, modify
|
|
||||||
or convey a specific copy of the covered work, then the patent license
|
|
||||||
you grant is automatically extended to all recipients of the covered
|
|
||||||
work and works based on it.
|
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within
|
|
||||||
the scope of its coverage, prohibits the exercise of, or is
|
|
||||||
conditioned on the non-exercise of one or more of the rights that are
|
|
||||||
specifically granted under this License. You may not convey a covered
|
|
||||||
work if you are a party to an arrangement with a third party that is
|
|
||||||
in the business of distributing software, under which you make payment
|
|
||||||
to the third party based on the extent of your activity of conveying
|
|
||||||
the work, and under which the third party grants, to any of the
|
|
||||||
parties who would receive the covered work from you, a discriminatory
|
|
||||||
patent license (a) in connection with copies of the covered work
|
|
||||||
conveyed by you (or copies made from those copies), or (b) primarily
|
|
||||||
for and in connection with specific products or compilations that
|
|
||||||
contain the covered work, unless you entered into that arrangement,
|
|
||||||
or that patent license was granted, prior to 28 March 2007.
|
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
|
||||||
any implied license or other defenses to infringement that may
|
|
||||||
otherwise be available to you under applicable patent law.
|
|
||||||
|
|
||||||
12. No Surrender of Others' Freedom.
|
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
|
||||||
covered work so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you may
|
|
||||||
not convey it at all. For example, if you agree to terms that obligate you
|
|
||||||
to collect a royalty for further conveying from those to whom you convey
|
|
||||||
the Program, the only way you could satisfy both those terms and this
|
|
||||||
License would be to refrain entirely from conveying the Program.
|
|
||||||
|
|
||||||
13. Use with the GNU Affero General Public License.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, you have
|
|
||||||
permission to link or combine any covered work with a work licensed
|
|
||||||
under version 3 of the GNU Affero General Public License into a single
|
|
||||||
combined work, and to convey the resulting work. The terms of this
|
|
||||||
License will continue to apply to the part which is the covered work,
|
|
||||||
but the special requirements of the GNU Affero General Public License,
|
|
||||||
section 13, concerning interaction through a network will apply to the
|
|
||||||
combination as such.
|
|
||||||
|
|
||||||
14. Revised Versions of this License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions of
|
|
||||||
the GNU General Public License from time to time. Such new versions will
|
|
||||||
be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the
|
|
||||||
Program specifies that a certain numbered version of the GNU General
|
|
||||||
Public License "or any later version" applies to it, you have the
|
|
||||||
option of following the terms and conditions either of that numbered
|
|
||||||
version or of any later version published by the Free Software
|
|
||||||
Foundation. If the Program does not specify a version number of the
|
|
||||||
GNU General Public License, you may choose any version ever published
|
|
||||||
by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Program specifies that a proxy can decide which future
|
|
||||||
versions of the GNU General Public License can be used, that proxy's
|
|
||||||
public statement of acceptance of a version permanently authorizes you
|
|
||||||
to choose that version for the Program.
|
|
||||||
|
|
||||||
Later license versions may give you additional or different
|
|
||||||
permissions. However, no additional obligations are imposed on any
|
|
||||||
author or copyright holder as a result of your choosing to follow a
|
|
||||||
later version.
|
|
||||||
|
|
||||||
15. Disclaimer of Warranty.
|
|
||||||
|
|
||||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
|
||||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
|
||||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
|
||||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
|
||||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
|
||||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
16. Limitation of Liability.
|
|
||||||
|
|
||||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
|
||||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
|
||||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
|
||||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
|
||||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
|
||||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
|
||||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
|
||||||
SUCH DAMAGES.
|
|
||||||
|
|
||||||
17. Interpretation of Sections 15 and 16.
|
|
||||||
|
|
||||||
If the disclaimer of warranty and limitation of liability provided
|
|
||||||
above cannot be given local legal effect according to their terms,
|
|
||||||
reviewing courts shall apply local law that most closely approximates
|
|
||||||
an absolute waiver of all civil liability in connection with the
|
|
||||||
Program, unless a warranty or assumption of liability accompanies a
|
|
||||||
copy of the Program in return for a fee.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
state the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
|
||||||
Copyright (C) <year> <name of author>
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If the program does terminal interaction, make it output a short
|
|
||||||
notice like this when it starts in an interactive mode:
|
|
||||||
|
|
||||||
<program> Copyright (C) <year> <name of author>
|
|
||||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|
||||||
This is free software, and you are welcome to redistribute it
|
|
||||||
under certain conditions; type `show c' for details.
|
|
||||||
|
|
||||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
|
||||||
parts of the General Public License. Of course, your program's commands
|
|
||||||
might be different; for a GUI interface, you would use an "about box".
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or school,
|
|
||||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
|
||||||
For more information on this, and how to apply and follow the GNU GPL, see
|
|
||||||
<https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
The GNU General Public License does not permit incorporating your program
|
|
||||||
into proprietary programs. If your program is a subroutine library, you
|
|
||||||
may consider it more useful to permit linking proprietary applications with
|
|
||||||
the library. If this is what you want to do, use the GNU Lesser General
|
|
||||||
Public License instead of this License. But first, please read
|
|
||||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
|
||||||
@@ -1,30 +1 @@
|
|||||||
# Aerospike Gnome (Tiling Window Manager)
|
# Pretty Borders
|
||||||
|
|
||||||
Aerospike is a simple and opinionated tiling window manager for gnome.
|
|
||||||
|
|
||||||
This project takes inspiration from previous gnome tiling window managers such
|
|
||||||
as [forge](https://github.com/forge-ext/forge)
|
|
||||||
and [cosmic-shell](https://github.com/pop-os/gnome-shell-extension-pop-cosmic) as well as
|
|
||||||
MacOS tiling WMs, mainly [Aerospace](https://github.com/nikitabobko/AeroSpace) (not affiliated).
|
|
||||||
|
|
||||||
## Current Features
|
|
||||||
|
|
||||||
- Auto-tiling
|
|
||||||
- Accordion layouts with variable sizes
|
|
||||||
- Tabbed layouts
|
|
||||||
- Tree-based (albeit set depth of 2 for now) container-window paired layout similar to Aerospace
|
|
||||||
- Diagram for this is pending
|
|
||||||
|
|
||||||
## Planned functionality
|
|
||||||
|
|
||||||
- Full Keyboard control w/window movement
|
|
||||||
- Sub-containers (more tree layers than the 1 supported for now)
|
|
||||||
- Gap size customization
|
|
||||||
|
|
||||||
## Not currently planned
|
|
||||||
|
|
||||||
- Active window borders
|
|
||||||
- See my other extension for a rainbow or static border - [PrettyBorders](https://github.com//pretty-borders)
|
|
||||||
- complicated window dragging features and uis
|
|
||||||
- Aerospace supports control + drag to combine windows while moving with the mouse, and normal window dragging.
|
|
||||||
|
|
||||||
Vendored
-11
@@ -1,11 +0,0 @@
|
|||||||
import "@girs/gjs";
|
|
||||||
import "@girs/gjs/dom";
|
|
||||||
import "@girs/gnome-shell/ambient";
|
|
||||||
import "@girs/gnome-shell/extensions/global";
|
|
||||||
|
|
||||||
// Extend Meta.Window with our custom property
|
|
||||||
declare namespace Meta {
|
|
||||||
interface Window {
|
|
||||||
_aerospikeData?: any;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-107
@@ -1,107 +0,0 @@
|
|||||||
import Meta from 'gi://Meta';
|
|
||||||
import {Extension} from 'resource:///org/gnome/shell/extensions/extension.js';
|
|
||||||
import * as Main from 'resource:///org/gnome/shell/ui/main.js';
|
|
||||||
import Gio from 'gi://Gio';
|
|
||||||
import Shell from 'gi://Shell';
|
|
||||||
import WindowManager from './src/wm/windowManager.js'
|
|
||||||
import {Direction} from './src/wm/container.js'
|
|
||||||
import {Logger} from "./src/utils/logger.js";
|
|
||||||
|
|
||||||
export default class aerospike extends Extension {
|
|
||||||
settings: Gio.Settings;
|
|
||||||
keyBindings: Map<string, number>;
|
|
||||||
windowManager: WindowManager;
|
|
||||||
|
|
||||||
constructor(metadata: ConstructorParameters<typeof Extension>[0]) {
|
|
||||||
super(metadata);
|
|
||||||
this.settings = this.getSettings('org.gnome.shell.extensions.aerospike');
|
|
||||||
this.keyBindings = new Map();
|
|
||||||
this.windowManager = new WindowManager(this.settings);
|
|
||||||
}
|
|
||||||
|
|
||||||
enable() {
|
|
||||||
try {
|
|
||||||
Logger.log("STARTING AEROSPIKE!")
|
|
||||||
this.bindSettings();
|
|
||||||
this.setupKeybindings();
|
|
||||||
this.windowManager.enable()
|
|
||||||
Logger.log("AEROSPIKE ENABLED SUCCESSFULLY")
|
|
||||||
} catch (e) {
|
|
||||||
Logger.error("AEROSPIKE ENABLE FAILED", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
disable() {
|
|
||||||
this.windowManager.disable()
|
|
||||||
this.removeKeybindings()
|
|
||||||
}
|
|
||||||
|
|
||||||
private keybindingActions(): Record<string, () => void> {
|
|
||||||
return {
|
|
||||||
'print-tree': () => { this.windowManager.printTreeStructure(); },
|
|
||||||
'toggle-orientation': () => { this.windowManager.toggleActiveContainerOrientation(); },
|
|
||||||
'reset-ratios': () => { this.windowManager.resetActiveContainerRatios(); },
|
|
||||||
'toggle-tabbed': () => { this.windowManager.toggleActiveContainerTabbed(); },
|
|
||||||
'focus-left': () => { this.windowManager.focusInDirection(Direction.LEFT); },
|
|
||||||
'focus-right': () => { this.windowManager.focusInDirection(Direction.RIGHT); },
|
|
||||||
'focus-up': () => { this.windowManager.focusInDirection(Direction.UP); },
|
|
||||||
'focus-down': () => { this.windowManager.focusInDirection(Direction.DOWN); },
|
|
||||||
'move-left': () => { this.windowManager.moveInDirection(Direction.LEFT); },
|
|
||||||
'move-right': () => { this.windowManager.moveInDirection(Direction.RIGHT); },
|
|
||||||
'move-up': () => { this.windowManager.moveInDirection(Direction.UP); },
|
|
||||||
'move-down': () => { this.windowManager.moveInDirection(Direction.DOWN); },
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
private bindSettings() {
|
|
||||||
const keybindings = Object.keys(this.keybindingActions());
|
|
||||||
keybindings.forEach(name => {
|
|
||||||
this.settings.connect(`changed::${name}`, () => {
|
|
||||||
log(`${name} keybinding changed to: ${this.settings.get_strv(name)}`);
|
|
||||||
this.refreshKeybinding(name);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private refreshKeybinding(settingName: string) {
|
|
||||||
if (this.keyBindings.has(settingName)) {
|
|
||||||
Main.wm.removeKeybinding(settingName);
|
|
||||||
this.keyBindings.delete(settingName);
|
|
||||||
}
|
|
||||||
|
|
||||||
const action = this.keybindingActions()[settingName];
|
|
||||||
if (action) this.bindKeybinding(settingName, action);
|
|
||||||
}
|
|
||||||
|
|
||||||
private removeKeybindings() {
|
|
||||||
this.keyBindings.forEach((_, key) => {
|
|
||||||
Main.wm.removeKeybinding(key);
|
|
||||||
});
|
|
||||||
this.keyBindings.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
private setupKeybindings() {
|
|
||||||
const actions = this.keybindingActions();
|
|
||||||
for (const [name, action] of Object.entries(actions)) {
|
|
||||||
this.bindKeybinding(name, action);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private bindKeybinding(settingName: string, callback: () => void) {
|
|
||||||
const keyBindingSettings = this.settings.get_strv(settingName);
|
|
||||||
|
|
||||||
if (keyBindingSettings.length === 0 || keyBindingSettings[0] === '') {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const keyBindingAction = Main.wm.addKeybinding(
|
|
||||||
settingName,
|
|
||||||
this.settings,
|
|
||||||
Meta.KeyBindingFlags.NONE,
|
|
||||||
Shell.ActionMode.NORMAL,
|
|
||||||
callback
|
|
||||||
);
|
|
||||||
|
|
||||||
this.keyBindings.set(settingName, keyBindingAction);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
export default {
|
|
||||||
preset: 'ts-jest/presets/default-esm',
|
|
||||||
testEnvironment: 'node',
|
|
||||||
extensionsToTreatAsEsm: ['.ts'],
|
|
||||||
moduleNameMapper: {
|
|
||||||
'^(\\.{1,2}/.*)\\.js$': '$1',
|
|
||||||
},
|
|
||||||
transform: {
|
|
||||||
'^.+\\.ts$': [
|
|
||||||
'ts-jest',
|
|
||||||
{
|
|
||||||
useESM: true,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
testMatch: ['**/__tests__/**/*.test.ts', '**/?(*.)+(spec|test).ts'],
|
|
||||||
collectCoverageFrom: [
|
|
||||||
'src/**/*.ts',
|
|
||||||
'!src/**/*.d.ts',
|
|
||||||
'!src/**/__tests__/**',
|
|
||||||
],
|
|
||||||
modulePathIgnorePatterns: ['<rootDir>/dist/', '<rootDir>/node_modules/'],
|
|
||||||
};
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
set dotenv-load
|
|
||||||
NAME:="aerospike"
|
|
||||||
DOMAIN:="lucaso.io"
|
|
||||||
FULL_NAME:=NAME + "@" + DOMAIN
|
|
||||||
|
|
||||||
packages:
|
|
||||||
pnpm install
|
|
||||||
|
|
||||||
build: packages && build-schemas
|
|
||||||
rm -rf dist/*
|
|
||||||
pnpm run build
|
|
||||||
cp metadata.json dist/
|
|
||||||
cp stylesheet.css dist/
|
|
||||||
mkdir -p dist/schemas
|
|
||||||
|
|
||||||
build-schemas:
|
|
||||||
glib-compile-schemas schemas
|
|
||||||
cp schemas/org.gnome.shell.extensions.aerospike.gschema.xml dist/schemas/
|
|
||||||
cp schemas/gschemas.compiled dist/schemas/
|
|
||||||
|
|
||||||
build-package: build
|
|
||||||
cd dist && zip ../{{NAME}}.zip -9r .
|
|
||||||
|
|
||||||
|
|
||||||
install: build
|
|
||||||
mkdir -p ~/.local/share/gnome-shell/extensions/{{NAME}}@{{DOMAIN}}
|
|
||||||
rm -rf ~/.local/share/gnome-shell/extensions/{{NAME}}@{{DOMAIN}}/*
|
|
||||||
cp -r dist/* ~/.local/share/gnome-shell/extensions/{{NAME}}@{{DOMAIN}}/
|
|
||||||
|
|
||||||
run:
|
|
||||||
env MUTTER_DEBUG_DUMMY_MODE_SPECS=1280x720 dbus-run-session -- gnome-shell --devkit --wayland
|
|
||||||
|
|
||||||
install-and-run: install run
|
|
||||||
|
|
||||||
live-debug:
|
|
||||||
journalctl /usr/bin/gnome-shell -f -o cat | tee debug.log
|
|
||||||
|
|
||||||
test:
|
|
||||||
pnpm test
|
|
||||||
|
|
||||||
test-watch:
|
|
||||||
pnpm test:watch
|
|
||||||
|
|
||||||
test-coverage:
|
|
||||||
pnpm test:coverage
|
|
||||||
|
|
||||||
ci-local:
|
|
||||||
act -W .gitea/workflows/build.yaml
|
|
||||||
|
|
||||||
lint:
|
|
||||||
pnpm run lint
|
|
||||||
|
|
||||||
clean:
|
|
||||||
pnpm run clean
|
|
||||||
|
|
||||||
#pack: build
|
|
||||||
# gnome-extensions pack dist \
|
|
||||||
# --force \
|
|
||||||
# --out-dir . \
|
|
||||||
# --schema ../schemas/org.gnome.shell.extensions.aerospike.gschema.xml
|
|
||||||
#
|
|
||||||
#install-pack: pack
|
|
||||||
# gnome-extensions install ./{{FULL_NAME}}.shell-extension.zip --force
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "aerospike",
|
|
||||||
"description": "I3 Like Tiling Window Manager for Gnome",
|
|
||||||
"uuid": "aerospike@lucaso.io",
|
|
||||||
"settings-schema": "org.gnome.shell.extensions.aerospike",
|
|
||||||
"shell-version": [
|
|
||||||
"48",
|
|
||||||
"49"
|
|
||||||
],
|
|
||||||
"gettext-domain": "aerospike@lucaso.io",
|
|
||||||
"url": "https://gitea.chaosdev.gay/lucasoskorep/aerospike@lucaso.io"
|
|
||||||
}
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "aerospike",
|
|
||||||
"version": "0.2.2",
|
|
||||||
"description": "Simple, Opinionated Tiling Window Manager for Gnome written in Typescript",
|
|
||||||
"type": "module",
|
|
||||||
"private": true,
|
|
||||||
"repository": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "git+https://gitlab.com/lucasoskorep/aerospike"
|
|
||||||
},
|
|
||||||
"author": "Lucas Oskorep <lucas.oskorep@gmail.com>",
|
|
||||||
"license": "GPL-3.0-only",
|
|
||||||
"bugs": {
|
|
||||||
"url": "https://github.com/lucasoskorep/aerospike-gnome/issues"
|
|
||||||
},
|
|
||||||
"homepage": "https://github.com/lucasoskorep/aerospike-gnome/#readme",
|
|
||||||
"sideEffects": false,
|
|
||||||
"scripts": {
|
|
||||||
"build": "tsc",
|
|
||||||
"clean": "rm -rf dist/*",
|
|
||||||
"lint": "eslint .",
|
|
||||||
"test": "jest",
|
|
||||||
"test:watch": "jest --watch",
|
|
||||||
"test:coverage": "jest --coverage"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@girs/gjs": "4.0.0-beta.38",
|
|
||||||
"@girs/gnome-shell": "49.1.0",
|
|
||||||
"@jest/globals": "^30.0.0",
|
|
||||||
"@types/jest": "^30.0.0",
|
|
||||||
"eslint": "^10.0.0",
|
|
||||||
"eslint-plugin-jsdoc": "^62.0.0",
|
|
||||||
"jest": "^30.0.0",
|
|
||||||
"ts-jest": "^29.1.2",
|
|
||||||
"typescript": "^5.9.2"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"@girs/mtk-17": "17.0.0-4.0.0-beta.38"
|
|
||||||
},
|
|
||||||
"pnpm": {
|
|
||||||
"overrides": {
|
|
||||||
"@girs/cairo-1.0": "1.0.0-4.0.0-beta.38",
|
|
||||||
"@girs/freetype2-2.0": "2.0.0-4.0.0-beta.38",
|
|
||||||
"@girs/gdk-4.0": "4.0.0-4.0.0-beta.38",
|
|
||||||
"@girs/gdkpixbuf-2.0": "2.0.0-4.0.0-beta.38",
|
|
||||||
"@girs/gio-2.0": "2.86.0-4.0.0-beta.38",
|
|
||||||
"@girs/gjs": "4.0.0-beta.38",
|
|
||||||
"@girs/glib-2.0": "2.86.0-4.0.0-beta.38",
|
|
||||||
"@girs/gmodule-2.0": "2.0.0-4.0.0-beta.38",
|
|
||||||
"@girs/gobject-2.0": "2.86.0-4.0.0-beta.38",
|
|
||||||
"@girs/graphene-1.0": "1.0.0-4.0.0-beta.38",
|
|
||||||
"@girs/gsk-4.0": "4.0.0-4.0.0-beta.38",
|
|
||||||
"@girs/gtk-4.0": "4.20.1-4.0.0-beta.38",
|
|
||||||
"@girs/harfbuzz-0.0": "11.5.0-4.0.0-beta.38",
|
|
||||||
"@girs/mtk-17": "17.0.0-4.0.0-beta.38",
|
|
||||||
"@girs/pango-1.0": "1.57.0-4.0.0-beta.38",
|
|
||||||
"@girs/pangocairo-1.0": "1.0.0-4.0.0-beta.38"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Generated
-4089
File diff suppressed because it is too large
Load Diff
@@ -1,4 +0,0 @@
|
|||||||
// This file is just a wrapper around the compiled TypeScript code
|
|
||||||
import AerospikeExtensions from './src/prefs/prefs.js';
|
|
||||||
|
|
||||||
export default AerospikeExtensions;
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
|
||||||
"extends": [
|
|
||||||
"config:recommended"
|
|
||||||
],
|
|
||||||
"packageRules": [
|
|
||||||
{
|
|
||||||
"matchPackageNames": ["actions/upload-artifact", "actions/download-artifact"],
|
|
||||||
"allowedVersions": "<4"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<schemalist>
|
|
||||||
<schema id="org.gnome.shell.extensions.aerospike" path="/org/gnome/shell/extensions/aerospike/">
|
|
||||||
|
|
||||||
<key name="focus-left" type="as">
|
|
||||||
<default><![CDATA[['<Super>h']]]></default>
|
|
||||||
<summary>Focus window to the left</summary>
|
|
||||||
<description>Move focus to the window to the left of the current window. In tabbed mode, switches to the previous tab.</description>
|
|
||||||
</key>
|
|
||||||
|
|
||||||
<key name="focus-right" type="as">
|
|
||||||
<default><![CDATA[['<Super>l']]]></default>
|
|
||||||
<summary>Focus window to the right</summary>
|
|
||||||
<description>Move focus to the window to the right of the current window. In tabbed mode, switches to the next tab.</description>
|
|
||||||
</key>
|
|
||||||
|
|
||||||
<key name="focus-up" type="as">
|
|
||||||
<default><![CDATA[['<Super>k']]]></default>
|
|
||||||
<summary>Focus window above</summary>
|
|
||||||
<description>Move focus to the window above the current window.</description>
|
|
||||||
</key>
|
|
||||||
|
|
||||||
<key name="focus-down" type="as">
|
|
||||||
<default><![CDATA[['<Super>j']]]></default>
|
|
||||||
<summary>Focus window below</summary>
|
|
||||||
<description>Move focus to the window below the current window.</description>
|
|
||||||
</key>
|
|
||||||
|
|
||||||
|
|
||||||
<key name="move-left" type="as">
|
|
||||||
<default><![CDATA[['<Super><Shift>h']]]></default>
|
|
||||||
<summary>Move window to the left</summary>
|
|
||||||
<description>Move the active window one position to the left within its container</description>
|
|
||||||
</key>
|
|
||||||
|
|
||||||
<key name="move-right" type="as">
|
|
||||||
<default><![CDATA[['<Super><Shift>l']]]></default>
|
|
||||||
<summary>Move window to the right</summary>
|
|
||||||
<description>Move the active window one position to the right within its container</description>
|
|
||||||
</key>
|
|
||||||
|
|
||||||
<key name="move-up" type="as">
|
|
||||||
<default><![CDATA[['<Super><Shift>k']]]></default>
|
|
||||||
<summary>Move window up</summary>
|
|
||||||
<description>Move the active window one position up within its container</description>
|
|
||||||
</key>
|
|
||||||
|
|
||||||
<key name="move-down" type="as">
|
|
||||||
<default><![CDATA[['<Super><Shift>j']]]></default>
|
|
||||||
<summary>Move window down</summary>
|
|
||||||
<description>Move the active window one position down within its container</description>
|
|
||||||
</key>
|
|
||||||
|
|
||||||
<key name="toggle-orientation" type="as">
|
|
||||||
<default><![CDATA[['<Super>comma']]]></default>
|
|
||||||
<summary>Toggle active container orientation</summary>
|
|
||||||
<description>Toggles the orientation of the container holding the active window between horizontal and vertical</description>
|
|
||||||
</key>
|
|
||||||
|
|
||||||
<key name="reset-ratios" type="as">
|
|
||||||
<default><![CDATA[['<Super>z']]]></default>
|
|
||||||
<summary>Reset container ratios to equal splits</summary>
|
|
||||||
<description>Resets all window size ratios in the active window's container to equal splits</description>
|
|
||||||
</key>
|
|
||||||
|
|
||||||
<key name="toggle-tabbed" type="as">
|
|
||||||
<default><![CDATA[['<Super>slash']]]></default>
|
|
||||||
<summary>Toggle tabbed container mode</summary>
|
|
||||||
<description>Toggles the active window's container between tabbed and accordion layout modes</description>
|
|
||||||
</key>
|
|
||||||
|
|
||||||
<key name="print-tree" type="as">
|
|
||||||
<default><![CDATA[['<Super><Shift>x']]]></default>
|
|
||||||
<summary>Print window tree structure</summary>
|
|
||||||
<description>Prints the current tree of containers and windows per monitor to logs</description>
|
|
||||||
</key>
|
|
||||||
|
|
||||||
</schema>
|
|
||||||
</schemalist>
|
|
||||||
@@ -1,260 +0,0 @@
|
|||||||
import { describe, test, expect, jest, beforeEach } from '@jest/globals';
|
|
||||||
|
|
||||||
// Mock the dependencies
|
|
||||||
jest.mock('../utils/logger.js', () => ({
|
|
||||||
Logger: {
|
|
||||||
log: jest.fn(),
|
|
||||||
info: jest.fn(),
|
|
||||||
debug: jest.fn(),
|
|
||||||
warn: jest.fn(),
|
|
||||||
error: jest.fn(),
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
|
|
||||||
jest.mock('../utils/events.js', () => ({
|
|
||||||
default: jest.fn(),
|
|
||||||
}));
|
|
||||||
|
|
||||||
// Since we can't import the actual WindowContainer that depends on GNOME APIs,
|
|
||||||
// we'll test the logic patterns used in the container
|
|
||||||
|
|
||||||
describe('Container Logic Tests', () => {
|
|
||||||
describe('Orientation Toggle Logic', () => {
|
|
||||||
enum Layout {
|
|
||||||
HORIZONTAL = 0,
|
|
||||||
VERTICAL = 1,
|
|
||||||
TABBED = 2,
|
|
||||||
}
|
|
||||||
|
|
||||||
const toggleOrientation = (current: Layout): Layout => {
|
|
||||||
if (current === Layout.TABBED) return Layout.HORIZONTAL;
|
|
||||||
return current === Layout.HORIZONTAL
|
|
||||||
? Layout.VERTICAL
|
|
||||||
: Layout.HORIZONTAL;
|
|
||||||
};
|
|
||||||
|
|
||||||
test('should toggle from HORIZONTAL to VERTICAL', () => {
|
|
||||||
const result = toggleOrientation(Layout.HORIZONTAL);
|
|
||||||
expect(result).toBe(Layout.VERTICAL);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('should toggle from VERTICAL to HORIZONTAL', () => {
|
|
||||||
const result = toggleOrientation(Layout.VERTICAL);
|
|
||||||
expect(result).toBe(Layout.HORIZONTAL);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('should toggle from TABBED to HORIZONTAL', () => {
|
|
||||||
const result = toggleOrientation(Layout.TABBED);
|
|
||||||
expect(result).toBe(Layout.HORIZONTAL);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('enum reverse mapping should return string names', () => {
|
|
||||||
expect(Layout[Layout.HORIZONTAL]).toBe('HORIZONTAL');
|
|
||||||
expect(Layout[Layout.VERTICAL]).toBe('VERTICAL');
|
|
||||||
expect(Layout[Layout.TABBED]).toBe('TABBED');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('Window Bounds Calculation', () => {
|
|
||||||
test('should calculate horizontal bounds correctly', () => {
|
|
||||||
const workArea = { x: 0, y: 0, width: 1000, height: 500 };
|
|
||||||
const itemCount = 3;
|
|
||||||
const windowWidth = Math.floor(workArea.width / itemCount);
|
|
||||||
|
|
||||||
const bounds = Array.from({ length: itemCount }, (_, index) => ({
|
|
||||||
x: workArea.x + (index * windowWidth),
|
|
||||||
y: workArea.y,
|
|
||||||
width: windowWidth,
|
|
||||||
height: workArea.height,
|
|
||||||
}));
|
|
||||||
|
|
||||||
expect(bounds.length).toBe(3);
|
|
||||||
expect(bounds[0].x).toBe(0);
|
|
||||||
expect(bounds[1].x).toBe(333);
|
|
||||||
expect(bounds[2].x).toBe(666);
|
|
||||||
expect(bounds[0].width).toBe(333);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('should calculate vertical bounds correctly', () => {
|
|
||||||
const workArea = { x: 0, y: 0, width: 1000, height: 900 };
|
|
||||||
const itemCount = 3;
|
|
||||||
const windowHeight = Math.floor(workArea.height / itemCount);
|
|
||||||
|
|
||||||
const bounds = Array.from({ length: itemCount }, (_, index) => ({
|
|
||||||
x: workArea.x,
|
|
||||||
y: workArea.y + (index * windowHeight),
|
|
||||||
width: workArea.width,
|
|
||||||
height: windowHeight,
|
|
||||||
}));
|
|
||||||
|
|
||||||
expect(bounds.length).toBe(3);
|
|
||||||
expect(bounds[0].y).toBe(0);
|
|
||||||
expect(bounds[1].y).toBe(300);
|
|
||||||
expect(bounds[2].y).toBe(600);
|
|
||||||
expect(bounds[0].height).toBe(300);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('should handle single window bounds', () => {
|
|
||||||
const workArea = { x: 100, y: 50, width: 800, height: 600 };
|
|
||||||
const itemCount = 1;
|
|
||||||
const windowWidth = Math.floor(workArea.width / itemCount);
|
|
||||||
|
|
||||||
const bounds = [{
|
|
||||||
x: workArea.x,
|
|
||||||
y: workArea.y,
|
|
||||||
width: windowWidth,
|
|
||||||
height: workArea.height,
|
|
||||||
}];
|
|
||||||
|
|
||||||
expect(bounds[0].x).toBe(100);
|
|
||||||
expect(bounds[0].y).toBe(50);
|
|
||||||
expect(bounds[0].width).toBe(800);
|
|
||||||
expect(bounds[0].height).toBe(600);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('Tabbed Bounds Calculation', () => {
|
|
||||||
const TAB_BAR_HEIGHT = 24;
|
|
||||||
|
|
||||||
test('should give all items the same content rect in tabbed mode', () => {
|
|
||||||
const workArea = { x: 100, y: 0, width: 1000, height: 500 };
|
|
||||||
const itemCount = 3;
|
|
||||||
|
|
||||||
const contentRect = {
|
|
||||||
x: workArea.x,
|
|
||||||
y: workArea.y + TAB_BAR_HEIGHT,
|
|
||||||
width: workArea.width,
|
|
||||||
height: workArea.height - TAB_BAR_HEIGHT,
|
|
||||||
};
|
|
||||||
|
|
||||||
const bounds = Array.from({ length: itemCount }, () => contentRect);
|
|
||||||
|
|
||||||
expect(bounds.length).toBe(3);
|
|
||||||
// All bounds should be identical
|
|
||||||
bounds.forEach(b => {
|
|
||||||
expect(b.x).toBe(100);
|
|
||||||
expect(b.y).toBe(TAB_BAR_HEIGHT);
|
|
||||||
expect(b.width).toBe(1000);
|
|
||||||
expect(b.height).toBe(500 - TAB_BAR_HEIGHT);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
test('tab bar rect should occupy top of work area', () => {
|
|
||||||
const workArea = { x: 200, y: 50, width: 800, height: 600 };
|
|
||||||
|
|
||||||
const tabBarRect = {
|
|
||||||
x: workArea.x,
|
|
||||||
y: workArea.y,
|
|
||||||
width: workArea.width,
|
|
||||||
height: TAB_BAR_HEIGHT,
|
|
||||||
};
|
|
||||||
|
|
||||||
expect(tabBarRect.x).toBe(200);
|
|
||||||
expect(tabBarRect.y).toBe(50);
|
|
||||||
expect(tabBarRect.width).toBe(800);
|
|
||||||
expect(tabBarRect.height).toBe(TAB_BAR_HEIGHT);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('active tab index should clamp after removal', () => {
|
|
||||||
let activeTabIndex = 2;
|
|
||||||
const itemCount = 2; // after removing one from 3
|
|
||||||
|
|
||||||
if (activeTabIndex >= itemCount) {
|
|
||||||
activeTabIndex = itemCount - 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
expect(activeTabIndex).toBe(1);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('active tab index should stay at 0 when first item removed', () => {
|
|
||||||
let activeTabIndex = 0;
|
|
||||||
const itemCount = 2; // after removing one from 3
|
|
||||||
|
|
||||||
if (activeTabIndex >= itemCount) {
|
|
||||||
activeTabIndex = itemCount - 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
expect(activeTabIndex).toBe(0);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('Window Index Finding', () => {
|
|
||||||
test('should find window index in array', () => {
|
|
||||||
const windows = [
|
|
||||||
{ id: 1, title: 'Window 1' },
|
|
||||||
{ id: 2, title: 'Window 2' },
|
|
||||||
{ id: 3, title: 'Window 3' },
|
|
||||||
];
|
|
||||||
|
|
||||||
const findIndex = (id: number) => {
|
|
||||||
for (let i = 0; i < windows.length; i++) {
|
|
||||||
if (windows[i].id === id) {
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return -1;
|
|
||||||
};
|
|
||||||
|
|
||||||
expect(findIndex(2)).toBe(1);
|
|
||||||
expect(findIndex(3)).toBe(2);
|
|
||||||
expect(findIndex(999)).toBe(-1);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('should safely remove window by index', () => {
|
|
||||||
const windows = [
|
|
||||||
{ id: 1, title: 'Window 1' },
|
|
||||||
{ id: 2, title: 'Window 2' },
|
|
||||||
{ id: 3, title: 'Window 3' },
|
|
||||||
];
|
|
||||||
|
|
||||||
const removeWindow = (id: number) => {
|
|
||||||
const index = windows.findIndex(w => w.id === id);
|
|
||||||
if (index !== -1) {
|
|
||||||
windows.splice(index, 1);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
};
|
|
||||||
|
|
||||||
const removed = removeWindow(2);
|
|
||||||
expect(removed).toBe(true);
|
|
||||||
expect(windows.length).toBe(2);
|
|
||||||
expect(windows.find(w => w.id === 2)).toBeUndefined();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe('Container Item Reordering', () => {
|
|
||||||
test('should reorder items correctly', () => {
|
|
||||||
const items = ['A', 'B', 'C', 'D'];
|
|
||||||
const originalIndex = 1; // 'B'
|
|
||||||
const newIndex = 3;
|
|
||||||
|
|
||||||
// Remove from original position and insert at new position
|
|
||||||
const [item] = items.splice(originalIndex, 1);
|
|
||||||
items.splice(newIndex, 0, item);
|
|
||||||
|
|
||||||
expect(items).toEqual(['A', 'C', 'D', 'B']);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('should handle reordering to same position', () => {
|
|
||||||
const items = ['A', 'B', 'C'];
|
|
||||||
const originalIndex = 1;
|
|
||||||
const newIndex = 1;
|
|
||||||
|
|
||||||
if (originalIndex !== newIndex) {
|
|
||||||
const [item] = items.splice(originalIndex, 1);
|
|
||||||
items.splice(newIndex, 0, item);
|
|
||||||
}
|
|
||||||
|
|
||||||
expect(items).toEqual(['A', 'B', 'C']);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('should handle moving first item to last', () => {
|
|
||||||
const items = ['A', 'B', 'C'];
|
|
||||||
const [item] = items.splice(0, 1);
|
|
||||||
items.splice(2, 0, item);
|
|
||||||
|
|
||||||
expect(items).toEqual(['B', 'C', 'A']);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,75 +0,0 @@
|
|||||||
import { describe, test, expect } from '@jest/globals';
|
|
||||||
import type { Rect } from '../utils/rect.js';
|
|
||||||
|
|
||||||
describe('Rect Type Tests', () => {
|
|
||||||
test('should create a valid Rect object', () => {
|
|
||||||
const rect: Rect = {
|
|
||||||
x: 10,
|
|
||||||
y: 20,
|
|
||||||
width: 100,
|
|
||||||
height: 200,
|
|
||||||
};
|
|
||||||
|
|
||||||
expect(rect.x).toBe(10);
|
|
||||||
expect(rect.y).toBe(20);
|
|
||||||
expect(rect.width).toBe(100);
|
|
||||||
expect(rect.height).toBe(200);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('should handle zero dimensions', () => {
|
|
||||||
const rect: Rect = {
|
|
||||||
x: 0,
|
|
||||||
y: 0,
|
|
||||||
width: 0,
|
|
||||||
height: 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
expect(rect.width).toBe(0);
|
|
||||||
expect(rect.height).toBe(0);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('should handle negative coordinates', () => {
|
|
||||||
const rect: Rect = {
|
|
||||||
x: -50,
|
|
||||||
y: -100,
|
|
||||||
width: 200,
|
|
||||||
height: 300,
|
|
||||||
};
|
|
||||||
|
|
||||||
expect(rect.x).toBe(-50);
|
|
||||||
expect(rect.y).toBe(-100);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('should calculate rect area correctly', () => {
|
|
||||||
const rect: Rect = {
|
|
||||||
x: 0,
|
|
||||||
y: 0,
|
|
||||||
width: 100,
|
|
||||||
height: 50,
|
|
||||||
};
|
|
||||||
|
|
||||||
const area = rect.width * rect.height;
|
|
||||||
expect(area).toBe(5000);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('should determine if point is inside rect', () => {
|
|
||||||
const rect: Rect = {
|
|
||||||
x: 10,
|
|
||||||
y: 10,
|
|
||||||
width: 100,
|
|
||||||
height: 100,
|
|
||||||
};
|
|
||||||
|
|
||||||
const pointInside = { x: 50, y: 50 };
|
|
||||||
const pointOutside = { x: 200, y: 200 };
|
|
||||||
|
|
||||||
const isInside = (point: { x: number; y: number }, r: Rect) =>
|
|
||||||
point.x >= r.x &&
|
|
||||||
point.x <= r.x + r.width &&
|
|
||||||
point.y >= r.y &&
|
|
||||||
point.y <= r.y + r.height;
|
|
||||||
|
|
||||||
expect(isInside(pointInside, rect)).toBe(true);
|
|
||||||
expect(isInside(pointOutside, rect)).toBe(false);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
// Gnome imports
|
|
||||||
import Adw from 'gi://Adw';
|
|
||||||
import Gtk from 'gi://Gtk';
|
|
||||||
import Gio from 'gi://Gio';
|
|
||||||
import GObject from 'gi://GObject';
|
|
||||||
import { gettext as _ } from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
|
|
||||||
import { Logger } from '../utils/logger.js';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* EntryRow class for handling text input including keybindings
|
|
||||||
*/
|
|
||||||
export class EntryRow extends Adw.EntryRow {
|
|
||||||
static {
|
|
||||||
GObject.registerClass(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
constructor(params: {
|
|
||||||
title: string,
|
|
||||||
settings: Gio.Settings,
|
|
||||||
bind: string,
|
|
||||||
map?: {
|
|
||||||
from: (settings: Gio.Settings, bind: string) => string,
|
|
||||||
to: (settings: Gio.Settings, bind: string, value: string) => void
|
|
||||||
}
|
|
||||||
}) {
|
|
||||||
super({ title: params.title });
|
|
||||||
|
|
||||||
const { settings, bind, map } = params;
|
|
||||||
|
|
||||||
// When text changes, update settings
|
|
||||||
this.connect('changed', () => {
|
|
||||||
const text = this.get_text();
|
|
||||||
if (typeof text === 'string') {
|
|
||||||
if (map) {
|
|
||||||
map.to(settings, bind, text);
|
|
||||||
} else {
|
|
||||||
settings.set_string(bind, text);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Set initial text from settings
|
|
||||||
const current = map ? map.from(settings, bind) : settings.get_string(bind);
|
|
||||||
this.set_text(current ?? '');
|
|
||||||
|
|
||||||
// Add reset button
|
|
||||||
this.add_suffix(
|
|
||||||
new ResetButton({
|
|
||||||
settings,
|
|
||||||
bind,
|
|
||||||
onReset: () => {
|
|
||||||
this.set_text((map ? map.from(settings, bind) : settings.get_string(bind)) ?? '');
|
|
||||||
},
|
|
||||||
})
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Reset button for settings
|
|
||||||
*/
|
|
||||||
export class ResetButton extends Gtk.Button {
|
|
||||||
static {
|
|
||||||
GObject.registerClass(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
constructor(params: {
|
|
||||||
settings?: Gio.Settings,
|
|
||||||
bind: string,
|
|
||||||
onReset?: () => void
|
|
||||||
}) {
|
|
||||||
super({
|
|
||||||
icon_name: 'edit-clear-symbolic',
|
|
||||||
tooltip_text: _('Reset'),
|
|
||||||
valign: Gtk.Align.CENTER,
|
|
||||||
});
|
|
||||||
|
|
||||||
this.connect('clicked', () => {
|
|
||||||
params.settings?.reset(params.bind);
|
|
||||||
params.onReset?.();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,191 +0,0 @@
|
|||||||
import Adw from 'gi://Adw';
|
|
||||||
import Gio from 'gi://Gio';
|
|
||||||
import Gtk from 'gi://Gtk';
|
|
||||||
import Gdk from 'gi://Gdk';
|
|
||||||
import {ExtensionPreferences, gettext as _} from 'resource:///org/gnome/Shell/Extensions/js/extensions/prefs.js';
|
|
||||||
import {Logger} from "../utils/logger.js";
|
|
||||||
import {EntryRow} from "./keybindings.js";
|
|
||||||
|
|
||||||
export default class AerospikeExtensions extends ExtensionPreferences {
|
|
||||||
async fillPreferencesWindow(window: Adw.PreferencesWindow) {
|
|
||||||
// Create settings object
|
|
||||||
const settings = this.getSettings('org.gnome.shell.extensions.aerospike');
|
|
||||||
|
|
||||||
// Create keybindings page (top-level)
|
|
||||||
const keybindingsPage = new Adw.PreferencesPage({
|
|
||||||
title: _('Keybindings'),
|
|
||||||
icon_name: 'input-keyboard-symbolic',
|
|
||||||
});
|
|
||||||
window.add(keybindingsPage);
|
|
||||||
|
|
||||||
const keybindingMap = this.createKeybindingMap();
|
|
||||||
|
|
||||||
// Top-level Keybindings header group with syntax help
|
|
||||||
const keybindingsHeader = new Adw.PreferencesGroup({
|
|
||||||
title: _('Keybindings'),
|
|
||||||
description: `${_("Syntax")}: <Super>h, <Shift>g, <Super><Shift>h
|
|
||||||
${_("Legend")}: <Super> - ${_("Windows key")}, <Primary> - ${_("Control key")}
|
|
||||||
${_("Delete text to unset. Press Return key to accept.")}`,
|
|
||||||
});
|
|
||||||
keybindingsPage.add(keybindingsHeader);
|
|
||||||
|
|
||||||
// --- Focus group ---
|
|
||||||
const focusGroup = new Adw.PreferencesGroup({
|
|
||||||
title: _('Focus'),
|
|
||||||
});
|
|
||||||
keybindingsPage.add(focusGroup);
|
|
||||||
|
|
||||||
focusGroup.add(
|
|
||||||
new EntryRow({
|
|
||||||
title: _('Focus Left'),
|
|
||||||
settings: settings,
|
|
||||||
bind: 'focus-left',
|
|
||||||
map: keybindingMap
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
focusGroup.add(
|
|
||||||
new EntryRow({
|
|
||||||
title: _('Focus Right'),
|
|
||||||
settings: settings,
|
|
||||||
bind: 'focus-right',
|
|
||||||
map: keybindingMap
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
focusGroup.add(
|
|
||||||
new EntryRow({
|
|
||||||
title: _('Focus Up'),
|
|
||||||
settings: settings,
|
|
||||||
bind: 'focus-up',
|
|
||||||
map: keybindingMap
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
focusGroup.add(
|
|
||||||
new EntryRow({
|
|
||||||
title: _('Focus Down'),
|
|
||||||
settings: settings,
|
|
||||||
bind: 'focus-down',
|
|
||||||
map: keybindingMap
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
// --- Move group ---
|
|
||||||
const moveGroup = new Adw.PreferencesGroup({
|
|
||||||
title: _('Move'),
|
|
||||||
});
|
|
||||||
keybindingsPage.add(moveGroup);
|
|
||||||
|
|
||||||
moveGroup.add(
|
|
||||||
new EntryRow({
|
|
||||||
title: _('Move Left'),
|
|
||||||
settings: settings,
|
|
||||||
bind: 'move-left',
|
|
||||||
map: keybindingMap
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
moveGroup.add(
|
|
||||||
new EntryRow({
|
|
||||||
title: _('Move Right'),
|
|
||||||
settings: settings,
|
|
||||||
bind: 'move-right',
|
|
||||||
map: keybindingMap
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
moveGroup.add(
|
|
||||||
new EntryRow({
|
|
||||||
title: _('Move Up'),
|
|
||||||
settings: settings,
|
|
||||||
bind: 'move-up',
|
|
||||||
map: keybindingMap
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
moveGroup.add(
|
|
||||||
new EntryRow({
|
|
||||||
title: _('Move Down'),
|
|
||||||
settings: settings,
|
|
||||||
bind: 'move-down',
|
|
||||||
map: keybindingMap
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
// --- Container Interactions group ---
|
|
||||||
const containerGroup = new Adw.PreferencesGroup({
|
|
||||||
title: _('Container Interactions'),
|
|
||||||
});
|
|
||||||
keybindingsPage.add(containerGroup);
|
|
||||||
|
|
||||||
containerGroup.add(
|
|
||||||
new EntryRow({
|
|
||||||
title: _('Toggle Orientation'),
|
|
||||||
settings: settings,
|
|
||||||
bind: 'toggle-orientation',
|
|
||||||
map: keybindingMap
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
containerGroup.add(
|
|
||||||
new EntryRow({
|
|
||||||
title: _('Reset Container Ratios to Equal'),
|
|
||||||
settings: settings,
|
|
||||||
bind: 'reset-ratios',
|
|
||||||
map: keybindingMap
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
containerGroup.add(
|
|
||||||
new EntryRow({
|
|
||||||
title: _('Toggle Tabbed Mode'),
|
|
||||||
settings: settings,
|
|
||||||
bind: 'toggle-tabbed',
|
|
||||||
map: keybindingMap
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
// --- Debugging group ---
|
|
||||||
const debuggingGroup = new Adw.PreferencesGroup({
|
|
||||||
title: _('Debugging'),
|
|
||||||
});
|
|
||||||
keybindingsPage.add(debuggingGroup);
|
|
||||||
|
|
||||||
debuggingGroup.add(
|
|
||||||
new EntryRow({
|
|
||||||
title: _('Print Tree Structure'),
|
|
||||||
settings: settings,
|
|
||||||
bind: 'print-tree',
|
|
||||||
map: keybindingMap
|
|
||||||
})
|
|
||||||
);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// Helper function to create a keybinding mapping object
|
|
||||||
private createKeybindingMap() {
|
|
||||||
return {
|
|
||||||
from(settings: Gio.Settings, bind: string) {
|
|
||||||
return settings.get_strv(bind).join(',');
|
|
||||||
},
|
|
||||||
to(settings: Gio.Settings, bind: string, value: string) {
|
|
||||||
if (!!value) {
|
|
||||||
const mappings = value.split(',').map((x) => {
|
|
||||||
const [, key, mods] = Gtk.accelerator_parse(x);
|
|
||||||
return Gtk.accelerator_valid(key, mods) && Gtk.accelerator_name(key, mods);
|
|
||||||
});
|
|
||||||
// Filter out any false values to ensure we only have strings
|
|
||||||
const stringMappings = mappings.filter((x): x is string => typeof x === 'string');
|
|
||||||
if (stringMappings.length > 0) {
|
|
||||||
Logger.debug("setting", bind, "to", stringMappings);
|
|
||||||
settings.set_strv(bind, stringMappings);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// If value deleted, unset the mapping
|
|
||||||
settings.set_strv(bind, []);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
import GLib from "gi://GLib";
|
|
||||||
|
|
||||||
export type QueuedEvent = {
|
|
||||||
name: string;
|
|
||||||
callback: () => void;
|
|
||||||
}
|
|
||||||
|
|
||||||
const pendingEvents: Map<string, QueuedEvent> = new Map();
|
|
||||||
|
|
||||||
export default function queueEvent(event: QueuedEvent, interval = 200) {
|
|
||||||
pendingEvents.set(event.name, event);
|
|
||||||
|
|
||||||
GLib.timeout_add(GLib.PRIORITY_DEFAULT, interval, () => {
|
|
||||||
const e = pendingEvents.get(event.name);
|
|
||||||
if (e && e === event) {
|
|
||||||
pendingEvents.delete(event.name);
|
|
||||||
e.callback();
|
|
||||||
}
|
|
||||||
return GLib.SOURCE_REMOVE;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
export class Logger {
|
|
||||||
|
|
||||||
static fatal(...args: any[]) {
|
|
||||||
console.log(`[Aerospike] [FATAL]`, ...args);
|
|
||||||
}
|
|
||||||
|
|
||||||
static error(...args: any[]) {
|
|
||||||
console.log(`[Aerospike] [ERROR]`, ...args);
|
|
||||||
}
|
|
||||||
|
|
||||||
static warn(...args: any[]) {
|
|
||||||
console.log(`[Aerospike] [WARN]`, ...args);
|
|
||||||
}
|
|
||||||
|
|
||||||
static info(...args: any[]) {
|
|
||||||
console.log(`[Aerospike] [INFO]`, ...args);
|
|
||||||
}
|
|
||||||
|
|
||||||
static debug(...args: any[]) {
|
|
||||||
console.log(`[Aerospike] [DEBUG]`, ...args);
|
|
||||||
}
|
|
||||||
|
|
||||||
static trace(...args: any[]) {
|
|
||||||
console.log(`[Aerospike] [TRACE]`, ...args);
|
|
||||||
}
|
|
||||||
|
|
||||||
static log(...args: any[]) {
|
|
||||||
console.log(`[Aerospike] [LOG]`, ...args);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
export type Rect = {
|
|
||||||
x: number;
|
|
||||||
y: number;
|
|
||||||
width: number;
|
|
||||||
height: number;
|
|
||||||
}
|
|
||||||
@@ -1,704 +0,0 @@
|
|||||||
import {WindowWrapper} from "./window.js";
|
|
||||||
import {Logger} from "../utils/logger.js";
|
|
||||||
import queueEvent from "../utils/events.js";
|
|
||||||
import {Rect} from "../utils/rect.js";
|
|
||||||
import {TabBar, TAB_BAR_HEIGHT} from "./tabBar.js";
|
|
||||||
|
|
||||||
export enum Layout {
|
|
||||||
ACC_HORIZONTAL = 0,
|
|
||||||
ACC_VERTICAL = 1,
|
|
||||||
TABBED = 2,
|
|
||||||
}
|
|
||||||
|
|
||||||
export enum Direction {
|
|
||||||
LEFT = 'left',
|
|
||||||
RIGHT = 'right',
|
|
||||||
UP = 'up',
|
|
||||||
DOWN = 'down',
|
|
||||||
}
|
|
||||||
|
|
||||||
// Returns equal ratios summing exactly to 1.0, with float drift absorbed by the last slot.
|
|
||||||
function equalRatios(n: number): number[] {
|
|
||||||
if (n <= 0) return [];
|
|
||||||
const base = 1 / n;
|
|
||||||
const ratios = Array(n).fill(base);
|
|
||||||
const sumExceptLast = ratios.slice(0, -1).reduce((a, b) => a + b, 0);
|
|
||||||
ratios[n - 1] = 1 - sumExceptLast;
|
|
||||||
return ratios;
|
|
||||||
}
|
|
||||||
|
|
||||||
export default class WindowContainer {
|
|
||||||
|
|
||||||
_tiledItems: (WindowWrapper | WindowContainer)[];
|
|
||||||
_tiledWindowLookup: Map<number, WindowWrapper>;
|
|
||||||
_orientation: Layout = Layout.ACC_HORIZONTAL;
|
|
||||||
_workArea: Rect;
|
|
||||||
|
|
||||||
// -- Accordion Mode States
|
|
||||||
|
|
||||||
_splitRatios: number[];
|
|
||||||
|
|
||||||
// -- Tabbed mode state -----------------------------------------------------
|
|
||||||
_activeTabIndex: number = 0;
|
|
||||||
_tabBar: TabBar | null = null;
|
|
||||||
|
|
||||||
constructor(workspaceArea: Rect) {
|
|
||||||
this._tiledItems = [];
|
|
||||||
this._tiledWindowLookup = new Map<number, WindowWrapper>();
|
|
||||||
this._workArea = workspaceArea;
|
|
||||||
this._splitRatios = [];
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Helpers ----------------------------------------------------------------
|
|
||||||
|
|
||||||
private _resetRatios(): void {
|
|
||||||
this._splitRatios = equalRatios(this._tiledItems.length);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Proportionally shrink existing ratios to carve out space for a new item
|
|
||||||
* at the given index. If no index is supplied the ratio is appended at the end.
|
|
||||||
*/
|
|
||||||
private _addRatioForNewWindow(index?: number): void {
|
|
||||||
const n = this._tiledItems.length;
|
|
||||||
if (n <= 1) {
|
|
||||||
this._splitRatios = [1.0];
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const newRatio = 1 / n;
|
|
||||||
const scale = 1 - newRatio;
|
|
||||||
const scaled = this._splitRatios.map(r => r * scale);
|
|
||||||
const partialSum = scaled.reduce((a, b) => a + b, 0) + newRatio;
|
|
||||||
scaled[scaled.length - 1] += (1.0 - partialSum);
|
|
||||||
|
|
||||||
const insertAt = index ?? scaled.length;
|
|
||||||
scaled.splice(insertAt, 0, newRatio);
|
|
||||||
this._splitRatios = scaled;
|
|
||||||
}
|
|
||||||
|
|
||||||
private _totalDimension(): number {
|
|
||||||
return this._orientation === Layout.ACC_HORIZONTAL
|
|
||||||
? this._workArea.width
|
|
||||||
: this._workArea.height;
|
|
||||||
}
|
|
||||||
|
|
||||||
isTabbed(): boolean {
|
|
||||||
return this._orientation === Layout.TABBED;
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Public API -------------------------------------------------------------
|
|
||||||
|
|
||||||
move(rect: Rect): void {
|
|
||||||
this._workArea = rect;
|
|
||||||
this.drawWindows();
|
|
||||||
}
|
|
||||||
|
|
||||||
toggleOrientation(): void {
|
|
||||||
if (this._orientation === Layout.TABBED) {
|
|
||||||
// Tabbed → Horizontal: restore accordion mode
|
|
||||||
this.setAccordion(Layout.ACC_HORIZONTAL);
|
|
||||||
} else {
|
|
||||||
this._orientation = this._orientation === Layout.ACC_HORIZONTAL
|
|
||||||
? Layout.ACC_VERTICAL
|
|
||||||
: Layout.ACC_HORIZONTAL;
|
|
||||||
Logger.info(`Container orientation toggled to ${Layout[this._orientation]}`);
|
|
||||||
this.drawWindows();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Switch this container to tabbed mode.
|
|
||||||
*/
|
|
||||||
setTabbed(): void {
|
|
||||||
if (this._orientation === Layout.TABBED) return;
|
|
||||||
|
|
||||||
Logger.info("Container switching to TABBED mode");
|
|
||||||
this._orientation = Layout.TABBED;
|
|
||||||
|
|
||||||
// Clamp active tab index
|
|
||||||
if (this._activeTabIndex < 0 || this._activeTabIndex >= this._tiledItems.length) {
|
|
||||||
this._activeTabIndex = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create tab bar
|
|
||||||
this._tabBar = new TabBar((index) => {
|
|
||||||
this.setActiveTab(index);
|
|
||||||
});
|
|
||||||
|
|
||||||
this.drawWindows();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Switch this container back to accordion (H or V) mode.
|
|
||||||
*/
|
|
||||||
setAccordion(orientation: Layout.ACC_HORIZONTAL | Layout.ACC_VERTICAL): void {
|
|
||||||
if (this._orientation !== Layout.TABBED) {
|
|
||||||
// Already accordion — just set the orientation
|
|
||||||
this._orientation = orientation;
|
|
||||||
this.drawWindows();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Logger.info(`Container switching from TABBED to ${Layout[orientation]}`);
|
|
||||||
this._orientation = orientation;
|
|
||||||
|
|
||||||
// Destroy tab bar
|
|
||||||
if (this._tabBar) {
|
|
||||||
this._tabBar.destroy();
|
|
||||||
this._tabBar = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Show all windows (they may have been hidden in tabbed mode)
|
|
||||||
this._showAllWindows();
|
|
||||||
|
|
||||||
this.drawWindows();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the active tab by index. Shows that window, hides others, updates tab bar.
|
|
||||||
*/
|
|
||||||
setActiveTab(index: number): void {
|
|
||||||
if (!this.isTabbed()) return;
|
|
||||||
if (index < 0 || index >= this._tiledItems.length) return;
|
|
||||||
|
|
||||||
this._activeTabIndex = index;
|
|
||||||
Logger.info(`Active tab set to ${index}`);
|
|
||||||
|
|
||||||
this._applyTabVisibility();
|
|
||||||
this._updateTabBar();
|
|
||||||
|
|
||||||
// Tile to resize the active window to the content area
|
|
||||||
this.drawWindows();
|
|
||||||
}
|
|
||||||
|
|
||||||
getActiveTabIndex(): number {
|
|
||||||
return this._activeTabIndex;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* If the given window is a tab in this container, make it the active tab.
|
|
||||||
* Returns true if the window was found and activated.
|
|
||||||
*/
|
|
||||||
focusWindowTab(windowId: number): boolean {
|
|
||||||
if (!this.isTabbed()) return false;
|
|
||||||
|
|
||||||
const index = this._getIndexOfWindow(windowId);
|
|
||||||
if (index !== -1 && index !== this._activeTabIndex) {
|
|
||||||
this.setActiveTab(index);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return index !== -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
hideTabBar(): void {
|
|
||||||
this._tabBar?.hide();
|
|
||||||
}
|
|
||||||
|
|
||||||
showTabBar(): void {
|
|
||||||
if (this.isTabbed() && this._tabBar) {
|
|
||||||
this._tabBar.show();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Add a window to this container.
|
|
||||||
* If `index` is omitted the window is appended at the end.
|
|
||||||
* A negative index (e.g. -1) is treated as "append at end".
|
|
||||||
*/
|
|
||||||
addWindow(winWrap: WindowWrapper, index?: number): void {
|
|
||||||
const insertAt = (index === undefined || index < 0)
|
|
||||||
? this._tiledItems.length
|
|
||||||
: Math.min(index, this._tiledItems.length);
|
|
||||||
|
|
||||||
this._tiledItems.splice(insertAt, 0, winWrap);
|
|
||||||
this._tiledWindowLookup.set(winWrap.getWindowId(), winWrap);
|
|
||||||
this._addRatioForNewWindow(insertAt);
|
|
||||||
|
|
||||||
if (this.isTabbed()) {
|
|
||||||
// TODO: make it so that when tabs are added they are made the current active tab
|
|
||||||
this._applyTabVisibility();
|
|
||||||
this._updateTabBar();
|
|
||||||
}
|
|
||||||
|
|
||||||
queueEvent({
|
|
||||||
name: "tiling-windows",
|
|
||||||
callback: () => this.drawWindows(),
|
|
||||||
}, 100);
|
|
||||||
}
|
|
||||||
|
|
||||||
getWindow(win_id: number): WindowWrapper | undefined {
|
|
||||||
if (this._tiledWindowLookup.has(win_id)) {
|
|
||||||
return this._tiledWindowLookup.get(win_id);
|
|
||||||
}
|
|
||||||
for (const item of this._tiledItems) {
|
|
||||||
if (item instanceof WindowContainer) {
|
|
||||||
const win = item.getWindow(win_id);
|
|
||||||
if (win) return win;
|
|
||||||
} else if (item.getWindowId() === win_id) {
|
|
||||||
return item;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
_getIndexOfWindow(win_id: number): number {
|
|
||||||
for (let i = 0; i < this._tiledItems.length; i++) {
|
|
||||||
const item = this._tiledItems[i];
|
|
||||||
if (item instanceof WindowWrapper && item.getWindowId() === win_id) {
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
removeWindow(win_id: number): void {
|
|
||||||
if (this._tiledWindowLookup.has(win_id)) {
|
|
||||||
const index = this._getIndexOfWindow(win_id);
|
|
||||||
this._tiledWindowLookup.delete(win_id);
|
|
||||||
if (index !== -1) {
|
|
||||||
// If removing the window that was hidden in tabbed mode,
|
|
||||||
// make sure to show it first so it doesn't stay invisible
|
|
||||||
const item = this._tiledItems[index];
|
|
||||||
if (item instanceof WindowWrapper) {
|
|
||||||
item.showWindow();
|
|
||||||
}
|
|
||||||
this._tiledItems.splice(index, 1);
|
|
||||||
}
|
|
||||||
this._resetRatios();
|
|
||||||
|
|
||||||
if (this.isTabbed()) {
|
|
||||||
if (this._tiledItems.length === 0) {
|
|
||||||
this._activeTabIndex = 0;
|
|
||||||
} else if (this._activeTabIndex >= this._tiledItems.length) {
|
|
||||||
this._activeTabIndex = this._tiledItems.length - 1;
|
|
||||||
}
|
|
||||||
this._applyTabVisibility();
|
|
||||||
this._updateTabBar();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
for (const item of this._tiledItems) {
|
|
||||||
if (item instanceof WindowContainer) {
|
|
||||||
item.removeWindow(win_id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.drawWindows();
|
|
||||||
}
|
|
||||||
|
|
||||||
disconnectSignals(): void {
|
|
||||||
this._tiledItems.forEach((item) => {
|
|
||||||
if (item instanceof WindowContainer) {
|
|
||||||
item.disconnectSignals();
|
|
||||||
} else {
|
|
||||||
item.disconnectWindowSignals();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
removeAllWindows(): void {
|
|
||||||
// tabbed mode hides all windows - this ensures they are available before removal
|
|
||||||
this._showAllWindows();
|
|
||||||
|
|
||||||
if (this._tabBar) {
|
|
||||||
this._tabBar.destroy();
|
|
||||||
this._tabBar = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
this._tiledItems = [];
|
|
||||||
this._tiledWindowLookup.clear();
|
|
||||||
this._splitRatios = [];
|
|
||||||
this._activeTabIndex = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
drawWindows(): void {
|
|
||||||
Logger.log("TILING WINDOWS IN CONTAINER");
|
|
||||||
Logger.log("WorkArea", this._workArea);
|
|
||||||
|
|
||||||
if (this.isTabbed()) {
|
|
||||||
this._tileTab();
|
|
||||||
} else {
|
|
||||||
this._tileAccordion();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
_tileAccordion() {
|
|
||||||
if (this._tiledItems.length === 0) return;
|
|
||||||
|
|
||||||
const bounds = this.getBounds();
|
|
||||||
Logger.info(`_tileAccordion: ratios=[${this._splitRatios.map(r => r.toFixed(3)).join(', ')}] bounds=[${bounds.map(b => `(${b.x},${b.y},${b.width},${b.height})`).join(', ')}]`);
|
|
||||||
this._tiledItems.forEach((item, index) => {
|
|
||||||
const rect = bounds[index];
|
|
||||||
if (item instanceof WindowContainer) {
|
|
||||||
item.move(rect);
|
|
||||||
} else {
|
|
||||||
Logger.info(`_tileAccordion: window[${index}] id=${item.getWindowId()} dragging=${item._dragging} → rect=(${rect.x},${rect.y},${rect.width},${rect.height})`);
|
|
||||||
item.safelyResizeWindow(rect);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private _tileTab(): void {
|
|
||||||
if (this._tiledItems.length === 0) return;
|
|
||||||
|
|
||||||
const tabBarRect: Rect = {
|
|
||||||
x: this._workArea.x,
|
|
||||||
y: this._workArea.y,
|
|
||||||
width: this._workArea.width,
|
|
||||||
height: TAB_BAR_HEIGHT,
|
|
||||||
};
|
|
||||||
|
|
||||||
const contentRect: Rect = {
|
|
||||||
x: this._workArea.x,
|
|
||||||
y: this._workArea.y + TAB_BAR_HEIGHT,
|
|
||||||
width: this._workArea.width,
|
|
||||||
height: this._workArea.height - TAB_BAR_HEIGHT,
|
|
||||||
};
|
|
||||||
|
|
||||||
// Position and show the tab bar
|
|
||||||
if (this._tabBar) {
|
|
||||||
this._tabBar.setPosition(tabBarRect);
|
|
||||||
if (!this._tabBar.isVisible()) {
|
|
||||||
this._rebuildAndShowTabBar();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
this._applyTabVisibility();
|
|
||||||
|
|
||||||
const activeItem = this._tiledItems[this._activeTabIndex];
|
|
||||||
if (activeItem) {
|
|
||||||
if (activeItem instanceof WindowContainer) {
|
|
||||||
activeItem.move(contentRect);
|
|
||||||
} else {
|
|
||||||
Logger.info(`_tileTabbed: active tab[${this._activeTabIndex}] id=${activeItem.getWindowId()} → rect=(${contentRect.x},${contentRect.y},${contentRect.width},${contentRect.height})`);
|
|
||||||
activeItem.safelyResizeWindow(contentRect);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Show the active tab window, hide all others.
|
|
||||||
*/
|
|
||||||
private _applyTabVisibility(): void {
|
|
||||||
this._tiledItems.forEach((item, index) => {
|
|
||||||
if (item instanceof WindowWrapper) {
|
|
||||||
if (index === this._activeTabIndex) {
|
|
||||||
item.showWindow();
|
|
||||||
} else {
|
|
||||||
item.hideWindow();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Show all windows (used when leaving tabbed mode).
|
|
||||||
*/
|
|
||||||
private _showAllWindows(): void {
|
|
||||||
this._tiledItems.forEach((item) => {
|
|
||||||
if (item instanceof WindowWrapper) {
|
|
||||||
item.showWindow();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Rebuild the tab bar buttons and show it.
|
|
||||||
*/
|
|
||||||
private _rebuildAndShowTabBar(): void {
|
|
||||||
if (!this._tabBar) return;
|
|
||||||
|
|
||||||
const windowItems = this._tiledItems.filter(
|
|
||||||
(item): item is WindowWrapper => item instanceof WindowWrapper
|
|
||||||
);
|
|
||||||
|
|
||||||
this._tabBar.rebuild(windowItems, this._activeTabIndex);
|
|
||||||
this._tabBar.show();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Public entry point to refresh tab titles (e.g. when a window title changes).
|
|
||||||
*/
|
|
||||||
refreshTabTitles(): void {
|
|
||||||
this._updateTabBar();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update tab bar state (active highlight, titles) without a full rebuild.
|
|
||||||
*/
|
|
||||||
private _updateTabBar(): void {
|
|
||||||
if (!this._tabBar) return;
|
|
||||||
|
|
||||||
// Rebuild is cheap — just recreate buttons from the current items
|
|
||||||
const windowItems = this._tiledItems.filter(
|
|
||||||
(item): item is WindowWrapper => item instanceof WindowWrapper
|
|
||||||
);
|
|
||||||
|
|
||||||
this._tabBar.rebuild(windowItems, this._activeTabIndex);
|
|
||||||
}
|
|
||||||
|
|
||||||
getBounds(): Rect[] {
|
|
||||||
if (this._orientation === Layout.TABBED) {
|
|
||||||
// In tabbed mode, all items share the same content rect
|
|
||||||
const contentRect: Rect = {
|
|
||||||
x: this._workArea.x,
|
|
||||||
y: this._workArea.y + TAB_BAR_HEIGHT,
|
|
||||||
width: this._workArea.width,
|
|
||||||
height: this._workArea.height - TAB_BAR_HEIGHT,
|
|
||||||
};
|
|
||||||
return this._tiledItems.map(() => contentRect);
|
|
||||||
}
|
|
||||||
|
|
||||||
return this._orientation === Layout.ACC_HORIZONTAL
|
|
||||||
? this._computeBounds('horizontal')
|
|
||||||
: this._computeBounds('vertical');
|
|
||||||
}
|
|
||||||
|
|
||||||
private _computeBounds(axis: 'horizontal' | 'vertical'): Rect[] {
|
|
||||||
const isHorizontal = axis === 'horizontal';
|
|
||||||
const total = isHorizontal ? this._workArea.width : this._workArea.height;
|
|
||||||
let used = 0;
|
|
||||||
|
|
||||||
return this._tiledItems.map((_, index) => {
|
|
||||||
const offset = used;
|
|
||||||
const size = index === this._tiledItems.length - 1
|
|
||||||
? total - used
|
|
||||||
: Math.floor(this._splitRatios[index] * total);
|
|
||||||
used += size;
|
|
||||||
|
|
||||||
return isHorizontal
|
|
||||||
? {x: this._workArea.x + offset, y: this._workArea.y, width: size, height: this._workArea.height}
|
|
||||||
: {x: this._workArea.x, y: this._workArea.y + offset, width: this._workArea.width, height: size};
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
adjustBoundary(boundaryIndex: number, deltaPixels: number): boolean {
|
|
||||||
// No boundary adjustment in tabbed mode
|
|
||||||
if (this.isTabbed()) return false;
|
|
||||||
|
|
||||||
if (boundaryIndex < 0 || boundaryIndex >= this._tiledItems.length - 1) {
|
|
||||||
Logger.warn(`adjustBoundary: invalid boundaryIndex ${boundaryIndex}`);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
const totalDim = this._totalDimension();
|
|
||||||
if (totalDim === 0) return false;
|
|
||||||
|
|
||||||
const ratioDelta = deltaPixels / totalDim;
|
|
||||||
const newLeft = this._splitRatios[boundaryIndex] + ratioDelta;
|
|
||||||
const newRight = this._splitRatios[boundaryIndex + 1] - ratioDelta;
|
|
||||||
|
|
||||||
if (newLeft <= 0 || newRight <= 0) {
|
|
||||||
Logger.log(`adjustBoundary: clamped — newLeft=${newLeft.toFixed(3)}, newRight=${newRight.toFixed(3)}`);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
this._splitRatios[boundaryIndex] = newLeft;
|
|
||||||
this._splitRatios[boundaryIndex + 1] = newRight;
|
|
||||||
|
|
||||||
Logger.info(`adjustBoundary: boundary=${boundaryIndex} ratios=[${this._splitRatios.map(r => r.toFixed(3)).join(', ')}]`);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Container Lookup --------------------------------------------------------
|
|
||||||
|
|
||||||
getContainerForWindow(win_id: number): WindowContainer | null {
|
|
||||||
for (const item of this._tiledItems) {
|
|
||||||
if (item instanceof WindowWrapper && item.getWindowId() === win_id) {
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
if (item instanceof WindowContainer) {
|
|
||||||
const found = item.getContainerForWindow(win_id);
|
|
||||||
if (found !== null) return found;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
getIndexOfItemNested(item: WindowWrapper): number {
|
|
||||||
for (let i = 0; i < this._tiledItems.length; i++) {
|
|
||||||
const container = this._tiledItems[i];
|
|
||||||
if (container instanceof WindowContainer) {
|
|
||||||
if (container.getIndexOfItemNested(item) !== -1) return i;
|
|
||||||
} else if (container.getWindowId() === item.getWindowId()) {
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: update this to work with nested containers - all other logic should already be working
|
|
||||||
itemDragged(item: WindowWrapper, x: number, y: number): void {
|
|
||||||
// In tabbed mode, dragging reorders tabs but doesn't change layout
|
|
||||||
if (this.isTabbed()) {
|
|
||||||
// Don't reorder during tabbed mode — tabs have a fixed visual layout
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const original_index = this.getIndexOfItemNested(item);
|
|
||||||
|
|
||||||
if (original_index === -1) {
|
|
||||||
Logger.error("Item not found in container during drag op", item.getWindowId());
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
let new_index = original_index;
|
|
||||||
this.getBounds().forEach((rect, index) => {
|
|
||||||
if (rect.x < x && rect.x + rect.width > x && rect.y < y && rect.y + rect.height > y) {
|
|
||||||
new_index = index;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if (original_index !== new_index) {
|
|
||||||
Logger.info(`itemDragged: swapped slots ${original_index}<->${new_index}, ratios=[${this._splitRatios.map(r => r.toFixed(3)).join(', ')}]`);
|
|
||||||
[this._tiledItems[original_index], this._tiledItems[new_index]] =
|
|
||||||
[this._tiledItems[new_index], this._tiledItems[original_index]];
|
|
||||||
this.drawWindows();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
resetRatios(): void {
|
|
||||||
this._resetRatios();
|
|
||||||
this.drawWindows();
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Directional Move (swap) ------------------------------------------------
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Swap the window at `windowId` with its neighbour in the given direction.
|
|
||||||
* Returns true if the swap occurred, false if the window is already at the edge
|
|
||||||
* or the direction is perpendicular to the container axis.
|
|
||||||
*/
|
|
||||||
swapWindowInDirection(windowId: number, direction: Direction): boolean {
|
|
||||||
const currentIndex = this._getIndexOfWindow(windowId);
|
|
||||||
if (currentIndex === -1) return false;
|
|
||||||
|
|
||||||
if (this.isTabbed()) {
|
|
||||||
// Tabbed: left/up = swap toward start, right/down = swap toward end
|
|
||||||
const delta = (direction === Direction.LEFT || direction === Direction.UP) ? -1 : 1;
|
|
||||||
const newIndex = currentIndex + delta;
|
|
||||||
if (newIndex < 0 || newIndex >= this._tiledItems.length) return false;
|
|
||||||
|
|
||||||
this._swapItems(currentIndex, newIndex);
|
|
||||||
this._activeTabIndex = newIndex;
|
|
||||||
this._updateTabBar();
|
|
||||||
this.drawWindows();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Accordion mode — only swap along the container's axis
|
|
||||||
const isAlongAxis =
|
|
||||||
(this._orientation === Layout.ACC_HORIZONTAL && (direction === Direction.LEFT || direction === Direction.RIGHT)) ||
|
|
||||||
(this._orientation === Layout.ACC_VERTICAL && (direction === Direction.UP || direction === Direction.DOWN));
|
|
||||||
|
|
||||||
if (!isAlongAxis) return false;
|
|
||||||
|
|
||||||
const delta = (direction === Direction.LEFT || direction === Direction.UP) ? -1 : 1;
|
|
||||||
const newIndex = currentIndex + delta;
|
|
||||||
if (newIndex < 0 || newIndex >= this._tiledItems.length) return false;
|
|
||||||
|
|
||||||
this._swapItems(currentIndex, newIndex);
|
|
||||||
this.drawWindows();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Swap two items in `_tiledItems` and their corresponding split ratios.
|
|
||||||
*/
|
|
||||||
private _swapItems(indexA: number, indexB: number): void {
|
|
||||||
[this._tiledItems[indexA], this._tiledItems[indexB]] =
|
|
||||||
[this._tiledItems[indexB], this._tiledItems[indexA]];
|
|
||||||
[this._splitRatios[indexA], this._splitRatios[indexB]] =
|
|
||||||
[this._splitRatios[indexB], this._splitRatios[indexA]];
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Directional Navigation ------------------------------------------------
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Given a window inside this container and a direction, return the window ID
|
|
||||||
* that should receive focus, or null if the edge of the container is reached.
|
|
||||||
*
|
|
||||||
* Behaviour by layout mode:
|
|
||||||
* - ACC_HORIZONTAL: left/right moves to the prev/next item; up/down → null
|
|
||||||
* - ACC_VERTICAL: up/down moves to the prev/next item; left/right → null
|
|
||||||
* - TABBED: left/right moves to the prev/next tab; up/down → null
|
|
||||||
*/
|
|
||||||
getAdjacentWindowId(windowId: number, direction: Direction): number | null {
|
|
||||||
const currentIndex = this._getIndexOfWindow(windowId);
|
|
||||||
if (currentIndex === -1) return null;
|
|
||||||
|
|
||||||
if (this.isTabbed()) {
|
|
||||||
// Tabbed: left/right cycle through tabs
|
|
||||||
if (direction === Direction.LEFT || direction === Direction.UP) {
|
|
||||||
const newIndex = currentIndex - 1;
|
|
||||||
if (newIndex < 0) return null;
|
|
||||||
return this._windowIdAtIndex(newIndex);
|
|
||||||
}
|
|
||||||
if (direction === Direction.RIGHT || direction === Direction.DOWN) {
|
|
||||||
const newIndex = currentIndex + 1;
|
|
||||||
if (newIndex >= this._tiledItems.length) return null;
|
|
||||||
return this._windowIdAtIndex(newIndex);
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Accordion mode – only navigate along the container's axis
|
|
||||||
const isAlongAxis =
|
|
||||||
(this._orientation === Layout.ACC_HORIZONTAL && (direction === Direction.LEFT || direction === Direction.RIGHT)) ||
|
|
||||||
(this._orientation === Layout.ACC_VERTICAL && (direction === Direction.UP || direction === Direction.DOWN));
|
|
||||||
|
|
||||||
if (!isAlongAxis) return null;
|
|
||||||
|
|
||||||
const delta = (direction === Direction.LEFT || direction === Direction.UP) ? -1 : 1;
|
|
||||||
const newIndex = currentIndex + delta;
|
|
||||||
if (newIndex < 0 || newIndex >= this._tiledItems.length) return null;
|
|
||||||
|
|
||||||
return this._windowIdAtIndex(newIndex);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return the "representative" window ID for the item at `index`.
|
|
||||||
* If the item is a WindowWrapper, return its ID directly.
|
|
||||||
* If it's a nested WindowContainer, return the first (or last) leaf window.
|
|
||||||
*/
|
|
||||||
private _windowIdAtIndex(index: number): number | null {
|
|
||||||
const item = this._tiledItems[index];
|
|
||||||
if (!item) return null;
|
|
||||||
|
|
||||||
if (item instanceof WindowWrapper) {
|
|
||||||
return item.getWindowId();
|
|
||||||
}
|
|
||||||
if (item instanceof WindowContainer) {
|
|
||||||
return item._firstLeafWindowId();
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return the window ID of the first leaf window in this container (depth-first).
|
|
||||||
*/
|
|
||||||
_firstLeafWindowId(): number | null {
|
|
||||||
for (const item of this._tiledItems) {
|
|
||||||
if (item instanceof WindowWrapper) return item.getWindowId();
|
|
||||||
if (item instanceof WindowContainer) {
|
|
||||||
const id = item._firstLeafWindowId();
|
|
||||||
if (id !== null) return id;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return the window ID of the last leaf window in this container (depth-first from end).
|
|
||||||
*/
|
|
||||||
_lastLeafWindowId(): number | null {
|
|
||||||
for (let i = this._tiledItems.length - 1; i >= 0; i--) {
|
|
||||||
const item = this._tiledItems[i];
|
|
||||||
if (item instanceof WindowWrapper) return item.getWindowId();
|
|
||||||
if (item instanceof WindowContainer) {
|
|
||||||
const id = item._lastLeafWindowId();
|
|
||||||
if (id !== null) return id;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,103 +0,0 @@
|
|||||||
import {WindowWrapper} from "./window.js";
|
|
||||||
import {Rect} from "../utils/rect.js";
|
|
||||||
import {Logger} from "../utils/logger.js";
|
|
||||||
|
|
||||||
import WindowContainer from "./container.js";
|
|
||||||
|
|
||||||
export default class Monitor {
|
|
||||||
|
|
||||||
_id: number;
|
|
||||||
_workArea: Rect;
|
|
||||||
_workspaces: WindowContainer[] = [];
|
|
||||||
|
|
||||||
constructor(monitorId: number) {
|
|
||||||
this._id = monitorId;
|
|
||||||
const workspace = global.workspace_manager.get_active_workspace();
|
|
||||||
this._workArea = workspace.get_work_area_for_monitor(this._id);
|
|
||||||
Logger.log("CREATING MONITOR", monitorId);
|
|
||||||
Logger.log("WorkArea", this._workArea.x, this._workArea.y, this._workArea.width, this._workArea.height);
|
|
||||||
const workspaceCount = global.workspace_manager.get_n_workspaces();
|
|
||||||
Logger.log("Workspace Count", workspaceCount);
|
|
||||||
for (let i = 0; i < workspaceCount; i++) {
|
|
||||||
this._workspaces.push(new WindowContainer(this._workArea));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
disconnectSignals() {
|
|
||||||
for (const container of this._workspaces) {
|
|
||||||
container.disconnectSignals();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
removeAllWindows(): void {
|
|
||||||
for (const container of this._workspaces) {
|
|
||||||
container.removeAllWindows();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
getWindow(windowId: number): WindowWrapper | undefined {
|
|
||||||
for (const container of this._workspaces) {
|
|
||||||
const win = container.getWindow(windowId);
|
|
||||||
if (win) return win;
|
|
||||||
}
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
removeWindow(winWrap: WindowWrapper) {
|
|
||||||
const windowId = winWrap.getWindowId();
|
|
||||||
for (const container of this._workspaces) {
|
|
||||||
if (container.getWindow(windowId)) {
|
|
||||||
container.removeWindow(windowId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
addWindow(winWrap: WindowWrapper, index?: number) {
|
|
||||||
const window_workspace = winWrap.getWindow().get_workspace().index();
|
|
||||||
this._workspaces[window_workspace].addWindow(winWrap, index);
|
|
||||||
}
|
|
||||||
|
|
||||||
tileWindows(): void {
|
|
||||||
const activeWorkspace = global.workspace_manager.get_active_workspace();
|
|
||||||
this._workArea = activeWorkspace.get_work_area_for_monitor(this._id);
|
|
||||||
// move() calls tileWindows() internally
|
|
||||||
this._workspaces[activeWorkspace.index()].move(this._workArea);
|
|
||||||
}
|
|
||||||
|
|
||||||
removeWorkspace(workspaceId: number): void {
|
|
||||||
this._workspaces.splice(workspaceId, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
addWorkspace(): void {
|
|
||||||
this._workspaces.push(new WindowContainer(this._workArea));
|
|
||||||
}
|
|
||||||
|
|
||||||
focusWindowTab(windowId: number): void {
|
|
||||||
for (const container of this._workspaces) {
|
|
||||||
if (container.focusWindowTab(windowId)) return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
refreshTabTitlesForWindow(winWrap: WindowWrapper): void {
|
|
||||||
const wsId = winWrap.getWorkspace();
|
|
||||||
if (wsId >= 0 && wsId < this._workspaces.length) {
|
|
||||||
this._workspaces[wsId].refreshTabTitles();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
hideTabBars(): void {
|
|
||||||
for (const container of this._workspaces) {
|
|
||||||
container.hideTabBar();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
showTabBars(): void {
|
|
||||||
for (const container of this._workspaces) {
|
|
||||||
container.showTabBar();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
itemDragged(item: WindowWrapper, x: number, y: number): void {
|
|
||||||
this._workspaces[item.getWorkspace()].itemDragged(item, x, y);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,131 +0,0 @@
|
|||||||
import Clutter from 'gi://Clutter';
|
|
||||||
import Pango from 'gi://Pango';
|
|
||||||
import St from 'gi://St';
|
|
||||||
import * as Main from 'resource:///org/gnome/shell/ui/main.js';
|
|
||||||
import {Logger} from "../utils/logger.js";
|
|
||||||
import {WindowWrapper} from "./window.js";
|
|
||||||
import {Rect} from "../utils/rect.js";
|
|
||||||
|
|
||||||
export const TAB_BAR_HEIGHT = 24;
|
|
||||||
|
|
||||||
type TabClickedCallback = (index: number) => void;
|
|
||||||
|
|
||||||
export class TabBar {
|
|
||||||
private _bar: St.BoxLayout;
|
|
||||||
private _buttons: St.Button[] = [];
|
|
||||||
private _activeIndex: number = 0;
|
|
||||||
private _onTabClicked: TabClickedCallback;
|
|
||||||
private _visible: boolean = false;
|
|
||||||
|
|
||||||
constructor(onTabClicked: TabClickedCallback) {
|
|
||||||
this._onTabClicked = onTabClicked;
|
|
||||||
this._bar = new St.BoxLayout({
|
|
||||||
style_class: 'aerospike-tab-bar',
|
|
||||||
vertical: false,
|
|
||||||
reactive: true,
|
|
||||||
can_focus: false,
|
|
||||||
track_hover: false,
|
|
||||||
});
|
|
||||||
// Force all tabs to equal width regardless of text length
|
|
||||||
(this._bar.layout_manager as Clutter.BoxLayout).homogeneous = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Rebuild all tab buttons from the current list of window items.
|
|
||||||
*/
|
|
||||||
rebuild(items: WindowWrapper[], activeIndex: number): void {
|
|
||||||
// Remove old buttons
|
|
||||||
this._bar.destroy_all_children();
|
|
||||||
this._buttons = [];
|
|
||||||
|
|
||||||
items.forEach((item, index) => {
|
|
||||||
const label = new St.Label({
|
|
||||||
text: item.getTabLabel(),
|
|
||||||
style_class: 'aerospike-tab-label',
|
|
||||||
y_align: Clutter.ActorAlign.CENTER,
|
|
||||||
x_align: Clutter.ActorAlign.CENTER,
|
|
||||||
x_expand: true,
|
|
||||||
});
|
|
||||||
label.clutter_text.ellipsize = Pango.EllipsizeMode.END;
|
|
||||||
|
|
||||||
const button = new St.Button({
|
|
||||||
style_class: 'aerospike-tab',
|
|
||||||
reactive: true,
|
|
||||||
can_focus: false,
|
|
||||||
track_hover: true,
|
|
||||||
x_expand: true,
|
|
||||||
child: label,
|
|
||||||
});
|
|
||||||
|
|
||||||
button.connect('clicked', () => {
|
|
||||||
this._onTabClicked(index);
|
|
||||||
});
|
|
||||||
|
|
||||||
this._bar.add_child(button);
|
|
||||||
this._buttons.push(button);
|
|
||||||
});
|
|
||||||
|
|
||||||
this.setActive(activeIndex);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update just the title text of a single tab (e.g. when a window title changes).
|
|
||||||
*/
|
|
||||||
updateTabTitle(index: number, title: string): void {
|
|
||||||
if (index < 0 || index >= this._buttons.length) return;
|
|
||||||
const label = this._buttons[index].get_child() as St.Label;
|
|
||||||
if (label) label.set_text(title);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Highlight the active tab and dim the rest.
|
|
||||||
*/
|
|
||||||
setActive(index: number): void {
|
|
||||||
this._activeIndex = index;
|
|
||||||
this._buttons.forEach((btn, i) => {
|
|
||||||
if (i === index) {
|
|
||||||
btn.add_style_class_name('aerospike-tab-active');
|
|
||||||
} else {
|
|
||||||
btn.remove_style_class_name('aerospike-tab-active');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Position and size the tab bar at the given screen rect.
|
|
||||||
*/
|
|
||||||
setPosition(rect: Rect): void {
|
|
||||||
this._bar.set_position(rect.x, rect.y);
|
|
||||||
this._bar.set_size(rect.width, rect.height);
|
|
||||||
}
|
|
||||||
|
|
||||||
show(): void {
|
|
||||||
if (this._visible) return;
|
|
||||||
this._visible = true;
|
|
||||||
Main.layoutManager.uiGroup.add_child(this._bar);
|
|
||||||
this._bar.show();
|
|
||||||
Logger.log("TabBar shown");
|
|
||||||
}
|
|
||||||
|
|
||||||
hide(): void {
|
|
||||||
if (!this._visible) return;
|
|
||||||
this._visible = false;
|
|
||||||
this._bar.hide();
|
|
||||||
if (this._bar.get_parent()) {
|
|
||||||
Main.layoutManager.uiGroup.remove_child(this._bar);
|
|
||||||
}
|
|
||||||
Logger.log("TabBar hidden");
|
|
||||||
}
|
|
||||||
|
|
||||||
destroy(): void {
|
|
||||||
this.hide();
|
|
||||||
this._bar.destroy_all_children();
|
|
||||||
this._buttons = [];
|
|
||||||
this._bar.destroy();
|
|
||||||
Logger.log("TabBar destroyed");
|
|
||||||
}
|
|
||||||
|
|
||||||
isVisible(): boolean {
|
|
||||||
return this._visible;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,187 +0,0 @@
|
|||||||
import Meta from 'gi://Meta';
|
|
||||||
import Clutter from "gi://Clutter";
|
|
||||||
import {IWindowManager} from "./windowManager.js";
|
|
||||||
import {Logger} from "../utils/logger.js";
|
|
||||||
import {Rect} from "../utils/rect.js";
|
|
||||||
import WindowContainer from "./container.js";
|
|
||||||
import queueEvent from "../utils/events.js";
|
|
||||||
|
|
||||||
|
|
||||||
type WindowMinimizedHandler = (window: WindowWrapper) => void;
|
|
||||||
type WindowWorkspaceChangedHandler = (window: WindowWrapper) => void;
|
|
||||||
|
|
||||||
export class WindowWrapper {
|
|
||||||
private static readonly RESIZE_TOLERANCE = 2;
|
|
||||||
|
|
||||||
readonly _window: Meta.Window;
|
|
||||||
readonly _windowMinimizedHandler: WindowMinimizedHandler;
|
|
||||||
readonly _signals: number[] = [];
|
|
||||||
_parent: WindowContainer | null = null;
|
|
||||||
_dragging: boolean = false;
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
window: Meta.Window,
|
|
||||||
winMinimized: WindowMinimizedHandler
|
|
||||||
) {
|
|
||||||
this._window = window;
|
|
||||||
this._windowMinimizedHandler = winMinimized;
|
|
||||||
}
|
|
||||||
|
|
||||||
getWindow(): Meta.Window {
|
|
||||||
return this._window;
|
|
||||||
}
|
|
||||||
|
|
||||||
getWindowId(): number {
|
|
||||||
return this._window.get_id();
|
|
||||||
}
|
|
||||||
|
|
||||||
getWorkspace(): number {
|
|
||||||
return this._window.get_workspace().index();
|
|
||||||
}
|
|
||||||
|
|
||||||
getMonitor(): number {
|
|
||||||
return this._window.get_monitor();
|
|
||||||
}
|
|
||||||
|
|
||||||
getRect(): Rect {
|
|
||||||
return this._window.get_frame_rect();
|
|
||||||
}
|
|
||||||
|
|
||||||
getTabLabel(): string {
|
|
||||||
const rawAppName = this._window.get_wm_class() ?? '';
|
|
||||||
// Strip reverse-domain prefix (e.g. "org.gnome.Nautilus" -> "Nautilus")
|
|
||||||
const lastName = rawAppName.includes('.')
|
|
||||||
? (rawAppName.split('.').pop() ?? rawAppName)
|
|
||||||
: rawAppName;
|
|
||||||
// Capitalize first letter
|
|
||||||
const appName = lastName.charAt(0).toUpperCase() + lastName.slice(1);
|
|
||||||
const title = this._window.get_title() ?? 'Untitled';
|
|
||||||
if (appName && appName.toLowerCase() !== title.toLowerCase()) {
|
|
||||||
return `${appName} | ${title}`;
|
|
||||||
}
|
|
||||||
return title;
|
|
||||||
}
|
|
||||||
|
|
||||||
hideWindow(): void {
|
|
||||||
const actor = this._window.get_compositor_private() as Clutter.Actor | null;
|
|
||||||
if (actor) actor.hide();
|
|
||||||
}
|
|
||||||
|
|
||||||
showWindow(): void {
|
|
||||||
const actor = this._window.get_compositor_private() as Clutter.Actor | null;
|
|
||||||
if (actor) actor.show();
|
|
||||||
}
|
|
||||||
|
|
||||||
startDragging(): void {
|
|
||||||
this._dragging = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
stopDragging(): void {
|
|
||||||
Logger.log("STOPPED DRAGGING")
|
|
||||||
this._dragging = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
connectWindowSignals(windowManager: IWindowManager): void {
|
|
||||||
const windowId = this._window.get_id();
|
|
||||||
this._signals.push(
|
|
||||||
this._window.connect('unmanaging', () => {
|
|
||||||
Logger.log("REMOVING WINDOW", windowId);
|
|
||||||
windowManager.handleWindowClosed(this);
|
|
||||||
}),
|
|
||||||
this._window.connect('notify::minimized', () => {
|
|
||||||
if (this._window.minimized) {
|
|
||||||
Logger.log(`Window minimized: ${windowId}`);
|
|
||||||
windowManager.handleWindowMinimized(this);
|
|
||||||
} else {
|
|
||||||
Logger.log(`Window unminimized: ${windowId}`);
|
|
||||||
windowManager.handleWindowUnminimized(this);
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
this._window.connect('notify::maximized-horizontally', () => {
|
|
||||||
if (this._window.is_maximized()) {
|
|
||||||
Logger.log(`Window maximized: ${windowId}`);
|
|
||||||
} else {
|
|
||||||
Logger.log(`Window unmaximized: ${windowId}`);
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
this._window.connect("workspace-changed", () => {
|
|
||||||
Logger.log("WORKSPACE CHANGED FOR WINDOW", this._window.get_id());
|
|
||||||
windowManager.handleWindowChangedWorkspace(this);
|
|
||||||
}),
|
|
||||||
this._window.connect("position-changed", () => {
|
|
||||||
windowManager.handleWindowPositionChanged(this);
|
|
||||||
}),
|
|
||||||
this._window.connect("size-changed", () => {
|
|
||||||
windowManager.handleWindowPositionChanged(this);
|
|
||||||
}),
|
|
||||||
this._window.connect('notify::title', () => {
|
|
||||||
windowManager.handleWindowTitleChanged(this);
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
disconnectWindowSignals(): void {
|
|
||||||
if (this._signals) {
|
|
||||||
this._signals.forEach(signal => {
|
|
||||||
try {
|
|
||||||
if (this._window != null) {
|
|
||||||
this._window.disconnect(signal);
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
Logger.warn("error disconnecting signal", signal, e);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
safelyResizeWindow(rect: Rect, _retry: number = 3): void {
|
|
||||||
if (this._dragging) {
|
|
||||||
Logger.info("STOPPED RESIZE BECAUSE ITEM IS BEING DRAGGED");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const actor = this._window.get_compositor_private() as Clutter.Actor | null;
|
|
||||||
if (!actor) {
|
|
||||||
Logger.log("No actor available, can't resize safely yet");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
actor.remove_all_transitions();
|
|
||||||
|
|
||||||
// Move first to guarantee the window reaches the correct position even
|
|
||||||
// if the subsequent resize is clamped by minimum-size hints.
|
|
||||||
this._window.move_frame(true, rect.x, rect.y);
|
|
||||||
this._window.move_resize_frame(true, rect.x, rect.y, rect.width, rect.height);
|
|
||||||
|
|
||||||
const new_rect = this._window.get_frame_rect();
|
|
||||||
const mismatch =
|
|
||||||
Math.abs(new_rect.x - rect.x) > WindowWrapper.RESIZE_TOLERANCE ||
|
|
||||||
Math.abs(new_rect.y - rect.y) > WindowWrapper.RESIZE_TOLERANCE ||
|
|
||||||
Math.abs(new_rect.width - rect.width) > WindowWrapper.RESIZE_TOLERANCE ||
|
|
||||||
Math.abs(new_rect.height - rect.height) > WindowWrapper.RESIZE_TOLERANCE;
|
|
||||||
|
|
||||||
if (_retry > 0 && mismatch) {
|
|
||||||
// If the window's actual size is larger than requested, it has a
|
|
||||||
// minimum-size constraint — retrying won't help. Just make sure
|
|
||||||
// it's at the correct position with its actual size.
|
|
||||||
const sizeConstrained =
|
|
||||||
new_rect.width > rect.width + WindowWrapper.RESIZE_TOLERANCE ||
|
|
||||||
new_rect.height > rect.height + WindowWrapper.RESIZE_TOLERANCE;
|
|
||||||
|
|
||||||
if (sizeConstrained) {
|
|
||||||
Logger.info("Window has min-size constraint, accepting actual size",
|
|
||||||
`want(${rect.x},${rect.y},${rect.width},${rect.height})`,
|
|
||||||
`actual(${new_rect.x},${new_rect.y},${new_rect.width},${new_rect.height})`);
|
|
||||||
this._window.move_frame(true, rect.x, rect.y);
|
|
||||||
} else {
|
|
||||||
Logger.warn("RESIZE MISMATCH, retrying",
|
|
||||||
`want(${rect.x},${rect.y},${rect.width},${rect.height})`,
|
|
||||||
`got(${new_rect.x},${new_rect.y},${new_rect.width},${new_rect.height})`);
|
|
||||||
queueEvent({
|
|
||||||
name: `delayed_resize_${this.getWindowId()}`,
|
|
||||||
callback: () => this.safelyResizeWindow(rect, _retry - 1),
|
|
||||||
}, 50);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,817 +0,0 @@
|
|||||||
import Meta from "gi://Meta";
|
|
||||||
import Gio from "gi://Gio";
|
|
||||||
|
|
||||||
import {WindowWrapper} from './window.js';
|
|
||||||
import * as Main from "resource:///org/gnome/shell/ui/main.js";
|
|
||||||
import {Logger} from "../utils/logger.js";
|
|
||||||
import Monitor from "./monitor.js";
|
|
||||||
import WindowContainer, {Direction, Layout} from "./container.js";
|
|
||||||
import {Rect} from "../utils/rect.js";
|
|
||||||
|
|
||||||
|
|
||||||
export interface IWindowManager {
|
|
||||||
_activeWindowId: number | null;
|
|
||||||
|
|
||||||
handleWindowClosed(winWrap: WindowWrapper): void;
|
|
||||||
|
|
||||||
handleWindowMinimized(winWrap: WindowWrapper): void;
|
|
||||||
|
|
||||||
handleWindowUnminimized(winWrap: WindowWrapper): void;
|
|
||||||
|
|
||||||
handleWindowChangedWorkspace(winWrap: WindowWrapper): void;
|
|
||||||
|
|
||||||
handleWindowPositionChanged(winWrap: WindowWrapper): void;
|
|
||||||
|
|
||||||
handleWindowTitleChanged(winWrap: WindowWrapper): void;
|
|
||||||
|
|
||||||
syncActiveWindow(): number | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const _UNUSED_MONITOR_ID = -1;
|
|
||||||
const _UNUSED_WINDOW_ID = -1;
|
|
||||||
|
|
||||||
export default class WindowManager implements IWindowManager {
|
|
||||||
_displaySignals: number[] = [];
|
|
||||||
_windowManagerSignals: number[] = [];
|
|
||||||
_workspaceManagerSignals: number[] = [];
|
|
||||||
_overviewSignals: number[] = [];
|
|
||||||
|
|
||||||
_activeWindowId: number | null = null;
|
|
||||||
_monitors: Map<number, Monitor> = new Map<number, Monitor>();
|
|
||||||
_minimizedItems: Map<number, WindowWrapper> = new Map<number, WindowWrapper>();
|
|
||||||
|
|
||||||
_grabbedWindowMonitor: number = _UNUSED_MONITOR_ID;
|
|
||||||
_grabbedWindowId: number = _UNUSED_WINDOW_ID;
|
|
||||||
_changingGrabbedMonitor: boolean = false;
|
|
||||||
_showingOverview: boolean = false;
|
|
||||||
|
|
||||||
// -- Resize-drag tracking --------------------------------------------------
|
|
||||||
_isResizeDrag: boolean = false;
|
|
||||||
_resizeDragWindowId: number = _UNUSED_WINDOW_ID;
|
|
||||||
_resizeDragOp: Meta.GrabOp = Meta.GrabOp.NONE;
|
|
||||||
_resizeDragLastMouseX: number = 0;
|
|
||||||
_resizeDragLastMouseY: number = 0;
|
|
||||||
_isTiling: boolean = false;
|
|
||||||
|
|
||||||
private readonly _settings: Gio.Settings;
|
|
||||||
|
|
||||||
constructor(settings: Gio.Settings) {
|
|
||||||
this._settings = settings;
|
|
||||||
}
|
|
||||||
|
|
||||||
public enable(): void {
|
|
||||||
Logger.log("Starting Aerospike Window Manager");
|
|
||||||
this.instantiateDisplaySignals();
|
|
||||||
|
|
||||||
const mon_count = global.display.get_n_monitors();
|
|
||||||
for (let i = 0; i < mon_count; i++) {
|
|
||||||
this._monitors.set(i, new Monitor(i));
|
|
||||||
}
|
|
||||||
|
|
||||||
this.captureExistingWindows();
|
|
||||||
this.syncActiveWindow();
|
|
||||||
}
|
|
||||||
|
|
||||||
instantiateDisplaySignals(): void {
|
|
||||||
this._displaySignals.push(
|
|
||||||
global.display.connect("grab-op-begin", (display, window, op) => {
|
|
||||||
this.handleGrabOpBegin(display, window, op)
|
|
||||||
}),
|
|
||||||
global.display.connect("grab-op-end", (display, window, op) => {
|
|
||||||
this.handleGrabOpEnd(display, window, op)
|
|
||||||
}),
|
|
||||||
global.display.connect("window-entered-monitor", (display, monitor, window) => {
|
|
||||||
Logger.log("WINDOW HAS ENTERED NEW MONITOR!")
|
|
||||||
if (this._showingOverview) {
|
|
||||||
if (this._getWrappedWindow(window) !== undefined) {
|
|
||||||
Logger.log("OVERVIEW - MOVING")
|
|
||||||
this._moveWindowToMonitor(window, monitor)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
global.display.connect('window-created', (display, window) => {
|
|
||||||
this.handleWindowCreated(display, window);
|
|
||||||
}),
|
|
||||||
global.display.connect('notify::focus-window', () => {
|
|
||||||
this.syncActiveWindow();
|
|
||||||
}),
|
|
||||||
global.display.connect("showing-desktop-changed", () => {
|
|
||||||
Logger.log("SHOWING DESKTOP CHANGED");
|
|
||||||
}),
|
|
||||||
global.display.connect("workareas-changed", (display) => {
|
|
||||||
Logger.log("WORK AREAS CHANGED",);
|
|
||||||
console.log(display.get_workspace_manager().get_active_workspace_index())
|
|
||||||
}),
|
|
||||||
global.display.connect("in-fullscreen-changed", () => {
|
|
||||||
Logger.log("IN FULL SCREEN CHANGED");
|
|
||||||
this._syncFullscreenTabBars();
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
|
|
||||||
this._workspaceManagerSignals = [
|
|
||||||
global.workspace_manager.connect("showing-desktop-changed", () => {
|
|
||||||
Logger.log("SHOWING DESKTOP CHANGED AT WORKSPACE LEVEL");
|
|
||||||
}),
|
|
||||||
global.workspace_manager.connect("workspace-added", (_, wsIndex) => {
|
|
||||||
Logger.log("WORKSPACE ADDED", wsIndex);
|
|
||||||
this._monitors.forEach((monitor: Monitor) => {
|
|
||||||
monitor.addWorkspace();
|
|
||||||
})
|
|
||||||
}),
|
|
||||||
global.workspace_manager.connect("workspace-removed", (_, wsIndex) => {
|
|
||||||
Logger.log("WORKSPACE REMOVED", wsIndex);
|
|
||||||
this._monitors.forEach((monitor: Monitor) => {
|
|
||||||
monitor.removeWorkspace(wsIndex);
|
|
||||||
})
|
|
||||||
}),
|
|
||||||
global.workspace_manager.connect("active-workspace-changed", (source) => {
|
|
||||||
Logger.log("Active workspace-changed", source.get_active_workspace().index());
|
|
||||||
}),
|
|
||||||
];
|
|
||||||
|
|
||||||
this._overviewSignals = [
|
|
||||||
Main.overview.connect("hiding", () => {
|
|
||||||
Logger.log("HIDING OVERVIEW")
|
|
||||||
this._showingOverview = false;
|
|
||||||
this._tileMonitors();
|
|
||||||
for (const monitor of this._monitors.values()) {
|
|
||||||
monitor.showTabBars();
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
Main.overview.connect("showing", () => {
|
|
||||||
this._showingOverview = true;
|
|
||||||
Logger.log("SHOWING OVERVIEW");
|
|
||||||
for (const monitor of this._monitors.values()) {
|
|
||||||
monitor.hideTabBars();
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
public disable(): void {
|
|
||||||
Logger.log("DISABLED AEROSPIKE WINDOW MANAGER!")
|
|
||||||
this.disconnectSignals();
|
|
||||||
this.removeAllWindows();
|
|
||||||
}
|
|
||||||
|
|
||||||
removeAllWindows(): void {
|
|
||||||
this.disconnectMinimizedSignals();
|
|
||||||
this._minimizedItems.clear();
|
|
||||||
this._monitors.forEach((monitor: Monitor) => {
|
|
||||||
monitor.removeAllWindows();
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
disconnectSignals(): void {
|
|
||||||
this.disconnectDisplaySignals();
|
|
||||||
this.disconnectMonitorSignals();
|
|
||||||
this.disconnectMinimizedSignals();
|
|
||||||
}
|
|
||||||
|
|
||||||
disconnectMonitorSignals(): void {
|
|
||||||
this._monitors.forEach((monitor: Monitor) => {
|
|
||||||
monitor.disconnectSignals();
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
disconnectDisplaySignals(): void {
|
|
||||||
this._displaySignals.forEach((signal) => {
|
|
||||||
global.display.disconnect(signal)
|
|
||||||
})
|
|
||||||
this._windowManagerSignals.forEach((signal) => {
|
|
||||||
global.window_manager.disconnect(signal)
|
|
||||||
})
|
|
||||||
this._workspaceManagerSignals.forEach((signal) => {
|
|
||||||
global.workspace_manager.disconnect(signal)
|
|
||||||
})
|
|
||||||
this._overviewSignals.forEach((signal) => {
|
|
||||||
Main.overview.disconnect(signal)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
disconnectMinimizedSignals(): void {
|
|
||||||
this._minimizedItems.forEach((item) => {
|
|
||||||
item.disconnectWindowSignals();
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
_isResizeOp(op: Meta.GrabOp): boolean {
|
|
||||||
return op === Meta.GrabOp.RESIZING_E ||
|
|
||||||
op === Meta.GrabOp.RESIZING_W ||
|
|
||||||
op === Meta.GrabOp.RESIZING_N ||
|
|
||||||
op === Meta.GrabOp.RESIZING_S ||
|
|
||||||
op === Meta.GrabOp.RESIZING_NE ||
|
|
||||||
op === Meta.GrabOp.RESIZING_NW ||
|
|
||||||
op === Meta.GrabOp.RESIZING_SE ||
|
|
||||||
op === Meta.GrabOp.RESIZING_SW;
|
|
||||||
}
|
|
||||||
|
|
||||||
handleGrabOpBegin(display: Meta.Display, window: Meta.Window, op: Meta.GrabOp): void {
|
|
||||||
Logger.log("Grab Op Start", op);
|
|
||||||
|
|
||||||
if (this._isResizeOp(op)) {
|
|
||||||
Logger.log("Resize drag begin, op=", op);
|
|
||||||
this._isResizeDrag = true;
|
|
||||||
this._resizeDragWindowId = window.get_id();
|
|
||||||
this._resizeDragOp = op;
|
|
||||||
const [startMouseX, startMouseY] = global.get_pointer();
|
|
||||||
this._resizeDragLastMouseX = startMouseX;
|
|
||||||
this._resizeDragLastMouseY = startMouseY;
|
|
||||||
this._getWrappedWindow(window)?.startDragging();
|
|
||||||
} else {
|
|
||||||
this._getWrappedWindow(window)?.startDragging();
|
|
||||||
this._grabbedWindowMonitor = window.get_monitor();
|
|
||||||
this._grabbedWindowId = window.get_id();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
handleGrabOpEnd(display: Meta.Display, window: Meta.Window, op: Meta.GrabOp): void {
|
|
||||||
Logger.log("Grab Op End ", op);
|
|
||||||
|
|
||||||
if (this._isResizeDrag) {
|
|
||||||
Logger.log("Resize drag end, op=", op);
|
|
||||||
this._isResizeDrag = false;
|
|
||||||
this._resizeDragWindowId = _UNUSED_WINDOW_ID;
|
|
||||||
this._resizeDragLastMouseX = 0;
|
|
||||||
this._resizeDragLastMouseY = 0;
|
|
||||||
this._resizeDragOp = Meta.GrabOp.NONE;
|
|
||||||
this._getWrappedWindow(window)?.stopDragging();
|
|
||||||
this._tileMonitors();
|
|
||||||
} else {
|
|
||||||
this._grabbedWindowId = _UNUSED_WINDOW_ID;
|
|
||||||
this._getWrappedWindow(window)?.stopDragging();
|
|
||||||
this._tileMonitors();
|
|
||||||
Logger.info("monitor_start and monitor_end", this._grabbedWindowMonitor, window.get_monitor());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
_getWrappedWindow(window: Meta.Window): WindowWrapper | undefined {
|
|
||||||
let wrapped: WindowWrapper | undefined = undefined;
|
|
||||||
for (const monitor of this._monitors.values()) {
|
|
||||||
wrapped = monitor.getWindow(window.get_id());
|
|
||||||
if (wrapped !== undefined) break;
|
|
||||||
}
|
|
||||||
return wrapped;
|
|
||||||
}
|
|
||||||
|
|
||||||
_getAndRemoveWrappedWindow(window: Meta.Window): WindowWrapper | undefined {
|
|
||||||
let wrapped: WindowWrapper | undefined = undefined;
|
|
||||||
for (const monitor of this._monitors.values()) {
|
|
||||||
wrapped = monitor.getWindow(window.get_id());
|
|
||||||
if (wrapped !== undefined) {
|
|
||||||
monitor.removeWindow(wrapped);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return wrapped;
|
|
||||||
}
|
|
||||||
|
|
||||||
_moveWindowToMonitor(window: Meta.Window, monitorId: number): void {
|
|
||||||
let wrapped = this._getAndRemoveWrappedWindow(window);
|
|
||||||
if (wrapped === undefined) {
|
|
||||||
Logger.error("WINDOW NOT DEFINED")
|
|
||||||
wrapped = new WindowWrapper(window, (winWrap) => this.handleWindowMinimized(winWrap));
|
|
||||||
wrapped.connectWindowSignals(this);
|
|
||||||
}
|
|
||||||
let new_mon = this._monitors.get(monitorId);
|
|
||||||
new_mon?.addWindow(wrapped)
|
|
||||||
this._grabbedWindowMonitor = monitorId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public handleWindowPositionChanged(winWrap: WindowWrapper): void {
|
|
||||||
if (this._isTiling || this._changingGrabbedMonitor) return;
|
|
||||||
|
|
||||||
if (this._isResizeDrag && winWrap.getWindowId() === this._resizeDragWindowId) {
|
|
||||||
this._handleResizeDragUpdate(winWrap);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (winWrap.getWindowId() === this._grabbedWindowId) {
|
|
||||||
const [mouseX, mouseY, _] = global.get_pointer();
|
|
||||||
|
|
||||||
let monitorIndex = -1;
|
|
||||||
for (let i = 0; i < global.display.get_n_monitors(); i++) {
|
|
||||||
const workArea = global.workspace_manager.get_active_workspace().get_work_area_for_monitor(i);
|
|
||||||
if (mouseX >= workArea.x && mouseX < workArea.x + workArea.width &&
|
|
||||||
mouseY >= workArea.y && mouseY < workArea.y + workArea.height) {
|
|
||||||
monitorIndex = i;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (monitorIndex === -1) return;
|
|
||||||
|
|
||||||
if (monitorIndex !== this._grabbedWindowMonitor) {
|
|
||||||
this._changingGrabbedMonitor = true;
|
|
||||||
this._moveWindowToMonitor(winWrap.getWindow(), monitorIndex);
|
|
||||||
this._changingGrabbedMonitor = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
this._isTiling = true;
|
|
||||||
try {
|
|
||||||
this._monitors.get(monitorIndex)?.itemDragged(winWrap, mouseX, mouseY);
|
|
||||||
} finally {
|
|
||||||
this._isTiling = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private _handleResizeDragUpdate(winWrap: WindowWrapper): void {
|
|
||||||
const op = this._resizeDragOp;
|
|
||||||
const winId = winWrap.getWindowId();
|
|
||||||
|
|
||||||
const [mouseX, mouseY] = global.get_pointer();
|
|
||||||
const dx = mouseX - this._resizeDragLastMouseX;
|
|
||||||
const dy = mouseY - this._resizeDragLastMouseY;
|
|
||||||
|
|
||||||
if (dx === 0 && dy === 0) return;
|
|
||||||
|
|
||||||
this._resizeDragLastMouseX = mouseX;
|
|
||||||
this._resizeDragLastMouseY = mouseY;
|
|
||||||
|
|
||||||
const container = this._findContainerForWindowAcrossMonitors(winId);
|
|
||||||
if (!container) {
|
|
||||||
Logger.warn("_handleResizeDragUpdate: no container found for window", winId);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const itemIndex = container._getIndexOfWindow(winId);
|
|
||||||
if (itemIndex === -1) return;
|
|
||||||
|
|
||||||
const isHorizontal = container._orientation === Layout.ACC_HORIZONTAL;
|
|
||||||
|
|
||||||
// E/S edge → boundary after the item; W/N edge → boundary before it.
|
|
||||||
let adjusted = false;
|
|
||||||
if (isHorizontal) {
|
|
||||||
if (op === Meta.GrabOp.RESIZING_E || op === Meta.GrabOp.RESIZING_NE || op === Meta.GrabOp.RESIZING_SE) {
|
|
||||||
adjusted = container.adjustBoundary(itemIndex, dx);
|
|
||||||
} else if (op === Meta.GrabOp.RESIZING_W || op === Meta.GrabOp.RESIZING_NW || op === Meta.GrabOp.RESIZING_SW) {
|
|
||||||
adjusted = container.adjustBoundary(itemIndex - 1, dx);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (op === Meta.GrabOp.RESIZING_S || op === Meta.GrabOp.RESIZING_SE || op === Meta.GrabOp.RESIZING_SW) {
|
|
||||||
adjusted = container.adjustBoundary(itemIndex, dy);
|
|
||||||
} else if (op === Meta.GrabOp.RESIZING_N || op === Meta.GrabOp.RESIZING_NE || op === Meta.GrabOp.RESIZING_NW) {
|
|
||||||
adjusted = container.adjustBoundary(itemIndex - 1, dy);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (adjusted) {
|
|
||||||
this._isTiling = true;
|
|
||||||
try {
|
|
||||||
container.drawWindows();
|
|
||||||
} finally {
|
|
||||||
this._isTiling = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private _findContainerForWindowAcrossMonitors(winId: number): WindowContainer | null {
|
|
||||||
const activeWorkspaceIndex = global.workspace_manager.get_active_workspace().index();
|
|
||||||
for (const monitor of this._monitors.values()) {
|
|
||||||
if (activeWorkspaceIndex >= monitor._workspaces.length) continue;
|
|
||||||
const container = monitor._workspaces[activeWorkspaceIndex].getContainerForWindow(winId);
|
|
||||||
if (container !== null) return container;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public handleWindowMinimized(winWrap: WindowWrapper): void {
|
|
||||||
const monitor_id = winWrap.getWindow().get_monitor()
|
|
||||||
this._minimizedItems.set(winWrap.getWindowId(), winWrap);
|
|
||||||
this._monitors.get(monitor_id)?.removeWindow(winWrap);
|
|
||||||
this._tileMonitors()
|
|
||||||
}
|
|
||||||
|
|
||||||
public handleWindowUnminimized(winWrap: WindowWrapper): void {
|
|
||||||
this._minimizedItems.delete(winWrap.getWindowId());
|
|
||||||
this._addWindowWrapperToMonitor(winWrap);
|
|
||||||
this._tileMonitors()
|
|
||||||
}
|
|
||||||
|
|
||||||
public handleWindowChangedWorkspace(winWrap: WindowWrapper): void {
|
|
||||||
const monitor = winWrap.getWindow().get_monitor();
|
|
||||||
this._monitors.get(monitor)?.removeWindow(winWrap);
|
|
||||||
this._monitors.get(monitor)?.addWindow(winWrap);
|
|
||||||
}
|
|
||||||
|
|
||||||
public captureExistingWindows() {
|
|
||||||
const workspace = global.workspace_manager.get_active_workspace();
|
|
||||||
const windows = global.display.get_tab_list(Meta.TabList.NORMAL, workspace);
|
|
||||||
windows.forEach(window => {
|
|
||||||
if (this._isWindowTileable(window)) {
|
|
||||||
this.addWindowToMonitor(window);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
this._tileMonitors();
|
|
||||||
}
|
|
||||||
|
|
||||||
handleWindowCreated(display: Meta.Display, window: Meta.Window) {
|
|
||||||
Logger.log("WINDOW CREATED ON DISPLAY", window, display);
|
|
||||||
if (!this._isWindowTileable(window)) return;
|
|
||||||
Logger.log("WINDOW IS TILABLE");
|
|
||||||
this.addWindowToMonitor(window);
|
|
||||||
}
|
|
||||||
|
|
||||||
handleWindowClosed(window: WindowWrapper): void {
|
|
||||||
const mon_id = window._window.get_monitor();
|
|
||||||
this._monitors.get(mon_id)?.removeWindow(window);
|
|
||||||
window.disconnectWindowSignals()
|
|
||||||
this.syncActiveWindow();
|
|
||||||
this._tileMonitors();
|
|
||||||
}
|
|
||||||
|
|
||||||
handleWindowTitleChanged(window: WindowWrapper): void {
|
|
||||||
const mon_id = window._window.get_monitor();
|
|
||||||
this._monitors.get(mon_id)?.refreshTabTitlesForWindow(window);
|
|
||||||
}
|
|
||||||
|
|
||||||
public addWindowToMonitor(window: Meta.Window) {
|
|
||||||
Logger.log("ADDING WINDOW TO MONITOR", window, window);
|
|
||||||
var wrapper = new WindowWrapper(window, (winWrap) => this.handleWindowMinimized(winWrap))
|
|
||||||
wrapper.connectWindowSignals(this);
|
|
||||||
this._addWindowWrapperToMonitor(wrapper);
|
|
||||||
}
|
|
||||||
|
|
||||||
_addWindowWrapperToMonitor(winWrap: WindowWrapper) {
|
|
||||||
if (winWrap.getWindow().minimized) {
|
|
||||||
this._minimizedItems.set(winWrap.getWindow().get_id(), winWrap);
|
|
||||||
} else {
|
|
||||||
this._monitors.get(winWrap.getWindow().get_monitor())?.addWindow(winWrap)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private _syncFullscreenTabBars(): void {
|
|
||||||
for (const [monitorId, monitor] of this._monitors.entries()) {
|
|
||||||
if (global.display.get_monitor_in_fullscreen(monitorId)) {
|
|
||||||
monitor.hideTabBars();
|
|
||||||
} else if (!this._showingOverview) {
|
|
||||||
monitor.showTabBars();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
_tileMonitors(): void {
|
|
||||||
this._isTiling = true;
|
|
||||||
try {
|
|
||||||
for (const monitor of this._monitors.values()) {
|
|
||||||
monitor.tileWindows();
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
Logger.error("_tileMonitors FAILED", e);
|
|
||||||
} finally {
|
|
||||||
this._isTiling = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
block_titles = [
|
|
||||||
"org.gnome.Shell.Extensions",
|
|
||||||
]
|
|
||||||
|
|
||||||
_isWindowTilingBlocked(window: Meta.Window): boolean {
|
|
||||||
Logger.info("title", window.get_title());
|
|
||||||
Logger.info("description", window.get_description());
|
|
||||||
Logger.info("class", window.get_wm_class());
|
|
||||||
Logger.info("class", window.get_wm_class_instance());
|
|
||||||
return this.block_titles.some((title) => {
|
|
||||||
if (window.get_wm_class() === title) {
|
|
||||||
Logger.log("WINDOW BLOCKED FROM TILING", window.get_title());
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
_isWindowTileable(window: Meta.Window) {
|
|
||||||
if (!window || !window.get_compositor_private()) return false;
|
|
||||||
if (this._isWindowTilingBlocked(window)) return false;
|
|
||||||
|
|
||||||
const windowType = window.get_window_type();
|
|
||||||
Logger.log("WINDOW TILING CHECK",);
|
|
||||||
|
|
||||||
return !window.is_skip_taskbar() &&
|
|
||||||
windowType !== Meta.WindowType.DESKTOP &&
|
|
||||||
windowType !== Meta.WindowType.DOCK &&
|
|
||||||
windowType !== Meta.WindowType.DIALOG &&
|
|
||||||
windowType !== Meta.WindowType.MODAL_DIALOG &&
|
|
||||||
windowType !== Meta.WindowType.UTILITY &&
|
|
||||||
windowType !== Meta.WindowType.MENU;
|
|
||||||
}
|
|
||||||
|
|
||||||
public syncActiveWindow(): number | null {
|
|
||||||
const focusWindow = global.display.focus_window;
|
|
||||||
if (focusWindow) {
|
|
||||||
this._activeWindowId = focusWindow.get_id();
|
|
||||||
Logger.debug(`Active window changed to: ${this._activeWindowId} (${focusWindow.get_title()})`);
|
|
||||||
|
|
||||||
// If the focused window is inside a tabbed container, make it the active tab
|
|
||||||
const monId = focusWindow.get_monitor();
|
|
||||||
this._monitors.get(monId)?.focusWindowTab(this._activeWindowId);
|
|
||||||
} else {
|
|
||||||
this._activeWindowId = null;
|
|
||||||
Logger.debug('No active window');
|
|
||||||
}
|
|
||||||
return this._activeWindowId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public toggleActiveContainerOrientation(): void {
|
|
||||||
if (this._activeWindowId === null) {
|
|
||||||
Logger.warn("No active window, cannot toggle container orientation");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const container = this._findContainerForWindowAcrossMonitors(this._activeWindowId);
|
|
||||||
if (container) {
|
|
||||||
container.toggleOrientation();
|
|
||||||
} else {
|
|
||||||
Logger.warn("Could not find container for active window");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public resetActiveContainerRatios(): void {
|
|
||||||
if (this._activeWindowId === null) {
|
|
||||||
Logger.warn("No active window, cannot reset container ratios");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const container = this._findContainerForWindowAcrossMonitors(this._activeWindowId);
|
|
||||||
if (container) {
|
|
||||||
Logger.info("Resetting container ratios to equal splits");
|
|
||||||
container.resetRatios();
|
|
||||||
} else {
|
|
||||||
Logger.warn("Could not find container for active window");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public toggleActiveContainerTabbed(): void {
|
|
||||||
if (this._activeWindowId === null) {
|
|
||||||
Logger.warn("No active window, cannot toggle tabbed mode");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const container = this._findContainerForWindowAcrossMonitors(this._activeWindowId);
|
|
||||||
if (container) {
|
|
||||||
if (container.isTabbed()) {
|
|
||||||
container.setAccordion(Layout.ACC_HORIZONTAL);
|
|
||||||
} else {
|
|
||||||
// Set the active tab to the focused window
|
|
||||||
const activeIndex = container._getIndexOfWindow(this._activeWindowId);
|
|
||||||
if (activeIndex !== -1) {
|
|
||||||
container._activeTabIndex = activeIndex;
|
|
||||||
}
|
|
||||||
container.setTabbed();
|
|
||||||
}
|
|
||||||
this._tileMonitors();
|
|
||||||
} else {
|
|
||||||
Logger.warn("Could not find container for active window");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Move the active window in the given direction.
|
|
||||||
*
|
|
||||||
* 1. Find the container holding the active window.
|
|
||||||
* 2. Try to swap within the container (adjacent neighbour).
|
|
||||||
* 3. If already at the container edge, move the window to the
|
|
||||||
* nearest monitor in that direction instead.
|
|
||||||
* 4. Re-tile to apply the new layout.
|
|
||||||
*/
|
|
||||||
public moveInDirection(direction: Direction): void {
|
|
||||||
if (this._activeWindowId === null) {
|
|
||||||
Logger.warn("No active window, cannot move in direction");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const container = this._findContainerForWindowAcrossMonitors(this._activeWindowId);
|
|
||||||
if (!container) {
|
|
||||||
Logger.warn("Could not find container for active window");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const swapped = container.swapWindowInDirection(this._activeWindowId, direction);
|
|
||||||
if (swapped) {
|
|
||||||
Logger.info(`Moved window ${this._activeWindowId} ${direction}`);
|
|
||||||
this._tileMonitors();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this._moveWindowCrossMonitor(this._activeWindowId, direction);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Move focus to the adjacent window in the given direction.
|
|
||||||
*
|
|
||||||
* 1. Find the container holding the active window.
|
|
||||||
* 2. Ask the container for the adjacent window in that direction.
|
|
||||||
* 3. If the container returns null (at the edge), try cross-monitor navigation.
|
|
||||||
* 4. Activate (focus) the target window.
|
|
||||||
*/
|
|
||||||
public focusInDirection(direction: Direction): void {
|
|
||||||
if (this._activeWindowId === null) {
|
|
||||||
Logger.warn("No active window, cannot focus in direction");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const container = this._findContainerForWindowAcrossMonitors(this._activeWindowId);
|
|
||||||
if (!container) {
|
|
||||||
Logger.warn("Could not find container for active window");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const targetId = container.getAdjacentWindowId(this._activeWindowId, direction);
|
|
||||||
if (targetId !== null) {
|
|
||||||
this._activateWindowById(targetId);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// At the edge of the container — try cross-monitor navigation
|
|
||||||
const crossMonitorId = this._findCrossMonitorWindow(direction);
|
|
||||||
if (crossMonitorId !== null) {
|
|
||||||
this._activateWindowById(crossMonitorId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Focus a window by its ID. Finds the Meta.Window and calls activate().
|
|
||||||
*/
|
|
||||||
private _activateWindowById(windowId: number): void {
|
|
||||||
for (const monitor of this._monitors.values()) {
|
|
||||||
const wrapped = monitor.getWindow(windowId);
|
|
||||||
if (wrapped) {
|
|
||||||
const metaWindow = wrapped.getWindow();
|
|
||||||
metaWindow.activate(global.get_current_time());
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Logger.warn(`_activateWindowById: window ${windowId} not found in any monitor`);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Find the adjacent monitor in the given direction from a current monitor.
|
|
||||||
* Returns the monitor ID or null if none exists in that direction.
|
|
||||||
*/
|
|
||||||
private _findAdjacentMonitorId(currentMonitorId: number, direction: Direction): number | null {
|
|
||||||
const currentMonitor = this._monitors.get(currentMonitorId)!;
|
|
||||||
const currentArea = currentMonitor._workArea;
|
|
||||||
const currentCenterX = currentArea.x + currentArea.width / 2;
|
|
||||||
const currentCenterY = currentArea.y + currentArea.height / 2;
|
|
||||||
|
|
||||||
let bestMonitorId: number | null = null;
|
|
||||||
let bestDistance = Infinity;
|
|
||||||
|
|
||||||
for (const [monId, monitor] of this._monitors.entries()) {
|
|
||||||
if (monId === currentMonitorId) continue;
|
|
||||||
|
|
||||||
const area = monitor._workArea;
|
|
||||||
const centerX = area.x + area.width / 2;
|
|
||||||
const centerY = area.y + area.height / 2;
|
|
||||||
|
|
||||||
let isInDirection = false;
|
|
||||||
let distance = Infinity;
|
|
||||||
|
|
||||||
switch (direction) {
|
|
||||||
case Direction.LEFT:
|
|
||||||
isInDirection = centerX < currentCenterX;
|
|
||||||
distance = currentCenterX - centerX;
|
|
||||||
break;
|
|
||||||
case Direction.RIGHT:
|
|
||||||
isInDirection = centerX > currentCenterX;
|
|
||||||
distance = centerX - currentCenterX;
|
|
||||||
break;
|
|
||||||
case Direction.UP:
|
|
||||||
isInDirection = centerY < currentCenterY;
|
|
||||||
distance = currentCenterY - centerY;
|
|
||||||
break;
|
|
||||||
case Direction.DOWN:
|
|
||||||
isInDirection = centerY > currentCenterY;
|
|
||||||
distance = centerY - currentCenterY;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isInDirection && distance < bestDistance) {
|
|
||||||
bestDistance = distance;
|
|
||||||
bestMonitorId = monId;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return bestMonitorId;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return the monitor ID that contains the given window, or null.
|
|
||||||
*/
|
|
||||||
private _findMonitorIdForWindow(windowId: number): number | null {
|
|
||||||
for (const [monId, monitor] of this._monitors.entries()) {
|
|
||||||
if (monitor.getWindow(windowId) !== undefined) return monId;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* When at the edge of a container, find the nearest window on the adjacent
|
|
||||||
* monitor in the given direction.
|
|
||||||
*
|
|
||||||
* On the target monitor, picks the edge-most window:
|
|
||||||
* - Navigating LEFT/UP → last (far-edge) leaf window
|
|
||||||
* - Navigating RIGHT/DOWN → first (near-edge) leaf window
|
|
||||||
*/
|
|
||||||
private _findCrossMonitorWindow(direction: Direction): number | null {
|
|
||||||
if (this._activeWindowId === null) return null;
|
|
||||||
|
|
||||||
const currentMonitorId = this._findMonitorIdForWindow(this._activeWindowId);
|
|
||||||
if (currentMonitorId === null) return null;
|
|
||||||
|
|
||||||
const targetMonitorId = this._findAdjacentMonitorId(currentMonitorId, direction);
|
|
||||||
if (targetMonitorId === null) return null;
|
|
||||||
|
|
||||||
const targetMonitor = this._monitors.get(targetMonitorId)!;
|
|
||||||
const activeWorkspaceIndex = global.workspace_manager.get_active_workspace().index();
|
|
||||||
if (activeWorkspaceIndex >= targetMonitor._workspaces.length) return null;
|
|
||||||
|
|
||||||
const targetContainer = targetMonitor._workspaces[activeWorkspaceIndex];
|
|
||||||
if (targetContainer._tiledItems.length === 0) return null;
|
|
||||||
|
|
||||||
return (direction === Direction.LEFT || direction === Direction.UP)
|
|
||||||
? targetContainer._lastLeafWindowId()
|
|
||||||
: targetContainer._firstLeafWindowId();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Move a window to the adjacent monitor in the given direction.
|
|
||||||
*
|
|
||||||
* The window is inserted at the "entry edge" of the target container:
|
|
||||||
* - Moving RIGHT/DOWN → position 0 (near edge)
|
|
||||||
* - Moving LEFT/UP → end of the container (far edge)
|
|
||||||
*/
|
|
||||||
private _moveWindowCrossMonitor(windowId: number, direction: Direction): void {
|
|
||||||
const currentMonitorId = this._findMonitorIdForWindow(windowId);
|
|
||||||
if (currentMonitorId === null) return;
|
|
||||||
|
|
||||||
const targetMonitorId = this._findAdjacentMonitorId(currentMonitorId, direction);
|
|
||||||
if (targetMonitorId === null) return;
|
|
||||||
|
|
||||||
const currentMonitor = this._monitors.get(currentMonitorId)!;
|
|
||||||
const wrapped = currentMonitor.getWindow(windowId);
|
|
||||||
if (!wrapped) return;
|
|
||||||
|
|
||||||
const targetMonitor = this._monitors.get(targetMonitorId)!;
|
|
||||||
const insertIndex = (direction === Direction.RIGHT || direction === Direction.DOWN) ? 0 : undefined;
|
|
||||||
|
|
||||||
currentMonitor.removeWindow(wrapped);
|
|
||||||
targetMonitor.addWindow(wrapped, insertIndex);
|
|
||||||
|
|
||||||
this._tileMonitors();
|
|
||||||
Logger.info(`Moved window ${windowId} to monitor ${targetMonitorId} (${direction})`);
|
|
||||||
}
|
|
||||||
|
|
||||||
public printTreeStructure(): void {
|
|
||||||
Logger.info("=".repeat(80));
|
|
||||||
Logger.info("WINDOW TREE STRUCTURE");
|
|
||||||
Logger.info("=".repeat(80));
|
|
||||||
Logger.info(`Active Window ID: ${this._activeWindowId ?? 'none'}`);
|
|
||||||
Logger.info("=".repeat(80));
|
|
||||||
|
|
||||||
const activeWorkspaceIndex = global.workspace_manager.get_active_workspace().index();
|
|
||||||
|
|
||||||
this._monitors.forEach((monitor: Monitor, monitorId: number) => {
|
|
||||||
const isActiveMonitor = this._activeWindowId !== null &&
|
|
||||||
monitor.getWindow(this._activeWindowId) !== undefined;
|
|
||||||
|
|
||||||
Logger.info(`Monitor ${monitorId}${isActiveMonitor ? ' *' : ''}:`);
|
|
||||||
Logger.info(` Work Area: x=${monitor._workArea.x}, y=${monitor._workArea.y}, w=${monitor._workArea.width}, h=${monitor._workArea.height}`);
|
|
||||||
|
|
||||||
monitor._workspaces.forEach((workspace, workspaceIndex) => {
|
|
||||||
const isActiveWorkspace = workspaceIndex === activeWorkspaceIndex;
|
|
||||||
Logger.info(` Workspace ${workspaceIndex}${isActiveWorkspace && isActiveMonitor ? ' *' : ''}:`);
|
|
||||||
Logger.info(` Orientation: ${Layout[workspace._orientation]}`);
|
|
||||||
Logger.info(` Items: ${workspace._tiledItems.length}`);
|
|
||||||
if (workspace.isTabbed()) {
|
|
||||||
Logger.info(` Active Tab: ${workspace._activeTabIndex}`);
|
|
||||||
}
|
|
||||||
this._printContainerTree(workspace, 4);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
Logger.info("=".repeat(80));
|
|
||||||
}
|
|
||||||
|
|
||||||
private _printContainerTree(container: WindowContainer, indentLevel: number): void {
|
|
||||||
const indent = " ".repeat(indentLevel);
|
|
||||||
|
|
||||||
container._tiledItems.forEach((item, index) => {
|
|
||||||
if (item instanceof WindowContainer) {
|
|
||||||
const containsActive = this._activeWindowId !== null &&
|
|
||||||
item.getWindow(this._activeWindowId) !== undefined;
|
|
||||||
Logger.info(`${indent}[${index}] Container (${Layout[item._orientation]})${containsActive ? ' *' : ''}:`);
|
|
||||||
Logger.info(`${indent} Items: ${item._tiledItems.length}`);
|
|
||||||
Logger.info(`${indent} Work Area: x=${item._workArea.x}, y=${item._workArea.y}, w=${item._workArea.width}, h=${item._workArea.height}`);
|
|
||||||
this._printContainerTree(item, indentLevel + 4);
|
|
||||||
} else {
|
|
||||||
const window = item.getWindow();
|
|
||||||
Logger.info(`${indent}[${index}] Window ID: ${item.getWindowId()}${this._activeWindowId === item.getWindowId() ? ' *' : ''}`);
|
|
||||||
Logger.info(`${indent} Title: "${window.get_title()}"`);
|
|
||||||
Logger.info(`${indent} Class: ${window.get_wm_class()}`);
|
|
||||||
const rect = item.getRect();
|
|
||||||
Logger.info(`${indent} Rect: x=${rect.x}, y=${rect.y}, w=${rect.width}, h=${rect.height}`);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
.aerospike-tab-bar {
|
|
||||||
background-color: rgba(30, 30, 30, 0.95);
|
|
||||||
border-bottom: 1px solid rgba(255, 255, 255, 0.08);
|
|
||||||
spacing: 1px;
|
|
||||||
padding: 2px 2px 0 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.aerospike-tab {
|
|
||||||
background-color: rgba(50, 50, 50, 0.8);
|
|
||||||
border-radius: 6px 6px 0 0;
|
|
||||||
padding: 2px 12px;
|
|
||||||
margin: 0 1px;
|
|
||||||
color: rgba(255, 255, 255, 0.5);
|
|
||||||
font-size: 11px;
|
|
||||||
font-weight: 400;
|
|
||||||
min-width: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.aerospike-tab:hover {
|
|
||||||
background-color: rgba(70, 70, 70, 0.9);
|
|
||||||
color: rgba(255, 255, 255, 0.8);
|
|
||||||
}
|
|
||||||
|
|
||||||
.aerospike-tab-active {
|
|
||||||
background-color: rgba(80, 80, 80, 1);
|
|
||||||
color: rgba(255, 255, 255, 1);
|
|
||||||
font-weight: 500;
|
|
||||||
}
|
|
||||||
|
|
||||||
.aerospike-tab-label {
|
|
||||||
font-size: 11px;
|
|
||||||
min-width: 0;
|
|
||||||
}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
{
|
|
||||||
"compilerOptions": {
|
|
||||||
"module": "NodeNext",
|
|
||||||
"moduleResolution": "NodeNext",
|
|
||||||
"outDir": "./dist",
|
|
||||||
"sourceMap": false,
|
|
||||||
"strict": true,
|
|
||||||
"noImplicitAny": false,
|
|
||||||
"skipLibCheck": true,
|
|
||||||
"target": "ES2022",
|
|
||||||
"lib": [
|
|
||||||
"ES2022"
|
|
||||||
],
|
|
||||||
},
|
|
||||||
"include": [
|
|
||||||
"ambient.d.ts",
|
|
||||||
"prefs.ts",
|
|
||||||
"src/**/*"
|
|
||||||
],
|
|
||||||
"files": [
|
|
||||||
"extension.ts"
|
|
||||||
],
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user